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

package/lib/index.d.cts

@@ -2,7 +2,7 @@ import * as _argonprotocol_mainchain from '@argonprotocol/mainchain';
 import { KeyringPair, ArgonClient, GenericEvent, SubmittableExtrinsic, EthereumReceipt, EthereumBeaconHeaderDetailsResponse, EthereumBeaconBlockResponse, EvmContracts, IArgonQueryable } from '@argonprotocol/mainchain';
 import { Client } from 'pg';
 import * as viem from 'viem';
-import { Hex, createWalletClient, defineChain, Address, ContractFunctionArgs } from 'viem';
+import { Hex, createWalletClient, defineChain, Address, ContractFunctionArgs, createPublicClient } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import * as _polkadot_types_codec from '@polkadot/types-codec';
 
@@ -218,7 +218,7 @@ declare function waitForFinalizedBeaconExecutionAtOrAbove(ethereum: TestEthereum
     block: EthereumBeaconBlockResponse;
 }>;
 declare function mineLaterExecutionAnchorReceipt(walletClient: Pick<ReturnType<typeof createWalletClient>, 'sendTransaction'>, chain: ReturnType<typeof defineChain>, ethereum: TestEthereum, account: ReturnType<typeof privateKeyToAccount>, minimumBlockNumber: bigint): Promise<viem.TransactionReceipt>;
-declare function waitForExecutionReceipt(ethereum: TestEthereum, transactionHash: Hex): Promise<EthereumReceipt>;
+declare function waitForExecutionReceipt(ethereum: Pick<TestEthereum, 'callExecution'>, transactionHash: Hex): Promise<EthereumReceipt>;
 declare function syncEthereumVerifierUntilAnchorCovers(mainchainClient: ArgonClient, relayer: KeyringPair, beaconApiUrl: string, minimumExecutionBlockNumber: bigint): Promise<void>;
 declare function toArgonKeccakSignature(signature: Hex): Hex;
 declare function toEvmRecoverableSignature(signature: Hex): Hex;
@@ -248,20 +248,7 @@ declare function getReadyEthereumGatewayUpdates(client: IArgonQueryable, gateway
 
 type DeployerAccount = ReturnType<typeof privateKeyToAccount>;
 type EthereumChain = ReturnType<typeof defineChain>;
-type EthereumPublicClient = {
-    getBalance: (args: {
-        address: Hex;
-    }) => Promise<bigint>;
-    getBlock: (...args: any[]) => Promise<any>;
-    getBlockNumber: () => Promise<bigint>;
-    readContract: (...args: any[]) => Promise<unknown>;
-    waitForTransactionReceipt: (args: {
-        hash: Hex;
-    }) => Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
-};
+type EthereumPublicClient = Pick<ReturnType<typeof createPublicClient>, 'getBalance' | 'getBlock' | 'getBlockNumber' | 'readContract' | 'estimateGas'>;
 type EthereumWalletClient = {
     sendTransaction: (...args: any[]) => Promise<Hex>;
     writeContract: (...args: any[]) => Promise<Hex>;
@@ -302,9 +289,9 @@ declare class EthereumProofE2eHarness {
     submit(tx: SubmittableExtrinsic, signer: KeyringPair): Promise<TestTxResult>;
     sudoSubmit(tx: SubmittableExtrinsic): Promise<TestTxResult>;
     syncVerifierThrough(minimumExecutionBlockNumber: bigint): Promise<void>;
-    proveGatewayActivity(gatewayAddress: Hex, throughExecutionBlockNumber: bigint): Promise<{
-        payload: _argonprotocol_mainchain.EthereumGatewayActivityProofPayload;
-        result: TestTxResult;
+    proveGatewayActivities(gatewayAddress: Hex, throughExecutionBlockNumber: bigint): Promise<{
+        payloads: _argonprotocol_mainchain.EthereumGatewayActivityStorageProofPayload[];
+        results: TestTxResult[];
     }>;
     configureEthereumRuntime(gateway: TestMintingGateway, mode: RuntimeSetupMode): Promise<{
         result: TestTxResult;
@@ -331,16 +318,10 @@ declare class TestMintingGateway {
     forceUpdateActiveCouncil(replacementCouncil: {
         signers: Hex[];
         weights: bigint[];
-    }, nextMicrogonsPerArgonot: bigint): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
-    relayReadyApprovals(batch: Awaited<ReturnType<typeof getReadyEthereumGatewayUpdates>>, operatorAddress: string): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    }, nextMicrogonsPerArgonot: bigint): Promise<viem.TransactionReceipt>;
+    relayReadyApprovals(batch: Awaited<ReturnType<typeof getReadyEthereumGatewayUpdates>>, operatorAddress: string): Promise<viem.TransactionReceipt>;
     argonApprovalsNonce(): Promise<bigint>;
-    globalIssuanceCouncil(): Promise<[Hex[], bigint[], Hex]>;
+    globalIssuanceCouncil(): Promise<readonly [bigint, bigint, `0x${string}`, bigint]>;
     authorityCollateral(signingKey: Hex): Promise<[bigint, bigint]>;
     finalizeTransferOut(args: {
         transferRequest: {
@@ -356,16 +337,10 @@ declare class TestMintingGateway {
         };
         collateralizationSignature: Hex;
         micronotCollateral: bigint;
-    }): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    }): Promise<viem.TransactionReceipt>;
     isFinalizedTransferOut(transferRequest: Parameters<typeof EvmContracts.hashMintingGatewayTransferOutOfArgonRequest>[0]): Promise<boolean>;
     argonBalance(address: Hex): Promise<bigint>;
-    fundExecutionAccount(address: Hex, value: bigint): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    fundExecutionAccount(address: Hex, value: bigint): Promise<viem.TransactionReceipt>;
 }
 declare class TestMintingAuthorityActor {
     readonly harness: EthereumProofE2eHarness;

package/lib/index.d.ts

@@ -2,7 +2,7 @@ import * as _argonprotocol_mainchain from '@argonprotocol/mainchain';
 import { KeyringPair, ArgonClient, GenericEvent, SubmittableExtrinsic, EthereumReceipt, EthereumBeaconHeaderDetailsResponse, EthereumBeaconBlockResponse, EvmContracts, IArgonQueryable } from '@argonprotocol/mainchain';
 import { Client } from 'pg';
 import * as viem from 'viem';
-import { Hex, createWalletClient, defineChain, Address, ContractFunctionArgs } from 'viem';
+import { Hex, createWalletClient, defineChain, Address, ContractFunctionArgs, createPublicClient } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import * as _polkadot_types_codec from '@polkadot/types-codec';
 
@@ -218,7 +218,7 @@ declare function waitForFinalizedBeaconExecutionAtOrAbove(ethereum: TestEthereum
     block: EthereumBeaconBlockResponse;
 }>;
 declare function mineLaterExecutionAnchorReceipt(walletClient: Pick<ReturnType<typeof createWalletClient>, 'sendTransaction'>, chain: ReturnType<typeof defineChain>, ethereum: TestEthereum, account: ReturnType<typeof privateKeyToAccount>, minimumBlockNumber: bigint): Promise<viem.TransactionReceipt>;
-declare function waitForExecutionReceipt(ethereum: TestEthereum, transactionHash: Hex): Promise<EthereumReceipt>;
+declare function waitForExecutionReceipt(ethereum: Pick<TestEthereum, 'callExecution'>, transactionHash: Hex): Promise<EthereumReceipt>;
 declare function syncEthereumVerifierUntilAnchorCovers(mainchainClient: ArgonClient, relayer: KeyringPair, beaconApiUrl: string, minimumExecutionBlockNumber: bigint): Promise<void>;
 declare function toArgonKeccakSignature(signature: Hex): Hex;
 declare function toEvmRecoverableSignature(signature: Hex): Hex;
@@ -248,20 +248,7 @@ declare function getReadyEthereumGatewayUpdates(client: IArgonQueryable, gateway
 
 type DeployerAccount = ReturnType<typeof privateKeyToAccount>;
 type EthereumChain = ReturnType<typeof defineChain>;
-type EthereumPublicClient = {
-    getBalance: (args: {
-        address: Hex;
-    }) => Promise<bigint>;
-    getBlock: (...args: any[]) => Promise<any>;
-    getBlockNumber: () => Promise<bigint>;
-    readContract: (...args: any[]) => Promise<unknown>;
-    waitForTransactionReceipt: (args: {
-        hash: Hex;
-    }) => Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
-};
+type EthereumPublicClient = Pick<ReturnType<typeof createPublicClient>, 'getBalance' | 'getBlock' | 'getBlockNumber' | 'readContract' | 'estimateGas'>;
 type EthereumWalletClient = {
     sendTransaction: (...args: any[]) => Promise<Hex>;
     writeContract: (...args: any[]) => Promise<Hex>;
@@ -302,9 +289,9 @@ declare class EthereumProofE2eHarness {
     submit(tx: SubmittableExtrinsic, signer: KeyringPair): Promise<TestTxResult>;
     sudoSubmit(tx: SubmittableExtrinsic): Promise<TestTxResult>;
     syncVerifierThrough(minimumExecutionBlockNumber: bigint): Promise<void>;
-    proveGatewayActivity(gatewayAddress: Hex, throughExecutionBlockNumber: bigint): Promise<{
-        payload: _argonprotocol_mainchain.EthereumGatewayActivityProofPayload;
-        result: TestTxResult;
+    proveGatewayActivities(gatewayAddress: Hex, throughExecutionBlockNumber: bigint): Promise<{
+        payloads: _argonprotocol_mainchain.EthereumGatewayActivityStorageProofPayload[];
+        results: TestTxResult[];
     }>;
     configureEthereumRuntime(gateway: TestMintingGateway, mode: RuntimeSetupMode): Promise<{
         result: TestTxResult;
@@ -331,16 +318,10 @@ declare class TestMintingGateway {
     forceUpdateActiveCouncil(replacementCouncil: {
         signers: Hex[];
         weights: bigint[];
-    }, nextMicrogonsPerArgonot: bigint): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
-    relayReadyApprovals(batch: Awaited<ReturnType<typeof getReadyEthereumGatewayUpdates>>, operatorAddress: string): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    }, nextMicrogonsPerArgonot: bigint): Promise<viem.TransactionReceipt>;
+    relayReadyApprovals(batch: Awaited<ReturnType<typeof getReadyEthereumGatewayUpdates>>, operatorAddress: string): Promise<viem.TransactionReceipt>;
     argonApprovalsNonce(): Promise<bigint>;
-    globalIssuanceCouncil(): Promise<[Hex[], bigint[], Hex]>;
+    globalIssuanceCouncil(): Promise<readonly [bigint, bigint, `0x${string}`, bigint]>;
     authorityCollateral(signingKey: Hex): Promise<[bigint, bigint]>;
     finalizeTransferOut(args: {
         transferRequest: {
@@ -356,16 +337,10 @@ declare class TestMintingGateway {
         };
         collateralizationSignature: Hex;
         micronotCollateral: bigint;
-    }): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    }): Promise<viem.TransactionReceipt>;
     isFinalizedTransferOut(transferRequest: Parameters<typeof EvmContracts.hashMintingGatewayTransferOutOfArgonRequest>[0]): Promise<boolean>;
     argonBalance(address: Hex): Promise<bigint>;
-    fundExecutionAccount(address: Hex, value: bigint): Promise<{
-        status: string;
-        blockNumber: bigint;
-    }>;
+    fundExecutionAccount(address: Hex, value: bigint): Promise<viem.TransactionReceipt>;
 }
 declare class TestMintingAuthorityActor {
     readonly harness: EthereumProofE2eHarness;

package/lib/index.js

@@ -1173,7 +1173,7 @@ import {
   isOutdatedTransactionError,
   u8aToHex
 } from "@argonprotocol/mainchain";
-import { parseSignature } from "viem";
+import { formatTransactionReceipt, parseSignature } from "viem";
 async function signGatewayPermit(args) {
   const signature = parseSignature(
     await args.account.signTypedData({
@@ -1268,7 +1268,7 @@ async function waitForExecutionReceipt2(ethereum, transactionHash) {
         [transactionHash]
       );
       if (receipt) {
-        return receipt;
+        return formatTransactionReceipt(receipt);
       }
     } catch (error) {
       const errorText = error instanceof Error ? [
@@ -1642,11 +1642,14 @@ function toHexValue(value) {
 
 // src/TestEthereumProofActors.ts
 import {
-  buildGatewayActivityProofPayload,
+  buildGatewayActivityStorageProofs,
+  captureGatewayActivityStorageProofs,
+  discoverMissingGatewayActivityLocators,
   decodeAddress,
   dispatchErrorToString,
   EvmContracts as EvmContracts3,
   FIXED_U128_DECIMALS,
+  getLatestArgonFinalizedExecutionHeader as getLatestArgonFinalizedExecutionHeader2,
   getEthereumBeaconSyncBootstrapTx,
   hexToU8a as hexToU8a2,
   Keyring as Keyring3,
@@ -1688,7 +1691,6 @@ var EthereumProofE2eHarness = class _EthereumProofE2eHarness {
       }
     });
     this.publicClient = createPublicClient2({
-      chain: this.chain,
       transport: http3(endpoints.executionRpcUrl)
     });
     this.walletClient = createWalletClient3({
@@ -1754,24 +1756,54 @@ var EthereumProofE2eHarness = class _EthereumProofE2eHarness {
       minimumExecutionBlockNumber
     );
   }
-  async proveGatewayActivity(gatewayAddress, throughExecutionBlockNumber) {
-    const payload = await buildGatewayActivityProofPayload(this.mainchainClient, {
+  async proveGatewayActivities(gatewayAddress, throughExecutionBlockNumber) {
+    const argonFinalizedExecutionHeader = await getLatestArgonFinalizedExecutionHeader2(
+      this.mainchainClient
+    );
+    const currentGatewayState = await this.mainchainClient.query.crosschainTransfer.gatewayStateBySourceChain("Ethereum");
+    const minimumGatewayActivityNonce = currentGatewayState.isSome ? currentGatewayState.unwrap().gatewayActivityNonce.toBigInt() + 1n : 1n;
+    const collectedLocators = await 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 captureGatewayActivityStorageProofs({
+      executionRpcUrl: this.endpoints.executionRpcUrl,
+      executionBlock,
+      gatewayAddress,
+      locators
+    });
+    const { payloads } = await 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 = [
@@ -1888,6 +1920,24 @@ var TestMintingGateway = class _TestMintingGateway {
       nonce: permitNonce,
       deadline: permitDeadline
     });
+    const data = encodeFunctionData2({
+      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 createWalletClient3({
       account: args.account,
       chain: this.harness.chain,
@@ -1896,25 +1946,20 @@ var TestMintingGateway = class _TestMintingGateway {
       account: args.account,
       chain: this.harness.chain,
       to: this.gatewayAddress,
-      data: encodeFunctionData2({
-        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,
@@ -1922,11 +1967,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,
@@ -1938,17 +1984,17 @@ var TestMintingGateway = class _TestMintingGateway {
           toHex(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"
@@ -1963,8 +2009,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,
@@ -1983,10 +2030,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",
@@ -1994,7 +2041,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",
@@ -2002,14 +2049,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 {