@funkit/core 0.8.6 → 0.10.0

package/dist/src/sponsors/Sponsor.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sponsor = void 0;
-const PaymasterApis_1 = require("../apis/PaymasterApis");
 const data_1 = require("../data");
 class Sponsor {
     constructor(options = globalThis.globalEnvOption, contractInterface, name, paymasterType) {
-        if (options.gasSponsor !== undefined && options.gasSponsor.sponsorAddress !== undefined) {
+        if (options.gasSponsor !== undefined &&
+            options.gasSponsor.sponsorAddress !== undefined) {
             this.sponsorAddress = options.gasSponsor.sponsorAddress;
         }
         this.contractInterface = contractInterface;
@@ -24,69 +24,53 @@ class Sponsor {
     /** True if the specified sponsor is in blacklist mode. **/
     async getListMode(sponsor, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getListMode", [sponsor], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getListMode', [sponsor], chain);
     }
-    async setToBlacklistMode(sponsor, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.updatePaymasterMode)(await chain.getChainId(), { mode: "blacklist" }, this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setListMode", [true]);
+    async setToBlacklistMode() {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setListMode', [true]);
     }
-    async setToWhitelistMode(sponsor, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.updatePaymasterMode)(await chain.getChainId(), { mode: "whitelist" }, this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setListMode", [false]);
+    async setToWhitelistMode() {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setListMode', [false]);
     }
     async batchTransaction(transactions) {
-        const batchActionsData = transactions.map((transaction) => (transaction.data ? transaction.data : "0x"));
-        const value = transactions.reduce((acc, transaction) => (transaction.value ? acc + BigInt(transaction.value) : acc), 0n);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "batchActions", [batchActionsData], value);
+        const batchActionsData = transactions.map((transaction) => transaction.data ? transaction.data : '0x');
+        const value = transactions.reduce((acc, transaction) => transaction.value ? acc + BigInt(transaction.value) : acc, 0n);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'batchActions', [batchActionsData], value);
     }
-    async addSpenderToWhitelist(sponsor, spender, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.addToList)(await chain.getChainId(), [spender], "walletsWhiteList", this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setSpenderWhitelistMode", [spender, true]);
+    async addSpenderToWhitelist(spender) {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setSpenderWhitelistMode', [spender, true]);
     }
-    async removeSpenderFromWhitelist(sponsor, spender, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.removeFromList)(await chain.getChainId(), [spender], "walletsWhiteList", this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setSpenderWhitelistMode", [spender, false]);
+    async removeSpenderFromWhitelist(spender) {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setSpenderWhitelistMode', [spender, false]);
     }
-    async batchWhitelistSpenders(sponsor, spenders, modes, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+    async batchWhitelistSpenders(spenders, modes) {
         const calldata = [];
         for (let i = 0; i < spenders.length; i++) {
             if (modes[i]) {
-                calldata.push(await this.addSpenderToWhitelist(sponsor, spenders[i], options));
+                calldata.push(await this.addSpenderToWhitelist(spenders[i]));
             }
             else {
-                calldata.push(await this.removeSpenderFromWhitelist(sponsor, spenders[i], options));
+                calldata.push(await this.removeSpenderFromWhitelist(spenders[i]));
             }
         }
-        (0, PaymasterApis_1.batchOperation)(await chain.getChainId(), spenders, modes, "walletsWhiteList", this.paymasterType, sponsor);
         return await this.batchTransaction(calldata);
     }
-    async addSpenderToBlacklist(sponsor, spender, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.addToList)(await chain.getChainId(), [spender], "walletsBlackList", this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setSpenderBlacklistMode", [spender, true]);
+    async addSpenderToBlacklist(spender) {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setSpenderBlacklistMode', [spender, true]);
     }
-    async removeSpenderFromBlacklist(sponsor, spender, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.removeFromList)(await chain.getChainId(), [spender], "walletsBlackList", this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setSpenderBlacklistMode", [spender, false]);
+    async removeSpenderFromBlacklist(spender) {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setSpenderBlacklistMode', [spender, false]);
     }
-    async batchBlacklistSpenders(sponsor, spenders, modes, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+    async batchBlacklistSpenders(spenders, modes) {
         const calldata = [];
         for (let i = 0; i < spenders.length; i++) {
             if (modes[i]) {
-                calldata.push(await this.addSpenderToBlacklist(sponsor, spenders[i], options));
+                calldata.push(await this.addSpenderToBlacklist(spenders[i]));
             }
             else {
-                calldata.push(await this.removeSpenderFromBlacklist(sponsor, spenders[i], options));
+                calldata.push(await this.removeSpenderFromBlacklist(spenders[i]));
             }
         }
-        (0, PaymasterApis_1.batchOperation)(await chain.getChainId(), spenders, modes, "walletsBlackList", this.paymasterType, sponsor);
         return await this.batchTransaction(calldata);
     }
 }

package/dist/src/sponsors/Sponsor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sponsor.js","sourceRoot":"","sources":["../../../src/sponsors/Sponsor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Sponsor.js","sourceRoot":"","sources":["../../../src/sponsors/Sponsor.ts"],"names":[],"mappings":"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"}

package/dist/src/sponsors/TokenSponsor.d.ts

@@ -1,18 +1,18 @@
-import { Address } from "viem";
-import { Sponsor } from "./Sponsor";
-import { AllTokenData } from "./types";
-import { Auth } from "../auth";
-import { TransactionParams } from "../common";
-import { EnvOption } from "../config";
-import { Operation } from "../data";
+import { Address } from 'viem';
+import { Auth } from '../auth';
+import { TransactionParams } from '../common';
+import { EnvOption } from '../config';
+import { Operation } from '../data';
+import { Sponsor } from './Sponsor';
+import { AllTokenData } from './types';
 export declare class TokenSponsor extends Sponsor {
     token: string;
     constructor(options?: EnvOption);
     getFunSponsorAddress(options?: EnvOption): Promise<Address>;
     getPaymasterAndData(options?: EnvOption): Promise<string>;
     getPaymasterAndDataPermit(partialOp: Operation, walletAddr: Address, userId: string, auth: Auth, options?: EnvOption): Promise<string>;
-    stake(depositor: Address, sponsor: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
-    unstake(sponsor: Address, receiver: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
+    stake(sponsor: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
+    unstake(receiver: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
     getUnlockBlock(sponsor: Address, token: string, options?: EnvOption): Promise<bigint>;
     getLockState(sponsor: Address, token: string, options?: EnvOption): Promise<boolean>;
     getTokenInfo(token: string, options?: EnvOption): Promise<any>;
@@ -20,8 +20,8 @@ export declare class TokenSponsor extends Sponsor {
     getTokenBalance(spender: Address, token: string, options?: EnvOption): Promise<bigint>;
     getAllTokens(options?: EnvOption): Promise<any>;
     addUsableToken(oracle: string, token: string, aggregator: string, options?: EnvOption): Promise<TransactionParams>;
-    depositToken(depositor: Address, token: string, spender: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
-    withdrawToken(withdrawer: Address, token: string, receiver: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
+    depositToken(token: string, spender: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
+    withdrawToken(token: string, receiver: Address, amount: number, options?: EnvOption): Promise<TransactionParams>;
     lockTokenDeposit(token: string, options?: EnvOption): Promise<TransactionParams>;
     unlockTokenDepositAfter(token: string, blocksToWait: number, options?: EnvOption): Promise<TransactionParams>;
     lockDeposit(): Promise<TransactionParams>;
@@ -30,11 +30,11 @@ export declare class TokenSponsor extends Sponsor {
     getSpenderBlacklisted(spender: Address, sponsor: Address, options?: EnvOption): Promise<boolean>;
     getSpenderWhitelisted(spender: Address, sponsor: Address, options?: EnvOption): Promise<boolean>;
     getTokenWhitelisted(sponsor: Address, token: string, options?: EnvOption): Promise<boolean>;
-    setTokenToWhitelistMode(sponsor: Address, options?: EnvOption): Promise<TransactionParams>;
-    batchWhitelistTokens(sponsor: Address, tokens: string[], modes: boolean[], options?: EnvOption): Promise<TransactionParams>;
+    setTokenToWhitelistMode(): Promise<TransactionParams>;
+    batchWhitelistTokens(tokens: string[], modes: boolean[], options?: EnvOption): Promise<TransactionParams>;
     getTokenListMode(sponsor: Address, options?: EnvOption): Promise<any>;
     getTokenBlacklisted(sponsor: Address, token: string, options?: EnvOption): Promise<boolean>;
-    setTokenToBlacklistMode(sponsor: Address, options?: EnvOption): Promise<TransactionParams>;
-    batchBlacklistTokens(sponsor: Address, tokens: string[], modes: boolean[], options?: EnvOption): Promise<TransactionParams>;
+    setTokenToBlacklistMode(): Promise<TransactionParams>;
+    batchBlacklistTokens(tokens: string[], modes: boolean[], options?: EnvOption): Promise<TransactionParams>;
     static getPaymasterAddress(options?: EnvOption): Promise<Address>;
 }

package/dist/src/sponsors/TokenSponsor.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenSponsor = void 0;
 const viem_1 = require("viem");
-const Sponsor_1 = require("./Sponsor");
-const types_1 = require("./types");
 const PaymasterApis_1 = require("../apis/PaymasterApis");
 const common_1 = require("../common");
 const constants_1 = require("../common/constants");
 const data_1 = require("../data");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
+const Sponsor_1 = require("./Sponsor");
+const types_1 = require("./types");
 class TokenSponsor extends Sponsor_1.Sponsor {
     constructor(options = globalThis.globalEnvOption) {
-        super(options, constants_1.TOKEN_PAYMASTER_CONTRACT_INTERFACE, "tokenPaymasterAddress", types_1.PaymasterType.TokenSponsor);
+        super(options, constants_1.TOKEN_PAYMASTER_CONTRACT_INTERFACE, 'tokenPaymasterAddress', types_1.PaymasterType.TokenSponsor);
         if (!options.gasSponsor?.token) {
-            throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, "token field is missing", { gasSponsor: options.gasSponsor }, "Provide correct token name or address.", "https://docs.fun.xyz");
+            throw new errors_1.InvalidParameterError(errors_1.ErrorCode.MissingParameter, 'token field is missing', { gasSponsor: options.gasSponsor }, 'Provide correct token name or address.', 'https://docs.fun.xyz');
         }
         this.token = options.gasSponsor.token.toLowerCase();
     }
@@ -22,16 +22,23 @@ class TokenSponsor extends Sponsor_1.Sponsor {
         if (!this.sponsorAddress) {
             const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
             if (common_1.TOKEN_SPONSOR_SUPPORT_CHAINS.includes(await chain.getChainId())) {
-                this.sponsorAddress = await chain.getAddress("funTokenSponsorAddress");
+                this.sponsorAddress = await chain.getAddress('funTokenSponsorAddress');
             }
             else {
-                throw new errors_1.ResourceNotFoundError(errors_1.ErrorCode.MissingParameter, "The network you are working with does not support token Fun Sponsor. You will need to run and manage your own token sponsor.", { tokenSponsorSupportChains: common_1.TOKEN_SPONSOR_SUPPORT_CHAINS, chain: await chain.getChainId() }, "Manage your own token sponsor, or use a supported network", "https://docs.fun.xyz");
+                throw new errors_1.ResourceNotFoundError(errors_1.ErrorCode.MissingParameter, 'The network you are working with does not support token Fun Sponsor. You will need to run and manage your own token sponsor.', {
+                    tokenSponsorSupportChains: common_1.TOKEN_SPONSOR_SUPPORT_CHAINS,
+                    chain: await chain.getChainId(),
+                }, 'Manage your own token sponsor, or use a supported network', 'https://docs.fun.xyz');
             }
         }
         return this.sponsorAddress;
     }
     async getPaymasterAndData(options = globalThis.globalEnvOption) {
-        const tokenAddress = await data_1.Token.getAddress(this.token, options);
+        // TODO: temporary fallback, remove after refactoring -- Panda
+        const chain = await data_1.Chain.getChain({
+            chainIdentifier: globalThis.globalEnvOption.chain,
+        });
+        const tokenAddress = await data_1.Token.getAddress(this.token, chain);
         const paymasterAddress = await this.getPaymasterAddress(options);
         const sponsor = await this.getFunSponsorAddress(options);
         return (0, viem_1.concat)([paymasterAddress, sponsor, tokenAddress]);
@@ -40,226 +47,202 @@ class TokenSponsor extends Sponsor_1.Sponsor {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
         const estimateGasSignature = await auth.getEstimateGasSignature(userId, partialOp);
         partialOp.userOp.signature = estimateGasSignature.toLowerCase();
-        const estimationPaymasterAddress = await chain.getAddress("estimationPaymasterAddress");
+        const estimationPaymasterAddress = await chain.getAddress('estimationPaymasterAddress');
         const { callGasLimit, verificationGasLimit, preVerificationGas } = await chain.estimateOpGas({
             ...partialOp.userOp,
-            paymasterAndData: estimationPaymasterAddress
+            paymasterAndData: estimationPaymasterAddress,
         });
         const { maxFeePerGas } = await chain.getFeeData();
         const paymasterAddress = await this.getPaymasterAddress(options);
-        const requiredGas = (callGasLimit + (verificationGasLimit + 400000n) * 3n + preVerificationGas) * BigInt(maxFeePerGas);
-        const tokenAddress = await data_1.Token.getAddress(this.token, options);
-        const decAmount = await constants_1.TOKEN_PAYMASTER_CONTRACT_INTERFACE.readFromChain(paymasterAddress, "getTokenValueOfEth", [tokenAddress, requiredGas], chain);
+        const requiredGas = (callGasLimit +
+            (verificationGasLimit + 400000n) * 3n +
+            preVerificationGas) *
+            BigInt(maxFeePerGas);
+        const tokenAddress = await data_1.Token.getAddress(this.token, chain);
+        const decAmount = await constants_1.TOKEN_PAYMASTER_CONTRACT_INTERFACE.readFromChain(paymasterAddress, 'getTokenValueOfEth', [tokenAddress, requiredGas], chain);
         const nonce = await (0, utils_1.getWalletPermitNonce)(walletAddr, chain);
         const client = await chain.getClient();
         const chainId = await client.getChainId();
         const hash = await (0, utils_1.getPermitHash)(tokenAddress, paymasterAddress, decAmount, nonce, walletAddr, BigInt(chainId));
         const sig = await auth.signHash(hash);
-        const encodedSig = (0, viem_1.encodeAbiParameters)([{ type: "address" }, { type: "address" }, { type: "uint256" }, { type: "uint256" }, { type: "bytes" }], [tokenAddress, paymasterAddress, decAmount, nonce, sig]);
+        const encodedSig = (0, viem_1.encodeAbiParameters)([
+            { type: 'address' },
+            { type: 'address' },
+            { type: 'uint256' },
+            { type: 'uint256' },
+            { type: 'bytes' },
+        ], [tokenAddress, paymasterAddress, decAmount, nonce, sig]);
         const sponsor = await this.getFunSponsorAddress(options);
-        const encodedAddresses = (0, viem_1.encodeAbiParameters)([{ type: "address" }, { type: "address" }], [sponsor, tokenAddress]);
-        const encodedData = (0, viem_1.encodeAbiParameters)([{ type: "bytes" }, { type: "bytes" }], [encodedAddresses, encodedSig]);
+        const encodedAddresses = (0, viem_1.encodeAbiParameters)([{ type: 'address' }, { type: 'address' }], [sponsor, tokenAddress]);
+        const encodedData = (0, viem_1.encodeAbiParameters)([{ type: 'bytes' }, { type: 'bytes' }], [encodedAddresses, encodedSig]);
         return (0, viem_1.concat)([paymasterAddress, encodedData]);
     }
-    async stake(depositor, sponsor, amount, options = globalThis.globalEnvOption) {
-        const amountdec = await data_1.Token.getDecimalAmount("eth", amount, options);
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), "0x", {
-            action: "stake",
-            amount,
-            from: depositor,
-            to: await this.getPaymasterAddress(options),
-            token: "eth"
-        }, this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "addEthDepositTo", [sponsor, amountdec], BigInt(amountdec));
+    async stake(sponsor, amount, options = globalThis.globalEnvOption) {
+        const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
+        const chain = await data_1.Chain.getChain({ chainIdentifier });
+        const amountdec = await data_1.Token.getDecimalAmount('eth', amount, chain);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'addEthDepositTo', [sponsor, amountdec], BigInt(amountdec));
     }
-    async unstake(sponsor, receiver, amount, options = globalThis.globalEnvOption) {
-        const amountdec = await data_1.Token.getDecimalAmount("eth", amount, options);
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), "0x", {
-            action: "unstake",
-            amount,
-            from: sponsor,
-            to: await this.getPaymasterAddress(options),
-            token: "eth"
-        }, this.paymasterType, receiver);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "withdrawEthDepositTo", [
-            receiver,
-            amountdec
-        ]);
+    async unstake(receiver, amount, options = globalThis.globalEnvOption) {
+        // TODO: temporary fallback, remove after refactoring -- Panda
+        const chainIdentifier = options.chain ?? globalThis.globalEnvOption.chain;
+        const chain = await data_1.Chain.getChain({ chainIdentifier });
+        const amountdec = await data_1.Token.getDecimalAmount('eth', amount, chain);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'withdrawEthDepositTo', [receiver, amountdec]);
     }
     async getUnlockBlock(sponsor, token, options = globalThis.globalEnvOption) {
-        const tokenAddr = (await data_1.Token.isNative(token)) ? constants_1.AddressZero : await data_1.Token.getAddress(token, options);
+        // TODO: temporary fallback, remove after refactoring -- Panda
+        const chain = await data_1.Chain.getChain({
+            chainIdentifier: globalThis.globalEnvOption.chain,
+        });
+        const tokenAddr = (await data_1.Token.isNative(token))
+            ? constants_1.AddressZero
+            : await data_1.Token.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 tokenAddr = (await data_1.Token.isNative(token)) ? constants_1.AddressZero : await data_1.Token.getAddress(token, options);
-        const unlockBlock = await this.getUnlockBlock(tokenAddr, sponsor);
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+        const tokenAddr = (await data_1.Token.isNative(token))
+            ? constants_1.AddressZero
+            : await data_1.Token.getAddress(token, chain);
+        const unlockBlock = await this.getUnlockBlock(tokenAddr, sponsor);
         const provider = await chain.getClient();
         const currentBlock = await provider.getBlockNumber();
         return unlockBlock === 0n || unlockBlock > currentBlock;
     }
     async getTokenInfo(token, options = globalThis.globalEnvOption) {
-        const tokenAddress = await data_1.Token.getAddress(token, options);
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getToken", [tokenAddress], chain);
+        const tokenAddress = await data_1.Token.getAddress(token, chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getToken', [tokenAddress], chain);
     }
     async getAllTokenData(spender, token, options = globalThis.globalEnvOption) {
-        const tokenAddress = await data_1.Token.getAddress(token, options);
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        const data = await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getAllTokenData", [tokenAddress, spender], chain);
+        const tokenAddress = await data_1.Token.getAddress(token, chain);
+        const data = await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getAllTokenData', [tokenAddress, spender], chain);
         return {
             unlockBlock: data[0],
-            tokenAmount: data[1]
+            tokenAmount: data[1],
         };
     }
     async getTokenBalance(spender, token, options = globalThis.globalEnvOption) {
-        const tokenData = new data_1.Token(token);
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+        const tokenData = new data_1.Token(token, chain);
         let tokenAddress;
         if (tokenData.isNative) {
             tokenAddress = constants_1.AddressZero;
         }
         else {
-            tokenAddress = await tokenData.getAddress(options);
+            tokenAddress = await tokenData.getAddress();
         }
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getTokenBalance", [tokenAddress, spender], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getTokenBalance', [tokenAddress, spender], chain);
     }
     async getAllTokens(options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getAllTokens", [], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getAllTokens', [], chain);
     }
     async addUsableToken(oracle, token, aggregator, options = globalThis.globalEnvOption) {
-        const decimals = await data_1.Token.getDecimals(token, options);
-        const tokenAddress = await data_1.Token.getAddress(token, options);
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+        const decimals = await data_1.Token.getDecimals(token, chain);
+        const tokenAddress = await data_1.Token.getAddress(token, chain);
         const data = [oracle, tokenAddress, decimals, aggregator];
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setTokenData", [data]);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setTokenData', [data]);
     }
-    async depositToken(depositor, token, spender, amount, options = globalThis.globalEnvOption) {
-        const tokenObj = new data_1.Token(token);
-        const tokenAddress = await tokenObj.getAddress(options);
-        const amountdec = await tokenObj.getDecimalAmount(amount, options);
+    async depositToken(token, spender, amount, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), "0x", {
-            action: "stakeToken",
-            amount,
-            from: depositor,
-            to: await this.getPaymasterAddress(options),
-            token
-        }, this.paymasterType, spender);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "addTokenDepositTo", [
-            tokenAddress,
-            spender,
-            amountdec
-        ]);
+        const tokenObj = new data_1.Token(token, chain);
+        const tokenAddress = await tokenObj.getAddress();
+        const amountDec = await tokenObj.getDecimalAmount(amount);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'addTokenDepositTo', [tokenAddress, spender, amountDec]);
     }
-    async withdrawToken(withdrawer, token, receiver, amount, options = globalThis.globalEnvOption) {
-        const tokenObj = new data_1.Token(token);
-        const tokenAddress = await tokenObj.getAddress(options);
-        const amountdec = await tokenObj.getDecimalAmount(amount, options);
+    async withdrawToken(token, receiver, amount, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), "0x", {
-            action: "unstakeToken",
-            amount,
-            from: withdrawer,
-            to: await this.getPaymasterAddress(options),
-            token
-        }, this.paymasterType, receiver);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "withdrawTokenDepositTo", [
-            tokenAddress,
-            receiver,
-            amountdec
-        ]);
+        const tokenObj = new data_1.Token(token, chain);
+        const tokenAddress = await tokenObj.getAddress();
+        const amountdec = await tokenObj.getDecimalAmount(amount);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'withdrawTokenDepositTo', [tokenAddress, receiver, amountdec]);
     }
     async lockTokenDeposit(token, options = globalThis.globalEnvOption) {
-        const tokenData = new data_1.Token(token);
-        const tokenAddress = tokenData.isNative ? constants_1.AddressZero : await tokenData.getAddress(options);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "lockTokenDeposit", [tokenAddress]);
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+        const tokenData = new data_1.Token(token, chain);
+        const tokenAddress = tokenData.isNative
+            ? constants_1.AddressZero
+            : await tokenData.getAddress();
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'lockTokenDeposit', [tokenAddress]);
     }
     async unlockTokenDepositAfter(token, blocksToWait, options = globalThis.globalEnvOption) {
-        const tokenData = new data_1.Token(token);
-        const tokenAddress = tokenData.isNative ? constants_1.AddressZero : await tokenData.getAddress(options);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "unlockTokenDepositAfter", [
-            tokenAddress,
-            blocksToWait
-        ]);
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
+        const tokenData = new data_1.Token(token, chain);
+        const tokenAddress = tokenData.isNative
+            ? constants_1.AddressZero
+            : await tokenData.getAddress();
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'unlockTokenDepositAfter', [tokenAddress, blocksToWait]);
     }
     async lockDeposit() {
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "lockTokenDeposit", [constants_1.AddressZero]);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'lockTokenDeposit', [constants_1.AddressZero]);
     }
     async unlockDepositAfter(blocksToWait) {
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "unlockTokenDepositAfter", [
-            constants_1.AddressZero,
-            blocksToWait
-        ]);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'unlockTokenDepositAfter', [constants_1.AddressZero, blocksToWait]);
     }
     async approve(approver, token, amount, options = globalThis.globalEnvOption) {
         const gasSponsorAddress = await this.getPaymasterAddress();
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), "0x", {
-            action: "approve",
+        (0, PaymasterApis_1.addTransaction)(await chain.getChainId(), Date.now(), '0x', {
+            action: 'approve',
             amount,
             from: approver,
             to: await this.getPaymasterAddress(options),
-            token
+            token,
         }, this.paymasterType, approver);
-        return data_1.Token.approve(token, gasSponsorAddress, amount);
+        return data_1.Token.approve(token, gasSponsorAddress, amount, chain);
     }
     async getSpenderBlacklisted(spender, sponsor, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getSpenderBlacklisted", [spender, sponsor], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getSpenderBlacklisted', [spender, sponsor], chain);
     }
     async getSpenderWhitelisted(spender, sponsor, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getSpenderWhitelisted", [spender, sponsor], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getSpenderWhitelisted', [spender, sponsor], chain);
     }
     async getTokenWhitelisted(sponsor, token, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        const tokenAddress = await data_1.Token.getAddress(token, options);
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getTokenWhitelisted", [tokenAddress, sponsor], chain);
+        const tokenAddress = await data_1.Token.getAddress(token, chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getTokenWhitelisted', [tokenAddress, sponsor], chain);
     }
-    async setTokenToWhitelistMode(sponsor, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.updatePaymasterMode)(await chain.getChainId(), { tokenMode: "whitelist" }, this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setTokenListMode", [false]);
+    async setTokenToWhitelistMode() {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setTokenListMode', [false]);
     }
-    async batchWhitelistTokens(sponsor, tokens, modes, options = globalThis.globalEnvOption) {
+    async batchWhitelistTokens(tokens, modes, options = globalThis.globalEnvOption) {
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
         const calldata = [];
         for (let i = 0; i < tokens.length; i++) {
-            const tokenAddress = await data_1.Token.getAddress(tokens[i], options);
-            calldata.push(this.contractInterface.encodeData("setTokenWhitelistMode", [tokenAddress, modes[i]]));
+            const tokenAddress = await data_1.Token.getAddress(tokens[i], chain);
+            calldata.push(this.contractInterface.encodeData('setTokenWhitelistMode', [
+                tokenAddress,
+                modes[i],
+            ]));
         }
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.batchOperation)(await chain.getChainId(), tokens, modes, "tokensWhiteList", this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "batchActions", [calldata]);
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'batchActions', [calldata]);
     }
     async getTokenListMode(sponsor, options = globalThis.globalEnvOption) {
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getTokenListMode", [sponsor], chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getTokenListMode', [sponsor], chain);
     }
     async getTokenBlacklisted(sponsor, token, options = globalThis.globalEnvOption) {
-        const tokenAddress = await data_1.Token.getAddress(token, options);
         const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), "getTokenBlacklisted", [tokenAddress, sponsor], chain);
+        const tokenAddress = await data_1.Token.getAddress(token, chain);
+        return await this.contractInterface.readFromChain(await this.getPaymasterAddress(options), 'getTokenBlacklisted', [tokenAddress, sponsor], chain);
     }
-    async setTokenToBlacklistMode(sponsor, options = globalThis.globalEnvOption) {
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.updatePaymasterMode)(await chain.getChainId(), { tokenMode: "blacklist" }, this.paymasterType, sponsor);
-        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setTokenListMode", [true]);
+    async setTokenToBlacklistMode() {
+        return this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setTokenListMode', [true]);
     }
-    async batchBlacklistTokens(sponsor, tokens, modes, options = globalThis.globalEnvOption) {
+    async batchBlacklistTokens(tokens, modes, options = globalThis.globalEnvOption) {
+        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
         const calldata = [];
         for (let i = 0; i < tokens.length; i++) {
-            const tokenAddress = await data_1.Token.getAddress(tokens[i], options);
-            calldata.push(this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), "setTokenBlacklistMode", [
-                tokenAddress,
-                modes[i]
-            ]));
+            const tokenAddress = await data_1.Token.getAddress(tokens[i], chain);
+            calldata.push(this.contractInterface.encodeTransactionParams(await this.getPaymasterAddress(), 'setTokenBlacklistMode', [tokenAddress, modes[i]]));
         }
-        const chain = await data_1.Chain.getChain({ chainIdentifier: options.chain });
-        await (0, PaymasterApis_1.batchOperation)(await chain.getChainId(), tokens, modes, "tokensBlackList", this.paymasterType, sponsor);
         return this.batchTransaction(calldata);
     }
     static async getPaymasterAddress(options = globalThis.globalEnvOption) {