@cryptorubic/web3 0.0.34 → 0.2.1

package/src/lib/adapter/adapters/models/approve-adapter.d.ts

@@ -1,7 +1,6 @@
-import { TokenAmount } from "@cryptorubic/core";
-import { AllowanceInfo } from "./common-types";
-import { EvmTransactionConfig } from "../../../utils/models/evm-transaction-config";
-export interface ApproveAdapter {
+import { TokenAmount } from '@cryptorubic/core';
+import { AllowanceInfo } from './common-types';
+export interface ApproveAdapter<T> {
     /**
      * @param fromTokenAddress erc20 address of checked token
      * @param walletAddress owner wallet address
@@ -10,12 +9,12 @@ export interface ApproveAdapter {
      */
     getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo>;
     /**
-     *
+     * Get data for tokens approve
      * @param tokenAddress erc20 token address
      * @param spenderAddress spender address
      * @param amount amount in non wei
      */
-    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
+    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): T;
     /**
      * Check if approve needed.
      * @param token
@@ -24,4 +23,11 @@ export interface ApproveAdapter {
      * @param amount
      */
     needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
+    /**
+     * Get data for tokens approve
+     * @param tokenAddress erc20 token address
+     * @param spenderAddress spender address
+     * @param amount amount in non wei
+     */
+    approve(walletAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
 }

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

@@ -1,4 +1,4 @@
-import { EvmBlockchainName } from "@cryptorubic/core";
+import { EvmBlockchainName } from '@cryptorubic/core';
 export interface EvmAdapterOptions {
     blockchain: EvmBlockchainName;
     rpcList: string[];

package/src/lib/adapter/adapters/models/gas-price.d.ts

@@ -0,0 +1,22 @@
+import BigNumber from 'bignumber.js';
+export type GasPrice = EIP1559Gas & SingleGasPrice;
+export interface EIP1559Gas {
+    /**
+     * EIP-1559 Block base fee.
+     */
+    baseFee?: string;
+    /**
+     * EIP-1559 Transaction maximum fee.
+     */
+    maxFeePerGas?: string;
+    /**
+     * EIP-1559 Transaction miner's tip.
+     */
+    maxPriorityFeePerGas?: string;
+}
+export interface SingleGasPrice {
+    gasPrice?: string;
+}
+export type GasPriceBN = {
+    [P in keyof GasPrice]: BigNumber;
+};

package/src/lib/adapter/adapters/models/gas-price.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,5 +1,5 @@
-import { TonApiConfig } from "./ton-api-config";
-import { TonClientParameters } from "@ton/ton/dist/client/TonClient";
+import { TonApiConfig } from './ton-api-config';
+import { TonClientParameters } from '@ton/ton/dist/client/TonClient';
 export interface TonAdapterConfig {
     tonApiConfig: TonApiConfig;
     tonClientConfig: TonClientParameters;

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

@@ -1,8 +1,8 @@
 import { Abi, MulticallResponse, MulticallParameters } from 'viem';
 import { AbstractAdapter } from './abstract-adapter';
-import { Connection } from "@solana/web3.js";
-import { ICustomLogger, SolanaBlockchainName, Token } from "@cryptorubic/core";
-import { EvmTransactionConfig } from "../../utils/models/evm-transaction-config";
+import { Connection } from '@solana/web3.js';
+import { ICustomLogger, SolanaBlockchainName, Token } from '@cryptorubic/core';
+import { EvmTransactionConfig } from '../../utils/models/evm-transaction-config';
 export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
     constructor(rpcList: string[], logger?: ICustomLogger);
     private createPublicClient;

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

@@ -45,7 +45,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
                 blockchain: core_1.BLOCKCHAIN_NAME.SOLANA,
                 decimals: token.decimals,
                 name: token.name,
-                symbol: token.symbol
+                symbol: token.symbol,
             });
         });
         if (nativeTokenIndex === -1) {

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

@@ -1,10 +1,10 @@
 import { BlockchainName, HttpClient, ICustomLogger, PriceTokenAmount, Token, TokenAmount, TonBlockchainName } from '@cryptorubic/core';
-import { Address, TonClient } from "@ton/ton";
-import { TonApiParseAddressResp } from "./models/tonapi-models";
-import { TonAdapterConfig } from "./models/ton-adapter-config";
-import BigNumber from "bignumber.js";
-import { TonTransactionConfig } from "../../utils/models/ton-transaction-config";
-import { AbstractAdapter } from "./abstract-adapter";
+import { Address, TonClient } from '@ton/ton';
+import { TonApiParseAddressResp } from './models/tonapi-models';
+import { TonAdapterConfig } from './models/ton-adapter-config';
+import BigNumber from 'bignumber.js';
+import { TonTransactionConfig } from '../../utils/models/ton-transaction-config';
+import { AbstractAdapter } from './abstract-adapter';
 export declare class TonAdapter extends AbstractAdapter<TonClient, TonClient, TonBlockchainName> {
     private readonly tonApi;
     readonly tonClient: TonClient;

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

@@ -28,7 +28,7 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
             blockchain: core_1.BLOCKCHAIN_NAME.TON,
             decimals: Number(decimals),
             name,
-            symbol
+            symbol,
         }));
         return necessaryInfo;
     }
@@ -42,9 +42,7 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         return this.tonApi.getAllFormatsOfAddress(walletAddress);
     }
     async getWalletAddress(address, contractAddress) {
-        const addressResult = await this.tonClient.runMethod(contractAddress, 'get_wallet_address', [
-            { cell: (0, ton_1.beginCell)().storeAddress(address).endCell(), type: 'slice' }
-        ]);
+        const addressResult = await this.tonClient.runMethod(contractAddress, 'get_wallet_address', [{ cell: (0, ton_1.beginCell)().storeAddress(address).endCell(), type: 'slice' }]);
         return addressResult.stack.readAddress();
     }
     async checkEnoughTokenBalance(token, walletAddress, amount = token.tokenAmount) {
@@ -53,10 +51,12 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         return balance.gte(amount);
     }
     async getBalance(walletAddress, tokenAddress) {
-        const isNative = !tokenAddress || web3_pure_1.Web3Pure.isNativeAddress(core_1.BLOCKCHAIN_NAME.TON, tokenAddress);
+        const isNative = !tokenAddress ||
+            web3_pure_1.Web3Pure.isNativeAddress(core_1.BLOCKCHAIN_NAME.TON, tokenAddress);
         const tokenBalance = isNative
             ? (await this.tonApi.fetchAccountInfo(walletAddress)).balance
-            : (await this.tonApi.fetchTokenInfoForWallet(walletAddress, tokenAddress)).balance;
+            : (await this.tonApi.fetchTokenInfoForWallet(walletAddress, tokenAddress))
+                .balance;
         return new bignumber_js_1.default(tokenBalance || 0);
     }
     getTransferEncodedConfig(tokenAddress, walletAddress, receiver, amount) {
@@ -69,7 +69,7 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         const transferAmount = BigInt(amount);
         const encodeConfig = {
             address: receiver,
-            amount: transferAmount.toString()
+            amount: transferAmount.toString(),
         };
         return encodeConfig;
     }
@@ -92,7 +92,7 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         const encodeConfig = {
             address: jettonWalletAddress.toRawString(),
             amount: (0, ton_1.toNano)('0.05').toString(),
-            payload: body.toBoc().toString('base64')
+            payload: body.toBoc().toString('base64'),
         };
         return encodeConfig;
     }

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

@@ -1,16 +1,15 @@
 import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from './abstract-adapter';
-import { ContractMulticallResponse, MethodData, TronWeb3PrimitiveType } from "@cryptorubic/tron-types";
+import { ContractMulticallResponse, MethodData, TronWeb3PrimitiveType } from '@cryptorubic/tron-types';
 import { TronWeb } from 'tronweb';
-import { AbiFragment } from "tronweb/lib/commonjs/types";
-import { ICustomLogger, PriceTokenAmount, Token, TokenAmount, TronBlockchainName } from "@cryptorubic/core";
-import { TronTransactionConfig } from "../../utils/models/tron-transaction-config";
-import { TronParameters } from "../../utils/models/tron-parameters";
-import { Abi } from "viem";
-import { ApproveAdapter } from "./models/approve-adapter";
-import { AllowanceInfo } from "./models/common-types";
-import { EvmTransactionConfig } from "../../utils/models/evm-transaction-config";
-export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> implements ApproveAdapter {
+import { AbiFragment } from 'tronweb/lib/commonjs/types';
+import { ICustomLogger, PriceTokenAmount, Token, TokenAmount, TronBlockchainName } from '@cryptorubic/core';
+import { TronTransactionConfig } from '../../utils/models/tron-transaction-config';
+import { TronParameters } from '../../utils/models/tron-parameters';
+import { Abi } from 'viem';
+import { ApproveAdapter } from './models/approve-adapter';
+import { AllowanceInfo } from './models/common-types';
+export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> implements ApproveAdapter<TronTransactionConfig> {
     private readonly multicallAddress;
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     constructor(rpcList: string[], logger?: ICustomLogger);
@@ -19,18 +18,18 @@ export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronB
         methodsData: MethodData[];
     }[]): Promise<ContractMulticallResponse<Output>[][]>;
     private multicall;
-    callContractMethod<T extends TronWeb3PrimitiveType = string>(contractAddress: string, contractAbi: readonly AbiFragment[], methodName: string, methodArguments?: unknown[]): Promise<T>;
+    read<T>(contractAddress: string, contractAbi: readonly AbiFragment[], methodName: string, methodArguments?: unknown[]): Promise<T>;
     private multicallContractsMethodsByOne;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token[]>;
     getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     getTokenBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
     convertTronAddressToHex(address: string): Promise<string>;
-    read<T>(): Promise<T>;
-    write(): Promise<string>;
     static encodeMethodCall(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments: TronParameters, callValue?: string, feeLimit?: number): TronTransactionConfig;
     private static flattenTypesToString;
     needApprove(from: TokenAmount | PriceTokenAmount, walletAddress: string, spender: string): Promise<boolean>;
-    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
+    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): TronTransactionConfig;
     getAllowance(fromTokenAddress: string, walletAddress: string, spender: string): Promise<AllowanceInfo>;
+    write(contractAddress: string, methodSignature: string, parameters: TronParameters): Promise<string>;
+    approve(fromAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
 }

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

@@ -23,7 +23,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         const calls = contractsData.map(({ contractAddress, methodsData }) => {
             return methodsData.map(({ methodName, methodArguments }) => [
                 contractAddress,
-                tron_web3_pure_1.TronWeb3Pure.encodeFunctionCall(contractAbi, methodName, methodArguments)
+                tron_web3_pure_1.TronWeb3Pure.encodeFunctionCall(contractAbi, methodName, methodArguments),
             ]);
         });
         try {
@@ -33,11 +33,16 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
                 const success = outputs.results[outputIndex];
                 const returnData = outputs.returnData[outputIndex];
                 outputIndex++;
+                const methodOutputAbi = contractAbi.find(
                 // @ts-ignore
-                const methodOutputAbi = contractAbi.find((funcSignature) => funcSignature.name === methodData.methodName).outputs;
+                (funcSignature) => funcSignature.name === methodData.methodName
+                // @ts-ignore
+                ).outputs;
                 return {
-                    output: success ? tron_web3_pure_1.TronWeb3Pure.decodeMethodOutput(methodOutputAbi, returnData) : null,
-                    success
+                    output: success
+                        ? tron_web3_pure_1.TronWeb3Pure.decodeMethodOutput(methodOutputAbi, returnData)
+                        : null,
+                    success,
                 };
             }));
         }
@@ -51,7 +56,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         // @ts-ignore
         return contract.aggregateViewCalls(calls).call();
     }
-    async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = []) {
+    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();
@@ -61,16 +66,16 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         return Promise.all(contractsData.map((contractData) => {
             return Promise.all(contractData.methodsData.map(async (methodData) => {
                 try {
-                    const output = (await this.callContractMethod(contractData.contractAddress, contractAbi, methodData.methodName, methodData.methodArguments));
+                    const output = (await this.read(contractData.contractAddress, contractAbi, methodData.methodName, methodData.methodArguments));
                     return {
                         output,
-                        success: true
+                        success: true,
                     };
                 }
                 catch {
                     return {
                         output: null,
-                        success: false
+                        success: false,
                     };
                 }
             }));
@@ -88,9 +93,9 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             methodsData: [
                 {
                     methodArguments: [userAddress],
-                    methodName: 'balanceOf'
-                }
-            ]
+                    methodName: 'balanceOf',
+                },
+            ],
         })));
         const results = await Promise.all(promises);
         const tokensBalances = results[0].map((tokenResults) => {
@@ -110,10 +115,12 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             contractAddress,
             methodsData: tokenFields.map((methodName) => ({
                 methodArguments: [],
-                methodName
-            }))
+                methodName,
+            })),
         }));
-        const results = contractsData.length ? await this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, contractsData) : [];
+        const results = contractsData.length
+            ? await this.multicallContractsMethods(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, contractsData)
+            : [];
         const tokens = results.map((tokenFieldsResults, tokenIndex) => {
             const tokenAddress = tokenAddresses[tokenIndex];
             const possibleToken = tokenFieldsResults.reduce((acc, field, fieldIndex) => {
@@ -122,7 +129,9 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
                 }
                 return {
                     ...acc,
-                    [tokenFields[fieldIndex]]: field.success ? field.output : undefined
+                    [tokenFields[fieldIndex]]: field.success
+                        ? field.output
+                        : undefined,
                 };
             }, {});
             return new core_1.Token({
@@ -130,7 +139,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
                 blockchain: core_1.BLOCKCHAIN_NAME.TRON,
                 decimals: Number(possibleToken?.decimals),
                 name: possibleToken?.name,
-                symbol: possibleToken?.symbol
+                symbol: possibleToken?.symbol,
             });
         });
         if (nativeTokenIndex === -1) {
@@ -142,7 +151,8 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async getBalance(userAddress, tokenAddress) {
         let balance;
-        if (tokenAddress && !web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.TRON, tokenAddress)) {
+        if (tokenAddress &&
+            !web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.TRON, tokenAddress)) {
             balance = await this.getTokenBalance(userAddress, tokenAddress);
         }
         else {
@@ -154,21 +164,15 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     async getTokenBalance(userAddress, tokenAddress) {
         this.public.setAddress(userAddress);
         const contract = await this.public.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, tokenAddress);
-        // @ts-ignore
-        const balance = await contract.balanceOf(userAddress).call();
+        const balance = await contract
+            // @ts-ignore
+            .balanceOf(userAddress)
+            .call();
         return new bignumber_js_1.default(balance?.toString());
     }
     async convertTronAddressToHex(address) {
         return this.public.address.toHex(address);
     }
-    read() {
-        throw new Error('Method is not implemented');
-    }
-    ;
-    write() {
-        throw new Error('Method is not implemented');
-    }
-    ;
     static encodeMethodCall(contractAddress, contractAbi, methodName, methodArguments, callValue, feeLimit) {
         const methodAbi = contractAbi.find((abiItem) => abiItem.type === 'function' && abiItem.name === methodName);
         if (!methodAbi) {
@@ -180,14 +184,15 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
             signature,
             to: contractAddress,
             ...(callValue && { callValue }),
-            ...(feeLimit && { feeLimit })
+            ...(feeLimit && { feeLimit }),
         };
     }
     static flattenTypesToString(abiInputs) {
         return (abiInputs?.map((abiInput) => {
             if (abiInput.type === 'tuple' || abiInput.type.includes('tuple')) {
+                const flattenedComponents = this.flattenTypesToString(
                 //@ts-ignore
-                const flattenedComponents = this.flattenTypesToString(abiInput.components);
+                abiInput.components);
                 return `(${flattenedComponents.join(',')})`;
             }
             return abiInput.type;
@@ -201,22 +206,32 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     encodeApprove(tokenAddress, spenderAddress, amount) {
         const amountWei = amount ?? new bignumber_js_1.default(2).pow(256).minus(1).toFixed();
-        const callData = tron_web3_pure_1.TronWeb3Pure.encodeFunctionCall(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'approve', [spenderAddress, amountWei]);
-        return {
-            data: callData,
-            to: tokenAddress,
-            value: '0'
-        };
+        return tron_web3_pure_1.TronWeb3Pure.encodeMethodCall(tokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'approve', [
+            { type: 'address', value: spenderAddress },
+            { type: 'uint256', value: amountWei },
+        ]);
     }
     async getAllowance(fromTokenAddress, walletAddress, spender) {
-        const [contract, decimals] = await Promise.all([
+        const [contract, decimals, allowance] = await Promise.all([
             this.public.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, fromTokenAddress),
-            this.callContractMethod(fromTokenAddress, trc_20_contract_abi_1.TRC20_CONTRACT_ABI, 'decimals')
+            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 allowance = await this.getAllowance(fromTokenAddress, walletAddress, spender);
-        const allowanceWeiBN = new bignumber_js_1.default(allowance?.toString());
+        const allowanceWeiBN = new bignumber_js_1.default(allowance);
         const allowanceNonWei = core_1.Token.fromWei(allowanceWeiBN, Number(decimals));
         return { allowanceNonWei, allowanceWei: allowanceWeiBN };
     }
+    async write(contractAddress, methodSignature, parameters) {
+        const transaction = await this.wallet.transactionBuilder.triggerSmartContract(contractAddress, methodSignature, {}, parameters, this.walletAddress);
+        const signedTransaction = await this.wallet.trx.sign(transaction.transaction);
+        const receipt = await this.wallet.trx.sendRawTransaction(signedTransaction);
+        return receipt.transaction.txID;
+    }
+    async approve(fromAddress, tokenAddress, spenderAddress, amount) {
+        const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
+        return this.write(config.to, config.signature, config.arguments);
+    }
 }
 exports.TronAdapter = TronAdapter;

package/src/lib/adapter/adapters/utils/ton-api.service.d.ts

@@ -1,8 +1,8 @@
 import { TonApiAccountInfoResp, TonApiAllNonNullableTokenInfoForWalletResp, TonApiParseAddressResp, TonApiTokenInfoForWalletResp, TonApiTokenInfoResp, TonApiTxDataByBocResp } from '../models/tonapi-models';
 import { TonCenterBlockInfo } from '../models/toncenter-types';
-import { HttpClient } from "@cryptorubic/core";
-import { TonApiConfig } from "../models/ton-api-config";
-import { Web3PrimitiveType } from "../../../utils/models/primitive-types";
+import { HttpClient } from '@cryptorubic/core';
+import { TonApiConfig } from '../models/ton-api-config';
+import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 export declare class TonApiService {
     private readonly httpClient;
     private readonly tonApiUrl;

package/src/lib/adapter/adapters/utils/ton-api.service.js

@@ -6,7 +6,8 @@ class TonApiService {
         this.httpClient = httpClient;
         this.apiKey = params.tonApiKey;
         this.tonApiUrl = params?.tonApiUrl || 'https://tonapi.io';
-        this.tonCenterV3Url = params.tonCenterV3Url || 'https://toncenter.com/api/v3';
+        this.tonCenterV3Url =
+            params.tonCenterV3Url || 'https://toncenter.com/api/v3';
     }
     /**
      * @param walletAddress in any format: raw or friendly
@@ -97,8 +98,8 @@ class TonApiService {
             params: {
                 limit: 1,
                 offset: 0,
-                sort: 'desc'
-            }
+                sort: 'desc',
+            },
         });
         if ('detail' in res) {
             throw new Error(`[TonApiService] Error in fetchWalletSeqno - ${res.detail[0]?.msg}`);

package/src/lib/adapter/blockchain-adapter-factory.service.d.ts

@@ -1,10 +1,11 @@
 import { SolanaAdapter } from './adapters/solana-adapter';
 import { TronAdapter } from './adapters/tron-adapter';
 import { AbstractAdapter } from './adapters/abstract-adapter';
-import { WalletProvider } from "./constants/models/wallet-provider";
-import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, HttpClient } from "@cryptorubic/core";
-import { TonAdapterConfig } from "./adapters/models/ton-adapter-config";
-import { EvmAdapter } from "./adapters/evm-adapter";
+import { WalletProvider } from './constants/models/wallet-provider';
+import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, HttpClient, TonBlockchainName } from '@cryptorubic/core';
+import { TonAdapter } from './adapters/ton-adapter';
+import { TonAdapterConfig } from './adapters/models/ton-adapter-config';
+import { EvmAdapter } from './adapters/evm-adapter';
 export declare class BlockchainAdapterFactoryService {
     private readonly rpcList;
     private readonly createLogger?;
@@ -17,6 +18,7 @@ export declare class BlockchainAdapterFactoryService {
     getAdapter(blockchain: SolanaBlockchainName): SolanaAdapter;
     getAdapter(blockchain: EvmBlockchainName): EvmAdapter;
     getAdapter(blockchain: TronBlockchainName): TronAdapter;
+    getAdapter(blockchain: TonBlockchainName): TonAdapter;
     private createStorage;
     private createAdapter;
     connectWallet(walletProvider: WalletProvider): void;

package/src/lib/adapter/blockchain-adapter-factory.service.js

@@ -23,7 +23,7 @@ class BlockchainAdapterFactoryService {
     static async createFactory(rpcList, httpClient, tonParams, createLogger) {
         // @TODO Add default logger
         const loggerFn = createLogger || undefined;
-        const resolvedHttpClient = httpClient ?? await Promise.resolve().then(() => require('axios'));
+        const resolvedHttpClient = httpClient ?? (await Promise.resolve().then(() => require('axios')));
         return new this(rpcList, createLogger, resolvedHttpClient, tonParams);
     }
     getAdapter(blockchain) {
@@ -35,8 +35,7 @@ class BlockchainAdapterFactoryService {
         return adapter;
     }
     createStorage() {
-        const adapters = Object.entries(this.rpcList)
-            .map(([blockchain, rpcs]) => {
+        const adapters = Object.entries(this.rpcList).map(([blockchain, rpcs]) => {
             const adapter = this.createAdapter(blockchain, rpcs || []);
             return [blockchain, adapter || null];
             if (adapter) {
@@ -47,10 +46,14 @@ class BlockchainAdapterFactoryService {
             return [blockchain, null];
         });
         const tonAdapter = this.createAdapter(core_1.BLOCKCHAIN_NAME.TON, []);
-        adapters.push(tonAdapter ? [core_1.BLOCKCHAIN_NAME.TON, tonAdapter] : [core_1.BLOCKCHAIN_NAME.TON, null]);
+        adapters.push(tonAdapter
+            ? [core_1.BLOCKCHAIN_NAME.TON, tonAdapter]
+            : [core_1.BLOCKCHAIN_NAME.TON, null]);
         const activeAdapters = adapters.filter(([blockchain, adapter]) => {
             const adapterExists = Boolean(adapter);
-            const message = adapterExists ? `Creating adapter for ${blockchain} blockchain` : `Failed to create adapter for ${blockchain} blockchain`;
+            const message = adapterExists
+                ? `Creating adapter for ${blockchain} blockchain`
+                : `Failed to create adapter for ${blockchain} blockchain`;
             this.logger?.customLog(message);
             return adapterExists;
         });
@@ -65,7 +68,7 @@ class BlockchainAdapterFactoryService {
                 if (viem_blockchain_mapping_1.viemBlockchainMapping?.[blockchain]) {
                     return new evm_adapter_1.EvmAdapter({
                         blockchain: blockchain,
-                        rpcList: rpcs
+                        rpcList: rpcs,
                     }, this.createLogger?.(`EVM_ADAPTER_${blockchain}`));
                 }
             }
@@ -76,11 +79,12 @@ class BlockchainAdapterFactoryService {
                 return new solana_adapter_1.SolanaAdapter(rpcs, this.createLogger?.(`SOLANA_ADAPTER`));
             }
         }
-        if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.httpClient && this.tonParams?.tonApiConfig && this.tonParams?.tonClientConfig) {
+        if (blockchain === core_1.BLOCKCHAIN_NAME.TON &&
+            this.httpClient &&
+            this.tonParams?.tonApiConfig &&
+            this.tonParams?.tonClientConfig) {
             return new ton_adapter_1.TonAdapter(this.httpClient, this.tonParams, this.createLogger?.(`TON_ADAPTER`));
         }
-        else {
-        }
         return null;
     }
     connectWallet(walletProvider) {
@@ -90,21 +94,28 @@ class BlockchainAdapterFactoryService {
                 const chain = viem_blockchain_mapping_1.viemBlockchainMapping[blockchain];
                 adapter.wallet = (0, viem_1.createWalletClient)({
                     chain: chain,
-                    transport: (0, viem_1.custom)(provider)
+                    transport: (0, viem_1.custom)(provider),
                 });
+                adapter.walletAddress = walletProvider[core_1.CHAIN_TYPE.EVM].address;
             });
         }
-        if (walletProvider?.[core_1.CHAIN_TYPE.SOLANA]?.core && this.adapterStore?.[core_1.BLOCKCHAIN_NAME.SOLANA]) {
+        if (walletProvider?.[core_1.CHAIN_TYPE.SOLANA]?.core &&
+            this.adapterStore?.[core_1.BLOCKCHAIN_NAME.SOLANA]) {
             const store = this.adapterStore[core_1.BLOCKCHAIN_NAME.SOLANA];
             store.wallet = walletProvider[core_1.CHAIN_TYPE.SOLANA].core;
+            store.walletAddress = walletProvider[core_1.CHAIN_TYPE.SOLANA].address;
         }
-        if (walletProvider?.[core_1.CHAIN_TYPE.TRON]?.core && this.adapterStore?.[core_1.BLOCKCHAIN_NAME.TRON]) {
+        if (walletProvider?.[core_1.CHAIN_TYPE.TRON]?.core &&
+            this.adapterStore?.[core_1.BLOCKCHAIN_NAME.TRON]) {
             const store = this.adapterStore[core_1.BLOCKCHAIN_NAME.TRON];
             store.wallet = walletProvider[core_1.CHAIN_TYPE.TRON].core;
+            store.walletAddress = walletProvider[core_1.CHAIN_TYPE.TRON].address;
         }
-        if (walletProvider?.[core_1.CHAIN_TYPE.TON]?.core && this.adapterStore?.[core_1.BLOCKCHAIN_NAME.TON]) {
+        if (walletProvider?.[core_1.CHAIN_TYPE.TON]?.core &&
+            this.adapterStore?.[core_1.BLOCKCHAIN_NAME.TON]) {
             const store = this.adapterStore[core_1.BLOCKCHAIN_NAME.TON];
             store.wallet = walletProvider[core_1.CHAIN_TYPE.TON].core;
+            store.walletAddress = walletProvider[core_1.CHAIN_TYPE.TON].address;
         }
     }
 }

package/src/lib/adapter/constants/chain-configs/chain-configs.d.ts

@@ -1,3 +1,3 @@
 import { ViemChain } from '../models/viem-chain-type';
-import { EvmBlockchainName } from "@cryptorubic/core";
+import { EvmBlockchainName } from '@cryptorubic/core';
 export declare const viemConfig: Partial<Record<EvmBlockchainName, ViemChain>>;