@cryptorubic/web3 1.0.0-alpha.no-sdk.3 → 1.0.0-alpha.no-sdk.5

package/package.json

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

package/src/index.d.ts

@@ -143,3 +143,15 @@ export * from './lib/utils/web3-types/solana-web3-pure';
 export * from './lib/utils/web3-types/sui-web3-pure';
 export * from './lib/utils/web3-types/ton-web3-pure';
 export * from './lib/utils/web3-types/tron-web3-pure';
+export * from './lib/utils/models/primitive-types';
+export * from './lib/utils/models/tron-transaction-info';
+export * from './lib/utils/models/tron-transaction-config';
+export * from './lib/utils/models/tron-parameters';
+export * from './lib/utils/models/tron-multicall-response';
+export * from './lib/utils/models/tron-call';
+export * from './lib/utils/models/tron-block';
+export * from './lib/utils/models/abi-types';
+export * from './lib/utils/models/evm-transaction-config';
+export * from './lib/utils/models/cn-validation-response';
+export * from './lib/utils/constants/changenow-api-blockchain';
+export * from './lib/utils/models/ton-transaction-config';

package/src/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-// Auto-generated exports - do not edit manually
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/client/bitcoin-adapter-client"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/models/btc-send-tx-params"), exports);
@@ -147,3 +146,15 @@ tslib_1.__exportStar(require("./lib/utils/web3-types/solana-web3-pure"), exports
 tslib_1.__exportStar(require("./lib/utils/web3-types/sui-web3-pure"), exports);
 tslib_1.__exportStar(require("./lib/utils/web3-types/ton-web3-pure"), exports);
 tslib_1.__exportStar(require("./lib/utils/web3-types/tron-web3-pure"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/primitive-types"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-transaction-info"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-transaction-config"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-parameters"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-multicall-response"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-call"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/tron-block"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/abi-types"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/evm-transaction-config"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/cn-validation-response"), exports);
+tslib_1.__exportStar(require("./lib/utils/constants/changenow-api-blockchain"), exports);
+tslib_1.__exportStar(require("./lib/utils/models/ton-transaction-config"), exports);

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

@@ -3,16 +3,15 @@ import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from '../common/abstract-adapter';
 import { BtcWallet } from '../models/btc-wallet-provider';
 import { BasicSendTransactionOptions } from '../models/basic-transaction-options';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
-import { BitconSendTxParams } from './models/btc-send-tx-params';
+import { BitcoinAdapterClient } from './client/bitcoin-adapter-client';
 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';
 export declare class BitcoinAdapter extends AbstractAdapter<BtcWallet, BtcWallet, BitcoinBlockchainName> {
     private readonly httpClient;
-    readonly client: AbstractAdapterClient<BtcWallet, BitconSendTxParams, string>;
+    readonly client: BitcoinAdapterClient;
     constructor(httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
     getBalance(userAddress: string): Promise<BigNumber>;
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;

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

@@ -53,7 +53,7 @@ export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient
      * @param [options] Additional options.
      * @returns Transaction receipt.
      */
-    trySendTransaction(toAddress: string, options: EvmTransactionOptions): Promise<TransactionReceipt>;
+    trySendTransaction(params: EvmSendTxParams): Promise<TransactionReceipt>;
     /**
      * Executes method of smart-contract and resolve the promise when the transaction is included in the block.
      * @param contractAddress Address of smart-contract which method is to be executed.

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

@@ -134,23 +134,25 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
      * @param [options] Additional options.
      * @returns Transaction receipt.
      */
-    async trySendTransaction(toAddress, options) {
+    async trySendTransaction(params) {
         try {
+            const to = params.txOptions.to;
+            const value = BigInt(params.txOptions.value?.toString() || '0');
             const gaslessParams = {
                 account: this.walletAddress,
-                to: toAddress,
-                value: BigInt(options.value?.toString() || '0'),
-                ...(options.data && { data: options.data })
+                to,
+                value,
+                ...(params.txOptions.data && { data: params.txOptions.data })
             };
             const gas = await this.evmAdapter.public.estimateGas(gaslessParams);
             const gasfulParams = {
                 ...gaslessParams,
-                ...(0, options_1.getGasOptions)(options),
+                ...(0, options_1.getGasOptions)(params.txOptions),
                 gas: gas.toString()
             };
             const gasfulViemParams = {
                 ...gaslessParams,
-                ...(0, options_1.getViemGasOptions)(options),
+                ...(0, options_1.getViemGasOptions)(params.txOptions),
                 gas
             };
             try {
@@ -161,9 +163,9 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
             }
             const sendParams = {
                 ...gasfulParams,
-                ...(options.onTransactionHash && {
-                    onTransactionHash: options.onTransactionHash,
-                    gasPriceOptions: options?.gasPriceOptions
+                ...(params.txOptions.onTransactionHash && {
+                    onTransactionHash: params.txOptions.onTransactionHash,
+                    gasPriceOptions: params.txOptions?.gasPriceOptions
                 })
             };
             const receipt = await this.sendTransaction({ txOptions: sendParams });
@@ -173,7 +175,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
             console.debug('Call tokens transfer error', err);
             const shouldIgnore = await this.shouldIgnoreError(err);
             if (shouldIgnore) {
-                return this.sendTransaction({ txOptions: options });
+                return this.sendTransaction(params);
             }
             throw (0, parse_evm_error_1.parseEvmError)(err);
         }

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

@@ -1,19 +1,17 @@
-import { Abi, MulticallResponse, MulticallParameters, PublicActions, PublicClient, WalletClient, WalletActions, BlockNumber, BlockTag, GetBlockReturnType, TransactionReceipt } from 'viem';
+import { Abi, MulticallResponse, MulticallParameters, PublicActions, PublicClient, WalletClient, WalletActions, BlockNumber, BlockTag, GetBlockReturnType } from 'viem';
 import { AbstractAdapter } from '../common/abstract-adapter';
 import { EvmBlockchainName, ICustomLogger, Token, TokenAmount, PriceTokenAmount, HttpClient } from '@cryptorubic/core';
 import BigNumber from 'bignumber.js';
 import { EvmAdapterOptions } from '../models/evm-adapter-options';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
-import { EvmSendTxParams } from './models/evm-send-tx-params';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
+import { EvmAdapterClient } from './client/evm-adapter-client';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
-import { ApproveAdapterClient } from '../models/approve-adapter';
 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 { GasPrice } from '../models/evm-web3-public-models/gas-price';
 export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicClient, WalletClient & WalletActions, EvmBlockchainName> {
-    readonly client: AbstractAdapterClient<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> & ApproveAdapterClient<EvmTransactionConfig>;
+    readonly client: EvmAdapterClient;
     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, rubicAppParams?: RubicAppAdaptersFactoryParams);

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

@@ -4,16 +4,15 @@ import { HttpClient, ICustomLogger, PriceTokenAmount, SolanaBlockchainName, Toke
 import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from '../common/abstract-adapter';
 import { SolanaRawInstruction } from '../models/solana-web3-types';
-import { SolanaSendTxParams } from './models/solana-send-tx-params';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
 import { SolanaWeb3 } from '../../constants/models/solana-web3';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
+import { SolanaAdapterClient } from './client/solana-adapter-client';
 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";
 export declare class SolanaAdapter extends AbstractAdapter<Connection, SolanaWeb3, SolanaBlockchainName> {
     private readonly httpClient;
-    readonly client: AbstractAdapterClient<SolanaWeb3, SolanaSendTxParams, string>;
+    readonly client: SolanaAdapterClient;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
     /**
      * Gets balance of multiple tokens.

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

@@ -3,14 +3,13 @@ import { HttpClient, ICustomLogger, PriceTokenAmount, SuiBlockchainName, Token,
 import { SuiClient } from '@mysten/sui/client';
 import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from '../common/abstract-adapter';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
 import { WalletAdapter } from '@suiet/wallet-sdk';
+import { SuiAdapterClient } from './client/sui-adapter-client';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
-import { SuiSendTxParams } from './models/sui-send-tx-params';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 export declare class SuiAdapter extends AbstractAdapter<SuiClient, WalletAdapter, SuiBlockchainName> {
-    readonly client: AbstractAdapterClient<WalletAdapter, SuiSendTxParams, string>;
+    readonly client: SuiAdapterClient;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
     multicallContractsMethods<Output extends Web3PrimitiveType>(): Promise<ContractMulticallResponse<Output>[][]>;

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

@@ -5,13 +5,12 @@ import { TonAdapterConfig } from '../models/ton-adapter-config';
 import BigNumber from 'bignumber.js';
 import { AbstractAdapter } from '../common/abstract-adapter';
 import { TonConnectUI } from '@tonconnect/ui';
-import { TonSendTxParams } from './models/ton-send-tx-params';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
+import { TonAdapterClient } from './client/ton-adapter-client';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
 import { Web3PrimitiveType } from '../../../utils/models/primitive-types';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 export declare class TonAdapter extends AbstractAdapter<TonClient, TonConnectUI, TonBlockchainName> {
-    readonly client: AbstractAdapterClient<TonConnectUI, TonSendTxParams, string>;
+    readonly client: TonAdapterClient;
     private readonly tonApi;
     constructor(httpClient: HttpClient, config: TonAdapterConfig, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
     getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;

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

@@ -8,12 +8,10 @@ import { Abi } from 'viem';
 import { ContractMulticallResponse } from '../../../utils/models/contract-multicall-response';
 import { TronWeb3PrimitiveType } from '../../../utils/models/primitive-types';
 import { MethodData } from '../../../utils/models/method-data';
-import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
-import { TronSendTxParams } from './models/tron-send-tx-params';
 import { RubicAppAdaptersFactoryParams } from '../../constants/models/create-factory-params';
-import { ApproveAdapterClient } from '../models/approve-adapter';
+import { TronAdapterClient } from './client/tron-adapter-client';
 export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> {
-    readonly client: AbstractAdapterClient<TronWeb, TronSendTxParams, string> & ApproveAdapterClient<TronTransactionConfig>;
+    readonly client: TronAdapterClient;
     private readonly multicallAddress;
     needPreswapAction(): Promise<boolean>;
     constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);

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

@@ -1,8 +1,7 @@
 import { Abi } from 'viem';
 import BigNumber from 'bignumber.js';
-import { ICustomLogger, Token, TokenAmount, BlockchainName, PriceTokenAmount } from '@cryptorubic/core';
+import { ICustomLogger, Token, TokenAmount, BlockchainName } from '@cryptorubic/core';
 import { AbstractAdapterClient } from './client/abstract-adapter-client';
-import { SupportedTokenField } from '../models/token-models';
 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';
@@ -15,14 +14,21 @@ export declare abstract class AbstractAdapter<P, W, B extends BlockchainName, Se
     get public(): P;
     protected constructor(blockchain: B, logger?: ICustomLogger);
     abstract getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
-    abstract checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
+    abstract checkEnoughBalance(token: TokenAmount, walletAddress: string): Promise<boolean>;
     abstract callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;
     /**
      * Gets token info by address.
      * @param tokenAddress Address of token.
      * @param tokenFields Token's fields to get.
      */
-    callForTokenInfo(tokenAddress: string, tokenFields?: SupportedTokenField[]): Promise<Token<BlockchainName>>;
+    callForTokenInfo(tokenAddress: string): Promise<Token<BlockchainName>>;
+    /**
+     * Checks that user has enough balance.
+     * @param userAddress Wallet address, which contains tokens.
+     * @param token Token to check balance of.
+     * @param requiredAmount Required user balance in Eth units.
+     */
+    checkBalance(token: Token, requiredAmount: BigNumber, userAddress: string): Promise<void | never>;
     /**
      * Uses multicall to make many methods calls in several contracts.
      * @param contractAbi Target contract abi.

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
 class AbstractAdapter {
     set public(value) {
         this._public = value;
@@ -50,9 +52,21 @@ class AbstractAdapter {
      * @param tokenAddress Address of token.
      * @param tokenFields Token's fields to get.
      */
-    async callForTokenInfo(tokenAddress, tokenFields = ['decimals', 'symbol', 'name']) {
+    async callForTokenInfo(tokenAddress) {
         return (await this.callForTokensInfo([tokenAddress]))[0];
     }
+    /**
+     * Checks that user has enough balance.
+     * @param userAddress Wallet address, which contains tokens.
+     * @param token Token to check balance of.
+     * @param requiredAmount Required user balance in Eth units.
+     */
+    async checkBalance(token, requiredAmount, userAddress) {
+        const enoughBalance = await this.checkEnoughBalance(new core_1.TokenAmount({ ...token, tokenAmount: requiredAmount }), userAddress);
+        if (!enoughBalance) {
+            throw new insufficient_funds_error_1.InsufficientFundsError(token.symbol);
+        }
+    }
     needPreswapAction(token, contractAddress, walletAddress, amount) {
         return Promise.resolve(false);
     }

package/src/lib/adapter/adapters/models/approve-adapter.d.ts

@@ -30,7 +30,7 @@ export interface ApproveAdapterClient<T> extends AbstractAdapterClient<{}, {}, {
      * Get data for tokens approve
      * @param tokenAddress erc20 token address
      * @param spenderAddress spender address
-     * @param amount amount in non wei
+     * @param amount amount in wei
      */
     approve(walletAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
 }