thirdweb 5.44.0 → 5.44.1

package/dist/types/wallets/getAllWalletsList.d.ts

@@ -10,86 +10,95 @@ export declare function getAllWalletsList(): Promise<[{
     readonly id: "com.trustwallet.app";
     readonly name: "Trust Wallet";
 }, {
-    readonly id: "global.safe";
-    readonly name: "Safe";
+    readonly id: "com.okex.wallet";
+    readonly name: "OKX Wallet";
 }, {
-    readonly id: "me.rainbow";
-    readonly name: "Rainbow";
+    readonly id: "com.bitget.web3";
+    readonly name: "Bitget Wallet";
+}, {
+    readonly id: "com.binance";
+    readonly name: "Binance Web3 Wallet";
 }, {
     readonly id: "org.uniswap";
     readonly name: "Uniswap Wallet";
 }, {
-    readonly id: "io.zerion.wallet";
-    readonly name: "Zerion";
-}, {
-    readonly id: "im.token";
-    readonly name: "imToken";
-}, {
-    readonly id: "xyz.argent";
-    readonly name: "Argent";
-}, {
-    readonly id: "com.bitget.web3";
-    readonly name: "Bitget Wallet";
+    readonly id: "com.safepal";
+    readonly name: "SafePal";
 }, {
-    readonly id: "com.crypto";
-    readonly name: "Crypto.com | DeFi Wallet";
+    readonly id: "me.rainbow";
+    readonly name: "Rainbow";
 }, {
-    readonly id: "com.okex.wallet";
-    readonly name: "OKX Wallet";
+    readonly id: "com.bybit";
+    readonly name: "Bybit Wallet";
 }, {
     readonly id: "pro.tokenpocket";
     readonly name: "TokenPocket";
 }, {
-    readonly id: "com.robinhood.wallet";
-    readonly name: "Robinhood Wallet";
-}, {
-    readonly id: "xyz.frontier.wallet";
-    readonly name: "Frontier";
+    readonly id: "com.ledger";
+    readonly name: "Ledger Live";
 }, {
-    readonly id: "com.blockchain";
-    readonly name: "Blockchain.com";
+    readonly id: "xyz.timelesswallet";
+    readonly name: "Timeless X";
 }, {
-    readonly id: "com.safepal";
-    readonly name: "SafePal";
+    readonly id: "global.safe";
+    readonly name: "Safe";
 }, {
-    readonly id: "app.omni";
-    readonly name: "Omni";
+    readonly id: "io.zerion.wallet";
+    readonly name: "Zerion";
 }, {
-    readonly id: "com.zengo";
-    readonly name: "Zengo Wallet";
+    readonly id: "com.robinhood.wallet";
+    readonly name: "Robinhood Wallet";
 }, {
     readonly id: "io.1inch.wallet";
     readonly name: "1inch Wallet";
 }, {
-    readonly id: "com.binance";
-    readonly name: "Binance Web3 Wallet";
+    readonly id: "com.crypto";
+    readonly name: "Crypto.com | DeFi Wallet";
 }, {
     readonly id: "com.exodus";
     readonly name: "Exodus";
 }, {
-    readonly id: "com.ledger";
-    readonly name: "Ledger Live";
+    readonly id: "xyz.argent";
+    readonly name: "Argent";
+}, {
+    readonly id: "im.token";
+    readonly name: "imToken";
+}, {
+    readonly id: "com.zengo";
+    readonly name: "Zengo Wallet";
+}, {
+    readonly id: "com.blockchain";
+    readonly name: "Blockchain.com";
+}, {
+    readonly id: "com.kraken";
+    readonly name: "Kraken Wallet ";
 }, {
     readonly id: "com.mewwallet";
     readonly name: "MEW wallet";
+}, {
+    readonly id: "org.mathwallet";
+    readonly name: "MathWallet";
 }, {
     readonly id: "com.alphawallet";
     readonly name: "AlphaWallet";
+}, {
+    readonly id: "com.unstoppabledomains";
+    readonly name: "Unstoppable Domains";
 }, {
     readonly id: "app.keyring";
     readonly name: "KEYRING PRO";
+}, {
+    readonly id: "xyz.frontier.wallet";
+    readonly name: "Frontier";
+}, {
+    readonly id: "app.omni";
+    readonly name: "Omni";
 }, {
     readonly id: "co.lobstr";
     readonly name: "LOBSTR Wallet";
 }, {
     readonly id: "app.onto";
     readonly name: "ONTO";
-}, {
-    readonly id: "org.mathwallet";
-    readonly name: "MathWallet";
-}, {
-    readonly id: "com.unstoppabledomains";
-    readonly name: "Unstoppable Domains";
 }, {
     readonly id: "technology.obvious";
     readonly name: "Obvious";
@@ -120,9 +129,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "io.myabcwallet";
     readonly name: "ABC Wallet";
-}, {
-    readonly id: "finance.ottr";
-    readonly name: "Ottr Finance";
 }, {
     readonly id: "co.arculus";
     readonly name: "Arculus Wallet";
@@ -459,9 +465,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "com.kriptonio";
     readonly name: "Kriptonio";
-}, {
-    readonly id: "xyz.timelesswallet";
-    readonly name: "Timeless Wallet";
 }, {
     readonly id: "com.brave.wallet";
     readonly name: "Bitski";
@@ -543,9 +546,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "com.tomi";
     readonly name: "tomiPAY";
-}, {
-    readonly id: "com.bybit";
-    readonly name: "Bybit Wallet";
 }, {
     readonly id: "app.subwallet";
     readonly name: "SubWallet";
@@ -843,9 +843,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "io.noone";
     readonly name: "Noone Wallet";
-}, {
-    readonly id: "io.gate.wallet";
-    readonly name: "GateWallet";
 }, {
     readonly id: "com.bitso";
     readonly name: "Bitso Web3 Wallet";
@@ -861,9 +858,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "io.bharatbox";
     readonly name: "BharatBox App";
-}, {
-    readonly id: "com.blanqlabs.wallet";
-    readonly name: "Blanq";
 }, {
     readonly id: "foundation.klaytn";
     readonly name: "Kaikas";
@@ -882,9 +876,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "com.getcogni";
     readonly name: "Cogni ";
-}, {
-    readonly id: "io.toric";
-    readonly name: "Toric Wallet";
 }, {
     readonly id: "com.fastex.wallet";
     readonly name: "Fastex Wallet";
@@ -939,9 +930,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "money.keychain";
     readonly name: "Keychain";
-}, {
-    readonly id: "cool.pay";
-    readonly name: "paycool";
 }, {
     readonly id: "com.mpcvault.broswerplugin";
     readonly name: "MPCVault | Team crypto wallet";
@@ -963,9 +951,6 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "com.bettatrade";
     readonly name: "Bettatrade";
-}, {
-    readonly id: "com.kraken";
-    readonly name: "Kraken Wallet ";
 }, {
     readonly id: "io.scramberry";
     readonly name: "ScramberryWallet";
@@ -1044,21 +1029,51 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "io.guardiianwallet";
     readonly name: "GUARDIIAN Wallet";
+}, {
+    readonly id: "io.wallypto";
+    readonly name: "Wallypto";
+}, {
+    readonly id: "com.safemoon";
+    readonly name: "SafeMoon";
+}, {
+    readonly id: "com.elrond.maiar.wallet";
+    readonly name: "xPortal";
+}, {
+    readonly id: "co.swopme";
+    readonly name: "SWOP";
+}, {
+    readonly id: "com.bitpay";
+    readonly name: "BitPay Wallet";
+}, {
+    readonly id: "app.tofee";
+    readonly name: "Tofee Wallet Official";
+}, {
+    readonly id: "com.zypto";
+    readonly name: "Zypto";
+}, {
+    readonly id: "xyz.orion";
+    readonly name: "Orion";
+}, {
+    readonly id: "io.uptn";
+    readonly name: "UPTN";
+}, {
+    readonly id: "com.coinbase.wallet";
+    readonly name: "Coinbase Wallet";
 }, {
     readonly id: "io.rabby";
     readonly name: "Rabby";
 }, {
     readonly id: "app.phantom";
     readonly name: "Phantom";
-}, {
-    readonly id: "com.coinbase.wallet";
-    readonly name: "Coinbase Wallet";
 }, {
     readonly id: "io.xdefi";
     readonly name: "XDEFI Wallet";
 }, {
     readonly id: "com.moongate.one";
     readonly name: "MG";
+}, {
+    readonly id: "com.blanqlabs.wallet";
+    readonly name: "Blanq";
 }, {
     readonly id: "tech.levain";
     readonly name: "Levain";
@@ -1074,6 +1089,15 @@ export declare function getAllWalletsList(): Promise<[{
 }, {
     readonly id: "io.finoa";
     readonly name: "FinoaConnect";
+}, {
+    readonly id: "inc.tomo";
+    readonly name: "tomo extension wallet";
+}, {
+    readonly id: "com.walletconnect.com";
+    readonly name: "SampleW";
+}, {
+    readonly id: "io.leapwallet.CompassWallet";
+    readonly name: "Compass Wallet";
 }, {
     readonly id: "com.lootrush";
     readonly name: "LootRush";

package/dist/types/wallets/getAllWalletsList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAllWalletsList.d.ts","sourceRoot":"","sources":["../../../src/wallets/getAllWalletsList.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAsB,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEtC"}
+{"version":3,"file":"getAllWalletsList.d.ts","sourceRoot":"","sources":["../../../src/wallets/getAllWalletsList.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAsB,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAEtC"}

package/dist/types/wallets/smart/smart-wallet.d.ts

@@ -28,7 +28,7 @@ import type { CreateWalletArgs } from "../wallet-types.js";
  * The `sponsorGas` option is used to enable sponsored gas for transactions automatically.
  *
  * ```ts
- * import { smartWalletm inAppWallet } from "thirdweb/wallets";
+ * import { smartWallet, inAppWallet } from "thirdweb/wallets";
  * import { sepolia } from "thirdweb/chains";
  * import { sendTransaction } from "thirdweb";
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.44.0",
+  "version": "5.44.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"

package/src/auth/constants.ts

@@ -27,4 +27,4 @@ export const universalSignatureValidatorAbi = [
 ] as const;
 
 export const universalSignatureValidatorByteCode =
-  "0x60806040523480156200001157600080fd5b50604051620007003803806200070083398101604081905262000034916200056f565b6000620000438484846200004f565b9050806000526001601ff35b600080846001600160a01b0316803b806020016040519081016040528181526000908060200190933c90507f6492649264926492649264926492649264926492649264926492649264926492620000a68462000451565b036200021f57600060608085806020019051810190620000c79190620005ce565b8651929550909350915060000362000192576000836001600160a01b031683604051620000f5919062000643565b6000604051808303816000865af19150503d806000811462000134576040519150601f19603f3d011682016040523d82523d6000602084013e62000139565b606091505b5050905080620001905760405162461bcd60e51b815260206004820152601e60248201527f5369676e617475726556616c696461746f723a206465706c6f796d656e74000060448201526064015b60405180910390fd5b505b604051630b135d3f60e11b808252906001600160a01b038a1690631626ba7e90620001c4908b90869060040162000661565b602060405180830381865afa158015620001e2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200020891906200069d565b6001600160e01b031916149450505050506200044a565b805115620002b157604051630b135d3f60e11b808252906001600160a01b03871690631626ba7e9062000259908890889060040162000661565b602060405180830381865afa15801562000277573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029d91906200069d565b6001600160e01b031916149150506200044a565b8251604114620003195760405162461bcd60e51b815260206004820152603a6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e677468000000000000606482015260840162000187565b620003236200046b565b506020830151604080850151855186939260009185919081106200034b576200034b620006c9565b016020015160f81c9050601b81148015906200036b57508060ff16601c14155b15620003cf5760405162461bcd60e51b815260206004820152603b6024820152600080516020620006e083398151915260448201527f3a20696e76616c6964207369676e617475726520762076616c75650000000000606482015260840162000187565b6040805160008152602081018083528a905260ff83169181019190915260608101849052608081018390526001600160a01b038a169060019060a0016020604051602081039080840390855afa1580156200042e573d6000803e3d6000fd5b505050602060405103516001600160a01b031614955050505050505b9392505050565b60006020825110156200046357600080fd5b508051015190565b60405180606001604052806003906020820280368337509192915050565b6001600160a01b03811681146200049f57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620004d5578181015183820152602001620004bb565b50506000910152565b600082601f830112620004f057600080fd5b81516001600160401b03808211156200050d576200050d620004a2565b604051601f8301601f19908116603f01168101908282118183101715620005385762000538620004a2565b816040528381528660208588010111156200055257600080fd5b62000565846020830160208901620004b8565b9695505050505050565b6000806000606084860312156200058557600080fd5b8351620005928162000489565b6020850151604086015191945092506001600160401b03811115620005b657600080fd5b620005c486828701620004de565b9150509250925092565b600080600060608486031215620005e457600080fd5b8351620005f18162000489565b60208501519093506001600160401b03808211156200060f57600080fd5b6200061d87838801620004de565b935060408601519150808211156200063457600080fd5b50620005c486828701620004de565b6000825162000657818460208701620004b8565b9190910192915050565b828152604060208201526000825180604084015262000688816060850160208701620004b8565b601f01601f1916919091016060019392505050565b600060208284031215620006b057600080fd5b81516001600160e01b0319811681146200044a57600080fd5b634e487b7160e01b600052603260045260246000fdfe5369676e617475726556616c696461746f72237265636f7665725369676e6572";
+  "0x608060405234801561001057600080fd5b5060405161069438038061069483398101604081905261002f9161051e565b600061003c848484610048565b9050806000526001601ff35b60007f64926492649264926492649264926492649264926492649264926492649264926100748361040c565b036101e7576000606080848060200190518101906100929190610577565b60405192955090935091506000906001600160a01b038516906100b69085906105dd565b6000604051808303816000865af19150503d80600081146100f3576040519150601f19603f3d011682016040523d82523d6000602084013e6100f8565b606091505b50509050876001600160a01b03163b60000361016057806101605760405162461bcd60e51b815260206004820152601e60248201527f5369676e617475726556616c696461746f723a206465706c6f796d656e74000060448201526064015b60405180910390fd5b604051630b135d3f60e11b808252906001600160a01b038a1690631626ba7e90610190908b9087906004016105f9565b602060405180830381865afa1580156101ad573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d19190610633565b6001600160e01b03191614945050505050610405565b6001600160a01b0384163b1561027a57604051630b135d3f60e11b808252906001600160a01b03861690631626ba7e9061022790879087906004016105f9565b602060405180830381865afa158015610244573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102689190610633565b6001600160e01b031916149050610405565b81516041146102df5760405162461bcd60e51b815260206004820152603a602482015260008051602061067483398151915260448201527f3a20696e76616c6964207369676e6174757265206c656e6774680000000000006064820152608401610157565b6102e7610425565b5060208201516040808401518451859392600091859190811061030c5761030c61065d565b016020015160f81c9050601b811480159061032b57508060ff16601c14155b1561038c5760405162461bcd60e51b815260206004820152603b602482015260008051602061067483398151915260448201527f3a20696e76616c6964207369676e617475726520762076616c756500000000006064820152608401610157565b60408051600081526020810180835289905260ff83169181019190915260608101849052608081018390526001600160a01b0389169060019060a0016020604051602081039080840390855afa1580156103ea573d6000803e3d6000fd5b505050602060405103516001600160a01b0316149450505050505b9392505050565b600060208251101561041d57600080fd5b508051015190565b60405180606001604052806003906020820280368337509192915050565b6001600160a01b038116811461045857600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60005b8381101561048c578181015183820152602001610474565b50506000910152565b600082601f8301126104a657600080fd5b81516001600160401b038111156104bf576104bf61045b565b604051601f8201601f19908116603f011681016001600160401b03811182821017156104ed576104ed61045b565b60405281815283820160200185101561050557600080fd5b610516826020830160208701610471565b949350505050565b60008060006060848603121561053357600080fd5b835161053e81610443565b6020850151604086015191945092506001600160401b0381111561056157600080fd5b61056d86828701610495565b9150509250925092565b60008060006060848603121561058c57600080fd5b835161059781610443565b60208501519093506001600160401b038111156105b357600080fd5b6105bf86828701610495565b604086015190935090506001600160401b0381111561056157600080fd5b600082516105ef818460208701610471565b9190910192915050565b828152604060208201526000825180604084015261061e816060850160208701610471565b601f01601f1916919091016060019392505050565b60006020828403121561064557600080fd5b81516001600160e01b03198116811461040557600080fd5b634e487b7160e01b600052603260045260246000fdfe5369676e617475726556616c696461746f72237265636f7665725369676e6572";

package/src/auth/verify-hash.ts

@@ -2,13 +2,11 @@ import { equalBytes } from "@noble/curves/abstract/utils";
 import { type Signature, encodeDeployData, serializeSignature } from "viem";
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
-import { getContract } from "../contract/contract.js";
 import { eth_call } from "../rpc/actions/eth_call.js";
 import { getRpcClient } from "../rpc/rpc.js";
 import { fromBytes } from "../utils/encoding/from-bytes.js";
 import { type Hex, isHex } from "../utils/encoding/hex.js";
 import { toBytes } from "../utils/encoding/to-bytes.js";
-import { DEFAULT_ACCOUNT_FACTORY } from "../wallets/smart/lib/constants.js";
 import {
   universalSignatureValidatorAbi,
   universalSignatureValidatorByteCode,
@@ -75,27 +73,18 @@ export async function verifyHash({
     );
   })();
 
-  const accountContract = getContract({
-    address,
-    chain,
-    client,
-  });
-
   const wrappedSignature = await (async () => {
+    // If no factory is provided, we have to assume its already deployed or is an EOA
+    // TODO: Figure out how to automatically tell if our default factory was used
+    if (!accountFactory) return signatureHex;
+
     // If this sigature was already wrapped for ERC-6492, carry on
     if (isErc6492Signature(signatureHex)) return signatureHex;
 
-    // If the contract is already deployed, return the original signature
-    const { isContractDeployed } = await import(
-      "../utils/bytecode/is-contract-deployed.js"
-    );
-    const isDeployed = await isContractDeployed(accountContract);
-    if (!isDeployed) return signatureHex;
-
     // Otherwise, serialize the signature for ERC-6492 validation
     return serializeErc6492Signature({
-      address: accountFactory?.address ?? DEFAULT_ACCOUNT_FACTORY,
-      data: accountFactory?.verificationCalldata ?? "0x",
+      address: accountFactory.address,
+      data: accountFactory.verificationCalldata,
       signature: signatureHex,
     });
   })();

package/src/extensions/airdrop/write/claimERC1155.test.ts

@@ -26,7 +26,7 @@ import { saveSnapshot } from "./saveSnapshot.js";
 
 // skip this test suite if there is no secret key available to test with
 // TODO: remove reliance on secret key during unit tests entirely
-describe.runIf(process.env.TW_SECRET_KEY)("claimERC1155", () => {
+describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC1155", () => {
   let airdropContract: ThirdwebContract;
   let erc1155TokenContract: ThirdwebContract;
 

package/src/extensions/airdrop/write/claimERC20.test.ts

@@ -24,7 +24,7 @@ import { saveSnapshot } from "./saveSnapshot.js";
 
 // skip this test suite if there is no secret key available to test with
 // TODO: remove reliance on secret key during unit tests entirely
-describe.runIf(process.env.TW_SECRET_KEY)("claimERC20", () => {
+describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC20", () => {
   let airdropContract: ThirdwebContract;
   let erc20TokenContract: ThirdwebContract;
 

package/src/extensions/airdrop/write/claimERC721.test.ts

@@ -26,7 +26,7 @@ import { saveSnapshot } from "./saveSnapshot.js";
 
 // skip this test suite if there is no secret key available to test with
 // TODO: remove reliance on secret key during unit tests entirely
-describe.runIf(process.env.TW_SECRET_KEY)("claimERC721", () => {
+describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC721", () => {
   let airdropContract: ThirdwebContract;
   let erc721TokenContract: ThirdwebContract;
 

package/src/pay/buyWithFiat/getQuote.ts

@@ -75,6 +75,13 @@ export type GetBuyWithFiatQuoteParams = {
    * This details will be stored with the purchase and can be retrieved later via the status API or Webhook
    */
   purchaseData?: object;
+
+  /**
+   * Optional parameter to onramp gas with the purchase
+   * If native token, will onramp extra native token amount
+   * If erc20, will onramp native token + erc20
+   */
+  toGasAmountWei?: string;
 };
 
 /**
@@ -190,6 +197,27 @@ export type BuyWithFiatQuote = {
     };
   };
 
+  /**
+   * Gas Token that will be sent to the user's wallet address by the on-ramp provider.
+   *
+   * Only used for ERC20 + Gas on-ramp flow. This will hold the details of the gas token and amount sent for gas.
+   *
+   * In Native Currency case, extra for gas will be added to the output amount of the onramp.
+   */
+  gasToken?: {
+    amount: string;
+    amountWei: string;
+    amountUSDCents: number;
+    token: {
+      chainId: number;
+      decimals: number;
+      name: string;
+      priceUSDCents: number;
+      symbol: string;
+      tokenAddress: string;
+    };
+  };
+
   /**
    * Link to the on-ramp provider UI that will prompt the user to buy the token with fiat currency.
    *
@@ -274,6 +302,7 @@ export async function getBuyWithFiatQuote(
         isTestMode: params.isTestMode,
         purchaseData: params.purchaseData,
         fromAddress: params.fromAddress,
+        toGasAmountWei: params.toGasAmountWei,
       }),
     });
 

package/src/react/core/hooks/auth/useSiweAuth.ts

@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { LoginPayload } from "../../../../auth/core/types.js";
 import type { VerifyLoginPayloadParams } from "../../../../auth/core/verify-login-payload.js";
-import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
+import type { Account, Wallet } from "../../../../wallets/interfaces/wallet.js";
 
 /**
  * Options for Setting up SIWE (Sign in with Ethereum) Authentication
@@ -48,10 +48,9 @@ export type SiweAuthOptions = {
  */
 export function useSiweAuth(
   activeWallet?: Wallet,
+  activeAccount?: Account,
   authOptions?: SiweAuthOptions,
 ) {
-  const activeAccount = activeWallet?.getAccount();
-
   const requiresAuth = !!authOptions;
 
   const queryClient = useQueryClient();

package/src/react/native/ui/connect/ConnectButton.tsx

@@ -45,7 +45,7 @@ export function ConnectButton(props: ConnectButtonProps) {
   const wallet = useActiveWallet();
   const account = useActiveAccount();
   const status = useActiveWalletConnectionStatus();
-  const siweAuth = useSiweAuth(wallet, props.auth);
+  const siweAuth = useSiweAuth(wallet, account, props.auth);
   useAutoConnect(props);
 
   const fadeAnim = useRef(new Animated.Value(0)); // For background opacity

package/src/react/native/ui/connect/ConnectModal.tsx

@@ -9,6 +9,7 @@ import type { Theme } from "../../../core/design-system/index.js";
 import { useSiweAuth } from "../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../core/hooks/connection/ConnectButtonProps.js";
 import type { ConnectEmbedProps } from "../../../core/hooks/connection/ConnectEmbedProps.js";
+import { useActiveAccount } from "../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../core/hooks/wallets/useActiveWallet.js";
 import { useDisconnect } from "../../../core/hooks/wallets/useDisconnect.js";
 import { useConnectionManager } from "../../../core/providers/connection-manager.js";
@@ -60,7 +61,8 @@ export type ModalState =
 export function ConnectEmbed(props: ConnectEmbedProps) {
   const theme = parseTheme(props.theme);
   const wallet = useActiveWallet();
-  const siweAuth = useSiweAuth(wallet, props.auth);
+  const account = useActiveAccount();
+  const siweAuth = useSiweAuth(wallet, account, props.auth);
   const needsAuth = siweAuth.requiresAuth && !siweAuth.isLoggedIn;
   const isConnected = wallet && !needsAuth;
   const adaptedProps = {

package/src/react/native/ui/connect/ConnectedModal.tsx

@@ -310,9 +310,9 @@ const ViewFunds = (props: ConnectedModalPropsInner) => {
 };
 
 const DisconnectWallet = (props: ConnectedModalProps) => {
-  const { wallet, theme, onClose } = props;
+  const { wallet, account, theme, onClose } = props;
   const { disconnect } = useDisconnect();
-  const siweAuth = useSiweAuth(wallet, props.auth);
+  const siweAuth = useSiweAuth(wallet, account, props.auth);
   return (
     <TouchableOpacity
       style={styles.walletMenuRow}

package/src/react/web/ui/ConnectWallet/ConnectButton.tsx

@@ -363,7 +363,7 @@ function ConnectButtonInner(
 ) {
   const activeWallet = useActiveWallet();
   const activeAccount = useActiveAccount();
-  const siweAuth = useSiweAuth(activeWallet, props.auth);
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
   const [showSignatureModal, setShowSignatureModal] = useState(false);
 
   // if wallet gets disconnected suddently, close the signature modal if it's open

package/src/react/web/ui/ConnectWallet/Modal/ConnectEmbed.tsx

@@ -181,7 +181,7 @@ import { useSetupScreen } from "./screen.js";
 export function ConnectEmbed(props: ConnectEmbedProps) {
   const activeWallet = useActiveWallet();
   const activeAccount = useActiveAccount();
-  const siweAuth = useSiweAuth(activeWallet, props.auth);
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
   const show =
     !activeAccount || (siweAuth.requiresAuth && !siweAuth.isLoggedIn);
 
@@ -334,8 +334,8 @@ const ConnectEmbedContent = (props: {
   });
   const { setScreen, initialScreen, screen } = screenSetup;
   const activeWallet = useActiveWallet();
-  const siweAuth = useSiweAuth(activeWallet, props.auth);
   const activeAccount = useActiveAccount();
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
 
   const isAutoConnecting = useIsAutoConnecting();
 

package/src/react/web/ui/ConnectWallet/Modal/ConnectModalContent.tsx

@@ -9,6 +9,7 @@ import {
   type SiweAuthOptions,
   useSiweAuth,
 } from "../../../../core/hooks/auth/useSiweAuth.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { useSetActiveWallet } from "../../../../core/hooks/wallets/useSetActiveWallet.js";
 import { useConnectionManager } from "../../../../core/providers/connection-manager.js";
@@ -76,9 +77,9 @@ export const ConnectModalContent = (props: {
   const { screen, setScreen, initialScreen } = props.screenSetup;
   const setActiveWallet = useSetActiveWallet();
   const setSelectionData = useSetSelectionData();
-
   const activeWallet = useActiveWallet();
-  const siweAuth = useSiweAuth(activeWallet, props.auth);
+  const activeAccount = useActiveAccount();
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
   const showSignatureScreen = siweAuth.requiresAuth && !siweAuth.isLoggedIn;
   const connectionManager = useConnectionManager();
 

package/src/react/web/ui/ConnectWallet/screens/SignatureScreen.tsx

@@ -11,6 +11,7 @@ import {
 } from "../../../../core/design-system/index.js";
 import { useSiweAuth } from "../../../../core/hooks/auth/useSiweAuth.js";
 import type { ConnectButtonProps } from "../../../../core/hooks/connection/ConnectButtonProps.js";
+import { useActiveAccount } from "../../../../core/hooks/wallets/useActiveAccount.js";
 import { useActiveWallet } from "../../../../core/hooks/wallets/useActiveWallet.js";
 import { useDisconnect } from "../../../../core/hooks/wallets/useDisconnect.js";
 import { wait } from "../../../../core/utils/wait.js";
@@ -46,7 +47,8 @@ export const SignatureScreen: React.FC<{
   } = props;
 
   const activeWallet = useActiveWallet();
-  const siweAuth = useSiweAuth(activeWallet, props.auth);
+  const activeAccount = useActiveAccount();
+  const siweAuth = useSiweAuth(activeWallet, activeAccount, props.auth);
   const [status, setStatus] = useState<Status>("idle");
   const { disconnect } = useDisconnect();
   const wallet = useActiveWallet();

package/src/transaction/actions/to-serializable-transaction.test.ts

@@ -14,7 +14,7 @@ import {
 import { serializeTransaction } from "../serialize-transaction.js";
 import { toSerializableTransaction } from "./to-serializable-transaction.js";
 
-describe("toSerializableTransaction", () => {
+describe.runIf(process.env.TW_SECRET_KEY)("toSerializableTransaction", () => {
   let transaction: PreparedTransaction;
   beforeAll(() => {
     transaction = prepareTransaction({

package/src/transaction/serialize-transaction.test.ts

@@ -26,7 +26,7 @@ const BASE_TRANSACTION = {
   value: toWei("1"),
 } as const satisfies TransactionSerializableBase;
 
-describe("eip1559", () => {
+describe.runIf(process.env.TW_SECRET_KEY)("eip1559", () => {
   const baseEip1559 = {
     ...BASE_TRANSACTION,
     chainId: 1,

package/src/transaction/serialize-transaction.ts

@@ -246,7 +246,12 @@ function serializeTransactionLegacy(
     if (typeof s === "undefined")
       throw new Error(`Invalid legacy signature value s: ${s}`);
 
-    serializedTransaction = [...serializedTransaction, toHex(v_), r, s];
+    serializedTransaction = [
+      ...serializedTransaction,
+      toHex(v_),
+      r === "0x00" ? "0x" : r,
+      s === "0x00" ? "0x" : s,
+    ];
   } else if (chainId > 0) {
     serializedTransaction = [
       ...serializedTransaction,
@@ -262,11 +267,16 @@ function serializeTransactionLegacy(
 export function toYParitySignatureArray(
   signature: ExactPartial<Signature>,
 ): Hex[] {
-  const { r, s, v, yParity } = signature;
-  if (typeof r === "undefined") return [];
-  if (typeof s === "undefined") return [];
+  const { v, yParity } = signature;
+
+  if (typeof signature.r === "undefined") return [];
+  if (typeof signature.s === "undefined") return [];
+
   if (typeof v === "undefined" && typeof yParity === "undefined") return [];
 
+  const r = trim(signature.r);
+  const s = trim(signature.s);
+
   const yParity_ = (() => {
     if (yParity === 1 || yParity === 0) return yParity ? toHex(1) : "0x";
     if (typeof yParity !== "undefined")
@@ -276,5 +286,5 @@ export function toYParitySignatureArray(
     if (v === 1n || v === 28n) return toHex(1);
     throw new Error(`Invalid signature value v: ${v}`);
   })();
-  return [yParity_, trim(r), trim(s)];
+  return [yParity_, r === "0x00" ? "0x" : r, s === "0x00" ? "0x" : s];
 }