@cryptorubic/web3 0.8.17-alpha.solana.20 → 0.8.17-alpha.solana.22

package/package.json

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

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

@@ -50,7 +50,13 @@ 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, { replaceRecentBlockhash: true });
+            const simulation = this.public.simulateTransaction(tx, {
+                replaceRecentBlockhash: true,
+                accounts: {
+                    encoding: 'base64',
+                    addresses: [config.walletAddress]
+                }
+            });
             const resp = await (0, timeout_1.withTimeout)(simulation, timeout, 'Solana Simulation Timeout!');
             return new bignumber_js_1.default(resp.value.unitsConsumed || exports.DEFAULT_CU_LIMIT).toFixed(0);
         }

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

@@ -20,7 +20,7 @@ export declare class SolanaGasService {
      */
     getPriorityFee(txData: string): Promise<BigNumber>;
     /**
-     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     * @returns prioritizationFee in micro-lamports(lamport * 10^-6)
      */
     private calculatePriorityFeeHelius;
     private getRecentPriorityFeeSolWeb3;

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

@@ -40,7 +40,7 @@ class SolanaGasService {
      */
     async getPriorityFee(txData) {
         if (!this.HELIUS_API_KEY) {
-            console.warn('[SolanaApiService_getConsumedUnitsPrice] heliusApiKey is not provided in "createFactory"');
+            console.warn('[SolanaApiService_getPriorityFee] heliusApiKey is not provided in "createFactory"');
         }
         const resp = await Promise.allSettled([this.calculatePriorityFeeHelius(txData), this.getRecentPriorityFeeSolWeb3()]);
         const cuPrice = resp
@@ -50,7 +50,7 @@ class SolanaGasService {
         return cuPrice;
     }
     /**
-     * @returns consumedUnitsPrice in micro-lamports(lamport * 10^-6)
+     * @returns prioritizationFee in micro-lamports(lamport * 10^-6)
      */
     async calculatePriorityFeeHelius(txData) {
         try {
@@ -75,7 +75,6 @@ class SolanaGasService {
         }
     }
     async getRecentPriorityFeeSolWeb3() {
-        const BASE_FEE_MICROLAMPORTS = 5_000;
         const lastSlot = await this.connection.getSlot();
         // last slots array [1000, 1001, 1002 ...]
         const last10Slots = Array.from({ length: 10 }, (_, idx) => lastSlot - idx).reverse();
@@ -83,23 +82,15 @@ class SolanaGasService {
             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 : BASE_FEE_MICROLAMPORTS));
+            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 flattenPriorityFees = resp.flat();
-        const avgProrityFee = flattenPriorityFees
+        const filteredPriorityFees = resp.flat().filter((fee) => fee > 0);
+        const avgProrityFee = filteredPriorityFees
             .reduce((acc, fee) => acc.plus(fee), new bignumber_js_1.default(0))
-            .div(flattenPriorityFees.length)
+            .div(filteredPriorityFees.length)
             .dp(0, bignumber_js_1.default.ROUND_CEIL);
-        // const resp = await this.connection.getRecentPrioritizationFees();
-        // const avgPriorityFee = resp
-        //     .reduce((acc, tx) => {
-        //         const cuPrice = new BigNumber(tx.prioritizationFee).multipliedBy(1_000_000).div(this.DEFAULT_CU_LIMIT);
-        //         return acc.gt(cuPrice) ? acc : cuPrice;
-        //     }, new BigNumber(0))
-        //     .div(resp.length)
-        //     .dp(0, BigNumber.ROUND_CEIL);
-        this.logger?.customLog('SOLANA_WEB3 PRIORITY_FEE SUCCESS', { priorityFeeEstimate: avgProrityFee.toNumber(), flattenPriorityFees });
+        this.logger?.customLog('SOLANA_WEB3 PRIORITY_FEE SUCCESS', { priorityFeeEstimate: avgProrityFee.toNumber(), filteredPriorityFees });
         return avgProrityFee;
     }
 }

package/src/lib/utils/models/solana-transaction-config.d.ts

@@ -1,5 +1,6 @@
 type Base64String = `AQA${string}`;
 export interface SolanaTxConfig {
     data: Base64String;
+    walletAddress: string;
 }
 export {};