Fix Msgs

strangelove-ventures · Oct 3, 2024 · 608a6dd · 608a6dd
1 parent 30fd6c2
commit 608a6dd
Showing 1 changed file with 67 additions and 61 deletions.
diff --git a/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts b/wormchain/contracts/tools/__tests__/test_ntt_accountant.ts
@@ -281,21 +281,23 @@ const makeVAA = (
 
 const submitVAA = async (vaa: VAA<Other>) => {
   const msg = client.wasm.msgExecuteContract({
-    sender: signer,
-    contract: NTT_GA_ADDRESS,
-    msg: toUtf8(
-      JSON.stringify({
-        submit_vaas: {
-          vaas: [
-            Buffer.from(
-              serialiseVAA(vaa as unknown as VAA<Payload>),
-              "hex"
-            ).toString("base64"),
-          ],
-        },
-      })
-    ),
-    funds: [],
+    value: {
+      sender: signer,
+      contract: NTT_GA_ADDRESS,
+      msg: toUtf8(
+        JSON.stringify({
+          submit_vaas: {
+            vaas: [
+              Buffer.from(
+                serialiseVAA(vaa as unknown as VAA<Payload>),
+                "hex"
+              ).toString("base64"),
+            ],
+          },
+        })
+      ),
+      funds: [],
+    },
   });
   const result = await client.signAndBroadcast(signer, [msg], {
     ...ZERO_FEE,
@@ -1023,11 +1025,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_events_received <=
-            beforeMetrics.global_accountant_events_received ||
+          beforeMetrics.global_accountant_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_transfer_vaas_submitted_and_approved <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
+          beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
       );
       const transferStatus = await fetchGlobalAccountantTransferStatus(
         HUB_CHAIN,
@@ -1059,16 +1061,18 @@ describe("NTT Global Accountant Tests", () => {
       // check replay protection
       {
         const msg = client.wasm.msgExecuteContract({
-          sender: signer,
-          contract: NTT_GA_ADDRESS,
-          msg: toUtf8(
-            JSON.stringify({
-              submit_vaas: {
-                vaas: [Buffer.from(signedVAA).toString("base64")],
-              },
-            })
-          ),
-          funds: [],
+          value: {
+            sender: signer,
+            contract: NTT_GA_ADDRESS,
+            msg: toUtf8(
+              JSON.stringify({
+                submit_vaas: {
+                  vaas: [Buffer.from(signedVAA).toString("base64")],
+                },
+              })
+            ),
+            funds: [],
+          },
         });
         const result = await client.signAndBroadcast(signer, [msg], {
           ...ZERO_FEE,
@@ -1098,11 +1102,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_total_balance_errors <=
-            beforeMetrics.global_accountant_total_balance_errors
+          beforeMetrics.global_accountant_total_balance_errors
       );
       // the transfer should fail, because there's an insufficient source balance
       if (VAA_SIGNERS.length > 1) {
@@ -1165,11 +1169,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_events_received <=
-            beforeMetrics.global_accountant_events_received ||
+          beforeMetrics.global_accountant_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_transfer_vaas_submitted_and_approved <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
+          beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
       );
       const transferStatus = await fetchGlobalAccountantTransferStatus(
         SPOKE_CHAIN_A,
@@ -1241,11 +1245,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_events_received <=
-            beforeMetrics.global_accountant_events_received ||
+          beforeMetrics.global_accountant_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_transfer_vaas_submitted_and_approved <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
+          beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
       );
       const transferStatus = await fetchGlobalAccountantTransferStatus(
         SPOKE_CHAIN_A,
@@ -1297,9 +1301,9 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted
+          beforeMetrics.global_accountant_transfer_vaas_submitted
       );
       // the transfer should fail, because there's an insufficient source balance
       await expect(
@@ -1340,9 +1344,9 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted
+          beforeMetrics.global_accountant_transfer_vaas_submitted
       );
       // the transfer should fail, because there's an insufficient source balance
       await expect(
@@ -1383,9 +1387,9 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted
+          beforeMetrics.global_accountant_transfer_vaas_submitted
       );
       // the transfer should fail, because there's an insufficient source balance
       await expect(
@@ -1416,9 +1420,9 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted
+          beforeMetrics.global_accountant_transfer_vaas_submitted
       );
       // the transfer should fail, because there's an insufficient source balance
       await expect(
@@ -1450,11 +1454,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_error_events_received <=
-            beforeMetrics.global_accountant_error_events_received ||
+          beforeMetrics.global_accountant_error_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_total_balance_errors <=
-            beforeMetrics.global_accountant_total_balance_errors
+          beforeMetrics.global_accountant_total_balance_errors
       );
       // the transfer should fail, because there's an insufficient source balance
       if (VAA_SIGNERS.length > 1) {
@@ -1529,11 +1533,11 @@ describe("NTT Global Accountant Tests", () => {
       await waitForMetricsChange(
         (afterMetrics) =>
           afterMetrics.global_accountant_events_received <=
-            beforeMetrics.global_accountant_events_received ||
+          beforeMetrics.global_accountant_events_received ||
           afterMetrics.global_accountant_transfer_vaas_submitted <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted ||
+          beforeMetrics.global_accountant_transfer_vaas_submitted ||
           afterMetrics.global_accountant_transfer_vaas_submitted_and_approved <=
-            beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
+          beforeMetrics.global_accountant_transfer_vaas_submitted_and_approved
       );
       const transferStatus = await fetchGlobalAccountantTransferStatus(
         HUB_CHAIN,
@@ -1565,16 +1569,18 @@ describe("NTT Global Accountant Tests", () => {
       // check replay protection
       {
         const msg = client.wasm.msgExecuteContract({
-          sender: signer,
-          contract: NTT_GA_ADDRESS,
-          msg: toUtf8(
-            JSON.stringify({
-              submit_vaas: {
-                vaas: [Buffer.from(signedVAA).toString("base64")],
-              },
-            })
-          ),
-          funds: [],
+          value: {
+            sender: signer,
+            contract: NTT_GA_ADDRESS,
+            msg: toUtf8(
+              JSON.stringify({
+                submit_vaas: {
+                  vaas: [Buffer.from(signedVAA).toString("base64")],
+                },
+              })
+            ),
+            funds: [],
+          },
         });
         const result = await client.signAndBroadcast(signer, [msg], {
           ...ZERO_FEE,