Enable Confirmed Txs and User Operations execution

safe-global · Feb 20, 2025 · f5abadd · f5abadd
1 parent 5bb59d3
commit f5abadd
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 16 deletions.
diff --git a/packages/sdk-starter-kit/src/SafeClient.ts b/packages/sdk-starter-kit/src/SafeClient.ts
@@ -1,6 +1,11 @@
 import Safe from '@safe-global/protocol-kit'
 import SafeApiKit, { SafeMultisigTransactionListResponse } from '@safe-global/api-kit'
-import { SafeTransaction, TransactionOptions, TransactionResult } from '@safe-global/types-kit'
+import {
+  SafeMultisigTransactionResponse,
+  SafeTransaction,
+  TransactionOptions,
+  TransactionResult
+} from '@safe-global/types-kit'
 
 import {
   createSafeClientResult,
@@ -89,18 +94,22 @@ export class SafeClient extends BaseClient {
    * @throws {Error} If the transaction confirmation fails.
    */
   async confirm({ safeTxHash }: ConfirmTransactionProps): Promise<SafeClientResult> {
-    let transactionResponse = await this.apiKit.getTransaction(safeTxHash)
     const safeAddress = await this.protocolKit.getAddress()
-    const signedTransaction = await this.protocolKit.signTransaction(transactionResponse)
+    let transactionResponse = await this.apiKit.getTransaction(safeTxHash)
+
+    let isReadyToExecute = await this.#hasEnoughConfirmations(transactionResponse)
+
+    if (!isReadyToExecute) {
+      const signedTransaction = await this.protocolKit.signTransaction(transactionResponse)
 
-    await this.apiKit.confirmTransaction(safeTxHash, signedTransaction.encodedSignatures())
+      await this.apiKit.confirmTransaction(safeTxHash, signedTransaction.encodedSignatures())
 
-    transactionResponse = await this.apiKit.getTransaction(safeTxHash)
+      transactionResponse = await this.apiKit.getTransaction(safeTxHash)
 
-    if (
-      transactionResponse.confirmations &&
-      transactionResponse.confirmationsRequired === transactionResponse.confirmations.length
-    ) {
+      isReadyToExecute = await this.#hasEnoughConfirmations(transactionResponse)
+    }
+
+    if (isReadyToExecute) {
       const executedTransactionResponse: TransactionResult =
         await this.protocolKit.executeTransaction(transactionResponse)
 
@@ -263,6 +272,14 @@ export class SafeClient extends BaseClient {
     })
   }
 
+  async #hasEnoughConfirmations(
+    transactionResponse: SafeMultisigTransactionResponse
+  ): Promise<boolean> {
+    return transactionResponse
+      ? transactionResponse.confirmations?.length === transactionResponse.confirmationsRequired
+      : false
+  }
+
   async #reconnectSafe(): Promise<void> {
     this.protocolKit = await this.protocolKit.connect({
       provider: this.protocolKit.getSafeProvider().provider,

diff --git a/packages/sdk-starter-kit/src/extensions/safe-operations/SafeOperationClient.ts b/packages/sdk-starter-kit/src/extensions/safe-operations/SafeOperationClient.ts
@@ -9,6 +9,7 @@ import {
   SafeClientResult,
   SendSafeOperationProps
 } from '@safe-global/sdk-starter-kit/types'
+import { SafeOperationResponse } from '@safe-global/types-kit'
 
 /**
  * @class
@@ -94,17 +95,23 @@ export class SafeOperationClient {
   }: ConfirmSafeOperationProps): Promise<SafeClientResult> {
     const safeAddress = await this.protocolKit.getAddress()
     const threshold = await this.protocolKit.getThreshold()
+    let safeOperationResponse = await this.apiKit.getSafeOperation(safeOperationHash)
 
-    await this.apiKit.confirmSafeOperation(
-      safeOperationHash,
-      buildSignatureBytes([await this.protocolKit.signHash(safeOperationHash)])
-    )
+    let isReadyForBundler = await this.#hasEnoughConfirmations(safeOperationResponse, threshold)
 
-    const confirmedSafeOperation = await this.apiKit.getSafeOperation(safeOperationHash)
+    if (!isReadyForBundler) {
+      await this.apiKit.confirmSafeOperation(
+        safeOperationHash,
+        buildSignatureBytes([await this.protocolKit.signHash(safeOperationHash)])
+      )
 
-    if (confirmedSafeOperation?.confirmations?.length === threshold) {
+      safeOperationResponse = await this.apiKit.getSafeOperation(safeOperationHash)
+      isReadyForBundler = await this.#hasEnoughConfirmations(safeOperationResponse, threshold)
+    }
+
+    if (isReadyForBundler) {
       const userOperationHash = await this.safe4337Pack.executeTransaction({
-        executable: confirmedSafeOperation
+        executable: safeOperationResponse
       })
 
       await this.#waitForOperationToFinish({ userOperationHash })
@@ -138,6 +145,13 @@ export class SafeOperationClient {
     return this.apiKit.getPendingSafeOperations(safeAddress, options)
   }
 
+  async #hasEnoughConfirmations(
+    safeOperationResponse: SafeOperationResponse,
+    threshold: number
+  ): Promise<boolean> {
+    return safeOperationResponse ? safeOperationResponse.confirmations?.length === threshold : false
+  }
+
   /**
    * Helper method to wait for the operation to finish
    * @param userOperationHash The userOperationHash to wait for. This comes from the bundler and can be obtained from the