renamed types, fixed wallet connect

Author: ethankonk

examples/foundry/README.md

@@ -83,7 +83,7 @@ Block: 9624270
 Paid: 0.000000162718420767 ETH (156813 gas * 0.001037659 gwei)
 
 ✅ Sequence #1 on sepolia | Total Paid: 0.000000162718420767 ETH (156813 gas * avg 0.001037659 gwei)
-                                                                                                                                                               
+
 
 ==========================
 ```

examples/with-sdk-js/src/app/layout.tsx

@@ -62,15 +62,15 @@ function RootLayout({ children }: RootLayoutProps) {
                   ],
                 },
               },
-              // walletConnect: {
-              //   projectId: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID!,
-              //   appMetadata: {
-              //     name: "Turnkey Wallet",
-              //     description: "A wallet for Turnkey",
-              //     url: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_URL!,
-              //     icons: ["/favicon.svg"],
-              //   },
-              // },
+              walletConnect: {
+                projectId: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID!,
+                appMetadata: {
+                  name: "Turnkey Wallet",
+                  description: "A wallet for Turnkey",
+                  url: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_URL!,
+                  icons: ["/favicon.svg"],
+                },
+              },
             },
           }}
         >

examples/with-sdk-js/src/app/page.tsx

@@ -1624,8 +1624,9 @@ export default function AuthPage() {
                 value: parseEther("0.001"),
                 nonce: 0,
                 gasLimit: BigInt("21000"),
-                maxFeePerGas: BigInt("1000000000"),
-                maxPriorityFeePerGas: BigInt("1000000000"),
+                gasPrice: BigInt("100000000000000"),
+                // maxFeePerGas: BigInt("1000000000"),
+                // maxPriorityFeePerGas: BigInt("1000000000"),
                 chainId: 1,
               };
 

packages/core/src/__types__/external-wallets.ts

@@ -219,7 +219,7 @@ export interface ConnectedWallet extends v1Wallet {
 /** @internal */
 export type Wallet = EmbeddedWallet | ConnectedWallet;
 
-export type BaseTransactionParams = {
+export type EvmTransactionParams = {
   from: `0x${string}`;
   to: `0x${string}`;
   value: `0x${string}`;
@@ -229,16 +229,16 @@ export type BaseTransactionParams = {
   data: `0x${string}`;
 };
 
-export type EIP1559TransactionParams = BaseTransactionParams & {
+export type EIP1559TransactionParams = EvmTransactionParams & {
   maxFeePerGas: `0x${string}`;
   maxPriorityFeePerGas: `0x${string}`;
 };
 
-export type LegacyTransactionParams = BaseTransactionParams & {
+export type LegacyEvmTransactionParams = EvmTransactionParams & {
   gasPrice: `0x${string}`;
 };
 
 /** @internal */
 export type EthereumTxParams =
   | EIP1559TransactionParams
-  | LegacyTransactionParams;
+  | LegacyEvmTransactionParams;

packages/core/src/__wallet__/wallet-connect/base.ts

@@ -15,6 +15,8 @@ import {
   WalletConnectProvider,
   WalletConnectInterface,
   SwitchableChain,
+  EvmTransactionParams,
+  EthereumTxParams,
 } from "../../__types__";
 import type { WalletConnectClient } from "./client";
 import type { SessionTypes } from "@walletconnect/types";
@@ -320,20 +322,52 @@ export class WalletConnectWallet implements WalletConnectInterface {
             address,
           ])) as string;
         case SignIntent.SignAndSendTransaction:
-          const account = provider.connectedAddresses[0];
+          const account = provider.connectedAddresses[0] as Hex;
+          if (!account) throw new Error("no connected address");
           const tx = Transaction.from(payload);
-          const txParams = {
+
+          const base: EvmTransactionParams = {
             from: account,
             to: tx.to?.toString() as Hex,
             value: toHex(tx.value),
             gas: toHex(tx.gasLimit),
-            maxFeePerGas: toHex(tx.maxFeePerGas ?? 0n),
-            maxPriorityFeePerGas: toHex(tx.maxPriorityFeePerGas ?? 0n),
             nonce: toHex(tx.nonce),
             chainId: toHex(tx.chainId),
             data: (tx.data?.toString() as Hex) ?? "0x",
           };
 
+          // Some libs use undefined for legacy, so normalize
+          const txType = (tx as any).type ?? 0;
+
+          let txParams: EthereumTxParams;
+
+          if (txType === undefined || txType === 0 || txType === 1) {
+            // legacy or EIP-2930 (gasPrice-based)
+            if (tx.gasPrice == null) {
+              throw new Error(
+                "Legacy or EIP-2930 transaction missing gasPrice",
+              );
+            }
+
+            txParams = {
+              ...base,
+              gasPrice: toHex(tx.gasPrice),
+            };
+          } else {
+            // EIP-1559 or future fee-market types
+            if (tx.maxFeePerGas == null || tx.maxPriorityFeePerGas == null) {
+              throw new Error(
+                "EIP-1559-style transaction missing maxFeePerGas or maxPriorityFeePerGas",
+              );
+            }
+
+            txParams = {
+              ...base,
+              maxFeePerGas: toHex(tx.maxFeePerGas),
+              maxPriorityFeePerGas: toHex(tx.maxPriorityFeePerGas),
+            };
+          }
+
           return (await this.client.request(
             this.ethChain,
             "eth_sendTransaction",

packages/core/src/__wallet__/web/native/ethereum.ts

@@ -9,7 +9,7 @@ import {
 import { Transaction } from "ethers";
 import { compressRawPublicKey } from "@turnkey/crypto";
 import {
-  BaseTransactionParams,
+  EvmTransactionParams,
   Chain,
   EthereumTxParams,
   EthereumWalletInterface,
@@ -284,7 +284,7 @@ export class EthereumWallet extends BaseEthereumWallet {
       case SignIntent.SignAndSendTransaction: {
         const tx = Transaction.from(payload);
 
-        const base: BaseTransactionParams = {
+        const base: EvmTransactionParams = {
           from: account,
           to: tx.to?.toString() as Hex,
           value: toHex(tx.value),
@@ -312,7 +312,9 @@ export class EthereumWallet extends BaseEthereumWallet {
         } else {
           // EIP-1559 or future fee-market types
           if (tx.maxFeePerGas == null || tx.maxPriorityFeePerGas == null) {
-            throw new Error("EIP-1559-style transaction missing maxFeePerGas or maxPriorityFeePerGas");
+            throw new Error(
+              "EIP-1559-style transaction missing maxFeePerGas or maxPriorityFeePerGas",
+            );
           }
 
           txParams = {