@cryptorubic/web3 1.0.0-alpha.no-sdk.33 → 1.0.0-alpha.no-sdk.35

package/package.json

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

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

@@ -33,7 +33,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
         super(adapterOptions.blockchain, logger);
         this.adapterOptions = adapterOptions;
         this.clientParams = clientParams;
-        this.signer = new evm_adapter_signer_1.EvmAdapterSigner(this.public, httpClient, logger, clientParams);
+        this.signer = new evm_adapter_signer_1.EvmAdapterSigner(this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
         this.public = this.createPublicClient(this.adapterOptions.rpcList);

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

@@ -5,8 +5,11 @@ import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, Wa
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
 import { Web3Error } from '../utils/parse-evm-error';
 export declare class EvmAdapterSigner extends AbstractAdapterSigner<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> {
-    private readonly evmPublic;
-    constructor(evmPublic: PublicActions & PublicClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    private readonly publicRef;
+    get publicClient(): PublicActions & PublicClient;
+    constructor(publicRef: {
+        public: (PublicActions & PublicClient) | null;
+    }, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     getBlockchainName(): Promise<BlockchainName | undefined>;
     /**
      * Sends Eth in transaction and resolve the promise when the transaction is included in the block.

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

@@ -11,9 +11,17 @@ const parse_evm_error_1 = require("../utils/parse-evm-error");
 const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 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) {
+    get publicClient() {
+        if (!this.publicRef.public) {
+            const msg = `Trying to access undefined publicClient in EvmAdapterSigner.`;
+            this.logger?.customLog(msg);
+            throw new Error(msg);
+        }
+        return this.publicRef.public;
+    }
+    constructor(publicRef, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
-        this.evmPublic = evmPublic;
+        this.publicRef = publicRef;
     }
     async getBlockchainName() {
         const userChainId = await this.wallet.getChainId();
@@ -64,7 +72,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 value,
                 ...(params.txOptions.data && { data: params.txOptions.data })
             };
-            const gas = await this.evmPublic.estimateGas(gaslessParams);
+            const gas = await this.publicClient.estimateGas(gaslessParams);
             const gasfulParams = {
                 ...gaslessParams,
                 ...(0, options_1.getGasOptions)(params.txOptions),
@@ -76,7 +84,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 gas
             };
             try {
-                await this.evmPublic.estimateGas(gasfulViemParams);
+                await this.publicClient.estimateGas(gasfulViemParams);
             }
             catch {
                 throw new rubic_sdk_error_1.RubicSdkError('Low native value');
@@ -160,7 +168,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 }),
                 account: this.walletAddress
             };
-            const gas = await this.evmPublic.estimateContractGas(gaslessParams);
+            const gas = await this.publicClient.estimateContractGas(gaslessParams);
             const gasfulParams = {
                 ...gaslessParams,
                 ...(0, options_1.getGasOptions)(options),
@@ -172,7 +180,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 gas
             };
             try {
-                await this.evmPublic.estimateContractGas(gasfulViemParams);
+                await this.publicClient.estimateContractGas(gasfulViemParams);
             }
             catch {
                 throw new rubic_sdk_error_1.RubicSdkError('Low native value');
@@ -235,7 +243,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
             account: address,
             args: methodArgs,
             functionName: method,
-            chain: this.evmPublic.chain,
+            chain: this.publicClient.chain,
             value: (0, viem_1.parseEther)(value)
         });
         return result;
@@ -246,7 +254,7 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
             to: to,
             value: (0, viem_1.parseEther)(value),
             data: data,
-            chain: this.evmPublic.chain,
+            chain: this.publicClient.chain,
             ...(options.gas && { gas: BigInt(options.gas) }),
             ...(0, options_1.getViemGasOptions)(options)
         });

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

@@ -5,8 +5,11 @@ import { SolanaSendTxParams } from '../models/solana-send-tx-params';
 import { Connection } from '@solana/web3.js';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
 export declare class SolanaAdapterSigner extends AbstractAdapterSigner<SolanaWeb3, SolanaSendTxParams, string> {
-    private readonly connection;
-    constructor(connection: Connection, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    private readonly publicRef;
+    get publicClient(): Connection;
+    constructor(publicRef: {
+        public: Connection | null;
+    }, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: SolanaSendTxParams): Promise<string>;

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

@@ -10,9 +10,17 @@ const errors_1 = require("../../utils/errors");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 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) {
+    get publicClient() {
+        if (!this.publicRef.public) {
+            const msg = `Trying to access undefined publicClient in SolanaAdapterSigner.`;
+            this.logger?.customLog(msg);
+            throw new Error(msg);
+        }
+        return this.publicRef.public;
+    }
+    constructor(publicRef, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
-        this.connection = connection;
+        this.publicRef = publicRef;
     }
     async write() {
         throw new Error('Method write is not supported');
@@ -36,7 +44,7 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
             }
             else {
                 try {
-                    const simulation = await this.connection.simulateTransaction(signedTx, {
+                    const simulation = await this.publicClient.simulateTransaction(signedTx, {
                         sigVerify: true,
                         replaceRecentBlockhash: false
                     });
@@ -45,7 +53,7 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
                 catch (err) {
                     console.log(err);
                 }
-                signature = await this.connection.sendRawTransaction(signedTx.serialize(), {
+                signature = await this.publicClient.sendRawTransaction(signedTx.serialize(), {
                     maxRetries: 3,
                     skipPreflight: false
                 });
@@ -67,7 +75,7 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
         let fetchedTx = null;
         while (!fetchedTx && Date.now() < deadline) {
             await (0, waitFor_1.waitFor)(5000);
-            fetchedTx = await this.connection.getTransaction(signature, {
+            fetchedTx = await this.publicClient.getTransaction(signature, {
                 commitment: 'confirmed',
                 maxSupportedTransactionVersion: 1
             });

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

@@ -17,7 +17,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
         this.rpcList = rpcList;
         this.httpClient = httpClient;
-        this.signer = new solana_adapter_signer_1.SolanaAdapterSigner(this.public, httpClient, logger, clientParams);
+        this.signer = new solana_adapter_signer_1.SolanaAdapterSigner(this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
         this.public = this.createConection(this.rpcList);

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

@@ -5,8 +5,11 @@ import { SuiSendTxParams } from '../models/sui-send-tx-params';
 import { WalletAdapter } from '@suiet/wallet-sdk';
 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);
+    private readonly publicRef;
+    get publicClient(): SuiClient;
+    constructor(publicRef: {
+        public: SuiClient | null;
+    }, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: SuiSendTxParams): Promise<string>;

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

@@ -6,9 +6,17 @@ const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-
 const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
 const parse_evm_error_1 = require("../../adapter-evm/utils/parse-evm-error");
 class SuiAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
-    constructor(suiClient, httpClient, logger, clientParams) {
+    get publicClient() {
+        if (!this.publicRef.public) {
+            const msg = `Trying to access undefined publicClient in SuiAdapterSigner.`;
+            this.logger?.customLog(msg);
+            throw new Error(msg);
+        }
+        return this.publicRef.public;
+    }
+    constructor(publicRef, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
-        this.suiClient = suiClient;
+        this.publicRef = publicRef;
     }
     async write() {
         throw new Error('Method write is not supported');
@@ -41,7 +49,7 @@ class SuiAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
         }
     }
     executeTxBlock(params) {
-        return this.suiClient.executeTransactionBlock(params);
+        return this.publicClient.executeTransactionBlock(params);
     }
 }
 exports.SuiAdapterSigner = SuiAdapterSigner;

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

@@ -12,8 +12,7 @@ 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);
+        this.signer = new sui_adapter_signer_1.SuiAdapterSigner(this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
         this.public = new client_1.SuiClient({ url: this.rpcList[0] });

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

@@ -10,8 +10,11 @@ import { TonClient } from '@ton/ton';
 import { TonTransactionConfig } from '../../../../utils/models/ton-transaction-config';
 export declare class TonAdapterSigner extends AbstractAdapterSigner<TonConnectUI, TonSendTxParams, string> {
     private readonly tonApi;
-    private readonly tonClient;
-    constructor(tonApi: TonApiService, tonClient: TonClient, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    private readonly publicRef;
+    get publicClient(): TonClient;
+    constructor(tonApi: TonApiService, publicRef: {
+        public: TonClient | null;
+    }, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: TonSendTxParams): Promise<string>;

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

@@ -9,10 +9,18 @@ const errors_1 = require("../../utils/errors");
 const core_2 = require("@ton/core");
 const waitFor_1 = require("../../utils/waitFor");
 class TonAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
-    constructor(tonApi, tonClient, httpClient, logger, clientParams) {
+    get publicClient() {
+        if (!this.publicRef.public) {
+            const msg = `Trying to access undefined publicClient in TonAdapterSigner.`;
+            this.logger?.customLog(msg);
+            throw new Error(msg);
+        }
+        return this.publicRef.public;
+    }
+    constructor(tonApi, publicRef, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
         this.tonApi = tonApi;
-        this.tonClient = tonClient;
+        this.publicRef = publicRef;
     }
     async write() {
         throw new Error('Method write is not supported');
@@ -149,7 +157,7 @@ class TonAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
         return inMsgHashBase64Url;
     }
     async getJettonWalletAddress(address, contractAddress) {
-        const addressResult = await this.tonClient.runMethod(contractAddress, 'get_wallet_address', [
+        const addressResult = await this.publicClient.runMethod(contractAddress, 'get_wallet_address', [
             { type: 'slice', cell: (0, core_2.beginCell)().storeAddress(address).endCell() }
         ]);
         return addressResult.stack.readAddress();

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

@@ -14,8 +14,7 @@ class TonAdapter extends abstract_adapter_1.AbstractAdapter {
         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);
+        this.signer = new ton_adapter_signer_1.TonAdapterSigner(this.tonApi, this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
         this.public = new ton_1.TonClient(this.config.tonClientConfig);

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

@@ -5,8 +5,11 @@ import { ClientAdaptersFactoryParams } from '../../../models/create-factory-para
 import { TronSendTxParams } from '../models/tron-send-tx-params';
 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);
+    private readonly publicRef;
+    get publicClient(): TronWeb;
+    constructor(publicRef: {
+        public: TronWeb | null;
+    }, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     write(contractAddress: string, methodSignature: string, parameters: TronParameters): Promise<string>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: TronSendTxParams): Promise<string>;

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

@@ -5,9 +5,17 @@ const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-
 const core_1 = require("@cryptorubic/core");
 const parse_tron_error_1 = require("../utils/parse-tron-error");
 class TronAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
-    constructor(tronWeb, httpClient, logger, clientParams) {
+    get publicClient() {
+        if (!this.publicRef.public) {
+            const msg = `Trying to access undefined publicClient in TronAdapterSigner.`;
+            this.logger?.customLog(msg);
+            throw new Error(msg);
+        }
+        return this.publicRef.public;
+    }
+    constructor(publicRef, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
-        this.tronWeb = tronWeb;
+        this.publicRef = publicRef;
     }
     async write(contractAddress, methodSignature, parameters) {
         const transaction = await this.wallet.transactionBuilder.triggerSmartContract(contractAddress, methodSignature, {}, parameters, this.walletAddress);
@@ -20,9 +28,9 @@ class TronAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner
     }
     async sendTransaction(params) {
         try {
-            const transaction = await this.tronWeb.transactionBuilder.triggerSmartContract(params.contractAddress, params.methodSignature, params.txOptions, params.parameters, this.walletAddress);
-            const signedTransaction = await this.tronWeb.trx.sign(transaction.transaction);
-            const receipt = await this.tronWeb.trx.sendRawTransaction(signedTransaction);
+            const transaction = await this.publicClient.transactionBuilder.triggerSmartContract(params.contractAddress, params.methodSignature, params.txOptions, params.parameters, this.walletAddress);
+            const signedTransaction = await this.publicClient.trx.sign(transaction.transaction);
+            const receipt = await this.publicClient.trx.sendRawTransaction(signedTransaction);
             if (params.txOptions.onTransactionHash) {
                 params.txOptions.onTransactionHash(receipt.transaction.txID);
             }
@@ -35,7 +43,7 @@ class TronAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner
     }
     async trySendTransaction(params) {
         try {
-            await this.tronWeb.transactionBuilder.estimateEnergy(params.contractAddress, params.methodSignature, {}, params.parameters, this.walletAddress);
+            await this.publicClient.transactionBuilder.estimateEnergy(params.contractAddress, params.methodSignature, {}, params.parameters, this.walletAddress);
         }
         catch (err) {
             const errMessage = typeof err === 'object' ? err.message : err;

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

@@ -21,7 +21,7 @@ class TronAdapter extends abstract_adapter_1.AbstractAdapter {
         super(core_1.BLOCKCHAIN_NAME.TRON, logger);
         this.rpcList = rpcList;
         this.multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
-        this.signer = new tron_adapter_signer_1.TronAdapterSigner(this.public, httpClient, logger, clientParams);
+        this.signer = new tron_adapter_signer_1.TronAdapterSigner(this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
         const rpc = typeof this.rpcList[0] === 'string' ? this.rpcList[0] : this.rpcList[0].fullHost;

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

@@ -10,9 +10,15 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     abstract signer: AbstractAdapterSigner<W, SendTxParams, SendTxResponse>;
     protected readonly logger?: ICustomLogger;
     protected readonly blockchain: B;
-    private _public;
+    /**
+     * used to pass public pointer in signer constructor
+     */
+    private _publicRef;
     protected set public(value: P | null);
     get public(): P;
+    get publicRef(): {
+        public: P | null;
+    };
     get connected(): boolean;
     protected constructor(blockchain: B, logger?: ICustomLogger);
     /**

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

@@ -8,21 +8,27 @@ 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;
+        this._publicRef.public = value;
     }
     get public() {
-        if (!this._public) {
+        if (!this._publicRef.public) {
             const msg = `Trying to access undefined public client in ${this.blockchain} adapter.`;
             this.logger?.customLog(msg);
             throw new Error(msg);
         }
-        return this._public;
+        return this._publicRef.public;
+    }
+    get publicRef() {
+        return this._publicRef;
     }
     get connected() {
-        return !!this._public;
+        return !!this._publicRef.public;
     }
     constructor(blockchain, logger) {
-        this._public = null;
+        /**
+         * used to pass public pointer in signer constructor
+         */
+        this._publicRef = { public: null };
         this.blockchain = blockchain;
         if (logger) {
             this.logger = logger;

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

@@ -93,8 +93,10 @@ class BlockchainAdapterFactoryService {
         const adapter = this.adapterStore[blockchain];
         adapter.signer.setWalletAddress(wallet.address);
         adapter.signer.setWallet(wallet.core);
-        if (!adapter.connected)
-            adapter.initWeb3Client();
+        Object.values(this.adapterStore).forEach((adapter) => {
+            if (!adapter.connected)
+                adapter.initWeb3Client();
+        });
     }
 }
 exports.BlockchainAdapterFactoryService = BlockchainAdapterFactoryService;