@0xsequence/account 1.5.0 → 1.6.1

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var abi = require('@0xsequence/abi');
 var core = require('@0xsequence/core');
 var migration = require('@0xsequence/migration');
 var relayer = require('@0xsequence/relayer');
@@ -76,10 +77,10 @@ function encodeGasRefundTransaction(option) {
 }
 class AccountSigner {
   constructor(account, chainId, options) {
-    this._isSigner = true;
     this.account = account;
     this.chainId = chainId;
     this.options = options;
+    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -142,7 +143,6 @@ class AccountSigner {
       nonceSpace: this.options.nonceSpace
     } : undefined); // Will always have a transaction response
   }
-
   getBalance(blockTag) {
     return this.provider.getBalance(this.account.address, blockTag);
   }
@@ -205,6 +205,14 @@ class Chain0Reader {
 }
 class Account {
   constructor(options) {
+    this.address = void 0;
+    this.networks = void 0;
+    this.tracker = void 0;
+    this.contexts = void 0;
+    this.migrator = void 0;
+    this.migrations = void 0;
+    this.orchestrator = void 0;
+    this.jwt = void 0;
     this.address = ethers.ethers.utils.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
@@ -546,6 +554,51 @@ class Account {
     }
     return decorated;
   }
+  buildOnChainSignature(digest) {
+    const subdigest = core.commons.signature.subdigestOf({
+      digest: ethers.ethers.utils.hexlify(digest),
+      chainId: 0,
+      address: this.address
+    });
+    const hexSubdigest = ethers.ethers.utils.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
+      threshold: 32768,
+      checkpoint: 0,
+      signers: [],
+      subdigests: [hexSubdigest]
+    });
+    const walletInterface = new ethers.ethers.utils.Interface(abi.walletContracts.mainModule.abi);
+    const bundle = {
+      entrypoint: this.address,
+      transactions: [{
+        to: this.address,
+        data: walletInterface.encodeFunctionData(
+        // *NEVER* use updateImageHash here, as it would effectively destroy the wallet
+        // setExtraImageHash sets an additional imageHash, without changing the current one
+        'setExtraImageHash', [this.coders.config.imageHashOf(config),
+        // 2 ** 255 instead of max uint256, to have more zeros in the calldata
+        '57896044618658097711785492504343953926634992332820282019728792003956564819968']),
+        // Conservative gas limit, used because the current relayer
+        // has trouble estimating gas for this transaction
+        gasLimit: 250000
+      }]
+    };
+
+    // Fire and forget request to save the config
+    this.tracker.saveWalletConfig({
+      config
+    });
+
+    // Encode a signature proof for the given subdigest
+    // use `chainId = 0` to make it simpler, as this signature is only a proof
+    const signature = this.coders.signature.encodeSigners(config, new Map(), [hexSubdigest], 0).encoded;
+    return {
+      bundle,
+      signature
+    };
+  }
   async buildEIP6492Signature(signature, status, chainId) {
     const bootstrapBundle = await this.buildBootstrapTransactions(status, chainId);
     if (bootstrapBundle.transactions.length === 0) {
@@ -678,9 +731,11 @@ class Account {
       decorate: true,
       cantValidateBehavior: 'ignore'
     };
-    const signed = await wallet.signTransactions(txs, (options == null ? void 0 : options.nonceSpace) && {
-      space: options == null ? void 0 : options.nonceSpace
-    }, metadata);
+    const nonceOptions = (options == null ? void 0 : options.nonceSpace) && {
+      space: options == null ? void 0 : options.nonceSpace,
+      serial: options == null ? void 0 : options.serial
+    };
+    const signed = await wallet.signTransactions(txs, nonceOptions, metadata);
     return _extends({}, signed, {
       signature: await this.decorateSignature(signed.signature, status)
     });
@@ -765,7 +820,7 @@ class Account {
     const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
-    callback == null ? void 0 : callback(decoratedBundle);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -796,7 +851,6 @@ class Account {
       entrypoint: this.address,
       nonce: 0 // The relayer also ignored the nonce
     };
-
     const decoratedBundle = await this.decorateTransactions(signedBundle, wstatus);
     const data = core.commons.transaction.encodeBundleExecData(decoratedBundle);
     const res = await this.relayer(chainId).getFeeOptionsRaw(decoratedBundle.entrypoint, data, options);

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var abi = require('@0xsequence/abi');
 var core = require('@0xsequence/core');
 var migration = require('@0xsequence/migration');
 var relayer = require('@0xsequence/relayer');
@@ -76,10 +77,10 @@ function encodeGasRefundTransaction(option) {
 }
 class AccountSigner {
   constructor(account, chainId, options) {
-    this._isSigner = true;
     this.account = account;
     this.chainId = chainId;
     this.options = options;
+    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -142,7 +143,6 @@ class AccountSigner {
       nonceSpace: this.options.nonceSpace
     } : undefined); // Will always have a transaction response
   }
-
   getBalance(blockTag) {
     return this.provider.getBalance(this.account.address, blockTag);
   }
@@ -205,6 +205,14 @@ class Chain0Reader {
 }
 class Account {
   constructor(options) {
+    this.address = void 0;
+    this.networks = void 0;
+    this.tracker = void 0;
+    this.contexts = void 0;
+    this.migrator = void 0;
+    this.migrations = void 0;
+    this.orchestrator = void 0;
+    this.jwt = void 0;
     this.address = ethers.ethers.utils.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
@@ -546,6 +554,51 @@ class Account {
     }
     return decorated;
   }
+  buildOnChainSignature(digest) {
+    const subdigest = core.commons.signature.subdigestOf({
+      digest: ethers.ethers.utils.hexlify(digest),
+      chainId: 0,
+      address: this.address
+    });
+    const hexSubdigest = ethers.ethers.utils.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
+      threshold: 32768,
+      checkpoint: 0,
+      signers: [],
+      subdigests: [hexSubdigest]
+    });
+    const walletInterface = new ethers.ethers.utils.Interface(abi.walletContracts.mainModule.abi);
+    const bundle = {
+      entrypoint: this.address,
+      transactions: [{
+        to: this.address,
+        data: walletInterface.encodeFunctionData(
+        // *NEVER* use updateImageHash here, as it would effectively destroy the wallet
+        // setExtraImageHash sets an additional imageHash, without changing the current one
+        'setExtraImageHash', [this.coders.config.imageHashOf(config),
+        // 2 ** 255 instead of max uint256, to have more zeros in the calldata
+        '57896044618658097711785492504343953926634992332820282019728792003956564819968']),
+        // Conservative gas limit, used because the current relayer
+        // has trouble estimating gas for this transaction
+        gasLimit: 250000
+      }]
+    };
+
+    // Fire and forget request to save the config
+    this.tracker.saveWalletConfig({
+      config
+    });
+
+    // Encode a signature proof for the given subdigest
+    // use `chainId = 0` to make it simpler, as this signature is only a proof
+    const signature = this.coders.signature.encodeSigners(config, new Map(), [hexSubdigest], 0).encoded;
+    return {
+      bundle,
+      signature
+    };
+  }
   async buildEIP6492Signature(signature, status, chainId) {
     const bootstrapBundle = await this.buildBootstrapTransactions(status, chainId);
     if (bootstrapBundle.transactions.length === 0) {
@@ -678,9 +731,11 @@ class Account {
       decorate: true,
       cantValidateBehavior: 'ignore'
     };
-    const signed = await wallet.signTransactions(txs, (options == null ? void 0 : options.nonceSpace) && {
-      space: options == null ? void 0 : options.nonceSpace
-    }, metadata);
+    const nonceOptions = (options == null ? void 0 : options.nonceSpace) && {
+      space: options == null ? void 0 : options.nonceSpace,
+      serial: options == null ? void 0 : options.serial
+    };
+    const signed = await wallet.signTransactions(txs, nonceOptions, metadata);
     return _extends({}, signed, {
       signature: await this.decorateSignature(signed.signature, status)
     });
@@ -765,7 +820,7 @@ class Account {
     const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
-    callback == null ? void 0 : callback(decoratedBundle);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -796,7 +851,6 @@ class Account {
       entrypoint: this.address,
       nonce: 0 // The relayer also ignored the nonce
     };
-
     const decoratedBundle = await this.decorateTransactions(signedBundle, wstatus);
     const data = core.commons.transaction.encodeBundleExecData(decoratedBundle);
     const res = await this.relayer(chainId).getFeeOptionsRaw(decoratedBundle.entrypoint, data, options);

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

@@ -1,3 +1,4 @@
+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';
@@ -72,10 +73,10 @@ function encodeGasRefundTransaction(option) {
 }
 class AccountSigner {
   constructor(account, chainId, options) {
-    this._isSigner = true;
     this.account = account;
     this.chainId = chainId;
     this.options = options;
+    this._isSigner = true;
   }
   get provider() {
     return this.account.providerFor(this.chainId);
@@ -138,7 +139,6 @@ class AccountSigner {
       nonceSpace: this.options.nonceSpace
     } : undefined); // Will always have a transaction response
   }
-
   getBalance(blockTag) {
     return this.provider.getBalance(this.account.address, blockTag);
   }
@@ -201,6 +201,14 @@ class Chain0Reader {
 }
 class Account {
   constructor(options) {
+    this.address = void 0;
+    this.networks = void 0;
+    this.tracker = void 0;
+    this.contexts = void 0;
+    this.migrator = void 0;
+    this.migrations = void 0;
+    this.orchestrator = void 0;
+    this.jwt = void 0;
     this.address = ethers.utils.getAddress(options.address);
     this.contexts = options.contexts;
     this.tracker = options.tracker;
@@ -542,6 +550,51 @@ class Account {
     }
     return decorated;
   }
+  buildOnChainSignature(digest) {
+    const subdigest = commons.signature.subdigestOf({
+      digest: ethers.utils.hexlify(digest),
+      chainId: 0,
+      address: this.address
+    });
+    const hexSubdigest = ethers.utils.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
+      threshold: 32768,
+      checkpoint: 0,
+      signers: [],
+      subdigests: [hexSubdigest]
+    });
+    const walletInterface = new ethers.utils.Interface(walletContracts.mainModule.abi);
+    const bundle = {
+      entrypoint: this.address,
+      transactions: [{
+        to: this.address,
+        data: walletInterface.encodeFunctionData(
+        // *NEVER* use updateImageHash here, as it would effectively destroy the wallet
+        // setExtraImageHash sets an additional imageHash, without changing the current one
+        'setExtraImageHash', [this.coders.config.imageHashOf(config),
+        // 2 ** 255 instead of max uint256, to have more zeros in the calldata
+        '57896044618658097711785492504343953926634992332820282019728792003956564819968']),
+        // Conservative gas limit, used because the current relayer
+        // has trouble estimating gas for this transaction
+        gasLimit: 250000
+      }]
+    };
+
+    // Fire and forget request to save the config
+    this.tracker.saveWalletConfig({
+      config
+    });
+
+    // Encode a signature proof for the given subdigest
+    // use `chainId = 0` to make it simpler, as this signature is only a proof
+    const signature = this.coders.signature.encodeSigners(config, new Map(), [hexSubdigest], 0).encoded;
+    return {
+      bundle,
+      signature
+    };
+  }
   async buildEIP6492Signature(signature, status, chainId) {
     const bootstrapBundle = await this.buildBootstrapTransactions(status, chainId);
     if (bootstrapBundle.transactions.length === 0) {
@@ -674,9 +727,11 @@ class Account {
       decorate: true,
       cantValidateBehavior: 'ignore'
     };
-    const signed = await wallet.signTransactions(txs, (options == null ? void 0 : options.nonceSpace) && {
-      space: options == null ? void 0 : options.nonceSpace
-    }, metadata);
+    const nonceOptions = (options == null ? void 0 : options.nonceSpace) && {
+      space: options == null ? void 0 : options.nonceSpace,
+      serial: options == null ? void 0 : options.serial
+    };
+    const signed = await wallet.signTransactions(txs, nonceOptions, metadata);
     return _extends({}, signed, {
       signature: await this.decorateSignature(signed.signature, status)
     });
@@ -761,7 +816,7 @@ class Account {
     const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
-    callback == null ? void 0 : callback(decoratedBundle);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -792,7 +847,6 @@ class Account {
       entrypoint: this.address,
       nonce: 0 // The relayer also ignored the nonce
     };
-
     const decoratedBundle = await this.decorateTransactions(signedBundle, wstatus);
     const data = commons.transaction.encodeBundleExecData(decoratedBundle);
     const res = await this.relayer(chainId).getFeeOptionsRaw(decoratedBundle.entrypoint, data, options);

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

@@ -85,6 +85,10 @@ export declare class Account {
     decorateSignature<T extends ethers.BytesLike>(signature: T, status: Partial<Pick<AccountStatus, 'presignedConfigurations'>>): Promise<T | string>;
     publishWitness(): Promise<void>;
     signDigest(digest: ethers.BytesLike, chainId: ethers.BigNumberish, decorate?: boolean, cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw', metadata?: object): Promise<string>;
+    buildOnChainSignature(digest: ethers.BytesLike): {
+        bundle: commons.transaction.TransactionBundle;
+        signature: string;
+    };
     private buildEIP6492Signature;
     editConfig(changes: {
         add?: commons.config.SimpleSigner[];
@@ -109,6 +113,7 @@ export declare class Account {
     signMessage(message: ethers.BytesLike, chainId: ethers.BigNumberish, cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw'): Promise<string>;
     signTransactions(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, pstatus?: AccountStatus, options?: {
         nonceSpace?: ethers.BigNumberish;
+        serial?: boolean;
     }): Promise<commons.transaction.SignedTransactionBundle>;
     signMigrations(chainId: ethers.BigNumberish, editConfig: (prevConfig: commons.config.Config) => commons.config.Config): Promise<boolean>;
     signAllMigrations(editConfig: (prevConfig: commons.config.Config) => commons.config.Config): Promise<{
@@ -136,6 +141,7 @@ export declare class Account {
     }): Promise<PreparedTransactions>;
     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>;
     getSigners(): Promise<Array<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/account",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "tools for migrating sequence wallets to new versions",
   "repository": "https://github.com/0xsequence/sequence.js/tree/master/packages/account",
   "source": "src/index.ts",
@@ -10,19 +10,20 @@
   "license": "Apache-2.0",
   "dependencies": {
     "ethers": "^5.5.2",
-    "@0xsequence/core": "1.5.0",
-    "@0xsequence/migration": "1.5.0",
-    "@0xsequence/network": "1.5.0",
-    "@0xsequence/relayer": "1.5.0",
-    "@0xsequence/sessions": "1.5.0",
-    "@0xsequence/utils": "1.5.0",
-    "@0xsequence/wallet": "1.5.0"
+    "@0xsequence/abi": "1.6.1",
+    "@0xsequence/core": "1.6.1",
+    "@0xsequence/migration": "1.6.1",
+    "@0xsequence/network": "1.6.1",
+    "@0xsequence/relayer": "1.6.1",
+    "@0xsequence/sessions": "1.6.1",
+    "@0xsequence/utils": "1.6.1",
+    "@0xsequence/wallet": "1.6.1"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "1.5.0",
-    "@0xsequence/tests": "1.5.0"
+    "@0xsequence/signhub": "1.6.1",
+    "@0xsequence/tests": "1.6.1"
   },
   "files": [
     "src",

package/src/account.ts

@@ -1,3 +1,4 @@
+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'
@@ -526,6 +527,50 @@ export class Account {
     return decorated
   }
 
+  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 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
+      threshold: 32768,
+      checkpoint: 0,
+      signers: [],
+      subdigests: [hexSubdigest]
+    })
+
+    const walletInterface = new ethers.utils.Interface(walletContracts.mainModule.abi)
+    const bundle: commons.transaction.TransactionBundle = {
+      entrypoint: this.address,
+      transactions: [
+        {
+          to: this.address,
+          data: walletInterface.encodeFunctionData(
+            // *NEVER* use updateImageHash here, as it would effectively destroy the wallet
+            // setExtraImageHash sets an additional imageHash, without changing the current one
+            'setExtraImageHash',
+            [
+              this.coders.config.imageHashOf(config),
+              // 2 ** 255 instead of max uint256, to have more zeros in the calldata
+              '57896044618658097711785492504343953926634992332820282019728792003956564819968'
+            ]
+          ),
+          // Conservative gas limit, used because the current relayer
+          // has trouble estimating gas for this transaction
+          gasLimit: 250000
+        }
+      ]
+    }
+
+    // Fire and forget request to save the config
+    this.tracker.saveWalletConfig({ config })
+
+    // Encode a signature proof for the given subdigest
+    // use `chainId = 0` to make it simpler, as this signature is only a proof
+    const signature = this.coders.signature.encodeSigners(config, new Map(), [hexSubdigest], 0).encoded
+    return { bundle, signature }
+  }
+
   private async buildEIP6492Signature(signature: string, status: AccountStatus, chainId: ethers.BigNumberish): Promise<string> {
     const bootstrapBundle = await this.buildBootstrapTransactions(status, chainId)
     if (bootstrapBundle.transactions.length === 0) {
@@ -669,6 +714,7 @@ export class Account {
     pstatus?: AccountStatus,
     options?: {
       nonceSpace?: ethers.BigNumberish
+      serial?: boolean
     }
   ): Promise<commons.transaction.SignedTransactionBundle> {
     const status = pstatus || (await this.status(chainId))
@@ -685,7 +731,8 @@ export class Account {
       cantValidateBehavior: 'ignore'
     }
 
-    const signed = await wallet.signTransactions(txs, options?.nonceSpace && { space: options?.nonceSpace }, metadata)
+    const nonceOptions = options?.nonceSpace && { space: options?.nonceSpace, serial: options?.serial }
+    const signed = await wallet.signTransactions(txs, nonceOptions, metadata)
 
     return {
       ...signed,
@@ -871,6 +918,7 @@ export class Account {
     callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void,
     options?: {
       nonceSpace?: ethers.BigNumberish
+      serial?: boolean
     }
   ): Promise<ethers.providers.TransactionResponse | undefined> {
     const status = await this.status(chainId)