fix: gnosis safe tx

bgd-labs · Nov 16, 2023 · 915ceac · 915ceac
1 parent 50e2eab
commit 915ceac
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bgd-labs/frontend-web3-utils",
   "description": "Frontend utilities common to multiple Web3 projects",
-  "version": "0.4.70",
+  "version": "0.4.71",
   "author": "BGD labs",
   "license": "MIT",
   "private": false,

diff --git a/src/web3/adapters/EthereumAdapter.ts b/src/web3/adapters/EthereumAdapter.ts
@@ -1,6 +1,7 @@
 import { produce } from 'immer';
 import { Hex, isHex } from 'viem';
 
+import { SafeTransactionServiceUrls } from '../../utils/constants';
 import { setLocalStorageTxPool } from '../../utils/localStorage';
 import {
   BaseTx,
@@ -51,10 +52,42 @@ export class EthereumAdapter<T extends BaseTx> implements AdapterInterface<T> {
         payload: payload,
         from,
       };
-      const txPool = this.get().addTXToPool(txParams, activeWallet.walletType);
 
-      this.waitForTxReceipt(txParams.hash);
-      return txPool[txParams.hash];
+      if (activeWallet.walletType === 'WalletConnect') {
+        // check if tx real on safe (need for safe + wallet connect)
+        const response = await fetch(
+          `${
+            SafeTransactionServiceUrls[txParams.chainId]
+          }/multisig-transactions/${tx}/`,
+        );
+
+        if (response.ok) {
+          const args = {
+            tx,
+            payload,
+            activeWallet,
+            chainId,
+            type,
+          };
+
+          this.get().updateEthAdapter(true);
+          return this.get().ethereumAdapter.executeTx(args);
+        } else {
+          const txPool = this.get().addTXToPool(
+            txParams,
+            activeWallet.walletType,
+          );
+          this.waitForTxReceipt(txParams.hash);
+          return txPool[txParams.hash];
+        }
+      } else {
+        const txPool = this.get().addTXToPool(
+          txParams,
+          activeWallet.walletType,
+        );
+        this.waitForTxReceipt(txParams.hash);
+        return txPool[txParams.hash];
+      }
     } else {
       return undefined;
     }

diff --git a/src/web3/adapters/GnosisAdapter.ts b/src/web3/adapters/GnosisAdapter.ts
@@ -75,47 +75,63 @@ export class GnosisAdapter<T extends BaseTx> implements AdapterInterface<T> {
       type,
       payload: payload,
       from,
+      isSafeTx: true,
     };
 
     if (isSafeTx(tx)) {
+      console.log('safe tx', tx);
       const txParams = {
         ...initialParams,
         hash: tx.safeTxHash,
       };
+      console.log('safe txParams', txParams);
       // @ts-ignore
       const txPool = this.get().addTXToPool(txParams, activeWallet.walletType);
       this.startTxTracking(txParams.hash);
       return txPool[txParams.hash];
     } else if (isHex(tx)) {
+      console.log('hex tx', tx);
+
       const txParams = {
         ...initialParams,
         hash: tx,
       };
 
-      // check if tx real on safe (need for safe + wallet connect)
-      const response = await fetch(
-        `${
-          SafeTransactionServiceUrls[initialParams.chainId]
-        }/multisig-transactions/${tx}/`,
-      );
+      console.log('hex txParams', txParams);
+
+      if (activeWallet.walletType === 'WalletConnect') {
+        // check if tx real on safe (need for safe + wallet connect)
+        const response = await fetch(
+          `${
+            SafeTransactionServiceUrls[initialParams.chainId]
+          }/multisig-transactions/${tx}/`,
+        );
 
-      if (response.ok) {
+        if (response.ok) {
+          const txPool = this.get().addTXToPool(
+            txParams,
+            activeWallet.walletType,
+          );
+          this.startTxTracking(txParams.hash);
+          return txPool[txParams.hash];
+        } else {
+          const args = {
+            tx,
+            payload,
+            activeWallet,
+            chainId,
+            type,
+          };
+          this.get().updateEthAdapter(false);
+          return this.get().ethereumAdapter.executeTx(args);
+        }
+      } else {
         const txPool = this.get().addTXToPool(
           txParams,
           activeWallet.walletType,
         );
         this.startTxTracking(txParams.hash);
         return txPool[txParams.hash];
-      } else {
-        const args = {
-          tx,
-          payload,
-          activeWallet,
-          chainId,
-          type,
-        };
-        this.get().updateEthAdapter(false);
-        return this.get().ethereumAdapter.executeTx(args);
       }
     } else {
       return undefined;

diff --git a/src/web3/store/transactionsSelectors.ts b/src/web3/store/transactionsSelectors.ts
@@ -85,7 +85,6 @@ export const selectTxExplorerLink = <T extends BaseTx>(
   state: ITransactionsState<T>,
   getChainParameters: (chainId: number) => Chain,
   txHash: Hex,
-  isWalletContract?: boolean,
   replacedTxHash?: Hex,
 ) => {
   const tx = selectTXByHash(state, txHash);
@@ -94,7 +93,7 @@ export const selectTxExplorerLink = <T extends BaseTx>(
   }
 
   const returnValue = (hash: string) => {
-    if (tx.walletType !== 'GnosisSafe' && !isWalletContract) {
+    if (tx.walletType !== 'GnosisSafe' && tx.isSafeTx) {
       return `${getChainParameters(tx.chainId).blockExplorers?.default
         .url}/tx/${hash}`;
     } else {

diff --git a/src/web3/store/transactionsSlice.ts b/src/web3/store/transactionsSlice.ts
@@ -31,6 +31,7 @@ export type BasicTx = {
   payload?: object;
   timestamp?: number;
   errorMessage?: string;
+  isSafeTx?: boolean;
 };
 
 export type EthBaseTx = BasicTx & {

diff --git a/src/web3/store/walletSlice.ts b/src/web3/store/walletSlice.ts
@@ -124,9 +124,6 @@ export function createWalletSlice({
             get().setClient(wallet.chain.id, client);
             walletConnected(activeWallet);
             set({ isActiveWalletSetting: false });
-            if (isContractAddress) {
-              get().updateEthAdapter(true);
-            }
           }
         }
       }