@cryptorubic/web3 0.8.17-alpha.solana.1 → 0.8.17-alpha.solana.3

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.17-alpha.solana.1",
+    "version": "0.8.17-alpha.solana.3",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.17-alpha.solana.1",
+        "@cryptorubic/core": "0.8.17-alpha.solana.3",
         "viem": "^2.19.1",
         "web3-utils": "^4.3.1",
         "@ton/ton": "^15.1.0",
         "@solana/web3.js": "1.95.3",
         "@solflare-wallet/utl-sdk": "^1.4.0",
         "@ethersproject/bignumber": "^5.7.0",
-        "@cryptorubic/tron-types": "0.8.17-alpha.solana.1",
+        "@cryptorubic/tron-types": "0.8.17-alpha.solana.3",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",

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

@@ -0,0 +1,9 @@
+import { HttpClient, ICustomLogger } from '@cryptorubic/core';
+import { SolanaAdapterConfig } from './solana-adapter-config';
+import { TonAdapterConfig } from './ton-adapter-config';
+export interface AdaptersFactoryParams {
+    tonParams: TonAdapterConfig;
+    solanaParams: SolanaAdapterConfig;
+    httpClient?: HttpClient;
+    createLogger?: (label: string) => ICustomLogger;
+}

package/src/lib/adapter/adapters/models/adapter-factory-params.js

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

package/src/lib/adapter/adapters/models/solana-adapter-config.d.ts

@@ -0,0 +1,3 @@
+export interface SolanaAdapterConfig {
+    heliusApiKey: string;
+}

package/src/lib/adapter/adapters/models/solana-adapter-config.js

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

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

@@ -5,11 +5,14 @@ import { HttpClient, ICustomLogger, PriceTokenAmount, SolanaBlockchainName, Toke
 import BigNumber from 'bignumber.js';
 import { SolanaRawInstruction } from './models/solana-web3-types';
 import { SolanaTxConfig } from '../../utils/models/solana-transaction-config';
+import { SolanaApiService } from './utils/solana-api-service';
+import { SolanaAdapterConfig } from './models/solana-adapter-config';
 export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
 export declare const DEFAULT_CU_LIMIT = 600000;
 export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
     private readonly httpClient;
-    constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger);
+    readonly apiService: SolanaApiService;
+    constructor(rpcList: string[], httpClient: HttpClient, solanaConfig: SolanaAdapterConfig, logger?: ICustomLogger);
     private createPublicClient;
     read<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
     write<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;

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

@@ -10,13 +10,15 @@ const bignumber_js_1 = require("bignumber.js");
 const solana_tokens_service_1 = require("./utils/solana-tokens-service");
 const bs58_1 = require("bs58");
 const utils_1 = require("ethers/lib/utils");
+const solana_api_service_1 = require("./utils/solana-api-service");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 exports.DEFAULT_CU_LIMIT = 600000;
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
-    constructor(rpcList, httpClient, logger) {
+    constructor(rpcList, httpClient, solanaConfig, logger) {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
         this.httpClient = httpClient;
         this.public = this.createPublicClient(rpcList);
+        this.apiService = new solana_api_service_1.SolanaApiService(httpClient, this.public, solanaConfig);
     }
     createPublicClient(rpcList) {
         if (!rpcList?.[0]) {

package/src/lib/adapter/adapters/utils/solana-api-service.d.ts

@@ -0,0 +1,18 @@
+import { HttpClient } from '@cryptorubic/core';
+import { Connection, VersionedTransaction } from '@solana/web3.js';
+import { SolanaAdapterConfig } from '../models/solana-adapter-config';
+export declare class SolanaApiService {
+    private httpClient;
+    private readonly connection;
+    private readonly HELIUS_API_URL;
+    private readonly HELIUS_API_KEY;
+    constructor(httpClient: HttpClient, connection: Connection, solanaConfig: SolanaAdapterConfig);
+    /**
+     * @returns ComputedUnitsLimit - like gasLimit in evm
+     */
+    getConsumedUnitsLimit(tx: VersionedTransaction): Promise<number>;
+    /**
+     * @returns ComputedUnitsPrice - like gasPrice in evm
+     */
+    getConsumedUnitsPrice(tx: VersionedTransaction): Promise<number>;
+}

package/src/lib/adapter/adapters/utils/solana-api-service.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaApiService = void 0;
+const utils_1 = require("ethers/lib/utils");
+class SolanaApiService {
+    constructor(httpClient, connection, solanaConfig) {
+        this.httpClient = httpClient;
+        this.connection = connection;
+        this.HELIUS_API_URL = 'https://mainnet.helius-rpc.com';
+        this.HELIUS_API_KEY = solanaConfig.heliusApiKey;
+    }
+    /**
+     * @returns ComputedUnitsLimit - like gasLimit in evm
+     */
+    async getConsumedUnitsLimit(tx) {
+        const DEFAULT_CU_LIMIT = 600000;
+        try {
+            const resp = await this.connection.simulateTransaction(tx, {
+                replaceRecentBlockhash: true
+            });
+            return resp.value.unitsConsumed ? resp.value.unitsConsumed * 1.2 : DEFAULT_CU_LIMIT;
+        }
+        catch (err) {
+            console.error('Solana_simulateTransaction_Error ==> ', err);
+            return DEFAULT_CU_LIMIT;
+        }
+    }
+    /**
+     * @returns ComputedUnitsPrice - like gasPrice in evm
+     */
+    async getConsumedUnitsPrice(tx) {
+        if (!this.HELIUS_API_KEY) {
+            throw new Error('[SolanaApiService_getConsumedUnitsPrice] params.solanaParams.heliusApiKey is not provided in "createFactory" method to use this method');
+        }
+        const resp = await this.httpClient.post(`${this.HELIUS_API_URL}/?api-key=${this.HELIUS_API_KEY}`, {
+            jsonrpc: '2.0',
+            id: '1',
+            method: 'getPriorityFeeEstimate',
+            params: [
+                {
+                    transaction: utils_1.base58.encode(tx.serialize()), // Pass the serialized transaction in Base58
+                    options: { priorityLevel: 'Medium' }
+                }
+            ]
+        });
+        return resp.result.priorityFeeEstimate;
+    }
+}
+exports.SolanaApiService = SolanaApiService;

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

@@ -2,21 +2,19 @@ import { SolanaAdapter } from './adapters/solana-adapter';
 import { TronAdapter } from './adapters/tron-adapter';
 import { AbstractAdapter } from './adapters/abstract-adapter';
 import { WalletProvider } from './constants/models/wallet-provider';
-import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, HttpClient, TonBlockchainName, BitcoinBlockchainName, SuiBlockchainName } from '@cryptorubic/core';
+import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, TonBlockchainName, BitcoinBlockchainName, SuiBlockchainName } from '@cryptorubic/core';
 import { TonAdapter } from './adapters/ton-adapter';
-import { TonAdapterConfig } from './adapters/models/ton-adapter-config';
 import { EvmAdapter } from './adapters/evm-adapter';
 import { BitcoinAdapter } from './adapters/bitcoin-adapter';
 import { SuiAdapter } from './adapters/sui-adapter';
+import { AdaptersFactoryParams } from './adapters/models/adapter-factory-params';
 export declare class BlockchainAdapterFactoryService {
     private readonly rpcList;
-    private readonly createLogger?;
-    private readonly httpClient?;
-    private readonly tonParams?;
+    private readonly params;
     readonly adapterStore: Partial<Record<BlockchainName, AbstractAdapter<unknown, unknown, BlockchainName>>>;
     protected readonly logger?: ICustomLogger;
     private constructor();
-    static createFactory(rpcList: Partial<Record<EvmBlockchainName, string[]>>, httpClient?: HttpClient, tonParams?: TonAdapterConfig, createLogger?: (label: string) => ICustomLogger): Promise<BlockchainAdapterFactoryService>;
+    static createFactory(rpcList: Partial<Record<EvmBlockchainName, string[]>>, params: AdaptersFactoryParams): Promise<BlockchainAdapterFactoryService>;
     getAdapter(blockchain: SolanaBlockchainName): SolanaAdapter;
     getAdapter(blockchain: EvmBlockchainName): EvmAdapter;
     getAdapter(blockchain: TronBlockchainName): TronAdapter;

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

@@ -11,22 +11,21 @@ const evm_adapter_1 = require("./adapters/evm-adapter");
 const bitcoin_adapter_1 = require("./adapters/bitcoin-adapter");
 const sui_adapter_1 = require("./adapters/sui-adapter");
 class BlockchainAdapterFactoryService {
-    constructor(rpcList, createLogger, httpClient, tonParams) {
+    constructor(rpcList, params) {
         this.rpcList = rpcList;
-        this.createLogger = createLogger;
-        this.httpClient = httpClient;
-        this.tonParams = tonParams;
+        this.params = params;
         this.adapterStore = {};
         this.adapterStore = this.createStorage();
-        if (this.createLogger) {
-            this.logger = this.createLogger('BlockchainAdapterFactory');
+        if (this.params.createLogger) {
+            this.logger = this.params.createLogger('BlockchainAdapterFactory');
         }
     }
-    static async createFactory(rpcList, httpClient, tonParams, createLogger) {
+    static async createFactory(rpcList, params) {
         // @TODO Add default logger
-        const loggerFn = createLogger || undefined;
-        const resolvedHttpClient = httpClient ?? (await Promise.resolve().then(() => require('axios')));
-        return new this(rpcList, createLogger, resolvedHttpClient, tonParams);
+        const loggerFn = params.createLogger || undefined;
+        const resolvedHttpClient = params.httpClient ?? (await Promise.resolve().then(() => require('axios')));
+        params.httpClient = resolvedHttpClient;
+        return new this(rpcList, params);
     }
     getAdapter(blockchain) {
         const adapter = this.adapterStore?.[blockchain];
@@ -64,24 +63,24 @@ class BlockchainAdapterFactoryService {
                     return new evm_adapter_1.EvmAdapter({
                         blockchain: blockchain,
                         rpcList: rpcs
-                    }, this.createLogger?.(`EVM_ADAPTER_${blockchain}`));
+                    }, this.params.createLogger?.(`EVM_ADAPTER_${blockchain}`));
                 }
             }
             if (blockchainType === core_1.CHAIN_TYPE.TRON) {
-                return new tron_adapter_1.TronAdapter(rpcs, this.createLogger?.(`TRON_ADAPTER`));
+                return new tron_adapter_1.TronAdapter(rpcs, this.params.createLogger?.(`TRON_ADAPTER`));
             }
             if (blockchainType === core_1.CHAIN_TYPE.SUI) {
-                return new sui_adapter_1.SuiAdapter(rpcs, this.createLogger?.(`SUI_ADAPTER`));
+                return new sui_adapter_1.SuiAdapter(rpcs, this.params.createLogger?.(`SUI_ADAPTER`));
             }
             if (blockchainType === core_1.CHAIN_TYPE.SOLANA) {
-                return new solana_adapter_1.SolanaAdapter(rpcs, this.httpClient, this.createLogger?.(`SOLANA_ADAPTER`));
+                return new solana_adapter_1.SolanaAdapter(rpcs, this.params.httpClient, this.params.solanaParams, this.params.createLogger?.(`SOLANA_ADAPTER`));
             }
         }
-        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`));
+        if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.params.tonParams?.tonApiConfig && this.params.tonParams?.tonClientConfig) {
+            return new ton_adapter_1.TonAdapter(this.params.httpClient, this.params.tonParams, this.params.createLogger?.(`TON_ADAPTER`));
         }
-        if (blockchain === core_1.BLOCKCHAIN_NAME.BITCOIN && this.httpClient) {
-            return new bitcoin_adapter_1.BitcoinAdapter(this.httpClient, this.createLogger?.(`BTC_ADAPTER`));
+        if (blockchain === core_1.BLOCKCHAIN_NAME.BITCOIN && this.params.httpClient) {
+            return new bitcoin_adapter_1.BitcoinAdapter(this.params.httpClient, this.params.createLogger?.(`BTC_ADAPTER`));
         }
         return null;
     }