@exodus/solana-api 2.5.6 → 2.5.8

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
-    "src/**",
-    "!src/__tests__",
+    "src",
+    "!src/**/__tests__",
     "README.md",
     "package.json"
   ],
@@ -31,5 +31,5 @@
     "url-join": "4.0.0",
     "wretch": "^1.5.2"
   },
-  "gitHead": "9ec7084bcdfe14f1c6f11df393351885773046a6"
+  "gitHead": "46b0e2b60d3b21c3aa9e33be5785d34b0ba29cca"
 }

package/src/api.js

@@ -48,7 +48,7 @@ export class Api {
 
   setTokens(assets = {}) {
     const solTokens = lodash.pickBy(assets, (asset) => asset.assetType === 'SOLANA_TOKEN')
-    this.tokens = lodash.mapKeys(solTokens, (v) => v.mintAddress)
+    this.tokens = new Map(Object.values(solTokens).map((v) => [v.mintAddress, v]))
   }
 
   request(path, contentType = 'application/json'): Wretcher {
@@ -102,11 +102,11 @@ export class Api {
   }
 
   getTokenByAddress(mint: string) {
-    return this.tokens[mint]
+    return this.tokens.get(mint)
   }
 
   isTokenSupported(mint: string) {
-    return !!this.getTokenByAddress(mint)
+    return this.tokens.has(mint)
   }
 
   async getEpochInfo(): number {

package/src/tx-log/solana-monitor.js

@@ -68,7 +68,7 @@ export class SolanaMonitor extends BaseMonitor {
   async emitUnknownTokensEvent({ tokenAccounts }) {
     const tokensList = await this.api.getWalletTokensList({ tokenAccounts })
     const unknownTokensList = tokensList.filter((mintAddress) => {
-      return !this.api.tokens[mintAddress]
+      return !this.api.tokens.has(mintAddress)
     })
     if (unknownTokensList.length > 0) {
       this.emit('unknown-tokens', unknownTokensList)

package/src/__tests__/api.test.js

@@ -1,273 +0,0 @@
-import lodash from 'lodash'
-import { fetch } from '@exodus/fetch'
-import wretch from 'wretch'
-import * as splToken from '@exodus/solana-spl-token'
-import {
-  generateKeyPair,
-  PublicKey,
-  LAMPORTS_PER_SOL,
-  TOKEN_PROGRAM_ID,
-  SystemProgram,
-  U64,
-  SolanaWeb3Transaction as Transaction,
-} from '@exodus/solana-lib'
-import { Api } from '../index'
-import { SOL_TRANSFER_TX } from './fixtures'
-import assets from './assets'
-
-const api = new Api({ assets })
-
-wretch().polyfills({
-  fetch,
-})
-
-const SECONDS = 1000
-jest.setTimeout(60 * SECONDS)
-
-const ADDRESS_WITH_HISTORY = 'Cd1uLoQwGZiDSyJxrwbpYmuDZM2tDftkowPjWv5YE5Z7'
-const ADDRESS_FRESH = '3bbnZt1mzp1EBRR9Rm6TX2cXzZYbVvM9THutWL8bCmVH' // no txs history
-const TXID =
-  '4AwqVmXFzciF89JyzMrTr5FT2tX1iMg7ypzCzUsGMD54dwjrE8w4GLNTbXXRpNcE8JkTSGRbZ8SzEc5umQJNFS3m'
-const SRM_TOKEN_TXID =
-  '2zJ7dnXMZYUhw4uaeLaBRcoDsgfM9HZ1GSbfjJp4SxWrFhzEdwNKFfFFJ8LL6ckKwh5Xg5ik5pUuRtjMkGMDZpgV'
-
-beforeAll(() => {
-  return api.watchAddress({ address: ADDRESS_WITH_HISTORY }) // Open WS connection
-})
-
-test('Solana: getRecentBlockHash', async () => {
-  const blockHash = await api.getRecentBlockHash()
-  expect(typeof blockHash).toEqual('string')
-  expect(blockHash.length > 40).toEqual(true)
-})
-
-test('Solana: getTransactionById', async () => {
-  const result = await api.getTransactionById(TXID)
-  expect(result.transaction.signatures[0]).toEqual(TXID) // string
-  expect(result.meta.fee > 0).toEqual(true)
-  expect(Array.isArray(result.meta.preBalances)).toEqual(true)
-  expect(Array.isArray(result.meta.postBalances)).toEqual(true)
-  expect(result.transaction.message.accountKeys.length > 1).toEqual(true)
-  expect(result.transaction.message.accountKeys[0].pubkey).toEqual(
-    'Bnjx2F242ZK6LsKbAvRwDoeKczJTK8LFM918p8sZCb69'
-  )
-})
-
-test('Solana: getFee', async () => {
-  const fee = await api.getFee()
-  expect(fee >= 4000).toEqual(true) // usually 5000 lamports
-})
-
-test('Solana: getBalance', async () => {
-  const [balance1, balance2] = await Promise.all([
-    api.getBalance(ADDRESS_WITH_HISTORY),
-    api.getBalance(ADDRESS_FRESH),
-  ])
-  expect(typeof balance1 === 'number').toEqual(true)
-  expect(typeof balance2 === 'number').toEqual(true)
-  expect(balance2).toEqual(0)
-})
-
-test('Solana: getBlockTime', async () => {
-  const ts = await api.getBlockTime(49901505)
-  expect(ts) // if null the backend started pruning old tx entries and has partial ledger!
-})
-
-test('Solana: getConfirmedSignaturesForAddress', async () => {
-  const addrTxs = await api.getConfirmedSignaturesForAddress(ADDRESS_WITH_HISTORY)
-  expect(addrTxs.length > 4)
-  const addrTxs2 = await api.getConfirmedSignaturesForAddress(ADDRESS_WITH_HISTORY, { until: '' })
-  expect(addrTxs2.length > 4).toEqual(true)
-})
-
-describe('getTransactions', () => {
-  test('Solana: Returns empty transactions if account is not created', async () => {
-    const { transactions } = await api.getTransactions(ADDRESS_FRESH)
-    expect(transactions.length === 0).toBeTruthy()
-  })
-
-  test('Solana: Returns correct transactions if account is created', async () => {
-    const { transactions, newCursor } = await api.getTransactions(ADDRESS_WITH_HISTORY)
-    expect(transactions.length >= 1).toBeTruthy()
-    expect(typeof newCursor).toEqual('string')
-    // check tokens txs returned as well
-    const tokenTx = transactions.find(({ id }) => id === SRM_TOKEN_TXID)
-    // console.log('tokenTx:', tokenTx)
-    expect(tokenTx.timestamp).toEqual(1608598478000)
-    expect(tokenTx.id).toEqual(SRM_TOKEN_TXID)
-    expect(tokenTx.token.tokenName).toEqual('serum')
-    expect(tokenTx.owner).toEqual(null)
-    expect(tokenTx.from).toEqual('71GbXnJkHz15kzjagB2f7N9H7HPA99v6BFuqfdYL5qtf')
-    expect(tokenTx.amount).toEqual(1000)
-    expect(tokenTx.fee).toEqual(0)
-  })
-
-  test('Solana: Returns expected transactions with cursor', async () => {
-    const OLD_TXID =
-      '3qFUz73ZPiexM8yHyTFhnEhXgVinzXCQMieJbTsfZKcW5V3vPSJJvRCSKjCHJDYtWqReeBrFV98hcCFaAznpjgUC' // existing old txid that should not be returned in txs history after cursor date.
-    const { transactions } = await api.getTransactions(ADDRESS_WITH_HISTORY, {
-      cursor:
-        '4kzJjAbaT1PVSuk7JDh6697Y63MrGGMwDgi8CKRtctHbXWRjPtrzY1RnbMuedPDefru2hrGeLfRDpqtdFmQQAMXm',
-    })
-    expect(transactions.length >= 1).toBeTruthy()
-    expect(lodash.find(transactions, { id: OLD_TXID })).toBeFalsy()
-    expect(
-      lodash.find(transactions, {
-        id:
-          '3V7eDr5BbgZfgiADpUxM2fHQ1ZAoJHddxxfFRd8KtDQeTqLsv9wkfeg6NrVHzQc7wnEmVRQPdsYBT3RKLztL6Suf',
-      })
-    ).toBeTruthy()
-  })
-})
-
-test('Solana: parseTransaction on a SOL tx', async () => {
-  const owner = 'Bnjx2F242ZK6LsKbAvRwDoeKczJTK8LFM918p8sZCb69'
-  const tx = await api.parseTransaction(owner, SOL_TRANSFER_TX)
-  // console.log(tx)
-  expect(tx.id).toEqual(
-    '4AwqVmXFzciF89JyzMrTr5FT2tX1iMg7ypzCzUsGMD54dwjrE8w4GLNTbXXRpNcE8JkTSGRbZ8SzEc5umQJNFS3m'
-  )
-  expect(tx.slot).toEqual(36446581)
-  expect(tx.error).toEqual(false)
-  expect(tx.from).toEqual('Bnjx2F242ZK6LsKbAvRwDoeKczJTK8LFM918p8sZCb69')
-  expect(tx.to).toEqual('84HuMpN8JPy9DLerT5nRcEHjkb1UQS3TD4CvR9y8MqgD')
-  expect(tx.amount).toEqual(2e13)
-  expect(tx.fee).toEqual(5e3)
-})
-
-test('Solana: getMinimumBalanceForRentExemption', async () => {
-  const minimumBalance = await api.getMinimumBalanceForRentExemption(80)
-  expect(typeof minimumBalance === 'number').toEqual(true)
-})
-
-test('Solana: getMetaplexMetadata', async () => {
-  const MANGO_SPL_TOKEN = 'MangoCzJ36AjZyKwVj3VnYU4GTonjfVEnJmvvWaxLac'
-
-  const metadata = await api.getMetaplexMetadata(MANGO_SPL_TOKEN)
-  // console.log('metadata', metadata)
-  expect(metadata.name).toEqual('Mango')
-  expect(metadata.symbol).toEqual('MNGO')
-})
-
-test('Solana: getMetaplexMetadata of invalid address returns null', async () => {
-  const RANDOM_SPL_TOKEN = 'Dhg9XnzJWzSQqH2aAnhPTEJHGQAkALDfD98MA499A7pa' // doesn't have metaplex data
-
-  const metadata = await api.getMetaplexMetadata(RANDOM_SPL_TOKEN)
-  expect(metadata).toEqual(null)
-})
-
-test('Solana: broadcastTransaction', async () => {
-  // execute setTimeout callback immediately (no wait)
-  jest.spyOn(global, 'setTimeout')
-  global.setTimeout.mockImplementation((callback) => {
-    return callback()
-  })
-
-  try {
-    // send transaction
-    const signedTx =
-      'AVXo5X7UNzpuOmYzkZ+fqHDGiRLTSMlWlUCcZKzEV5CIKlrdvZa3/2GrJJfPrXgZqJbYDaGiOnP99tI/sRJfiwwBAAEDRQ/n5E5CLbMbHanUG3+iVvBAWZu0WFM6NoB5xfybQ7kNwwgfIhv6odn2qTUu/gOisDtaeCW1qlwW/gx3ccr/4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvsInicc+E3IZzLqeA+iM5cn9kSaeFzOuClz1Z2kZQy0BAgIAAQwCAAAAAPIFKgEAAAA='
-    await api.broadcastTransaction(signedTx)
-    expect('To Fail').toEqual(true)
-  } catch (err) {
-    expect(err.message.match(/Blockhash not found/)).toBeTruthy()
-  } finally {
-    global.setTimeout.mockRestore()
-  }
-})
-
-describe('Solana: getDecimals', () => {
-  test('returns decimals if valid SPL address', async () => {
-    const decimals = await api.getDecimals('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v') // USDC
-    expect(decimals).toEqual(6)
-  })
-
-  test('Solana: getDecimals: errors if invalid SPL address', async () => {
-    try {
-      await api.getDecimals('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1w')
-      expect('To Fail').toEqual(true)
-    } catch (err) {
-      expect(err.message.match(/could not find account/)).toBeTruthy()
-    }
-
-    try {
-      await api.getDecimals('EPjFWdd5ZwTDt1')
-      expect('To Fail').toEqual(true)
-    } catch (err) {
-      expect(err.message.match(/WrongSize/)).toBeTruthy()
-    }
-  })
-})
-
-describe('Solana: isSpl', () => {
-  test('returns true for addresses owned by the Token Program', async () => {
-    expect(await api.isSpl('BmxZ1pghpcoyT7aykj7D1o4AxWirTqvD7zD2tNngjirT')).toBeTruthy()
-    expect(await api.isSpl('buMnhMd5xSyXBssTQo15jouu8VhuEZJCfbtBUZgRcuW')).toBeTruthy()
-    expect(await api.isSpl('MAPS41MDahZ9QdKXhVa4dWB9RuyfV4XqhyAZ8XcYepb')).toBeTruthy()
-  })
-
-  test('returns false for addresses not owned by the Token Program', async () => {
-    expect(await api.isSpl('9zyPU1mjgzaVyQsYwKJJ7AhVz5bgx5uc1NPABvAcUXsT')).toBeFalsy()
-  })
-})
-
-describe('Solana: simulateAndRetrieveSideEffects', () => {
-  const ownerSolAccount = new PublicKey('3b1rT3knyRnZHKHCCxKWnJDWo8k6SDdSTvYzqyXUYwxL') // 1 SOL
-  const ownerTokenAddress = new PublicKey('FRaWiAGc3bvQKAkqqAxwmLvCVH7AaUGo6MrBUYhCmojK') // 0 Wrapped SOL (Token)
-
-  const secondarySolAccount = new PublicKey('41TDiDgCLz2eh5vPMhWCdNeaoMfrs3tM4rGdZgX4jL56') // 1 SOL
-  const secondaryTokenAddress = new PublicKey('8HPbjj4QVnYGUcRrfeZ3XdMhq36RnaJqvUHjHZYZ2p65') // 1 Wrapped SOL (Token)
-
-  // Use solana devnet since we need actual accounts with available balance for simulation
-  const testApi = new Api({ rpcUrl: 'https://api.devnet.solana.com', assets })
-
-  test('returns willSend and willReceive account changes', async () => {
-    const SOL_SEND_AMOUNT = LAMPORTS_PER_SOL * 0.1
-    const TOKEN_SEND_AMOUNT = LAMPORTS_PER_SOL * 0.531
-
-    const txFee = await api.getFee()
-    const transaction = new Transaction()
-    // Owner sends SOL
-    transaction.add(
-      SystemProgram.transfer({
-        fromPubkey: ownerSolAccount,
-        toPubkey: generateKeyPair().publicKey,
-        lamports: SOL_SEND_AMOUNT,
-      })
-    )
-    // Owner receives Wrapped SOL token
-    transaction.add(
-      splToken.Token.createTransferInstruction(
-        TOKEN_PROGRAM_ID,
-        secondaryTokenAddress,
-        ownerTokenAddress,
-        secondarySolAccount,
-        [],
-        TOKEN_SEND_AMOUNT
-      )
-    )
-    transaction.recentBlockhash = await testApi.getRecentBlockHash()
-    transaction.feePayer = ownerSolAccount
-    transaction.signatures = [
-      { signature: null, publicKey: ownerSolAccount },
-      { signature: null, publicKey: secondarySolAccount },
-    ]
-
-    const result = await testApi.simulateAndRetrieveSideEffects(
-      transaction.compileMessage(),
-      ownerSolAccount.toString()
-    )
-
-    expect(result.willSend.length === 1).toBeTruthy()
-    expect(result.willSend[0].type).toEqual('SOL')
-    expect(result.willSend[0].balance).toEqual(new U64((SOL_SEND_AMOUNT + txFee * 2) * -1)) // two tx and will send would be negative
-
-    expect(result.willReceive.length === 1).toBeTruthy()
-    expect(result.willReceive[0].type).toEqual('TOKEN')
-    expect(result.willReceive[0].balance).toEqual(new U64(TOKEN_SEND_AMOUNT))
-  })
-})
-
-afterAll(async () => {
-  return api.unwatchAddress({ address: ADDRESS_WITH_HISTORY })
-})

package/src/__tests__/assets.js

@@ -1,7 +0,0 @@
-import { keyBy } from '@exodus/basic-utils'
-import { connectAssets } from '@exodus/assets'
-import assetsList from '@exodus/solana-meta'
-
-const assets = connectAssets(keyBy(assetsList, (asset) => asset.name))
-
-export default assets