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

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.2",
     "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/adapters/utils/solana-utils/solana-gas-service.d.ts

@@ -1,6 +1,5 @@
 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;
@@ -9,7 +8,7 @@ export declare class SolanaGasService {
     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);
+    constructor(httpClient: HttpClient, connection: Connection, logger: ICustomLogger | undefined);
     /**
      * @returns wei ComputedUnitsLimit - like gasLimit in evm
      */

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

@@ -12,11 +12,11 @@ class SolanaGasService {
     HELIUS_API_URL = 'https://mainnet.helius-rpc.com';
     HELIUS_API_KEY;
     DEFAULT_CU_LIMIT = 200_000; //in CU
-    constructor(httpClient, connection, logger, solanaConfig) {
+    constructor(httpClient, connection, logger) {
         this.httpClient = httpClient;
         this.connection = connection;
         this.logger = logger;
-        this.HELIUS_API_KEY = solanaConfig.heliusApiKey;
+        this.HELIUS_API_KEY = '';
     }
     /**
      * @returns wei ComputedUnitsLimit - like gasLimit in evm

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