Factory update: Agoric validation, nonce tracking, no payload/gas

.github/workflows/agoric-integration.yml

@@ -52,13 +52,6 @@ jobs:
 
       - name: Make offer for creating EVM Smart Wallet
         run: ./integration/scripts/make-account.mjs
-        env:
-          makeAccount: true
 
       - name: Relay data from EVM chain
-        run: |
-          npm run relay:cosmos &
-          sleep 150
-
-      - name: Get EVM Smart wallet address
-        run: ./integration/scripts/make-account.mjs
+        run: npm run relay:cosmos

integration/scripts/make-account.mjs

@@ -1,105 +1,31 @@
 #!/usr/bin/env node
 // @ts-check
 import "./lockdown.mjs";
-import {
-  fetchFromVStorage,
-  poll,
-  prepareOffer,
-  processWalletOffer,
-  validateEvmAddress,
-} from "./utils.mjs";
+import { prepareOffer, processWalletOffer } from "./utils.mjs";
 
 const OFFER_FILE = "offer.json";
 const CONTAINER_PATH = `/usr/src/${OFFER_FILE}`;
 const FROM_ADDRESS = "agoric1rwwley550k9mmk6uq6mm6z4udrg8kyuyvfszjk";
-const vStorageUrl = `http://localhost/agoric-lcd/agoric/vstorage/data/published.wallet.${FROM_ADDRESS}`;
-const { makeAccount } = process.env;
 const { log, error } = console;
 
 try {
-  if (makeAccount) {
-    log("--- Creating and Monitoring LCA ---");
-
-    log("Preparing offer...");
-    const offer = await prepareOffer({
-      publicInvitationMaker: "createAndMonitorLCA",
-      instanceName: "axelarGmp",
-      brandName: "BLD",
-      amount: 1n,
-      source: "contract",
-      offerArgs: {
-        gasAmount: 0n,
-      },
-    });
-
-    await processWalletOffer({
-      offer,
-      OFFER_FILE,
-      CONTAINER_PATH,
-      FROM_ADDRESS,
-    });
-  } else {
-    log("--- Getting EVM Smart Wallet Address ---");
-
-    const methodName = "getRemoteAddress";
-    const invitationArgs = harden([methodName, []]);
-
-    log(`Fetching previous offer from ${vStorageUrl}.current`);
-    const { offerToUsedInvitation } = await fetchFromVStorage(
-      `${vStorageUrl}.current`,
-    );
-    const previousOffer = offerToUsedInvitation[0][0];
-    log(`Previous offer found: ${JSON.stringify(previousOffer)}`);
-
-    log("Preparing offer...");
-    const offer = await prepareOffer({
-      invitationMakerName: "makeEVMTransactionInvitation",
-      instanceName: "axelarGmp",
-      emptyProposal: true,
-      source: "continuing",
-      invitationArgs,
-      previousOffer,
-    });
-
-    await processWalletOffer({
-      offer,
-      OFFER_FILE,
-      CONTAINER_PATH,
-      FROM_ADDRESS,
-    });
-
-    const pollIntervalMs = 5000; // 5 seconds
-    const maxWaitMs = 2 * 60 * 1000; // 2 minutes
-    const valid = await poll({
-      checkFn: async () => {
-        log(`Fetching offer result from ${vStorageUrl}`);
-        const offerData = await fetchFromVStorage(vStorageUrl);
-        log(`Offer data received: ${JSON.stringify(offerData)}`);
-
-        let smartWalletAddress;
-        try {
-          smartWalletAddress = offerData?.status?.result;
-        } catch (err) {
-          log("Failed to parse offerData.status.result as JSON:", err);
-        }
-
-        log(`Validating smart wallet address: ${smartWalletAddress}`);
-        validateEvmAddress(smartWalletAddress);
-
-        log(`Smart wallet address: ${smartWalletAddress}`);
-        return true;
-      },
-      pollIntervalMs,
-      maxWaitMs,
-    });
-
-    if (valid) {
-      console.log(`✅ Test passed`);
-    } else {
-      console.error(`❌ Test failed`);
-      process.exit(1);
-    }
-  }
+  log("--- Creating and Monitoring LCA ---");
+
+  log("Preparing offer...");
+  const offer = await prepareOffer({
+    publicInvitationMaker: "createAndMonitorLCA",
+    instanceName: "axelarGmp",
+    brandName: "BLD",
+    amount: 1n,
+    source: "contract",
+  });
+
+  await processWalletOffer({
+    offer,
+    OFFER_FILE,
+    CONTAINER_PATH,
+    FROM_ADDRESS,
+  });
 } catch (err) {
   error("ERROR:", err.shortMessage || err.message);
   process.exit(1);

integration/scripts/setup-gmp.mjs

@@ -7,7 +7,7 @@ const { log } = console;
 
 const SDK_REPO = "https://github.com/Agoric/agoric-sdk.git";
 const SDK_DIR = "/usr/src/agoric-sdk-cp";
-const BRANCH_NAME = "master";
+const BRANCH_NAME = "rs-use-nonce-in-axelar-gmp-contract";
 const PLAN_FILE_DIR = "/usr/src/upgrade-test-scripts";
 const vbankAssetUrl =
   "http://localhost/agoric-lcd/agoric/vstorage/data/published.agoricNames.vbankAsset";

packages/axelar-local-dev-cosmos/src/__tests__/Factory.spec.ts

@@ -32,7 +32,7 @@ describe("Factory", () => {
   const abiCoder = new ethers.AbiCoder();
   const expectedWalletAddress = "0x856e4424f806D16E8CBC702B3c0F2ede5468eae5";
 
-  const sourceContract = "agoric";
+  const sourceChain = "agoric";
   const sourceAddress = "0x1234567890123456789012345678901234567890";
 
   let commandIdCounter = 1;
@@ -75,7 +75,6 @@ describe("Factory", () => {
     factory = await Contract.deploy(
       axelarGatewayMock.target,
       axelarGasServiceMock.target,
-      "Ethereum",
     );
     await factory.waitForDeployment();
 
@@ -93,7 +92,7 @@ describe("Factory", () => {
     });
   });
 
-  it("fund Factory with ETH to pay for gas", async () => {
+  it("fund Factory with ETH", async () => {
     const provider = ethers.provider;
 
     const factoryAddress = await factory.getAddress();
@@ -116,7 +115,7 @@ describe("Factory", () => {
           return null;
         }
       })
-      .find((parsed) => parsed && parsed.name === "Received");
+      .find((parsed) => parsed && parsed.name === "TokensReceived");
 
     expect(receivedEvent).to.not.be.undefined;
     expect(receivedEvent?.args.sender).to.equal(owner.address);
@@ -129,12 +128,13 @@ describe("Factory", () => {
   it("should create a new remote wallet using Factory", async () => {
     const commandId = getCommandId();
 
-    const payload = abiCoder.encode(["uint256"], [50000]);
+    const nonce = 1;
+    const payload = abiCoder.encode(["uint256"], [nonce]);
     const payloadHash = keccak256(toBytes(payload));
 
     await approveMessage({
       commandId,
-      from: sourceContract,
+      from: sourceChain,
       sourceAddress,
       targetAddress: factory.target,
       payload: payloadHash,
@@ -145,15 +145,64 @@ describe("Factory", () => {
 
     const tx = await factory.execute(
       commandId,
-      sourceContract,
+      sourceChain,
       sourceAddress,
       payload,
     );
 
     await expect(tx)
-      .to.emit(factory, "SmartWalletCreated")
-      .withArgs(expectedWalletAddress, sourceAddress, "agoric", sourceAddress);
-    await expect(tx).to.emit(factory, "CrossChainCallSent");
+      .to.emit(factory, "NewWalletCreated")
+      .withArgs(expectedWalletAddress, nonce, sourceAddress, "agoric");
+  });
+
+  it("should revert if nonce is reused", async () => {
+    const commandId = getCommandId();
+
+    const nonce = 1;
+    const payload = abiCoder.encode(["uint256"], [nonce]);
+    const payloadHash = keccak256(toBytes(payload));
+
+    await approveMessage({
+      commandId,
+      from: sourceChain,
+      sourceAddress,
+      targetAddress: factory.target,
+      payload: payloadHash,
+      owner,
+      AxelarGateway: axelarGatewayMock,
+      abiCoder,
+    });
+
+    await expect(
+      factory.execute(commandId, sourceChain, sourceAddress, payload),
+    ).to.be.revertedWith("nonce already used by sender");
+  });
+
+  it("should revert if message comes from a chain besides agoric", async () => {
+    const commandId = getCommandId();
+    const unsupportedSourceChain = "ethereum";
+    const payload = abiCoder.encode(["uint256"], [2]);
+    const payloadHash = keccak256(toBytes(payload));
+
+    await approveMessage({
+      commandId,
+      from: unsupportedSourceChain,
+      sourceAddress,
+      targetAddress: factory.target,
+      payload: payloadHash,
+      owner,
+      AxelarGateway: axelarGatewayMock,
+      abiCoder,
+    });
+
+    await expect(
+      factory.execute(
+        commandId,
+        unsupportedSourceChain,
+        sourceAddress,
+        payload,
+      ),
+    ).to.be.revertedWith("Only messages from Agoric chain are allowed");
   });
 
   it("should use the remote wallet to call other contracts", async () => {
@@ -188,7 +237,7 @@ describe("Factory", () => {
     const commandId1 = getCommandId();
     await approveMessage({
       commandId: commandId1,
-      from: sourceContract,
+      from: sourceChain,
       sourceAddress,
       targetAddress: wallet.target,
       payload: payloadHash,
@@ -199,7 +248,7 @@ describe("Factory", () => {
 
     const execTx = await wallet.execute(
       commandId1,
-      sourceContract,
+      sourceChain,
       sourceAddress,
       multicallPayload,
     );
@@ -222,7 +271,7 @@ describe("Factory", () => {
     const commandId2 = getCommandId();
     await approveMessageWithToken({
       commandId: commandId2,
-      from: sourceContract,
+      from: sourceChain,
       sourceAddress,
       targetAddress: wallet.target,
       payload: payloadHash2,
@@ -235,7 +284,7 @@ describe("Factory", () => {
 
     const execWithTokenTx = await wallet.executeWithToken(
       commandId2,
-      sourceContract,
+      sourceChain,
       sourceAddress,
       multicallPayload2,
       "USDC",