@exodus/solana-lib 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -19,7 +19,6 @@
     "@exodus/models": "^8.10.4",
     "@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": "145ae526c51aefa39ffda8c63c70b30724aa9881"
 }

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/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