Cleanup

packages/account/src/account.ts

@@ -758,8 +758,10 @@ export class Account {
     pstatus?: AccountStatus,
     callback?: (bundle: commons.transaction.IntendedTransactionBundle) => void
   ): Promise<ethers.providers.TransactionResponse> {
-    const firstChainId = Array.isArray(signedBundle) ? signedBundle[0].chainId : signedBundle.chainId
-    const status = pstatus || (await this.status(firstChainId))
+    if (!Array.isArray(signedBundle)) {
+      return this.sendSignedTransactions([signedBundle], chainId, quote, pstatus, callback)
+    }
+    const status = pstatus || (await this.status(signedBundle[0].chainId))
     this.mustBeFullyMigrated(status)
 
     const decoratedBundle = await this.decorateTransactions(signedBundle, status)

packages/account/src/orchestrator/wrapper.ts

@@ -3,28 +3,26 @@ import { signers, Status } from '@0xsequence/signhub'
 import { ethers } from 'ethers'
 import { Account } from '../account'
 
-export type AccountWrapperDecorateMetadata = {
-  chainId?: ethers.BigNumberish
+export type MetadataWithChainId = {
+  chainId: ethers.BigNumberish
 }
 
-// Implements a wrapper for using Sequence accounts as nested signers
-// in the signhub orchestrator. It only works for nested signatures.
+// Implements a wrapper for using Sequence accounts as nested signers in the signhub orchestrator.
 export class AccountOrchestratorWrapper implements signers.SapientSigner {
   constructor(public account: Account) {}
 
   async getAddress(): Promise<string> {
     return this.account.address
   }
 
-  getChainIdFromMetadata(metadata: Object): ethers.BigNumberish {
-    let { chainId } = metadata as AccountWrapperDecorateMetadata
+  getChainIdFromMetadata(metadata: Object): ethers.BigNumber {
     try {
-      chainId = ethers.BigNumber.from(chainId)
+      const { chainId } = metadata as MetadataWithChainId
+      return ethers.BigNumber.from(chainId)
     } catch (err) {
       // Invalid metadata object
-      throw new Error('AccountOrchestratorWrapper only supports account status callbacks')
+      throw new Error('AccountOrchestratorWrapper only supports metadata with chain id')
     }
-    return chainId
   }
 
   async buildDeployTransaction(metadata: Object): Promise<commons.transaction.TransactionBundle | undefined> {

packages/signhub/src/signers/signer.ts

@@ -46,7 +46,9 @@ export interface SapientSigner {
 
 export function isSapientSigner(signer: ethers.Signer | SapientSigner): signer is SapientSigner {
   return (
+    (signer as SapientSigner).getAddress !== undefined &&
     (signer as SapientSigner).buildDeployTransaction !== undefined &&
+    (signer as SapientSigner).predecorateSignedTransactions !== undefined &&
     (signer as SapientSigner).decorateTransactions !== undefined &&
     (signer as SapientSigner).requestSignature !== undefined &&
     (signer as SapientSigner).notifyStatusChange !== undefined