@cryptorubic/web3 1.0.0-alpha.no-sdk.6 → 1.0.0-alpha.no-sdk.8

package/package.json

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

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

@@ -27,8 +27,6 @@ export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet
     getPublicKey(userAddress: string): Promise<string | null>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;
-    read<T>(args: unknown): Promise<T>;
-    write(args: unknown): Promise<string>;
     getPublicKeyFromWallet(): Promise<string>;
     transfer(recipient: string, amount: string, fromAddress: string, memo?: string, options?: BasicSendTransactionOptions): Promise<string>;
     sendPsbtTransaction(psbt: string, userAddress: string, inputIndexes: number[], options?: BasicSendTransactionOptions): Promise<string>;

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

@@ -61,12 +61,6 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     async callForTokensInfo(tokenAddresses) {
         return [core_1.nativeTokensList[core_1.BLOCKCHAIN_NAME.BITCOIN]];
     }
-    read(args) {
-        throw new Error('Not implemented');
-    }
-    write(args) {
-        throw new Error('Not implemented');
-    }
     async getPublicKeyFromWallet() {
         const res = await this.client.clientWallet.request({
             method: 'request_accounts_and_keys',

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

@@ -6,6 +6,8 @@ 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> {
     constructor(httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    read<T>(args: unknown): Promise<T>;
+    write(args: unknown): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
     getTransactionStatus(txHash: string): Promise<TxStatus>;
     sendTransaction(params: BitconSendTxParams): Promise<string>;

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

@@ -9,6 +9,12 @@ class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClie
     constructor(httpClient, logger, rubicAppParams) {
         super(httpClient, logger, rubicAppParams);
     }
+    read(args) {
+        throw new Error('Not implemented');
+    }
+    write(args) {
+        throw new Error('Not implemented');
+    }
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.BITCOIN);
     }

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

@@ -1,18 +1,17 @@
 import { BlockchainName, HttpClient, ICustomLogger, TokenAmount } from '@cryptorubic/core';
 import { RubicAppAdaptersFactoryParams } from '../../../constants/models/create-factory-params';
 import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
-import { Abi, TransactionReceipt, WalletActions, WalletClient } from 'viem';
+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 'packages/web3/src/lib/utils/models/evm-transaction-config';
-import { EvmAdapter } from '../evm-adapter';
 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> {
-    private readonly evmAdapter;
-    constructor(evmAdapter: EvmAdapter, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    private readonly evmPublic;
+    constructor(evmPublic: PublicActions & PublicClient, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
     getBlockchainName(): Promise<BlockchainName | undefined>;
     getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo>;
     needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
@@ -77,4 +76,7 @@ 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): Promise<string>;
 }

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAdapterClient = void 0;
 const core_1 = require("@cryptorubic/core");
 const abstract_adapter_client_1 = require("../../common/client/abstract-adapter-client");
+const viem_1 = require("viem");
 const waitForTransactionReceipt_1 = require("viem/_types/actions/public/waitForTransactionReceipt");
 const options_1 = require("../../utils/options");
 const viem_blockchain_mapping_1 = require("../../../constants/viem-blockchain-mapping");
@@ -14,9 +15,9 @@ const rubic_sdk_error_1 = require("packages/web3/src/lib/errors/rubic-sdk.error"
 const evm_adapter_1 = require("../evm-adapter");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
 class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
-    constructor(evmAdapter, httpClient, logger, rubicAppParams) {
+    constructor(evmPublic, httpClient, logger, rubicAppParams) {
         super(httpClient, logger, rubicAppParams);
-        this.evmAdapter = evmAdapter;
+        this.evmPublic = evmPublic;
     }
     async getBlockchainName() {
         const userChainId = await this.clientWallet.getChainId();
@@ -24,8 +25,8 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
     }
     async getAllowance(fromTokenAddress, walletAddress, spenderAddress) {
         const [decimals, allowance] = await Promise.all([
-            this.evmAdapter.read(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'decimals'),
-            this.evmAdapter.read(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'allowance', [walletAddress, spenderAddress])
+            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));
@@ -43,7 +44,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
     }
     async approve(fromAddress, tokenAddress, spenderAddress, amount) {
         const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
-        return this.evmAdapter.write(fromAddress, config.to, config.value, config.data);
+        return this.write(fromAddress, config.to, config.value, config.data);
     }
     /**
      * Build encoded approve transaction config.
@@ -62,7 +63,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         };
     }
     async needPermit2Approve(token, permit2Address, walletAddress, spenderAddress) {
-        const res = await this.evmAdapter.read(permit2Address, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'allowance', [
+        const res = await this.read(permit2Address, uni_v3_permit_abi_1.UNI_V3_PERMIT_2_ABI, 'allowance', [
             walletAddress,
             token.address,
             spenderAddress
@@ -96,7 +97,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
      * @param hash Transaction hash
      */
     async getTransactionReceipt(hash) {
-        return this.evmAdapter.public.getTransactionReceipt({ hash: hash });
+        return this.evmPublic.getTransactionReceipt({ hash: hash });
     }
     /**
      * Sends Eth in transaction and resolve the promise when the transaction is included in the block.
@@ -144,7 +145,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
                 value,
                 ...(params.txOptions.data && { data: params.txOptions.data })
             };
-            const gas = await this.evmAdapter.public.estimateGas(gaslessParams);
+            const gas = await this.evmPublic.estimateGas(gaslessParams);
             const gasfulParams = {
                 ...gaslessParams,
                 ...(0, options_1.getGasOptions)(params.txOptions),
@@ -156,7 +157,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
                 gas
             };
             try {
-                await this.evmAdapter.public.estimateGas(gasfulViemParams);
+                await this.evmPublic.estimateGas(gasfulViemParams);
             }
             catch {
                 throw new rubic_sdk_error_1.RubicSdkError('Low native value');
@@ -237,7 +238,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
                 }),
                 account: this.walletAddress
             };
-            const gas = await this.evmAdapter.public.estimateContractGas(gaslessParams);
+            const gas = await this.evmPublic.estimateContractGas(gaslessParams);
             const gasfulParams = {
                 ...gaslessParams,
                 ...(0, options_1.getGasOptions)(options),
@@ -249,7 +250,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
                 gas
             };
             try {
-                await this.evmAdapter.public.estimateContractGas(gasfulViemParams);
+                await this.evmPublic.estimateContractGas(gasfulViemParams);
             }
             catch {
                 throw new rubic_sdk_error_1.RubicSdkError('Low native value');
@@ -305,5 +306,36 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         }
         return { account, chain };
     }
+    async read(address, abi, method, methodArgs = []) {
+        const result = await this.evmPublic.readContract({
+            abi,
+            address: address,
+            args: methodArgs,
+            functionName: method
+        });
+        return result;
+    }
+    async writeContract(address, abi, method, value = '0', methodArgs = []) {
+        const result = await this.clientWallet.writeContract({
+            abi,
+            address: address,
+            account: address,
+            args: methodArgs,
+            functionName: method,
+            chain: this.evmPublic.chain,
+            value: (0, viem_1.parseEther)(value)
+        });
+        return result;
+    }
+    async write(address, to, value, data) {
+        const result = await this.clientWallet.sendTransaction({
+            account: address,
+            to: to,
+            value: (0, viem_1.parseEther)(value),
+            data: data,
+            chain: this.evmPublic.chain
+        });
+        return result;
+    }
 }
 exports.EvmAdapterClient = EvmAdapterClient;

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

@@ -31,9 +31,6 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
         workchain: number;
     }>;
     protected createPublicClient(rpcList: string[]): (PublicActions & PublicClient) | null;
-    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): Promise<string>;
     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;

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

@@ -23,12 +23,12 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         const fromTokenAddress = isNative && tokenAmount.blockchain === core_1.BLOCKCHAIN_NAME.METIS
             ? '0xdeaddeaddeaddeaddeaddeaddeaddeaddead0000'
             : tokenAmount.blockchain;
-        await this.writeContract(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', '0', [approveAmount]);
+        await this.client.writeContract(fromTokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', '0', [approveAmount]);
     }
     constructor(httpClient, adapterOptions, logger, rubicAppParams) {
         super(adapterOptions.blockchain, logger);
         this.public = this.createPublicClient(adapterOptions.rpcList);
-        this.client = new evm_adapter_client_1.EvmAdapterClient(this, httpClient, logger, rubicAppParams);
+        this.client = new evm_adapter_client_1.EvmAdapterClient(this.public, httpClient, logger, rubicAppParams);
     }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = [], options = {}) {
         return this.public.readContract({
@@ -124,37 +124,6 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             })
         });
     }
-    async read(address, abi, method, methodArgs = []) {
-        const result = await this.public.readContract({
-            abi,
-            address: address,
-            args: methodArgs,
-            functionName: method
-        });
-        return result;
-    }
-    async writeContract(address, abi, method, value = '0', methodArgs = []) {
-        const result = await this.client.clientWallet.writeContract({
-            abi,
-            address: address,
-            account: address,
-            args: methodArgs,
-            functionName: method,
-            chain: this.public.chain,
-            value: (0, viem_1.parseEther)(value)
-        });
-        return result;
-    }
-    async write(address, to, value, data) {
-        const result = await this.client.clientWallet.sendTransaction({
-            account: address,
-            to: to,
-            value: (0, viem_1.parseEther)(value),
-            data: data,
-            chain: this.public.chain
-        });
-        return result;
-    }
     async multicallByContract(contracts, allowErrors = true) {
         const results = await this.public.multicall(contracts);
         const rpcRequestFail = results.every((result) => result?.status === 'failure');
@@ -295,7 +264,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             });
             return new bignumber_js_1.default(nativeBalance.toString());
         }
-        const tokenBalance = await this.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
+        const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
         return new bignumber_js_1.default(tokenBalance);
     }
     async getTransactionCount(walletAddress) {

package/src/lib/adapter/adapters/adapter-solana/client/solana-adapter-client.d.ts

@@ -8,6 +8,8 @@ import { TxStatus } from '../../models/web3-public-models/tx-status';
 export declare class SolanaAdapterClient extends AbstractAdapterClient<SolanaWeb3, SolanaSendTxParams, string> {
     private readonly connection;
     constructor(connection: Connection, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    read<T>(): Promise<T>;
+    write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     getTransactionStatus(txHash: string): Promise<TxStatus>;
     sendTransaction(params: SolanaSendTxParams): Promise<string>;

package/src/lib/adapter/adapters/adapter-solana/client/solana-adapter-client.js

@@ -15,6 +15,12 @@ class SolanaAdapterClient extends abstract_adapter_client_1.AbstractAdapterClien
         super(httpClient, logger, rubicAppParams);
         this.connection = connection;
     }
+    async read() {
+        throw new Error('Method read is not supported');
+    }
+    async write() {
+        throw new Error('Method write is not supported');
+    }
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.SOLANA);
     }

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

@@ -1,4 +1,3 @@
-import { Abi } from 'viem';
 import { AddressLookupTableAccount, Connection, Keypair, PublicKey, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
 import { HttpClient, ICustomLogger, PriceTokenAmount, SolanaBlockchainName, Token, TokenAmount } from '@cryptorubic/core';
 import BigNumber from 'bignumber.js';
@@ -27,8 +26,6 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb
         workchain: number;
     }>;
     private createConection;
-    read<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
-    write<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
     simulateTransaction(_config: object, _from: string): Promise<void>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;

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

@@ -57,12 +57,6 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
             return new web3_js_1.Connection(rpcList[0], 'confirmed');
         }
     }
-    async read(_address, _abi, _method, _methodArgs = []) {
-        throw new Error('Method multicall is not supported');
-    }
-    async write(_address, _abi, _method, _methodArgs = []) {
-        throw new Error('Method multicall is not supported');
-    }
     async simulateTransaction(_config, _from) { }
     async checkEnoughBalance(token, walletAddress) {
         const balance = await this.getBalance(walletAddress, token.address);

package/src/lib/adapter/adapters/adapter-sui/client/sui-adapter-client.d.ts

@@ -8,6 +8,8 @@ import { ExecuteTransactionBlockParams, SuiClient, SuiTransactionBlockResponse }
 export declare class SuiAdapterClient extends AbstractAdapterClient<WalletAdapter, SuiSendTxParams, string> {
     private readonly suiClient;
     constructor(suiClient: SuiClient, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    read<T>(): Promise<T>;
+    write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     sendTransaction(params: SuiSendTxParams): Promise<string>;

package/src/lib/adapter/adapters/adapter-sui/client/sui-adapter-client.js

@@ -11,6 +11,12 @@ class SuiAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         super(httpClient, logger, rubicAppParams);
         this.suiClient = suiClient;
     }
+    async read() {
+        throw new Error('Method read is not supported');
+    }
+    async write() {
+        throw new Error('Method write is not supported');
+    }
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.SUI);
     }

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

@@ -18,8 +18,6 @@ export declare class SuiAdapter extends AbstractAdapter<SuiClient, WalletAdapter
         blockNumber: number;
         workchain: number;
     }>;
-    read<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
-    write<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
     multicallByAddress<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[][], _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     simulateTransaction(_config: object, _from: string): Promise<void>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SuiBlockchainName>[]>;

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

@@ -31,12 +31,6 @@ class SuiAdapter extends abstract_adapter_1.AbstractAdapter {
         const stringEpoch = epochInfo.data[0].epoch;
         return Number(stringEpoch);
     }
-    async read(_address, _abi, _method, _methodArgs = []) {
-        throw new Error('Method read is not supported');
-    }
-    async write(_address, _abi, _method, _methodArgs = []) {
-        throw new Error('Method write is not supported');
-    }
     async multicallByAddress(_address, _abi, _method, _methodArgs = [], _allowErrors = true) {
         throw new Error('Method multicall is not supported');
     }

package/src/lib/adapter/adapters/adapter-ton/client/ton-adapter-client.d.ts

@@ -13,6 +13,8 @@ export declare class TonAdapterClient extends AbstractAdapterClient<TonConnectUI
     private readonly tonApi;
     private readonly tonClient;
     constructor(tonApi: TonApiService, config: TonAdapterConfig, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    read<T>(): Promise<T>;
+    write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     sendTransaction(params: TonSendTxParams): Promise<string>;

package/src/lib/adapter/adapters/adapter-ton/client/ton-adapter-client.js

@@ -16,6 +16,12 @@ class TonAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         this.tonApi = tonApi;
         this.tonClient = new ton_1.TonClient(config.tonClientConfig);
     }
+    async read() {
+        throw new Error('Method read is not supported');
+    }
+    async write() {
+        throw new Error('Method write is not supported');
+    }
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.TON);
     }

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

@@ -21,8 +21,6 @@ export declare class TonAdapter extends AbstractAdapter<TonClient, TonConnectUI,
         workchain: number;
     }>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;
-    read<T>(args: unknown): Promise<T>;
-    write(args: unknown): Promise<string>;
     getAllFormatsOfAddress(walletAddress: string): Promise<TonApiParseAddressResp>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     getBalance(walletAddress: string, tokenAddress?: string): Promise<BigNumber>;

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

@@ -70,12 +70,6 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         }));
         return necessaryInfo;
     }
-    read(args) {
-        throw new Error('Not implemented');
-    }
-    write(args) {
-        throw new Error('Not implemented');
-    }
     async getAllFormatsOfAddress(walletAddress) {
         return this.tonApi.getAllFormatsOfAddress(walletAddress);
     }

package/src/lib/adapter/adapters/adapter-tron/client/tron-adapter-client.d.ts

@@ -5,12 +5,14 @@ import { RubicAppAdaptersFactoryParams } from '../../../constants/models/create-
 import { TronSendTxParams } from '../models/tron-send-tx-params';
 import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { TronTransactionConfig } from 'packages/web3/src/lib/utils/models/tron-transaction-config';
-import { TronAdapter } from '../tron-adapter';
 import { ApproveAdapterClient } from '../../models/approve-adapter';
 import { AllowanceInfo } from '../../models/common-types';
+import { TronParameters } from 'packages/web3/src/lib/utils/models/tron-parameters';
 export declare class TronAdapterClient extends AbstractAdapterClient<TronWeb, TronSendTxParams, string> implements ApproveAdapterClient<TronTransactionConfig> {
-    private readonly tronAdapter;
-    constructor(tronAdapter: TronAdapter, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    private readonly tronWeb;
+    constructor(tronWeb: TronWeb, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    read<T>(contractAddress: string, contractAbi: any, methodName: string, methodArguments?: unknown[]): Promise<T>;
+    write(contractAddress: string, methodSignature: string, parameters: TronParameters): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
     getAllowance(fromTokenAddress: string, walletAddress: string, spender: string): Promise<AllowanceInfo>;
     needApprove(from: TokenAmount, walletAddress: string, spender: string): Promise<boolean>;

package/src/lib/adapter/adapters/adapter-tron/client/tron-adapter-client.js

@@ -8,19 +8,32 @@ const trc_20_contract_abi_1 = require("../../constants/trc-20-contract-abi");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const parse_tron_error_1 = require("../utils/parse-tron-error");
 const tron_adapter_1 = require("../tron-adapter");
+const tron_web3_pure_1 = require("packages/web3/src/lib/utils/web3-types/tron-web3-pure");
 class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
-    constructor(tronAdapter, httpClient, logger, rubicAppParams) {
+    constructor(tronWeb, httpClient, logger, rubicAppParams) {
         super(httpClient, logger, rubicAppParams);
-        this.tronAdapter = tronAdapter;
+        this.tronWeb = tronWeb;
+    }
+    async read(contractAddress, contractAbi, methodName, methodArguments = []) {
+        this.tronWeb.setAddress(contractAddress);
+        const contract = await this.tronWeb.contract(contractAbi, contractAddress);
+        const response = await contract[methodName](...methodArguments).call();
+        return tron_web3_pure_1.TronWeb3Pure.flattenParameterToPrimitive(response);
+    }
+    async write(contractAddress, methodSignature, parameters) {
+        const transaction = await this.clientWallet.transactionBuilder.triggerSmartContract(contractAddress, methodSignature, {}, parameters, this.walletAddress);
+        const signedTransaction = await this.clientWallet.trx.sign(transaction.transaction);
+        const receipt = await this.clientWallet.trx.sendRawTransaction(signedTransaction);
+        return receipt.transaction.txID;
     }
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.TRON);
     }
     async getAllowance(fromTokenAddress, walletAddress, spender) {
         const [contract, decimals, allowance] = await Promise.all([
-            this.tronAdapter.public.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, fromTokenAddress),
-            this.tronAdapter.read(fromTokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'decimals'),
-            this.tronAdapter.read(fromTokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'allowance', [spender])
+            this.tronWeb.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, fromTokenAddress),
+            this.read(fromTokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'decimals'),
+            this.read(fromTokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'allowance', [spender])
         ]);
         const allowanceWeiBN = new bignumber_js_1.default(allowance);
         const allowanceNonWei = core_1.Token.fromWei(allowanceWeiBN, Number(decimals));
@@ -34,7 +47,7 @@ class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient
     }
     async approve(fromAddress, tokenAddress, spenderAddress, amount) {
         const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
-        return this.tronAdapter.write(config.to, config.signature, config.arguments);
+        return this.write(config.to, config.signature, config.arguments);
     }
     encodeApprove(tokenAddress, spenderAddress, amount) {
         const amountWei = amount ?? new bignumber_js_1.default(2).pow(256).minus(1).toFixed();
@@ -58,13 +71,13 @@ class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient
      * @param hash Transaction hash.
      */
     async getTransactionInfo(hash) {
-        return this.tronAdapter.public.trx.getTransactionInfo(hash);
+        return this.tronWeb.trx.getTransactionInfo(hash);
     }
     async sendTransaction(params) {
         try {
-            const transaction = await this.tronAdapter.public.transactionBuilder.triggerSmartContract(params.contractAddress, params.methodSignature, params.txOptions, params.parameters, this.walletAddress);
-            const signedTransaction = await this.tronAdapter.public.trx.sign(transaction.transaction);
-            const receipt = await this.tronAdapter.public.trx.sendRawTransaction(signedTransaction);
+            const transaction = await this.tronWeb.transactionBuilder.triggerSmartContract(params.contractAddress, params.methodSignature, params.txOptions, params.parameters, this.walletAddress);
+            const signedTransaction = await this.tronWeb.trx.sign(transaction.transaction);
+            const receipt = await this.tronWeb.trx.sendRawTransaction(signedTransaction);
             if (params.txOptions.onTransactionHash) {
                 params.txOptions.onTransactionHash(receipt.transaction.txID);
             }
@@ -77,7 +90,7 @@ class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient
     }
     async trySendTransaction(params) {
         try {
-            await this.tronAdapter.public.transactionBuilder.estimateEnergy(params.contractAddress, params.methodSignature, {}, params.parameters, this.walletAddress);
+            await this.tronWeb.transactionBuilder.estimateEnergy(params.contractAddress, params.methodSignature, {}, params.parameters, this.walletAddress);
         }
         catch (err) {
             const errMessage = typeof err === 'object' ? err.message : err;

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

@@ -27,7 +27,6 @@ export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronB
     }>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     private multicall;
-    read<T>(contractAddress: string, contractAbi: any, methodName: string, methodArguments?: unknown[]): Promise<T>;
     private multicallContractsMethodsByOne;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token[]>;
     getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
@@ -35,5 +34,4 @@ export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronB
     convertTronAddressToHex(address: string): Promise<string>;
     static encodeMethodCall(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments: TronParameters, callValue?: string, feeLimit?: number): TronTransactionConfig;
     private static flattenTypesToString;
-    write(contractAddress: string, methodSignature: string, parameters: TronParameters): Promise<string>;
 }

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

@@ -18,7 +18,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         super(core_1.BLOCKCHAIN_NAME.TRON, logger);
         this.multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
         this.public = new tronweb_1.TronWeb({ fullHost: rpcList[0] });
-        this.client = new tron_adapter_client_1.TronAdapterClient(this, httpClient, logger, rubicAppParams);
+        this.client = new tron_adapter_client_1.TronAdapterClient(this.public, httpClient, logger, rubicAppParams);
     }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = []) {
         this.public.setAddress(contractAddress);
@@ -94,17 +94,11 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         // @ts-ignore
         return contract.aggregateViewCalls(calls).call();
     }
-    async read(contractAddress, contractAbi, methodName, methodArguments = []) {
-        this.public.setAddress(contractAddress);
-        const contract = await this.public.contract(contractAbi, contractAddress);
-        const response = await contract[methodName](...methodArguments).call();
-        return tron_web3_pure_1.TronWeb3Pure.flattenParameterToPrimitive(response);
-    }
     multicallContractsMethodsByOne(contractAbi, contractsData) {
         return Promise.all(contractsData.map((contractData) => {
             return Promise.all(contractData.methodsData.map(async (methodData) => {
                 try {
-                    const output = (await this.read(contractData.contractAddress, contractAbi, methodData.methodName, methodData.methodArguments));
+                    const output = (await this.client.read(contractData.contractAddress, contractAbi, methodData.methodName, methodData.methodArguments));
                     return {
                         output,
                         success: true
@@ -205,11 +199,5 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             return abiInput.type;
         }) || []);
     }
-    async write(contractAddress, methodSignature, parameters) {
-        const transaction = await this.client.clientWallet.transactionBuilder.triggerSmartContract(contractAddress, methodSignature, {}, parameters, this.client.walletAddress);
-        const signedTransaction = await this.client.clientWallet.trx.sign(transaction.transaction);
-        const receipt = await this.client.clientWallet.trx.sendRawTransaction(signedTransaction);
-        return receipt.transaction.txID;
-    }
 }
 exports.TronAdapter = TronAdapter;

package/src/lib/adapter/adapters/common/abstract-adapter.d.ts

@@ -57,7 +57,5 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     }>;
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string | BigNumber): Promise<boolean>;
     handlePreswap(contractAddress: string, walletAddress: string, tokenAmount: TokenAmount): Promise<void>;
-    abstract read<T>(...args: unknown[]): Promise<T>;
-    abstract write(...args: unknown[]): Promise<string>;
     static getRandomBytes(bytes: number): string;
 }

package/src/lib/adapter/adapters/common/client/abstract-adapter-client.d.ts

@@ -14,6 +14,8 @@ export declare abstract class AbstractAdapterClient<ClientWallet, SendTxParams,
     abstract getBlockchainName(): Promise<BlockchainName | undefined>;
     abstract sendTransaction(params: SendTxParams): Promise<SendTxResponse>;
     abstract getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
+    abstract read<T>(...args: unknown[]): Promise<T>;
+    abstract write(...args: unknown[]): Promise<string>;
     /**
      * Checks, that selected blockchain in wallet is equal to passed blockchain.
      */

package/src/lib/utils/models/evm-transaction-config.d.ts

@@ -1,3 +1,4 @@
+import { ErrorInterface } from '@cryptorubic/core';
 export interface EvmTransactionConfig {
     to: string;
     data: string;
@@ -6,4 +7,5 @@ export interface EvmTransactionConfig {
     gasPrice?: string;
     maxFeePerGas?: string;
     maxPriorityFeePerGas?: string;
+    warnings?: ErrorInterface[];
 }