@0xsequence/account 1.10.15 → 2.0.1

package/dist/0xsequence-account.cjs.dev.js

@@ -25,20 +25,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.ethers.BigNumber.from(option.value);
+  const value = BigInt(option.value);
   switch (option.token.type) {
     case relayer.proto.FeeTokenType.UNKNOWN:
       return [{
@@ -46,8 +35,8 @@ function encodeGasRefundTransaction(option) {
         revertOnError: true,
         gasLimit: option.gasLimit,
         to: option.to,
-        value: value.toHexString(),
-        data: []
+        value: utils.toHexString(value),
+        data: '0x'
       }];
     case relayer.proto.FeeTokenType.ERC20_TOKEN:
       if (!option.token.contractAddress) {
@@ -59,7 +48,7 @@ function encodeGasRefundTransaction(option) {
         gasLimit: option.gasLimit,
         to: option.token.contractAddress,
         value: 0,
-        data: new ethers.ethers.utils.Interface([{
+        data: new ethers.ethers.Interface([{
           constant: false,
           inputs: [{
             type: 'address'
@@ -69,7 +58,7 @@ function encodeGasRefundTransaction(option) {
           name: 'transfer',
           outputs: [],
           type: 'function'
-        }]).encodeFunctionData('transfer', [option.to, value.toHexString()])
+        }]).encodeFunctionData('transfer', [option.to, utils.toHexString(value)])
       }];
     default:
       throw new Error(`Unhandled fee token type ${option.token.type}`);
@@ -80,7 +69,6 @@ class AccountSigner {
     this.account = account;
     this.chainId = chainId;
     this.options = options;
-    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -92,6 +80,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;
@@ -113,33 +105,32 @@ class AccountSigner {
       if (option.token.type === relayer.proto.FeeTokenType.UNKNOWN) {
         // Native token
         const balance = await this.getBalance();
-        if (balance.gte(ethers.ethers.BigNumber.from(option.value))) {
+        if (balance >= BigInt(option.value)) {
           return option;
         }
       } else if (option.token.contractAddress && option.token.type === relayer.proto.FeeTokenType.ERC20_TOKEN) {
         // ERC20 token
         const token = new ethers.ethers.Contract(option.token.contractAddress, balanceOfAbi, this.provider);
         const balance = await token.balanceOf(this.account.address);
-        if (balance.gte(ethers.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.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
   }
@@ -147,7 +138,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);
@@ -167,7 +160,7 @@ class AccountSigner {
     throw new Error('Method not implemented.');
   }
   getChainId() {
-    return Promise.resolve(ethers.ethers.BigNumber.from(this.chainId).toNumber());
+    return Promise.resolve(Number(this.chainId));
   }
   getGasPrice() {
     throw new Error('Method not implemented.');
@@ -175,10 +168,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) {
@@ -197,7 +196,7 @@ class Chain0Reader {
     return undefined;
   }
   async nonce(_wallet, _space) {
-    return ethers.ethers.constants.Zero;
+    return 0n;
   }
   async isValidSignature(_wallet, _digest, _signature) {
     throw new Error('Method not supported.');
@@ -214,7 +213,7 @@ class Account {
     this.orchestrator = void 0;
     this.jwt = void 0;
     this.projectAccessKey = void 0;
-    this.address = ethers.ethers.utils.getAddress(options.address);
+    this.address = ethers.ethers.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
     this.networks = options.networks;
@@ -264,21 +263,25 @@ class Account {
     };
   }
   network(chainId) {
-    const tcid = ethers.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.ethers.providers.StaticJsonRpcProvider(utils.getEthersConnectionInfo(found.rpcUrl, this.projectAccessKey, this.jwt), {
-      name: '',
-      chainId: ethers.ethers.BigNumber.from(chainId).toNumber()
+    if (!found.provider && !found.rpcUrl) {
+      throw new Error(`Provider not found for chainId ${chainId}`);
+    }
+    const network = new ethers.ethers.Network(found.name, found.chainId);
+    return found.provider || new ethers.ethers.JsonRpcProvider(utils.getFetchRequest(found.rpcUrl, this.projectAccessKey, this.jwt), network, {
+      staticNetwork: network
     });
   }
   reader(chainId) {
-    if (ethers.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
@@ -310,7 +313,7 @@ class Account {
     return this.walletFor(chainId, this.contextFor(status.version), status.config, coder);
   }
   walletFor(chainId, context, config, coders) {
-    const isNetworkZero = ethers.ethers.constants.Zero.eq(chainId);
+    const isNetworkZero = BigInt(chainId) === 0n;
     return new wallet.Wallet({
       config,
       context,
@@ -512,7 +515,7 @@ class Account {
     return coder.trim(chainedSignature);
   }
   async publishWitness() {
-    const digest = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(`This is a Sequence account woo! ${Date.now()}`));
+    const digest = ethers.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);
@@ -530,7 +533,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.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);
 
@@ -561,11 +564,11 @@ class Account {
   }
   buildOnChainSignature(digest) {
     const subdigest = core.commons.signature.subdigestOf({
-      digest: ethers.ethers.utils.hexlify(digest),
+      digest: ethers.ethers.hexlify(digest),
       chainId: 0,
       address: this.address
     });
-    const hexSubdigest = ethers.ethers.utils.hexlify(subdigest);
+    const hexSubdigest = ethers.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
@@ -574,7 +577,7 @@ class Account {
       signers: [],
       subdigests: [hexSubdigest]
     });
-    const walletInterface = new ethers.ethers.utils.Interface(abi.walletContracts.mainModule.abi);
+    const walletInterface = new ethers.ethers.Interface(abi.walletContracts.mainModule.abi);
     const bundle = {
       entrypoint: this.address,
       transactions: [{
@@ -609,13 +612,13 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       throw new Error('Cannot build EIP-6492 signature without bootstrap transactions');
     }
-    const encoded = ethers.ethers.utils.defaultAbiCoder.encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, core.commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
-    return ethers.ethers.utils.solidityPack(['bytes', 'bytes32'], [encoded, core.commons.EIP6492.EIP_6492_SUFFIX]);
+    const encoded = ethers.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, core.commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
+    return ethers.ethers.solidityPacked(['bytes', 'bytes32'], [encoded, core.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);
   }
@@ -675,7 +678,6 @@ class Account {
       const deployTransaction = wallet.Wallet.buildDeployTransaction(status.original.context, status.original.imageHash);
       transactions.push(...deployTransaction.transactions);
     }
-    transactions.length;
 
     // Get pending migrations
     transactions.push(...status.signedMigrations.map(m => ({
@@ -719,7 +721,7 @@ class Account {
     }), feeQuote);
   }
   signMessage(message, chainId, cantValidateBehavior = 'ignore') {
-    return this.signDigest(ethers.ethers.utils.keccak256(message), chainId, true, cantValidateBehavior);
+    return this.signDigest(ethers.ethers.keccak256(message), chainId, true, cantValidateBehavior);
   }
   async signTransactions(txs, chainId, pstatus, options) {
     const status = pstatus || (await this.status(chainId));
@@ -845,7 +847,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.ethers.utils.hexlify(ethers.ethers.utils.randomBytes(32));
+    const intentId = ethers.ethers.hexlify(ethers.ethers.randomBytes(32));
     const signedBundle = {
       chainId,
       intent: {

package/dist/0xsequence-account.cjs.prod.js

@@ -25,20 +25,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.ethers.BigNumber.from(option.value);
+  const value = BigInt(option.value);
   switch (option.token.type) {
     case relayer.proto.FeeTokenType.UNKNOWN:
       return [{
@@ -46,8 +35,8 @@ function encodeGasRefundTransaction(option) {
         revertOnError: true,
         gasLimit: option.gasLimit,
         to: option.to,
-        value: value.toHexString(),
-        data: []
+        value: utils.toHexString(value),
+        data: '0x'
       }];
     case relayer.proto.FeeTokenType.ERC20_TOKEN:
       if (!option.token.contractAddress) {
@@ -59,7 +48,7 @@ function encodeGasRefundTransaction(option) {
         gasLimit: option.gasLimit,
         to: option.token.contractAddress,
         value: 0,
-        data: new ethers.ethers.utils.Interface([{
+        data: new ethers.ethers.Interface([{
           constant: false,
           inputs: [{
             type: 'address'
@@ -69,7 +58,7 @@ function encodeGasRefundTransaction(option) {
           name: 'transfer',
           outputs: [],
           type: 'function'
-        }]).encodeFunctionData('transfer', [option.to, value.toHexString()])
+        }]).encodeFunctionData('transfer', [option.to, utils.toHexString(value)])
       }];
     default:
       throw new Error(`Unhandled fee token type ${option.token.type}`);
@@ -80,7 +69,6 @@ class AccountSigner {
     this.account = account;
     this.chainId = chainId;
     this.options = options;
-    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -92,6 +80,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;
@@ -113,33 +105,32 @@ class AccountSigner {
       if (option.token.type === relayer.proto.FeeTokenType.UNKNOWN) {
         // Native token
         const balance = await this.getBalance();
-        if (balance.gte(ethers.ethers.BigNumber.from(option.value))) {
+        if (balance >= BigInt(option.value)) {
           return option;
         }
       } else if (option.token.contractAddress && option.token.type === relayer.proto.FeeTokenType.ERC20_TOKEN) {
         // ERC20 token
         const token = new ethers.ethers.Contract(option.token.contractAddress, balanceOfAbi, this.provider);
         const balance = await token.balanceOf(this.account.address);
-        if (balance.gte(ethers.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.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
   }
@@ -147,7 +138,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);
@@ -167,7 +160,7 @@ class AccountSigner {
     throw new Error('Method not implemented.');
   }
   getChainId() {
-    return Promise.resolve(ethers.ethers.BigNumber.from(this.chainId).toNumber());
+    return Promise.resolve(Number(this.chainId));
   }
   getGasPrice() {
     throw new Error('Method not implemented.');
@@ -175,10 +168,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) {
@@ -197,7 +196,7 @@ class Chain0Reader {
     return undefined;
   }
   async nonce(_wallet, _space) {
-    return ethers.ethers.constants.Zero;
+    return 0n;
   }
   async isValidSignature(_wallet, _digest, _signature) {
     throw new Error('Method not supported.');
@@ -214,7 +213,7 @@ class Account {
     this.orchestrator = void 0;
     this.jwt = void 0;
     this.projectAccessKey = void 0;
-    this.address = ethers.ethers.utils.getAddress(options.address);
+    this.address = ethers.ethers.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
     this.networks = options.networks;
@@ -264,21 +263,25 @@ class Account {
     };
   }
   network(chainId) {
-    const tcid = ethers.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.ethers.providers.StaticJsonRpcProvider(utils.getEthersConnectionInfo(found.rpcUrl, this.projectAccessKey, this.jwt), {
-      name: '',
-      chainId: ethers.ethers.BigNumber.from(chainId).toNumber()
+    if (!found.provider && !found.rpcUrl) {
+      throw new Error(`Provider not found for chainId ${chainId}`);
+    }
+    const network = new ethers.ethers.Network(found.name, found.chainId);
+    return found.provider || new ethers.ethers.JsonRpcProvider(utils.getFetchRequest(found.rpcUrl, this.projectAccessKey, this.jwt), network, {
+      staticNetwork: network
     });
   }
   reader(chainId) {
-    if (ethers.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
@@ -310,7 +313,7 @@ class Account {
     return this.walletFor(chainId, this.contextFor(status.version), status.config, coder);
   }
   walletFor(chainId, context, config, coders) {
-    const isNetworkZero = ethers.ethers.constants.Zero.eq(chainId);
+    const isNetworkZero = BigInt(chainId) === 0n;
     return new wallet.Wallet({
       config,
       context,
@@ -512,7 +515,7 @@ class Account {
     return coder.trim(chainedSignature);
   }
   async publishWitness() {
-    const digest = ethers.ethers.utils.keccak256(ethers.ethers.utils.toUtf8Bytes(`This is a Sequence account woo! ${Date.now()}`));
+    const digest = ethers.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);
@@ -530,7 +533,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.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);
 
@@ -561,11 +564,11 @@ class Account {
   }
   buildOnChainSignature(digest) {
     const subdigest = core.commons.signature.subdigestOf({
-      digest: ethers.ethers.utils.hexlify(digest),
+      digest: ethers.ethers.hexlify(digest),
       chainId: 0,
       address: this.address
     });
-    const hexSubdigest = ethers.ethers.utils.hexlify(subdigest);
+    const hexSubdigest = ethers.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
@@ -574,7 +577,7 @@ class Account {
       signers: [],
       subdigests: [hexSubdigest]
     });
-    const walletInterface = new ethers.ethers.utils.Interface(abi.walletContracts.mainModule.abi);
+    const walletInterface = new ethers.ethers.Interface(abi.walletContracts.mainModule.abi);
     const bundle = {
       entrypoint: this.address,
       transactions: [{
@@ -609,13 +612,13 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       throw new Error('Cannot build EIP-6492 signature without bootstrap transactions');
     }
-    const encoded = ethers.ethers.utils.defaultAbiCoder.encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, core.commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
-    return ethers.ethers.utils.solidityPack(['bytes', 'bytes32'], [encoded, core.commons.EIP6492.EIP_6492_SUFFIX]);
+    const encoded = ethers.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'bytes', 'bytes'], [bootstrapBundle.entrypoint, core.commons.transaction.encodeBundleExecData(bootstrapBundle), signature]);
+    return ethers.ethers.solidityPacked(['bytes', 'bytes32'], [encoded, core.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);
   }
@@ -675,7 +678,6 @@ class Account {
       const deployTransaction = wallet.Wallet.buildDeployTransaction(status.original.context, status.original.imageHash);
       transactions.push(...deployTransaction.transactions);
     }
-    transactions.length;
 
     // Get pending migrations
     transactions.push(...status.signedMigrations.map(m => ({
@@ -719,7 +721,7 @@ class Account {
     }), feeQuote);
   }
   signMessage(message, chainId, cantValidateBehavior = 'ignore') {
-    return this.signDigest(ethers.ethers.utils.keccak256(message), chainId, true, cantValidateBehavior);
+    return this.signDigest(ethers.ethers.keccak256(message), chainId, true, cantValidateBehavior);
   }
   async signTransactions(txs, chainId, pstatus, options) {
     const status = pstatus || (await this.status(chainId));
@@ -845,7 +847,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.ethers.utils.hexlify(ethers.ethers.utils.randomBytes(32));
+    const intentId = ethers.ethers.hexlify(ethers.ethers.randomBytes(32));
     const signedBundle = {
       chainId,
       intent: {