@exodus/solana-api 2.5.27 → 2.5.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.27",
+  "version": "2.5.29",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -23,8 +23,8 @@
     "@exodus/models": "^10.1.0",
     "@exodus/nfts-core": "^0.5.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/solana-lib": "^1.7.4",
-    "@exodus/solana-meta": "^1.0.5",
+    "@exodus/solana-lib": "^1.7.5",
+    "@exodus/solana-meta": "^1.0.7",
     "bn.js": "^4.11.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "9e93c3846854f6c64b0bdd5abe103ec5ff980596"
+  "gitHead": "7ec211abf9ccbc6b8bc84440f3bc6da659aebaaf"
 }

package/src/api.js

@@ -22,8 +22,9 @@ import { Connection } from './connection'
 
 // Doc: https://docs.solana.com/apps/jsonrpc-api
 
-const RPC_URL = 'https://solana.a.exodus.io' // https://vip-api.mainnet-beta.solana.com/, https://api.mainnet-beta.solana.com, https://solana-api.projectserum.com
-const WS_ENDPOINT = 'wss://solana.a.exodus.io/ws'
+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
 
 // Tokens + SOL api support
 export class Api {
@@ -63,6 +64,7 @@ export class Api {
     handleReconnect,
     reconnectDelay,
   }) {
+    if (FORCE_HTTP) return false
     const conn = new Connection({
       endpoint: this.wsUrl,
       address,
@@ -89,7 +91,7 @@ export class Api {
     if (handleTransfers) return handleTransfers(updates)
   }
 
-  async rpcCall(method, params = [], { address = '', forceHttp = false } = {}) {
+  async rpcCall(method, params = [], { address = '', forceHttp = FORCE_HTTP } = {}) {
     // ws request
     const connection = this.connections[address] || lodash.sample(Object.values(this.connections)) // pick random connection
     if (lodash.get(connection, 'isOpen') && !lodash.get(connection, 'shutdown') && !forceHttp) {
@@ -119,7 +121,7 @@ export class Api {
 
   async getRecentBlockHash(commitment?) {
     const result = await this.rpcCall(
-      'getRecentBlockhash',
+      'getLatestBlockhash',
       [{ commitment: commitment || 'finalized', encoding: 'jsonParsed' }],
       { forceHttp: true }
     )
@@ -340,10 +342,14 @@ export class Api {
       }, [])
       .map((ix) => {
         const type = lodash.get(ix, 'parsed.type')
-        const isTransferTx = ix.parsed && ix.program === 'spl-token' && type === 'transfer'
+        const isTransferTx =
+          ix.parsed && ix.program === 'spl-token' && ['transfer', 'transferChecked'].includes(type)
         const source = lodash.get(ix, 'parsed.info.source')
         const destination = lodash.get(ix, 'parsed.info.destination')
-        const amount = Number(lodash.get(ix, 'parsed.info.amount', 0))
+        const amount = Number(
+          lodash.get(ix, 'parsed.info.amount', 0) ||
+            lodash.get(ix, 'parsed.info.tokenAmount.amount', 0)
+        )
 
         const tokenAccount = tokenAccountsByOwner.find(({ tokenAccountAddress }) => {
           return [source, destination].includes(tokenAccountAddress)
@@ -798,7 +804,7 @@ export class Api {
    */
   broadcastTransaction = async (signedTx, options) => {
     console.log('Solana broadcasting TX:', signedTx) // base64
-    const defaultOptions = { encoding: 'base64', preflightCommitment: 'finalized' }
+    const defaultOptions = { encoding: 'base64', preflightCommitment: 'confirmed' }
 
     const params = [signedTx, { ...defaultOptions, ...options }]
     const errorMessagesToRetry = ['Blockhash not found']

package/src/index.js

@@ -9,6 +9,12 @@ export { default as SolanaFeeMonitor } from './fee-monitor'
 export { SolanaMonitor } from './tx-log'
 export { SolanaAccountState } from './account-state'
 export { getSolStakedFee, getStakingInfo, getUnstakingFee } from './staking-utils'
+export {
+  isSolanaStaking,
+  isSolanaUnstaking,
+  isSolanaWithdrawn,
+  isSolanaRewardsActivityTx,
+} from './txs-utils'
 export { createAndBroadcastTXFactory } from './tx-send'
 export { getBalancesFactory } from './get-balances'
 

package/src/txs-utils.js

@@ -0,0 +1,11 @@
+import { get } from 'lodash'
+
+const isSolanaTx = (tx) => tx.coinName === 'solana'
+export const isSolanaStaking = (tx) =>
+  isSolanaTx(tx) && ['createAccountWithSeed', 'delegate'].includes(get(tx, 'data.staking.method'))
+export const isSolanaUnstaking = (tx) =>
+  isSolanaTx(tx) && get(tx, 'data.staking.method') === 'undelegate'
+export const isSolanaWithdrawn = (tx) =>
+  isSolanaTx(tx) && get(tx, 'data.staking.method') === 'withdraw'
+export const isSolanaRewardsActivityTx = (tx) =>
+  [isSolanaStaking, isSolanaUnstaking, isSolanaWithdrawn].some((fn) => fn(tx))