@exodus/solana-api 3.3.1 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "3.3.1",
+  "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.0",
+    "@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": "30fdc2a936b6776866467baf926c899e9a236beb"
+  "gitHead": "0214827414fb3ac874b22cef41dae41bcef98ed6"
 }

package/src/api.js

@@ -26,6 +26,7 @@ import { Connection } from './connection'
 const RPC_URL = 'https://solana.a.exodus.io' // https://vip-api.mainnet-beta.solana.com/, https://api.mainnet-beta.solana.com
 const WS_ENDPOINT = 'wss://solana.a.exodus.io/ws' // not standard across all node providers (we're compatible only with Quicknode)
 const FORCE_HTTP = true // use https over ws
+const WRAPPED_SOLANA_TOKEN_MINT_ADDRESS = `So11111111111111111111111111111111111111112`
 
 // Tokens + SOL api support
 export class Api {
@@ -342,6 +343,20 @@ export class Api {
         type: ix.parsed.type, // transfer, createAccount, initializeAccount
         ...ix.parsed.info,
       }))
+
+    let solanaTransferTx = lodash.find(instructions, (ix) => {
+      if (![ix.source, ix.destination].includes(ownerAddress)) return false
+      return ix.program === 'system' && ix.type === 'transfer'
+    }) // get SOL transfer
+
+    // check if there is a temp account created & closed within the instructions when there is no direct solana transfer
+    const accountToRedeemToOwner = solanaTransferTx
+      ? undefined
+      : instructions.find(
+          ({ type, owner, destination }) =>
+            type === 'closeAccount' && owner === ownerAddress && destination === ownerAddress
+        )?.account
+
     innerInstructions = innerInstructions
       .reduce((acc, val) => {
         return [...acc, ...val.instructions]
@@ -352,23 +367,47 @@ export class Api {
           ix.parsed &&
           ix.program === 'spl-token' &&
           ['transfer', 'transferChecked', 'transferCheckedWithFee'].includes(type)
+
+        if (!isTransferTx) return null
+
         const source = lodash.get(ix, 'parsed.info.source')
         const destination = lodash.get(ix, 'parsed.info.destination')
+        const mint = lodash.get(ix, 'parsed.info.mint')
         const amount = Number(
           lodash.get(ix, 'parsed.info.amount', 0) ||
             lodash.get(ix, 'parsed.info.tokenAmount.amount', 0)
         )
+        const txId = txDetails.transaction.signatures[0]
+        if (
+          accountToRedeemToOwner &&
+          [source, destination].includes(accountToRedeemToOwner) &&
+          mint === WRAPPED_SOLANA_TOKEN_MINT_ADDRESS
+        ) {
+          const ownerOrAccount = (account) =>
+            account && account === accountToRedeemToOwner ? ownerAddress : account
+
+          solanaTransferTx = {
+            id: txId,
+            from: ownerOrAccount(source),
+            to: ownerOrAccount(destination),
+            amount,
+            fee,
+          }
+          return
+        }
 
         const tokenAccount = tokenAccountsByOwner.find(({ tokenAccountAddress }) => {
           return [source, destination].includes(tokenAccountAddress)
         })
+        if (!tokenAccount) return
+
         const isSending = tokenAccountsByOwner.some(({ tokenAccountAddress }) => {
           return [source].includes(tokenAccountAddress)
         })
 
         // owner if it's a send tx
         const instruction = {
-          id: txDetails.transaction.signatures[0],
+          id: txId,
           slot: txDetails.slot,
           owner: isSending ? ownerAddress : null,
           from: source,
@@ -377,29 +416,27 @@ export class Api {
           token: tokenAccount,
           fee: isSending ? fee : 0,
         }
-        return isTransferTx && tokenAccount ? instruction : null
+        return tokenAccount ? instruction : null
       })
       .filter((ix) => !!ix)
 
     // program:type tells us if it's a SOL or Token transfer
-    const solanaTx = lodash.find(instructions, (ix) => {
-      if (![ix.source, ix.destination].includes(ownerAddress)) return false
-      return ix.program === 'system' && ix.type === 'transfer'
-    }) // get SOL transfer
+
     const stakeTx = lodash.find(instructions, { program: 'system', type: 'createAccountWithSeed' })
     const stakeWithdraw = lodash.find(instructions, { program: 'stake', type: 'withdraw' })
     const stakeUndelegate = lodash.find(instructions, { program: 'stake', type: 'deactivate' })
-    const hasSolanaTx = solanaTx && preTokenBalances.length === 0 && postTokenBalances.length === 0 // only SOL moved and no tokens movements
+    const hasOnlySolanaTx =
+      solanaTransferTx && preTokenBalances.length === 0 && postTokenBalances.length === 0 // only SOL moved and no tokens movements
 
     let tx = {}
-    if (hasSolanaTx) {
+    if (hasOnlySolanaTx) {
       // Solana tx
-      const isSending = ownerAddress === solanaTx.source
+      const isSending = ownerAddress === solanaTransferTx.source
       tx = {
-        owner: solanaTx.source,
-        from: solanaTx.source,
-        to: solanaTx.destination,
-        amount: solanaTx.lamports, // number
+        owner: solanaTransferTx.source,
+        from: solanaTransferTx.source,
+        to: solanaTransferTx.destination,
+        amount: solanaTransferTx.lamports, // number
         fee: isSending ? fee : 0,
       }
     } else if (stakeTx) {
@@ -456,6 +493,7 @@ export class Api {
         Array.isArray(tokenAccountsByOwner),
         'tokenAccountsByOwner is required when parsing token tx'
       )
+
       const tokenTxs = lodash
         .filter(instructions, ({ program, type }) => {
           return (
@@ -521,7 +559,7 @@ export class Api {
           )
         })
 
-        if (preBalances.length > 0 || postBalances.length > 0) {
+        if (preBalances.length > 0 || postBalances.length > 0 || solanaTransferTx) {
           tx = {}
 
           if (includeUnparsed && innerInstructions.length > 0) {
@@ -532,22 +570,25 @@ export class Api {
             tx = getUnparsedTx()
             tx.dexTxs = getInnerTxsFromBalanceChanges()
           } else {
-            if (solanaTx) {
+            if (solanaTransferTx) {
               // the base tx will be the one that moved solana.
-              tx = {
-                owner: solanaTx.source,
-                from: solanaTx.source,
-                to: solanaTx.destination,
-                amount: solanaTx.lamports, // number
-                fee: ownerAddress === solanaTx.source ? fee : 0,
-              }
+              tx =
+                solanaTransferTx.from && solanaTransferTx.to
+                  ? solanaTransferTx
+                  : {
+                      owner: solanaTransferTx.source,
+                      from: solanaTransferTx.source,
+                      to: solanaTransferTx.destination,
+                      amount: solanaTransferTx.lamports, // number
+                      fee: ownerAddress === solanaTransferTx.source ? fee : 0,
+                    }
             }
 
             // If it has inner instructions then it's a DEX tx that moved SPL -> SPL
             if (innerInstructions.length > 0) {
               tx.dexTxs = innerInstructions
               // if tx involves only SPL swaps. Expand DEX ix (first element as tx base and the other kept there)
-              if (!tx.from && !solanaTx) {
+              if (!tx.from && !solanaTransferTx) {
                 tx = tx.dexTxs[0]
                 tx.dexTxs = innerInstructions.slice(1)
               }
@@ -888,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) => {
@@ -1004,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
     )
@@ -1021,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,