@cryptorubic/web3 1.0.0-alpha.no-sdk.27 → 1.0.0-alpha.no-sdk.29

package/package.json

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

package/src/index.d.ts

@@ -19,7 +19,6 @@ export * from './lib/adapter/adapters/adapter-sui/sui-adapter';
 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/signer/tron-adapter-signer';
 export * from './lib/adapter/adapters/adapter-tron/models/tron-send-tx-params';

package/src/index.js

@@ -22,7 +22,6 @@ tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-sui/sui-adapter"),
 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/signer/tron-adapter-signer"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-tron/models/tron-send-tx-params"), exports);

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

@@ -9,6 +9,7 @@ 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';
+import { TxStatus } from '../models/web3-public-models/tx-status';
 export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet, BitcoinBlockchainName> {
     private readonly httpClient;
     readonly signer: BitcoinAdapterSigner;
@@ -16,6 +17,7 @@ export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(args: unknown): Promise<T>;
+    getTransactionStatus(txHash: string): Promise<TxStatus>;
     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

@@ -5,6 +5,7 @@ const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
 const abstract_adapter_1 = require("../common/abstract-adapter");
 const bitcoin_adapter_signer_1 = require("./signer/bitcoin-adapter-signer");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     get public() {
         throw new Error('public property is not set in BitcoinAdapter.');
@@ -20,6 +21,11 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     read(args) {
         throw new Error('Not implemented');
     }
+    async getTransactionStatus(txHash) {
+        const url = `https://api.blockcypher.com/v1/btc/main/txs/${txHash}`;
+        const { confirmations } = await this.httpClient.get(url);
+        return confirmations > 0 ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.PENDING;
+    }
     async getBalance(userAddress, _tokenAddress) {
         const url = `https://api.blockcypher.com/v1/btc/main/addrs/${userAddress}/balance`;
         const response = await this.httpClient.get(url);

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

@@ -3,15 +3,15 @@ import { ClientAdaptersFactoryParams } from '../../../models/create-factory-para
 import { BitconSendTxParams } from '../models/btc-send-tx-params';
 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 BitcoinAdapterSigner extends AbstractAdapterSigner<BtcWallet, BitconSendTxParams, string> {
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write(args: unknown): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
-    getTransactionStatus(txHash: string): Promise<TxStatus>;
     sendTransaction(params: BitconSendTxParams): Promise<string>;
     private transfer;
     private sendPsbtTransaction;
     private getSrcStatusRecursive;
     private isPsbtConfig;
+    private getTransactionStatus;
+    private getSrcTxStatus;
 }

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

@@ -15,11 +15,6 @@ class BitcoinAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSign
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.BITCOIN);
     }
-    async getTransactionStatus(txHash) {
-        const url = `https://api.blockcypher.com/v1/btc/main/txs/${txHash}`;
-        const { confirmations } = await this.httpClient.get(url);
-        return confirmations > 0 ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.PENDING;
-    }
     async sendTransaction(params) {
         if (this.isPsbtConfig(params.txOptions)) {
             return this.sendPsbtTransaction(params.txOptions);
@@ -118,5 +113,24 @@ class BitcoinAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSign
     isPsbtConfig(txConfig) {
         return 'psbt' in txConfig;
     }
+    async getTransactionStatus(txHash) {
+        const url = `https://api.blockcypher.com/v1/btc/main/txs/${txHash}`;
+        const { confirmations } = await this.httpClient.get(url);
+        return confirmations > 0 ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.PENDING;
+    }
+    async getSrcTxStatus(blockchain, srcTxHash) {
+        try {
+            const status = await this.getTransactionStatus(srcTxHash);
+            if (status === tx_status_1.TX_STATUS.FAIL && blockchain === core_1.BLOCKCHAIN_NAME.ZK_SYNC) {
+                const zkSyncAwarenessTime = 4000;
+                await (0, waitFor_1.waitFor)(zkSyncAwarenessTime);
+                return this.getTransactionStatus(srcTxHash);
+            }
+            return status;
+        }
+        catch {
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+    }
 }
 exports.BitcoinAdapterSigner = BitcoinAdapterSigner;

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

@@ -13,6 +13,7 @@ import { GasPrice } from '../models/evm-web3-public-models/gas-price';
 import { EvmTransactionOptions } from './models/evm-send-tx-params';
 import { ApprovableAdapter } from '../models/approve-adapter';
 import { AllowanceInfo } from '../models/common-types';
+import { TxStatus } from '../models/web3-public-models/tx-status';
 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>;
@@ -24,6 +25,12 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
         gasPrice?: string;
         gas?: string;
     }): Promise<T>;
+    getTransactionStatus(hash: string): Promise<TxStatus>;
+    /**
+     * Gets mined transaction receipt.
+     * @param hash Transaction hash
+     */
+    private getTransactionReceipt;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(contractAbi: Abi, contractsData: {
         contractAddress: string;

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

@@ -14,6 +14,7 @@ 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");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction(token, contractAddress, walletAddress, amount) {
         return this.needApprove(token, contractAddress, walletAddress, amount);
@@ -42,6 +43,23 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             ...(options.from && { account: options.from })
         });
     }
+    async getTransactionStatus(hash) {
+        const txReceipt = await this.getTransactionReceipt(hash);
+        if (txReceipt === null) {
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+        if (txReceipt.status) {
+            return tx_status_1.TX_STATUS.SUCCESS;
+        }
+        return tx_status_1.TX_STATUS.FAIL;
+    }
+    /**
+     * Gets mined transaction receipt.
+     * @param hash Transaction hash
+     */
+    async getTransactionReceipt(hash) {
+        return this.public.getTransactionReceipt({ hash: hash });
+    }
     async getTokensBalances(userAddress, tokensAddresses) {
         const indexOfNativeCoin = tokensAddresses.findIndex((tokenAddress) => web3_pure_1.Web3Pure.isNativeAddress('ETH', tokenAddress));
         const promises = [];

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

@@ -4,17 +4,10 @@ import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-sign
 import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
 import { Web3Error } from '../utils/parse-evm-error';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 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>;
-    getTransactionStatus(hash: string): Promise<TxStatus>;
-    /**
-     * Gets mined transaction receipt.
-     * @param hash Transaction hash
-     */
-    private getTransactionReceipt;
     /**
      * Sends Eth in transaction and resolve the promise when the transaction is included in the block.
      * @param toAddress Eth receiver address.

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

@@ -9,7 +9,6 @@ const options_1 = require("../../utils/options");
 const viem_blockchain_mapping_1 = require("../../../constants/viem-blockchain-mapping");
 const parse_evm_error_1 = require("../utils/parse-evm-error");
 const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
 class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(evmPublic, httpClient, logger, clientParams) {
@@ -20,23 +19,6 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
         const userChainId = await this.wallet.getChainId();
         return core_1.BlockchainsInfo.getBlockchainNameById(userChainId);
     }
-    async getTransactionStatus(hash) {
-        const txReceipt = await this.getTransactionReceipt(hash);
-        if (txReceipt === null) {
-            return tx_status_1.TX_STATUS.PENDING;
-        }
-        if (txReceipt.status) {
-            return tx_status_1.TX_STATUS.SUCCESS;
-        }
-        return tx_status_1.TX_STATUS.FAIL;
-    }
-    /**
-     * Gets mined transaction receipt.
-     * @param hash Transaction hash
-     */
-    async getTransactionReceipt(hash) {
-        return this.evmPublic.getTransactionReceipt({ hash: hash });
-    }
     /**
      * Sends Eth in transaction and resolve the promise when the transaction is included in the block.
      * @param toAddress Eth receiver address.

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

@@ -4,13 +4,11 @@ import { ClientAdaptersFactoryParams } from '../../../models/create-factory-para
 import { SolanaSendTxParams } from '../models/solana-send-tx-params';
 import { Connection } from '@solana/web3.js';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 export declare class SolanaAdapterSigner extends AbstractAdapterSigner<SolanaWeb3, SolanaSendTxParams, string> {
     private readonly connection;
     constructor(connection: Connection, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
-    getTransactionStatus(txHash: string): Promise<TxStatus>;
     sendTransaction(params: SolanaSendTxParams): Promise<string>;
     private waitForTxConfirmation;
 }

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

@@ -8,7 +8,6 @@ const js_base64_1 = require("js-base64");
 const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
 const errors_1 = require("../../utils/errors");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
 class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(connection, httpClient, logger, clientParams) {
@@ -21,23 +20,6 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.SOLANA);
     }
-    async getTransactionStatus(txHash) {
-        try {
-            const transaction = await this.connection.getTransaction(txHash, {
-                maxSupportedTransactionVersion: 1
-            });
-            if (transaction?.meta?.err) {
-                return tx_status_1.TX_STATUS.FAIL;
-            }
-            if (transaction?.blockTime) {
-                return tx_status_1.TX_STATUS.SUCCESS;
-            }
-            return tx_status_1.TX_STATUS.PENDING;
-        }
-        catch {
-            return tx_status_1.TX_STATUS.PENDING;
-        }
-    }
     async sendTransaction(params) {
         try {
             const decodedData = js_base64_1.Base64.toUint8Array(params.txOptions.data);

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

@@ -8,13 +8,14 @@ import { SolanaWeb3 } from '../../constants/models/solana-web3';
 import { SolanaAdapterSigner } from './signer/solana-adapter-signer';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
-export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
+import { TxStatus } from '../models/web3-public-models/tx-status';
 export declare class SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb3, SolanaBlockchainName> {
     private readonly httpClient;
     readonly signer: SolanaAdapterSigner;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(): Promise<T>;
+    getTransactionStatus(txHash: string): Promise<TxStatus>;
     /**
      * Gets balance of multiple tokens.
      * @param address Wallet address.

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaAdapter = exports.NATIVE_SOLANA_MINT_ADDRESS = void 0;
+exports.SolanaAdapter = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 const core_1 = require("@cryptorubic/core");
@@ -11,7 +11,7 @@ const abstract_adapter_1 = require("../common/abstract-adapter");
 const web3_pure_1 = require("../../../utils/web3-pure");
 const solana_tokens_service_1 = require("./services/solana-tokens-service");
 const solana_adapter_signer_1 = require("./signer/solana-adapter-signer");
-exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
@@ -25,6 +25,23 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     async read() {
         throw new Error('Method read is not supported');
     }
+    async getTransactionStatus(txHash) {
+        try {
+            const transaction = await this.public.getTransaction(txHash, {
+                maxSupportedTransactionVersion: 1
+            });
+            if (transaction?.meta?.err) {
+                return tx_status_1.TX_STATUS.FAIL;
+            }
+            if (transaction?.blockTime) {
+                return tx_status_1.TX_STATUS.SUCCESS;
+            }
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+        catch {
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+    }
     /**
      * Gets balance of multiple tokens.
      * @param address Wallet address.
@@ -38,7 +55,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         }));
         const nativeSolBalance = await this.public.getBalanceAndContext(new web3_js_1.PublicKey(address), 'confirmed');
         return tokensAddresses.map((tokenAddress) => {
-            if (tokenAddress === exports.NATIVE_SOLANA_MINT_ADDRESS) {
+            if (tokenAddress === web3_pure_1.Web3Pure.getNativeTokenAddress(core_1.BLOCKCHAIN_NAME.SOLANA)) {
                 return new bignumber_js_1.default(nativeSolBalance.value.toString());
             }
             const tokenWithBalance = tokenInfo.get(tokenAddress);

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

@@ -3,14 +3,12 @@ import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-sign
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { SuiSendTxParams } from '../models/sui-send-tx-params';
 import { WalletAdapter } from '@suiet/wallet-sdk';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { ExecuteTransactionBlockParams, SuiClient, SuiTransactionBlockResponse } from '@mysten/sui/dist/cjs/client';
 export declare class SuiAdapterSigner extends AbstractAdapterSigner<WalletAdapter, SuiSendTxParams, string> {
     private readonly suiClient;
     constructor(suiClient: SuiClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
-    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     sendTransaction(params: SuiSendTxParams): Promise<string>;
     executeTxBlock(params: ExecuteTransactionBlockParams): Promise<SuiTransactionBlockResponse>;
 }

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

@@ -5,7 +5,6 @@ const core_1 = require("@cryptorubic/core");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
 const parse_evm_error_1 = require("../../adapter-evm/utils/parse-evm-error");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
 class SuiAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(suiClient, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
@@ -17,19 +16,6 @@ class SuiAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.SUI);
     }
-    async getTransactionStatus(srcTxHash) {
-        try {
-            const txDetails = await this.suiClient.getTransactionBlock({ digest: srcTxHash });
-            const status = txDetails?.effects?.status.status;
-            if (!status) {
-                return tx_status_1.TX_STATUS.PENDING;
-            }
-            return status === 'success' ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.FAIL;
-        }
-        catch {
-            return tx_status_1.TX_STATUS.PENDING;
-        }
-    }
     async sendTransaction(params) {
         try {
             const account = this.wallet.accounts[0];

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

@@ -8,11 +8,13 @@ import { SuiAdapterSigner } from './signer/sui-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 { TxStatus } from '../models/web3-public-models/tx-status';
 export declare class SuiAdapter extends AbstractAdapter<SuiClient, WalletAdapter, SuiBlockchainName> {
     readonly signer: SuiAdapterSigner;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(): Promise<T>;
+    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(): Promise<ContractMulticallResponse<Output>[][]>;
     getBlockNumber(): Promise<number | {

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

@@ -7,6 +7,7 @@ const bignumber_js_1 = require("bignumber.js");
 const abstract_adapter_1 = require("../common/abstract-adapter");
 const web3_pure_1 = require("../../../utils/web3-pure");
 const sui_adapter_signer_1 = require("./signer/sui-adapter-signer");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class SuiAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.SUI, logger);
@@ -19,6 +20,19 @@ class SuiAdapter extends abstract_adapter_1.AbstractAdapter {
     async read() {
         throw new Error('Method read is not supported');
     }
+    async getTransactionStatus(srcTxHash) {
+        try {
+            const txDetails = await this.public.getTransactionBlock({ digest: srcTxHash });
+            const status = txDetails?.effects?.status.status;
+            if (!status) {
+                return tx_status_1.TX_STATUS.PENDING;
+            }
+            return status === 'success' ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.FAIL;
+        }
+        catch {
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+    }
     async getTokensBalances(userAddress, tokensAddresses) {
         const allUserTokens = await this.public.getAllBalances({ owner: userAddress });
         return tokensAddresses.map((address) => {

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

@@ -1,7 +1,6 @@
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { TonSendTxParams } from '../models/ton-send-tx-params';
 import { TonConnectUI } from '@tonconnect/ui';
 import { BasicSendTransactionOptions } from '../../models/basic-transaction-options';
@@ -15,7 +14,6 @@ export declare class TonAdapterSigner extends AbstractAdapterSigner<TonConnectUI
     constructor(tonApi: TonApiService, tonClient: TonClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
-    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     sendTransaction(params: TonSendTxParams): Promise<string>;
     private waitForTransactionReceipt;
     /**

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

@@ -4,7 +4,6 @@ exports.TonAdapterSigner = void 0;
 const core_1 = require("@cryptorubic/core");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const errors_1 = require("../../utils/errors");
 const core_2 = require("@ton/core");
@@ -21,13 +20,6 @@ class TonAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.TON);
     }
-    async getTransactionStatus(srcTxHash) {
-        const isCompleted = await this.tonApi.checkIsTxCompleted(srcTxHash);
-        if (isCompleted) {
-            return tx_status_1.TX_STATUS.SUCCESS;
-        }
-        return tx_status_1.TX_STATUS.PENDING;
-    }
     async sendTransaction(params) {
         try {
             const { boc } = await this.wallet.sendTransaction({

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

@@ -9,12 +9,14 @@ import { TonAdapterSigner } from './signer/ton-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 { TxStatus } from '../models/web3-public-models/tx-status';
 export declare class TonAdapter extends AbstractAdapter<TonClient, TonConnectUI, TonBlockchainName> {
     readonly signer: TonAdapterSigner;
     private readonly tonApi;
     constructor(httpClient: HttpClient, config: TonAdapterConfig, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     read<T>(): Promise<T>;
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
+    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(): Promise<ContractMulticallResponse<Output>[][]>;
     getBlockNumber(): Promise<number | {

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

@@ -8,6 +8,7 @@ const bignumber_js_1 = require("bignumber.js");
 const abstract_adapter_1 = require("../common/abstract-adapter");
 const web3_pure_1 = require("../../../utils/web3-pure");
 const ton_adapter_signer_1 = require("./signer/ton-adapter-signer");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class TonAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(httpClient, config, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.TON, logger);
@@ -21,6 +22,13 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
     async callContractMethod() {
         throw new Error('Method call is not supported');
     }
+    async getTransactionStatus(srcTxHash) {
+        const isCompleted = await this.tonApi.checkIsTxCompleted(srcTxHash);
+        if (isCompleted) {
+            return tx_status_1.TX_STATUS.SUCCESS;
+        }
+        return tx_status_1.TX_STATUS.PENDING;
+    }
     async getTokensBalances(userAddress, tokensAddresses) {
         const tokensWithBalance = await this.tonApi.fetchAllNonNullableTokensInfoForWallet(userAddress);
         const nativeIndex = tokensAddresses.findIndex((tokenAddress) => web3_pure_1.Web3Pure.isNativeAddress('TON', tokenAddress));

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

@@ -3,19 +3,12 @@ import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-sign
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { TronSendTxParams } from '../models/tron-send-tx-params';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { TronParameters } from '../../../../utils/models/tron-parameters';
 export declare class TronAdapterSigner extends AbstractAdapterSigner<TronWeb, TronSendTxParams, string> {
     private readonly tronWeb;
     constructor(tronWeb: TronWeb, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write(contractAddress: string, methodSignature: string, parameters: TronParameters): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
-    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
-    /**
-     * Gets mined transaction info.
-     * @param hash Transaction hash.
-     */
-    private getTransactionInfo;
     sendTransaction(params: TronSendTxParams): Promise<string>;
     trySendTransaction(params: TronSendTxParams): Promise<string>;
 }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TronAdapterSigner = void 0;
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const core_1 = require("@cryptorubic/core");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const parse_tron_error_1 = require("../utils/parse-tron-error");
 class TronAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(tronWeb, httpClient, logger, clientParams) {
@@ -19,23 +18,6 @@ class TronAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.TRON);
     }
-    async getTransactionStatus(srcTxHash) {
-        const txReceipt = await this.getTransactionInfo(srcTxHash);
-        if (txReceipt?.receipt) {
-            if (txReceipt.result === 'FAILED') {
-                return tx_status_1.TX_STATUS.FAIL;
-            }
-            return tx_status_1.TX_STATUS.SUCCESS;
-        }
-        return tx_status_1.TX_STATUS.PENDING;
-    }
-    /**
-     * Gets mined transaction info.
-     * @param hash Transaction hash.
-     */
-    async getTransactionInfo(hash) {
-        return this.tronWeb.trx.getTransactionInfo(hash);
-    }
     async sendTransaction(params) {
         try {
             const transaction = await this.tronWeb.transactionBuilder.triggerSmartContract(params.contractAddress, params.methodSignature, params.txOptions, params.parameters, this.walletAddress);

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

@@ -13,6 +13,7 @@ import { TronAdapterSigner } from './signer/tron-adapter-signer';
 import { TronTransactionOptions } from './models/tron-send-tx-params';
 import { AllowanceInfo } from '../models/common-types';
 import { ApprovableAdapter } from '../models/approve-adapter';
+import { TxStatus } from '../models/web3-public-models/tx-status';
 export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> implements ApprovableAdapter<TronTransactionConfig> {
     readonly signer: TronAdapterSigner;
     private readonly multicallAddress;
@@ -21,6 +22,12 @@ export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronB
         fullHost: string;
     })[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments?: unknown[]): Promise<T>;
+    getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
+    /**
+     * Gets mined transaction info.
+     * @param hash Transaction hash.
+     */
+    private getTransactionInfo;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends TronWeb3PrimitiveType>(contractAbi: any, contractsData: {
         contractAddress: string;

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

@@ -12,6 +12,7 @@ const tron_web3_pure_1 = require("../../../utils/web3-types/tron-web3-pure");
 const tron_adapter_signer_1 = require("./signer/tron-adapter-signer");
 const options_1 = require("../utils/options");
 const parse_tron_error_1 = require("./utils/parse-tron-error");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
 class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     async needPreswapAction() {
         return false;
@@ -29,6 +30,23 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         const response = await contract[methodName](...methodArguments).call();
         return tron_web3_pure_1.TronWeb3Pure.flattenParameterToPrimitive(response);
     }
+    async getTransactionStatus(srcTxHash) {
+        const txReceipt = await this.getTransactionInfo(srcTxHash);
+        if (txReceipt?.receipt) {
+            if (txReceipt.result === 'FAILED') {
+                return tx_status_1.TX_STATUS.FAIL;
+            }
+            return tx_status_1.TX_STATUS.SUCCESS;
+        }
+        return tx_status_1.TX_STATUS.PENDING;
+    }
+    /**
+     * Gets mined transaction info.
+     * @param hash Transaction hash.
+     */
+    async getTransactionInfo(hash) {
+        return this.public.trx.getTransactionInfo(hash);
+    }
     async getTokensBalances(userAddress, tokensAddresses) {
         const indexOfNativeCoin = tokensAddresses.findIndex((address) => web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.TRON, address));
         const promises = [];

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

@@ -5,6 +5,7 @@ import { AbstractAdapterSigner } from './signer/abstract-adapter-signer';
 import { MethodData } from '../models/web3-public-models/method-data';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
+import { TxStatus } from '../models/web3-public-models/tx-status';
 export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, SendTxParams extends object = {}, SendTxResponse = {}> {
     abstract signer: AbstractAdapterSigner<W, SendTxParams, SendTxResponse>;
     protected readonly logger?: ICustomLogger;
@@ -65,4 +66,6 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     handlePreswap(contractAddress: string, walletAddress: string, tokenAmount: TokenAmount): Promise<void>;
     static getRandomBytes(bytes: number): string;
     abstract read<T>(...args: unknown[]): Promise<T>;
+    abstract getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
+    getSrcTxStatus(blockchain: BlockchainName, srcTxHash: string): Promise<TxStatus>;
 }

package/src/lib/adapter/adapters/common/abstract-adapter.js

@@ -4,6 +4,8 @@ exports.AbstractAdapter = void 0;
 const viem_1 = require("viem");
 const core_1 = require("@cryptorubic/core");
 const insufficient_funds_error_1 = require("../../../errors/swap/insufficient-funds.error");
+const tx_status_1 = require("../models/web3-public-models/tx-status");
+const waitFor_1 = require("../utils/waitFor");
 class AbstractAdapter {
     set public(value) {
         this._public = value;
@@ -53,5 +55,19 @@ class AbstractAdapter {
         const randomBytes = crypto.getRandomValues(new Uint8Array(bytes));
         return (0, viem_1.bytesToHex)(randomBytes);
     }
+    async getSrcTxStatus(blockchain, srcTxHash) {
+        try {
+            const status = await this.getTransactionStatus(srcTxHash);
+            if (status === tx_status_1.TX_STATUS.FAIL && blockchain === core_1.BLOCKCHAIN_NAME.ZK_SYNC) {
+                const zkSyncAwarenessTime = 4000;
+                await (0, waitFor_1.waitFor)(zkSyncAwarenessTime);
+                return this.getTransactionStatus(srcTxHash);
+            }
+            return status;
+        }
+        catch {
+            return tx_status_1.TX_STATUS.PENDING;
+        }
+    }
 }
 exports.AbstractAdapter = AbstractAdapter;

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

@@ -1,6 +1,5 @@
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
-import { TxStatus } from '../../models/web3-public-models/tx-status';
 export declare abstract class AbstractAdapterSigner<ClientWallet, SendTxParams, SendTxResponse> {
     protected readonly httpClient: HttpClient;
     protected readonly logger?: ICustomLogger | undefined;
@@ -13,13 +12,11 @@ export declare abstract class AbstractAdapterSigner<ClientWallet, SendTxParams,
     constructor(httpClient: HttpClient, logger?: ICustomLogger | undefined, clientParams?: ClientAdaptersFactoryParams | undefined);
     abstract getBlockchainName(): Promise<BlockchainName | undefined>;
     abstract sendTransaction(params: SendTxParams): Promise<SendTxResponse>;
-    abstract getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     abstract write(...args: unknown[]): Promise<string>;
     /**
      * Checks, that selected blockchain in wallet is equal to passed blockchain.
      */
     checkBlockchainCorrect(blockchainName: BlockchainName): Promise<void | never>;
-    getSrcTxStatus(blockchain: BlockchainName, srcTxHash: string): Promise<TxStatus>;
     setWalletAddress(newWalletAddress: string): void;
     setWallet(wallet: ClientWallet): void;
 }

package/src/lib/adapter/adapters/common/signer/abstract-adapter-signer.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractAdapterSigner = void 0;
-const core_1 = require("@cryptorubic/core");
 const rubic_api_link_mapping_1 = require("../../../constants/rubic-api-link-mapping");
-const tx_status_1 = require("../../models/web3-public-models/tx-status");
-const waitFor_1 = require("../../utils/waitFor");
 const wrong_network_error_1 = require("../../../../errors/swap/wrong-network.error");
 class AbstractAdapterSigner {
     get apiUrl() {
@@ -35,20 +32,6 @@ class AbstractAdapterSigner {
             throw new wrong_network_error_1.WrongNetworkError(blockchainName);
         }
     }
-    async getSrcTxStatus(blockchain, srcTxHash) {
-        try {
-            const status = await this.getTransactionStatus(srcTxHash);
-            if (status === tx_status_1.TX_STATUS.FAIL && blockchain === core_1.BLOCKCHAIN_NAME.ZK_SYNC) {
-                const zkSyncAwarenessTime = 4000;
-                await (0, waitFor_1.waitFor)(zkSyncAwarenessTime);
-                return this.getTransactionStatus(srcTxHash);
-            }
-            return status;
-        }
-        catch {
-            return tx_status_1.TX_STATUS.PENDING;
-        }
-    }
     setWalletAddress(newWalletAddress) {
         this._walletAddress = newWalletAddress;
     }

package/src/lib/adapter/adapters/models/approve-adapter.js

@@ -2,48 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isApprovableAdapter = isApprovableAdapter;
 function isApprovableAdapter(adapter) {
-    return 'needApprove' in adapter && 'approve' in adapter && 'getAllowance' in adapter && 'encodeApprove' in adapter;
+    return 'needApprove' in adapter && 'approveTokens' in adapter && 'getAllowance' in adapter && 'encodeApprove' in adapter;
 }
-// export interface ApproveAdapterClient<T> extends AbstractAdapterSigner<{}, {}, {}> {
-//     /**
-//      * @param fromTokenAddress erc20 address of checked token
-//      * @param walletAddress owner wallet address
-//      * @param spenderAddress spender address
-//      * @return allowance wei amount
-//      */
-//     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): T;
-//     /**
-//      * Check if approve needed.
-//      * @param token
-//      * @param contractAddress
-//      * @param walletAddress
-//      * @param amount
-//      */
-//     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 receipt.
-//      */
-//     approveTokens(
-//         tokenAddress: string,
-//         spenderAddress: string,
-//         amount: BigNumber | 'infinity',
-//         options: BasicSendTransactionOptions
-//     ): Promise<string>;
-// }
-// export function isApprovableAdapterClient(
-//     adapterClient: AbstractAdapterSigner<{}, {}, {}>
-// ): adapterClient is ApproveAdapterClient<EvmTransactionConfig | TronTransactionConfig> {
-//     return 'needApprove' in adapterClient && 'approveTokens' in adapterClient && 'getAllowance' in adapterClient;
-// }

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

@@ -1,6 +0,0 @@
-import { TonClient } from '@ton/ton';
-export declare class TonClientInstance {
-    private static instance;
-    private constructor();
-    static getInstance(): TonClient;
-}

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

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TonClientInstance = void 0;
-const ton_1 = require("@ton/ton");
-class TonClientInstance {
-    constructor() { }
-    static getInstance() {
-        if (!this.instance) {
-            this.instance = new ton_1.TonClient({
-                endpoint: 'https://x-api.rubic.exchange/toncenter/api/v2/jsonRPC',
-                apiKey: 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4'
-            });
-        }
-        return this.instance;
-    }
-}
-exports.TonClientInstance = TonClientInstance;
-TonClientInstance.instance = null;