@exodus/solana-api 3.3.2 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -29,7 +29,7 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^3.0.1",
+    "@exodus/solana-lib": "^3.1.0",
     "@exodus/solana-meta": "^1.0.7",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
@@ -44,5 +44,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "^1.0.0"
   },
-  "gitHead": "44ecb6d313061bd62306a4171c0f61e40be5daaf"
+  "gitHead": "0214827414fb3ac874b22cef41dae41bcef98ed6"
 }

package/src/api.js

@@ -929,10 +929,10 @@ export class Api {
 
   simulateTransaction = async (encodedTransaction, options) => {
     const {
-      value: { accounts },
+      value: { accounts, unitsConsumed, err },
     } = await this.rpcCall('simulateTransaction', [encodedTransaction, options])
 
-    return accounts
+    return { accounts, unitsConsumed, err }
   }
 
   resolveSimulationSideEffects = async (solAccounts, tokenAccounts) => {
@@ -1045,14 +1045,7 @@ export class Api {
     }
   }
 
-  /**
-   * Simulate transaction and return side effects
-   */
-  simulateAndRetrieveSideEffects = async (
-    message,
-    publicKey,
-    transactionMessage // decompiled TransactionMessage
-  ) => {
+  simulateUnsignedTransaction = async ({ message, transactionMessage }) => {
     const { config, accountAddresses } = getTransactionSimulationParams(
       transactionMessage || message
     )
@@ -1062,9 +1055,33 @@ export class Api {
       Buffer.from(message.serialize()),
       signatures
     ).toString('base64')
-    const futureAccountsState = await this.simulateTransaction(encodedTransaction, config)
+    const { accounts, unitsConsumed, err } = await this.simulateTransaction(encodedTransaction, {
+      ...config,
+      replaceRecentBlockhash: true,
+      sigVerify: false,
+    })
+    return {
+      accounts,
+      accountAddresses,
+      unitsConsumed,
+      err,
+    }
+  }
+
+  /**
+   * Simulate transaction and return side effects
+   */
+  simulateAndRetrieveSideEffects = async (
+    message,
+    publicKey,
+    transactionMessage // decompiled TransactionMessage
+  ) => {
+    const { accounts, accountAddresses } = await this.simulateUnsignedTransaction({
+      message,
+      transactionMessage,
+    })
     const { solAccounts, tokenAccounts } = filterAccountsByOwner(
-      futureAccountsState,
+      accounts,
       accountAddresses,
       publicKey
     )

package/src/tx-send.js

@@ -141,9 +141,10 @@ export const createAndBroadcastTXFactory =
 
     let { priorityFee } = feeData
 
+    const transactionForFeeEstimation = prepareForSigning(unsignedTransaction)
+
     if (!priorityFee) {
       try {
-        const transactionForFeeEstimation = prepareForSigning(unsignedTransaction)
         priorityFee = await api.getPriorityFee(transactionToBase58(transactionForFeeEstimation))
       } catch (e) {
         console.warn(`Failed to fetch priority fee: ${e.message}`)
@@ -151,7 +152,12 @@ export const createAndBroadcastTXFactory =
       }
     }
 
+    const { unitsConsumed: computeUnits } = await api.simulateUnsignedTransaction({
+      message: transactionForFeeEstimation.compileMessage(),
+    })
+
     unsignedTransaction.txData.priorityFee = priorityFee
+    unsignedTransaction.txData.computeUnits = computeUnits
 
     const { txId, rawTx } = await assetClientInterface.signTransaction({
       assetName: baseAsset.name,