[Wallets] fix gas estimations for local and embedded wallets (#2143)

.changeset/lucky-pianos-sing.md

@@ -0,0 +1,6 @@
+---
+"@thirdweb-dev/wallets": patch
+"@thirdweb-dev/sdk": patch
+---
+
+Fix gas estimations for local and embedded wallets

packages/sdk/src/evm/common/gas-price.ts

@@ -1,7 +1,6 @@
 import { ChainId } from "../constants/chains/ChainId";
 import { BigNumber, utils, providers } from "ethers";
 import { Mumbai, Polygon } from "@thirdweb-dev/chains";
-import { isBrowser } from "./utils";
 
 type FeeData = {
   maxFeePerGas: null | BigNumber;
@@ -10,11 +9,6 @@ type FeeData = {
 };
 
 export async function getDefaultGasOverrides(provider: providers.Provider) {
-  // If we're running in the browser, let users configure gas price in their wallet UI
-  if (isBrowser()) {
-    return {};
-  }
-
   // handle smart wallet provider
   if ((provider as any).originalProvider) {
     provider = (provider as any).originalProvider;

packages/sdk/src/evm/core/classes/internal/contract-wrapper.ts

@@ -43,6 +43,7 @@ import {
   PermitRequestMessage,
 } from "../../types";
 import { RPCConnectionHandler } from "./rpc-connection-handler";
+import { isBrowser } from "../../../common/utils";
 
 /**
  * @internal
@@ -145,6 +146,10 @@ export class ContractWrapper<
    * @internal
    */
   public async getCallOverrides(): Promise<CallOverrides> {
+    // If we're running in the browser, let users configure gas price in their wallet UI
+    if (isBrowser()) {
+      return {};
+    }
     return getDefaultGasOverrides(this.getProvider());
   }
 

packages/sdk/src/evm/core/classes/transactions.ts

@@ -17,7 +17,7 @@ import type {
   TransactionOptionsWithContractWrapper,
 } from "../../types/transactions";
 import { GaslessTransaction, TransactionResult } from "../types";
-import { ThirdwebStorage } from "@thirdweb-dev/storage";
+import { ThirdwebStorage, isBrowser } from "@thirdweb-dev/storage";
 import {
   BaseContract,
   CallOverrides,
@@ -222,19 +222,13 @@ abstract class TransactionContext {
    * Get gas overrides for the transaction
    */
   protected async getGasOverrides() {
+    // If we're running in the browser, let users configure gas price in their wallet UI
+    // TODO - should prob only check if its a json rpc signer (browser extension)
+    if (isBrowser()) {
+      return {};
+    }
     return getDefaultGasOverrides(this.provider);
   }
-
-  /**
-   * Calculates the priority fee per gas according (adding a 10% buffer)
-   */
-  private getPreferredPriorityFee(
-    defaultPriorityFeePerGas: BigNumber,
-  ): BigNumber {
-    const extraTip = defaultPriorityFeePerGas.div(100).mul(10); // + 10%
-    const txGasPrice = defaultPriorityFeePerGas.add(extraTip);
-    return txGasPrice;
-  }
 }
 
 export class Transaction<

packages/sdk/src/evm/core/wallet/user-wallet.ts

@@ -1,6 +1,6 @@
 import type { BlockTag } from "@ethersproject/abstract-provider";
 import type { IERC20 } from "@thirdweb-dev/contracts-js";
-import { ThirdwebStorage } from "@thirdweb-dev/storage";
+import { ThirdwebStorage, isBrowser } from "@thirdweb-dev/storage";
 import {
   BigNumber,
   Wallet,
@@ -112,10 +112,14 @@ export class UserWallet {
     if (isNativeToken(resolvedCurrency)) {
       // native token transfer
       const from = await signer.getAddress();
+      const gasOverrides = isBrowser()
+        ? {}
+        : await getDefaultGasOverrides(this.connection.getProvider());
       const tx = await signer.sendTransaction({
         from,
         to: resolvedTo,
         value: amountInWei,
+        ...gasOverrides,
       });
       return {
         receipt: await tx.wait(),
@@ -294,20 +298,14 @@ export class UserWallet {
     transactionRequest: providers.TransactionRequest,
   ): Promise<providers.TransactionResponse> {
     const signer = this.requireWallet();
-    const hasGasPrice = !!transactionRequest.gasPrice;
-    const hasFeeData =
-      !!transactionRequest.maxFeePerGas &&
-      !!transactionRequest.maxPriorityFeePerGas;
-    const hasGasData = hasGasPrice || hasFeeData;
-    if (!hasGasData) {
-      // set default gas values
-      const defaultGas = await getDefaultGasOverrides(
-        this.connection.getProvider(),
-      );
-      transactionRequest.maxFeePerGas = defaultGas.maxFeePerGas;
-      transactionRequest.maxPriorityFeePerGas = defaultGas.maxPriorityFeePerGas;
-      transactionRequest.gasPrice = defaultGas.gasPrice;
-    }
+    // set default gas values
+    const gasOverrides = isBrowser()
+      ? {}
+      : await getDefaultGasOverrides(this.connection.getProvider());
+    transactionRequest = {
+      ...gasOverrides,
+      ...transactionRequest,
+    };
     return signer.sendTransaction(transactionRequest);
   }
 

packages/wallets/src/evm/connectors/embedded-wallet/implementations/lib/core/signer.ts

@@ -16,6 +16,7 @@ import type {
 
 import Provider from "ethereum-provider";
 import type { EmbeddedWalletIframeCommunicator } from "../../utils/iFrameCommunication/EmbeddedWalletIframeCommunicator";
+import { getDefaultGasOverrides } from "@thirdweb-dev/sdk";
 
 export type SignerProcedureTypes = {
   getAddress: void;
@@ -98,6 +99,20 @@ export class EthersSigner extends Signer {
     return signedTransaction;
   }
 
+  override async sendTransaction(
+    transaction: Deferrable<providers.TransactionRequest>,
+  ): Promise<providers.TransactionResponse> {
+    if (!this.provider) {
+      throw new Error("Provider not found");
+    }
+    const gas = await getDefaultGasOverrides(this.provider);
+    const txWithGas = {
+      ...gas,
+      ...transaction,
+    };
+    return super.sendTransaction(txWithGas);
+  }
+
   async _signTypedData(
     domain: SignerProcedureTypes["signTypedDataV4"]["domain"],
     types: SignerProcedureTypes["signTypedDataV4"]["types"],

packages/wallets/src/evm/connectors/local-wallet/index.ts

@@ -6,6 +6,7 @@ import type { Signer } from "ethers";
 import { providers } from "ethers";
 import type { Wallet } from "ethers";
 import { getChainProvider } from "@thirdweb-dev/sdk";
+import { WrappedSigner } from "./wrapped-signer";
 
 export type LocalWalletConnectorOptions = {
   chain: Chain;
@@ -119,8 +120,9 @@ function getSignerFromEthersWallet(
   ethersWallet: Wallet,
   provider?: providers.Provider,
 ) {
+  let signer = ethersWallet;
   if (provider) {
-    return ethersWallet.connect(provider);
+    signer = ethersWallet.connect(provider);
   }
-  return ethersWallet;
+  return new WrappedSigner(signer);
 }

packages/wallets/src/evm/connectors/local-wallet/wrapped-signer.ts

@@ -0,0 +1,42 @@
+import { getDefaultGasOverrides } from "@thirdweb-dev/sdk";
+import { Bytes, Signer, providers } from "ethers";
+import { Deferrable, defineReadOnly } from "ethers/lib/utils";
+
+export class WrappedSigner extends Signer {
+  constructor(private signer: Signer) {
+    super();
+    defineReadOnly(this, "provider", signer.provider);
+  }
+
+  override async getAddress(): Promise<string> {
+    return await this.signer.getAddress();
+  }
+
+  override async signMessage(message: Bytes | string): Promise<string> {
+    return await this.signer.signMessage(message);
+  }
+
+  override async signTransaction(
+    transaction: Deferrable<providers.TransactionRequest>,
+  ): Promise<string> {
+    return await this.signer.signTransaction(transaction);
+  }
+
+  override connect(provider: providers.Provider): Signer {
+    return new WrappedSigner(this.signer.connect(provider));
+  }
+
+  override async sendTransaction(
+    transaction: Deferrable<providers.TransactionRequest>,
+  ): Promise<providers.TransactionResponse> {
+    if (!this.provider) {
+      throw new Error("Provider not found");
+    }
+    const gas = await getDefaultGasOverrides(this.provider);
+    const txWithGas = {
+      ...gas,
+      ...transaction,
+    };
+    return await this.signer.sendTransaction(txWithGas);
+  }
+}

packages/wallets/src/evm/wallets/abstract.ts

@@ -8,6 +8,7 @@ import {
   Price,
   TransactionResult,
   fetchCurrencyValue,
+  getDefaultGasOverrides,
   isNativeToken,
   normalizePriceValue,
 } from "@thirdweb-dev/sdk";
@@ -148,10 +149,12 @@ export abstract class AbstractWallet
     );
 
     if (isNativeToken(currencyAddress)) {
+      const gas = getDefaultGasOverrides(signer.provider);
       const tx = await signer.sendTransaction({
         from,
         to,
         value,
+        ...gas,
       });
       return { receipt: await tx.wait() };
     } else {