@cryptorubic/web3 0.8.17-alpha.solana.13 → 0.8.17-alpha.solana.15

package/package.json

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

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

@@ -19,6 +19,8 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
     multicallByContract<T>(_contracts: MulticallParameters, _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     multicallByAddress<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[][], _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
     simulateTransaction(config: SolanaTxConfig, timeout?: number): Promise<string>;
+    private updatePriorityFee;
+    private encodeNumberToArrayLE;
     checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
     getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
     /**

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

@@ -49,12 +49,21 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
             const { blockhash } = await this.public.getLatestBlockhash();
             const tx = web3_js_1.VersionedTransaction.deserialize(bufferData);
             tx.message.recentBlockhash = blockhash;
-            const simulation = this.public.simulateTransaction(tx, {
-                commitment: 'finalized',
-                replaceRecentBlockhash: false,
-                sigVerify: true,
-                accounts: { encoding: 'base64', addresses: [...Object.values(config.accounts)] }
-            });
+            // const simulation = this.public.simulateTransaction(tx, {
+            //     commitment: 'finalized',
+            //     replaceRecentBlockhash: false,
+            //     sigVerify: true,
+            //     accounts: { encoding: 'base64', addresses: [...Object.values(config.accounts)] }
+            // });
+            if (config.estimateConsumedUnits) {
+                const txWithBlockHash = Buffer.from(tx.serialize()).toString('base64');
+                const [computedUnitsPrice, computedUnitsLimit] = await Promise.all([
+                    this.gasService.getConsumedUnitsPrice(txWithBlockHash),
+                    this.gasService.getConsumedUnitsLimit(txWithBlockHash)
+                ]);
+                this.updatePriorityFee(tx, computedUnitsPrice.toNumber(), computedUnitsLimit.toNumber());
+            }
+            const simulation = this.public.simulateTransaction(tx, { replaceRecentBlockhash: true });
             const resp = await Promise.race([
                 simulation,
                 new Promise((_, reject) => setTimeout(() => reject('Timeout'), timeout))
@@ -65,6 +74,29 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
             throw err;
         }
     }
+    updatePriorityFee(tx, computeUnitPrice, computeUnitLimit) {
+        const computeBudgetOfset = 1;
+        const computeUnitPriceData = tx.message.compiledInstructions[1].data;
+        const encodedPrice = this.encodeNumberToArrayLE(computeUnitPrice, 8);
+        for (let i = 0; i < encodedPrice.length; i++) {
+            computeUnitPriceData[i + computeBudgetOfset] = encodedPrice[i];
+        }
+        if (computeUnitLimit) {
+            const computeUnitLimitData = tx.message.compiledInstructions[0].data;
+            const encodedLimit = this.encodeNumberToArrayLE(computeUnitLimit, 4);
+            for (let i = 0; i < encodedLimit.length; i++) {
+                computeUnitLimitData[i + computeBudgetOfset] = encodedLimit[i];
+            }
+        }
+    }
+    encodeNumberToArrayLE(num, arraySize) {
+        const result = new Uint8Array(arraySize);
+        for (let i = 0; i < arraySize; i++) {
+            result[i] = Number(num & 0xff);
+            num >>= 8;
+        }
+        return result;
+    }
     async checkEnoughBalance(token, walletAddress) {
         const balance = await this.getBalance(walletAddress, token.address);
         return balance.gte(token.tokenAmount);

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

@@ -14,9 +14,15 @@ export declare class SolanaGasService {
     getConsumedUnitsLimit(txData: string): Promise<BigNumber>;
     /**
      * @param txData base64 or hex string
-     * @returns wei ComputedUnitsPrice - like gasPrice in evm
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
      */
     getConsumedUnitsPrice(txData: string): Promise<BigNumber>;
+    /**
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     */
     private calculateCUPriceHelius;
+    /**
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     */
     private calculateCUPriceSolWeb3;
 }

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

@@ -27,13 +27,13 @@ class SolanaGasService {
             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);
+            console.error('[SolanaApiService_getConsumedUnitsLimit] err ==> ', err);
             return new bignumber_js_1.default(DEFAULT_CU_LIMIT);
         }
     }
     /**
      * @param txData base64 or hex string
-     * @returns wei ComputedUnitsPrice - like gasPrice in evm
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
      */
     async getConsumedUnitsPrice(txData) {
         if (!this.HELIUS_API_KEY) {
@@ -46,28 +46,42 @@ class SolanaGasService {
             .reduce((acc, price) => (acc.gt(price) ? acc : price), new bignumber_js_1.default(0));
         return cuPrice;
     }
+    /**
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     */
     async calculateCUPriceHelius(txData) {
-        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' }
-                }
-            ]
-        });
-        return new bignumber_js_1.default(resp.result.priorityFeeEstimate);
+        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' }
+                    }
+                ]
+            });
+            return new bignumber_js_1.default(resp.result.priorityFeeEstimate);
+        }
+        catch (err) {
+            console.error('[SolanaGasService_getConsumedUnitsPrice] err ==> ', err);
+            return new bignumber_js_1.default(0);
+        }
     }
+    /**
+     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     */
     async calculateCUPriceSolWeb3() {
+        const BASE_FEE = 5_000;
         const resp = await this.connection.getRecentPrioritizationFees();
         const avgCUPrice = resp
             .reduce((acc, tx) => acc.plus(tx.prioritizationFee), new bignumber_js_1.default(0))
             .div(resp.length)
             .dp(0, bignumber_js_1.default.ROUND_CEIL);
-        return avgCUPrice;
+        const cuPrice = new bignumber_js_1.default(Math.max(BASE_FEE, avgCUPrice.toNumber()));
+        return cuPrice;
     }
 }
 exports.SolanaGasService = SolanaGasService;