@hyperlane-xyz/sdk 41.3.1 → 43.0.0

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js

@@ -1,3 +1,4 @@
+import { generateTypedData } from '@safe-global/protocol-kit';
 import { assert, retryAsync, rootLogger } from '@hyperlane-xyz/utils';
 import { SAFE_API_BASE_RETRY_MS, SAFE_API_RETRIES, canProposeSafeTransactions, getSafe, getSafeService, } from '../../../../utils/gnosisSafe.js';
 import { TxSubmitterType } from '../TxSubmitterTypes.js';
@@ -29,11 +30,7 @@ export class EV5GnosisSafeTxSubmitter {
         const signerAddress = await signer.getAddress();
         const authorized = await canProposeSafeTransactions(signerAddress, chain, multiProvider, safeAddress);
         assert(authorized, `Signer ${signerAddress} is not an authorized Safe Proposer for ${safeAddress}`);
-        const safeSignerKey = 'privateKey' in signer
-            ? signer.privateKey
-            : undefined;
-        assert(safeSignerKey, 'Signer must have a private key to propose Safe transactions');
-        const { safe, safeService } = await EV5GnosisSafeTxSubmitter.initSafeAndService(chain, multiProvider, safeAddress, safeSignerKey);
+        const { safe, safeService } = await EV5GnosisSafeTxSubmitter.initSafeAndService(chain, multiProvider, safeAddress);
         return new EV5GnosisSafeTxSubmitter(multiProvider, props, safe, safeService);
     }
     async getNextNonce() {
@@ -67,8 +64,8 @@ export class EV5GnosisSafeTxSubmitter {
     async proposeSafeTransaction(safeTransaction) {
         const safeTxHash = await this.safe.getTransactionHash(safeTransaction);
         const senderAddress = await this.multiProvider.getSignerAddress(this.props.chain);
-        const safeSignature = await this.safe.signTypedData(safeTransaction);
-        const senderSignature = safeSignature.data;
+        const signer = this.multiProvider.getSigner(this.props.chain);
+        const senderSignature = await signSafeTransactionWithSigner(this.safe, safeTransaction, signer);
         this.logger.info(`Submitting transaction proposal to ${this.props.safeAddress} on ${this.props.chain}: ${safeTxHash}`);
         return retryAsync(() => this.safeService.proposeTransaction({
             safeAddress: this.props.safeAddress,
@@ -79,4 +76,15 @@ export class EV5GnosisSafeTxSubmitter {
         }), SAFE_API_RETRIES, SAFE_API_BASE_RETRY_MS);
     }
 }
+export async function signSafeTransactionWithSigner(safe, safeTransaction, signer) {
+    assert('_signTypedData' in signer && typeof signer._signTypedData === 'function', 'Signer must support EIP-712 typed-data signing to propose Safe transactions');
+    const typedData = generateTypedData({
+        safeAddress: await safe.getAddress(),
+        safeVersion: safe.getContractVersion(),
+        chainId: await safe.getChainId(),
+        data: safeTransaction.data,
+    });
+    assert(typedData.primaryType === 'SafeTx', 'Expected Safe transaction typed data');
+    return signer._signTypedData(typedData.domain, { SafeTx: typedData.types.SafeTx }, typedData.message);
+}
 //# sourceMappingURL=EV5GnosisSafeTxSubmitter.js.map

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"EV5GnosisSafeTxSubmitter.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EV5GnosisSafeTxSubmitter.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.ts"],"names":[],"mappings":"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"}

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EV5GnosisSafeTxSubmitter.test.d.ts.map

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EV5GnosisSafeTxSubmitter.test.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.ts"],"names":[],"mappings":""}

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.js

@@ -0,0 +1,145 @@
+import Safe, { EthSafeTransaction } from '@safe-global/protocol-kit';
+import { OperationType } from '@safe-global/types-kit';
+import { expect } from 'chai';
+import { Signer, Wallet, ethers } from 'ethers';
+import { ProtocolType } from '@hyperlane-xyz/utils';
+import { MultiProvider } from '../../../MultiProvider.js';
+import { EV5GnosisSafeTxSubmitter, signSafeTransactionWithSigner, } from './EV5GnosisSafeTxSubmitter.js';
+class HttpStyleTypedDataSigner extends Signer {
+    wallet;
+    typedDataCalls = 0;
+    lastSignature;
+    constructor(wallet) {
+        super();
+        this.wallet = wallet;
+    }
+    getAddress() {
+        return this.wallet.getAddress();
+    }
+    signMessage() {
+        throw new Error('not implemented');
+    }
+    signTransaction() {
+        throw new Error('not implemented');
+    }
+    connect() {
+        return this;
+    }
+    async _signTypedData(domain, types, value) {
+        this.typedDataCalls += 1;
+        this.lastSignature = await this.wallet._signTypedData(domain, types, value);
+        return this.lastSignature;
+    }
+}
+describe('signSafeTransactionWithSigner', () => {
+    const wallet = Wallet.createRandom();
+    const privateKey = wallet.privateKey;
+    const contractAddress = '0x0000000000000000000000000000000000000001';
+    const safeVersion = '1.4.1';
+    const chainId = 31337n;
+    const transaction = new EthSafeTransaction({
+        to: '0x0000000000000000000000000000000000000002',
+        value: '3',
+        data: '0x12345678',
+        operation: OperationType.Call,
+        safeTxGas: '0',
+        baseGas: '0',
+        gasPrice: '0',
+        gasToken: '0x0000000000000000000000000000000000000000',
+        refundReceiver: '0x0000000000000000000000000000000000000000',
+        nonce: 7,
+    });
+    async function createLocalSignerSafe() {
+        // Safe only calls proxyCreationCode while initializing a predicted
+        // account. The mocked chain still exercises Protocol Kit's real local
+        // signer and Safe.signTypedData implementation.
+        const encodedProxyCreationCode = ethers.utils.defaultAbiCoder.encode(['bytes'], ['0x00']);
+        const provider = {
+            async request({ method }) {
+                switch (method) {
+                    case 'eth_chainId':
+                        return `0x${chainId.toString(16)}`;
+                    case 'eth_getCode':
+                        return '0x01';
+                    case 'eth_call':
+                        return encodedProxyCreationCode;
+                    case 'eth_getTransactionCount':
+                        return '0x0';
+                    default:
+                        throw new Error(`Unexpected test RPC method ${method}`);
+                }
+            },
+        };
+        const contractNetwork = {
+            safeSingletonAddress: contractAddress,
+            safeProxyFactoryAddress: contractAddress,
+            multiSendAddress: contractAddress,
+            multiSendCallOnlyAddress: contractAddress,
+            fallbackHandlerAddress: contractAddress,
+            signMessageLibAddress: contractAddress,
+            createCallAddress: contractAddress,
+            simulateTxAccessorAddress: contractAddress,
+        };
+        // @ts-expect-error protocol-kit exposes its default class directly at runtime.
+        return Safe.init({
+            provider,
+            signer: privateKey,
+            predictedSafe: {
+                safeAccountConfig: { owners: [wallet.address], threshold: 1 },
+                safeDeploymentConfig: { safeVersion },
+            },
+            contractNetworks: { [chainId.toString()]: contractNetwork },
+        });
+    }
+    it('matches Protocol Kit local-key signing byte-for-byte', async () => {
+        const safe = await createLocalSignerSafe();
+        const expected = (await safe.signTypedData(transaction)).data;
+        expect(await signSafeTransactionWithSigner(safe, transaction, wallet)).to.equal(expected);
+    });
+    it('rejects signers without typed-data support', async () => {
+        const safe = await createLocalSignerSafe();
+        const signer = Object.create(wallet);
+        Object.defineProperty(signer, '_signTypedData', { value: undefined });
+        let error;
+        try {
+            await signSafeTransactionWithSigner(safe, transaction, signer);
+        }
+        catch (caught) {
+            error = caught instanceof Error ? caught : new Error(String(caught));
+        }
+        expect(error?.message).to.include('must support EIP-712');
+    });
+    it('proposes the exact signature from an external typed-data signer', async () => {
+        const safe = await createLocalSignerSafe();
+        const signer = new HttpStyleTypedDataSigner(wallet);
+        const multiProvider = new MultiProvider({
+            test: {
+                chainId: Number(chainId),
+                domainId: Number(chainId),
+                name: 'test',
+                protocol: ProtocolType.Ethereum,
+                rpcUrls: [{ http: 'http://127.0.0.1:8545' }],
+            },
+        });
+        multiProvider.setSigner('test', signer);
+        let proposal;
+        const safeService = Object.create(null);
+        safeService.getNextNonce = async () => '11';
+        safeService.proposeTransaction = async (value) => {
+            proposal = value;
+        };
+        const submitter = new EV5GnosisSafeTxSubmitter(multiProvider, { chain: 'test', safeAddress: await safe.getAddress() }, safe, safeService);
+        await submitter.submit({
+            chainId: Number(chainId),
+            to: transaction.data.to,
+            value: ethers.BigNumber.from(transaction.data.value),
+            data: transaction.data.data,
+        });
+        expect(signer.typedDataCalls).to.equal(1);
+        expect(proposal).to.not.equal(undefined);
+        expect(proposal?.senderAddress).to.equal(wallet.address);
+        expect(proposal?.senderSignature).to.equal(signer.lastSignature);
+        expect(proposal?.safeAddress).to.equal(await safe.getAddress());
+    });
+});
+//# sourceMappingURL=EV5GnosisSafeTxSubmitter.test.js.map

package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EV5GnosisSafeTxSubmitter.test.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.test.ts"],"names":[],"mappings":"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"}

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts

@@ -1,16 +1,29 @@
 import { TransactionReceipt } from '@ethersproject/providers';
+import { Signer } from 'ethers';
 import { Logger } from 'pino';
 import { MultiProvider } from '../../../MultiProvider.js';
 import { AnnotatedEV5Transaction } from '../../../ProviderType.js';
 import { TxSubmitterType } from '../TxSubmitterTypes.js';
 import { EV5TxSubmitterInterface } from './EV5TxSubmitterInterface.js';
 import { EV5JsonRpcTxSubmitterProps } from './types.js';
+export interface EV5SubmittedTransaction {
+    transactionHash: string;
+    receipt?: TransactionReceipt;
+}
+/** Retains irreversible progress when a sequential batch fails. */
+export declare class EV5JsonRpcSubmissionError extends Error {
+    readonly submittedTransactions: EV5SubmittedTransaction[];
+    readonly cause: unknown;
+    readonly name = "EV5JsonRpcSubmissionError";
+    constructor(message: string, submittedTransactions: EV5SubmittedTransaction[], cause: unknown);
+}
 export declare class EV5JsonRpcTxSubmitter implements EV5TxSubmitterInterface {
     readonly multiProvider: MultiProvider;
     readonly props: EV5JsonRpcTxSubmitterProps;
+    readonly signer?: Signer | undefined;
     readonly txSubmitterType: TxSubmitterType;
     protected readonly logger: Logger;
-    constructor(multiProvider: MultiProvider, props: EV5JsonRpcTxSubmitterProps);
+    constructor(multiProvider: MultiProvider, props: EV5JsonRpcTxSubmitterProps, signer?: Signer | undefined);
     submit(...txs: AnnotatedEV5Transaction[]): Promise<TransactionReceipt[]>;
 }
 //# sourceMappingURL=EV5JsonRpcTxSubmitter.d.ts.map

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EV5JsonRpcTxSubmitter.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExD,qBAAa,qBAAsB,YAAW,uBAAuB;aAQjD,aAAa,EAAE,aAAa;aAC5B,KAAK,EAAE,0BAA0B;IARnD,SAAgB,eAAe,EAAE,eAAe,CAA4B;IAE5E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAE9B;IAEH,YACkB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,0BAA0B,EAC/C;IAES,MAAM,CACjB,GAAG,GAAG,EAAE,uBAAuB,EAAE,GAChC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmB/B;CACF"}
+{"version":3,"file":"EV5JsonRpcTxSubmitter.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAmB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAExD,MAAM,WAAW,uBAAuB;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,kBAAkB,CAAC;CAC9B;AAED,mEAAmE;AACnE,qBAAa,yBAA0B,SAAQ,KAAK;aAKhC,qBAAqB,EAAE,uBAAuB,EAAE;aAChD,KAAK,EAAE,OAAO;IALhC,QAAQ,CAAC,IAAI,+BAA+B;IAE5C,YACE,OAAO,EAAE,MAAM,EACC,qBAAqB,EAAE,uBAAuB,EAAE,EAChD,KAAK,EAAE,OAAO,EAG/B;CACF;AAED,qBAAa,qBAAsB,YAAW,uBAAuB;aAQjD,aAAa,EAAE,aAAa;aAC5B,KAAK,EAAE,0BAA0B;aACjC,MAAM,CAAC,EAAE,MAAM;IATjC,SAAgB,eAAe,EAAE,eAAe,CAA4B;IAE5E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAE9B;IAEH,YACkB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,0BAA0B,EACjC,MAAM,CAAC,EAAE,MAAM,YAAA,EAC7B;IAES,MAAM,CACjB,GAAG,GAAG,EAAE,uBAAuB,EAAE,GAChC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA8D/B;CACF"}

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js

@@ -1,25 +1,66 @@
-import { assert, rootLogger } from '@hyperlane-xyz/utils';
+import { assert, formatError, rootLogger } from '@hyperlane-xyz/utils';
 import { TxSubmitterType } from '../TxSubmitterTypes.js';
+/** Retains irreversible progress when a sequential batch fails. */
+export class EV5JsonRpcSubmissionError extends Error {
+    submittedTransactions;
+    cause;
+    name = 'EV5JsonRpcSubmissionError';
+    constructor(message, submittedTransactions, cause) {
+        super(message);
+        this.submittedTransactions = submittedTransactions;
+        this.cause = cause;
+    }
+}
 export class EV5JsonRpcTxSubmitter {
     multiProvider;
     props;
+    signer;
     txSubmitterType = TxSubmitterType.JSON_RPC;
     logger = rootLogger.child({
         module: 'json-rpc-submitter',
     });
-    constructor(multiProvider, props) {
+    constructor(multiProvider, props, signer) {
         this.multiProvider = multiProvider;
         this.props = props;
+        this.signer = signer;
     }
     async submit(...txs) {
         const receipts = [];
+        const submittedTransactions = [];
         const submitterChainId = this.multiProvider.getChainId(this.props.chain);
+        // Validate the entire batch before the first irreversible broadcast.
         for (const tx of txs) {
             assert(tx.chainId, 'Invalid PopulatedTransaction: Missing chainId field');
             assert(tx.chainId === submitterChainId, `Transaction chainId ${tx.chainId} does not match submitter chainId ${submitterChainId}`);
-            const receipt = await this.multiProvider.sendTransaction(this.props.chain, tx);
-            this.logger.debug(`Submitted PopulatedTransaction on ${this.props.chain}: ${receipt.transactionHash}`);
-            receipts.push(receipt);
+        }
+        const provider = this.multiProvider.getProvider(this.props.chain);
+        const signer = this.signer
+            ? this.signer.provider === provider
+                ? this.signer
+                : this.signer.connect(provider)
+            : this.multiProvider.getSigner(this.props.chain);
+        const signerAddress = await signer.getAddress();
+        for (const tx of txs) {
+            try {
+                const { annotation, ...populatedTx } = tx;
+                if (annotation)
+                    this.logger.info(annotation);
+                const txRequest = await this.multiProvider.prepareTx(this.props.chain, populatedTx, signerAddress);
+                const response = await signer.sendTransaction(txRequest);
+                const submittedTransaction = {
+                    transactionHash: response.hash,
+                };
+                submittedTransactions.push(submittedTransaction);
+                this.logger.info(`Sent tx ${response.hash}`);
+                const receipt = await this.multiProvider.handleTx(this.props.chain, response);
+                submittedTransaction.receipt = receipt;
+                assert(receipt.status === 1, `Transaction ${receipt.transactionHash} reverted`);
+                this.logger.debug(`Submitted PopulatedTransaction on ${this.props.chain}: ${receipt.transactionHash}`);
+                receipts.push(receipt);
+            }
+            catch (error) {
+                throw new EV5JsonRpcSubmissionError(`Failed to submit JSON-RPC transaction batch on ${this.props.chain}: ${formatError(error)}`, submittedTransactions, error);
+            }
         }
         return receipts;
     }

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"EV5JsonRpcTxSubmitter.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAKzD,MAAM,OAAO,qBAAqB;IAQd,aAAa;IACb,KAAK;IARP,eAAe,GAAoB,eAAe,CAAC,QAAQ,CAAC;IAEzD,MAAM,GAAW,UAAU,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE,oBAAoB;KAC7B,CAAC,CAAC;IAEH,YACkB,aAA4B,EAC5B,KAAiC;6BADjC,aAAa;qBACb,KAAK;IACpB,CAAC;IAEG,KAAK,CAAC,MAAM,CACjB,GAAG,GAA8B;QAEjC,MAAM,QAAQ,GAAyB,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzE,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,qDAAqD,CAAC,CAAC;YAC1E,MAAM,CACJ,EAAE,CAAC,OAAO,KAAK,gBAAgB,EAC/B,uBAAuB,EAAE,CAAC,OAAO,qCAAqC,gBAAgB,EAAE,CACzF,CAAC;YACF,MAAM,OAAO,GAAoB,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CACvE,IAAI,CAAC,KAAK,CAAC,KAAK,EAChB,EAAE,CACH,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,qCAAqC,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,eAAe,EAAE,CACpF,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"EV5JsonRpcTxSubmitter.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.ts"],"names":[],"mappings":"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"}

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EV5JsonRpcTxSubmitter.test.d.ts.map

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EV5JsonRpcTxSubmitter.test.d.ts","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.ts"],"names":[],"mappings":""}

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.js

@@ -0,0 +1,125 @@
+import { expect } from 'chai';
+import { Wallet, providers, } from 'ethers';
+import sinon from 'sinon';
+import { TestChainName } from '../../../../consts/testChains.js';
+import { randomAddress } from '../../../../test/testUtils.js';
+import { MultiProvider } from '../../../MultiProvider.js';
+import { EV5JsonRpcSubmissionError, EV5JsonRpcTxSubmitter, } from './EV5JsonRpcTxSubmitter.js';
+describe('EV5JsonRpcTxSubmitter', () => {
+    const chain = TestChainName.test1;
+    const chainId = 9913371;
+    const props = { type: 'jsonRpc', chain };
+    const tx = { chainId, to: randomAddress() };
+    let multiProvider;
+    let mainSigner;
+    let explicitSigner;
+    let connectedExplicitSigner;
+    let prepareTx;
+    beforeEach(() => {
+        const provider = new providers.JsonRpcProvider('http://127.0.0.1:8545');
+        mainSigner = Wallet.createRandom().connect(provider);
+        explicitSigner = Wallet.createRandom();
+        connectedExplicitSigner = explicitSigner.connect(provider);
+        multiProvider = MultiProvider.createTestMultiProvider({
+            signer: mainSigner,
+            provider,
+        });
+        sinon.stub(explicitSigner, 'connect').returns(connectedExplicitSigner);
+        prepareTx = sinon
+            .stub(multiProvider, 'prepareTx')
+            .callsFake(async (_, request) => request);
+    });
+    afterEach(() => sinon.restore());
+    it('uses an explicit signer instead of the MultiProvider signer', async () => {
+        const response = transactionResponse('0x01');
+        const receipt = transactionReceipt('0x01', 1);
+        const explicitSend = sinon
+            .stub(connectedExplicitSigner, 'sendTransaction')
+            .resolves(response);
+        const mainSend = sinon.stub(mainSigner, 'sendTransaction');
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner);
+        expect(await submitter.submit(tx)).to.deep.equal([receipt]);
+        expect(explicitSend.calledOnce).to.equal(true);
+        expect(mainSend.called).to.equal(false);
+        expect(prepareTx.calledWith(chain, sinon.match.object, explicitSigner.address)).to.equal(true);
+    });
+    it('uses the MultiProvider signer when no explicit signer is supplied', async () => {
+        const response = transactionResponse('0x02');
+        const receipt = transactionReceipt('0x02', 1);
+        const mainSend = sinon
+            .stub(mainSigner, 'sendTransaction')
+            .resolves(response);
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props);
+        expect(await submitter.submit(tx)).to.deep.equal([receipt]);
+        expect(mainSend.calledOnce).to.equal(true);
+        expect(prepareTx.calledWith(chain, sinon.match.object, mainSigner.address)).to.equal(true);
+    });
+    it('validates the complete batch before broadcasting', async () => {
+        const explicitSend = sinon.stub(connectedExplicitSigner, 'sendTransaction');
+        const submitter = new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner);
+        let error;
+        try {
+            await submitter.submit(tx, { ...tx, chainId: chainId + 1 });
+        }
+        catch (caught) {
+            error = caught instanceof Error ? caught : new Error(String(caught));
+        }
+        expect(error?.message).to.include('does not match submitter chainId');
+        expect(explicitSend.called).to.equal(false);
+    });
+    it('retains confirmed receipts and a pending hash on partial failure', async () => {
+        const firstResponse = transactionResponse('0x03');
+        const secondResponse = transactionResponse('0x04');
+        const firstReceipt = transactionReceipt('0x03', 1);
+        sinon
+            .stub(connectedExplicitSigner, 'sendTransaction')
+            .onFirstCall()
+            .resolves(firstResponse)
+            .onSecondCall()
+            .resolves(secondResponse);
+        sinon
+            .stub(multiProvider, 'handleTx')
+            .onFirstCall()
+            .resolves(firstReceipt)
+            .onSecondCall()
+            .rejects(new Error('confirmation timeout'));
+        const error = await captureSubmissionError(new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner).submit(tx, tx));
+        expect(error.submittedTransactions).to.deep.equal([
+            { transactionHash: firstResponse.hash, receipt: firstReceipt },
+            { transactionHash: secondResponse.hash },
+        ]);
+    });
+    it('retains a reverted receipt', async () => {
+        const response = transactionResponse('0x05');
+        const receipt = transactionReceipt('0x05', 0);
+        sinon.stub(connectedExplicitSigner, 'sendTransaction').resolves(response);
+        sinon.stub(multiProvider, 'handleTx').resolves(receipt);
+        const error = await captureSubmissionError(new EV5JsonRpcTxSubmitter(multiProvider, props, explicitSigner).submit(tx));
+        expect(error.message).to.include(`Transaction ${response.hash} reverted`);
+        expect(error.submittedTransactions).to.deep.equal([
+            { transactionHash: response.hash, receipt },
+        ]);
+    });
+});
+async function captureSubmissionError(submission) {
+    try {
+        await submission;
+    }
+    catch (error) {
+        if (error instanceof EV5JsonRpcSubmissionError)
+            return error;
+        throw error;
+    }
+    throw new Error('Expected submission to fail');
+}
+function transactionResponse(hash) {
+    // CAST: minimal ethers response test double; only hash is read before handleTx.
+    return { hash };
+}
+function transactionReceipt(hash, status) {
+    // CAST: minimal ethers receipt test double; only hash/status are inspected.
+    return { transactionHash: hash, status };
+}
+//# sourceMappingURL=EV5JsonRpcTxSubmitter.test.js.map

package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EV5JsonRpcTxSubmitter.test.js","sourceRoot":"","sources":["../../../../../src/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.test.ts"],"names":[],"mappings":"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"}