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

package/package.json

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

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

@@ -12,6 +12,7 @@ import { MethodData } from '../models/web3-public-models/method-data';
 export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet, BitcoinBlockchainName> {
     private readonly httpClient;
     readonly client: BitcoinAdapterClient;
+    get public(): BtcWallet;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     getBalance(userAddress: string, _tokenAddress?: string): Promise<BigNumber>;

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

@@ -6,6 +6,9 @@ const bignumber_js_1 = require("bignumber.js");
 const abstract_adapter_1 = require("../common/abstract-adapter");
 const bitcoin_adapter_client_1 = require("./client/bitcoin-adapter-client");
 class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
+    get public() {
+        throw new Error('public property is not set in BitcoinAdapter.');
+    }
     constructor(httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.BITCOIN, logger);
         this.httpClient = httpClient;

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

@@ -7,12 +7,12 @@ import { TonConnectUI } from '@tonconnect/ui';
 import { BasicSendTransactionOptions } from '../../models/basic-transaction-options';
 import { Address } from '@ton/core';
 import { TonApiService } from '../services/ton-api.service';
-import { TonAdapterConfig } from '../../models/ton-adapter-config';
+import { TonClient } from '@ton/ton';
 import { TonTransactionConfig } from '../../../../utils/models/ton-transaction-config';
 export declare class TonAdapterClient extends AbstractAdapterClient<TonConnectUI, TonSendTxParams, string> {
     private readonly tonApi;
     private readonly tonClient;
-    constructor(tonApi: TonApiService, config: TonAdapterConfig, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    constructor(tonApi: TonApiService, tonClient: TonClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     read<T>(): Promise<T>;
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;

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

@@ -9,12 +9,11 @@ const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const errors_1 = require("../../utils/errors");
 const core_2 = require("@ton/core");
 const waitFor_1 = require("../../utils/waitFor");
-const ton_1 = require("@ton/ton");
 class TonAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
-    constructor(tonApi, config, httpClient, logger, clientParams) {
+    constructor(tonApi, tonClient, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
         this.tonApi = tonApi;
-        this.tonClient = new ton_1.TonClient(config.tonClientConfig);
+        this.tonClient = tonClient;
     }
     async read() {
         throw new Error('Method read is not supported');

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

@@ -12,7 +12,8 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(httpClient, config, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.TON, logger);
         this.tonApi = new ton_api_service_1.TonApiService(httpClient, config.tonApiConfig, logger);
-        this.client = new ton_adapter_client_1.TonAdapterClient(this.tonApi, config, httpClient, logger, clientParams);
+        this.public = new ton_1.TonClient(config.tonClientConfig);
+        this.client = new ton_adapter_client_1.TonAdapterClient(this.tonApi, this.public, httpClient, logger, clientParams);
     }
     async callContractMethod() {
         throw new Error('Method call is not supported');

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

@@ -15,7 +15,7 @@ export declare class TronAdapterClient extends AbstractAdapterClient<TronWeb, Tr
     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>;
+    getAllowance(fromTokenAddress: string, _walletAddress: string, spender: string): Promise<AllowanceInfo>;
     needApprove(from: TokenAmount, walletAddress: string, spender: string): Promise<boolean>;
     approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: TronTransactionOptions): Promise<string>;
     encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): TronTransactionConfig;

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

@@ -30,9 +30,8 @@ class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient
     getBlockchainName() {
         return Promise.resolve(core_1.BLOCKCHAIN_NAME.TRON);
     }
-    async getAllowance(fromTokenAddress, walletAddress, spender) {
-        const [contract, decimals, allowance] = await Promise.all([
-            this.tronWeb.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, fromTokenAddress),
+    async getAllowance(fromTokenAddress, _walletAddress, spender) {
+        const [decimals, allowance] = await Promise.all([
             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])
         ]);

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

@@ -14,7 +14,9 @@ export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronB
     readonly client: TronAdapterClient;
     private readonly multicallAddress;
     needPreswapAction(): Promise<boolean>;
-    constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    constructor(rpcList: (string | {
+        fullHost: string;
+    })[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments?: unknown[]): Promise<T>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends TronWeb3PrimitiveType>(contractAbi: any, contractsData: {

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

@@ -17,7 +17,8 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpcList, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.TRON, logger);
         this.multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
-        this.public = new tronweb_1.TronWeb({ fullHost: rpcList[0] });
+        const rpc = typeof rpcList[0] === 'string' ? rpcList[0] : rpcList[0].fullHost;
+        this.public = new tronweb_1.TronWeb({ fullHost: rpc });
         this.client = new tron_adapter_client_1.TronAdapterClient(this.public, httpClient, logger, clientParams);
     }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = []) {

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

@@ -10,36 +10,12 @@ class AbstractAdapter {
     }
     get public() {
         if (!this._public) {
-            const msg = 'Trying to access undefined client';
+            const msg = `Trying to access undefined public client in ${this.blockchain} adapter.`;
             this.logger?.customLog(msg);
             throw new Error(msg);
         }
         return this._public;
     }
-    // private _wallet: W | null = null;
-    // public set wallet(value: W | null) {
-    //     this._wallet = value;
-    // }
-    // public get wallet(): W {
-    //     if (!this._wallet) {
-    //         const msg = 'Trying to access undefined client';
-    //         this.logger?.customLog(msg);
-    //         throw new Error(msg);
-    //     }
-    //     return this._wallet;
-    // }
-    // private _walletAddress: string | null = null;
-    // public set walletAddress(value: string | null) {
-    //     this._walletAddress = value;
-    // }
-    // public get walletAddress(): string {
-    //     if (!this._walletAddress) {
-    //         const msg = 'Trying to access undefined walletAddress';
-    //         this.logger?.customLog(msg);
-    //         throw new Error(msg);
-    //     }
-    //     return this._walletAddress;
-    // }
     constructor(blockchain, logger) {
         this._public = null;
         this.blockchain = blockchain;

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

@@ -58,7 +58,7 @@ class BlockchainAdapterFactoryService {
         return store;
     }
     createAdapter(blockchain, rpcs) {
-        if (rpcs.length > 0 && typeof rpcs[0] === 'string') {
+        if (rpcs.length > 0) {
             const blockchainType = core_1.BlockchainsInfo.getChainType(blockchain);
             if (blockchainType === core_1.CHAIN_TYPE.EVM) {
                 if (viem_blockchain_mapping_1.viemBlockchainMapping?.[blockchain]) {

package/src/lib/adapter/models/create-factory-params.d.ts

@@ -1,10 +1,10 @@
-import { BitcoinBlockchainName, EvmBlockchainName, HttpClient, ICustomLogger, SolanaBlockchainName, SuiBlockchainName, TonBlockchainName, TronBlockchainName } from '@cryptorubic/core';
+import { EvmBlockchainName, HttpClient, ICustomLogger, SolanaBlockchainName, SuiBlockchainName, TronBlockchainName } from '@cryptorubic/core';
 import { EnvType } from '../constants/models/env-type';
 import { TronWebProvider } from '../adapters/adapter-tron/models/tron-web-provider';
 import { TonAdapterConfig } from '../adapters/models/ton-adapter-config';
-export type RpcSupportedBlockhainName = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<TonBlockchainName, string[]> & Record<BitcoinBlockchainName, string[]> & Record<SuiBlockchainName, string[]>;
+export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]>;
 export interface AdapterFactoryParams {
-    rpcList: RpcSupportedBlockhainName;
+    rpcList: RpcListType;
     httpClient?: HttpClient;
     tonParams?: TonAdapterConfig;
     createLogger?: (label: string) => ICustomLogger;