@cryptorubic/web3 1.0.0-alpha.no-sdk.14 → 1.0.0-alpha.no-sdk.16

package/package.json

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

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

@@ -15,7 +15,15 @@ export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient
     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>;
+    /**
+     * Executes approve method in ERC-20 token contract.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Token amount to approve in wei.
+     * @param [options] Additional options.
+     * @returns Approval transaction hash.
+     */
+    approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<string>;
     /**
      * Build encoded approve transaction config.
      * @param tokenAddress Address of the smart-contract corresponding to the token.
@@ -78,5 +86,5 @@ export declare class EvmAdapterClient extends AbstractAdapterClient<WalletClient
     private getChainAndAccount;
     read<T>(address: string, abi: Abi, method: string, methodArgs?: unknown[]): Promise<T>;
     writeContract(address: string, abi: Abi, method: string, value?: string, methodArgs?: unknown[]): Promise<string>;
-    write(address: string, to: string, value: string, data: string): Promise<string>;
+    write(address: string, to: string, value: string, data: string, options?: EvmTransactionOptions): Promise<string>;
 }

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

@@ -14,6 +14,7 @@ const parse_evm_error_1 = require("../utils/parse-evm-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");
+const insufficient_funds_gas_price_value_error_1 = require("packages/web3/src/lib/errors/cross-chain/insufficient-funds-gas-price-value.error");
 class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
     constructor(evmPublic, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
@@ -42,9 +43,29 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         const { allowanceWei } = await this.getAllowance(fromTokenAddress, walletAddress, contractAddress);
         return allowanceWei.lt(token.weiAmount);
     }
-    async approve(fromAddress, tokenAddress, spenderAddress, amount) {
-        const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
-        return this.write(fromAddress, config.to, config.value, config.data);
+    /**
+     * Executes approve method in ERC-20 token contract.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Token amount to approve in wei.
+     * @param [options] Additional options.
+     * @returns Approval transaction hash.
+     */
+    async approveTokens(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+        try {
+            const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
+            const gasOptions = options.gasPriceOptions ? (0, options_1.getGasOptions)(options) : {};
+            const txOptions = { ...options, ...gasOptions };
+            const receipt = await this.executeContractMethod(tokenAddress, erc20_token_abi_1.erc20TokenAbi, 'approve', [spenderAddress, BigInt(rawValue.toFixed(0))], txOptions);
+            return receipt.transactionHash;
+        }
+        catch (err) {
+            if (err?.message?.includes('gas required exceeds allowance') || err?.message?.includes('insufficient balance to pay for gas')) {
+                throw new insufficient_funds_gas_price_value_error_1.InsufficientFundsGasPriceValueError();
+            }
+            console.debug(err);
+            throw err;
+        }
     }
     /**
      * Build encoded approve transaction config.
@@ -119,8 +140,7 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
                 ...(params.txOptions.gas && { gas: BigInt(params.txOptions.gas) }),
                 chain
             };
-            // @ts-ignore
-            const hash = await this.web3.sendTransaction(viemParams);
+            const hash = await this.clientWallet.sendTransaction(viemParams);
             params.txOptions?.onTransactionHash?.(hash);
             return (0, actions_1.waitForTransactionReceipt)(this.clientWallet, { hash });
         }
@@ -327,13 +347,15 @@ class EvmAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
         });
         return result;
     }
-    async write(address, to, value, data) {
+    async write(address, to, value, data, options = {}) {
         const result = await this.clientWallet.sendTransaction({
             account: address,
             to: to,
             value: (0, viem_1.parseEther)(value),
             data: data,
-            chain: this.evmPublic.chain
+            chain: this.evmPublic.chain,
+            ...(options.gas && { gas: BigInt(options.gas) }),
+            ...(0, options_1.getViemGasOptions)(options)
         });
         return result;
     }

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

@@ -1,8 +1,9 @@
 import { TronWeb } from 'tronweb';
+import BigNumber from 'bignumber.js';
 import { AbstractAdapterClient } from '../../common/client/abstract-adapter-client';
 import { BlockchainName, HttpClient, ICustomLogger, TokenAmount } from '@cryptorubic/core';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
-import { TronSendTxParams } from '../models/tron-send-tx-params';
+import { TronSendTxParams, TronTransactionOptions } from '../models/tron-send-tx-params';
 import { TxStatus } from '../../models/web3-public-models/tx-status';
 import { TronTransactionConfig } from '../../../../utils/models/tron-transaction-config';
 import { ApproveAdapterClient } from '../../models/approve-adapter';
@@ -16,7 +17,7 @@ export declare class TronAdapterClient extends AbstractAdapterClient<TronWeb, Tr
     getBlockchainName(): Promise<BlockchainName>;
     getAllowance(fromTokenAddress: string, walletAddress: string, spender: string): Promise<AllowanceInfo>;
     needApprove(from: TokenAmount, walletAddress: string, spender: string): Promise<boolean>;
-    approve(fromAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
+    approveTokens(tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: TronTransactionOptions): Promise<string>;
     encodeApprove(tokenAddress: string, spenderAddress: string, amount?: string): TronTransactionConfig;
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     /**

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

@@ -9,6 +9,7 @@ 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("../../../../utils/web3-types/tron-web3-pure");
+const options_1 = require("../../utils/options");
 class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient {
     constructor(tronWeb, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
@@ -45,9 +46,24 @@ class TronAdapterClient extends abstract_adapter_client_1.AbstractAdapterClient
         const { allowanceWei } = await this.getAllowance(from.address, walletAddress, spender);
         return allowanceWei.lt(from.weiAmount);
     }
-    async approve(fromAddress, tokenAddress, spenderAddress, amount) {
-        const config = this.encodeApprove(tokenAddress, spenderAddress, amount);
-        return this.write(config.to, config.signature, config.arguments);
+    async approveTokens(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+        try {
+            const contract = await this.tronWeb.contract(trc_20_contract_abi_1.TRC20_CONTRACT_ABI, tokenAddress);
+            const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
+            const transactionHash = await contract.approve(spenderAddress, rawValue.toFixed(0)).send({
+                ...(options.feeLimit && {
+                    feeLimit: (0, options_1.stringifyAmount)(options.feeLimit)
+                })
+            });
+            if (options.onTransactionHash) {
+                options.onTransactionHash(transactionHash);
+            }
+            return transactionHash;
+        }
+        catch (err) {
+            console.error('Approve execution error: ', err);
+            throw (0, parse_tron_error_1.parseTronError)(err);
+        }
     }
     encodeApprove(tokenAddress, spenderAddress, amount) {
         const amountWei = amount ?? new bignumber_js_1.default(2).pow(256).minus(1).toFixed();

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

@@ -3,6 +3,8 @@ import { AllowanceInfo } from './common-types';
 import { EvmTransactionConfig } from '../../../utils/models/evm-transaction-config';
 import { TronTransactionConfig } from '../../../utils/models/tron-transaction-config';
 import { AbstractAdapterClient } from '../common/client/abstract-adapter-client';
+import { BasicSendTransactionOptions } from './basic-transaction-options';
+import BigNumber from 'bignumber.js';
 export interface ApproveAdapterClient<T> extends AbstractAdapterClient<{}, {}, {}> {
     /**
      * @param fromTokenAddress erc20 address of checked token
@@ -27,11 +29,13 @@ export interface ApproveAdapterClient<T> extends AbstractAdapterClient<{}, {}, {
      */
     needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     /**
-     * Get data for tokens approve
-     * @param tokenAddress erc20 token address
-     * @param spenderAddress spender address
-     * @param amount amount in wei
+     * Executes approve method in ERC-20 token contract.
+     * @param tokenAddress Address of the smart-contract corresponding to the token.
+     * @param spenderAddress Wallet or contract address to approve.
+     * @param amount Token amount to approve in wei.
+     * @param [options] Additional options.
+     * @returns Approval transaction receipt.
      */
-    approve(walletAddress: string, tokenAddress: string, spenderAddress: string, amount?: string): Promise<string>;
+    approveTokens(tokenAddress: string, spenderAddress: string, amount: BigNumber | 'infinity', options: BasicSendTransactionOptions): Promise<string>;
 }
 export declare function isApprovableAdapterClient(adapterClient: AbstractAdapterClient<{}, {}, {}>): adapterClient is ApproveAdapterClient<EvmTransactionConfig | TronTransactionConfig>;