@exodus/solana-lib 1.2.13 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.2.13",
+  "version": "1.2.16",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.4.3",
-    "@exodus/assets": "^8.0.2",
+    "@exodus/assets": "^8.0.53",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
     "@exodus/models": "^8.4.0",
     "bn.js": "^4.11.0",
@@ -23,5 +23,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "df87ac51e1f8ff2d14664a0707166cdc3ccd9a8d"
+  "gitHead": "882b8a97ef05cbd0fbd7da0b2ce457e0a0ae7e35"
 }

package/src/tokens.js

@@ -1,19 +1,12 @@
-// adapted from https://github.com/project-serum/spl-token-wallet/blob/master/src/utils/tokens/names.js
+import assets from '@exodus/assets'
 
-const TOKENS = [
-  {
-    mintAddress: 'SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt',
-    tokenName: 'serum',
-    tokenProperName: 'Serum',
-    tokenSymbol: 'SRM',
-  },
-  {
-    mintAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-    tokenName: 'usdcoin_solana',
-    tokenProperName: 'USD Coin Solana',
-    tokenSymbol: 'USDCSOL',
-  },
-  // ....
-]
+// tokens info: https://github.com/project-serum/spl-token-wallet/blob/master/src/utils/tokens/names.js
 
-export default TOKENS
+const tokens = Object.values(assets)
+  .filter((asset) => asset.assetType === 'SOLANA_TOKEN')
+  .map((token) => ({
+    ...token,
+    tokenName: token.name, // alias
+  }))
+
+export default tokens

package/src/transaction.js

@@ -52,7 +52,7 @@ class Tx {
       assert(Array.isArray(fromTokenAddresses), 'fromTokenAddresses Array is required')
     }
 
-    const token = TOKENS.find(({ tokenName: name }) => name === tokenName)
+    const token = TOKENS.find(({ name }) => name === tokenName)
     this.txObj = {
       from,
       to,
@@ -110,7 +110,7 @@ class Tx {
     let amountToSend
     for (let { ticker, tokenAccountAddress, balance } of fromTokenAddresses) {
       // need to add more of this instruction until we reach the desired balance (amount) to send
-      assert(ticker === token.tokenSymbol, `Got unexpected ticker ${ticker}`)
+      assert(ticker === token.ticker, `Got unexpected ticker ${ticker}`)
       if (amountLeft === 0) break
 
       balance = Number(balance)
@@ -129,7 +129,7 @@ class Tx {
       )
     }
 
-    assert(amountLeft === 0, `Not enough balance to send ${amount} ${token.tokenSymbol}`)
+    assert(amountLeft === 0, `Not enough balance to send ${amount} ${token.ticker}`)
   }
 
   static createStakeAccountTransaction({ address, amount, seed = SEED, pool, recentBlockhash }) {