@cryptorubic/web3 0.14.0-alpha.solana-gas.11 → 1.0.0-alpha.no-sdk.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.14.0-alpha.solana-gas.11",
+    "version": "1.0.0-alpha.no-sdk.1",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",
@@ -14,7 +14,6 @@
         "bitcoin-address-validation": "^2.2.3",
         "bs58": "^6.0.0",
         "crc-32": "^1.2.2",
-        "ethers": "*",
         "js-base64": "^3.7.8",
         "tronweb": "^6.0.0-beta.4",
         "tslib": "*",

package/src/index.d.ts

@@ -11,20 +11,17 @@ export * from './lib/adapter/adapters/constants/erc20-token-abi';
 export * from './lib/adapter/adapters/constants/trc-20-contract-abi';
 export * from './lib/adapter/adapters/constants/tron-multicall-abi';
 export * from './lib/adapter/adapters/models/evm-adapter-options';
-export * from './lib/adapter/adapters/abstract-adapter';
-export * from './lib/adapter/adapters/evm-adapter';
-export * from './lib/adapter/adapters/solana-adapter';
-export * from './lib/adapter/adapters/tron-adapter';
-export * from './lib/adapter/adapters/ton-adapter';
+export * from './lib/adapter/adapters/common/abstract-adapter';
+export * from './lib/adapter/adapters/adapter-evm/evm-adapter';
+export * from './lib/adapter/adapters/adapter-ton/ton-adapter';
 export * from './lib/adapter/adapters/models/ton-adapter-config';
 export * from './lib/adapter/adapters/models/common-types';
 export * from './lib/adapter/adapters/models/ton-api-config';
 export * from './lib/adapter/adapters/models/tonapi-models';
 export * from './lib/adapter/adapters/models/toncenter-types';
 export * from './lib/adapter/adapters/models/approve-adapter';
-export * from './lib/adapter/adapters/models/gas-price';
 export * from './lib/adapter/adapters/models/btc-wallet-provider';
-export * from './lib/adapter/adapters/bitcoin-adapter';
+export * from './lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter';
 export * from './lib/utils/web3-pure';
 export * from './lib/utils/models/evm-transaction-config';
 export * from './lib/utils/web3-types/bitcoin-web3-pure';

package/src/index.js

@@ -11,20 +11,17 @@ tslib_1.__exportStar(require("./lib/adapter/adapters/constants/erc20-token-abi")
 tslib_1.__exportStar(require("./lib/adapter/adapters/constants/trc-20-contract-abi"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/constants/tron-multicall-abi"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/evm-adapter-options"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/abstract-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/evm-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/solana-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/tron-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/ton-adapter"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/common/abstract-adapter"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-evm/evm-adapter"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-ton/ton-adapter"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/ton-adapter-config"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/common-types"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/ton-api-config"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/tonapi-models"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/toncenter-types"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/approve-adapter"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/models/gas-price"), exports);
 tslib_1.__exportStar(require("./lib/adapter/adapters/models/btc-wallet-provider"), exports);
-tslib_1.__exportStar(require("./lib/adapter/adapters/bitcoin-adapter"), exports);
+tslib_1.__exportStar(require("./lib/adapter/adapters/adapter-bitcoin/bitcoin-adapter"), exports);
 // utils aka web3pure
 tslib_1.__exportStar(require("./lib/utils/web3-pure"), exports);
 tslib_1.__exportStar(require("./lib/utils/models/evm-transaction-config"), exports);

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

@@ -0,0 +1,35 @@
+import { BitcoinBlockchainName, BlockchainName, HttpClient, ICustomLogger, PriceTokenAmount, Token, TokenAmount } from '@cryptorubic/core';
+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 { 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>;
+    constructor(httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    getBalance(userAddress: string): Promise<BigNumber>;
+    getTokensBalances(userAddress: string, tokensAddresses: string[]): Promise<BigNumber[]>;
+    multicallContractsMethods<Output extends Web3PrimitiveType>(contractAbi: Abi, contractsData: {
+        contractAddress: string;
+        methodsData: MethodData[];
+    }[]): Promise<ContractMulticallResponse<Output>[][]>;
+    getBlockNumber(): Promise<number | {
+        blockNumber: number;
+        workchain: number;
+    }>;
+    getPublicKey(userAddress: string): Promise<string | null>;
+    checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
+    callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>): Promise<Token<BlockchainName>[]>;
+    read<T>(args: unknown): Promise<T>;
+    write(args: unknown): Promise<string>;
+    getPublicKeyFromWallet(): Promise<string>;
+    transfer(recipient: string, amount: string, fromAddress: string, memo?: string, options?: BasicSendTransactionOptions): Promise<string>;
+    sendPsbtTransaction(psbt: string, userAddress: string, inputIndexes: number[], options?: BasicSendTransactionOptions): Promise<string>;
+}

package/src/lib/adapter/adapters/{bitcoin-adapter.js → adapter-bitcoin/bitcoin-adapter.js}

@@ -3,18 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BitcoinAdapter = void 0;
 const core_1 = require("@cryptorubic/core");
 const bignumber_js_1 = require("bignumber.js");
-const abstract_adapter_1 = require("./abstract-adapter");
+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 {
-    httpClient;
-    constructor(httpClient, logger) {
+    constructor(httpClient, logger, rubicAppParams) {
         super(core_1.BLOCKCHAIN_NAME.BITCOIN, logger);
         this.httpClient = httpClient;
+        this.client = new bitcoin_adapter_client_1.BitcoinAdapterClient(httpClient, logger, rubicAppParams);
     }
     async getBalance(userAddress) {
         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);
     }
+    getTokensBalances(userAddress, tokensAddresses) {
+        return this.getBalance(userAddress).then((el) => [el]);
+    }
+    multicallContractsMethods(contractAbi, contractsData) {
+        throw new Error('Method not implemented.');
+    }
+    getBlockNumber() {
+        throw new Error('Method not implemented.');
+    }
     async getPublicKey(userAddress) {
         try {
             const url = `https://api.blockcypher.com/v1/btc/main/addrs/${userAddress}/full`;
@@ -55,7 +65,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
         throw new Error('Not implemented');
     }
     async getPublicKeyFromWallet() {
-        const res = await this.wallet.request({
+        const res = await this.client.clientWallet.request({
             method: 'request_accounts_and_keys',
             params: {
                 purposes: ['payment']
@@ -69,7 +79,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async transfer(recipient, amount, fromAddress, memo, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.wallet.request({
+            this.client.clientWallet.request({
                 method: 'transfer',
                 params: [
                     {
@@ -108,7 +118,7 @@ class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async sendPsbtTransaction(psbt, userAddress, inputIndexes, options) {
         const hashPromise = new Promise((resolve, reject) => {
-            this.wallet.request({
+            this.client.clientWallet.request({
                 method: 'sign_psbt',
                 params: {
                     psbt,

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

@@ -0,0 +1,16 @@
+import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
+import { RubicAppAdaptersFactoryParams } from '../../../constants/models/create-factory-params';
+import { BitconSendTxParams } from '../models/btc-send-tx-params';
+import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
+import { BtcWallet } from '../../models/btc-wallet-provider';
+import { TxStatus } from '../../models/web3-public-models/tx-status';
+export declare class BitcoinAdapterClient extends AbstractAdapterClient<BtcWallet, BitconSendTxParams, string> {
+    constructor(httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    getBlockchainName(): Promise<BlockchainName>;
+    getTransactionStatus(txHash: string): Promise<TxStatus>;
+    sendTransaction(params: BitconSendTxParams): Promise<string>;
+    private transfer;
+    private sendPsbtTransaction;
+    private getSrcStatusRecursive;
+    private isPsbtConfig;
+}

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

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BitcoinAdapterClient = void 0;
+const core_1 = require("@cryptorubic/core");
+const abstract_adapter_client_1 = require("../../common/client/abstract-adapter-client");
+const tx_status_1 = require("../../models/web3-public-models/tx-status");
+const waitFor_1 = require("../../utils/waitFor");
+class BitcoinAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
+    constructor(httpClient, logger, rubicAppParams) {
+        super(httpClient, logger, rubicAppParams);
+    }
+    getBlockchainName() {
+        return Promise.resolve(core_1.BLOCKCHAIN_NAME.BITCOIN);
+    }
+    async getTransactionStatus(txHash) {
+        const url = `https://api.blockcypher.com/v1/btc/main/txs/${txHash}`;
+        const { confirmations } = await this.httpClient.get(url);
+        return confirmations > 0 ? tx_status_1.TX_STATUS.SUCCESS : tx_status_1.TX_STATUS.PENDING;
+    }
+    async sendTransaction(params) {
+        if (this.isPsbtConfig(params.txOptions)) {
+            return this.sendPsbtTransaction(params.txOptions);
+        }
+        else {
+            return this.transfer(params.txOptions);
+        }
+    }
+    async transfer(txConfig, options) {
+        const hashPromise = new Promise((resolve, reject) => {
+            this.clientWallet.request({
+                method: 'transfer',
+                params: [
+                    {
+                        feeRate: 10,
+                        from: this.walletAddress,
+                        recipient: txConfig.depositAddress,
+                        amount: {
+                            amount: txConfig.value,
+                            decimals: 8
+                        },
+                        ...(txConfig.memo && { memo: txConfig.memo })
+                    }
+                ]
+            }, (error, txHash) => {
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    const hash = txHash;
+                    options?.onTransactionHash?.(hash);
+                    resolve(hash);
+                }
+            });
+        });
+        try {
+            const srcTxHash = await hashPromise;
+            if (typeof srcTxHash === 'string') {
+                const statusData = await this.getSrcStatusRecursive(srcTxHash);
+                return statusData.hash;
+            }
+            throw new Error();
+        }
+        catch {
+            throw new Error('Failed to transfer funds');
+        }
+    }
+    async sendPsbtTransaction(txConfig, options) {
+        const hashPromise = new Promise((resolve, reject) => {
+            this.clientWallet.request({
+                method: 'sign_psbt',
+                params: [
+                    {
+                        psbt: txConfig.psbt,
+                        signInputs: {
+                            [this.walletAddress]: txConfig.signInputs
+                        },
+                        allowedSignHash: 1,
+                        broadcast: true
+                    }
+                ]
+            }, (error, txHash) => {
+                if (error) {
+                    reject(error);
+                }
+                else {
+                    const txData = txHash;
+                    options?.onTransactionHash?.(txData.result.txId);
+                    resolve(txData.result.txId);
+                }
+            });
+        });
+        try {
+            const srcTxHash = await hashPromise;
+            if (typeof srcTxHash === 'string') {
+                const statusData = await this.getSrcStatusRecursive(srcTxHash);
+                return statusData.hash;
+            }
+            throw new Error();
+        }
+        catch {
+            throw new Error('Failed to sign psbt transaction');
+        }
+    }
+    async getSrcStatusRecursive(srcTxHash) {
+        const srcTxStatus = await this.getSrcTxStatus(core_1.BLOCKCHAIN_NAME.BITCOIN, srcTxHash);
+        if (srcTxStatus === tx_status_1.TX_STATUS.FAIL || srcTxStatus === tx_status_1.TX_STATUS.SUCCESS) {
+            return {
+                status: srcTxStatus,
+                hash: srcTxHash
+            };
+        }
+        await (0, waitFor_1.waitFor)(300000);
+        return this.getSrcStatusRecursive(srcTxHash);
+    }
+    isPsbtConfig(txConfig) {
+        return 'psbt' in txConfig;
+    }
+}
+exports.BitcoinAdapterClient = BitcoinAdapterClient;

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

@@ -0,0 +1,5 @@
+import { BitcoinPsbtEncodedConfig } from './btc-web3-private-models/bitcoin-psbt-encoded-config';
+import { BitcoinTransferEncodedConfig } from './btc-web3-private-models/bitcoin-transfer-encoded-config';
+export interface BitconSendTxParams {
+    txOptions: BitcoinTransferEncodedConfig | BitcoinPsbtEncodedConfig;
+}

package/src/lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-psbt-encoded-config.d.ts

@@ -0,0 +1,5 @@
+import { BasicSendTransactionOptions } from '../../../models/basic-transaction-options';
+export interface BitcoinPsbtEncodedConfig extends BasicSendTransactionOptions {
+    signInputs: number[];
+    psbt: string;
+}

package/src/lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-trade-types.d.ts

@@ -0,0 +1,7 @@
+export interface BitcoinTransferTxApiResp {
+    extraFields: {
+        memo: string;
+    };
+    depositAddress: string;
+    value: string;
+}

package/src/lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-transfer-encoded-config.d.ts

@@ -0,0 +1,6 @@
+import { BasicSendTransactionOptions } from '../../../models/basic-transaction-options';
+export interface BitcoinTransferEncodedConfig extends BasicSendTransactionOptions {
+    memo?: string;
+    depositAddress: string;
+    value: string;
+}

package/src/lib/adapter/adapters/adapter-bitcoin/models/btc-web3-private-models/bitcoin-transfer-encoded-config.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,80 @@
+import { BlockchainName, HttpClient, ICustomLogger, TokenAmount } from '@cryptorubic/core';
+import { RubicAppAdaptersFactoryParams } from '../../../constants/models/create-factory-params';
+import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
+import { Abi, TransactionReceipt, WalletActions, WalletClient } from 'viem';
+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 { EvmAdapter } from '../evm-adapter';
+import { TxStatus } from '../../models/web3-public-models/tx-status';
+import { ApproveAdapterClient } from '../../models/approve-adapter';
+import { AllowanceInfo } from '../../models/common-types';
+export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> implements ApproveAdapterClient<EvmTransactionConfig> {
+    private readonly evmAdapter;
+    constructor(evmAdapter: EvmAdapter, httpClient: HttpClient, logger?: ICustomLogger, rubicAppParams?: RubicAppAdaptersFactoryParams);
+    getBlockchainName(): Promise<BlockchainName | undefined>;
+    getAllowance(fromTokenAddress: string, walletAddress: string, spenderAddress: string): Promise<AllowanceInfo>;
+    needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
+    approve(fromAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
+    /**
+     * Build encoded approve transaction config.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Amount of tokens in approval window in spending cap field
+     * @returns Encoded approve transaction config.
+     */
+    encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): EvmTransactionConfig;
+    needPermit2Approve(token: TokenAmount, permit2Address: string, walletAddress: string, spenderAddress: string): Promise<boolean>;
+    /**
+     * @param tokenAddress Token address you want to approve for spending
+     * @param permit2Address Addres of permit2 contract
+     * @param spenderAddress Contract address spending your tokens
+     * @param amount Approved amount
+     * @param deadline Ms number added to current time (Date.now()) until approve expiration
+     */
+    approveOnPermit2(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<TransactionReceipt>;
+    getTransactionStatus(hash: string): Promise<TxStatus>;
+    /**
+     * Gets mined transaction receipt.
+     * @param hash Transaction hash
+     */
+    private getTransactionReceipt;
+    /**
+     * Sends Eth in transaction and resolve the promise when the transaction is included in the block.
+     * @param toAddress Eth receiver address.
+     * @param [options] Additional options.
+     * @returns Transaction receipt.
+     */
+    sendTransaction(params: EvmSendTxParams): Promise<TransactionReceipt>;
+    /**
+     * Tries to send Eth in transaction and resolve the promise when the transaction is included in the block or rejects the error.
+     * @param toAddress Eth receiver address.
+     * @param [options] Additional options.
+     * @returns Transaction receipt.
+     */
+    trySendTransaction(toAddress: string, options: EvmTransactionOptions): 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.
+     * @param contractAbi Abi of smart-contract which method is to be executed.
+     * @param methodName Method name to execute.
+     * @param methodArguments Method arguments.
+     * @param [options] Additional options.
+     * @returns Smart-contract method returned value.
+     */
+    executeContractMethod(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments: unknown[], options?: EvmTransactionOptions): Promise<TransactionReceipt>;
+    /**
+     * Tries to execute method of smart-contract and resolve the promise when the transaction is included in the block or rejects the error.
+     * @param contractAddress Address of smart-contract which method is to be executed.
+     * @param contractAbi Abi of smart-contract which method is to be executed.
+     * @param methodName Method name to execute.
+     * @param methodArguments Method arguments.
+     * @param [options] Additional options.
+     * @param allowError Check error and decides to execute contact if error is allowed.
+     */
+    tryExecuteContractMethod(contractAddress: string, contractAbi: Abi, methodName: string, methodArguments: unknown[], options?: EvmTransactionOptions, allowError?: (err: Web3Error) => boolean): Promise<TransactionReceipt>;
+    private shouldIgnoreError;
+    signMessage(message: string): Promise<string>;
+    private getChainAndAccount;
+}