@exodus/solana-api 1.2.26 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.2.26",
+  "version": "1.3.1",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
-    "@exodus/solana-lib": "^1.2.26",
+    "@exodus/solana-lib": "^1.2.27",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "504a9acc493123550061e13cc71900aa7fe1505f"
+  "gitHead": "3f87eb48ecfdc13665102dacae7ca67dc8f1012e"
 }

package/src/index.js

@@ -90,7 +90,7 @@ class Api {
   async getConfirmedSignaturesForAddress(address: string, { until, before, limit } = {}): any {
     until = until || undefined
     return this.api.post({
-      method: 'getConfirmedSignaturesForAddress2',
+      method: 'getSignaturesForAddress',
       params: [address, { until, before, limit }],
     })
   }
@@ -160,8 +160,8 @@ class Api {
     txDetails: Object,
     tokenAccountsByOwner: ?Array
   ): Object {
-    const { fee } = txDetails.meta
-    let { instructions } = txDetails.transaction.message
+    const { fee, preTokenBalances, postTokenBalances } = txDetails.meta
+    let { instructions, accountKeys } = txDetails.transaction.message
     instructions = instructions
       .filter((ix) => ix.parsed) // only known instructions
       .map((ix) => ({
@@ -179,7 +179,7 @@ class Api {
     const stakeWithdraw = lodash.find(instructions, { program: 'stake', type: 'withdraw' })
     const stakeUndelegate = lodash.find(instructions, { program: 'stake', type: 'deactivate' })
 
-    let tx
+    let tx = {}
     if (solanaTx) {
       // Solana tx
       const isSending = ownerAddress === solanaTx.source
@@ -271,13 +271,62 @@ class Api {
           }
         })
 
-      // .reduce to sum/sub (based on isSending) all the same tokens amount (From instructions -> 1 single tx)
-      tx = tokenTxs.reduce((finalTx, ix) => {
-        if (!ix) return finalTx // skip null instructions
-        if (!finalTx.token) return ix // init finalTx (support just 1 token type per tx)
-        if (finalTx.token.ticker === ix.token.ticker) finalTx.amount += ix.amount
-        return finalTx
-      }, {})
+      if (tokenTxs.length) {
+        // found spl-token simple transfer/transferChecked instruction
+        // .reduce to sum/sub (based on isSending) all the same tokens amount (From instructions -> 1 single tx)
+        tx = tokenTxs.reduce((finalTx, ix) => {
+          if (!ix) return finalTx // skip null instructions
+          if (!finalTx.token) return ix // init finalTx (support just 1 token type per tx)
+          if (finalTx.token.ticker === ix.token.ticker) finalTx.amount += ix.amount
+          return finalTx
+        }, {})
+      } else if (preTokenBalances && postTokenBalances) {
+        // probably a DEX program is involved (multiple instructions), compute balance changes
+
+        const accountIndexes = lodash.mapKeys(accountKeys, (x, i) => i)
+        Object.values(accountIndexes).forEach((acc) => {
+          // filter by ownerAddress
+          const hasKnownOwner = !!lodash.find(tokenAccountsByOwner, {
+            tokenAccountAddress: acc.pubkey,
+          })
+          acc.owner = hasKnownOwner ? ownerAddress : null
+        })
+
+        // group by owner and supported token
+        const preBalances = preTokenBalances.filter((t) => {
+          return accountIndexes[t.accountIndex].owner === ownerAddress && isTokenSupported(t.mint)
+        })
+        const postBalances = postTokenBalances.filter((t) => {
+          return accountIndexes[t.accountIndex].owner === ownerAddress && isTokenSupported(t.mint)
+        })
+
+        if (preBalances.length && preBalances.length === postBalances.length) {
+          // parse and compute pre-balances/post-balances difference (1 token per tx spported at the moment)
+          const amount =
+            Number(lodash.get(postBalances, '[0].uiTokenAmount.amount', 0)) -
+            Number(lodash.get(preBalances, '[0].uiTokenAmount.amount', 0))
+          const isSending = Math.sign(amount) <= 0
+
+          const mint = lodash.get(postBalances, '[0].mint', '')
+          const { tokenName, ticker } = tokens.find(({ mintAddress }) => mintAddress === mint) || {
+            tokenName: 'unknown',
+            ticker: 'UNKNOWN',
+          }
+
+          tx = {
+            owner: isSending ? ownerAddress : TOKEN_PROGRAM_ID.toBase58(),
+            token: {
+              tokenAccountAddress: '', // token account is closed after the swap
+              tokenName,
+              ticker,
+            },
+            from: isSending ? ownerAddress : TOKEN_PROGRAM_ID.toBase58(),
+            to: ownerAddress, // DEX always interact with the owner address
+            amount,
+            fee: isSending ? fee : 0, // in lamports
+          }
+        }
+      }
     }
 
     // How tokens tx are parsed:
@@ -379,6 +428,12 @@ class Api {
       : null
   }
 
+  async getTokenAddressOwner(address: string) {
+    const value = await this.getAccountInfo(address)
+    const owner = lodash.get(value, 'data.parsed.info.owner', null)
+    return owner
+  }
+
   async getAddressMint(address) {
     const value = await this.getAccountInfo(address)
     const mintAddress = lodash.get(value, 'data.parsed.info.mint', null) // token mint
@@ -443,18 +498,10 @@ class Api {
     return { accounts, totalStake, locked, withdrawable, pending }
   }
 
-  async getInflationReward(stakingAddresses: Array, epoch: number) {
-    const rewards = await this.api.post({
-      method: 'getInflationReward',
-      params: [stakingAddresses, { epoch }],
-    })
-
-    return rewards
-  }
-
   async getRewards(stakingAddresses = []) {
     if (!stakingAddresses.length) return 0
 
+    // custom endpoint!
     const rewards = await this.request(`rewards?addresses=${stakingAddresses.join(',')}`)
       .get()
       .error(500, () => ({})) // addresses not found
@@ -494,4 +541,8 @@ class Api {
   }
 }
 
+function isTokenSupported(mint: string) {
+  return !!tokens.find(({ mintAddress }) => mintAddress === mint)
+}
+
 export default new Api()