@argonprotocol/testing 1.5.2-dev.9c5eb2c8 → 1.5.2-dev.cdfb6ab4

package/lib/index.cjs

@@ -1309,7 +1309,7 @@ async function waitForExecutionReceipt2(ethereum, transactionHash) {
         [transactionHash]
       );
       if (receipt) {
-        return receipt;
+        return (0, import_viem2.formatTransactionReceipt)(receipt);
       }
     } catch (error) {
       const errorText = error instanceof Error ? [
@@ -1707,7 +1707,6 @@ var EthereumProofE2eHarness = class _EthereumProofE2eHarness {
       }
     });
     this.publicClient = (0, import_viem4.createPublicClient)({
-      chain: this.chain,
       transport: (0, import_viem4.http)(endpoints.executionRpcUrl)
     });
     this.walletClient = (0, import_viem4.createWalletClient)({
@@ -1773,24 +1772,54 @@ var EthereumProofE2eHarness = class _EthereumProofE2eHarness {
       minimumExecutionBlockNumber
     );
   }
-  async proveGatewayActivity(gatewayAddress, throughExecutionBlockNumber) {
-    const payload = await (0, import_mainchain8.buildGatewayActivityProofPayload)(this.mainchainClient, {
+  async proveGatewayActivities(gatewayAddress, throughExecutionBlockNumber) {
+    const argonFinalizedExecutionHeader = await (0, import_mainchain8.getLatestArgonFinalizedExecutionHeader)(
+      this.mainchainClient
+    );
+    const currentGatewayState = await this.mainchainClient.query.crosschainTransfer.gatewayStateBySourceChain("Ethereum");
+    const minimumGatewayActivityNonce = currentGatewayState.isSome ? currentGatewayState.unwrap().gatewayActivityNonce.toBigInt() + 1n : 1n;
+    const collectedLocators = await (0, import_mainchain8.discoverMissingGatewayActivityLocators)({
+      finalizedExecutionBlockNumber: argonFinalizedExecutionHeader.blockNumber,
       executionRpcUrl: this.endpoints.executionRpcUrl,
       gatewayAddress,
-      throughExecutionBlockNumber
+      minimumGatewayActivityNonce
     });
-    if (!payload) {
+    const locators = collectedLocators.filter(
+      (locator) => locator.blockNumber <= throughExecutionBlockNumber
+    );
+    if (locators.length === 0) {
       throw new Error("Expected uncovered gateway activity to prove");
     }
-    const result = await this.submit(
-      this.mainchainClient.tx.crosschainTransfer.proveGatewayActivity(
-        "Ethereum",
-        payload.previousGatewayActivityNonce,
-        payload.proof
-      ),
-      this.proofRelayer
-    );
-    return { payload, result };
+    const executionBlock = await this.publicClient.getBlock({
+      blockNumber: argonFinalizedExecutionHeader.blockNumber
+    });
+    const captures = await (0, import_mainchain8.captureGatewayActivityStorageProofs)({
+      executionRpcUrl: this.endpoints.executionRpcUrl,
+      executionBlock,
+      gatewayAddress,
+      locators
+    });
+    const { payloads } = await (0, import_mainchain8.buildGatewayActivityStorageProofs)(this.mainchainClient, {
+      executionRpcUrl: this.endpoints.executionRpcUrl,
+      gatewayAddress,
+      locators: captures
+    });
+    if (payloads.length === 0) {
+      throw new Error("Expected uncovered gateway activity to prove");
+    }
+    const results = [];
+    for (const payload of payloads) {
+      const result = await this.submit(
+        this.mainchainClient.tx.crosschainTransfer.proveGatewayActivityStorage(
+          "Ethereum",
+          payload.previousGatewayActivityNonce,
+          payload.proof
+        ),
+        this.proofRelayer
+      );
+      results.push(result);
+    }
+    return { payloads, results };
   }
   async configureEthereumRuntime(gateway, mode) {
     const calls = [
@@ -1907,6 +1936,24 @@ var TestMintingGateway = class _TestMintingGateway {
       nonce: permitNonce,
       deadline: permitDeadline
     });
+    const data = (0, import_viem4.encodeFunctionData)({
+      abi: mintingGatewayAbi2,
+      functionName: "startTransferToArgon",
+      args: [
+        this.argonTokenAddress,
+        args.amountRuntimeUnits,
+        args.recipientArgonAddress,
+        permitDeadline,
+        permitSignature.v,
+        permitSignature.r,
+        permitSignature.s
+      ]
+    });
+    const estimatedGas = await this.harness.publicClient.estimateGas({
+      account: args.account,
+      to: this.gatewayAddress,
+      data
+    });
     const transactionHash = await (0, import_viem4.createWalletClient)({
       account: args.account,
       chain: this.harness.chain,
@@ -1915,25 +1962,20 @@ var TestMintingGateway = class _TestMintingGateway {
       account: args.account,
       chain: this.harness.chain,
       to: this.gatewayAddress,
-      data: (0, import_viem4.encodeFunctionData)({
-        abi: mintingGatewayAbi2,
-        functionName: "startTransferToArgon",
-        args: [
-          this.argonTokenAddress,
-          args.amountRuntimeUnits,
-          args.recipientArgonAddress,
-          permitDeadline,
-          permitSignature.v,
-          permitSignature.r,
-          permitSignature.s
-        ]
-      })
+      data,
+      // Estimation may append to this block's locator; mining in a new block creates storage slots.
+      gas: estimatedGas * 2n
     });
-    return waitForExecutionReceipt2(this.harness.ethereum, transactionHash);
+    const receipt = await waitForExecutionReceipt2(this.harness.ethereum, transactionHash);
+    if (receipt.status !== "success") {
+      throw new Error(`Transfer to Argon reverted: ${transactionHash}`);
+    }
+    return receipt;
   }
   async forceUpdateActiveCouncil(replacementCouncil, nextMicrogonsPerArgonot) {
-    return this.harness.publicClient.waitForTransactionReceipt({
-      hash: await this.harness.walletClient.writeContract({
+    return waitForExecutionReceipt2(
+      this.harness.ethereum,
+      await this.harness.walletClient.writeContract({
         account: this.harness.deployer,
         chain: this.harness.chain,
         address: this.gatewayAddress,
@@ -1941,11 +1983,12 @@ var TestMintingGateway = class _TestMintingGateway {
         functionName: "forceUpdateActiveCouncil",
         args: [replacementCouncil, nextMicrogonsPerArgonot]
       })
-    });
+    );
   }
   async relayReadyApprovals(batch, operatorAddress) {
-    return this.harness.publicClient.waitForTransactionReceipt({
-      hash: await this.harness.walletClient.writeContract({
+    return waitForExecutionReceipt2(
+      this.harness.ethereum,
+      await this.harness.walletClient.writeContract({
         account: this.harness.deployer,
         chain: this.harness.chain,
         address: this.gatewayAddress,
@@ -1957,17 +2000,17 @@ var TestMintingGateway = class _TestMintingGateway {
           (0, import_viem4.toHex)((0, import_mainchain8.decodeAddress)(operatorAddress), { size: 32 })
         ]
       })
-    });
+    );
   }
   async argonApprovalsNonce() {
-    return await this.harness.publicClient.readContract({
+    return this.harness.publicClient.readContract({
       address: this.gatewayAddress,
       abi: mintingGatewayAbi2,
       functionName: "argonApprovalsNonce"
     });
   }
   async globalIssuanceCouncil() {
-    return await this.harness.publicClient.readContract({
+    return this.harness.publicClient.readContract({
       address: this.gatewayAddress,
       abi: mintingGatewayAbi2,
       functionName: "globalIssuanceCouncil"
@@ -1982,8 +2025,9 @@ var TestMintingGateway = class _TestMintingGateway {
     });
   }
   async finalizeTransferOut(args) {
-    return this.harness.publicClient.waitForTransactionReceipt({
-      hash: await this.harness.walletClient.writeContract({
+    return waitForExecutionReceipt2(
+      this.harness.ethereum,
+      await this.harness.walletClient.writeContract({
         account: this.harness.deployer,
         chain: this.harness.chain,
         address: this.gatewayAddress,
@@ -2002,10 +2046,10 @@ var TestMintingGateway = class _TestMintingGateway {
           }
         ]
       })
-    });
+    );
   }
   async isFinalizedTransferOut(transferRequest) {
-    return await this.harness.publicClient.readContract({
+    return this.harness.publicClient.readContract({
       address: this.gatewayAddress,
       abi: mintingGatewayAbi2,
       functionName: "finalizedTransferOutOfArgonIds",
@@ -2013,7 +2057,7 @@ var TestMintingGateway = class _TestMintingGateway {
     });
   }
   async argonBalance(address) {
-    return await this.harness.publicClient.readContract({
+    return this.harness.publicClient.readContract({
       address: this.argonTokenAddress,
       abi: argonTokenAbi,
       functionName: "balanceOf",
@@ -2021,14 +2065,15 @@ var TestMintingGateway = class _TestMintingGateway {
     });
   }
   async fundExecutionAccount(address, value) {
-    return this.harness.publicClient.waitForTransactionReceipt({
-      hash: await this.harness.walletClient.sendTransaction({
+    return waitForExecutionReceipt2(
+      this.harness.ethereum,
+      await this.harness.walletClient.sendTransaction({
         account: this.harness.deployer,
         chain: this.harness.chain,
         to: address,
         value
       })
-    });
+    );
   }
 };
 var TestMintingAuthorityActor = class {