@cryptorubic/web3 1.1.0-alpha-stellar.29 → 1.1.0-alpha-stellar.31

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { BlockchainName, HttpClient, ICustomLogger } from '@cryptorubic/core';
+import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { ClientAdaptersFactoryParams } from '../../../models/create-factory-params';
 import { AbstractAdapterSigner } from '../../common/signer/abstract-adapter-signer';
-import { Abi, PublicActions, PublicClient, TransactionReceipt, WalletActions, WalletClient } from 'viem';
 import { EvmSendTxParams, EvmTransactionOptions } from '../models/evm-send-tx-params';
 import { Web3Error } from '../utils/parse-evm-error';
 export declare class EvmAdapterSigner extends AbstractAdapterSigner<WalletClient & WalletActions, EvmSendTxParams, TransactionReceipt> {

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvmAdapterSigner = void 0;
 const core_1 = require("@cryptorubic/core");
-const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
+const bignumber_js_1 = require("bignumber.js");
 const viem_1 = require("viem");
 const actions_1 = require("viem/actions");
-const options_1 = require("../../utils/options");
+const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
+const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
 const viem_blockchain_mapping_1 = require("../../../constants/viem-blockchain-mapping");
+const abstract_adapter_signer_1 = require("../../common/signer/abstract-adapter-signer");
+const options_1 = require("../../utils/options");
 const parse_evm_error_1 = require("../utils/parse-evm-error");
-const rubic_sdk_error_1 = require("../../../../errors/rubic-sdk.error");
-const tx_reverted_in_chain_error_1 = require("../../../../errors/common/tx-reverted-in-chain.error");
-const bignumber_js_1 = require("bignumber.js");
 class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
     get publicClient() {
         if (!this.publicRef.public) {
@@ -73,8 +73,8 @@ class EvmAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSigner {
                 value,
                 ...(params.txOptions.data && { data: params.txOptions.data })
             };
-            const gas = await this.publicClient.estimateGas(gaslessParams);
-            const calculatedGas = params.txOptions.gasLimitRatio
+            const gas = params.txOptions.gas ? BigInt(params.txOptions.gas) : await this.publicClient.estimateGas(gaslessParams);
+            const calculatedGas = !params.txOptions.gas && params.txOptions.gasLimitRatio
                 ? BigInt(new bignumber_js_1.default(gas.toString()).multipliedBy(params.txOptions.gasLimitRatio).toFixed(0))
                 : gas;
             const gasfulParams = {

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

@@ -1,5 +1,2 @@
 import { rpc } from '@stellar/stellar-sdk';
-export type StellarClient = {
-    soroban: rpc.Server;
-    horizon: rpc.Server;
-};
+export type StellarClient = rpc.Server;

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

@@ -28,12 +28,12 @@ class StellarAdapterSigner extends abstract_adapter_signer_1.AbstractAdapterSign
             const transaction = typeof params.txOptions.transaction === 'string'
                 ? stellar_sdk_1.TransactionBuilder.fromXDR(params.txOptions.transaction, stellar_sdk_1.Networks.PUBLIC)
                 : params.txOptions.transaction;
-            const preparedTransaction = await this.publicClient.soroban.prepareTransaction(transaction);
+            const preparedTransaction = await this.publicClient.prepareTransaction(transaction);
             const { signedTxXdr } = await this.wallet.signTransaction(preparedTransaction.toXDR(), {
                 networkPassphrase: stellar_sdk_1.Networks.PUBLIC,
                 address: this.walletAddress
             });
-            const resp = await this.publicClient.soroban.sendTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(signedTxXdr, stellar_sdk_1.Networks.PUBLIC));
+            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 });
             }

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

@@ -11,11 +11,10 @@ import { Abi } from 'viem';
 import { MethodData } from '../models/web3-public-models/method-data';
 import { ContractMulticallResponse } from '../models/web3-public-models/contract-multicall-response';
 import { StellarTransactionConfig } from '../../../utils/models/stellar-transaction-config';
-import { StellarProviderUrl } from './models/stellar-provider-url';
 export declare class StellarAdapter extends AbstractAdapter<StellarClient, StellarWallet, StellarBlockchainName> {
-    private readonly stellarProviderUrl;
+    private readonly rpcList;
     readonly signer: StellarAdapterSigner;
-    constructor(stellarProviderUrl: StellarProviderUrl, httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     initWeb3Client(): void;
     getBlockNumber(): Promise<number | {
         blockNumber: number;

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

@@ -11,23 +11,19 @@ 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");
 class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
-    constructor(stellarProviderUrl, httpClient, logger, clientParams) {
+    constructor(rpcList, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.STELLAR, logger);
-        this.stellarProviderUrl = stellarProviderUrl;
+        this.rpcList = rpcList;
         this.signer = new stellar_adapter_signer_1.StellarAdapterSigner(this.publicRef, httpClient, logger, clientParams);
     }
     initWeb3Client() {
-        const serverOptions = {
+        this.public = new stellar_sdk_2.rpc.Server(this.rpcList[0], {
             allowHttp: true,
             timeout: 5000
-        };
-        this.public = {
-            soroban: new stellar_sdk_2.rpc.Server(this.stellarProviderUrl.sorobanUrl, serverOptions),
-            horizon: new stellar_sdk_2.rpc.Server(this.stellarProviderUrl.horizonUrl, serverOptions)
-        };
+        });
     }
     async getBlockNumber() {
-        const { sequence } = await this.public.soroban.getLatestLedger();
+        const { sequence } = await this.public.getLatestLedger();
         return sequence;
     }
     async getTokensBalances(userAddress, tokensAddresses) {
@@ -36,10 +32,10 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
     async getBalance(userAddress, tokenAddress) {
         try {
             if (!tokenAddress || web3_pure_1.Web3Pure.isNativeAddress(core_1.BLOCKCHAIN_NAME.STELLAR, tokenAddress)) {
-                const resp = await this.public.soroban.getAccountEntry(userAddress);
+                const resp = await this.public.getAccountEntry(userAddress);
                 return new bignumber_js_1.default(resp.balance().toString());
             }
-            const resp = await this.public.soroban.getTrustline(userAddress, this.convertTokenAddressToAsset(tokenAddress));
+            const resp = await this.public.getTrustline(userAddress, this.convertTokenAddressToAsset(tokenAddress));
             return new bignumber_js_1.default(resp.balance().toString());
         }
         catch {
@@ -60,7 +56,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
                 .addOperation(contract.call(method))
                 .setTimeout(30)
                 .build();
-            const resp = await this.public.soroban.simulateTransaction(tx);
+            const resp = await this.public.simulateTransaction(tx);
             if ('error' in resp) {
                 throw new Error(resp.error);
             }
@@ -84,33 +80,26 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
             return false;
         }
         try {
-            const trustline = await this.public.soroban.getTrustline(walletAddress, this.convertTokenAddressToAsset(token.address));
+            const trustline = await this.public.getTrustline(walletAddress, this.convertTokenAddressToAsset(token.address));
             return new bignumber_js_1.default(trustline.limit().toString()).lt(token.weiAmount);
         }
         catch (err) {
-            console.error(err);
             return true;
         }
     }
     async addTrustline(tokenAddress) {
         try {
             const tx = await this.encodeTrustline(tokenAddress, this.signer.walletAddress);
-            try {
-                const resp = await this.public.horizon.simulateTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(tx, stellar_sdk_1.Networks.PUBLIC), undefined, 'record_allow_nonroot');
-                console.log(resp);
-            }
-            catch (err) {
-                console.log(err);
-            }
             const { signedTxXdr } = await this.signer.wallet.signTransaction(tx, {
                 networkPassphrase: stellar_sdk_1.Networks.PUBLIC,
                 address: this.signer.walletAddress
             });
-            const resp = await this.public.horizon.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 { hash } = await this.public.sendTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(signedTxXdr, stellar_sdk_1.Networks.PUBLIC));
+            const resp = await this.public.pollTransaction(hash);
+            if (resp.status === 'FAILED') {
+                throw new Error('Failed to execute transaction', { cause: resp.resultXdr });
             }
-            return resp.hash;
+            return resp.txHash;
         }
         catch (err) {
             this.logger?.customError('FAILED TO ADD TRUSTLINE', err);
@@ -118,7 +107,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
         }
     }
     async encodeTrustline(tokenAddress, walletAddress) {
-        const account = await this.public.soroban.getAccount(walletAddress);
+        const account = await this.public.getAccount(walletAddress);
         const tx = new stellar_sdk_1.TransactionBuilder(account, {
             fee: stellar_sdk_1.BASE_FEE,
             networkPassphrase: stellar_sdk_1.Networks.PUBLIC
@@ -151,7 +140,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
             .addOperation(operation)
             .setTimeout(30)
             .build();
-        const resp = await this.public.soroban.simulateTransaction(tx);
+        const resp = await this.public.simulateTransaction(tx);
         if ('error' in resp) {
             throw new Error(resp.error);
         }
@@ -160,7 +149,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async simulateTransaction(config) {
         try {
-            const resp = await this.public.soroban.simulateTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(config.transaction, stellar_sdk_1.Networks.PUBLIC));
+            const resp = await this.public.simulateTransaction(stellar_sdk_1.TransactionBuilder.fromXDR(config.transaction, stellar_sdk_1.Networks.PUBLIC));
             if ('error' in resp) {
                 throw new Error(resp.error);
             }
@@ -173,7 +162,7 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
     }
     async getTransactionStatus(srcTxHash) {
         try {
-            const resp = await this.public.soroban.pollTransaction(srcTxHash);
+            const resp = await this.public.pollTransaction(srcTxHash);
             if (resp.status === 'SUCCESS') {
                 return tx_status_1.TX_STATUS.SUCCESS;
             }

package/src/lib/adapter/blockchain-adapter-factory.service.d.ts

@@ -15,7 +15,6 @@ export declare class BlockchainAdapterFactoryService {
     private readonly createLogger?;
     private readonly tonParams?;
     private readonly clientParams?;
-    private readonly stellarParams?;
     readonly adapterStore: Partial<Record<BlockchainName, AbstractAdapter<unknown, unknown, BlockchainName>>>;
     protected readonly logger?: ICustomLogger;
     private constructor();

package/src/lib/adapter/blockchain-adapter-factory.service.js

@@ -11,13 +11,12 @@ const tron_adapter_1 = require("./adapters/adapter-tron/tron-adapter");
 const sui_adapter_1 = require("./adapters/adapter-sui/sui-adapter");
 const stellar_adapter_1 = require("./adapters/adapter-stellar/stellar-adapter");
 class BlockchainAdapterFactoryService {
-    constructor(rpcList, httpClient, createLogger, tonParams, clientParams, stellarParams) {
+    constructor(rpcList, httpClient, createLogger, tonParams, clientParams) {
         this.rpcList = rpcList;
         this.httpClient = httpClient;
         this.createLogger = createLogger;
         this.tonParams = tonParams;
         this.clientParams = clientParams;
-        this.stellarParams = stellarParams;
         this.adapterStore = {};
         this.adapterStore = this.createStorage();
         if (this.createLogger) {
@@ -32,7 +31,7 @@ class BlockchainAdapterFactoryService {
         // @TODO Add default logger
         const loggerFn = params.createLogger || undefined;
         const resolvedHttpClient = params.httpClient ?? (await Promise.resolve().then(() => require('axios')));
-        return new this(params.rpcList, resolvedHttpClient, params.createLogger, params.tonParams, params.clientParams, params.stellarParams);
+        return new this(params.rpcList, resolvedHttpClient, params.createLogger, params.tonParams, params.clientParams);
     }
     getAdapter(blockchain) {
         const adapter = this.adapterStore?.[blockchain];
@@ -82,6 +81,9 @@ class BlockchainAdapterFactoryService {
             if (blockchainType === core_1.CHAIN_TYPE.SOLANA) {
                 return new solana_adapter_1.SolanaAdapter(rpcs, this.httpClient, this.createLogger?.(`SOLANA_ADAPTER`), this.clientParams);
             }
+            if (blockchain === core_1.BLOCKCHAIN_NAME.STELLAR) {
+                return new stellar_adapter_1.StellarAdapter(rpcs, this.httpClient, this.logger, this.clientParams);
+            }
         }
         if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.tonParams?.tonApiConfig && this.tonParams?.tonClientConfig) {
             return new ton_adapter_1.TonAdapter(this.httpClient, this.tonParams, this.createLogger?.(`TON_ADAPTER`), this.clientParams);
@@ -89,9 +91,6 @@ class BlockchainAdapterFactoryService {
         if (blockchain === core_1.BLOCKCHAIN_NAME.BITCOIN && this.httpClient) {
             return new bitcoin_adapter_1.BitcoinAdapter(this.httpClient, this.createLogger?.(`BTC_ADAPTER`), this.clientParams);
         }
-        if (blockchain === core_1.BLOCKCHAIN_NAME.STELLAR && this.stellarParams) {
-            return new stellar_adapter_1.StellarAdapter(this.stellarParams, this.httpClient, this.logger, this.clientParams);
-        }
         return null;
     }
     connectWallet(blockchain, wallet) {

package/src/lib/adapter/models/create-factory-params.d.ts

@@ -1,17 +1,15 @@
-import { EvmBlockchainName, HttpClient, ICustomLogger, SolanaBlockchainName, SuiBlockchainName, TronBlockchainName } from '@cryptorubic/core';
+import { EvmBlockchainName, HttpClient, ICustomLogger, SolanaBlockchainName, StellarBlockchainName, SuiBlockchainName, TronBlockchainName } from '@cryptorubic/core';
 import { EnvType } from '../constants/models/env-type';
 import { TronWebProvider } from '../adapters/adapter-tron/models/tron-web-provider';
 import { TonAdapterConfig } from '../adapters/models/ton-adapter-config';
 import { FallbackTransportConfig, HttpTransportConfig } from 'viem';
-import { StellarProviderUrl } from '../adapters/adapter-stellar/models/stellar-provider-url';
-export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]>;
+export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]> & Record<StellarBlockchainName, string[]>;
 export interface AdapterFactoryParams {
     rpcList: RpcListType;
     httpClient?: HttpClient;
     tonParams?: TonAdapterConfig;
     createLogger?: (label: string) => ICustomLogger;
     clientParams?: ClientAdaptersFactoryParams;
-    stellarParams: StellarProviderUrl;
 }
 export interface ClientAdaptersFactoryParams {
     envType: EnvType;

package/src/lib/errors/blockchain/user-reject.error.d.ts

@@ -3,5 +3,5 @@ import { RubicSdkError } from '../rubic-sdk.error';
  * Thrown, when user cancels transaction.
  */
 export declare class UserRejectError extends RubicSdkError {
-    constructor();
+    constructor(message?: string);
 }

package/src/lib/errors/blockchain/user-reject.error.js

@@ -6,8 +6,8 @@ const rubic_sdk_error_1 = require("../rubic-sdk.error");
  * Thrown, when user cancels transaction.
  */
 class UserRejectError extends rubic_sdk_error_1.RubicSdkError {
-    constructor() {
-        super();
+    constructor(message) {
+        super(message);
         Object.setPrototypeOf(this, UserRejectError.prototype);
     }
 }

package/src/lib/adapter/adapters/adapter-stellar/models/stellar-provider-url.d.ts

@@ -1,4 +0,0 @@
-export interface StellarProviderUrl {
-    horizonUrl: string;
-    sorobanUrl: string;
-}

package/src/lib/adapter/adapters/adapter-stellar/models/stellar-provider-url.js

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