@cryptorubic/web3 0.13.0-alpha.solana-gas.1 → 0.13.0-alpha.solana-gas.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.13.0-alpha.solana-gas.1",
+    "version": "0.13.0-alpha.solana-gas.3",
     "dependencies": {
         "@ethersproject/bignumber": "^5.8.0",
         "@mysten/sui": "^1.24.0",

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

@@ -81,8 +81,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
             to: to,
             value: (0, viem_1.parseEther)(value),
             data: data,
-            chain: this.public.chain,
-            kzg: undefined
+            chain: this.public.chain
         });
         return result;
     }

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

@@ -1,9 +1,7 @@
 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/solana-adapter.d.ts

@@ -5,14 +5,11 @@ 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 { SolanaAdapterConfig } from './models/solana-adapter-config';
-import { SolanaGasService } from './utils/solana-utils/solana-gas-service';
 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;
-    readonly gasService: SolanaGasService;
-    constructor(rpcList: string[], httpClient: HttpClient, solanaConfig: SolanaAdapterConfig, logger?: ICustomLogger);
+    constructor(rpcList: string[], httpClient: HttpClient, 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

@@ -9,19 +9,16 @@ const web3_pure_1 = require("../../utils/web3-pure");
 const bignumber_js_1 = require("bignumber.js");
 const bs58_1 = require("bs58");
 const js_base64_1 = require("js-base64");
-const solana_gas_service_1 = require("./utils/solana-utils/solana-gas-service");
 const solana_tokens_service_1 = require("./utils/solana-utils/solana-tokens-service");
 const timeout_1 = require("./utils/timeout");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 exports.DEFAULT_CU_LIMIT = 600_000;
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
     httpClient;
-    gasService;
-    constructor(rpcList, httpClient, solanaConfig, logger) {
+    constructor(rpcList, httpClient, logger) {
         super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
         this.httpClient = httpClient;
         this.public = this.createPublicClient(rpcList);
-        this.gasService = new solana_gas_service_1.SolanaGasService(httpClient, this.public, logger, solanaConfig);
     }
     createPublicClient(rpcList) {
         if (!rpcList?.[0]) {

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

@@ -76,7 +76,7 @@ class BlockchainAdapterFactoryService {
                 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.params.httpClient, this.params.solanaParams, this.params.createLogger?.(`SOLANA_ADAPTER`));
+                return new solana_adapter_1.SolanaAdapter(rpcs, this.params.httpClient, this.params.createLogger?.(`SOLANA_ADAPTER`));
             }
         }
         if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.params.tonParams?.tonApiConfig && this.params.tonParams?.tonClientConfig) {

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

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

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

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

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

@@ -1,27 +0,0 @@
-import { HttpClient, ICustomLogger } from '@cryptorubic/core';
-import { Connection } from '@solana/web3.js';
-import { SolanaAdapterConfig } from '../../models/solana-adapter-config';
-import BigNumber from 'bignumber.js';
-export declare class SolanaGasService {
-    private httpClient;
-    private readonly connection;
-    private readonly logger;
-    private readonly HELIUS_API_URL;
-    private readonly HELIUS_API_KEY;
-    readonly DEFAULT_CU_LIMIT = 200000;
-    constructor(httpClient: HttpClient, connection: Connection, logger: ICustomLogger | undefined, solanaConfig: SolanaAdapterConfig);
-    /**
-     * @returns wei ComputedUnitsLimit - like gasLimit in evm
-     */
-    getConsumedUnitsLimit(txData: string): Promise<BigNumber>;
-    /**
-     * @param txData base64 or hex string
-     * @returns prioritizationFee in micro-lamports (lamport = 1_000_000 microlamports)
-     */
-    getPriorityFee(txData: string): Promise<BigNumber>;
-    /**
-     * @returns prioritizationFee in micro-lamports(lamport * 10^-6)
-     */
-    private calculatePriorityFeeHelius;
-    private getRecentPriorityFeeSolWeb3;
-}

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

@@ -1,97 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaGasService = void 0;
-const utils_1 = require("ethers/lib/utils");
-const utility_funcs_1 = require("./utility-funcs");
-const bignumber_js_1 = require("bignumber.js");
-// solana gas fee FORMULA: 200_000 CU * 0.02 Lamports/CU = 4000 Lamports = 0.000004 SOL
-class SolanaGasService {
-    httpClient;
-    connection;
-    logger;
-    HELIUS_API_URL = 'https://mainnet.helius-rpc.com';
-    HELIUS_API_KEY;
-    DEFAULT_CU_LIMIT = 200_000; //in CU
-    constructor(httpClient, connection, logger, solanaConfig) {
-        this.httpClient = httpClient;
-        this.connection = connection;
-        this.logger = logger;
-        this.HELIUS_API_KEY = solanaConfig.heliusApiKey;
-    }
-    /**
-     * @returns wei ComputedUnitsLimit - like gasLimit in evm
-     */
-    async getConsumedUnitsLimit(txData) {
-        try {
-            const tx = (0, utility_funcs_1.convertB64DataToTx)(txData);
-            const resp = await this.connection.simulateTransaction(tx, {
-                replaceRecentBlockhash: true
-            });
-            return resp.value.unitsConsumed ? new bignumber_js_1.default(resp.value.unitsConsumed * 1.2) : new bignumber_js_1.default(this.DEFAULT_CU_LIMIT);
-        }
-        catch (err) {
-            console.error('[SolanaApiService_getConsumedUnitsLimit] err ==> ', err);
-            return new bignumber_js_1.default(this.DEFAULT_CU_LIMIT);
-        }
-    }
-    /**
-     * @param txData base64 or hex string
-     * @returns prioritizationFee in micro-lamports (lamport = 1_000_000 microlamports)
-     */
-    async getPriorityFee(txData) {
-        if (!this.HELIUS_API_KEY) {
-            console.warn('[SolanaApiService_getPriorityFee] heliusApiKey is not provided in "createFactory"');
-        }
-        const resp = await Promise.allSettled([this.calculatePriorityFeeHelius(txData), this.getRecentPriorityFeeSolWeb3()]);
-        const cuPrice = resp
-            .filter((r) => r.status === 'fulfilled')
-            .map((r) => r.value)
-            .reduce((acc, price) => (acc.gt(price) ? acc : price), new bignumber_js_1.default(0));
-        return cuPrice;
-    }
-    /**
-     * @returns prioritizationFee in micro-lamports(lamport * 10^-6)
-     */
-    async calculatePriorityFeeHelius(txData) {
-        try {
-            const tx = (0, utility_funcs_1.convertB64DataToTx)(txData);
-            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' }
-                    }
-                ]
-            });
-            this.logger?.customLog('HELIUS PRIORITY_FEE SUCCESS', { priorityFeeEstimate: resp.result.priorityFeeEstimate });
-            return new bignumber_js_1.default(resp.result.priorityFeeEstimate);
-        }
-        catch (err) {
-            this.logger?.customLog('HELIUS PRIORITY_FEE ERROR', err);
-            return new bignumber_js_1.default(0);
-        }
-    }
-    async getRecentPriorityFeeSolWeb3() {
-        const lastSlot = await this.connection.getSlot();
-        // last slots array [1000, 1001, 1002 ...]
-        const last10Slots = Array.from({ length: 10 }, (_, idx) => lastSlot - idx).reverse();
-        const getPriorityFeesFromBlock = async (slotNum) => {
-            const block = await this.connection.getBlock(slotNum, { maxSupportedTransactionVersion: 0, commitment: 'confirmed' });
-            if (!block)
-                return [];
-            return block.transactions.map((tx) => (tx.meta && tx.meta.fee ? tx.meta.fee : 0));
-        };
-        const resp = await Promise.all(last10Slots.map((slotNum) => getPriorityFeesFromBlock(slotNum)));
-        const filteredPriorityFees = resp.flat().filter((fee) => fee > 0);
-        const avgProrityFee = filteredPriorityFees
-            .reduce((acc, fee) => acc.plus(fee), new bignumber_js_1.default(0))
-            .div(filteredPriorityFees.length)
-            .dp(0, bignumber_js_1.default.ROUND_CEIL);
-        this.logger?.customLog('SOLANA_WEB3 PRIORITY_FEE SUCCESS', { priorityFeeEstimate: avgProrityFee.toNumber() });
-        return avgProrityFee;
-    }
-}
-exports.SolanaGasService = SolanaGasService;

package/src/lib/adapter/adapters/utils/solana-utils/utility-funcs.d.ts

@@ -1,2 +0,0 @@
-import { VersionedTransaction } from '@solana/web3.js';
-export declare function convertB64DataToTx(txData: string): VersionedTransaction;

package/src/lib/adapter/adapters/utils/solana-utils/utility-funcs.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertB64DataToTx = convertB64DataToTx;
-const web3_js_1 = require("@solana/web3.js");
-function convertB64DataToTx(txData) {
-    const bufferData = txData.startsWith('0x') ? Buffer.from(txData.slice(2), 'hex') : Buffer.from(txData, 'base64');
-    const tx = web3_js_1.VersionedTransaction.deserialize(bufferData);
-    return tx;
-}