Reduce calls to wallet.getStatus

Author: ScreamingHawk

packages/wallet/core/src/wallet.ts

@@ -371,7 +371,6 @@ export class Wallet {
     // If the latest configuration does not match the onchain configuration
     // then we bundle the update into the transaction envelope
     if (!options?.noConfigUpdate) {
-      const status = await this.getStatus(provider)
       if (status.imageHash !== status.onChainImageHash) {
         calls.push({
           to: this.address,
@@ -402,7 +401,7 @@ export class Wallet {
         factory,
         factoryData,
       },
-      ...(await this.prepareBlankEnvelope(Number(chainId))),
+      ...(await this.prepareBlankEnvelope(Number(chainId), status.configuration)),
     }
   }
 
@@ -461,15 +460,15 @@ export class Wallet {
       }
     }
 
-    const [chainId, nonce] = await Promise.all([
+    const [chainId, nonce, status] = await Promise.all([
       provider.request({ method: 'eth_chainId' }),
       this.getNonce(provider, space),
+      this.getStatus(provider),
     ])
 
     // If the latest configuration does not match the onchain configuration
     // then we bundle the update into the transaction envelope
     if (!options?.noConfigUpdate) {
-      const status = await this.getStatus(provider)
       if (status.imageHash !== status.onChainImageHash) {
         calls.push({
           to: this.address,
@@ -490,7 +489,7 @@ export class Wallet {
         nonce,
         calls,
       },
-      ...(await this.prepareBlankEnvelope(Number(chainId))),
+      ...(await this.prepareBlankEnvelope(Number(chainId), status.configuration)),
     }
   }
 
@@ -597,13 +596,15 @@ export class Wallet {
     return encoded
   }
 
-  private async prepareBlankEnvelope(chainId: number) {
-    const status = await this.getStatus()
-
+  private async prepareBlankEnvelope(chainId: number, configuration?: Config.Config) {
+    if (!configuration) {
+      const status = await this.getStatus()
+      configuration = status.configuration
+    }
     return {
       wallet: this.address,
-      chainId: chainId,
-      configuration: status.configuration,
+      chainId,
+      configuration,
     }
   }
 }