@exodus/solana-api 1.4.8 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "1.4.8",
+  "version": "2.0.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.3.5",
+    "@exodus/solana-lib": "^1.3.6",
     "lodash": "^4.17.11",
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
@@ -22,5 +22,5 @@
   "devDependencies": {
     "node-fetch": "~1.6.3"
   },
-  "gitHead": "90293962539f80a74060b3010cbfa4ab4570baa7"
+  "gitHead": "90859f94717cf2b928cb93b030ecfba523b8179e"
 }

package/src/index.js

@@ -27,6 +27,7 @@ class Api {
   constructor(rpcUrl) {
     this.setServer(rpcUrl)
     this.setTokens(assets)
+    this.tokensToSkip = {}
   }
 
   setServer(rpcUrl) {
@@ -219,6 +220,9 @@ class Api {
         unparsed: true,
         amount: postBalances[ownerIndex] - preBalances[ownerIndex] + feePaid,
         fee: feePaid,
+        data: {
+          meta: txDetails.meta,
+        },
       }
     }
 
@@ -453,6 +457,36 @@ class Api {
     }
   }
 
+  async getSupply(mintAddress: string): string {
+    const { value: { amount } } = await this.api.post({
+      method: 'getTokenSupply',
+      params: [mintAddress],
+    })
+    return amount
+  }
+
+  async getWalletTokensList({ address, tokenAccounts }) {
+    const tokensMint = []
+    for (let account of tokenAccounts) {
+      const mint = account.mintAddress
+
+      // skip cached NFT
+      if (this.tokensToSkip[mint]) continue
+      // skip 0 balance
+      if (account.balance === '0') continue
+      // skip NFT
+      const supply = await this.getSupply(mint)
+      if (supply === '1') {
+        this.tokensToSkip[mint] = true
+        continue
+      }
+      // OK
+      tokensMint.push(mint)
+    }
+
+    return tokensMint
+  }
+
   async getTokenAccountsByOwner(address: string, tokenTicker: ?string): Array {
     const { value: accountsList } = await this.api.post({
       method: 'getTokenAccountsByOwner',
@@ -484,8 +518,8 @@ class Api {
       : tokenAccounts
   }
 
-  async getTokensBalance(address: string, filterByTokens = []) {
-    let accounts = await this.getTokenAccountsByOwner(address) // Tokens
+  async getTokensBalance({ address, filterByTokens = [], tokenAccounts }) {
+    let accounts = tokenAccounts || (await this.getTokenAccountsByOwner(address))
 
     const tokensBalance = accounts.reduce((acc, { tokenName, balance }) => {
       if (tokenName === 'unknown' || (filterByTokens.length && !filterByTokens.includes(tokenName)))
@@ -532,6 +566,11 @@ class Api {
     return value
   }
 
+  async isSpl(address: string) {
+    const { owner } = await this.getAccountInfo(address)
+    return owner === 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'
+  }
+
   async getMetaplexMetadata(tokenMintAddress: string) {
     const metaplexPDA = getMetadataAccount(tokenMintAddress)
     const res = await this.getAccountInfo(metaplexPDA)
@@ -560,8 +599,8 @@ class Api {
     return account.owner === SYSTEM_PROGRAM_ID.toBase58()
       ? 'solana'
       : account.owner === TOKEN_PROGRAM_ID.toBase58()
-      ? 'token'
-      : null
+        ? 'token'
+        : null
   }
 
   async getTokenAddressOwner(address: string) {
@@ -751,7 +790,10 @@ class Api {
    */
   simulateAndRetrieveSideEffects = async (transactionMessage, publicKey: string) => {
     const { config, accountAddresses } = getTransactionSimulationParams(transactionMessage)
-    const encodedTransaction = buildRawTransaction(transactionMessage.serialize()).toString('base64')
+    const encodedTransaction = buildRawTransaction(
+      transactionMessage.serialize(),
+      transactionMessage.header.numRequiredSignatures || 1
+    ).toString('base64')
     const futureAccountsState = await this.simulateTransaction(encodedTransaction, config)
     const { solAccounts, tokenAccounts } = filterAccountsByOwner(
       futureAccountsState,