From e97220609f76cd50bb78d2a8e579dfa58916c303 Mon Sep 17 00:00:00 2001 From: Harshad Patil Date: Thu, 10 Mar 2022 11:47:01 -0800 Subject: [PATCH 1/4] Regression tests for - bar to abar - abar transfer - abar to bar --- .../scripts/create_test_bars.sh | 26 +++++ .../regression/triple_masking/scripts/env.sh | 4 + .../triple_masking/scripts/setup_wallets.sh | 29 ++++++ .../triple_masking/test_triple_masking.sh | 96 +++++++++++++++++++ tools/triple_masking/bar_to_abar_convert.sh | 2 - 5 files changed, 155 insertions(+), 2 deletions(-) create mode 100755 tools/regression/triple_masking/scripts/create_test_bars.sh create mode 100755 tools/regression/triple_masking/scripts/env.sh create mode 100755 tools/regression/triple_masking/scripts/setup_wallets.sh create mode 100755 tools/regression/triple_masking/test_triple_masking.sh diff --git a/tools/regression/triple_masking/scripts/create_test_bars.sh b/tools/regression/triple_masking/scripts/create_test_bars.sh new file mode 100755 index 000000000..872d7d144 --- /dev/null +++ b/tools/regression/triple_masking/scripts/create_test_bars.sh @@ -0,0 +1,26 @@ +set -e + +target/release/fn setup -O ~/.findora/mnenomic.key -S http://0.0.0.0 + +echo "\n\n\n Simple transfer 1" +echo "------------------------------------------------------------------------------" +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 5 + +echo "\n\n\n Simple transfer 2" +echo "------------------------------------------------------------------------------" +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 5 + +echo "\n\n\n Simple transfer 3" +echo "------------------------------------------------------------------------------" +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 5 + +echo "\n\n\n Simple transfer 4" +echo "------------------------------------------------------------------------------" +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 5 + +# setup the new wallet +set +e \ No newline at end of file diff --git a/tools/regression/triple_masking/scripts/env.sh b/tools/regression/triple_masking/scripts/env.sh new file mode 100755 index 000000000..5596c58bf --- /dev/null +++ b/tools/regression/triple_masking/scripts/env.sh @@ -0,0 +1,4 @@ +FILE_MNEMONIC="mnemonic-temp.keys" +FILE_ANON_KEYS="anon-keys-temp.keys" + +BAR_SEC_KEY="21ZXFhLnhhjNiPGOn_0UDRLWGQWer4A7dv6MY4nM-e4=" \ No newline at end of file diff --git a/tools/regression/triple_masking/scripts/setup_wallets.sh b/tools/regression/triple_masking/scripts/setup_wallets.sh new file mode 100755 index 000000000..a6fe6ad39 --- /dev/null +++ b/tools/regression/triple_masking/scripts/setup_wallets.sh @@ -0,0 +1,29 @@ +#rm mnemonic-temp.keys anon-keys-temp.keys + +# These wallets would be used to move Anonymous funds around + +echo "double quit tape enough charge fancy mandate ostrich this program laundry insect either escape cement van turtle loud immense load tip spike inquiry spice" > mnemonic-temp.keys + +echo " +{ + \"axfr_secret_key\": \"J7PqRhmBOE_gadFs4rB4lcKuz_YoWa5VSlALyKuZdQjNBryPSYZhRczonGNY3-mp86LWW8TJ6clirfk4gk03Tw==\", + \"axfr_public_key\": \"zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08=\", + \"enc_key\": \"Gu558brzFchoqQR9oi8QP54KZKSQ18Djzt82C4YUyFg=\", + \"dec_key\": \"4GNC0J_qOXV2kww5BC5bOCyrTEfCodX5BoFaj06uN1s=\" +}" > anon-keys-temp.keys + +fn setup -O mnemonic-temp.keys -S http://0.0.0.0 + +echo "New BAR wallet with Balance:" +target/release/fn wallet --show + + +rm anon-keys-temp2.keys +echo " +{ + \"axfr_secret_key\": \"MwdsbYhTp4Io062nV7E2HkJfsnaTCZpkdjr6aijv2Aem3KjuGWqf4TLB_-20b305Ja3Pop8NS8tgMNUOVXUL5Q==\", + \"axfr_public_key\": \"ptyo7hlqn-Eywf_ttG99OSWtz6KfDUvLYDDVDlV1C-U=\", + \"enc_key\": \"SAmB7Oji4sAgENLaLb4PFclxQL_DRrEkXcYp6eXuXwI=\", + \"dec_key\": \"AEq1ZUFk_fB__YaNjQ3D2taGOnMZAx4adpB6RbnPj24=\" +}" >> anon-keys-temp2.keys +sleep 5 \ No newline at end of file diff --git a/tools/regression/triple_masking/test_triple_masking.sh b/tools/regression/triple_masking/test_triple_masking.sh new file mode 100755 index 000000000..ffa0a6bac --- /dev/null +++ b/tools/regression/triple_masking/test_triple_masking.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +set -e + +EVM_SCRIPTS_PATH="tools/regression/evm/scripts" +TRIPLE_MASKING_SCRIPTS_PATH="tools/regression/triple_masking/scripts" +source $EVM_SCRIPTS_PATH/env.sh +source $TRIPLE_MASKING_SCRIPTS_PATH/env.sh +let SLEEP_INTERVAL=($BLOCK_INTERVAL + 1) + +#Setup environment +./$EVM_SCRIPTS_PATH/setup.sh + +#Run Tests +echo -e "${YEL}Run test cases and verify results${NC}" + + +./$TRIPLE_MASKING_SCRIPTS_PATH/create_test_bars.sh +#Verify +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 840000000 +echo + +./$TRIPLE_MASKING_SCRIPTS_PATH/setup_wallets.sh + + +echo "\n\n\n Bar To Abar Conversion" +echo "===============================================================================" +# convert bar to abar +sleep 1 +fn convert-bar-to-abar --anon-keys ./$FILE_ANON_KEYS --txo-sid 3 + +sleep 20 + +#Verify +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 629990000 +echo + +randomiser1=$(tail -n 1 owned_randomizers) +echo "\n\n Owned Abars after Bar to Abar conversion" +sleep 20 #Do not remove/decrease +fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser1 + + +echo "\n\n\n Anonymous Transfer from Sender1 to Receiver1" +echo "------------------------------------------------------------------------------" +fn anon-transfer --amount 189990000 --anon-keys ./anon-keys-temp.keys --to-axfr-public-key ptyo7hlqn-Eywf_ttG99OSWtz6KfDUvLYDDVDlV1C-U= --to-enc-key SAmB7Oji4sAgENLaLb4PFclxQL_DRrEkXcYp6eXuXwI= --randomizer $randomiser1 + +randomiser2=$(tail -n 1 sent_randomizers) +echo "\n\n Owned Abars for Receiver1 after Anon Transfer 1" +sleep 30 +echo $randomiser2 > /dev/null +fn owned-abars -p ptyo7hlqn-Eywf_ttG99OSWtz6KfDUvLYDDVDlV1C-U= -r $randomiser2 + +echo "\n\n\n Anonymous Transfer from Receiver1 (Sender2) to Receiver2" +echo "------------------------------------------------------------------------------" +fn anon-transfer --amount 169990000 --anon-keys ./anon-keys-temp2.keys --to-axfr-public-key BdECoTzLNQHlKq1oGMI2kdh27yp_I2CZen0FGYLFkM0= --to-enc-key Ox5L-mGxzOFfd4fef7WZGJMdO-EKBVnnJypZiEl_9FQ= --randomizer $randomiser2 + +randomiser3=$(tail -n 1 sent_randomizers) +echo "\n\n Owned Abars for Receiver2 after Anon Transfer 2" +sleep 30 +echo $randomiser3 > /dev/null +fn owned-abars -p BdECoTzLNQHlKq1oGMI2kdh27yp_I2CZen0FGYLFkM0= -r $randomiser3 + +sleep 2 +echo "\n\n\n Fetch merkle proof for Anon Transfer 2" +echo "------------------------------------------------------------------------------" +fn anon-fetch-merkle-proof -a 2 + +#Verify +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 629990000 +echo + +fn owned-utxos + +echo "\n\n\n Bar To Abar Conversion" +echo "===============================================================================" +# convert bar to abar +sleep 1 +fn convert-bar-to-abar --anon-keys ./$FILE_ANON_KEYS --txo-sid 9 + +sleep 20 + +#Verify +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419980000 +echo + +randomiser=$(tail -n 1 owned_randomizers) +echo "\n\n Owned Abars " +sleep 20 #Do not remove/decrease +target/release/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser + +target/release/fn convert-abar-to-bar --anon-keys ./anon-keys-temp.keys -r $randomiser --to-wallet-address fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 + +#Verify +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419980000 +echo \ No newline at end of file diff --git a/tools/triple_masking/bar_to_abar_convert.sh b/tools/triple_masking/bar_to_abar_convert.sh index 992a26f70..23fba8c06 100755 --- a/tools/triple_masking/bar_to_abar_convert.sh +++ b/tools/triple_masking/bar_to_abar_convert.sh @@ -1,5 +1,4 @@ -set -e echo "\n\n\n Simple transfer 1" echo "------------------------------------------------------------------------------" @@ -17,7 +16,6 @@ target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0 sleep 5 # setup the new wallet -set +e FILE_MNEMONIC="mnemonic-temp.keys" FILE_ANON_KEYS="anon-keys-temp.keys" From a385ed8f18ac93b8789334ce1e1d9232c4951041 Mon Sep 17 00:00:00 2001 From: Harshad Patil Date: Mon, 21 Mar 2022 13:27:52 -0700 Subject: [PATCH 2/4] fix binary path --- .../triple_masking/scripts/create_test_bars.sh | 10 +++++----- .../regression/triple_masking/scripts/setup_wallets.sh | 2 +- tools/regression/triple_masking/test_triple_masking.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/regression/triple_masking/scripts/create_test_bars.sh b/tools/regression/triple_masking/scripts/create_test_bars.sh index 872d7d144..cc06734e4 100755 --- a/tools/regression/triple_masking/scripts/create_test_bars.sh +++ b/tools/regression/triple_masking/scripts/create_test_bars.sh @@ -1,25 +1,25 @@ set -e -target/release/fn setup -O ~/.findora/mnenomic.key -S http://0.0.0.0 +target/debug/fn setup -O ~/.findora/mnenomic.key -S http://0.0.0.0 echo "\n\n\n Simple transfer 1" echo "------------------------------------------------------------------------------" -target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 sleep 5 echo "\n\n\n Simple transfer 2" echo "------------------------------------------------------------------------------" -target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 sleep 5 echo "\n\n\n Simple transfer 3" echo "------------------------------------------------------------------------------" -target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 sleep 5 echo "\n\n\n Simple transfer 4" echo "------------------------------------------------------------------------------" -target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 sleep 5 # setup the new wallet diff --git a/tools/regression/triple_masking/scripts/setup_wallets.sh b/tools/regression/triple_masking/scripts/setup_wallets.sh index a6fe6ad39..f95951001 100755 --- a/tools/regression/triple_masking/scripts/setup_wallets.sh +++ b/tools/regression/triple_masking/scripts/setup_wallets.sh @@ -15,7 +15,7 @@ echo " fn setup -O mnemonic-temp.keys -S http://0.0.0.0 echo "New BAR wallet with Balance:" -target/release/fn wallet --show +target/debug/fn wallet --show rm anon-keys-temp2.keys diff --git a/tools/regression/triple_masking/test_triple_masking.sh b/tools/regression/triple_masking/test_triple_masking.sh index ffa0a6bac..b77fd4adc 100755 --- a/tools/regression/triple_masking/test_triple_masking.sh +++ b/tools/regression/triple_masking/test_triple_masking.sh @@ -87,9 +87,9 @@ echo randomiser=$(tail -n 1 owned_randomizers) echo "\n\n Owned Abars " sleep 20 #Do not remove/decrease -target/release/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser +target/debug/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser -target/release/fn convert-abar-to-bar --anon-keys ./anon-keys-temp.keys -r $randomiser --to-wallet-address fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +target/debug/fn convert-abar-to-bar --anon-keys ./anon-keys-temp.keys -r $randomiser --to-wallet-address fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 #Verify python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419980000 From c03923a6356e37428af21bcb3373cf4c9c606036 Mon Sep 17 00:00:00 2001 From: Harshad Patil Date: Tue, 22 Mar 2022 10:17:41 -0700 Subject: [PATCH 3/4] Anon fee for abar to bar conversion --- tools/devnet/env.sh | 2 +- .../scripts/create_test_bars.sh | 25 ++++++++------- .../triple_masking/scripts/setup_wallets.sh | 2 +- .../triple_masking/test_triple_masking.sh | 32 +++++++++++-------- 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/tools/devnet/env.sh b/tools/devnet/env.sh index 553bcd58f..d25996051 100755 --- a/tools/devnet/env.sh +++ b/tools/devnet/env.sh @@ -11,7 +11,7 @@ export FIN_DEBUG="${FIN_DEBUG:=$TMP_DEBUG}" export DEVNET="$FIN_DEBUG/devnet" # binary config -BIN_CFG_DEFAULT=debug +BIN_CFG_DEFAULT=release BIN_CFG="${BIN_CFG:=$BIN_CFG_DEFAULT}" BIN="target/$BIN_CFG" diff --git a/tools/regression/triple_masking/scripts/create_test_bars.sh b/tools/regression/triple_masking/scripts/create_test_bars.sh index cc06734e4..a339561aa 100755 --- a/tools/regression/triple_masking/scripts/create_test_bars.sh +++ b/tools/regression/triple_masking/scripts/create_test_bars.sh @@ -1,26 +1,27 @@ -set -e -target/debug/fn setup -O ~/.findora/mnenomic.key -S http://0.0.0.0 +target/release/fn setup -O ~/.findora/mnenomic.key -S http://0.0.0.0 echo "\n\n\n Simple transfer 1" echo "------------------------------------------------------------------------------" -target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 -sleep 5 +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 10 echo "\n\n\n Simple transfer 2" echo "------------------------------------------------------------------------------" -target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 -sleep 5 +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 10 echo "\n\n\n Simple transfer 3" echo "------------------------------------------------------------------------------" -target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 -sleep 5 +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 10 echo "\n\n\n Simple transfer 4" echo "------------------------------------------------------------------------------" -target/debug/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 -sleep 5 +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 10 -# setup the new wallet -set +e \ No newline at end of file +echo "\n\n\n Simple transfer 5" +echo "------------------------------------------------------------------------------" +target/release/fn transfer --amount 210000000 --asset FRA -T fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 10 diff --git a/tools/regression/triple_masking/scripts/setup_wallets.sh b/tools/regression/triple_masking/scripts/setup_wallets.sh index f95951001..a6fe6ad39 100755 --- a/tools/regression/triple_masking/scripts/setup_wallets.sh +++ b/tools/regression/triple_masking/scripts/setup_wallets.sh @@ -15,7 +15,7 @@ echo " fn setup -O mnemonic-temp.keys -S http://0.0.0.0 echo "New BAR wallet with Balance:" -target/debug/fn wallet --show +target/release/fn wallet --show rm anon-keys-temp2.keys diff --git a/tools/regression/triple_masking/test_triple_masking.sh b/tools/regression/triple_masking/test_triple_masking.sh index b77fd4adc..63c16b0af 100755 --- a/tools/regression/triple_masking/test_triple_masking.sh +++ b/tools/regression/triple_masking/test_triple_masking.sh @@ -17,7 +17,7 @@ echo -e "${YEL}Run test cases and verify results${NC}" ./$TRIPLE_MASKING_SCRIPTS_PATH/create_test_bars.sh #Verify -python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 840000000 +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 1050000000 echo ./$TRIPLE_MASKING_SCRIPTS_PATH/setup_wallets.sh @@ -32,7 +32,7 @@ fn convert-bar-to-abar --anon-keys ./$FILE_ANON_KEYS --txo-sid 3 sleep 20 #Verify -python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 629990000 +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 839990000 echo randomiser1=$(tail -n 1 owned_randomizers) @@ -67,7 +67,7 @@ echo "-------------------------------------------------------------------------- fn anon-fetch-merkle-proof -a 2 #Verify -python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 629990000 +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 839990000 echo fn owned-utxos @@ -77,20 +77,26 @@ echo "========================================================================== # convert bar to abar sleep 1 fn convert-bar-to-abar --anon-keys ./$FILE_ANON_KEYS --txo-sid 9 - -sleep 20 +sleep 5 +fn convert-bar-to-abar --anon-keys ./$FILE_ANON_KEYS --txo-sid 12 +sleep 5 #Verify -python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419980000 +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419970000 echo -randomiser=$(tail -n 1 owned_randomizers) -echo "\n\n Owned Abars " -sleep 20 #Do not remove/decrease -target/debug/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser - -target/debug/fn convert-abar-to-bar --anon-keys ./anon-keys-temp.keys -r $randomiser --to-wallet-address fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +tail -n 2 owned_randomizers > randomizer_file +randomiser=$(awk 'FNR>=1 && FNR<=1' randomizer_file) +echo "\n\n Owned Abars after Bar to Abar conversion 1" +sleep 20 +target/release/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $randomiser +fee_randomiser=$(awk 'FNR>=2 && FNR<=2' randomizer_file) +echo "\n\n Owned Abars after Bar to Abar conversion 2" +sleep 20 +target/release/fn owned-abars -p zQa8j0mGYUXM6JxjWN_pqfOi1lvEyenJYq35OIJNN08= -r $fee_randomiser +target/release/fn convert-abar-to-bar --anon-keys ./anon-keys-temp.keys -r $randomiser -F $fee_randomiser --to-wallet-address fra1ck6mu4fgmh7n3g0y5jm0zjrq6hwgckut9q2tf5fpwhrdgkhgdp9qhla5t5 +sleep 20 #Verify -python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 419980000 +python $REGRESSION_PATH/evm.py verify-balance --sec-key $BAR_SEC_KEY --amount 629980000 echo \ No newline at end of file From 47112b2ee51fe580541c934f843513371a3970b6 Mon Sep 17 00:00:00 2001 From: Harshad Patil Date: Wed, 23 Mar 2022 14:26:43 -0700 Subject: [PATCH 4/4] Updating the zei library version --- src/components/abciapp/Cargo.toml | 4 ++-- src/components/contracts/modules/account/Cargo.toml | 2 +- src/components/contracts/primitives/mocks/Cargo.toml | 2 +- src/components/contracts/primitives/types/Cargo.toml | 2 +- src/components/finutils/Cargo.toml | 6 +++--- src/components/wasm/Cargo.toml | 6 +++--- src/ledger/Cargo.toml | 10 +++++----- src/libs/credentials/Cargo.toml | 2 +- src/libs/globutils/Cargo.toml | 6 +++--- src/libs/sparse_merkle_tree/Cargo.toml | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/abciapp/Cargo.toml b/src/components/abciapp/Cargo.toml index 80da4431a..3dda86bda 100644 --- a/src/components/abciapp/Cargo.toml +++ b/src/components/abciapp/Cargo.toml @@ -41,8 +41,8 @@ percent-encoding = "2.1.0" nix = "0.22.1" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } ruc = "1.0" abci = { git = "https://github.com/FindoraNetwork/rust-abci", tag = "v0.7.2" } config = { path = "../config"} diff --git a/src/components/contracts/modules/account/Cargo.toml b/src/components/contracts/modules/account/Cargo.toml index 3d127639c..483c9f4c6 100644 --- a/src/components/contracts/modules/account/Cargo.toml +++ b/src/components/contracts/modules/account/Cargo.toml @@ -26,4 +26,4 @@ fp-types = { path = "../../primitives/types" } [dev-dependencies] parking_lot = "0.11.1" rand_chacha = "0.2.0" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } diff --git a/src/components/contracts/primitives/mocks/Cargo.toml b/src/components/contracts/primitives/mocks/Cargo.toml index 1751f8a30..1d78a4643 100644 --- a/src/components/contracts/primitives/mocks/Cargo.toml +++ b/src/components/contracts/primitives/mocks/Cargo.toml @@ -18,7 +18,7 @@ rand_chacha = "0.2.0" rlp = "0.5" serde_json = "1.0" sha3 = "0.8" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } # primitives fp-traits = { path = "../traits" } diff --git a/src/components/contracts/primitives/types/Cargo.toml b/src/components/contracts/primitives/types/Cargo.toml index f9216a1ec..4dbc9a5e5 100644 --- a/src/components/contracts/primitives/types/Cargo.toml +++ b/src/components/contracts/primitives/types/Cargo.toml @@ -19,7 +19,7 @@ ruc = "1.0" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0" sha3 = "0.8" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } fixed-hash = "0.7.0" # primitives diff --git a/src/components/finutils/Cargo.toml b/src/components/finutils/Cargo.toml index 583a4ce0a..364efaf57 100644 --- a/src/components/finutils/Cargo.toml +++ b/src/components/finutils/Cargo.toml @@ -22,9 +22,9 @@ parking_lot = "0.11.1" curve25519-dalek = { version = "3.0", features = ["serde"] } wasm-bindgen = { version = "0.2.50", features = ["serde-serialize"] } -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } ruc = "1.0" ledger = { path = "../../ledger" } diff --git a/src/components/wasm/Cargo.toml b/src/components/wasm/Cargo.toml index 2fc38bf89..3d48be8fd 100644 --- a/src/components/wasm/Cargo.toml +++ b/src/components/wasm/Cargo.toml @@ -32,10 +32,10 @@ bech32 = "0.7.2" # OR the compiling will fail. getrandom = { version = "0.2", features = ["js"] } -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } ruc = "1.0" -zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } finutils = { path = "../finutils", default-features = false } globutils = { path = "../../libs/globutils" } diff --git a/src/ledger/Cargo.toml b/src/ledger/Cargo.toml index 6acae23ac..fe4193906 100644 --- a/src/ledger/Cargo.toml +++ b/src/ledger/Cargo.toml @@ -30,10 +30,10 @@ fp-types = { path = "../components/contracts/primitives/types" } itertools = "0.8" ruc = "1.0" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -zeiutils = { package = "utils", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +zeiutils = { package = "utils", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } bulletproofs = { package = "bulletproofs", git = "https://github.com/FindoraNetwork/bp", branch = "batch_verification", features = ["yoloproofs"] } fbnc = { version = "0.2.9", default-features = false} @@ -65,7 +65,7 @@ sodiumoxide = "0.2.1" fs2 = "0.4" storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v0.1.4" } sparse_merkle_tree = { path = "../libs/sparse_merkle_tree" } -zei_accumulators = { package = "accumulators", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei_accumulators = { package = "accumulators", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } [target.'cfg(target_arch = "wasm32")'.dependencies] parking_lot = { version = "0.11.1", features = ["wasm-bindgen"] } diff --git a/src/libs/credentials/Cargo.toml b/src/libs/credentials/Cargo.toml index 21ec2395c..890000285 100644 --- a/src/libs/credentials/Cargo.toml +++ b/src/libs/credentials/Cargo.toml @@ -12,4 +12,4 @@ linear-map = {version = "1.2.0", features = ["serde_impl"] } serde = "1.0.124" serde_derive = "1.0" wasm-bindgen = { version = "0.2.50", features = ["serde-serialize"] } -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } diff --git a/src/libs/globutils/Cargo.toml b/src/libs/globutils/Cargo.toml index 581a847f4..2c1e1fb4c 100644 --- a/src/libs/globutils/Cargo.toml +++ b/src/libs/globutils/Cargo.toml @@ -12,9 +12,9 @@ serde_json = "1.0" time = "0.1" rand = "0.8" cryptohash = { path = "../cryptohash" } -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } -zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +crypto = { package = "crypto", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } +zeialgebra = { package = "algebra", git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } hex = "0.4.2" base64 = "0.10" diff --git a/src/libs/sparse_merkle_tree/Cargo.toml b/src/libs/sparse_merkle_tree/Cargo.toml index 811e63001..73d75808e 100644 --- a/src/libs/sparse_merkle_tree/Cargo.toml +++ b/src/libs/sparse_merkle_tree/Cargo.toml @@ -22,7 +22,7 @@ serde = "1.0.124" serde_derive = "1.0" serde_json = "1.0" sha2 = "0.8.0" -zei = { git = "https://github.com/FindoraNetwork/zei", branch = "develop" } +zei = { git = "https://github.com/FindoraNetwork/zei", tag = "v0.1.5" } bls12_381 = "0.2.0" storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v0.1.4" } parking_lot = "0.11.1" \ No newline at end of file