@exodus/solana-api 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -14,12 +14,13 @@
   },
   "dependencies": {
     "@exodus/asset-json-rpc": "^1.0.0",
-    "@exodus/solana-lib": "^1.2.13",
+    "@exodus/solana-lib": "^1.2.16",
     "lodash": "^4.17.11",
+    "url-join": "4.0.0",
     "wretch": "^1.5.2"
   },
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "6aa4ea58a169758d9c9471bf55ce060e113dd88c"
+  "gitHead": "6e6162c94eefd164c7dd63d039be60f790b37ced"
 }

package/src/index.js

@@ -3,6 +3,8 @@ import createApi from '@exodus/asset-json-rpc'
 import { tokens, SYSTEM_PROGRAM_ID, STAKE_PROGRAM_ID, TOKEN_PROGRAM_ID } from '@exodus/solana-lib'
 import assert from 'assert'
 import lodash from 'lodash'
+import urljoin from 'url-join'
+import wretch, { Wretcher } from 'wretch'
 
 // Doc: https://docs.solana.com/apps/jsonrpc-api
 
@@ -19,7 +21,13 @@ class Api {
     this.api = createApi(this.rpcUrl)
   }
 
-  async getCurrentEpoch(): number {
+  request(path, contentType = 'application/json'): Wretcher {
+    return wretch(urljoin(this.rpcUrl, path)).headers({
+      'Content-type': contentType,
+    })
+  }
+
+  async getEpochInfo(): number {
     const { epoch } = await this.api.post({
       method: 'getEpochInfo',
     })
@@ -190,12 +198,15 @@ class Api {
         staking: {
           method: 'createAccountWithSeed',
           seed: stakeTx.seed,
-          stakeAddress: stakeTx.newAccount,
+          stakeAddresses: [stakeTx.newAccount],
           stake: stakeTx.lamports,
         },
       }
     } else if (stakeWithdraw) {
-      // TODO: lodash.find above returns 1 occurence, there could be multiple withdraw instructions in the same tx.
+      const stakeAccounts = lodash.map(
+        lodash.filter(instructions, { program: 'stake', type: 'withdraw' }),
+        'stakeAccount'
+      )
       tx = {
         owner: stakeWithdraw.withdrawAuthority,
         from: stakeWithdraw.stakeAccount,
@@ -204,20 +215,24 @@ class Api {
         fee,
         staking: {
           method: 'withdraw',
-          stakeAddress: stakeWithdraw.stakeAccount,
+          stakeAddresses: stakeAccounts,
           stake: stakeWithdraw.lamports,
         },
       }
     } else if (stakeUndelegate) {
+      const stakeAccounts = lodash.map(
+        lodash.filter(instructions, { program: 'stake', type: 'deactivate' }),
+        'stakeAccount'
+      )
       tx = {
         owner: stakeUndelegate.stakeAuthority,
         from: stakeUndelegate.stakeAuthority,
-        to: stakeUndelegate.stakeAccount,
+        to: stakeUndelegate.stakeAccount, // obsolete
         amount: 0,
         fee,
         staking: {
           method: 'undelegate',
-          stakeAddress: stakeUndelegate.stakeAccount,
+          stakeAddresses: stakeAccounts,
         },
       }
     } else {
@@ -287,14 +302,14 @@ class Api {
       const mint = lodash.get(account, 'data.parsed.info.mint')
       const token = tokens.find(({ mintAddress }) => mintAddress === mint) || {
         tokenName: 'unknown',
-        tokenSymbol: 'UNKNOWN',
+        ticker: 'UNKNOWN',
       }
       const balance = lodash.get(account, 'data.parsed.info.tokenAmount.amount', '0')
       tokenAccounts.push({
         tokenAccountAddress: pubkey,
         owner: address,
         tokenName: token.tokenName,
-        ticker: token.tokenSymbol,
+        ticker: token.ticker,
         balance,
       })
     }
@@ -412,6 +427,32 @@ 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
+
+    const rewards = await this.request(`rewards?addresses=${stakingAddresses.join(',')}`)
+      .get()
+      .error(500, () => ({})) // addresses not found
+      .error(400, () => ({}))
+      .json()
+
+    // sum rewards for all addresses
+    const earnings = Object.values(rewards).reduce((total, x) => {
+      return total + x
+    }, 0)
+
+    return earnings
+  }
+
   /**
    * Broadcast a signed transaction
    */