@0xsequence/account 1.4.8 → 1.5.0

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

@@ -442,7 +442,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 +464,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 +477,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;
   }
@@ -754,9 +762,9 @@ 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 == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
@@ -823,10 +831,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') {
@@ -840,40 +844,45 @@ class Account {
   async getSigners() {
     var _this4 = this;
     const last = ts => ts.length ? ts[ts.length - 1] : undefined;
-    return (await Promise.all(this.networks.map(async function (network) {
-      var _last;
-      const {
-        chainId
-      } = network;
-      const status = await _this4.status(chainId);
-      let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
-      if (!latestImageHash) {
-        if (status.onChain.version !== status.version) {
-          const migration = last(status.signedMigrations);
-          if (migration) {
-            const {
-              toVersion,
-              toConfig
-            } = migration;
-            const _coder = core.universal.genericCoderFor(toVersion);
-            latestImageHash = _coder.config.imageHashOf(toConfig);
+    return (await Promise.all(this.networks.map(async function ({
+      chainId,
+      name
+    }) {
+      try {
+        var _last;
+        const status = await _this4.status(chainId);
+        let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
+        if (!latestImageHash) {
+          if (status.onChain.version !== status.version) {
+            const migration = last(status.signedMigrations);
+            if (migration) {
+              const {
+                toVersion,
+                toConfig
+              } = migration;
+              const _coder = core.universal.genericCoderFor(toVersion);
+              latestImageHash = _coder.config.imageHashOf(toConfig);
+            }
           }
         }
+        if (!latestImageHash) {
+          latestImageHash = status.onChain.imageHash;
+        }
+        const latestConfig = await _this4.tracker.configOfImageHash({
+          imageHash: latestImageHash
+        });
+        if (!latestConfig) {
+          throw new Error(`unable to find config for image hash ${latestImageHash}`);
+        }
+        const coder = core.universal.genericCoderFor(latestConfig.version);
+        const signers = coder.config.signersOf(latestConfig);
+        return signers.map(signer => _extends({}, signer, {
+          network: chainId
+        }));
+      } catch (error) {
+        console.warn(`unable to get signers on network ${chainId} ${name}`, error);
+        return [];
       }
-      if (!latestImageHash) {
-        latestImageHash = status.onChain.imageHash;
-      }
-      const latestConfig = await _this4.tracker.configOfImageHash({
-        imageHash: latestImageHash
-      });
-      if (!latestConfig) {
-        throw new Error(`unable to find config for image hash ${latestImageHash}`);
-      }
-      const coder = core.universal.genericCoderFor(latestConfig.version);
-      const signers = coder.config.signersOf(latestConfig);
-      return signers.map(signer => _extends({}, signer, {
-        network: chainId
-      }));
     }))).flat();
   }
   async getAllSigners() {

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

@@ -442,7 +442,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 +464,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 +477,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;
   }
@@ -754,9 +762,9 @@ 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 == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
@@ -823,10 +831,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') {
@@ -840,40 +844,45 @@ class Account {
   async getSigners() {
     var _this4 = this;
     const last = ts => ts.length ? ts[ts.length - 1] : undefined;
-    return (await Promise.all(this.networks.map(async function (network) {
-      var _last;
-      const {
-        chainId
-      } = network;
-      const status = await _this4.status(chainId);
-      let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
-      if (!latestImageHash) {
-        if (status.onChain.version !== status.version) {
-          const migration = last(status.signedMigrations);
-          if (migration) {
-            const {
-              toVersion,
-              toConfig
-            } = migration;
-            const _coder = core.universal.genericCoderFor(toVersion);
-            latestImageHash = _coder.config.imageHashOf(toConfig);
+    return (await Promise.all(this.networks.map(async function ({
+      chainId,
+      name
+    }) {
+      try {
+        var _last;
+        const status = await _this4.status(chainId);
+        let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
+        if (!latestImageHash) {
+          if (status.onChain.version !== status.version) {
+            const migration = last(status.signedMigrations);
+            if (migration) {
+              const {
+                toVersion,
+                toConfig
+              } = migration;
+              const _coder = core.universal.genericCoderFor(toVersion);
+              latestImageHash = _coder.config.imageHashOf(toConfig);
+            }
           }
         }
+        if (!latestImageHash) {
+          latestImageHash = status.onChain.imageHash;
+        }
+        const latestConfig = await _this4.tracker.configOfImageHash({
+          imageHash: latestImageHash
+        });
+        if (!latestConfig) {
+          throw new Error(`unable to find config for image hash ${latestImageHash}`);
+        }
+        const coder = core.universal.genericCoderFor(latestConfig.version);
+        const signers = coder.config.signersOf(latestConfig);
+        return signers.map(signer => _extends({}, signer, {
+          network: chainId
+        }));
+      } catch (error) {
+        console.warn(`unable to get signers on network ${chainId} ${name}`, error);
+        return [];
       }
-      if (!latestImageHash) {
-        latestImageHash = status.onChain.imageHash;
-      }
-      const latestConfig = await _this4.tracker.configOfImageHash({
-        imageHash: latestImageHash
-      });
-      if (!latestConfig) {
-        throw new Error(`unable to find config for image hash ${latestImageHash}`);
-      }
-      const coder = core.universal.genericCoderFor(latestConfig.version);
-      const signers = coder.config.signersOf(latestConfig);
-      return signers.map(signer => _extends({}, signer, {
-        network: chainId
-      }));
     }))).flat();
   }
   async getAllSigners() {

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

@@ -438,7 +438,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 +460,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 +473,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;
   }
@@ -750,9 +758,9 @@ 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 == null ? void 0 : callback(decoratedBundle);
     return this.relayer(chainId).relay(decoratedBundle, quote);
   }
@@ -819,10 +827,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') {
@@ -836,40 +840,45 @@ class Account {
   async getSigners() {
     var _this4 = this;
     const last = ts => ts.length ? ts[ts.length - 1] : undefined;
-    return (await Promise.all(this.networks.map(async function (network) {
-      var _last;
-      const {
-        chainId
-      } = network;
-      const status = await _this4.status(chainId);
-      let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
-      if (!latestImageHash) {
-        if (status.onChain.version !== status.version) {
-          const migration = last(status.signedMigrations);
-          if (migration) {
-            const {
-              toVersion,
-              toConfig
-            } = migration;
-            const _coder = universal.genericCoderFor(toVersion);
-            latestImageHash = _coder.config.imageHashOf(toConfig);
+    return (await Promise.all(this.networks.map(async function ({
+      chainId,
+      name
+    }) {
+      try {
+        var _last;
+        const status = await _this4.status(chainId);
+        let latestImageHash = (_last = last(status.presignedConfigurations)) == null ? void 0 : _last.nextImageHash;
+        if (!latestImageHash) {
+          if (status.onChain.version !== status.version) {
+            const migration = last(status.signedMigrations);
+            if (migration) {
+              const {
+                toVersion,
+                toConfig
+              } = migration;
+              const _coder = universal.genericCoderFor(toVersion);
+              latestImageHash = _coder.config.imageHashOf(toConfig);
+            }
           }
         }
+        if (!latestImageHash) {
+          latestImageHash = status.onChain.imageHash;
+        }
+        const latestConfig = await _this4.tracker.configOfImageHash({
+          imageHash: latestImageHash
+        });
+        if (!latestConfig) {
+          throw new Error(`unable to find config for image hash ${latestImageHash}`);
+        }
+        const coder = universal.genericCoderFor(latestConfig.version);
+        const signers = coder.config.signersOf(latestConfig);
+        return signers.map(signer => _extends({}, signer, {
+          network: chainId
+        }));
+      } catch (error) {
+        console.warn(`unable to get signers on network ${chainId} ${name}`, error);
+        return [];
       }
-      if (!latestImageHash) {
-        latestImageHash = status.onChain.imageHash;
-      }
-      const latestConfig = await _this4.tracker.configOfImageHash({
-        imageHash: latestImageHash
-      });
-      if (!latestConfig) {
-        throw new Error(`unable to find config for image hash ${latestImageHash}`);
-      }
-      const coder = universal.genericCoderFor(latestConfig.version);
-      const signers = coder.config.signersOf(latestConfig);
-      return signers.map(signer => _extends({}, signer, {
-        network: chainId
-      }));
     }))).flat();
   }
   async getAllSigners() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xsequence/account",
-  "version": "1.4.8",
+  "version": "1.5.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.8",
-    "@0xsequence/migration": "1.4.8",
-    "@0xsequence/network": "1.4.8",
-    "@0xsequence/relayer": "1.4.8",
-    "@0xsequence/sessions": "1.4.8",
-    "@0xsequence/utils": "1.4.8",
-    "@0xsequence/wallet": "1.4.8"
+    "@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"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "nyc": "^15.1.0",
-    "@0xsequence/signhub": "1.4.8",
-    "@0xsequence/tests": "1.4.8"
+    "@0xsequence/signhub": "1.5.0",
+    "@0xsequence/tests": "1.5.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
@@ -773,10 +779,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)
@@ -881,11 +887,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)
   }
 
@@ -905,34 +906,38 @@ export class Account {
 
     return (
       await Promise.all(
-        this.networks.map(async network => {
-          const { chainId } = network
-          const status = await this.status(chainId)
-
-          let latestImageHash = last(status.presignedConfigurations)?.nextImageHash
-          if (!latestImageHash) {
-            if (status.onChain.version !== status.version) {
-              const migration = last(status.signedMigrations)
-              if (migration) {
-                const { toVersion, toConfig } = migration
-                const coder = universal.genericCoderFor(toVersion)
-                latestImageHash = coder.config.imageHashOf(toConfig)
+        this.networks.map(async ({ chainId, name }) => {
+          try {
+            const status = await this.status(chainId)
+
+            let latestImageHash = last(status.presignedConfigurations)?.nextImageHash
+            if (!latestImageHash) {
+              if (status.onChain.version !== status.version) {
+                const migration = last(status.signedMigrations)
+                if (migration) {
+                  const { toVersion, toConfig } = migration
+                  const coder = universal.genericCoderFor(toVersion)
+                  latestImageHash = coder.config.imageHashOf(toConfig)
+                }
               }
             }
-          }
-          if (!latestImageHash) {
-            latestImageHash = status.onChain.imageHash
-          }
+            if (!latestImageHash) {
+              latestImageHash = status.onChain.imageHash
+            }
 
-          const latestConfig = await this.tracker.configOfImageHash({ imageHash: latestImageHash })
-          if (!latestConfig) {
-            throw new Error(`unable to find config for image hash ${latestImageHash}`)
-          }
+            const latestConfig = await this.tracker.configOfImageHash({ imageHash: latestImageHash })
+            if (!latestConfig) {
+              throw new Error(`unable to find config for image hash ${latestImageHash}`)
+            }
 
-          const coder = universal.genericCoderFor(latestConfig.version)
-          const signers = coder.config.signersOf(latestConfig)
+            const coder = universal.genericCoderFor(latestConfig.version)
+            const signers = coder.config.signersOf(latestConfig)
 
-          return signers.map(signer => ({ ...signer, network: chainId }))
+            return signers.map(signer => ({ ...signer, network: chainId }))
+          } catch (error) {
+            console.warn(`unable to get signers on network ${chainId} ${name}`, error)
+            return []
+          }
         })
       )
     ).flat()

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 {}