@cryptorubic/web3 1.1.0-alpha-stellar.30 → 1.1.0-alpha-stellar.32

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "1.1.0-alpha-stellar.30",
+    "version": "1.1.0-alpha-stellar.32",
     "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-rpc-provider.d.ts

@@ -0,0 +1,4 @@
+export interface StellarRpcProvider {
+    horizon: string;
+    soroban: string;
+}

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

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

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

@@ -11,10 +11,12 @@ 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 { StellarRpcProvider } from './models/stellar-rpc-provider';
 export declare class StellarAdapter extends AbstractAdapter<StellarClient, StellarWallet, StellarBlockchainName> {
-    private readonly rpcList;
+    private readonly rpc;
     readonly signer: StellarAdapterSigner;
-    constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
+    private readonly horizonClient;
+    constructor(rpc: StellarRpcProvider[], httpClient: HttpClient, logger?: ICustomLogger, clientParams?: ClientAdaptersFactoryParams);
     initWeb3Client(): void;
     getBlockNumber(): Promise<number | {
         blockNumber: number;

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

@@ -11,13 +11,14 @@ 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(rpcList, httpClient, logger, clientParams) {
+    constructor(rpc, httpClient, logger, clientParams) {
         super(core_1.BLOCKCHAIN_NAME.STELLAR, logger);
-        this.rpcList = rpcList;
+        this.rpc = rpc;
         this.signer = new stellar_adapter_signer_1.StellarAdapterSigner(this.publicRef, httpClient, logger, clientParams);
+        this.horizonClient = new stellar_sdk_1.Horizon.Server(rpc[0].horizon);
     }
     initWeb3Client() {
-        this.public = new stellar_sdk_2.rpc.Server(this.rpcList[0], {
+        this.public = new stellar_sdk_2.rpc.Server(this.rpc[0].soroban, {
             allowHttp: true,
             timeout: 5000
         });
@@ -27,6 +28,13 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
         return sequence;
     }
     async getTokensBalances(userAddress, tokensAddresses) {
+        try {
+            const resp = await this.horizonClient.loadAccount(userAddress);
+            console.log(resp.balances);
+        }
+        catch (err) {
+            console.error(err);
+        }
         return Promise.all(tokensAddresses.map((address) => this.getBalance(userAddress, address)));
     }
     async getBalance(userAddress, tokenAddress) {
@@ -84,7 +92,6 @@ class StellarAdapter extends abstract_adapter_1.AbstractAdapter {
             return new bignumber_js_1.default(trustline.limit().toString()).lt(token.weiAmount);
         }
         catch (err) {
-            console.error(err);
             return true;
         }
     }

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

@@ -3,7 +3,8 @@ 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';
-export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]> & Record<StellarBlockchainName, string[]>;
+import { StellarRpcProvider } from '../adapters/adapter-stellar/models/stellar-rpc-provider';
+export type RpcListType = Record<EvmBlockchainName, string[]> & Record<TronBlockchainName, TronWebProvider[]> & Record<SolanaBlockchainName, string[]> & Record<SuiBlockchainName, string[]> & Record<StellarBlockchainName, StellarRpcProvider[]>;
 export interface AdapterFactoryParams {
     rpcList: RpcListType;
     httpClient?: HttpClient;

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);
     }
 }