@cryptorubic/web3 1.1.0-alpha-stellar.50 → 1.1.0-alpha-stellar.52

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.1.0-alpha-stellar.50",
+    "version": "1.1.0-alpha-stellar.52",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

package/src/lib/adapter/adapters/adapter-stellar/signer/stellar-adapter-signer.d.ts

@@ -4,6 +4,7 @@ import { StellarClient } from '../models/stellar-client';
 import { StellarSendTxParams } from '../models/stellar-send-tx-params';
 import { StellarWallet } from '../models/stellar-wallet';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
+import { xdr } from '@stellar/stellar-sdk';
 export declare class StellarAdapterSigner extends AbstractAdapterSigner<StellarWallet, StellarSendTxParams, string> {
     private readonly publicRef;
     get publicClient(): StellarClient;
@@ -13,4 +14,5 @@ export declare class StellarAdapterSigner extends AbstractAdapterSigner<StellarW
     write<T>(): Promise<T>;
     getBlockchainName(): Promise<BlockchainName>;
     sendTransaction(params: StellarSendTxParams): Promise<string>;
+    parseTxError(txResult: xdr.TransactionResult): void;
 }

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

@@ -43,18 +43,31 @@ class StellarAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSign
                 address: this.walletAddress
             });
             const resp = await this.publicClient.sendTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(signedTxXdr, stellar_sdk_1.Networks.PUBLIC));
-            if (resp.status === 'ERROR') {
-                throw new Error('Failed to execute transaction', { cause: resp.errorResult });
+            const txStatus = await this.publicClient.pollTransaction(resp.hash);
+            if (txStatus.status === 'FAILED') {
+                this.parseTxError(txStatus.resultXdr);
             }
             if (params.txOptions.onTransactionHash) {
-                params.txOptions.onTransactionHash?.(resp.hash);
+                params.txOptions.onTransactionHash?.(txStatus.txHash);
             }
-            return resp.hash;
+            return txStatus.txHash;
         }
         catch (err) {
             console.error('Send transaction error', err);
             throw err;
         }
     }
+    parseTxError(txResult) {
+        const failedTxCode = txResult.result().switch().name;
+        if (failedTxCode === 'txInsufficientBalance') {
+            throw new insufficient_funds_gas_price_value_error_1.InsufficientFundsGasPriceValueError();
+        }
+        const failedOperation = txResult.result().results()[0];
+        const failedOperationCode = failedOperation.tr().value().switch().name;
+        if (failedOperationCode === 'changeTrustLowReserve') {
+            throw new insufficient_funds_gas_price_value_error_1.InsufficientFundsGasPriceValueError();
+        }
+        throw new Error(failedOperationCode);
+    }
 }
 exports.StellarAdapterSigner = StellarAdapterSigner;

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

@@ -3,7 +3,7 @@ import { AbstractAdapter } from '../common/abstract-adapter';
 import { StellarClient } from './models/stellar-client';
 import { StellarWallet } from './models/stellar-wallet';
 import { TxStatus } from '../models/web3-public-models/tx-status';
-import { Horizon } from '@stellar/stellar-sdk';
+import { Account, Horizon } from '@stellar/stellar-sdk';
 import { ClientAdaptersFactoryParams } from '../../models/create-factory-params';
 import { StellarAdapterSigner } from './signer/stellar-adapter-signer';
 import BigNumber from 'bignumber.js';
@@ -42,7 +42,7 @@ export declare class StellarAdapter extends AbstractAdapter<StellarClient, Stell
     getTransactionStatus(srcTxHash: string): Promise<TxStatus>;
     getMinWeiBalance(userAddress: string): Promise<BigNumber>;
     getFeeFromTransaction(xdr: string): BigNumber;
-    private parseTxError;
+    getAccountInfo(walletAddress: string): Promise<Account>;
     callContractMethod<T extends Web3PrimitiveType = string>(_contractAddress: string, _contractAbi: Abi | undefined, _methodName: string, _methodArguments?: {
         value: string;
         type: string;

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

@@ -10,7 +10,7 @@ const stellar_sdk_2 = require("@stellar/stellar-sdk");
 const bignumber_js_1 = require("bignumber.js");
 const web3_pure_1 = require("../../../utils/web3-pure");
 const fake_stellar_wallet_1 = require("./constants/fake-stellar-wallet");
-const insufficient_funds_gas_price_value_error_1 = require("../../../errors/cross-chain/insufficient-funds-gas-price-value.error");
+const inactive_account_error_1 = require("../../../errors/blockchain/inactive-account.error");
 class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
     constructor(rpc, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.STELLAR, logger);
@@ -132,9 +132,12 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
                 address: this.signer.walletAddress
             });
             const resp = await this.public.sendTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(signedTxXdr, stellar_sdk_1.Networks.PUBLIC));
+            if (resp.status === 'ERROR' && resp.errorResult) {
+                this.signer.parseTxError(resp.errorResult);
+            }
             const resStatus = await this.public.pollTransaction(resp.hash);
             if (resStatus.status === 'FAILED') {
-                this.parseTxError(resStatus.resultXdr);
+                this.signer.parseTxError(resStatus.resultXdr);
             }
             return resStatus.txHash;
         }
@@ -144,7 +147,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
         }
     }
     async encodeTrustline(tokenAddress, walletAddress) {
-        const account = await this.public.getAccount(walletAddress);
+        const account = await this.getAccountInfo(walletAddress);
         const tx = new stellar_sdk_1.TransactionBuilder(account, {
             fee: stellar_sdk_1.BASE_FEE,
             networkPassphrase: stellar_sdk_1.Networks.PUBLIC
@@ -226,11 +229,16 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
         const parsedTranssaction = stellar_sdk_1.TransactionBuilder.fromXDR(xdr, stellar_sdk_1.Networks.PUBLIC);
         return new bignumber_js_1.default(parsedTranssaction.fee);
     }
-    parseTxError(txResult) {
-        const failedOperation = txResult.result().results()[0];
-        const failedOperationCode = failedOperation.tr().value().switch().name;
-        if (failedOperationCode === stellar_sdk_1.xdr.ChangeTrustResultCode.changeTrustLowReserve().name) {
-            throw new insufficient_funds_gas_price_value_error_1.InsufficientFundsGasPriceValueError();
+    async getAccountInfo(walletAddress) {
+        try {
+            const account = await this.public.getAccount(walletAddress);
+            return account;
+        }
+        catch (err) {
+            if (err.message?.includes('Account not found')) {
+                throw new inactive_account_error_1.InactiveAccountError();
+            }
+            throw err;
         }
     }
     async callContractMethod(_contractAddress, _contractAbi = [], _methodName, _methodArguments = [], _options) {

package/src/lib/errors/blockchain/inactive-account.error.d.ts

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

package/src/lib/errors/blockchain/inactive-account.error.js

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