@0xsequence/account 1.1.4 → 1.1.5

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

@@ -262,7 +262,7 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       return bundle;
     }
-    return {
+    const decoratedBundle = {
       entrypoint: bootstrapBundle.entrypoint,
       chainId: bundle.chainId,
       intent: bundle.intent,
@@ -275,6 +275,12 @@ class Account {
         value: 0
       }]
     };
+
+    // 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, decoratedBundle.chainId, decoratedBundle.transactions);
+    }
+    return decoratedBundle;
   }
   decorateSignature(signature, status) {
     if (!status.presignedConfigurations || status.presignedConfigurations.length === 0) {
@@ -528,10 +534,11 @@ class Account {
       failedChains
     };
   }
-  async sendSignedTransactions(signedBundle, chainId, quote, pstatus) {
+  async sendSignedTransactions(signedBundle, chainId, quote, pstatus, callback) {
     const status = pstatus || (await this.status(signedBundle.chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = this.decorateTransactions(signedBundle, status);
+    callback == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -586,8 +593,8 @@ class Account {
     const status = await this.status(chainId);
     const predecorated = skipPreDecorate ? txs : await this.predecorateTransactions(txs, status, chainId);
     const signed = await this.signTransactions(predecorated, chainId);
-    if (callback) callback(signed);
-    return this.sendSignedTransactions(signed, chainId, quote);
+    // TODO: is it safe to pass status again here?
+    return this.sendSignedTransactions(signed, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {
     const digest = utils.encodeTypedDataDigest({

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

@@ -262,7 +262,7 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       return bundle;
     }
-    return {
+    const decoratedBundle = {
       entrypoint: bootstrapBundle.entrypoint,
       chainId: bundle.chainId,
       intent: bundle.intent,
@@ -275,6 +275,12 @@ class Account {
         value: 0
       }]
     };
+
+    // 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, decoratedBundle.chainId, decoratedBundle.transactions);
+    }
+    return decoratedBundle;
   }
   decorateSignature(signature, status) {
     if (!status.presignedConfigurations || status.presignedConfigurations.length === 0) {
@@ -528,10 +534,11 @@ class Account {
       failedChains
     };
   }
-  async sendSignedTransactions(signedBundle, chainId, quote, pstatus) {
+  async sendSignedTransactions(signedBundle, chainId, quote, pstatus, callback) {
     const status = pstatus || (await this.status(signedBundle.chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = this.decorateTransactions(signedBundle, status);
+    callback == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -586,8 +593,8 @@ class Account {
     const status = await this.status(chainId);
     const predecorated = skipPreDecorate ? txs : await this.predecorateTransactions(txs, status, chainId);
     const signed = await this.signTransactions(predecorated, chainId);
-    if (callback) callback(signed);
-    return this.sendSignedTransactions(signed, chainId, quote);
+    // TODO: is it safe to pass status again here?
+    return this.sendSignedTransactions(signed, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {
     const digest = utils.encodeTypedDataDigest({

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

@@ -258,7 +258,7 @@ class Account {
     if (bootstrapBundle.transactions.length === 0) {
       return bundle;
     }
-    return {
+    const decoratedBundle = {
       entrypoint: bootstrapBundle.entrypoint,
       chainId: bundle.chainId,
       intent: bundle.intent,
@@ -271,6 +271,12 @@ class Account {
         value: 0
       }]
     };
+
+    // 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, decoratedBundle.chainId, decoratedBundle.transactions);
+    }
+    return decoratedBundle;
   }
   decorateSignature(signature, status) {
     if (!status.presignedConfigurations || status.presignedConfigurations.length === 0) {
@@ -524,10 +530,11 @@ class Account {
       failedChains
     };
   }
-  async sendSignedTransactions(signedBundle, chainId, quote, pstatus) {
+  async sendSignedTransactions(signedBundle, chainId, quote, pstatus, callback) {
     const status = pstatus || (await this.status(signedBundle.chainId));
     this.mustBeFullyMigrated(status);
     const decoratedBundle = this.decorateTransactions(signedBundle, status);
+    callback == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
   async fillGasLimits(txs, chainId, status) {
@@ -582,8 +589,8 @@ class Account {
     const status = await this.status(chainId);
     const predecorated = skipPreDecorate ? txs : await this.predecorateTransactions(txs, status, chainId);
     const signed = await this.signTransactions(predecorated, chainId);
-    if (callback) callback(signed);
-    return this.sendSignedTransactions(signed, chainId, quote);
+    // TODO: is it safe to pass status again here?
+    return this.sendSignedTransactions(signed, chainId, quote, undefined, callback);
   }
   async signTypedData(domain, types, message, chainId, cantValidateBehavior = 'ignore') {
     const digest = encodeTypedDataDigest({

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

@@ -111,7 +111,7 @@ export declare class Account {
         migratedAllChains: boolean;
         failedChains: number[];
     }>;
-    sendSignedTransactions(signedBundle: commons.transaction.IntendedTransactionBundle, chainId: ethers.BigNumberish, quote?: FeeQuote, pstatus?: AccountStatus): Promise<ethers.providers.TransactionResponse>;
+    sendSignedTransactions(signedBundle: commons.transaction.IntendedTransactionBundle, chainId: ethers.BigNumberish, quote?: FeeQuote, pstatus?: AccountStatus, callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void): Promise<ethers.providers.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): Promise<{
         options: FeeOption[];
@@ -123,7 +123,7 @@ export declare class Account {
         chainId: ethers.BigNumberish;
         stubSignatureOverrides: Map<string, string>;
     }): Promise<PreparedTransactions>;
-    sendTransaction(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, quote?: FeeQuote, skipPreDecorate?: boolean, callback?: (signed: commons.transaction.SignedTransactionBundle) => void): Promise<ethers.providers.TransactionResponse>;
+    sendTransaction(txs: commons.transaction.Transactionish, chainId: ethers.BigNumberish, quote?: FeeQuote, skipPreDecorate?: boolean, callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void): Promise<ethers.providers.TransactionResponse>;
     signTypedData(domain: TypedDataDomain, types: Record<string, Array<TypedDataField>>, message: Record<string, any>, chainId: ethers.BigNumberish, cantValidateBehavior?: 'ignore' | 'eip6492' | 'throw'): Promise<string>;
     getAllSigners(): Promise<{
         address: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/account",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "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.1.4",
-    "@0xsequence/migration": "1.1.4",
-    "@0xsequence/network": "1.1.4",
-    "@0xsequence/relayer": "1.1.4",
-    "@0xsequence/sessions": "1.1.4",
-    "@0xsequence/utils": "1.1.4",
-    "@0xsequence/wallet": "1.1.4"
+    "@0xsequence/core": "1.1.5",
+    "@0xsequence/migration": "1.1.5",
+    "@0xsequence/network": "1.1.5",
+    "@0xsequence/relayer": "1.1.5",
+    "@0xsequence/sessions": "1.1.5",
+    "@0xsequence/utils": "1.1.5",
+    "@0xsequence/wallet": "1.1.5"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "1.1.4",
-    "@0xsequence/tests": "1.1.4"
+    "@0xsequence/signhub": "1.1.5",
+    "@0xsequence/tests": "1.1.5"
   },
   "files": [
     "src",

package/src/account.ts

@@ -373,7 +373,7 @@ export class Account {
       return bundle
     }
 
-    return {
+    const decoratedBundle = {
       entrypoint: bootstrapBundle.entrypoint,
       chainId: bundle.chainId,
       intent: bundle.intent,
@@ -389,6 +389,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(
+        this.contexts[this.version].guestModule,
+        decoratedBundle.chainId,
+        decoratedBundle.transactions
+      )
+    }
+
+    return decoratedBundle
   }
 
   decorateSignature<T extends ethers.BytesLike>(
@@ -691,12 +702,14 @@ export class Account {
     signedBundle: commons.transaction.IntendedTransactionBundle,
     chainId: ethers.BigNumberish,
     quote?: FeeQuote,
-    pstatus?: AccountStatus
+    pstatus?: AccountStatus,
+    callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void
   ): Promise<ethers.providers.TransactionResponse> {
     const status = pstatus || (await this.status(signedBundle.chainId))
     this.mustBeFullyMigrated(status)
 
     const decoratedBundle = this.decorateTransactions(signedBundle, status)
+    callback?.(decoratedBundle)
 
     return this.relayer(chainId).relay(decoratedBundle, quote)
   }
@@ -775,13 +788,13 @@ export class Account {
     chainId: ethers.BigNumberish,
     quote?: FeeQuote,
     skipPreDecorate: boolean = false,
-    callback?: (signed: commons.transaction.SignedTransactionBundle) => void
+    callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void
   ): Promise<ethers.providers.TransactionResponse> {
     const status = await this.status(chainId)
     const predecorated = skipPreDecorate ? txs : await this.predecorateTransactions(txs, status, chainId)
     const signed = await this.signTransactions(predecorated, chainId)
-    if (callback) callback(signed)
-    return this.sendSignedTransactions(signed, chainId, quote)
+    // TODO: is it safe to pass status again here?
+    return this.sendSignedTransactions(signed, chainId, quote, undefined, callback)
   }
 
   async signTypedData(