@dynamic-labs/ethereum-core 4.0.0-alpha.5 → 4.0.0-alpha.51

package/src/connector/{EthWalletConnector.js → EthereumWalletConnector.js}

@@ -2,7 +2,7 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
 import { getAddress, formatEther } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, UserRejectedRequestError } from '@dynamic-labs/utils';
+import { parseEvmNetworks, retryableFn, FALLBACK_UNDEFINED, DynamicError, UserRejectedRequestError, isMobile } from '@dynamic-labs/utils';
 import { WalletConnectorBase, logger } from '@dynamic-labs/wallet-connector-core';
 import '../utils/logger.js';
 import '../utils/viem/estimateL1Fee/opStack/estimateL1Fee.js';
@@ -13,7 +13,25 @@ import { findEvmNetwork } from '../utils/findEvmNetwork/findEvmNetwork.js';
 import { getNameservice } from '../utils/getNameservice/getNameservice.js';
 import { EthereumWallet } from '../wallet/EthereumWallet.js';
 
-class EthWalletConnector extends WalletConnectorBase {
+class EthereumWalletConnector extends WalletConnectorBase {
+    constructor(props) {
+        var _a;
+        super(props);
+        this.supportedChains = ['EVM', 'ETH'];
+        this.connectedChain = 'EVM';
+        this.ChainWallet = EthereumWallet;
+        this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
+            var _a;
+            [acc[network.chainId]] = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a.length)
+                ? network.privateCustomerRpcUrls
+                : network.rpcUrls;
+            return acc;
+        }, {});
+        this.walletUiUtils = props.walletUiUtils;
+        this.evmNetworks = parseEvmNetworks(props.evmNetworks);
+        this.chainRpcProviders = props.chainRpcProviders;
+        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
+    }
     getPublicClient() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -33,21 +51,6 @@ class EthWalletConnector extends WalletConnectorBase {
             return (_b = this.chainRpcProviders.getEvmProviderByChainId(providers, networkId)) === null || _b === void 0 ? void 0 : _b.provider;
         });
     }
-    constructor(props) {
-        var _a;
-        super(props);
-        this.ChainWallet = EthereumWallet;
-        this.evmNetworkRpcMap = () => this.evmNetworks.reduce((acc, network) => {
-            var _a;
-            [acc[network.chainId]] = ((_a = network === null || network === void 0 ? void 0 : network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a.length)
-                ? network.privateCustomerRpcUrls
-                : network.rpcUrls;
-            return acc;
-        }, {});
-        this.evmNetworks = parseEvmNetworks(props.evmNetworks);
-        this.chainRpcProviders = props.chainRpcProviders;
-        (_a = this.chainRpcProviders) === null || _a === void 0 ? void 0 : _a.registerEvmProviders();
-    }
     getNetwork() {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = this.getWalletClient();
@@ -179,7 +182,7 @@ class EthWalletConnector extends WalletConnectorBase {
     }
     providerSwitchNetwork(_a) {
         return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
-            var _b, _c, _d, _e;
+            var _b, _c, _d, _e, _f;
             const { chainId } = network;
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === chainId) {
@@ -200,16 +203,19 @@ class EthWalletConnector extends WalletConnectorBase {
                 }
             }
             catch (error) {
+                if ((_b = error.details) === null || _b === void 0 ? void 0 : _b.includes('"wallet_switchEthereumChain" not implemented')) {
+                    throw new DynamicError('Network switching is not available at this time. The user should manually switch network in their wallet');
+                }
                 // we need to check for unrecognized chain error first because it also contains 'rejected' in message
                 if (error.code === 4902 ||
-                    ((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('Unrecognized chain')) ||
+                    ((_c = error.message) === null || _c === void 0 ? void 0 : _c.includes('Unrecognized chain')) ||
                     // https://github.com/MetaMask/metamask-mobile/issues/3312#issuecomment-1065923294
-                    ((_d = (_c = error.data) === null || _c === void 0 ? void 0 : _c.orginalError) === null || _d === void 0 ? void 0 : _d.code) === 4902) {
+                    ((_e = (_d = error.data) === null || _d === void 0 ? void 0 : _d.orginalError) === null || _e === void 0 ? void 0 : _e.code) === 4902) {
                     // error code indicates the chain has not been added yet
                     // https://docs.metamask.io/guide/rpc-api.html#usage-with-wallet-switchethereumchain
                     return this.providerAddNetwork({ network, provider });
                 }
-                else if (((_e = error.message) === null || _e === void 0 ? void 0 : _e.includes('rejected')) ||
+                else if (((_f = error.message) === null || _f === void 0 ? void 0 : _f.includes('rejected')) ||
                     (typeof error === 'string' && error.includes('rejected'))) {
                     throw new DynamicError("User rejected the wallet's request to switch network");
                 }
@@ -223,7 +229,16 @@ class EthWalletConnector extends WalletConnectorBase {
         return __awaiter(this, arguments, void 0, function* ({ network, provider, }) {
             var _b;
             try {
-                return yield provider.addChain({ chain: getOrMapViemChain(network) });
+                if (isMobile()) {
+                    yield this.walletUiUtils.addNetwork({
+                        handler: () => provider.addChain({ chain: getOrMapViemChain(network) }),
+                        network,
+                        walletConnector: this,
+                    });
+                }
+                else {
+                    yield provider.addChain({ chain: getOrMapViemChain(network) });
+                }
             }
             catch (error) {
                 if (((_b = error.message) === null || _b === void 0 ? void 0 : _b.includes('rejected')) ||
@@ -279,4 +294,4 @@ class EthWalletConnector extends WalletConnectorBase {
     }
 }
 
-export { EthWalletConnector };
+export { EthereumWalletConnector };

package/src/connector/createConnector/createConnector.cjs

@@ -0,0 +1,103 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../_virtual/_tslib.cjs');
+var EthereumWalletConnector = require('../EthereumWalletConnector.cjs');
+
+const createConnector = (customConnectorFn) => (props) => {
+    const delegate = customConnectorFn(props);
+    return [
+        class extends EthereumWalletConnector.EthereumWalletConnector {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { metadata: delegate.metadata }));
+                this.name = delegate.metadata.name;
+                this.overrideKey = `${delegate.metadata.name}evm`;
+            }
+            connect() {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    yield delegate.connect();
+                });
+            }
+            endSession() {
+                const _super = Object.create(null, {
+                    endSession: { get: () => super.endSession }
+                });
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    if (delegate.disconnect) {
+                        yield delegate.disconnect();
+                    }
+                    return _super.endSession.call(this);
+                });
+            }
+            getAddress() {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return delegate.getAddress();
+                });
+            }
+            getConnectedAccounts() {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return delegate.getConnectedAccounts();
+                });
+            }
+            getNetwork() {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return delegate.getNetwork();
+                });
+            }
+            getPublicClient() {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return delegate.getPublicClient();
+                });
+            }
+            getWalletClient(chainId) {
+                return delegate.getWalletClient(chainId);
+            }
+            isInstalledOnBrowser() {
+                return delegate.isInstalledOnBrowser();
+            }
+            signMessage(messageToSign) {
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    return delegate.signMessage(messageToSign);
+                });
+            }
+            filter() {
+                if (delegate.filter) {
+                    return delegate.filter();
+                }
+                return super.filter();
+            }
+            init() {
+                const _super = Object.create(null, {
+                    init: { get: () => super.init }
+                });
+                return _tslib.__awaiter(this, void 0, void 0, function* () {
+                    if (delegate.init) {
+                        return delegate.init();
+                    }
+                    return _super.init.call(this);
+                });
+            }
+            supportsNetworkSwitching() {
+                if (delegate.supportsNetworkSwitching) {
+                    return delegate.supportsNetworkSwitching();
+                }
+                return super.supportsNetworkSwitching();
+            }
+            switchNetwork(_a) {
+                const _super = Object.create(null, {
+                    switchNetwork: { get: () => super.switchNetwork }
+                });
+                return _tslib.__awaiter(this, arguments, void 0, function* ({ networkName, networkChainId, }) {
+                    if (delegate.switchNetwork) {
+                        return delegate.switchNetwork({ networkChainId, networkName });
+                    }
+                    return _super.switchNetwork.call(this, { networkChainId, networkName });
+                });
+            }
+        },
+    ];
+};
+
+exports.createConnector = createConnector;

package/src/connector/createConnector/createConnector.d.ts

@@ -0,0 +1,23 @@
+import { WalletClient, Transport, Chain, Account, PublicClient } from 'viem';
+import { WalletConnectorsMethod, WalletMetadata } from '@dynamic-labs/wallet-connector-core';
+type CustomConnectorDelegate = {
+    metadata: WalletMetadata;
+    connect: () => Promise<void>;
+    disconnect: () => Promise<void>;
+    getAddress: () => Promise<string>;
+    getConnectedAccounts: () => Promise<string[]>;
+    getNetwork: () => Promise<number | undefined>;
+    getPublicClient: () => Promise<void | PublicClient<Transport, Chain> | undefined>;
+    getWalletClient: (chainId?: string) => WalletClient<Transport, Chain, Account> | undefined;
+    isInstalledOnBrowser: () => boolean;
+    signMessage: (messageToSign: string) => Promise<string>;
+    filter?: () => boolean;
+    init?: () => Promise<void>;
+    supportsNetworkSwitching?: () => boolean;
+    switchNetwork?: (props: {
+        networkName?: string;
+        networkChainId?: number;
+    }) => Promise<void>;
+};
+export declare const createConnector: (customConnectorFn: (props: any) => CustomConnectorDelegate) => WalletConnectorsMethod;
+export {};

package/src/connector/createConnector/createConnector.js

@@ -0,0 +1,99 @@
+'use client'
+import { __awaiter } from '../../../_virtual/_tslib.js';
+import { EthereumWalletConnector } from '../EthereumWalletConnector.js';
+
+const createConnector = (customConnectorFn) => (props) => {
+    const delegate = customConnectorFn(props);
+    return [
+        class extends EthereumWalletConnector {
+            constructor(props) {
+                super(Object.assign(Object.assign({}, props), { metadata: delegate.metadata }));
+                this.name = delegate.metadata.name;
+                this.overrideKey = `${delegate.metadata.name}evm`;
+            }
+            connect() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    yield delegate.connect();
+                });
+            }
+            endSession() {
+                const _super = Object.create(null, {
+                    endSession: { get: () => super.endSession }
+                });
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (delegate.disconnect) {
+                        yield delegate.disconnect();
+                    }
+                    return _super.endSession.call(this);
+                });
+            }
+            getAddress() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return delegate.getAddress();
+                });
+            }
+            getConnectedAccounts() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return delegate.getConnectedAccounts();
+                });
+            }
+            getNetwork() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return delegate.getNetwork();
+                });
+            }
+            getPublicClient() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return delegate.getPublicClient();
+                });
+            }
+            getWalletClient(chainId) {
+                return delegate.getWalletClient(chainId);
+            }
+            isInstalledOnBrowser() {
+                return delegate.isInstalledOnBrowser();
+            }
+            signMessage(messageToSign) {
+                return __awaiter(this, void 0, void 0, function* () {
+                    return delegate.signMessage(messageToSign);
+                });
+            }
+            filter() {
+                if (delegate.filter) {
+                    return delegate.filter();
+                }
+                return super.filter();
+            }
+            init() {
+                const _super = Object.create(null, {
+                    init: { get: () => super.init }
+                });
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (delegate.init) {
+                        return delegate.init();
+                    }
+                    return _super.init.call(this);
+                });
+            }
+            supportsNetworkSwitching() {
+                if (delegate.supportsNetworkSwitching) {
+                    return delegate.supportsNetworkSwitching();
+                }
+                return super.supportsNetworkSwitching();
+            }
+            switchNetwork(_a) {
+                const _super = Object.create(null, {
+                    switchNetwork: { get: () => super.switchNetwork }
+                });
+                return __awaiter(this, arguments, void 0, function* ({ networkName, networkChainId, }) {
+                    if (delegate.switchNetwork) {
+                        return delegate.switchNetwork({ networkChainId, networkName });
+                    }
+                    return _super.switchNetwork.call(this, { networkChainId, networkName });
+                });
+            }
+        },
+    ];
+};
+
+export { createConnector };

package/src/connector/createConnector/index.d.ts

@@ -0,0 +1 @@
+export * from './createConnector';

package/src/connector/index.d.ts

@@ -1,2 +1,3 @@
-export * from './EthWalletConnector';
+export * from './EthereumWalletConnector';
 export * from './isEthWalletConnector';
+export * from './createConnector';

package/src/connector/isEthWalletConnector/isEthWalletConnector.d.ts

@@ -1,3 +1,3 @@
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { EthWalletConnector } from '../';
-export declare const isEthWalletConnector: (connector: WalletConnector | EthWalletConnector) => connector is EthWalletConnector;
+import { EthereumWalletConnector } from '../';
+export declare const isEthWalletConnector: (connector: WalletConnector | EthereumWalletConnector) => connector is EthereumWalletConnector;

package/src/index.cjs

@@ -3,8 +3,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var EthWalletConnector = require('./connector/EthWalletConnector.cjs');
+var assertPackageVersion = require('@dynamic-labs/assert-package-version');
+var _package = require('../package.cjs');
+var EthereumWalletConnector = require('./connector/EthereumWalletConnector.cjs');
 var isEthWalletConnector = require('./connector/isEthWalletConnector/isEthWalletConnector.cjs');
+var createConnector = require('./connector/createConnector/createConnector.cjs');
 require('./rpc/RpcProvidersEthereum/RpcProvidersEthereum.cjs');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
 var evmProvidersSelector = require('./rpc/evmProvidersSelector/evmProvidersSelector.cjs');
@@ -25,10 +28,11 @@ var validateAddressFormat = require('./utils/validateAddressFormat/validateAddre
 var EthereumWallet = require('./wallet/EthereumWallet.cjs');
 var isEthereumWallet = require('./wallet/isEthereumWallet/isEthereumWallet.cjs');
 
+assertPackageVersion.assertPackageVersion('@dynamic-labs/ethereum-core', _package.version);
 
-
-exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
+exports.EthereumWalletConnector = EthereumWalletConnector.EthereumWalletConnector;
 exports.isEthWalletConnector = isEthWalletConnector.isEthWalletConnector;
+exports.createConnector = createConnector.createConnector;
 exports.evmProvidersSelector = evmProvidersSelector.evmProvidersSelector;
 exports.ViemRpcUiTransaction = ViemRpcUiTransaction.ViemRpcUiTransaction;
 exports.ViemUiTransaction = ViemUiTransaction.ViemUiTransaction;

package/src/index.js

@@ -1,6 +1,9 @@
 'use client'
-export { EthWalletConnector } from './connector/EthWalletConnector.js';
+import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
+import { version } from '../package.js';
+export { EthereumWalletConnector } from './connector/EthereumWalletConnector.js';
 export { isEthWalletConnector } from './connector/isEthWalletConnector/isEthWalletConnector.js';
+export { createConnector } from './connector/createConnector/createConnector.js';
 import './rpc/RpcProvidersEthereum/RpcProvidersEthereum.js';
 export * from '@dynamic-labs/rpc-providers';
 export { evmProvidersSelector } from './rpc/evmProvidersSelector/evmProvidersSelector.js';
@@ -20,3 +23,5 @@ export { getNameservice } from './utils/getNameservice/getNameservice.js';
 export { validateAddressFormat } from './utils/validateAddressFormat/validateAddressFormat.js';
 export { EthereumWallet } from './wallet/EthereumWallet.js';
 export { isEthereumWallet } from './wallet/isEthereumWallet/isEthereumWallet.js';
+
+assertPackageVersion('@dynamic-labs/ethereum-core', version);

package/src/rpc/RpcProvidersEthereum/RpcProvidersEthereum.cjs

@@ -4,11 +4,6 @@
 var viem = require('viem');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
 var utils = require('@dynamic-labs/utils');
-require('../../../_virtual/_tslib.cjs');
-require('../../utils/logger.cjs');
-require('../../utils/viem/estimateL1Fee/opStack/estimateL1Fee.cjs');
-require('../../utils/viem/chainsMap/chainsMap.cjs');
-require('viem/accounts');
 var getOrMapViemChain = require('../../utils/viem/getOrMapViemChain/getOrMapViemChain.cjs');
 
 rpcProviders.ChainRpcProviders.getEvmProviderByChainId = (rpcProviders, chainId) => {
@@ -19,8 +14,8 @@ rpcProviders.ChainRpcProviders.getEvmProviderByChainId = (rpcProviders, chainId)
 rpcProviders.ChainRpcProviders.registerEvmProviders = () => {
     rpcProviders.ChainRpcProviders.registerChainProviders(rpcProviders.ProviderChain.EVM, (config) => {
         const rpcProviders = {};
-        if (config === null || config === void 0 ? void 0 : config.evm) {
-            rpcProviders.evm = utils.parseEvmNetworks(config.evm).map((network) => {
+        if (config === null || config === void 0 ? void 0 : config['evm']) {
+            rpcProviders.evm = utils.parseEvmNetworks(config['evm']).map((network) => {
                 var _a;
                 const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
                 const provider = viem.createPublicClient({

package/src/rpc/RpcProvidersEthereum/RpcProvidersEthereum.js

@@ -2,11 +2,6 @@
 import { createPublicClient, http } from 'viem';
 import { ChainRpcProviders, ProviderChain } from '@dynamic-labs/rpc-providers';
 import { parseEvmNetworks } from '@dynamic-labs/utils';
-import '../../../_virtual/_tslib.js';
-import '../../utils/logger.js';
-import '../../utils/viem/estimateL1Fee/opStack/estimateL1Fee.js';
-import '../../utils/viem/chainsMap/chainsMap.js';
-import 'viem/accounts';
 import { getOrMapViemChain } from '../../utils/viem/getOrMapViemChain/getOrMapViemChain.js';
 
 ChainRpcProviders.getEvmProviderByChainId = (rpcProviders, chainId) => {
@@ -17,8 +12,8 @@ ChainRpcProviders.getEvmProviderByChainId = (rpcProviders, chainId) => {
 ChainRpcProviders.registerEvmProviders = () => {
     ChainRpcProviders.registerChainProviders(ProviderChain.EVM, (config) => {
         const rpcProviders = {};
-        if (config === null || config === void 0 ? void 0 : config.evm) {
-            rpcProviders.evm = parseEvmNetworks(config.evm).map((network) => {
+        if (config === null || config === void 0 ? void 0 : config['evm']) {
+            rpcProviders.evm = parseEvmNetworks(config['evm']).map((network) => {
                 var _a;
                 const rpcUrl = ((_a = network.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || network.rpcUrls[0];
                 const provider = createPublicClient({

package/src/rpc/evmProvidersSelector/evmProvidersSelector.cjs

@@ -3,7 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../RpcProvidersEthereum/RpcProvidersEthereum.cjs');
 var rpcProviders = require('@dynamic-labs/rpc-providers');
 
 const evmProvidersSelector = (providers) => {

package/src/rpc/evmProvidersSelector/evmProvidersSelector.d.ts

@@ -1,4 +1,4 @@
-import { EvmRpcProvider, RpcProvidersSelector } from '..';
+import { EvmRpcProvider, RpcProvidersSelector } from '@dynamic-labs/rpc-providers';
 export type EvmRpcProviderMethods = {
     defaultProvider: EvmRpcProvider | undefined;
     providers: EvmRpcProvider[] | undefined;

package/src/rpc/evmProvidersSelector/evmProvidersSelector.js

@@ -1,5 +1,4 @@
 'use client'
-import '../RpcProvidersEthereum/RpcProvidersEthereum.js';
 import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 
 const evmProvidersSelector = (providers) => {

package/src/utils/viem/ViemRpcUiTransaction/ViemRpcUiTransaction.cjs

@@ -35,7 +35,7 @@ class ViemRpcUiTransaction extends Eip1559FeeFeed.Eip1559FeeFeed {
         return this.transaction.to || undefined;
     }
     get from() {
-        return this.transaction.from;
+        return this.transaction.from || '';
     }
     get value() {
         const { value } = this.transaction;
@@ -62,10 +62,11 @@ class ViemRpcUiTransaction extends Eip1559FeeFeed.Eip1559FeeFeed {
     estimateGas() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const _a = this.transaction, transaction = _tslib.__rest(_a, ["from"]);
+            const _a = this.transaction, { from } = _a, transaction = _tslib.__rest(_a, ["from"]);
+            const transactionWithFrom = Object.assign(Object.assign({}, transaction), { from });
             const hexResult = (yield this.publicClient.transport.request({
                 method: 'eth_estimateGas',
-                params: [transaction],
+                params: [transactionWithFrom],
             }));
             return viem.hexToBigInt(hexResult);
         });

package/src/utils/viem/ViemRpcUiTransaction/ViemRpcUiTransaction.d.ts

@@ -23,7 +23,7 @@ export declare class ViemRpcUiTransaction extends Eip1559FeeFeed implements IUIT
     parse: (input: string) => bigint;
     format: (value: bigint, { precision }?: import("@dynamic-labs/types").IUITransactionFormatOptions) => string;
     get to(): `0x${string}` | undefined;
-    get from(): `0x${string}`;
+    get from(): `0x${string}` | "";
     get value(): bigint | undefined;
     get data(): `0x${string}` | undefined;
     submit(): Promise<string>;

package/src/utils/viem/ViemRpcUiTransaction/ViemRpcUiTransaction.js

@@ -31,7 +31,7 @@ class ViemRpcUiTransaction extends Eip1559FeeFeed {
         return this.transaction.to || undefined;
     }
     get from() {
-        return this.transaction.from;
+        return this.transaction.from || '';
     }
     get value() {
         const { value } = this.transaction;
@@ -58,10 +58,11 @@ class ViemRpcUiTransaction extends Eip1559FeeFeed {
     estimateGas() {
         return __awaiter(this, void 0, void 0, function* () {
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const _a = this.transaction, transaction = __rest(_a, ["from"]);
+            const _a = this.transaction, { from } = _a, transaction = __rest(_a, ["from"]);
+            const transactionWithFrom = Object.assign(Object.assign({}, transaction), { from });
             const hexResult = (yield this.publicClient.transport.request({
                 method: 'eth_estimateGas',
-                params: [transaction],
+                params: [transactionWithFrom],
             }));
             return hexToBigInt(hexResult);
         });