@exodus/solana-lib 1.6.0 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.6.0",
+  "version": "1.6.3",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -14,12 +14,11 @@
   },
   "dependencies": {
     "@exodus/asset-lib": "^3.7.1",
-    "@exodus/assets": "^8.0.74",
     "@exodus/buffer-layout": "^1.2.0-exodus1",
     "@exodus/models": "^8.10.4",
+    "@exodus/solana-meta": "^1.0.2",
     "@exodus/solana-spl-token": "0.1.8-exodus.1",
     "@project-serum/serum": "0.13.64",
-    "@solana/web3.js": "1.31.0",
     "bn.js": "^4.11.0",
     "borsh": "^0.7.0",
     "bs58": "^4.0.1",
@@ -27,5 +26,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "301d6e9222b3c0828c73cea460c94c9bbce878e6"
+  "gitHead": "a7b27e4f299057c16dda446f006fa61a945a6cbf"
 }

package/src/fee-data/solana.js

@@ -1,5 +1,5 @@
 import { FeeData } from '@exodus/asset-lib'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/solana-meta'
 
 export default new FeeData({
   config: {
@@ -7,5 +7,5 @@ export default new FeeData({
     fuelThreshold: '0.000015 SOL',
   },
   mainKey: 'fee',
-  currency: assets.solana.currency,
+  currency: asset.currency,
 })

package/src/keypair.js

@@ -1,5 +1,6 @@
 // @flow
 import nacl from 'tweetnacl'
+import { PublicKey } from './vendor'
 
 export function getKeyPairFromPrivateKey(privateKey: string | Buffer): Object {
   const { publicKey, secretKey } = nacl.sign.keyPair.fromSeed(
@@ -17,7 +18,7 @@ export function generateKeyPair() {
 
   return {
     secretKey: Buffer.from(secretKey, 'hex'), // secretKey
-    publicKey: Buffer.from(publicKey, 'hex'),
+    publicKey: new PublicKey(publicKey),
   }
 }
 

package/src/tx/build-raw-transaction.js

@@ -1,5 +1,5 @@
 import * as nacl from 'tweetnacl'
-import { PACKET_DATA_SIZE } from '@solana/web3.js'
+import { PACKET_DATA_SIZE } from '../vendor'
 
 // Copied from:
 // https://github.com/solana-labs/solana-web3.js/blob/42612c936d8d4ddbcb09dbb73db9e1aeaf6d8764/src/util/shortvec-encoding.ts#L15-L28.

package/src/tx/decode-tx-instructions.js

@@ -8,7 +8,7 @@ import {
   SystemProgram,
   TransactionInstruction,
   PublicKey,
-} from '@solana/web3.js'
+} from './../vendor'
 import bs58 from 'bs58'
 
 type DecodedInstruction = {

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

@@ -1,8 +1,7 @@
-import assets from '@exodus/assets'
+import { asset } from '@exodus/solana-meta'
 import type { UnsignedTransaction, ParsedTransaction } from '@exodus/models/lib/types'
 
 export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransaction {
-  const asset = assets.solana
   const {
     from,
     to,
@@ -32,7 +31,6 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
   const amount = asset.currency.baseUnit(txData.amount)
   const fee = asset.currency.baseUnit(txData.fee)
   return {
-    asset,
     from: [from],
     to,
     amount,

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

@@ -1,5 +1,4 @@
-import { merge } from 'lodash'
-import assets from '@exodus/assets'
+import { asset } from '@exodus/solana-meta'
 import type { UnsignedTransaction, SignedTransaction } from '@exodus/models/lib/types'
 
 import { Transaction, getTransactionStrategy } from '../'
@@ -14,17 +13,12 @@ export function signUnsignedTx(
     return _signTx({ tx: transaction, privateKey })
   }
 
-  const asset = assets.solana
   const address = from
   const amount = unitAmount ? asset.currency.baseUnit(unitAmount).toNumber() : unitAmount
 
-  const args = merge(unsignedTx.txData, {
-    asset,
-    address,
-    amount,
-  })
+  const txData = { ...unsignedTx.txData, address, amount }
 
-  const tx = createTx({ txData: args, method })
+  const tx = createTx({ txData, method })
   return _signTx({ tx, privateKey })
 }
 

package/src/tx/simulate-and-sign-tx.js

@@ -12,15 +12,17 @@ export function getTransactionSimulationParams(transactionMessage) {
     commitment: 'confirmed',
   }
 
-  let accountAddresses = []
+  const accountAddresses = new Set()
+
   if (!transactionMessage.accountKeys) {
     const programIds = new Set(
       transactionMessage.instructions.map((instruction) => instruction.programId.toString())
     )
+
     transactionMessage.instructions.forEach((instruction) => {
       instruction.keys.forEach((key) => {
         if (!programIds.has(key.pubkey.toString())) {
-          accountAddresses.push(key.pubkey.toString())
+          accountAddresses.add(key.pubkey.toString())
         }
       })
     })
@@ -35,19 +37,19 @@ export function getTransactionSimulationParams(transactionMessage) {
       )
     }
 
-    accountAddresses = transactionMessage.accountKeys
+    transactionMessage.accountKeys
       .filter((_, index) => !indexToProgramIds.has(index))
-      .map((account) => account.toString())
+      .forEach((account) => accountAddresses.add(account.toString()))
   }
 
   config['accounts'] = {
     encoding: 'base64',
-    addresses: accountAddresses,
+    addresses: Array.from(accountAddresses),
   }
 
   return {
     config,
-    accountAddresses,
+    accountAddresses: Array.from(accountAddresses),
   }
 }
 

package/src/vendor/message.js

@@ -72,6 +72,10 @@ export class Message {
     this.instructions = args.instructions
   }
 
+  isAccountSigner(index: number): boolean {
+    return index < this.header.numRequiredSignatures
+  }
+
   isAccountWritable(index: number): boolean {
     return (
       index < this.header.numRequiredSignatures - this.header.numReadonlySignedAccounts ||

package/src/vendor/transaction.js

@@ -356,12 +356,6 @@ export class Transaction {
       }
     })
 
-    if (numRequiredSignatures !== this.signatures.length) {
-      throw new Error(
-        `missing signer(s) - required signatures: ${numRequiredSignatures}, got ${this.signatures.length}`
-      )
-    }
-
     const accountKeys = signedKeys.concat(unsignedKeys)
     const instructions: CompiledInstruction[] = this.instructions.map((instruction) => {
       const { data, programId } = instruction