@0xsequence/account 1.4.9 → 1.6.0

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

@@ -76,10 +76,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 +142,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 +204,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;
@@ -442,7 +449,7 @@ class Account {
     return txs;
   }
   async decorateTransactions(bundles, status, chainId) {
-    var _chainId;
+    var _chainId, _bundles$;
     if (!Array.isArray(bundles)) {
       // Recurse with array
       return this.decorateTransactions([bundles], status, chainId);
@@ -464,7 +471,7 @@ class Account {
       entrypoint,
       chainId,
       // Intent of the first bundle is used
-      intent: bundles[0].intent,
+      intent: (_bundles$ = bundles[0]) == null ? void 0 : _bundles$.intent,
       transactions: [...bootstrapBundle.transactions, ...bundles.map(bundle => ({
         to: bundle.entrypoint,
         data: core.commons.transaction.encodeBundleExecData(bundle),
@@ -477,7 +484,15 @@ class Account {
 
     // Re-compute the meta-transaction id to use the guest module subdigest
     if (!status.onChain.deployed) {
-      decoratedBundle.intent.id = core.commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      const id = core.commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      if (decoratedBundle.intent === undefined) {
+        decoratedBundle.intent = {
+          id,
+          wallet: this.address
+        };
+      } else {
+        decoratedBundle.intent.id = id;
+      }
     }
     return decoratedBundle;
   }
@@ -670,9 +685,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)
     });
@@ -754,10 +771,10 @@ class Account {
     if (!Array.isArray(signedBundle)) {
       return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback);
     }
-    const status = pstatus || (await this.status(signedBundle[0].chainId));
+    const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
-    const decoratedBundle = await this.decorateTransactions(signedBundle, status);
-    callback == null ? void 0 : callback(decoratedBundle);
+    const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -788,7 +805,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);
@@ -823,10 +839,6 @@ class Account {
       bundles.push(signed);
     }
     bundles.push(...childBundles.filter(b => b.transactions.length > 0));
-    if (bundles.length === 0) {
-      // Nothing to send?
-      return;
-    }
     return this.sendSignedTransactions(bundles, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {

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

@@ -76,10 +76,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 +142,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 +204,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;
@@ -442,7 +449,7 @@ class Account {
     return txs;
   }
   async decorateTransactions(bundles, status, chainId) {
-    var _chainId;
+    var _chainId, _bundles$;
     if (!Array.isArray(bundles)) {
       // Recurse with array
       return this.decorateTransactions([bundles], status, chainId);
@@ -464,7 +471,7 @@ class Account {
       entrypoint,
       chainId,
       // Intent of the first bundle is used
-      intent: bundles[0].intent,
+      intent: (_bundles$ = bundles[0]) == null ? void 0 : _bundles$.intent,
       transactions: [...bootstrapBundle.transactions, ...bundles.map(bundle => ({
         to: bundle.entrypoint,
         data: core.commons.transaction.encodeBundleExecData(bundle),
@@ -477,7 +484,15 @@ class Account {
 
     // Re-compute the meta-transaction id to use the guest module subdigest
     if (!status.onChain.deployed) {
-      decoratedBundle.intent.id = core.commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      const id = core.commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      if (decoratedBundle.intent === undefined) {
+        decoratedBundle.intent = {
+          id,
+          wallet: this.address
+        };
+      } else {
+        decoratedBundle.intent.id = id;
+      }
     }
     return decoratedBundle;
   }
@@ -670,9 +685,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)
     });
@@ -754,10 +771,10 @@ class Account {
     if (!Array.isArray(signedBundle)) {
       return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback);
     }
-    const status = pstatus || (await this.status(signedBundle[0].chainId));
+    const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
-    const decoratedBundle = await this.decorateTransactions(signedBundle, status);
-    callback == null ? void 0 : callback(decoratedBundle);
+    const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -788,7 +805,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);
@@ -823,10 +839,6 @@ class Account {
       bundles.push(signed);
     }
     bundles.push(...childBundles.filter(b => b.transactions.length > 0));
-    if (bundles.length === 0) {
-      // Nothing to send?
-      return;
-    }
     return this.sendSignedTransactions(bundles, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {

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

@@ -72,10 +72,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 +138,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 +200,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;
@@ -438,7 +445,7 @@ class Account {
     return txs;
   }
   async decorateTransactions(bundles, status, chainId) {
-    var _chainId;
+    var _chainId, _bundles$;
     if (!Array.isArray(bundles)) {
       // Recurse with array
       return this.decorateTransactions([bundles], status, chainId);
@@ -460,7 +467,7 @@ class Account {
       entrypoint,
       chainId,
       // Intent of the first bundle is used
-      intent: bundles[0].intent,
+      intent: (_bundles$ = bundles[0]) == null ? void 0 : _bundles$.intent,
       transactions: [...bootstrapBundle.transactions, ...bundles.map(bundle => ({
         to: bundle.entrypoint,
         data: commons.transaction.encodeBundleExecData(bundle),
@@ -473,7 +480,15 @@ class Account {
 
     // Re-compute the meta-transaction id to use the guest module subdigest
     if (!status.onChain.deployed) {
-      decoratedBundle.intent.id = commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      const id = commons.transaction.subdigestOfGuestModuleTransactions(this.contexts[this.version].guestModule, chainId, decoratedBundle.transactions);
+      if (decoratedBundle.intent === undefined) {
+        decoratedBundle.intent = {
+          id,
+          wallet: this.address
+        };
+      } else {
+        decoratedBundle.intent.id = id;
+      }
     }
     return decoratedBundle;
   }
@@ -666,9 +681,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)
     });
@@ -750,10 +767,10 @@ class Account {
     if (!Array.isArray(signedBundle)) {
       return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback);
     }
-    const status = pstatus || (await this.status(signedBundle[0].chainId));
+    const status = pstatus || (await this.status(chainId));
     this.mustBeFullyMigrated(status);
-    const decoratedBundle = await this.decorateTransactions(signedBundle, status);
-    callback == null ? void 0 : callback(decoratedBundle);
+    const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId);
+    callback == null || callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -784,7 +801,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);
@@ -819,10 +835,6 @@ class Account {
       bundles.push(signed);
     }
     bundles.push(...childBundles.filter(b => b.transactions.length > 0));
-    if (bundles.length === 0) {
-      // Nothing to send?
-      return;
-    }
     return this.sendSignedTransactions(bundles, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {

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

@@ -109,6 +109,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 +137,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.4.9",
+  "version": "1.6.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",
@@ -10,19 +10,19 @@
   "license": "Apache-2.0",
   "dependencies": {
     "ethers": "^5.5.2",
-    "@0xsequence/core": "1.4.9",
-    "@0xsequence/utils": "1.4.9",
-    "@0xsequence/sessions": "1.4.9",
-    "@0xsequence/migration": "1.4.9",
-    "@0xsequence/relayer": "1.4.9",
-    "@0xsequence/wallet": "1.4.9",
-    "@0xsequence/network": "1.4.9"
+    "@0xsequence/core": "1.6.0",
+    "@0xsequence/migration": "1.6.0",
+    "@0xsequence/network": "1.6.0",
+    "@0xsequence/relayer": "1.6.0",
+    "@0xsequence/sessions": "1.6.0",
+    "@0xsequence/utils": "1.6.0",
+    "@0xsequence/wallet": "1.6.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "1.4.9",
-    "@0xsequence/tests": "1.4.9"
+    "@0xsequence/tests": "1.6.0",
+    "@0xsequence/signhub": "1.6.0"
   },
   "files": [
     "src",

package/src/account.ts

@@ -422,7 +422,7 @@ export class Account {
       entrypoint,
       chainId,
       // Intent of the first bundle is used
-      intent: bundles[0].intent,
+      intent: bundles[0]?.intent,
       transactions: [
         ...bootstrapBundle.transactions,
         ...bundles.map(
@@ -440,11 +440,17 @@ export class Account {
 
     // Re-compute the meta-transaction id to use the guest module subdigest
     if (!status.onChain.deployed) {
-      decoratedBundle.intent.id = commons.transaction.subdigestOfGuestModuleTransactions(
+      const id = commons.transaction.subdigestOfGuestModuleTransactions(
         this.contexts[this.version].guestModule,
         chainId,
         decoratedBundle.transactions
       )
+
+      if (decoratedBundle.intent === undefined) {
+        decoratedBundle.intent = { id, wallet: this.address }
+      } else {
+        decoratedBundle.intent.id = id
+      }
     }
 
     return decoratedBundle
@@ -663,6 +669,7 @@ export class Account {
     pstatus?: AccountStatus,
     options?: {
       nonceSpace?: ethers.BigNumberish
+      serial?: boolean
     }
   ): Promise<commons.transaction.SignedTransactionBundle> {
     const status = pstatus || (await this.status(chainId))
@@ -679,7 +686,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,
@@ -773,10 +781,10 @@ export class Account {
     if (!Array.isArray(signedBundle)) {
       return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback)
     }
-    const status = pstatus || (await this.status(signedBundle[0].chainId))
+    const status = pstatus || (await this.status(chainId))
     this.mustBeFullyMigrated(status)
 
-    const decoratedBundle = await this.decorateTransactions(signedBundle, status)
+    const decoratedBundle = await this.decorateTransactions(signedBundle, status, chainId)
     callback?.(decoratedBundle)
 
     return this.relayer(chainId).relay(decoratedBundle, quote)
@@ -865,6 +873,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)
@@ -881,11 +890,6 @@ export class Account {
     }
     bundles.push(...childBundles.filter(b => b.transactions.length > 0))
 
-    if (bundles.length === 0) {
-      // Nothing to send?
-      return
-    }
-
     return this.sendSignedTransactions(bundles, chainId, quote, undefined, callback)
   }
 

package/src/orchestrator/wrapper.ts

@@ -46,16 +46,7 @@ export class AccountOrchestratorWrapper implements signers.SapientSigner {
     return this.account.decorateTransactions(bundle, status)
   }
 
-  async requestSignature(
-    _id: string,
-    message: ethers.utils.BytesLike,
-    metadata: object,
-    callbacks: {
-      onSignature: (signature: ethers.utils.BytesLike) => void
-      onRejection: (error: string) => void
-      onStatus: (situation: string) => void
-    }
-  ): Promise<boolean> {
+  sign(message: ethers.utils.BytesLike, metadata: object): Promise<ethers.utils.BytesLike> {
     if (!commons.isWalletSignRequestMetadata(metadata)) {
       throw new Error('AccountOrchestratorWrapper only supports wallet metadata requests')
     }
@@ -67,14 +58,7 @@ export class AccountOrchestratorWrapper implements signers.SapientSigner {
 
     // For Sequence nested signatures we must use `signDigest` and not `signMessage`
     // otherwise the account will hash the digest and the signature will be invalid.
-    try {
-      callbacks.onSignature(await this.account.signDigest(message, chainId, decorate, cantValidateBehavior, metadata))
-    } catch (err) {
-      callbacks.onRejection('Unable to sign account')
-      return false
-    }
-
-    return true
+    return this.account.signDigest(message, chainId, decorate, cantValidateBehavior, metadata)
   }
 
   notifyStatusChange(_i: string, _s: Status, _m: object): void {}