@0xsequence/account 1.10.15 → 2.0.0

package/dist/0xsequence-account.esm.js

@@ -2,7 +2,7 @@ import { walletContracts } from '@0xsequence/abi';
 import { commons, universal } from '@0xsequence/core';
 import { defaults, migrator, version } from '@0xsequence/migration';
 import { proto, isRelayer, RpcRelayer } from '@0xsequence/relayer';
-import { getEthersConnectionInfo, encodeTypedDataDigest } from '@0xsequence/utils';
+import { toHexString, getFetchRequest, encodeTypedDataDigest } from '@0xsequence/utils';
 import { Wallet } from '@0xsequence/wallet';
 import { ethers } from 'ethers';
 
@@ -21,20 +21,9 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
-function isPromise(value) {
-  return !!value && typeof value.then === 'function';
-}
-function isDeferrable(value) {
-  // The value is deferrable if any of the properties is a Promises
-  if (typeof value === 'object') {
-    return Object.keys(value).some(key => isPromise(value[key]));
-  }
-  return false;
-}
-
 function encodeGasRefundTransaction(option) {
   if (!option) return [];
-  const value = ethers.BigNumber.from(option.value);
+  const value = BigInt(option.value);
   switch (option.token.type) {
     case proto.FeeTokenType.UNKNOWN:
       return [{
@@ -42,8 +31,8 @@ function encodeGasRefundTransaction(option) {
         revertOnError: true,
         gasLimit: option.gasLimit,
         to: option.to,
-        value: value.toHexString(),
-        data: []
+        value: toHexString(value),
+        data: '0x'
       }];
     case proto.FeeTokenType.ERC20_TOKEN:
       if (!option.token.contractAddress) {
@@ -55,7 +44,7 @@ function encodeGasRefundTransaction(option) {
         gasLimit: option.gasLimit,
         to: option.token.contractAddress,
         value: 0,
-        data: new ethers.utils.Interface([{
+        data: new ethers.Interface([{
           constant: false,
           inputs: [{
             type: 'address'
@@ -65,7 +54,7 @@ function encodeGasRefundTransaction(option) {
           name: 'transfer',
           outputs: [],
           type: 'function'
-        }]).encodeFunctionData('transfer', [option.to, value.toHexString()])
+        }]).encodeFunctionData('transfer', [option.to, toHexString(value)])
       }];
     default:
       throw new Error(`Unhandled fee token type ${option.token.type}`);
@@ -76,7 +65,6 @@ class AccountSigner {
     this.account = account;
     this.chainId = chainId;
     this.options = options;
-    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -88,6 +76,10 @@ class AccountSigner {
     var _this$options$cantVal, _this$options;
     return this.account.signMessage(message, this.chainId, (_this$options$cantVal = (_this$options = this.options) == null ? void 0 : _this$options.cantValidateBehavior) != null ? _this$options$cantVal : 'throw');
   }
+  signTypedData(domain, types, value) {
+    var _this$options$cantVal2, _this$options2;
+    return this.account.signTypedData(domain, types, value, this.chainId, (_this$options$cantVal2 = (_this$options2 = this.options) == null ? void 0 : _this$options2.cantValidateBehavior) != null ? _this$options$cantVal2 : 'throw');
+  }
   async defaultSelectFee(_txs, options) {
     // If no options, return undefined
     if (options.length === 0) return undefined;
@@ -109,33 +101,32 @@ class AccountSigner {
       if (option.token.type === proto.FeeTokenType.UNKNOWN) {
         // Native token
         const balance = await this.getBalance();
-        if (balance.gte(ethers.BigNumber.from(option.value))) {
+        if (balance >= BigInt(option.value)) {
           return option;
         }
       } else if (option.token.contractAddress && option.token.type === proto.FeeTokenType.ERC20_TOKEN) {
         // ERC20 token
         const token = new ethers.Contract(option.token.contractAddress, balanceOfAbi, this.provider);
         const balance = await token.balanceOf(this.account.address);
-        if (balance.gte(ethers.BigNumber.from(option.value))) {
+        if (balance >= BigInt(option.value)) {
           return option;
         }
       } else ;
     }
     throw new Error('No fee option available - not enough balance');
   }
-  async sendTransaction(txsPromise, options) {
-    var _this$options$stubSig, _this$options2, _this$options$selectF, _this$options3, _this$options4;
-    const txs = isDeferrable(txsPromise) ? await ethers.utils.resolveProperties(txsPromise) : txsPromise;
+  async sendTransaction(txs, options) {
+    var _this$options$stubSig, _this$options3, _this$options$selectF, _this$options4, _this$options5;
     const prepare = await this.account.prepareTransactions({
       txs,
       chainId: this.chainId,
-      stubSignatureOverrides: (_this$options$stubSig = (_this$options2 = this.options) == null ? void 0 : _this$options2.stubSignatureOverrides) != null ? _this$options$stubSig : new Map(),
+      stubSignatureOverrides: (_this$options$stubSig = (_this$options3 = this.options) == null ? void 0 : _this$options3.stubSignatureOverrides) != null ? _this$options$stubSig : new Map(),
       simulateForFeeOptions: options == null ? void 0 : options.simulateForFeeOptions
     });
-    const selectMethod = (_this$options$selectF = (_this$options3 = this.options) == null ? void 0 : _this$options3.selectFee) != null ? _this$options$selectF : this.defaultSelectFee.bind(this);
+    const selectMethod = (_this$options$selectF = (_this$options4 = this.options) == null ? void 0 : _this$options4.selectFee) != null ? _this$options$selectF : this.defaultSelectFee.bind(this);
     const feeOption = await selectMethod(txs, prepare.feeOptions);
     const finalTransactions = [...prepare.transactions, ...encodeGasRefundTransaction(feeOption)];
-    return this.account.sendTransaction(finalTransactions, this.chainId, prepare.feeQuote, undefined, undefined, ((_this$options4 = this.options) == null ? void 0 : _this$options4.nonceSpace) !== undefined ? {
+    return this.account.sendTransaction(finalTransactions, this.chainId, prepare.feeQuote, undefined, undefined, ((_this$options5 = this.options) == null ? void 0 : _this$options5.nonceSpace) !== undefined ? {
       nonceSpace: this.options.nonceSpace
     } : undefined); // Will always have a transaction response
   }
@@ -143,7 +134,9 @@ class AccountSigner {
     return this.provider.getBalance(this.account.address, blockTag);
   }
   call(transaction, blockTag) {
-    return this.provider.call(transaction, blockTag);
+    return this.provider.call(_extends({}, transaction, {
+      blockTag
+    }));
   }
   async resolveName(name) {
     const res = await this.provider.resolveName(name);
@@ -163,7 +156,7 @@ class AccountSigner {
     throw new Error('Method not implemented.');
   }
   getChainId() {
-    return Promise.resolve(ethers.BigNumber.from(this.chainId).toNumber());
+    return Promise.resolve(Number(this.chainId));
   }
   getGasPrice() {
     throw new Error('Method not implemented.');
@@ -171,10 +164,16 @@ class AccountSigner {
   getFeeData() {
     throw new Error('Method not implemented.');
   }
+  getNonce(blockTag) {
+    throw new Error('Method not implemented.');
+  }
+  populateCall(tx) {
+    throw new Error('Method not implemented.');
+  }
   checkTransaction(transaction) {
     throw new Error('Method not implemented.');
   }
-  populateTransaction(transaction) {
+  async populateTransaction(tx) {
     throw new Error('Method not implemented.');
   }
   _checkProvider(operation) {
@@ -193,7 +192,7 @@ class Chain0Reader {
     return undefined;
   }
   async nonce(_wallet, _space) {
-    return ethers.constants.Zero;
+    return 0n;
   }
   async isValidSignature(_wallet, _digest, _signature) {
     throw new Error('Method not supported.');
@@ -210,7 +209,7 @@ class Account {
     this.orchestrator = void 0;
     this.jwt = void 0;
     this.projectAccessKey = void 0;
-    this.address = ethers.utils.getAddress(options.address);
+    this.address = ethers.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
     this.networks = options.networks;
@@ -260,21 +259,25 @@ class Account {
     };
   }
   network(chainId) {
-    const tcid = ethers.BigNumber.from(chainId);
-    const found = this.networks.find(n => tcid.eq(n.chainId));
+    const tcid = BigInt(chainId);
+    const found = this.networks.find(n => tcid === BigInt(n.chainId));
     if (!found) throw new Error(`Network not found for chainId ${chainId}`);
     return found;
   }
   providerFor(chainId) {
     const found = this.network(chainId);
-    if (!found.provider && !found.rpcUrl) throw new Error(`Provider not found for chainId ${chainId}`);
-    return found.provider || new ethers.providers.StaticJsonRpcProvider(getEthersConnectionInfo(found.rpcUrl, this.projectAccessKey, this.jwt), {
-      name: '',
-      chainId: ethers.BigNumber.from(chainId).toNumber()
+    if (!found.provider && !found.rpcUrl) {
+      throw new Error(`Provider not found for chainId ${chainId}`);
+    }
+    const network = new ethers.Network(found.name, found.chainId);
+    return found.provider || new ethers.JsonRpcProvider(getFetchRequest(found.rpcUrl, this.projectAccessKey, this.jwt), network, {
+      staticNetwork: network
     });
   }
   reader(chainId) {
-    if (ethers.constants.Zero.eq(chainId)) return new Chain0Reader();
+    if (BigInt(chainId) === 0n) {
+      return new Chain0Reader();
+    }
 
     // TODO: Networks should be able to provide a reader directly
     // and we should default to the on-chain reader
@@ -306,7 +309,7 @@ class Account {
     return this.walletFor(chainId, this.contextFor(status.version), status.config, coder);
   }
   walletFor(chainId, context, config, coders) {
-    const isNetworkZero = ethers.constants.Zero.eq(chainId);
+    const isNetworkZero = BigInt(chainId) === 0n;
     return new Wallet({
       config,
       context,
@@ -508,7 +511,7 @@ class Account {
     return coder.trim(chainedSignature);
   }
   async publishWitness() {
-    const digest = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(`This is a Sequence account woo! ${Date.now()}`));
+    const digest = ethers.id(`This is a Sequence account woo! ${Date.now()}`);
     const signature = await this.signDigest(digest, 0, false);
     const decoded = this.coders.signature.decode(signature);
     const signatures = this.coders.signature.signaturesOfDecoded(decoded);
@@ -526,7 +529,7 @@ class Account {
     // So we ignore the state on "chain zero" and instead use one of the states of the networks
     // wallet-webapp should ensure the wallet is as migrated as possible, trying to mimic
     // the behaviour of being migrated on all chains
-    const chainRef = ethers.constants.Zero.eq(chainId) ? this.networks[0].chainId : chainId;
+    const chainRef = BigInt(chainId) === 0n ? this.networks[0].chainId : chainId;
     const status = await this.status(chainRef);
     this.mustBeFullyMigrated(status);
 
@@ -557,11 +560,11 @@ class Account {
   }
   buildOnChainSignature(digest) {
     const subdigest = commons.signature.subdigestOf({
-      digest: ethers.utils.hexlify(digest),
+      digest: ethers.hexlify(digest),
       chainId: 0,
       address: this.address
     });
-    const hexSubdigest = ethers.utils.hexlify(subdigest);
+    const hexSubdigest = ethers.hexlify(subdigest);
     const config = this.coders.config.fromSimple({
       // Threshold *only* needs to be > 0, this is not a magic number
       // we only use 2 ** 15 because it may lead to lower gas costs in some chains
@@ -570,7 +573,7 @@ class Account {
       signers: [],
       subdigests: [hexSubdigest]
     });
-    const walletInterface = new ethers.utils.Interface(walletContracts.mainModule.abi);
+    const walletInterface = new ethers.Interface(walletContracts.mainModule.abi);
     const bundle = {
       entrypoint: this.address,
       transactions: [{
@@ -605,13 +608,13 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       throw new Error('Cannot build EIP-6492 signature without bootstrap transactions');
     }
-    const encoded = ethers.utils.defaultAbiCoder.encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
-    return ethers.utils.solidityPack(['bytes', 'bytes32'], [encoded, commons.EIP6492.EIP_6492_SUFFIX]);
+    const encoded = ethers.AbiCoder.defaultAbiCoder().encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
+    return ethers.solidityPacked(['bytes', 'bytes32'], [encoded, commons.EIP6492.EIP_6492_SUFFIX]);
   }
   async editConfig(changes) {
     const currentConfig = await this.status(0).then(s => s.config);
     const newConfig = this.coders.config.editConfig(currentConfig, _extends({}, changes, {
-      checkpoint: this.coders.config.checkpointOf(currentConfig).add(1)
+      checkpoint: this.coders.config.checkpointOf(currentConfig) + 1n
     }));
     return this.updateConfig(newConfig);
   }
@@ -671,7 +674,6 @@ class Account {
       const deployTransaction = Wallet.buildDeployTransaction(status.original.context, status.original.imageHash);
       transactions.push(...deployTransaction.transactions);
     }
-    transactions.length;
 
     // Get pending migrations
     transactions.push(...status.signedMigrations.map(m => ({
@@ -715,7 +717,7 @@ class Account {
     }), feeQuote);
   }
   signMessage(message, chainId, cantValidateBehavior = 'ignore') {
-    return this.signDigest(ethers.utils.keccak256(message), chainId, true, cantValidateBehavior);
+    return this.signDigest(ethers.keccak256(message), chainId, true, cantValidateBehavior);
   }
   async signTransactions(txs, chainId, pstatus, options) {
     const status = pstatus || (await this.status(chainId));
@@ -841,7 +843,7 @@ class Account {
     const stubSignature = wallet.coders.config.buildStubSignature(wallet.config, stubSignatureOverrides);
 
     // Now we can decorate the transactions as always, but we need to manually build the signed bundle
-    const intentId = ethers.utils.hexlify(ethers.utils.randomBytes(32));
+    const intentId = ethers.hexlify(ethers.randomBytes(32));
     const signedBundle = {
       chainId,
       intent: {

package/dist/declarations/src/account.d.ts

@@ -5,7 +5,7 @@ import { FeeOption, FeeQuote, Relayer } from '@0xsequence/relayer';
 import { tracker } from '@0xsequence/sessions';
 import { SignatureOrchestrator } from '@0xsequence/signhub';
 import { Wallet } from '@0xsequence/wallet';
-import { ethers, TypedDataDomain, TypedDataField } from 'ethers';
+import { ethers } from 'ethers';
 import { AccountSigner, AccountSignerOptions } from "./signer.js";
 export type AccountStatus = {
     original: {
@@ -72,7 +72,7 @@ export declare class Account {
         config: commons.config.ConfigCoder;
     };
     network(chainId: ethers.BigNumberish): NetworkConfig;
-    providerFor(chainId: ethers.BigNumberish): ethers.providers.Provider;
+    providerFor(chainId: ethers.BigNumberish): ethers.Provider;
     reader(chainId: ethers.BigNumberish): commons.reader.Reader;
     relayer(chainId: ethers.BigNumberish): Relayer;
     setOrchestrator(orchestrator: SignatureOrchestrator): void;
@@ -127,7 +127,7 @@ export declare class Account {
         migratedAllChains: boolean;
         failedChains: number[];
     }>;
-    sendSignedTransactions(signedBundle: commons.transaction.IntendedTransactionBundle | commons.transaction.IntendedTransactionBundle[], chainId: ethers.BigNumberish, quote?: FeeQuote, pstatus?: AccountStatus, callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void): Promise<ethers.providers.TransactionResponse>;
+    sendSignedTransactions(signedBundle: commons.transaction.IntendedTransactionBundle | commons.transaction.IntendedTransactionBundle[], chainId: ethers.BigNumberish, quote?: FeeQuote, pstatus?: AccountStatus, callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void): Promise<ethers.TransactionResponse>;
     fillGasLimits(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, status?: AccountStatus): Promise<commons.transaction.SimulatedTransaction[]>;
     gasRefundQuotes(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, stubSignatureOverrides: Map<string, string>, status?: AccountStatus, options?: {
         simulate?: boolean;
@@ -145,8 +145,8 @@ export declare class Account {
     sendTransaction(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, quote?: FeeQuote, skipPreDecorate?: boolean, callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void, options?: {
         nonceSpace?: ethers.BigNumberish;
         serial?: boolean;
-    }): Promise<ethers.providers.TransactionResponse | undefined>;
-    signTypedData(domain: TypedDataDomain, types: Record<string, Array<TypedDataField>>, message: Record<string, any>, chainId: ethers.BigNumberish, cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw'): Promise<string>;
+    }): Promise<ethers.TransactionResponse | undefined>;
+    signTypedData(domain: ethers.TypedDataDomain, types: Record<string, Array<ethers.TypedDataField>>, message: Record<string, any>, chainId: ethers.BigNumberish, cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw'): Promise<string>;
     getSigners(): Promise<Array<{
         address: string;
         network: ChainId;

package/dist/declarations/src/signer.d.ts

@@ -7,32 +7,34 @@ export type AccountSignerOptions = {
     nonceSpace?: ethers.BigNumberish;
     cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw';
     stubSignatureOverrides?: Map<string, string>;
-    selectFee?: (txs: ethers.utils.Deferrable<ethers.providers.TransactionRequest> | commons.transaction.Transactionish, options: FeeOption[]) => Promise<FeeOption | undefined>;
+    selectFee?: (txs: ethers.TransactionRequest | commons.transaction.Transactionish, options: FeeOption[]) => Promise<FeeOption | undefined>;
 };
-export declare class AccountSigner implements ethers.Signer {
+export declare class AccountSigner implements ethers.AbstractSigner<ethers.Provider> {
     account: Account;
     chainId: ChainId;
     readonly options?: AccountSignerOptions | undefined;
-    readonly _isSigner = true;
     constructor(account: Account, chainId: ChainId, options?: AccountSignerOptions | undefined);
-    get provider(): ethers.providers.Provider;
+    get provider(): ethers.Provider;
     getAddress(): Promise<string>;
-    signMessage(message: string | ethers.utils.Bytes): Promise<string>;
+    signMessage(message: string | ethers.BytesLike): Promise<string>;
+    signTypedData(domain: ethers.TypedDataDomain, types: Record<string, Array<ethers.TypedDataField>>, value: Record<string, any>): Promise<string>;
     private defaultSelectFee;
-    sendTransaction(txsPromise: ethers.utils.Deferrable<ethers.providers.TransactionRequest> | commons.transaction.Transactionish, options?: {
+    sendTransaction(txs: commons.transaction.Transactionish, options?: {
         simulateForFeeOptions?: boolean;
-    }): Promise<ethers.providers.TransactionResponse>;
-    getBalance(blockTag?: ethers.providers.BlockTag | undefined): Promise<ethers.BigNumber>;
-    call(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>, blockTag?: ethers.providers.BlockTag | undefined): Promise<string>;
+    }): Promise<ethers.TransactionResponse>;
+    getBalance(blockTag?: ethers.BlockTag | undefined): Promise<bigint>;
+    call(transaction: ethers.TransactionRequest, blockTag?: ethers.BlockTag): Promise<string>;
     resolveName(name: string): Promise<string>;
-    connect(_provider: ethers.providers.Provider): ethers.Signer;
-    signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
-    getTransactionCount(blockTag?: ethers.providers.BlockTag | undefined): Promise<number>;
-    estimateGas(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<ethers.BigNumber>;
+    connect(_provider: ethers.Provider): ethers.Signer;
+    signTransaction(transaction: ethers.TransactionRequest): Promise<string>;
+    getTransactionCount(blockTag?: ethers.BlockTag | undefined): Promise<number>;
+    estimateGas(transaction: ethers.TransactionRequest): Promise<bigint>;
     getChainId(): Promise<number>;
-    getGasPrice(): Promise<ethers.BigNumber>;
-    getFeeData(): Promise<ethers.providers.FeeData>;
-    checkTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
-    populateTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<ethers.providers.TransactionRequest>;
+    getGasPrice(): Promise<bigint>;
+    getFeeData(): Promise<ethers.FeeData>;
+    getNonce(blockTag?: ethers.BlockTag): Promise<number>;
+    populateCall(tx: ethers.TransactionRequest): Promise<ethers.TransactionLike<string>>;
+    checkTransaction(transaction: ethers.TransactionRequest): ethers.TransactionRequest;
+    populateTransaction(tx: ethers.TransactionRequest): Promise<ethers.TransactionLike<string>>;
     _checkProvider(operation?: string | undefined): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/account",
-  "version": "1.10.15",
+  "version": "2.0.0",
   "description": "tools for migrating sequence wallets to new versions",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/account",
   "source": "src/index.ts",
@@ -9,21 +9,24 @@
   "author": "Horizon Blockchain Games",
   "license": "Apache-2.0",
   "dependencies": {
-    "ethers": "^5.5.2",
-    "@0xsequence/abi": "1.10.15",
-    "@0xsequence/core": "1.10.15",
-    "@0xsequence/migration": "1.10.15",
-    "@0xsequence/network": "1.10.15",
-    "@0xsequence/relayer": "1.10.15",
-    "@0xsequence/sessions": "1.10.15",
-    "@0xsequence/utils": "1.10.15",
-    "@0xsequence/wallet": "1.10.15"
+    "@0xsequence/abi": "2.0.0",
+    "@0xsequence/core": "2.0.0",
+    "@0xsequence/migration": "2.0.0",
+    "@0xsequence/network": "2.0.0",
+    "@0xsequence/relayer": "2.0.0",
+    "@0xsequence/sessions": "2.0.0",
+    "@0xsequence/utils": "2.0.0",
+    "@0xsequence/wallet": "2.0.0"
+  },
+  "peerDependencies": {
+    "ethers": ">=6"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "ethers": "^6.13.0",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "1.10.15",
-    "@0xsequence/tests": "1.10.15"
+    "@0xsequence/signhub": "2.0.0",
+    "@0xsequence/tests": "2.0.0"
   },
   "files": [
     "src",

package/src/account.ts

@@ -1,14 +1,13 @@
 import { walletContracts } from '@0xsequence/abi'
 import { commons, universal } from '@0xsequence/core'
-import { WalletSignRequestMetadata } from '@0xsequence/core/src/commons'
 import { migrator, defaults, version } from '@0xsequence/migration'
 import { ChainId, NetworkConfig } from '@0xsequence/network'
 import { FeeOption, FeeQuote, isRelayer, Relayer, RpcRelayer } from '@0xsequence/relayer'
 import { tracker } from '@0xsequence/sessions'
 import { SignatureOrchestrator } from '@0xsequence/signhub'
-import { encodeTypedDataDigest, getEthersConnectionInfo } from '@0xsequence/utils'
+import { encodeTypedDataDigest, getFetchRequest } from '@0xsequence/utils'
 import { Wallet } from '@0xsequence/wallet'
-import { ethers, TypedDataDomain, TypedDataField } from 'ethers'
+import { ethers } from 'ethers'
 import { AccountSigner, AccountSignerOptions } from './signer'
 
 export type AccountStatus = {
@@ -82,11 +81,11 @@ class Chain0Reader implements commons.reader.Reader {
     return undefined
   }
 
-  async nonce(_wallet: string, _space: ethers.BigNumberish): Promise<ethers.BigNumberish> {
-    return ethers.constants.Zero
+  async nonce(_wallet: string, _space: ethers.BigNumberish): Promise<bigint> {
+    return 0n
   }
 
-  async isValidSignature(_wallet: string, _digest: ethers.utils.BytesLike, _signature: ethers.utils.BytesLike): Promise<boolean> {
+  async isValidSignature(_wallet: string, _digest: ethers.BytesLike, _signature: ethers.BytesLike): Promise<boolean> {
     throw new Error('Method not supported.')
   }
 }
@@ -108,7 +107,7 @@ export class Account {
   private projectAccessKey?: string
 
   constructor(options: AccountOptions) {
-    this.address = ethers.utils.getAddress(options.address)
+    this.address = ethers.getAddress(options.address)
 
     this.contexts = options.contexts
     this.tracker = options.tracker
@@ -178,26 +177,32 @@ export class Account {
   }
 
   network(chainId: ethers.BigNumberish): NetworkConfig {
-    const tcid = ethers.BigNumber.from(chainId)
-    const found = this.networks.find(n => tcid.eq(n.chainId))
+    const tcid = BigInt(chainId)
+    const found = this.networks.find(n => tcid === BigInt(n.chainId))
     if (!found) throw new Error(`Network not found for chainId ${chainId}`)
     return found
   }
 
-  providerFor(chainId: ethers.BigNumberish): ethers.providers.Provider {
+  providerFor(chainId: ethers.BigNumberish): ethers.Provider {
     const found = this.network(chainId)
-    if (!found.provider && !found.rpcUrl) throw new Error(`Provider not found for chainId ${chainId}`)
+    if (!found.provider && !found.rpcUrl) {
+      throw new Error(`Provider not found for chainId ${chainId}`)
+    }
+
+    const network = new ethers.Network(found.name, found.chainId)
+
     return (
       found.provider ||
-      new ethers.providers.StaticJsonRpcProvider(getEthersConnectionInfo(found.rpcUrl, this.projectAccessKey, this.jwt), {
-        name: '',
-        chainId: ethers.BigNumber.from(chainId).toNumber()
+      new ethers.JsonRpcProvider(getFetchRequest(found.rpcUrl, this.projectAccessKey, this.jwt), network, {
+        staticNetwork: network
       })
     )
   }
 
   reader(chainId: ethers.BigNumberish): commons.reader.Reader {
-    if (ethers.constants.Zero.eq(chainId)) return new Chain0Reader()
+    if (BigInt(chainId) === 0n) {
+      return new Chain0Reader()
+    }
 
     // TODO: Networks should be able to provide a reader directly
     // and we should default to the on-chain reader
@@ -241,7 +246,7 @@ export class Account {
     config: commons.config.Config,
     coders: typeof this.coders
   ): Wallet {
-    const isNetworkZero = ethers.constants.Zero.eq(chainId)
+    const isNetworkZero = BigInt(chainId) === 0n
     return new Wallet({
       config,
       context,
@@ -486,7 +491,7 @@ export class Account {
   }
 
   async publishWitness(): Promise<void> {
-    const digest = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(`This is a Sequence account woo! ${Date.now()}`))
+    const digest = ethers.id(`This is a Sequence account woo! ${Date.now()}`)
     const signature = await this.signDigest(digest, 0, false)
     const decoded = this.coders.signature.decode(signature)
     const signatures = this.coders.signature.signaturesOfDecoded(decoded)
@@ -506,7 +511,7 @@ export class Account {
     // So we ignore the state on "chain zero" and instead use one of the states of the networks
     // wallet-webapp should ensure the wallet is as migrated as possible, trying to mimic
     // the behaviour of being migrated on all chains
-    const chainRef = ethers.constants.Zero.eq(chainId) ? this.networks[0].chainId : chainId
+    const chainRef = BigInt(chainId) === 0n ? this.networks[0].chainId : chainId
     const status = await this.status(chainRef)
     this.mustBeFullyMigrated(status)
 
@@ -541,8 +546,12 @@ export class Account {
   }
 
   buildOnChainSignature(digest: ethers.BytesLike): { bundle: commons.transaction.TransactionBundle; signature: string } {
-    const subdigest = commons.signature.subdigestOf({ digest: ethers.utils.hexlify(digest), chainId: 0, address: this.address })
-    const hexSubdigest = ethers.utils.hexlify(subdigest)
+    const subdigest = commons.signature.subdigestOf({
+      digest: ethers.hexlify(digest),
+      chainId: 0,
+      address: this.address
+    })
+    const hexSubdigest = ethers.hexlify(subdigest)
     const config = this.coders.config.fromSimple({
       // Threshold *only* needs to be > 0, this is not a magic number
       // we only use 2 ** 15 because it may lead to lower gas costs in some chains
@@ -552,7 +561,7 @@ export class Account {
       subdigests: [hexSubdigest]
     })
 
-    const walletInterface = new ethers.utils.Interface(walletContracts.mainModule.abi)
+    const walletInterface = new ethers.Interface(walletContracts.mainModule.abi)
     const bundle: commons.transaction.TransactionBundle = {
       entrypoint: this.address,
       transactions: [
@@ -590,12 +599,12 @@ export class Account {
       throw new Error('Cannot build EIP-6492 signature without bootstrap transactions')
     }
 
-    const encoded = ethers.utils.defaultAbiCoder.encode(
+    const encoded = ethers.AbiCoder.defaultAbiCoder().encode(
       ['address', 'bytes', 'bytes'],
       [bootstrapBundle.entrypoint, commons.transaction.encodeBundleExecData(bootstrapBundle), signature]
     )
 
-    return ethers.utils.solidityPack(['bytes', 'bytes32'], [encoded, commons.EIP6492.EIP_6492_SUFFIX])
+    return ethers.solidityPacked(['bytes', 'bytes32'], [encoded, commons.EIP6492.EIP_6492_SUFFIX])
   }
 
   async editConfig(changes: {
@@ -606,7 +615,7 @@ export class Account {
     const currentConfig = await this.status(0).then(s => s.config)
     const newConfig = this.coders.config.editConfig(currentConfig, {
       ...changes,
-      checkpoint: this.coders.config.checkpointOf(currentConfig).add(1)
+      checkpoint: this.coders.config.checkpointOf(currentConfig) + 1n
     })
 
     return this.updateConfig(newConfig)
@@ -671,7 +680,6 @@ export class Account {
 
       transactions.push(...deployTransaction.transactions)
     }
-    const len = transactions.length
 
     // Get pending migrations
     transactions.push(
@@ -718,7 +726,7 @@ export class Account {
     chainId: ethers.BigNumberish,
     cantValidateBehavior: 'ignore' | 'eip6492' | 'throw' = 'ignore'
   ): Promise<string> {
-    return this.signDigest(ethers.utils.keccak256(message), chainId, true, cantValidateBehavior)
+    return this.signDigest(ethers.keccak256(message), chainId, true, cantValidateBehavior)
   }
 
   async signTransactions(
@@ -735,7 +743,7 @@ export class Account {
 
     const wallet = this.walletForStatus(chainId, status)
 
-    const metadata: WalletSignRequestMetadata = {
+    const metadata: commons.WalletSignRequestMetadata = {
       address: this.address,
       digest: '', // Set in wallet.signTransactions
       chainId,
@@ -840,7 +848,7 @@ export class Account {
     quote?: FeeQuote,
     pstatus?: AccountStatus,
     callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void
-  ): Promise<ethers.providers.TransactionResponse> {
+  ): Promise<ethers.TransactionResponse> {
     if (!Array.isArray(signedBundle)) {
       return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback)
     }
@@ -887,7 +895,7 @@ export class Account {
     const stubSignature = wallet.coders.config.buildStubSignature(wallet.config, stubSignatureOverrides)
 
     // Now we can decorate the transactions as always, but we need to manually build the signed bundle
-    const intentId = ethers.utils.hexlify(ethers.utils.randomBytes(32))
+    const intentId = ethers.hexlify(ethers.randomBytes(32))
     const signedBundle: commons.transaction.SignedTransactionBundle = {
       chainId,
       intent: {
@@ -938,7 +946,7 @@ export class Account {
       nonceSpace?: ethers.BigNumberish
       serial?: boolean
     }
-  ): Promise<ethers.providers.TransactionResponse | undefined> {
+  ): Promise<ethers.TransactionResponse | undefined> {
     const status = await this.status(chainId)
 
     const predecorated = skipPreDecorate ? txs : await this.predecorateTransactions(txs, status, chainId)
@@ -957,8 +965,8 @@ export class Account {
   }
 
   async signTypedData(
-    domain: TypedDataDomain,
-    types: Record<string, Array<TypedDataField>>,
+    domain: ethers.TypedDataDomain,
+    types: Record<string, Array<ethers.TypedDataField>>,
     message: Record<string, any>,
     chainId: ethers.BigNumberish,
     cantValidateBehavior: 'ignore' | 'eip6492' | 'throw' = 'ignore'