@funkit/core 2.2.0 → 2.2.1

package/dist/index.js

@@ -11360,20 +11360,6 @@ var useFaucet = async (chainIdentifier, wallet) => {
 };
 
 // src/utils/CheckoutUtils.ts
-async function getDecimals({
-  chainId,
-  tokenAddress
-}) {
-  if (tokenAddress === FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS) {
-    return FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO[chainId].nativeCurrency.decimals;
-  }
-  if (chainId === dydxChain.id.toString() && FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO[chainId].checkoutAssetWhitelist?.[0] === tokenAddress.toLowerCase()) {
-    return 6;
-  }
-  const chain = await Chain.getChain({ chainIdentifier: chainId });
-  const token = new Token(tokenAddress, chain);
-  return Number(await token.getDecimals());
-}
 function generateRandomCheckoutSalt() {
   return BigInt(randomBytes(32));
 }
@@ -11399,7 +11385,7 @@ import { JSBI } from "@uniswap/sdk";
 import {
   CurrencyAmount,
   Percent,
-  Token as Token2,
+  Token,
   TradeType
 } from "@uniswap/sdk-core";
 import {
@@ -11612,8 +11598,8 @@ async function swapExec(client, uniswapAddrs, swapParams, chainId) {
   const swapper = new SwapToken(client, 3, univ3quoter, univ3factory);
   const tokenInDecimal = await swapper.getTokenDecimals(tokenInAddress);
   const tokenOutDecimal = await swapper.getTokenDecimals(tokenOutAddress);
-  const tokenIn = new Token2(chainId, tokenInAddress, tokenInDecimal);
-  const tokenOut = new Token2(chainId, tokenOutAddress, tokenOutDecimal);
+  const tokenIn = new Token(chainId, tokenInAddress, tokenInDecimal);
+  const tokenOut = new Token(chainId, tokenOutAddress, tokenOutDecimal);
   const { uncheckedTrade, tokenInAmount } = await swapper.createTrade(
     amountIn,
     tokenIn,
@@ -12815,7 +12801,7 @@ function toBytes32Arr(data) {
 // src/data/Token.ts
 import { formatUnits as formatUnits2, isAddress as isAddress3, parseUnits as parseUnits2 } from "viem";
 var wrappedNativeTokens = { eth: "weth", matic: "wmatic", mnt: "wmnt" };
-var Token = class _Token {
+var Token2 = class _Token {
   address;
   chain;
   isNative = false;
@@ -14221,7 +14207,7 @@ var createFeeRecipientAndTokenMerkleTree = async (params) => {
   const chain = await Chain.getChain({ chainIdentifier: options.chain });
   const tokens = await Promise.all(
     (params.feeTokenWhitelist ?? []).map(
-      (token) => Token.getAddress(token, chain)
+      (token) => Token2.getAddress(token, chain)
     )
   );
   const feeRecipientAndTokenMerkleTree = new MerkleTree([
@@ -14695,8 +14681,8 @@ var oneInchTransactionParams = async (params, walletAddress, txOptions = globalT
     );
   }
   const approveAndExecAddress = await chain.getAddress("approveAndExecAddress");
-  const inToken = new Token(params.tokenIn, chain);
-  const outToken = new Token(params.tokenOut, chain);
+  const inToken = new Token2(params.tokenIn, chain);
+  const outToken = new Token2(params.tokenOut, chain);
   const inTokenAddress = inToken.isNative ? eth1InchAddress : await inToken.getAddress();
   const outTokenAddress = outToken.isNative ? eth1InchAddress : await outToken.getAddress();
   const oneinchSwapParams = {
@@ -14728,8 +14714,8 @@ var uniswapV3SwapTransactionParams = async (params, txOptions = globalThis.globa
   const univ3quoter = await chain.getAddress("univ3quoter");
   const univ3factory = await chain.getAddress("univ3factory");
   const univ3router = await chain.getAddress("univ3router");
-  const tokenIn = new Token(params.tokenIn, chain);
-  const tokenOut = new Token(params.tokenOut, chain);
+  const tokenIn = new Token2(params.tokenIn, chain);
+  const tokenOut = new Token2(params.tokenOut, chain);
   const tokenInAddress = await tokenIn.getAddress();
   const tokenOutAddress = await tokenOut.getAddress();
   const uniswapAddrs = {
@@ -14788,8 +14774,8 @@ var uniswapV2SwapTransactionParams = async (params, txOptions = globalThis.globa
   const tokenSwapAddress = await chain.getAddress("tokenSwapAddress");
   const factory = await chain.getAddress("UniswapV2Factory");
   const router = await chain.getAddress("UniswapV2Router02");
-  const tokenIn = new Token(params.tokenIn, chain);
-  const tokenOut = new Token(params.tokenOut, chain);
+  const tokenIn = new Token2(params.tokenIn, chain);
+  const tokenOut = new Token2(params.tokenOut, chain);
   const tokenInAddress = await tokenIn.getAddress();
   const tokenOutAddress = await tokenOut.getAddress();
   const uniswapAddrs = {
@@ -14876,7 +14862,7 @@ var tokenTransferTransactionParams = async (params, chain) => {
       "https://docs.fun.xyz"
     );
   }
-  const tokenObj = new Token(token, chain);
+  const tokenObj = new Token2(token, chain);
   if (tokenObj.isNative) {
     return {
       to,
@@ -14913,7 +14899,7 @@ var tokenTransferFromTransactionParams = async (params, chain) => {
       "https://docs.fun.xyz"
     );
   }
-  const tokenObj = new Token(token, chain);
+  const tokenObj = new Token2(token, chain);
   if (tokenObj.isNative) {
     return {
       to,
@@ -14959,7 +14945,7 @@ var erc20ApproveTransactionParams = async (params) => {
   const chain = await Chain.getChain({
     chainIdentifier: globalThis.globalEnvOption.chain
   });
-  const tokenObj = new Token(token, chain);
+  const tokenObj = new Token2(token, chain);
   const convertedAmount = await tokenObj.getDecimalAmount(amount);
   return ERC20_CONTRACT_INTERFACE.encodeTransactionParams(
     await tokenObj.getAddress(),
@@ -15168,7 +15154,7 @@ var CheckoutSponsor = class extends Sponsor {
   }
   async stake(_sponsor, amount, options) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "deposit",
@@ -15178,7 +15164,7 @@ var CheckoutSponsor = class extends Sponsor {
   }
   async unstake(receiver, amount, options) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawTo",
@@ -15274,7 +15260,7 @@ var GaslessSponsor = class extends Sponsor {
   }
   async stake(sponsor, amount, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "addDepositTo",
@@ -15284,7 +15270,7 @@ var GaslessSponsor = class extends Sponsor {
   }
   async unstake(receiver, amount, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawDepositTo",
@@ -15400,7 +15386,7 @@ var TokenSponsor = class extends Sponsor {
     const chain = await Chain.getChain({
       chainIdentifier: globalThis.globalEnvOption.chain
     });
-    const tokenAddress = await Token.getAddress(this.token, chain);
+    const tokenAddress = await Token2.getAddress(this.token, chain);
     const paymasterAddress = await this.getPaymasterAddress(options);
     const sponsor = await this.getFunSponsorAddress(options);
     return concat4([paymasterAddress, sponsor, tokenAddress]);
@@ -15422,7 +15408,7 @@ var TokenSponsor = class extends Sponsor {
     const { maxFeePerGas } = await chain.getFeeData();
     const paymasterAddress = await this.getPaymasterAddress(options);
     const requiredGas = (callGasLimit + (verificationGasLimit + 400000n) * 3n + preVerificationGas) * BigInt(maxFeePerGas);
-    const tokenAddress = await Token.getAddress(this.token, chain);
+    const tokenAddress = await Token2.getAddress(this.token, chain);
     const decAmount = await TOKEN_PAYMASTER_CONTRACT_INTERFACE.readFromChain(
       paymasterAddress,
       "getTokenValueOfEth",
@@ -15465,7 +15451,7 @@ var TokenSponsor = class extends Sponsor {
   async stake(sponsor, amount, options = globalThis.globalEnvOption) {
     const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
     const chain = await Chain.getChain({ chainIdentifier });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "addEthDepositTo",
@@ -15476,7 +15462,7 @@ var TokenSponsor = class extends Sponsor {
   async unstake(receiver, amount, options = globalThis.globalEnvOption) {
     const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
     const chain = await Chain.getChain({ chainIdentifier });
-    const amountdec = await Token.getDecimalAmount("eth", amount, chain);
+    const amountdec = await Token2.getDecimalAmount("eth", amount, chain);
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
       "withdrawEthDepositTo",
@@ -15487,13 +15473,13 @@ var TokenSponsor = class extends Sponsor {
     const chain = await Chain.getChain({
       chainIdentifier: globalThis.globalEnvOption.chain
     });
-    const tokenAddr = await Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain);
+    const tokenAddr = await Token2.isNative(token) ? AddressZero : await Token2.getAddress(token, chain);
     return (await this.getAllTokenData(tokenAddr, sponsor, options)).unlockBlock;
   }
   // false means unlocked, true means locked
   async getLockState(sponsor, token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddr = await Token.isNative(token) ? AddressZero : await Token.getAddress(token, chain);
+    const tokenAddr = await Token2.isNative(token) ? AddressZero : await Token2.getAddress(token, chain);
     const unlockBlock = await this.getUnlockBlock(tokenAddr, sponsor);
     const provider = await chain.getClient();
     const currentBlock = await provider.getBlockNumber();
@@ -15501,7 +15487,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async getTokenInfo(token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const tokenAddress = await Token2.getAddress(token, chain);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getToken",
@@ -15511,7 +15497,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async getAllTokenData(spender, token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const tokenAddress = await Token2.getAddress(token, chain);
     const data = await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getAllTokenData",
@@ -15525,7 +15511,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async getTokenBalance(spender, token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenData = new Token(token, chain);
+    const tokenData = new Token2(token, chain);
     let tokenAddress;
     if (tokenData.isNative) {
       tokenAddress = AddressZero;
@@ -15550,8 +15536,8 @@ var TokenSponsor = class extends Sponsor {
   }
   async addUsableToken(oracle, token, aggregator, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const decimals = await Token.getDecimals(token, chain);
-    const tokenAddress = await Token.getAddress(token, chain);
+    const decimals = await Token2.getDecimals(token, chain);
+    const tokenAddress = await Token2.getAddress(token, chain);
     const data = [oracle, tokenAddress, decimals, aggregator];
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
@@ -15561,7 +15547,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async depositToken(token, spender, amount, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenObj = new Token(token, chain);
+    const tokenObj = new Token2(token, chain);
     const tokenAddress = await tokenObj.getAddress();
     const amountDec = await tokenObj.getDecimalAmount(amount);
     return this.contractInterface.encodeTransactionParams(
@@ -15572,7 +15558,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async withdrawToken(token, receiver, amount, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenObj = new Token(token, chain);
+    const tokenObj = new Token2(token, chain);
     const tokenAddress = await tokenObj.getAddress();
     const amountdec = await tokenObj.getDecimalAmount(amount);
     return this.contractInterface.encodeTransactionParams(
@@ -15583,7 +15569,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async lockTokenDeposit(token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenData = new Token(token, chain);
+    const tokenData = new Token2(token, chain);
     const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress();
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
@@ -15593,7 +15579,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async unlockTokenDepositAfter(token, blocksToWait, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenData = new Token(token, chain);
+    const tokenData = new Token2(token, chain);
     const tokenAddress = tokenData.isNative ? AddressZero : await tokenData.getAddress();
     return this.contractInterface.encodeTransactionParams(
       await this.getPaymasterAddress(),
@@ -15632,7 +15618,7 @@ var TokenSponsor = class extends Sponsor {
       this.paymasterType,
       approver
     );
-    return Token.approve(token, gasSponsorAddress, amount, chain);
+    return Token2.approve(token, gasSponsorAddress, amount, chain);
   }
   async getSpenderBlacklisted(spender, sponsor, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
@@ -15654,7 +15640,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async getTokenWhitelisted(sponsor, token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const tokenAddress = await Token2.getAddress(token, chain);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenWhitelisted",
@@ -15673,7 +15659,7 @@ var TokenSponsor = class extends Sponsor {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
     const calldata = [];
     for (let i = 0; i < tokens.length; i++) {
-      const tokenAddress = await Token.getAddress(tokens[i], chain);
+      const tokenAddress = await Token2.getAddress(tokens[i], chain);
       calldata.push(
         this.contractInterface.encodeData("setTokenWhitelistMode", [
           tokenAddress,
@@ -15698,7 +15684,7 @@ var TokenSponsor = class extends Sponsor {
   }
   async getTokenBlacklisted(sponsor, token, options = globalThis.globalEnvOption) {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
-    const tokenAddress = await Token.getAddress(token, chain);
+    const tokenAddress = await Token2.getAddress(token, chain);
     return await this.contractInterface.readFromChain(
       await this.getPaymasterAddress(options),
       "getTokenBlacklisted",
@@ -15717,7 +15703,7 @@ var TokenSponsor = class extends Sponsor {
     const chain = await Chain.getChain({ chainIdentifier: options.chain });
     const calldata = [];
     for (let i = 0; i < tokens.length; i++) {
-      const tokenAddress = await Token.getAddress(tokens[i], chain);
+      const tokenAddress = await Token2.getAddress(tokens[i], chain);
       calldata.push(
         this.contractInterface.encodeTransactionParams(
           await this.getPaymasterAddress(),
@@ -15872,8 +15858,8 @@ async function getSocketBridgeApproveTransaction(chainId, sender, allowanceTarge
 // src/actions/Bridge.ts
 var bridgeTransactionParams = async (params, walletAddress, chain) => {
   const { recipient, fromToken, toToken, sort } = params;
-  const fromTokenObj = new Token(fromToken, chain);
-  const toTokenObj = new Token(toToken, chain);
+  const fromTokenObj = new Token2(fromToken, chain);
+  const toTokenObj = new Token2(toToken, chain);
   const amount = await fromTokenObj.getDecimalAmount(params.amount);
   if (!recipient) {
     throw new InvalidParameterError(
@@ -15950,12 +15936,12 @@ var fees2 = {
 };
 var limitSwapOrderTransactionParams = async (params, chain) => {
   const { tokenIn, tokenOut, tokenInAmount, tokenOutAmount, poolFee } = params;
-  const tokenInAddress = await new Token(tokenIn, chain).getAddress();
-  const tokenOutAddress = await new Token(tokenOut, chain).getAddress();
-  const amountIn = await new Token(tokenIn, chain).getDecimalAmount(
+  const tokenInAddress = await new Token2(tokenIn, chain).getAddress();
+  const tokenOutAddress = await new Token2(tokenOut, chain).getAddress();
+  const amountIn = await new Token2(tokenIn, chain).getDecimalAmount(
     tokenInAmount
   );
-  const amountOut = await new Token(tokenOut, chain).getDecimalAmount(
+  const amountOut = await new Token2(tokenOut, chain).getDecimalAmount(
     tokenOutAmount
   );
   const uniswapv3LimitOrderAddress = await chain.getAddress(
@@ -17361,7 +17347,7 @@ var FunWallet = class extends FirstClassActions {
         );
       }
       const chain = await Chain.getChain({ chainIdentifier: options.chain });
-      const token = new Token(options.fee.token, chain);
+      const token = new Token2(options.fee.token, chain);
       if (options.fee.gasPercent && !token.isNative) {
         throw new InvalidParameterError(
           "InvalidParameterCombination" /* InvalidParameterCombination */,
@@ -17499,7 +17485,7 @@ export {
   TOKEN_PAYMASTER_CONTRACT_INTERFACE,
   TOKEN_SPONSOR_SUPPORT_CHAINS,
   ThrottlingError,
-  Token,
+  Token2 as Token,
   TokenSponsor,
   UNISWAPV2FACTORY_ABI,
   UNISWAPV2FACTORY_INTERFACE,
@@ -17562,7 +17548,6 @@ export {
   getChainFromId,
   getChainFromName,
   getContractAbi,
-  getDecimals,
   getEnvOptions,
   getFullReceipt,
   getGasPrice,