thirdweb 5.67.1-nightly-040e478ad6cf630dedf666eac7abeb668d323666-20241113000339 → 5.68.1-nightly-895b4d145fb0519febdb399abffea36208692d95-20241115000335

package/src/wallets/__generated__/wallet-infos.ts

@@ -95,7 +95,7 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     hasMobileSupport: true,
   },
   {
-    id: "com.crypto",
+    id: "com.crypto.wallet",
     name: "Crypto.com | DeFi Wallet",
     hasMobileSupport: true,
   },
@@ -906,7 +906,7 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
   },
   {
     id: "com.tomi",
-    name: "tomiPAY",
+    name: "tomi Wallet",
     hasMobileSupport: true,
   },
   {
@@ -1814,6 +1814,16 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Plumaa ID",
     hasMobileSupport: true,
   },
+  {
+    id: "social.gm2",
+    name: "GM² Social",
+    hasMobileSupport: true,
+  },
+  {
+    id: "nl.greenhood.wallet",
+    name: "Greenhood",
+    hasMobileSupport: true,
+  },
   {
     id: "com.coinbase.wallet",
     name: "Coinbase Wallet",
@@ -1889,6 +1899,11 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Nightly",
     hasMobileSupport: false,
   },
+  {
+    id: "com.blazpay.wallet",
+    name: "Blazpay",
+    hasMobileSupport: false,
+  },
   {
     id: "com.lootrush",
     name: "LootRush",
@@ -1904,6 +1919,11 @@ const ALL_MINIMAL_WALLET_INFOS = (<const>[
     name: "Dawn Wallet",
     hasMobileSupport: false,
   },
+  {
+    id: "xyz.abs",
+    name: "Abstract Global Wallet",
+    hasMobileSupport: false,
+  },
   {
     id: "smart",
     name: "Smart Wallet",

package/src/wallets/create-wallet.ts

@@ -7,7 +7,6 @@ import type { Account, Wallet } from "./interfaces/wallet.js";
 import type {
   CreateWalletArgs,
   EcosystemWalletId,
-  InjectedConnectOptions,
   WalletAutoConnectionOption,
   WalletId,
 } from "./wallet-types.js";
@@ -23,6 +22,7 @@ import { COINBASE } from "./constants.js";
 import { isEcosystemWallet } from "./ecosystem/is-ecosystem-wallet.js";
 import { ecosystemWallet } from "./in-app/web/ecosystem.js";
 import { inAppWallet } from "./in-app/web/in-app.js";
+import { getInjectedProvider } from "./injected/index.js";
 import { smartWallet } from "./smart/smart-wallet.js";
 import type { WCConnectOptions } from "./wallet-connect/types.js";
 import { createWalletEmitter } from "./wallet-emitter.js";
@@ -226,7 +226,7 @@ export function createWallet<const ID extends WalletId>(
           const { injectedProvider } = await import("./injected/mipdStore.js");
           // injected wallet priority for autoConnect
           if (id !== "walletConnect" && injectedProvider(id)) {
-            const { autoConnectInjectedWallet } = await import(
+            const { autoConnectEip1193Wallet } = await import(
               "./injected/index.js"
             );
 
@@ -235,8 +235,9 @@ export function createWallet<const ID extends WalletId>(
               connectedChain,
               doDisconnect,
               doSwitchChain,
-            ] = await autoConnectInjectedWallet({
+            ] = await autoConnectEip1193Wallet({
               id: id as InjectedSupportedWalletIds,
+              provider: getInjectedProvider(id),
               emitter,
               chain: options.chain,
               client: options.client,
@@ -339,7 +340,7 @@ export function createWallet<const ID extends WalletId>(
 
           const { injectedProvider } = await import("./injected/mipdStore.js");
           if (injectedProvider(id) && !forceWalletConnectOption) {
-            const { connectInjectedWallet } = await import(
+            const { connectEip1193Wallet } = await import(
               "./injected/index.js"
             );
 
@@ -348,11 +349,13 @@ export function createWallet<const ID extends WalletId>(
               connectedChain,
               doDisconnect,
               doSwitchChain,
-            ] = await connectInjectedWallet(
-              id as InjectedSupportedWalletIds,
-              options as InjectedConnectOptions,
+            ] = await connectEip1193Wallet({
+              id: id as InjectedSupportedWalletIds,
+              provider: getInjectedProvider(id),
+              client: options.client,
+              chain: options.chain,
               emitter,
-            );
+            });
             // set the states
             account = connectedAccount;
             chain = connectedChain;

package/src/wallets/injected/index.ts

@@ -1,4 +1,4 @@
-import type { Address } from "abitype";
+import type { EIP1193Provider } from "viem";
 import {
   type SignTypedDataParameters,
   getTypesForEIP712Domain,
@@ -18,13 +18,12 @@ import {
 } from "../../utils/encoding/hex.js";
 import { parseTypedData } from "../../utils/signatures/helpers/parseTypedData.js";
 import type { InjectedSupportedWalletIds } from "../__generated__/wallet-ids.js";
-import type { Ethereum } from "../interfaces/ethereum.js";
 import type { Account, SendTransactionOption } from "../interfaces/wallet.js";
 import type { DisconnectFn, SwitchChainFn } from "../types.js";
 import { getValidPublicRPCUrl } from "../utils/chains.js";
 import { normalizeChainId } from "../utils/normalizeChainId.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
-import type { InjectedConnectOptions, WalletId } from "../wallet-types.js";
+import type { WalletId } from "../wallet-types.js";
 import { injectedProvider } from "./mipdStore.js";
 
 // TODO: save the provider in data
@@ -40,19 +39,38 @@ export function getInjectedProvider(walletId: WalletId) {
 /**
  * @internal
  */
-export async function connectInjectedWallet(
-  id: InjectedSupportedWalletIds,
-  options: InjectedConnectOptions,
-  emitter: WalletEmitter<InjectedSupportedWalletIds>,
-): Promise<ReturnType<typeof onConnect>> {
-  const provider = getInjectedProvider(id);
-  const addresses = await provider.request({
-    method: "eth_requestAccounts",
-  });
+export async function connectEip1193Wallet({
+  id,
+  provider,
+  emitter,
+  client,
+  chain,
+}: {
+  id: InjectedSupportedWalletIds | ({} & string);
+  provider: EIP1193Provider;
+  client: ThirdwebClient;
+  chain?: Chain;
+  emitter: WalletEmitter<InjectedSupportedWalletIds>;
+}): Promise<ReturnType<typeof onConnect>> {
+  let addresses: string[] | undefined;
+  const retries = 3;
+  let attempts = 0;
+  // retry 3 times, some providers take a while to return accounts on connect
+  while (!addresses?.[0] && attempts < retries) {
+    try {
+      addresses = await provider.request({
+        method: "eth_requestAccounts",
+      });
+    } catch (e) {
+      console.error(e);
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    attempts++;
+  }
 
-  const addr = addresses[0];
+  const addr = addresses?.[0];
   if (!addr) {
-    throw new Error("no accounts available");
+    throw new Error("Failed to connect to wallet, no accounts available");
   }
 
   // use the first account
@@ -64,14 +82,12 @@ export async function connectInjectedWallet(
     .then(normalizeChainId);
 
   let connectedChain =
-    options.chain && options.chain.id === chainId
-      ? options.chain
-      : getCachedChain(chainId);
+    chain && chain.id === chainId ? chain : getCachedChain(chainId);
 
   // if we want a specific chainId and it is not the same as the provider chainId, trigger switchChain
-  if (options.chain && options.chain.id !== chainId) {
-    await switchChain(provider, options.chain);
-    connectedChain = options.chain;
+  if (chain && chain.id !== chainId) {
+    await switchChain(provider, chain);
+    connectedChain = chain;
   }
 
   return onConnect({
@@ -79,7 +95,7 @@ export async function connectInjectedWallet(
     address,
     chain: connectedChain,
     emitter,
-    client: options.client,
+    client,
     id,
   });
 }
@@ -87,19 +103,19 @@ export async function connectInjectedWallet(
 /**
  * @internal
  */
-export async function autoConnectInjectedWallet({
+export async function autoConnectEip1193Wallet({
   id,
+  provider,
   emitter,
   client,
   chain,
 }: {
-  id: InjectedSupportedWalletIds;
+  id: InjectedSupportedWalletIds | ({} & string);
+  provider: EIP1193Provider;
   emitter: WalletEmitter<InjectedSupportedWalletIds>;
   client: ThirdwebClient;
   chain?: Chain;
 }): Promise<ReturnType<typeof onConnect>> {
-  const provider = getInjectedProvider(id);
-
   // connected accounts
   const addresses = await provider.request({
     method: "eth_accounts",
@@ -107,7 +123,7 @@ export async function autoConnectInjectedWallet({
 
   const addr = addresses[0];
   if (!addr) {
-    throw new Error("no accounts available");
+    throw new Error("Failed to connect to wallet, no accounts available");
   }
 
   // use the first account
@@ -137,27 +153,44 @@ function createAccount({
   client,
   id,
 }: {
-  provider: Ethereum;
+  provider: EIP1193Provider;
   address: string;
   client: ThirdwebClient;
-  id: WalletId;
+  id: WalletId | ({} & string);
 }) {
   const account: Account = {
     address: getAddress(address),
     async sendTransaction(tx: SendTransactionOption) {
+      const gasFees = tx.gasPrice
+        ? {
+            gasPrice: tx.gasPrice ? numberToHex(tx.gasPrice) : undefined,
+          }
+        : {
+            maxFeePerGas: tx.maxFeePerGas
+              ? numberToHex(tx.maxFeePerGas)
+              : undefined,
+            maxPriorityFeePerGas: tx.maxPriorityFeePerGas
+              ? numberToHex(tx.maxPriorityFeePerGas)
+              : undefined,
+          };
+      const params = [
+        {
+          ...gasFees,
+          nonce: tx.nonce ? numberToHex(tx.nonce) : undefined,
+          accessList: tx.accessList,
+          value: tx.value ? numberToHex(tx.value) : undefined,
+          gas: tx.gas ? numberToHex(tx.gas) : undefined,
+          from: this.address,
+          to: tx.to ? getAddress(tx.to) : undefined,
+          data: tx.data,
+          ...tx.eip712,
+        },
+      ];
+
       const transactionHash = (await provider.request({
         method: "eth_sendTransaction",
-        params: [
-          {
-            accessList: tx.accessList,
-            value: tx.value ? numberToHex(tx.value) : undefined,
-            gas: tx.gas ? numberToHex(tx.gas) : undefined,
-            gasPrice: tx.gasPrice ? numberToHex(tx.gasPrice) : undefined,
-            from: this.address,
-            to: tx.to as Address,
-            data: tx.data,
-          },
-        ],
+        // @ts-expect-error - overriding types here
+        params,
       })) as Hex;
 
       trackTransaction({
@@ -251,12 +284,12 @@ async function onConnect({
   client,
   id,
 }: {
-  provider: Ethereum;
+  provider: EIP1193Provider;
   address: string;
   chain: Chain;
   emitter: WalletEmitter<InjectedSupportedWalletIds>;
   client: ThirdwebClient;
-  id: WalletId;
+  id: WalletId | ({} & string);
 }): Promise<[Account, Chain, DisconnectFn, SwitchChainFn]> {
   const account = createAccount({ provider, address, client, id });
   async function disconnect() {
@@ -308,7 +341,7 @@ async function onConnect({
 /**
  * @internal
  */
-async function switchChain(provider: Ethereum, chain: Chain) {
+async function switchChain(provider: EIP1193Provider, chain: Chain) {
   const hexChainId = numberToHex(chain.id);
   try {
     await provider.request({

package/dist/cjs/wallets/__generated__/wallet/com.crypto/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/__generated__/wallet/com.crypto/index.ts"],"names":[],"mappings":";AAAA,2EAA2E;AAC3E,oCAAoC;;;AAEvB,QAAA,MAAM,GAAG;IACpB,EAAE,EAAE,YAAY;IAChB,IAAI,EAAE,0BAA0B;IAChC,QAAQ,EAAE,qBAAqB;IAC/B,QAAQ,EAAE,sCAAsC;IAChD,GAAG,EAAE;QACH,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,iDAAiD;QACtD,OAAO,EAAE,+DAA+D;QACxE,GAAG,EAAE,IAAI;QACT,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,IAAI;KACZ;IACD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,2BAA2B;KACvC;IACD,OAAO,EAAE;QACP,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;KAChB;CACO,CAAC"}

package/dist/esm/wallets/__generated__/wallet/com.crypto/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wallets/__generated__/wallet/com.crypto/index.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,oCAAoC;AAEpC,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,EAAE,EAAE,YAAY;IAChB,IAAI,EAAE,0BAA0B;IAChC,QAAQ,EAAE,qBAAqB;IAC/B,QAAQ,EAAE,sCAAsC;IAChD,GAAG,EAAE;QACH,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,iDAAiD;QACtD,OAAO,EAAE,+DAA+D;QACxE,GAAG,EAAE,IAAI;QACT,OAAO,EAAE,IAAI;QACb,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,IAAI;KACZ;IACD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,2BAA2B;KACvC;IACD,OAAO,EAAE;QACP,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;KAChB;CACO,CAAC"}

package/dist/types/wallets/__generated__/wallet/com.crypto/image.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../../../../../src/wallets/__generated__/wallet/com.crypto/image.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,KAAK,gqEACopE,CAAC;AAEhqE,eAAe,KAAK,CAAC"}