@exodus/solana-lib 1.2.4 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "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.0",
+    "@exodus/assets": "^8.0.2",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
     "@exodus/models": "^8.4.0",
     "bn.js": "~4.11.0",
@@ -22,5 +22,5 @@
     "create-hash": "~1.1.3",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "f5a2d444a2789ca118671566f32805dba061ce5a"
+  "gitHead": "791e305a718246460d5ac93ed2eb7808955c0f5d"
 }

package/src/helpers/tokenTransfer.js

@@ -52,17 +52,11 @@ function createIx(
   })
 }
 
-// https://github.com/paul-schaaf/spl-token-ui/blob/main/src/solana/token/editing.ts#L207
-export const createTokenTransferInstruction = (
-  owner,
-  fromTokenAddress,
-  tokenMintAddress,
-  to,
-  amount
-) => {
+// https://github.com/paul-schaaf/spl-token-ui/blob/main/src/solana/token/editing.ts#L211
+export const createTokenTransferInstruction = (owner, fromTokenAddress, to, amount) => {
   const sourcePubkey = new PublicKey(fromTokenAddress) // the token ADDRESS needed!
-  const destinationPubkey = new PublicKey(findAssociatedTokenAddress(to, tokenMintAddress))
-  console.log(`destination associatedTokenAddress: ${destinationPubkey.toBase58()}`)
+  const destinationPubkey = new PublicKey(to)
+  console.log(`destination token address: ${destinationPubkey.toBase58()}`)
   const ownerAccountOrWalletPublicKey = new PublicKey(owner) // the only native SOL address
 
   const transferIx = Token.createTransferInstruction(

package/src/tokens.js

@@ -1,26 +1,13 @@
-// reference https://github.com/project-serum/spl-token-wallet/blob/master/src/utils/tokens/names.js
+// adapted from https://github.com/project-serum/spl-token-wallet/blob/master/src/utils/tokens/names.js
 
 const TOKENS = [
   {
     mintAddress: 'SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt',
-    tokenName: 'Serum',
+    tokenName: 'serum',
+    tokenProperName: 'Serum',
     tokenSymbol: 'SRM',
   },
-  {
-    tokenSymbol: 'BTC',
-    mintAddress: '9n4nbM75f5Ui33ZbPYXn59EwSgE8CGsHtAeTH5YFeJ9E',
-    tokenName: 'Wrapped Bitcoin',
-    icon:
-      'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/bitcoin/info/logo.png',
-  },
-  {
-    tokenSymbol: 'USDC',
-    mintAddress: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
-    tokenName: 'USD Coin',
-    icon:
-      'https://raw.githubusercontent.com/trustwallet/assets/f3ffd0b9ae2165336279ce2f8db1981a55ce30f8/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
-  },
-  // ... TODO: do we want to add decimals for every token? (Serum SRM is 6)
+  // ....
 ]
 
 export default TOKENS

package/src/transaction.js

@@ -2,6 +2,7 @@
 import assert from 'assert'
 
 import { getKeyPairFromPrivateKey } from './keypair'
+import { findAssociatedTokenAddress } from './encode'
 import {
   createAssociatedTokenAccount,
   createTokenTransferInstruction,
@@ -18,7 +19,8 @@ class Tx {
     recentBlockhash,
     // fee, // (Fee per Signature: 5000 lamports)
     // Tokens related:
-    tokenTicker,
+    tokenName,
+    destinationAddressType,
     isAssociatedTokenAccountActive, // true when recipient balance !== 0
     fromTokenAddresses, // sender token addresses
   } = {}) {
@@ -27,7 +29,11 @@ class Tx {
     assert(amount, 'amount is required')
     assert(typeof amount === 'number', 'amount must be a number')
     assert(recentBlockhash, 'recentBlockhash is required')
-    if (tokenTicker) {
+    if (tokenName) {
+      assert(
+        typeof destinationAddressType !== 'undefined',
+        'destinationAddressType is required when sending tokens'
+      )
       assert(
         typeof isAssociatedTokenAccountActive !== 'undefined',
         'isAssociatedTokenAccountActive is required when sending tokens'
@@ -35,13 +41,14 @@ class Tx {
       assert(Array.isArray(fromTokenAddresses), 'fromTokenAddresses Array is required')
     }
 
-    const token = TOKENS.find(({ tokenSymbol }) => tokenSymbol === tokenTicker)
+    const token = TOKENS.find(({ tokenName: name }) => name === tokenName)
     this.txObj = {
       from,
       to,
       amount,
       recentBlockhash,
       token,
+      destinationAddressType,
       isAssociatedTokenAccountActive,
       fromTokenAddresses,
     }
@@ -74,14 +81,18 @@ class Tx {
     amount,
     recentBlockhash,
     token,
+    destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
   }) {
     this.transaction = new Transaction({
       recentBlockhash,
     })
+    const isUnknown = destinationAddressType === null
+    const isSOLaddress = destinationAddressType === 'solana'
     // crete account instruction
-    if (!isAssociatedTokenAccountActive)
+    if (isUnknown) throw new Error('Destination SOL balance cannot be zero (address not active)') // cannot initialize without knowing the owner
+    if (isSOLaddress && !isAssociatedTokenAccountActive)
       this.transaction.add(createAssociatedTokenAccount(from, token.mintAddress, to))
 
     let amountLeft = amount
@@ -100,15 +111,10 @@ class Tx {
         amountLeft -= amountToSend
       }
 
+      const dest = isSOLaddress ? findAssociatedTokenAddress(to, token.mintAddress) : to
       // add transfer token instruction
       this.transaction.add(
-        createTokenTransferInstruction(
-          from,
-          tokenAccountAddress,
-          token.mintAddress,
-          to,
-          amountToSend
-        )
+        createTokenTransferInstruction(from, tokenAccountAddress, dest, amountToSend)
       )
     }
 

package/src/tx/create-unsigned-tx.js

@@ -6,6 +6,11 @@ export function createUnsignedTx({
   to,
   amount,
   recentBlockhash,
+  // Tokens related:
+  tokenName,
+  destinationAddressType,
+  isAssociatedTokenAccountActive, // true when recipient balance !== 0
+  fromTokenAddresses, // sender token addresses
 }: ParsedTransaction): UnsignedTransaction {
   return {
     txData: {
@@ -13,6 +18,11 @@ export function createUnsignedTx({
       to,
       amount: amount.toBase().toNumber(),
       recentBlockhash,
+      // Tokens related:
+      tokenName,
+      destinationAddressType,
+      isAssociatedTokenAccountActive,
+      fromTokenAddresses,
     },
     txMeta: {
       assetName: asset.name,

package/src/tx/parse-unsigned-tx.js

@@ -3,7 +3,16 @@ import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/
 
 export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransaction {
   const asset = assets.solana
-  const { from, to, recentBlockhash, ...txData } = unsignedTx.txData
+  const {
+    from,
+    to,
+    recentBlockhash,
+    tokenName,
+    destinationAddressType,
+    isAssociatedTokenAccountActive,
+    fromTokenAddresses,
+    ...txData
+  } = unsignedTx.txData
 
   const amount = asset.currency.baseUnit(txData.amount)
   return {
@@ -12,5 +21,10 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     to,
     amount,
     recentBlockhash,
+    // token related
+    tokenName,
+    destinationAddressType,
+    isAssociatedTokenAccountActive,
+    fromTokenAddresses,
   }
 }

package/src/tx/sign-unsigned-tx.js

@@ -6,7 +6,16 @@ export function signUnsignedTx(
   unsignedTx: UnsignedTransaction,
   privateKey: Buffer
 ): SignedTransaction {
-  const { from, to, amount, recentBlockhash } = unsignedTx.txData
+  const {
+    from,
+    to,
+    amount,
+    recentBlockhash,
+    tokenName,
+    destinationAddressType,
+    isAssociatedTokenAccountActive,
+    fromTokenAddresses,
+  } = unsignedTx.txData
 
   const asset = assets.solana
   const tx = new Transaction({
@@ -14,6 +23,10 @@ export function signUnsignedTx(
     to,
     amount: asset.currency.baseUnit(amount).toNumber(),
     recentBlockhash,
+    tokenName,
+    destinationAddressType,
+    isAssociatedTokenAccountActive,
+    fromTokenAddresses,
   })
 
   // sign plain tx

package/src/vendor/transaction.js

@@ -316,7 +316,9 @@ export class Transaction {
     })
 
     if (numRequiredSignatures !== this.signatures.length) {
-      throw new Error('missing signer(s)')
+      throw new Error(
+        `missing signer(s) - required signatures: ${numRequiredSignatures}, got ${this.signatures.length}`
+      )
     }
 
     const accountKeys = signedKeys.concat(unsignedKeys)