@cryptorubic/web3 1.0.0-alpha.no-sdk.23 → 1.0.0-alpha.no-sdk.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.0.0-alpha.no-sdk.23",
+    "version": "1.0.0-alpha.no-sdk.24",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/index.d.ts

@@ -1,32 +1,32 @@
 export * from './lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter';
-export * from './lib/adapter/adapters/adapter-bitcoin/client/bitcoin-adapter-client';
+export * from './lib/adapter/adapters/adapter-bitcoin/signer/bitcoin-adapter-signer';
 export * from './lib/adapter/adapters/adapter-bitcoin/models/btc-send-tx-params';
 export * from './lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-psbt-encoded-config';
 export * from './lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-trade-types';
 export * from './lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-transfer-encoded-config';
-export * from './lib/adapter/adapters/adapter-evm/client/evm-adapter-client';
+export * from './lib/adapter/adapters/adapter-evm/signer/evm-adapter-signer';
 export * from './lib/adapter/adapters/adapter-evm/constants/proxy-hash-errors';
 export * from './lib/adapter/adapters/adapter-evm/evm-adapter';
 export * from './lib/adapter/adapters/adapter-evm/models/evm-send-tx-params';
 export * from './lib/adapter/adapters/adapter-evm/utils/parse-evm-error';
-export * from './lib/adapter/adapters/adapter-solana/client/solana-adapter-client';
+export * from './lib/adapter/adapters/adapter-solana/signer/solana-adapter-signer';
 export * from './lib/adapter/adapters/adapter-solana/models/solana-send-tx-params';
 export * from './lib/adapter/adapters/adapter-solana/services/solana-tokens-service';
 export * from './lib/adapter/adapters/adapter-solana/solana-adapter';
-export * from './lib/adapter/adapters/adapter-sui/client/sui-adapter-client';
+export * from './lib/adapter/adapters/adapter-sui/signer/sui-adapter-signer';
 export * from './lib/adapter/adapters/adapter-sui/models/sui-send-tx-params';
 export * from './lib/adapter/adapters/adapter-sui/sui-adapter';
-export * from './lib/adapter/adapters/adapter-ton/client/ton-adapter-client';
+export * from './lib/adapter/adapters/adapter-ton/signer/ton-adapter-signer';
 export * from './lib/adapter/adapters/adapter-ton/models/ton-send-tx-params';
 export * from './lib/adapter/adapters/adapter-ton/services/ton-api.service';
 export * from './lib/adapter/adapters/adapter-ton/services/ton-client/ton-client';
 export * from './lib/adapter/adapters/adapter-ton/ton-adapter';
-export * from './lib/adapter/adapters/adapter-tron/client/tron-adapter-client';
+export * from './lib/adapter/adapters/adapter-tron/signer/tron-adapter-signer';
 export * from './lib/adapter/adapters/adapter-tron/models/tron-send-tx-params';
 export * from './lib/adapter/adapters/adapter-tron/tron-adapter';
 export * from './lib/adapter/adapters/adapter-tron/utils/parse-tron-error';
 export * from './lib/adapter/adapters/common/abstract-adapter';
-export * from './lib/adapter/adapters/common/client/abstract-adapter-client';
+export * from './lib/adapter/adapters/common/signer/abstract-adapter-signer';
 export * from './lib/adapter/adapters/constants/erc20-token-abi';
 export * from './lib/adapter/adapters/constants/possible-errors';
 export * from './lib/adapter/adapters/constants/trc-20-contract-abi';

package/src/index.js

@@ -2,34 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/client/bitcoin-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/signer/bitcoin-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/models/btc-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-psbt-encoded-config"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-trade-types"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-transfer-encoded-config"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/client/evm-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/signer/evm-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/constants/proxy-hash-errors"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/evm-adapter"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/models/evm-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/utils/parse-evm-error"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-solana/client/solana-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-solana/signer/solana-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-solana/models/solana-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-solana/services/solana-tokens-service"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-solana/solana-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-sui/client/sui-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-sui/signer/sui-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-sui/models/sui-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-sui/sui-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/client/ton-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/signer/ton-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/models/ton-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/services/ton-api.service"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/services/ton-client/ton-client"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/ton-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/client/tron-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/signer/tron-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/models/tron-send-tx-params"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/tron-adapter"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/utils/parse-tron-error"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/common/abstract-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/common/client/abstract-adapter-client"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/common/signer/abstract-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/constants/erc20-token-abi"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/constants/possible-errors"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/constants/trc-20-contract-abi"), exports);

package/src/lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter.d.ts

@@ -4,17 +4,18 @@ import { AbstractAdapter } from '../common/abstract-adapter';
 import { BtcWallet } from '../models/btc-wallet-provider';
 import { BasicSendTransactionOptions } from '../models/basic-transaction-options';
 import { ClientAdaptersFactoryParams } from '../../models/create-factory-params';
-import { BitcoinAdapterClient } from './client/bitcoin-adapter-client';
+import { BitcoinAdapterSigner } from './signer/bitcoin-adapter-signer';
 import { Abi } from 'viem';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 import { MethodData } from '../models/web3-public-models/method-data';
 export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet, BitcoinBlockchainName> {
     private readonly httpClient;
-    readonly client: BitcoinAdapterClient;
+    readonly signer: BitcoinAdapterSigner;
     get public(): BtcWallet;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
+    read<T>(args: unknown): Promise<T>;
     getBalance(userAddress: string, _tokenAddress?: string): Promise<BigNumber>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(contractAbi: Abi, contractsData: {

package/src/lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter.js

@@ -4,7 +4,7 @@ exports.BitcoinAdapter = void 0;
 const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
 const abstract_adapter_1 = require("../common/abstract-adapter");
-const bitcoin_adapter_client_1 = require("./client/bitcoin-adapter-client");
+const bitcoin_adapter_signer_1 = require("./signer/bitcoin-adapter-signer");
 class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     get public() {
         throw new Error('public property is not set in BitcoinAdapter.');
@@ -12,11 +12,14 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.BITCOIN, logger);
         this.httpClient = httpClient;
-        this.client = new bitcoin_adapter_client_1.BitcoinAdapterClient(httpClient, logger, clientParams);
+        this.signer = new bitcoin_adapter_signer_1.BitcoinAdapterSigner(httpClient, logger, clientParams);
     }
     callContractMethod() {
         throw new Error('Method not implemented.');
     }
+    read(args) {
+        throw new Error('Not implemented');
+    }
     async getBalance(userAddress, _tokenAddress) {
         const url = `https://api.blockcypher.com/v1/btc/main/addrs/${userAddress}/balance`;
         const response = await this.httpClient.get(url);
@@ -65,7 +68,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
         return [core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.BITCOIN]];
     }
     async getPublicKeyFromWallet() {
-        const res = await this.client.clientWallet.request({
+        const res = await this.signer.wallet.request({
             method: 'request_accounts_and_keys',
             params: {
                 purposes: ['payment']
@@ -79,7 +82,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async transfer(recipient, amount, fromAddress, memo, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.client.clientWallet.request({
+            this.signer.wallet.request({
                 method: 'transfer',
                 params: [
                     {
@@ -107,7 +110,6 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
         try {
             const hash = await hashPromise;
             if (typeof hash === 'string') {
-                // const statusData = this.getSrcStatusRecursive(srcTxHash, BLOCKCHAIN_NAME.BITCOIN, 300_000);
                 return hash;
             }
             throw new Error();
@@ -118,7 +120,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async sendPsbtTransaction(psbt, userAddress, inputIndexes, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.client.clientWallet.request({
+            this.signer.wallet.request({
                 method: 'sign_psbt',
                 params: {
                     psbt,

package/src/lib/adapter/adapters/adapter-bitcoin/{client/bitcoin-adapter-client.d.ts → signer/bitcoin-adapter-signer.d.ts}

@@ -1,12 +1,11 @@
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { BitconSendTxParams } from '../models/btc-send-tx-params';
-import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
+import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
 import { BtcWallet } from '../../models/btc-wallet-provider';
 import { TxStatus } from '../../models/web3-public-models/tx-status';
-export declare class BitcoinAdapterClient extends AbstractAdapterClient<BtcWallet, BitconSendTxParams, string> {
+export declare class BitcoinAdapterSigner extends AbstractAdapterSigner<BtcWallet, BitconSendTxParams, string> {
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
-    read<T>(args: unknown): Promise<T>;
     write(args: unknown): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
     getTransactionStatus(txHash: string): Promise<TxStatus>;

package/src/lib/adapter/adapters/adapter-bitcoin/{client/bitcoin-adapter-client.js → signer/bitcoin-adapter-signer.js}

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitcoinAdapterClient = void 0;
+exports.BitcoinAdapterSigner = void 0;
 const core_1 = require("@cryptorubic/core");
-const abstract_adapter_client_1 = require("../../common/client/abstract-adapter-client");
+const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const waitFor_1 = require("../../utils/waitFor");
-class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
+class BitcoinAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
     }
-    read(args) {
-        throw new Error('Not implemented');
-    }
     write(args) {
         throw new Error('Not implemented');
     }
@@ -33,7 +30,7 @@ class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClie
     }
     async transfer(txConfig, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.clientWallet.request({
+            this.wallet.request({
                 method: 'transfer',
                 params: [
                     {
@@ -72,7 +69,7 @@ class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClie
     }
     async sendPsbtTransaction(txConfig, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.clientWallet.request({
+            this.wallet.request({
                 method: 'sign_psbt',
                 params: [
                     {
@@ -122,4 +119,4 @@ class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClie
         return 'psbt' in txConfig;
     }
 }
-exports.BitcoinAdapterClient = BitcoinAdapterClient;
+exports.BitcoinAdapterSigner = BitcoinAdapterSigner;

package/src/lib/adapter/adapters/adapter-evm/evm-adapter.d.ts

@@ -1,17 +1,20 @@
-import { Abi, MulticallResponse, MulticallParameters, PublicActions, PublicClient, WalletClient, WalletActions, BlockNumber, BlockTag, GetBlockReturnType } from 'viem';
+import { Abi, MulticallResponse, MulticallParameters, PublicActions, PublicClient, WalletClient, WalletActions, BlockNumber, BlockTag, GetBlockReturnType, TransactionReceipt } from 'viem';
 import { AbstractAdapter } from '../common/abstract-adapter';
 import { EvmBlockchainName, ICustomLogger, Token, TokenAmount, PriceTokenAmount, HttpClient } from '@cryptorubic/core';
 import BigNumber from 'bignumber.js';
 import { EvmAdapterOptions } from '../models/evm-adapter-options';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
-import { EvmAdapterClient } from './client/evm-adapter-client';
+import { EvmAdapterSigner } from './signer/evm-adapter-signer';
 import { ClientAdaptersFactoryParams } from '../../models/create-factory-params';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 import { MethodData } from '../models/web3-public-models/method-data';
 import { GasPrice } from '../models/evm-web3-public-models/gas-price';
-export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicClient, WalletClient & WalletActions, EvmBlockchainName> {
-    readonly client: EvmAdapterClient;
+import { EvmTransactionOptions } from './models/evm-send-tx-params';
+import { ApprovableAdapter } from '../models/approve-adapter';
+import { AllowanceInfo } from '../models/common-types';
+export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicClient, WalletClient & WalletActions, EvmBlockchainName> implements ApprovableAdapter<EvmTransactionConfig> {
+    readonly signer: EvmAdapterSigner;
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     handlePreswap(contractAddress: string, walletAddress: string, tokenAmount: TokenAmount): Promise<void>;
     constructor(httpClient: HttpClient, adapterOptions: EvmAdapterOptions, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
@@ -34,6 +37,7 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
     multicallByContract<T>(contracts: MulticallParameters, allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     multicallByAddress<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[][], allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     static encodeMethodCall(contractAddress: string, contractAbi: Abi, method: string, parameters?: unknown[], value?: string): EvmTransactionConfig;
+    read<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[]): Promise<T>;
     /**
      * Generate random HEX strings from a given byte size.
      * @param size byte size.
@@ -55,6 +59,34 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
      */
     getBalance(walletAddress: string, tokenAddress?: string): Promise<BigNumber>;
     getTransactionCount(walletAddress: string): Promise<number>;
+    getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo>;
+    needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
+    /**
+     * Executes approve method in ERC-20 token contract.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Token amount to approve in wei.
+     * @param [options] Additional options.
+     * @returns Approval transaction hash.
+     */
+    approveTokens(walletAddress: string, tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<string>;
+    /**
+     * Build encoded approve transaction config.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount wei amount of tokens in approval window in spending cap field
+     * @returns Encoded approve transaction config.
+     */
+    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
+    needPermit2Approve(token: TokenAmount, permit2Address: string, walletAddress: string, spenderAddress: string): Promise<boolean>;
+    /**
+     * @param tokenAddress Token address you want to approve for spending
+     * @param permit2Address Addres of permit2 contract
+     * @param spenderAddress Contract address spending your tokens
+     * @param amount Approved amount
+     * @param deadline Ms number added to current time (Date.now()) until approve expiration
+     */
+    approveOnPermit2(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<TransactionReceipt>;
     /**
      * Calculates EIP-1559 specific gas details.
      * @see {@link https://github.com/ethers-io/ethers.js/blob/master/packages/abstract-provider/src.ts/index.ts#L235}

package/src/lib/adapter/adapters/adapter-evm/evm-adapter.js

@@ -9,11 +9,14 @@ const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
 const web3_pure_1 = require("../../../utils/web3-pure");
 const possible_errors_1 = require("../constants/possible-errors");
-const evm_adapter_client_1 = require("./client/evm-adapter-client");
+const evm_adapter_signer_1 = require("./signer/evm-adapter-signer");
 const rubic_sdk_error_1 = require("../../../errors/rubic-sdk.error");
+const uni_v3_permit_abi_1 = require("../constants/uni-v3-permit-abi");
+const insufficient_funds_gas_price_value_error_1 = require("../../../errors/cross-chain/insufficient-funds-gas-price-value.error");
+const options_1 = require("../utils/options");
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
-        return this.client.needApprove(token, contractAddress, walletAddress, amount);
+        return this.needApprove(token, contractAddress, walletAddress, amount);
     }
     async handlePreswap(contractAddress, walletAddress, tokenAmount) {
         const approveAmount = this.blockchain === core_1.BLOCKCHAIN_NAME.GNOSIS || this.blockchain === core_1.BLOCKCHAIN_NAME.CRONOS
@@ -23,12 +26,12 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         const fromTokenAddress = isNative && tokenAmount.blockchain === core_1.BLOCKCHAIN_NAME.METIS
             ? '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000'
             : tokenAmount.blockchain;
-        await this.client.writeContract(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', '0', [approveAmount]);
+        await this.signer.writeContract(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', '0', [approveAmount]);
     }
     constructor(httpClient, adapterOptions, logger, clientParams) {
         super(adapterOptions.blockchain, logger);
         this.public = this.createPublicClient(adapterOptions.rpcList);
-        this.client = new evm_adapter_client_1.EvmAdapterClient(this.public, httpClient, logger, clientParams);
+        this.signer = new evm_adapter_signer_1.EvmAdapterSigner(this.public, httpClient, logger, clientParams);
     }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = [], options = {}) {
         return this.public.readContract({
@@ -175,6 +178,15 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             throw err;
         }
     }
+    async read(address, abi, method, methodArgs = []) {
+        const result = await this.public.readContract({
+            abi,
+            address: address,
+            args: methodArgs,
+            functionName: method
+        });
+        return result;
+    }
     /**
      * Generate random HEX strings from a given byte size.
      * @param size byte size.
@@ -267,7 +279,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async getBalance(walletAddress, tokenAddress) {
         const isToken = tokenAddress && !web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.EVM, tokenAddress);
         if (isToken) {
-            const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
+            const tokenBalance = await this.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
             return new bignumber_js_1.default(tokenBalance);
         }
         const nativeBalance = await this.public.getBalance({
@@ -281,85 +293,99 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         });
         return transactionCount ?? 0;
     }
-    // public async getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo> {
-    //     const [decimals, allowance] = await Promise.all([
-    //         this.read<string>(fromTokenAddress, erc20TokenAbi, 'decimals'),
-    //         this.read<string>(fromTokenAddress, erc20TokenAbi, 'allowance', [walletAddress, spenderAddress])
-    //     ]);
-    //     const allowanceWeiBN = new BigNumber(allowance);
-    //     const allowanceNonWei = Token.fromWei(allowanceWeiBN, Number(decimals));
-    //     return { allowanceNonWei, allowanceWei: allowanceWeiBN };
-    // }
-    // public encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig {
-    //     const amountWei = amount ?? new BigNumber(2).pow(256).minus(1).toFixed();
-    //     const tx = EvmAdapter.encodeMethodCall(tokenAddress, erc20TokenAbi, 'approve', [spenderAddress, amountWei]);
-    //     return {
-    //         data: tx.data,
-    //         to: tx.to,
-    //         value: tx.value
-    //     };
-    // }
-    // public async needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean> {
-    //     // Native coin in METIS can be Token required approve
-    //     if (token.isNative && token.blockchain !== BLOCKCHAIN_NAME.METIS) {
-    //         return false;
-    //     }
-    //     // Special native address for METIS native coin
-    //     const fromTokenAddress =
-    //         token.isNative && token.blockchain === BLOCKCHAIN_NAME.METIS ? '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000' : token.address;
-    //     const { allowanceWei } = await this.getAllowance(fromTokenAddress, walletAddress, contractAddress);
-    //     return allowanceWei.lt(token.weiAmount);
-    // }
-    // public async approve(fromAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string> {
-    //     const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
-    //     return this.write(fromAddress, config.to, config.value, config.data);
-    // }
-    // public async needPermit2Approve(
-    //     token: TokenAmount,
-    //     permit2Address: string,
-    //     walletAddress: string,
-    //     spenderAddress: string
-    // ): Promise<boolean> {
-    //     const res = await this.read<Permit2AllowanceContractResponse>(permit2Address, UNI_V3_PERMIT_2_ABI, 'allowance', [
-    //         walletAddress,
-    //         token.address,
-    //         spenderAddress
-    //     ]);
-    //     const [amount, expiration, _nonce] = res;
-    //     return token.weiAmount.gt(amount) || new BigNumber(Date.now()).gt(Number(expiration) * 1000);
-    // }
-    // public encodePermit2Approve(
-    //     tokenAddress: string,
-    //     spenderAddress: string,
-    //     permit2Address: string,
-    //     expiration: string,
-    //     amount: string
-    // ): EvmTransactionConfig {
-    //     const tx = EvmAdapter.encodeMethodCall(permit2Address, UNI_V3_PERMIT_2_ABI, 'approve', [
-    //         tokenAddress,
-    //         spenderAddress,
-    //         amount,
-    //         expiration
-    //     ]);
-    //     return {
-    //         data: tx.data,
-    //         value: tx.value,
-    //         to: tx.to
-    //     };
-    // }
-    // public async approveOnPermit2(
-    //     fromAddress: string,
-    //     tokenAddress: string,
-    //     permit2Address: string,
-    //     spenderAddress: string,
-    //     deadline: BigNumber = new BigNumber(1_000_000),
-    //     amount?: BigNumber
-    // ): Promise<string> {
-    //     const approveAmount = amount ? amount : new BigNumber(2).pow(256).minus(1);
-    //     const expiration = new BigNumber(Date.now()).plus(deadline).toFixed();
-    //     const tx = this.encodePermit2Approve(tokenAddress, spenderAddress, permit2Address, expiration, approveAmount.toFixed());
-    //     return this.write(fromAddress, tx.to, tx.value, tx.data);
-    // }
+    async getAllowance(fromTokenAddress, walletAddress, spenderAddress) {
+        const [decimals, allowance] = await Promise.all([
+            this.read(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'decimals'),
+            this.read(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'allowance', [walletAddress, spenderAddress])
+        ]);
+        const allowanceWeiBN = new bignumber_js_1.default(allowance);
+        const allowanceNonWei = core_1.Token.fromWei(allowanceWeiBN, Number(decimals));
+        return { allowanceNonWei, allowanceWei: allowanceWeiBN };
+    }
+    async needApprove(token, contractAddress, walletAddress, amount) {
+        // Native coin in METIS can be Token required approve
+        if (token.isNative && token.blockchain !== core_1.BLOCKCHAIN_NAME.METIS) {
+            return false;
+        }
+        // Special native address for METIS native coin
+        const fromTokenAddress = token.isNative && token.blockchain === core_1.BLOCKCHAIN_NAME.METIS ? '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000' : token.address;
+        const { allowanceWei } = await this.getAllowance(fromTokenAddress, walletAddress, contractAddress);
+        return allowanceWei.lt(token.weiAmount);
+    }
+    /**
+     * Executes approve method in ERC-20 token contract.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Token amount to approve in wei.
+     * @param [options] Additional options.
+     * @returns Approval transaction hash.
+     */
+    async approveTokens(walletAddress, tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+        try {
+            const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
+            const encodedApprove = this.encodeApprove(tokenAddress, spenderAddress, rawValue.toFixed(0));
+            const gaslessParams = {
+                account: walletAddress,
+                to: tokenAddress,
+                value: BigInt('0'),
+                data: encodedApprove.data
+            };
+            const gas = await this.public.estimateGas({
+                ...gaslessParams,
+                ...(0, options_1.getViemGasOptions)(options)
+            });
+            const gasfulViemOptions = {
+                ...gaslessParams,
+                ...(0, options_1.getViemGasOptions)(options),
+                gas: gas.toString()
+            };
+            const receipt = await this.signer.executeContractMethod(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', [spenderAddress, BigInt(rawValue.toFixed(0))], gasfulViemOptions);
+            return receipt.transactionHash;
+        }
+        catch (err) {
+            if (err?.message?.includes('gas required exceeds allowance') || err?.message?.includes('insufficient balance to pay for gas')) {
+                throw new insufficient_funds_gas_price_value_error_1.InsufficientFundsGasPriceValueError();
+            }
+            console.debug(err);
+            throw err;
+        }
+    }
+    /**
+     * Build encoded approve transaction config.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount wei amount of tokens in approval window in spending cap field
+     * @returns Encoded approve transaction config.
+     */
+    encodeApprove(tokenAddress, spenderAddress, amount) {
+        const amountWei = amount ?? new bignumber_js_1.default(2).pow(256).minus(1).toFixed();
+        const tx = EvmAdapter.encodeMethodCall(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', [spenderAddress, amountWei]);
+        return {
+            data: tx.data,
+            to: tx.to,
+            value: tx.value
+        };
+    }
+    async needPermit2Approve(token, permit2Address, walletAddress, spenderAddress) {
+        const res = await this.read(permit2Address, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'allowance', [
+            walletAddress,
+            token.address,
+            spenderAddress
+        ]);
+        const [amount, expiration, _nonce] = res;
+        return token.weiAmount.gt(amount) || new bignumber_js_1.default(Date.now()).gt(Number(expiration) * 1000);
+    }
+    /**
+     * @param tokenAddress Token address you want to approve for spending
+     * @param permit2Address Addres of permit2 contract
+     * @param spenderAddress Contract address spending your tokens
+     * @param amount Approved amount
+     * @param deadline Ms number added to current time (Date.now()) until approve expiration
+     */
+    async approveOnPermit2(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+        const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
+        return this.signer.executeContractMethod(tokenAddress, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'approve', [spenderAddress, BigInt(rawValue.toString())], options);
+    }
     /**
      * Calculates EIP-1559 specific gas details.
      * @see {@link https://github.com/ethers-io/ethers.js/blob/master/packages/abstract-provider/src.ts/index.ts#L235}

package/src/lib/adapter/adapters/adapter-evm/{client/evm-adapter-client.d.ts → signer/evm-adapter-signer.d.ts}

@@ -1,46 +1,14 @@
-import { BlockchainName, HttpClient, ICustomLogger, TokenAmount } from '@cryptorubic/core';
+import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
-import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
+import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
 import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
-import BigNumber from 'bignumber.js';
 import { Web3Error } from '../utils/parse-evm-error';
-import { EvmTransactionConfig } from '../../../../utils/models/evm-transaction-config';
 import { TxStatus } from '../../models/web3-public-models/tx-status';
-import { ApproveAdapterClient } from '../../models/approve-adapter';
-import { AllowanceInfo } from '../../models/common-types';
-export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> implements ApproveAdapterClient<EvmTransactionConfig> {
+export declare class EvmAdapterSigner extends AbstractAdapterSigner<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> {
     private readonly evmPublic;
     constructor(evmPublic: PublicActions & PublicClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     getBlockchainName(): Promise<BlockchainName | undefined>;
-    getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo>;
-    needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
-    /**
-     * Executes approve method in ERC-20 token contract.
-     * @param tokenAddress Address of the smart-contract corresponding to the token.
-     * @param spenderAddress Wallet or contract address to approve.
-     * @param amount Token amount to approve in wei.
-     * @param [options] Additional options.
-     * @returns Approval transaction hash.
-     */
-    approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<string>;
-    /**
-     * Build encoded approve transaction config.
-     * @param tokenAddress Address of the smart-contract corresponding to the token.
-     * @param spenderAddress Wallet or contract address to approve.
-     * @param amount wei amount of tokens in approval window in spending cap field
-     * @returns Encoded approve transaction config.
-     */
-    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
-    needPermit2Approve(token: TokenAmount, permit2Address: string, walletAddress: string, spenderAddress: string): Promise<boolean>;
-    /**
-     * @param tokenAddress Token address you want to approve for spending
-     * @param permit2Address Addres of permit2 contract
-     * @param spenderAddress Contract address spending your tokens
-     * @param amount Approved amount
-     * @param deadline Ms number added to current time (Date.now()) until approve expiration
-     */
-    approveOnPermit2(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<TransactionReceipt>;
     getTransactionStatus(hash: string): Promise<TxStatus>;
     /**
      * Gets mined transaction receipt.
@@ -84,7 +52,6 @@ export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient
     private shouldIgnoreError;
     signMessage(message: string): Promise<string>;
     private getChainAndAccount;
-    read<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[]): Promise<T>;
     writeContract(address: string, abi: Abi, method: string, value?: string, methodArgs?: unknown[]): Promise<string>;
     write(address: string, to: string, value: string, data: string, options?: EvmTransactionOptions): Promise<string>;
 }