@cryptorubic/web3 1.0.0-alpha.no-sdk.9 → 1.0.0-alpha.no-sdk.11

package/package.json

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

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

@@ -14,7 +14,7 @@ export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet
     readonly client: BitcoinAdapterClient;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     callContractMethod<T extends Web3PrimitiveType = string>(): Promise<T>;
-    getBalance(userAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, _tokenAddress?: string): Promise<BigNumber>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(contractAbi: Abi, contractsData: {
         contractAddress: string;

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

@@ -14,7 +14,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     callContractMethod() {
         throw new Error('Method not implemented.');
     }
-    async getBalance(userAddress) {
+    async getBalance(userAddress, _tokenAddress) {
         const url = `https://api.blockcypher.com/v1/btc/main/addrs/${userAddress}/balance`;
         const response = await this.httpClient.get(url);
         return new bignumber_js_1.default(response.final_balance);

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

@@ -5,7 +5,7 @@ import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, Wa
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
 import BigNumber from 'bignumber.js';
 import { Web3Error } from '../utils/parse-evm-error';
-import { EvmTransactionConfig } from 'packages/web3/src/lib/utils/models/evm-transaction-config';
+import { EvmTransactionConfig } from '../../../../utils/models/evm-transaction-config';
 import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { ApproveAdapterClient } from '../../models/approve-adapter';
 import { AllowanceInfo } from '../../models/common-types';

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

@@ -11,7 +11,7 @@ const bignumber_js_1 = require("bignumber.js");
 const uni_v3_permit_abi_1 = require("../../constants/uni-v3-permit-abi");
 const erc20_token_abi_1 = require("../../constants/erc20-token-abi");
 const parse_evm_error_1 = require("../utils/parse-evm-error");
-const rubic_sdk_error_1 = require("packages/web3/src/lib/errors/rubic-sdk.error");
+const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const evm_adapter_1 = require("../evm-adapter");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
 class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {

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

@@ -258,14 +258,15 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
      * @returns wei amount
      */
     async getBalance(walletAddress, tokenAddress) {
-        if (!tokenAddress) {
-            const nativeBalance = await this.public.getBalance({
-                address: walletAddress
-            });
-            return new bignumber_js_1.default(nativeBalance.toString());
+        const isToken = tokenAddress && !web3_pure_1.Web3Pure.isNativeAddress(core_1.CHAIN_TYPE.EVM, tokenAddress);
+        if (isToken) {
+            const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
+            return new bignumber_js_1.default(tokenBalance);
         }
-        const tokenBalance = await this.client.read(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'balanceOf', [walletAddress]);
-        return new bignumber_js_1.default(tokenBalance);
+        const nativeBalance = await this.public.getBalance({
+            address: walletAddress
+        });
+        return new bignumber_js_1.default(nativeBalance.toString());
     }
     async getTransactionCount(walletAddress) {
         const transactionCount = await this.public?.getTransactionCount({

package/src/lib/adapter/adapters/adapter-evm/utils/parse-evm-error.d.ts

@@ -1,4 +1,4 @@
-import { RubicSdkError } from 'packages/web3/src/lib/errors/rubic-sdk.error';
+import { RubicSdkError } from '../../../../errors/rubic-sdk.error';
 /**
  * Type of errors, thrown by web3 methods.
  */

package/src/lib/adapter/adapters/adapter-evm/utils/parse-evm-error.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseEvmError = parseEvmError;
-const low_gas_error_1 = require("packages/web3/src/lib/errors/blockchain/low-gas.error");
-const transaction_reverted_error_1 = require("packages/web3/src/lib/errors/blockchain/transaction-reverted.error");
-const user_reject_error_1 = require("packages/web3/src/lib/errors/blockchain/user-reject.error");
-const insufficient_funds_gas_price_value_error_1 = require("packages/web3/src/lib/errors/cross-chain/insufficient-funds-gas-price-value.error");
-const rubic_sdk_error_1 = require("packages/web3/src/lib/errors/rubic-sdk.error");
-const failed_to_check_for_transaction_receipt_error_1 = require("packages/web3/src/lib/errors/swap/failed-to-check-for-transaction-receipt.error");
-const low_slippage_error_1 = require("packages/web3/src/lib/errors/swap/low-slippage.error");
+const low_gas_error_1 = require("../../../../errors/blockchain/low-gas.error");
+const transaction_reverted_error_1 = require("../../../../errors/blockchain/transaction-reverted.error");
+const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
+const insufficient_funds_gas_price_value_error_1 = require("../../../../errors/cross-chain/insufficient-funds-gas-price-value.error");
+const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
+const failed_to_check_for_transaction_receipt_error_1 = require("../../../../errors/swap/failed-to-check-for-transaction-receipt.error");
+const low_slippage_error_1 = require("../../../../errors/swap/low-slippage.error");
 const proxy_hash_errors_1 = require("../constants/proxy-hash-errors");
-const low_slippage_deflationary_token_error_1 = require("packages/web3/src/lib/errors/swap/low-slippage-deflationary-token.error");
+const low_slippage_deflationary_token_error_1 = require("../../../../errors/swap/low-slippage-deflationary-token.error");
 const errors_1 = require("../../utils/errors");
 /**
  * Parses web3 error by its code or message.

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

@@ -28,7 +28,7 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb
     private createConection;
     simulateTransaction(_config: object, _from: string): Promise<void>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
-    getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SolanaBlockchainName>[]>;
     parseRawInstruction(rawInstruction: SolanaRawInstruction[], dataFormat: BufferEncoding): TransactionInstruction[];
     parseLUTAddresses(lookupTableAddresses: string[]): Promise<AddressLookupTableAccount[]>;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiAdapterClient = void 0;
 const core_1 = require("@cryptorubic/core");
 const abstract_adapter_client_1 = require("../../common/client/abstract-adapter-client");
-const user_reject_error_1 = require("packages/web3/src/lib/errors/blockchain/user-reject.error");
+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 SuiAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {

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

@@ -22,6 +22,6 @@ export declare class SuiAdapter extends AbstractAdapter<SuiClient, WalletAdapter
     simulateTransaction(_config: object, _from: string): Promise<void>;
     callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<SuiBlockchainName>[]>;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
-    getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
+    getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     compareSuiAddress(addressA: string, addressB: string): boolean;
 }

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

@@ -8,7 +8,7 @@ import { BasicSendTransactionOptions } from '../../models/basic-transaction-opti
 import { Address } from '@ton/core';
 import { TonApiService } from '../services/ton-api.service';
 import { TonAdapterConfig } from '../../models/ton-adapter-config';
-import { TonTransactionConfig } from 'packages/web3/src/lib/utils/models/ton-transaction-config';
+import { TonTransactionConfig } from '../../../../utils/models/ton-transaction-config';
 export declare class TonAdapterClient extends AbstractAdapterClient<TonConnectUI, TonSendTxParams, string> {
     private readonly tonApi;
     private readonly tonClient;

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TonAdapterClient = void 0;
 const core_1 = require("@cryptorubic/core");
 const abstract_adapter_client_1 = require("../../common/client/abstract-adapter-client");
-const user_reject_error_1 = require("packages/web3/src/lib/errors/blockchain/user-reject.error");
+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("packages/web3/src/lib/errors/rubic-sdk.error");
+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");

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

@@ -4,10 +4,10 @@ import { BlockchainName, HttpClient, ICustomLogger, TokenAmount } from '@cryptor
 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 { TronTransactionConfig } from 'packages/web3/src/lib/utils/models/tron-transaction-config';
+import { TronTransactionConfig } from '../../../../utils/models/tron-transaction-config';
 import { ApproveAdapterClient } from '../../models/approve-adapter';
 import { AllowanceInfo } from '../../models/common-types';
-import { TronParameters } from 'packages/web3/src/lib/utils/models/tron-parameters';
+import { TronParameters } from '../../../../utils/models/tron-parameters';
 export declare class TronAdapterClient extends AbstractAdapterClient<TronWeb, TronSendTxParams, string> implements ApproveAdapterClient<TronTransactionConfig> {
     private readonly tronWeb;
     constructor(tronWeb: TronWeb, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);

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

@@ -8,7 +8,7 @@ const trc_20_contract_abi_1 = require("../../constants/trc-20-contract-abi");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
 const parse_tron_error_1 = require("../utils/parse-tron-error");
 const tron_adapter_1 = require("../tron-adapter");
-const tron_web3_pure_1 = require("packages/web3/src/lib/utils/web3-types/tron-web3-pure");
+const tron_web3_pure_1 = require("../../../../utils/web3-types/tron-web3-pure");
 class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
     constructor(tronWeb, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);

package/src/lib/adapter/adapters/adapter-tron/models/tron-send-tx-params.d.ts

@@ -1,4 +1,4 @@
-import { TronParameters } from 'packages/web3/src/lib/utils/models/tron-parameters';
+import { TronParameters } from '../../../../utils/models/tron-parameters';
 import { BasicSendTransactionOptions } from '../../models/basic-transaction-options';
 export interface TronSendTxParams {
     contractAddress: string;

package/src/lib/adapter/adapters/adapter-tron/utils/parse-tron-error.d.ts

@@ -1,2 +1,2 @@
-import { RubicSdkError } from 'packages/web3/src/lib/errors/rubic-sdk.error';
+import { RubicSdkError } from '../../../../errors/rubic-sdk.error';
 export declare function parseTronError(err: unknown): RubicSdkError;

package/src/lib/adapter/adapters/adapter-tron/utils/parse-tron-error.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTronError = parseTronError;
-const tron_insufficient_native_balance_1 = require("packages/web3/src/lib/errors/blockchain/tron-insufficient-native-balance");
-const tron_transaction_expired_1 = require("packages/web3/src/lib/errors/blockchain/tron-transaction-expired");
-const user_reject_error_1 = require("packages/web3/src/lib/errors/blockchain/user-reject.error");
+const tron_insufficient_native_balance_1 = require("../../../../errors/blockchain/tron-insufficient-native-balance");
+const tron_transaction_expired_1 = require("../../../../errors/blockchain/tron-transaction-expired");
+const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
 const errors_1 = require("../../utils/errors");
 function parseTronError(err) {
     if (err?.includes?.('Confirmation declined by user')) {

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

@@ -13,6 +13,12 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     protected set public(value: P | null);
     get public(): P;
     protected constructor(blockchain: B, logger?: ICustomLogger);
+    /**
+     * Gets account native or token balance in wei.
+     * @param userAddress Wallet address, whose balance you want to find out.
+     * @param tokenAddress Address of the smart-contract corresponding to the token,
+     */
+    abstract getBalance(userAddress: string, tokenAddress?: string): Promise<BigNumber>;
     abstract getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     abstract checkEnoughBalance(token: TokenAmount, walletAddress: string): Promise<boolean>;
     abstract callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;