@cryptorubic/web3 1.0.0-alpha.no-sdk.24 → 1.0.0-alpha.no-sdk.26

package/package.json

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

package/src/index.d.ts

@@ -84,6 +84,7 @@ export * from './lib/errors/blockchain/user-reject.error';
 export * from './lib/errors/blockchain/wrong-from-address.error';
 export * from './lib/errors/blockchain/wrong-receiver-address.error';
 export * from './lib/errors/common/timeout.error';
+export * from './lib/errors/common/tx-reverted-in-chain.error';
 export * from './lib/errors/cross-chain/cross-chain-is-unavailable.error';
 export * from './lib/errors/cross-chain/insufficient-funds-gas-price-value.error';
 export * from './lib/errors/cross-chain/low-to-slippage.error';

package/src/index.js

@@ -87,6 +87,7 @@ tslib_1.__exportStar(require("./lib/errors/blockchain/user-reject.error"), expor
 tslib_1.__exportStar(require("./lib/errors/blockchain/wrong-from-address.error"), exports);
 tslib_1.__exportStar(require("./lib/errors/blockchain/wrong-receiver-address.error"), exports);
 tslib_1.__exportStar(require("./lib/errors/common/timeout.error"), exports);
+tslib_1.__exportStar(require("./lib/errors/common/tx-reverted-in-chain.error"), exports);
 tslib_1.__exportStar(require("./lib/errors/cross-chain/cross-chain-is-unavailable.error"), exports);
 tslib_1.__exportStar(require("./lib/errors/cross-chain/insufficient-funds-gas-price-value.error"), exports);
 tslib_1.__exportStar(require("./lib/errors/cross-chain/low-to-slippage.error"), exports);

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

@@ -69,7 +69,7 @@ export declare class EvmAdapter extends AbstractAdapter<PublicActions & PublicCl
      * @param [options] Additional options.
      * @returns Approval transaction hash.
      */
-    approveTokens(walletAddress: string, tokenAddress: string, spenderAddress: string, amount?: BigNumber | 'infinity', options?: EvmTransactionOptions): Promise<string>;
+    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.

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

@@ -320,12 +320,12 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
      * @param [options] Additional options.
      * @returns Approval transaction hash.
      */
-    async approveTokens(walletAddress, tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
+    async approveTokens(tokenAddress, spenderAddress, amount = 'infinity', options = {}) {
         try {
             const rawValue = amount === 'infinity' ? new bignumber_js_1.default(2).pow(256).minus(1) : amount;
             const encodedApprove = this.encodeApprove(tokenAddress, spenderAddress, rawValue.toFixed(0));
             const gaslessParams = {
-                account: walletAddress,
+                account: this.signer.walletAddress,
                 to: tokenAddress,
                 value: BigInt('0'),
                 data: encodedApprove.data

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

@@ -10,6 +10,7 @@ const viem_blockchain_mapping_1 = require("../../../constants/viem-blockchain-ma
 const parse_evm_error_1 = require("../utils/parse-evm-error");
 const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
+const tx_reverted_in_chain_error_1 = require("packages/web3/src/lib/errors/common/tx-reverted-in-chain.error");
 class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(evmPublic, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
@@ -106,6 +107,9 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 })
             };
             const receipt = await this.sendTransaction({ txOptions: sendParams });
+            if (receipt.status !== 'success') {
+                throw new tx_reverted_in_chain_error_1.TxRevertedInBlockchainError();
+            }
             return receipt;
         }
         catch (err) {

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

@@ -4,12 +4,12 @@ exports.SolanaAdapterSigner = void 0;
 const core_1 = require("@cryptorubic/core");
 const web3_js_1 = require("@solana/web3.js");
 const waitFor_1 = require("../../utils/waitFor");
-const timeout_error_1 = require("../../../../errors/common/timeout.error");
 const js_base64_1 = require("js-base64");
 const user_reject_error_1 = require("../../../../errors/blockchain/user-reject.error");
 const errors_1 = require("../../utils/errors");
 const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
 const tx_status_1 = require("../../models/web3-public-models/tx-status");
+const tx_reverted_in_chain_error_1 = require("packages/web3/src/lib/errors/common/tx-reverted-in-chain.error");
 class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     constructor(connection, httpClient, logger, clientParams) {
         super(httpClient, logger, clientParams);
@@ -91,7 +91,7 @@ class SolanaAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigne
             });
         }
         if (!fetchedTx || fetchedTx.meta?.err)
-            throw new timeout_error_1.TimeoutError();
+            throw new tx_reverted_in_chain_error_1.TxRevertedInBlockchainError();
     }
 }
 exports.SolanaAdapterSigner = SolanaAdapterSigner;

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

@@ -12,7 +12,8 @@ import { ClientAdaptersFactoryParams } from '../../models/create-factory-params'
 import { TronAdapterSigner } from './signer/tron-adapter-signer';
 import { TronTransactionOptions } from './models/tron-send-tx-params';
 import { AllowanceInfo } from '../models/common-types';
-export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> {
+import { ApprovableAdapter } from '../models/approve-adapter';
+export declare class TronAdapter extends AbstractAdapter<TronWeb, TronWeb, TronBlockchainName> implements ApprovableAdapter<TronTransactionConfig> {
     readonly signer: TronAdapterSigner;
     private readonly multicallAddress;
     needPreswapAction(): Promise<boolean>;

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

@@ -30,13 +30,12 @@ export interface ApprovableAdapter<T> extends AbstractAdapter<any, any, Blockcha
     needApprove(token: TokenAmount, contractAddress: string, walletAddress: string, amount: string): Promise<boolean>;
     /**
      * Executes approve method in ERC-20 token contract.
-     * @param walletAddress Address of user wallet.
      * @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.
      */
-    approveTokens(walletAddress: string, tokenAddress: string, spenderAddress: string, amount: BigNumber | 'infinity', options: BasicSendTransactionOptions): Promise<string>;
+    approveTokens(tokenAddress: string, spenderAddress: string, amount: BigNumber | 'infinity', options: BasicSendTransactionOptions): Promise<string>;
 }
 export declare function isApprovableAdapter(adapter: AbstractAdapter<any, any, BlockchainName, {}>): adapter is ApprovableAdapter<EvmTransactionConfig | TronTransactionConfig>;

package/src/lib/errors/common/tx-reverted-in-chain.error.d.ts

@@ -0,0 +1,4 @@
+import { RubicSdkError } from '../rubic-sdk.error';
+export declare class TxRevertedInBlockchainError extends RubicSdkError {
+    constructor(message?: string);
+}

package/src/lib/errors/common/tx-reverted-in-chain.error.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TxRevertedInBlockchainError = void 0;
+const rubic_sdk_error_1 = require("../rubic-sdk.error");
+class TxRevertedInBlockchainError extends rubic_sdk_error_1.RubicSdkError {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, TxRevertedInBlockchainError.prototype);
+    }
+}
+exports.TxRevertedInBlockchainError = TxRevertedInBlockchainError;