@exodus/solana-lib 1.2.16 → 1.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.2.16",
+  "version": "1.2.21",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -23,5 +23,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "882b8a97ef05cbd0fbd7da0b2ce457e0a0ae7e35"
+  "gitHead": "dac1d4d133b92c18334de5a37332cfad769e1459"
 }

package/src/encode.js

@@ -1,7 +1,7 @@
 // @flow
 import { PublicKey, StakeProgram } from './vendor'
 import { SPL_ASSOCIATED_TOKEN_ACCOUNT_PROGRAM_ID, TOKEN_PROGRAM_ID, SEED } from './constants'
-import { getPublicKey } from './keypair'
+import { getPublicKey, getKeyPairFromPrivateKey } from './keypair'
 import bs58 from 'bs58'
 import BN from 'bn.js'
 
@@ -30,6 +30,11 @@ export function isValidAddress(address: string): boolean {
   }
 }
 
+export function getEncodedSecretKey(privateKey): string {
+  const { secretKey } = getKeyPairFromPrivateKey(Buffer.from(privateKey, 'hex'))
+  return bs58.encode(secretKey)
+}
+
 // doc: https://spl.solana.com/associated-token-account (HACK: refactored to sync)
 export function findAssociatedTokenAddress(
   walletAddress: string,

package/src/transaction.js

@@ -30,7 +30,9 @@ class Tx {
     recentBlockhash,
     // fee, // (Fee per Signature: 5000 lamports)
     // Tokens related:
+    // pass either name or mintAddress, if both, mintAddress has priority
     tokenName,
+    tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive, // true when recipient balance !== 0
     fromTokenAddresses, // sender token addresses
@@ -40,7 +42,7 @@ class Tx {
     assert(amount, 'amount is required')
     assert(typeof amount === 'number', 'amount must be a number')
     assert(recentBlockhash, 'recentBlockhash is required')
-    if (tokenName) {
+    if (tokenName || tokenMintAddress) {
       assert(
         typeof destinationAddressType !== 'undefined',
         'destinationAddressType is required when sending tokens'
@@ -52,19 +54,23 @@ class Tx {
       assert(Array.isArray(fromTokenAddresses), 'fromTokenAddresses Array is required')
     }
 
-    const token = TOKENS.find(({ name }) => name === tokenName)
+    if (tokenName && !tokenMintAddress) {
+      const token = TOKENS.find(({ name }) => name === tokenName)
+      tokenMintAddress = token && token.mintAddress
+    }
+
     this.txObj = {
       from,
       to,
       amount,
       recentBlockhash,
-      token,
+      tokenMintAddress,
       destinationAddressType,
       isAssociatedTokenAccountActive,
       fromTokenAddresses,
     }
 
-    if (token) {
+    if (tokenMintAddress) {
       // TOKEN transfer tx
       this.buildTokenTransaction(this.txObj)
     } else {
@@ -91,7 +97,7 @@ class Tx {
     to,
     amount,
     recentBlockhash,
-    token,
+    tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
@@ -99,18 +105,18 @@ class Tx {
     this.transaction = new Transaction({
       recentBlockhash,
     })
-    const isUnknown = destinationAddressType === null
+    // const isUnknown = destinationAddressType === null
+    // if (isUnknown) throw new Error('Destination SOL balance cannot be zero (address not active)') // cannot initialize without knowing the owner
     const isSOLaddress = destinationAddressType === 'solana'
     // crete account instruction
-    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))
+      this.transaction.add(createAssociatedTokenAccount(from, tokenMintAddress, to))
 
     let amountLeft = amount
     let amountToSend
-    for (let { ticker, tokenAccountAddress, balance } of fromTokenAddresses) {
+    for (let { mintAddress, tokenAccountAddress, balance } of fromTokenAddresses) {
       // need to add more of this instruction until we reach the desired balance (amount) to send
-      assert(ticker === token.ticker, `Got unexpected ticker ${ticker}`)
+      assert(mintAddress === tokenMintAddress, `Got unexpected mintAddress ${mintAddress}`)
       if (amountLeft === 0) break
 
       balance = Number(balance)
@@ -122,14 +128,14 @@ class Tx {
         amountLeft -= amountToSend
       }
 
-      const dest = isSOLaddress ? findAssociatedTokenAddress(to, token.mintAddress) : to
+      const dest = isSOLaddress ? findAssociatedTokenAddress(to, tokenMintAddress) : to
       // add transfer token instruction
       this.transaction.add(
         createTokenTransferInstruction(from, tokenAccountAddress, dest, amountToSend)
       )
     }
 
-    assert(amountLeft === 0, `Not enough balance to send ${amount} ${token.ticker}`)
+    assert(amountLeft === 0, `Not enough balance to send ${amount} ${tokenMintAddress}`)
   }
 
   static createStakeAccountTransaction({ address, amount, seed = SEED, pool, recentBlockhash }) {

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

@@ -9,6 +9,7 @@ export function createUnsignedTx({
   recentBlockhash,
   // Tokens related:
   tokenName,
+  tokenMintAddress,
   destinationAddressType,
   isAssociatedTokenAccountActive, // true when recipient balance !== 0
   fromTokenAddresses, // sender token addresses
@@ -27,6 +28,7 @@ export function createUnsignedTx({
       recentBlockhash,
       // Tokens related:
       tokenName,
+      tokenMintAddress,
       destinationAddressType,
       isAssociatedTokenAccountActive,
       fromTokenAddresses,

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

@@ -8,6 +8,7 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     to,
     recentBlockhash,
     tokenName,
+    tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
@@ -29,6 +30,7 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     recentBlockhash,
     // token related
     tokenName,
+    tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,

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

@@ -13,6 +13,7 @@ export function signUnsignedTx(
     recentBlockhash,
     // tokens related
     tokenName,
+    tokenMintAddress,
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
@@ -62,6 +63,7 @@ export function signUnsignedTx(
         amount,
         recentBlockhash,
         tokenName,
+        tokenMintAddress,
         destinationAddressType,
         isAssociatedTokenAccountActive,
         fromTokenAddresses,