[SDK] fix: EIP1193 provider value filtering in transactions (#6449)

Author: joaquim-verges

.changeset/small-taxis-jog.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Fix EIP1193 provider adapter filtering out value from transactions

packages/thirdweb/src/adapters/eip1193/to-eip1193.test.ts

@@ -5,8 +5,10 @@ import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { typedData } from "~test/typed-data.js";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import { waitForReceipt } from "../../transaction/actions/wait-for-tx-receipt.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
 import type { Account, Wallet } from "../../wallets/interfaces/wallet.js";
+import { getWalletBalance } from "../../wallets/utils/getWalletBalance.js";
 import { createWalletEmitter } from "../../wallets/wallet-emitter.js";
 import { toProvider } from "./to-eip1193.js";
 
@@ -117,12 +119,33 @@ describe("toProvider", () => {
       to: TEST_WALLET_B,
     });
 
+    const balanceBefore = await getWalletBalance({
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      address: mockAccount.address,
+    });
+
     const result = await provider.request({
       method: "eth_sendTransaction",
       params: [tx],
     });
 
     expect(ox__Hex.validate(result)).toBe(true);
+    const receipt = await waitForReceipt({
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      transactionHash: result,
+    });
+
+    expect(receipt.status).toBe("success");
+
+    const balanceAfter = await getWalletBalance({
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      address: mockAccount.address,
+    });
+
+    expect(balanceAfter.value).toBeLessThan(balanceBefore.value);
   });
 
   test("should handle eth_estimateGas", async () => {

packages/thirdweb/src/wallets/in-app/core/wallet/enclave-wallet.ts

@@ -5,7 +5,7 @@ import type { ThirdwebClient } from "../../../../client/client.js";
 import { eth_sendRawTransaction } from "../../../../rpc/actions/eth_sendRawTransaction.js";
 import { getRpcClient } from "../../../../rpc/rpc.js";
 import { getAddress } from "../../../../utils/address.js";
-import { type Hex, toHex } from "../../../../utils/encoding/hex.js";
+import { type Hex, isHex, toHex } from "../../../../utils/encoding/hex.js";
 import { parseTypedData } from "../../../../utils/signatures/helpers/parse-typed-data.js";
 import type { Prettify } from "../../../../utils/type-utils.js";
 import type {
@@ -141,39 +141,32 @@ export class EnclaveWallet implements IWebWallet {
       const transaction: Record<string, Hex | number | undefined> = {
         to: tx.to ? getAddress(tx.to) : undefined,
         data: tx.data,
-        value: typeof tx.value === "bigint" ? toHex(tx.value) : undefined,
-        gas:
-          typeof tx.gas === "bigint"
-            ? toHex(tx.gas + tx.gas / BigInt(10))
-            : undefined, // Add a 10% buffer to gas
+        value: hexlify(tx.value),
+        gas: hexlify(tx.gas),
         nonce:
-          typeof tx.nonce === "number"
-            ? toHex(tx.nonce)
-            : toHex(
-                await import(
-                  "../../../../rpc/actions/eth_getTransactionCount.js"
-                ).then(({ eth_getTransactionCount }) =>
-                  eth_getTransactionCount(rpcRequest, {
-                    address: getAddress(this.address),
-                    blockTag: "pending",
-                  }),
-                ),
-              ),
+          hexlify(tx.nonce) ||
+          toHex(
+            await import(
+              "../../../../rpc/actions/eth_getTransactionCount.js"
+            ).then(({ eth_getTransactionCount }) =>
+              eth_getTransactionCount(rpcRequest, {
+                address: getAddress(this.address),
+                blockTag: "pending",
+              }),
+            ),
+          ),
         chainId: toHex(tx.chainId),
       };
 
-      if (typeof tx.maxFeePerGas === "bigint") {
-        transaction.maxFeePerGas = toHex(tx.maxFeePerGas);
-        transaction.maxPriorityFeePerGas =
-          typeof tx.maxPriorityFeePerGas === "bigint"
-            ? toHex(tx.maxPriorityFeePerGas)
-            : undefined;
+      if (hexlify(tx.maxFeePerGas)) {
+        transaction.maxFeePerGas = hexlify(tx.maxFeePerGas);
+        transaction.maxPriorityFeePerGas = hexlify(tx.maxPriorityFeePerGas);
         transaction.type = 2;
       } else {
-        transaction.gasPrice =
-          typeof tx.gasPrice === "bigint" ? toHex(tx.gasPrice) : undefined;
+        transaction.gasPrice = hexlify(tx.gasPrice);
         transaction.type = 0;
       }
+
       return signEnclaveTransaction({
         client,
         storage,
@@ -253,3 +246,7 @@ export class EnclaveWallet implements IWebWallet {
     };
   }
 }
+
+function hexlify(value: string | number | bigint | undefined) {
+  return value === undefined || isHex(value) ? value : toHex(value);
+}