@cryptorubic/web3 1.0.0-alpha.no-sdk.30 → 1.0.0-alpha.no-sdk.32

package/package.json

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

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

@@ -15,6 +15,7 @@ export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet
     readonly signer: BitcoinAdapterSigner;
     get public(): BtcWallet;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    initWeb3Client(): void;
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(args: unknown): Promise<T>;
     getTransactionStatus(txHash: string): Promise<TxStatus>;

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

@@ -15,6 +15,9 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
         this.httpClient = httpClient;
         this.signer = new bitcoin_adapter_signer_1.BitcoinAdapterSigner(httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        super.public = null;
+    }
     callContractMethod() {
         throw new Error('Method not implemented.');
     }

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

@@ -15,10 +15,13 @@ 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> {
+    private readonly adapterOptions;
+    private readonly clientParams?;
     readonly signer: EvmAdapterSigner;
     needPreswapAction(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     handlePreswap(contractAddress: string, walletAddress: string, tokenAmount: TokenAmount): Promise<void>;
-    constructor(httpClient: HttpClient, adapterOptions: EvmAdapterOptions, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    constructor(httpClient: HttpClient, adapterOptions: EvmAdapterOptions, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams | undefined);
+    initWeb3Client(): void;
     callContractMethod<T extends Web3PrimitiveType = string>(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments?: unknown[], options?: {
         from?: string;
         value?: string;
@@ -40,7 +43,7 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
         blockNumber: number;
         workchain: number;
     }>;
-    protected createPublicClient(rpcList: string[]): (PublicActions & PublicClient) | null;
+    private createPublicClient;
     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

@@ -31,9 +31,13 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     constructor(httpClient, adapterOptions, logger, clientParams) {
         super(adapterOptions.blockchain, logger);
-        this.public = this.createPublicClient(adapterOptions.rpcList);
+        this.adapterOptions = adapterOptions;
+        this.clientParams = clientParams;
         this.signer = new evm_adapter_signer_1.EvmAdapterSigner(this.public, httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        this.public = this.createPublicClient(this.adapterOptions.rpcList);
+    }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = [], options = {}) {
         return this.public.readContract({
             abi: contractAbi,
@@ -134,7 +138,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             retryDelay: 100,
             timeout: 5000
         }));
-        const chain = viem_blockchain_mapping_1.viemBlockchainMapping[this.blockchain];
+        const chain = this.clientParams?.viemConfig?.[this.blockchain] || viem_blockchain_mapping_1.viemBlockchainMapping[this.blockchain];
         return (0, viem_1.createPublicClient)({
             // @ts-ignore
             chain,

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

@@ -10,9 +10,11 @@ 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 SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb3, SolanaBlockchainName> {
+    private readonly rpcList;
     private readonly httpClient;
     readonly signer: SolanaAdapterSigner;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    initWeb3Client(): void;
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(): Promise<T>;
     getTransactionStatus(txHash: string): Promise<TxStatus>;

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

@@ -15,10 +15,13 @@ 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);
+        this.rpcList = rpcList;
         this.httpClient = httpClient;
-        this.public = this.createConection(rpcList);
         this.signer = new solana_adapter_signer_1.SolanaAdapterSigner(this.public, httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        this.public = this.createConection(this.rpcList);
+    }
     async callContractMethod() {
         throw new Error('Method call is not supported');
     }

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

@@ -10,8 +10,10 @@ 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> {
+    private readonly rpcList;
     readonly signer: SuiAdapterSigner;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    initWeb3Client(): void;
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     read<T>(): Promise<T>;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;

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

@@ -11,9 +11,13 @@ 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);
+        this.rpcList = rpcList;
         this.public = new client_1.SuiClient({ url: rpcList[0] });
         this.signer = new sui_adapter_signer_1.SuiAdapterSigner(this.public, httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        this.public = new client_1.SuiClient({ url: this.rpcList[0] });
+    }
     async callContractMethod() {
         throw new Error('Method call is not supported');
     }

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

@@ -11,9 +11,11 @@ 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> {
+    private readonly config;
     readonly signer: TonAdapterSigner;
     private readonly tonApi;
     constructor(httpClient: HttpClient, config: TonAdapterConfig, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    initWeb3Client(): void;
     read<T>(): Promise<T>;
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;

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

@@ -12,10 +12,14 @@ 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);
+        this.config = config;
         this.tonApi = new ton_api_service_1.TonApiService(httpClient, config.tonApiConfig, logger);
         this.public = new ton_1.TonClient(config.tonClientConfig);
         this.signer = new ton_adapter_signer_1.TonAdapterSigner(this.tonApi, this.public, httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        this.public = new ton_1.TonClient(this.config.tonClientConfig);
+    }
     async read() {
         throw new Error('Method read is not supported');
     }

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

@@ -15,12 +15,14 @@ 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> {
+    private readonly rpcList;
     readonly signer: TronAdapterSigner;
     private readonly multicallAddress;
     needPreswapAction(): Promise<boolean>;
     constructor(rpcList: (string | {
         fullHost: string;
     })[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    initWeb3Client(): void;
     callContractMethod<T extends Web3PrimitiveType = string>(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments?: unknown[]): Promise<T>;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     /**

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

@@ -19,11 +19,14 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     constructor(rpcList, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.TRON, logger);
+        this.rpcList = rpcList;
         this.multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
-        const rpc = typeof rpcList[0] === 'string' ? rpcList[0] : rpcList[0].fullHost;
-        this.public = new tronweb_1.TronWeb({ fullHost: rpc });
         this.signer = new tron_adapter_signer_1.TronAdapterSigner(this.public, httpClient, logger, clientParams);
     }
+    initWeb3Client() {
+        const rpc = typeof this.rpcList[0] === 'string' ? this.rpcList[0] : this.rpcList[0].fullHost;
+        this.public = new tronweb_1.TronWeb({ fullHost: rpc });
+    }
     async callContractMethod(contractAddress, contractAbi, methodName, methodArguments = []) {
         this.public.setAddress(contractAddress);
         const contract = await this.public.contract(contractAbi, contractAddress);

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

@@ -13,7 +13,14 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     private _public;
     protected set public(value: P | null);
     get public(): P;
+    get connected(): boolean;
     protected constructor(blockchain: B, logger?: ICustomLogger);
+    /**
+     * Used to set this.public property, if it's not set - you can't send rpc requests to blockchain.
+     * Mostly you need to instantiate it at the same time as BlockchainAdapterFactoryService.createAdapter() called.
+     * In rubic-app it's called on wallet connection to prevent unnecessary rpc requests `net_listening` from viem library.
+     */
+    abstract initWeb3Client(): void;
     /**
      * Gets account native or token balance in wei.
      * @param userAddress Wallet address, whose balance you want to find out.

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

@@ -18,6 +18,9 @@ class AbstractAdapter {
         }
         return this._public;
     }
+    get connected() {
+        return !!this._public;
+    }
     constructor(blockchain, logger) {
         this._public = null;
         this.blockchain = blockchain;

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

@@ -5,9 +5,9 @@ const rubic_api_link_mapping_1 = require("../../../constants/rubic-api-link-mapp
 const wrong_network_error_1 = require("../../../../errors/swap/wrong-network.error");
 class AbstractAdapterSigner {
     get apiUrl() {
-        if (!this.clientParams) {
-            this.logger?.customError('clientParams is not set for apiUrl call.');
-            throw new Error('clientParams is not set for apiUrl call.');
+        if (!this.clientParams?.envType) {
+            this.logger?.customError('clientParams.envType is not set for apiUrl call.');
+            throw new Error('clientParams.envType is not set for apiUrl call.');
         }
         const rubicApiLink = rubic_api_link_mapping_1.rubicApiLinkMapping[this.clientParams.envType];
         return rubicApiLink ? rubicApiLink : 'https://dev1-api-v2.rubic.exchange';

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

@@ -55,6 +55,9 @@ class BlockchainAdapterFactoryService {
         });
         const store = Object.fromEntries(activeAdapters);
         this.logger?.customLog('Adapters store created');
+        if (!this.clientParams?.lazyLoadWeb3) {
+            Object.values(store).forEach((adapter) => adapter.initWeb3Client());
+        }
         return store;
     }
     createAdapter(blockchain, rpcs) {
@@ -90,6 +93,8 @@ class BlockchainAdapterFactoryService {
         const adapter = this.adapterStore[blockchain];
         adapter.signer.setWalletAddress(wallet.address);
         adapter.signer.setWallet(wallet.core);
+        if (!adapter.connected)
+            adapter.initWeb3Client();
     }
 }
 exports.BlockchainAdapterFactoryService = BlockchainAdapterFactoryService;

package/src/lib/adapter/constants/viem-blockchain-mapping.js

@@ -73,7 +73,6 @@ exports.viemBlockchainMapping = {
     [core_1.BLOCKCHAIN_NAME.CORE]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.CORE],
     [core_1.BLOCKCHAIN_NAME.BERACHAIN]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.BERACHAIN],
     [core_1.BLOCKCHAIN_NAME.SONEIUM]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.SONEIUM],
-    [core_1.BLOCKCHAIN_NAME.WANCHAIN]: chains_1.wanchain,
     [core_1.BLOCKCHAIN_NAME.UNICHAIN]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.UNICHAIN],
     [core_1.BLOCKCHAIN_NAME.MORPH]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.MORPH], // viem Morph config without multicall address
     [core_1.BLOCKCHAIN_NAME.HEMI]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.HEMI],

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

@@ -2,6 +2,7 @@ import { EvmBlockchainName, HttpClient, ICustomLogger, SolanaBlockchainName, Sui
 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';
+import { ViemChain } from '../constants/models/viem-chain-type';
 export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]>;
 export interface AdapterFactoryParams {
     rpcList: RpcListType;
@@ -12,4 +13,6 @@ export interface AdapterFactoryParams {
 }
 export interface ClientAdaptersFactoryParams {
     envType: EnvType;
+    viemConfig?: Partial<Record<EvmBlockchainName, ViemChain>>;
+    lazyLoadWeb3?: boolean;
 }