bugfix/prepareTx (#56)

* replace client.prepareTransactionRequest w/ customProvider calls * lint
flashbots · Jul 17, 2024 · 10caf97 · 10caf97
1 parent 86dc9d5
commit 10caf97
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/chains/suave/wallet.ts b/src/chains/suave/wallet.ts
@@ -207,20 +207,23 @@ function newSuaveWallet<TTransport extends Transport>(params: {
           console.warn('no gas provided, using default 30000000')
           return 30000000n
         })()
-      const preparedTx = await this.customProvider.prepareTransactionRequest({
-        account: client.account,
-        ...txRequest,
-        gas,
-      })
-      const gasPrice =
-        preparedTx.gasPrice ?? (await this.customProvider.getGasPrice())
+
+      const from = txRequest.from ?? client.account.address
+
       return {
         ...txRequest,
-        from: txRequest.from ?? preparedTx.from,
-        nonce: txRequest.nonce ?? preparedTx.nonce,
-        gas: txRequest.gas ?? preparedTx.gas,
-        gasPrice: txRequest.gasPrice ?? gasPrice,
+        from,
+        nonce:
+          txRequest.nonce ??
+          (await this.customProvider.getTransactionCount({ address: from })),
+        gas,
+        gasPrice:
+          txRequest.gasPrice ?? (await this.customProvider.getGasPrice()),
         chainId: txRequest.chainId ?? suaveRigil.id,
+        type:
+          txRequest.type ?? txRequest.kettleAddress
+            ? SuaveTxRequestTypes.ConfidentialRequest
+            : '0x0',
       }
     },