test sending memo field from secretdev-1 to secretdev-2

Author: cboh4

Diff for: contracts/cw20-ics20/test/docker-compose.yml

@@ -13,6 +13,7 @@ services:
       # faucet
       - "5000:5000"
     environment:
+      FAST_BLOCKS: "true"
       LOG_LEVEL: "TRACE"
   localsecret-2:
     image: "ghcr.io/scrtlabs/localsecret:v1.14.0"
@@ -27,5 +28,6 @@ services:
       # faucet
       - "5300:5000"
     environment:
+      FAST_BLOCKS: "true"
       CHAINID: "secretdev-2"
       LOG_LEVEL: "TRACE"

Diff for: contracts/cw20-ics20/test/test.ts

@@ -56,7 +56,9 @@ let channelId1 = "";
 let channelId2 = "";
 
 beforeAll(async () => {
-  const linkPromise = createIbcConnection();
+  const link = await createIbcConnection();
+
+  await sleep(300)
 
   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",
@@ -93,7 +95,7 @@ beforeAll(async () => {
       walletAmino,
       walletProto,
       secretjs: new SecretNetworkClient({
-        url: "http://localhost:3317",
+        url: "http://localhost:2317",
         wallet: walletProto,
         walletAddress: walletProto.address,
         chainId: "secretdev-2",
@@ -102,7 +104,7 @@ beforeAll(async () => {
   }
 
   await waitForBlocks("secretdev-1", "http://localhost:1317");
-  await waitForBlocks("secretdev-2", "http://localhost:3317");
+  await waitForBlocks("secretdev-2", "http://localhost:2317");
 
   contracts.snip20.wasm = fs.readFileSync(`${__dirname}/snip20.wasm`) as Uint8Array;
   contracts.ics20.wasm = fs.readFileSync(`${__dirname}/../contract.wasm`) as Uint8Array;
@@ -129,13 +131,17 @@ beforeAll(async () => {
     ],
     { gasLimit: 5_000_000 }
   );
+  await sleep(1000);
   if (tx.code !== TxResultCode.Success) {
     console.error(tx.rawLog);
   }
   expect(tx.code).toBe(TxResultCode.Success);
 
+
   contracts.snip20.codeId = Number(tx.arrayLog.find((x) => x.key === "code_id").value);
+  await sleep(1000);
   contracts.ics20.codeId = Number(tx.arrayLog.reverse().find((x) => x.key === "code_id").value);
+  await sleep(1000);
 
   console.log("Instantiating snip20 on secretdev-1...");
 
@@ -165,6 +171,8 @@ beforeAll(async () => {
     { gasLimit: 300_000 }
   );
 
+  await sleep(1000);
+
   contracts.snip20.address = MsgInstantiateContractResponse.decode(tx.data[0]).address;
   contracts.snip20.ibcPortId = "wasm." + contracts.snip20.address;
 
@@ -196,8 +204,12 @@ beforeAll(async () => {
   contracts.ics20.address = MsgInstantiateContractResponse.decode(tx.data[0]).address;
   contracts.ics20.ibcPortId = "wasm." + contracts.ics20.address;
 
+  await sleep(1000);
+
   console.log("Waiting for IBC connection...");
-  const link = await linkPromise;
+  // const link = await createIbcConnection();
+
+  await sleep(1000);
 
   console.log("Creating IBC channel...");
   const channels = await createIbcChannel(link, contracts.ics20.ibcPortId);
@@ -215,6 +227,7 @@ test(
     // register snip20 on ics20, then send tokens from secretdev-1
     console.log("Sending tokens from secretdev-1...");
 
+    const memo1 = "test memo from secretdev-1";
     let tx = await accounts1[0].secretjs.tx.broadcast(
       [
         new MsgExecuteContract({
@@ -245,7 +258,9 @@ test(
                   })
                 )
               ),
+              memo: memo1,                    
             },
+            // memo: "test2 memo from secretdev-1",                    
           },
         }),
       ],
@@ -258,6 +273,10 @@ test(
     }
     expect(tx.code).toBe(TxResultCode.Success);
 
+    let res = tx.arrayLog.find(element => element.key === 'memo');
+    let receivedMemo = res ? res.value : undefined;
+    expect(receivedMemo).toBe(memo1);
+
     let snip20Balance: any = await accounts1[0].secretjs.query.compute.queryContract({
       contract_address: contracts.snip20.address,
       code_hash: contracts.snip20.code_hash,
@@ -304,7 +323,7 @@ test(
       },
       receiver: accounts1[0].address,
       timeout_timestamp: String(Math.floor(Date.now() / 1000) + 10 * 60) /* 10 minutes */,
-      memo: "memo"
+      memo: "test memo from secretdev-2"
     });
 
     if (tx.code !== TxResultCode.Success) {

Diff for: contracts/cw20-ics20/test/utils.ts

@@ -1,5 +1,7 @@
 import { IbcClient, Link } from "@confio/relayer";
 import { ChannelPair } from "@confio/relayer/build/lib/link";
+import { stringToPath } from "@cosmjs/crypto";
+import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
 import { GasPrice } from "@cosmjs/stargate";
 import { sha256 } from "@noble/hashes/sha256";
 import { SecretNetworkClient, toHex, toUtf8, Wallet } from "secretjs";
@@ -106,47 +108,53 @@ export async function waitForIBCChannel(chainId: string, url: string, channelId:
 export async function createIbcConnection(): Promise<Link> {
   // Create signers as LocalSecret account d
   // (Both sides are localsecret so same account can be used on both sides)
-  const signerA = new Wallet(
-    "word twist toast cloth movie predict advance crumble escape whale sail such angry muffin balcony keen move employ cook valve hurt glimpse breeze brick"
+  const signerA = await DirectSecp256k1HdWallet.fromMnemonic(
+    "word twist toast cloth movie predict advance crumble escape whale sail such angry muffin balcony keen move employ cook valve hurt glimpse breeze brick", // account d
+    { hdPaths: [stringToPath("m/44'/529'/0'/0/0")], prefix: "secret" },
   );
+  const [account] = await signerA.getAccounts();
   const signerB = signerA;
 
   // Create IBC Client for chain A
   const clientA = await IbcClient.connectWithSigner(
     chain1RPC,
     signerA,
-    signerA.address, 
+    account.address, 
   {
     gasPrice: GasPrice.fromString("0.25uscrt"),
     estimatedBlockTime: 750,
     estimatedIndexerTime: 500,
   });
-  // console.group("IBC client for chain A");
+  console.group("IBC client for chain A");
   // console.log(JSON.stringify(clientA));
   // console.groupEnd();
+  await sleep(2000);
 
   // Create IBC Client for chain A
   const clientB = await IbcClient.connectWithSigner(
   chain2RPC, 
   signerB,
-  signerB.address, 
+  account.address, 
   {
     gasPrice: GasPrice.fromString("0.25uscrt"),
     estimatedBlockTime: 750,
     estimatedIndexerTime: 500,
   });
   console.group("IBC client for chain B");
+  await sleep(2000);
   // console.log(JSON.stringify(clientB));
   // console.groupEnd();
 
   // Create new connectiosn for the 2 clients
-  console.log("clientA:", clientA);
-  console.log("clientB:", clientB);
+  // econsole.log("clientA:", clientA);
+  // console.log("clientB:", clientB);
   const link = await Link.createWithNewConnections(clientA, clientB);
 
-  console.group("IBC link details");
-  console.log(JSON.stringify(link));
-  console.groupEnd();
+  await sleep(1000);
+
+  // console.group("IBC link details");
+  // console.log(JSON.stringify(link));
+  // console.groupEnd();
 
   return link;
 }