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

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@cryptorubic/web3",
-    "version": "0.8.17-alpha.solana.3",
+    "version": "0.8.17-alpha.solana.5",
     "dependencies": {
         "tslib": "^2.3.0",
         "bignumber.js": "9.1.2",
-        "@cryptorubic/core": "0.8.17-alpha.solana.3",
+        "@cryptorubic/core": "0.8.17-alpha.solana.5",
         "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.3",
+        "@cryptorubic/tron-types": "0.8.17-alpha.solana.5",
         "bitcoin-address-validation": "^2.2.3",
         "axios": "0.27.2",
         "crc-32": "^1.2.2",

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

@@ -5,8 +5,8 @@ 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';
+import { SolanaApiService } from './utils/solana-utils/solana-api-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> {

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

@@ -7,10 +7,10 @@ const web3_js_1 = require("@solana/web3.js");
 const core_1 = require("@cryptorubic/core");
 const web3_pure_1 = require("../../utils/web3-pure");
 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");
+const solana_api_service_1 = require("./utils/solana-utils/solana-api-service");
+const solana_tokens_service_1 = require("./utils/solana-utils/solana-tokens-service");
 exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
 exports.DEFAULT_CU_LIMIT = 600000;
 class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {

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

@@ -0,0 +1,19 @@
+import { HttpClient } from '@cryptorubic/core';
+import { Connection } from '@solana/web3.js';
+import { SolanaAdapterConfig } from '../../models/solana-adapter-config';
+import BigNumber from 'bignumber.js';
+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 wei ComputedUnitsLimit - like gasLimit in evm
+     */
+    getConsumedUnitsLimit(txData: string): Promise<BigNumber>;
+    /**
+     * @returns wei ComputedUnitsPrice - like gasPrice in evm
+     */
+    getConsumedUnitsPrice(txData: string): Promise<BigNumber>;
+}

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaApiService = void 0;
 const utils_1 = require("ethers/lib/utils");
+const utility_funcs_1 = require("./utility-funcs");
+const bignumber_js_1 = require("bignumber.js");
 class SolanaApiService {
     constructor(httpClient, connection, solanaConfig) {
         this.httpClient = httpClient;
@@ -10,28 +12,30 @@ class SolanaApiService {
         this.HELIUS_API_KEY = solanaConfig.heliusApiKey;
     }
     /**
-     * @returns ComputedUnitsLimit - like gasLimit in evm
+     * @returns wei ComputedUnitsLimit - like gasLimit in evm
      */
-    async getConsumedUnitsLimit(tx) {
+    async getConsumedUnitsLimit(txData) {
         const DEFAULT_CU_LIMIT = 600000;
         try {
+            const tx = (0, utility_funcs_1.convertB64DataToTx)(txData);
             const resp = await this.connection.simulateTransaction(tx, {
                 replaceRecentBlockhash: true
             });
-            return resp.value.unitsConsumed ? resp.value.unitsConsumed * 1.2 : DEFAULT_CU_LIMIT;
+            return resp.value.unitsConsumed ? new bignumber_js_1.default(resp.value.unitsConsumed * 1.2) : new bignumber_js_1.default(DEFAULT_CU_LIMIT);
         }
         catch (err) {
             console.error('Solana_simulateTransaction_Error ==> ', err);
-            return DEFAULT_CU_LIMIT;
+            return new bignumber_js_1.default(DEFAULT_CU_LIMIT);
         }
     }
     /**
-     * @returns ComputedUnitsPrice - like gasPrice in evm
+     * @returns wei ComputedUnitsPrice - like gasPrice in evm
      */
-    async getConsumedUnitsPrice(tx) {
+    async getConsumedUnitsPrice(txData) {
         if (!this.HELIUS_API_KEY) {
             throw new Error('[SolanaApiService_getConsumedUnitsPrice] params.solanaParams.heliusApiKey is not provided in "createFactory" method to use this method');
         }
+        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',
@@ -43,7 +47,7 @@ class SolanaApiService {
                 }
             ]
         });
-        return resp.result.priorityFeeEstimate;
+        return new bignumber_js_1.default(resp.result.priorityFeeEstimate);
     }
 }
 exports.SolanaApiService = SolanaApiService;

package/src/lib/adapter/adapters/utils/{solana-tokens-service.d.ts → solana-utils/solana-tokens-service.d.ts}

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { HttpClient } from '@cryptorubic/core';
-import { SolanaToken } from '../models/solana-web3-types';
+import { SolanaToken } from '../../models/solana-web3-types';
 export declare class SolanaTokensService {
     private readonly httpClient;
     private connection;

package/src/lib/adapter/adapters/utils/{solana-tokens-service.js → solana-utils/solana-tokens-service.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaTokensService = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
-const timeout_1 = require("./timeout");
+const timeout_1 = require("../timeout");
 class SolanaTokensService {
     constructor(connection, httpClient) {
         this.httpClient = httpClient;

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

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

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

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

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

@@ -1,18 +0,0 @@
-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>;
-}