@exodus/solana-lib 1.3.1 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -25,5 +25,5 @@
     "lodash": "^4.17.11",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "49f3f78ac41acaf405e2849cccb2f9ecd0060424"
+  "gitHead": "e0c7ce8b006cb8cfc78bbd86769b7b5b1890e72b"
 }

package/src/transaction.js

@@ -36,11 +36,15 @@ class Tx {
     destinationAddressType,
     isAssociatedTokenAccountActive, // true when recipient balance !== 0
     fromTokenAddresses, // sender token addresses
+    instructions,
+    feePayer,
   } = {}) {
-    assert(from, 'from is required')
-    assert(to, 'to is required')
-    assert(amount, 'amount is required')
-    assert(typeof amount === 'number', 'amount must be a number')
+    if (!instructions) {
+      assert(from, 'from is required')
+      assert(to, 'to is required')
+      assert(amount, 'amount is required')
+      assert(typeof amount === 'number', 'amount must be a number')
+    }
     assert(recentBlockhash, 'recentBlockhash is required')
     if (tokenMintAddress) {
       assert(
@@ -63,11 +67,15 @@ class Tx {
       destinationAddressType,
       isAssociatedTokenAccountActive,
       fromTokenAddresses,
+      instructions,
+      feePayer,
     }
 
     if (tokenMintAddress) {
       // TOKEN transfer tx
       this.buildTokenTransaction(this.txObj)
+    } else if (instructions) {
+      this.buildInstructionsTransaction(this.txObj)
     } else {
       // SOL tx
       this.buildSOLtransaction(this.txObj)
@@ -87,6 +95,21 @@ class Tx {
     })
   }
 
+  buildInstructionsTransaction({ feePayer, recentBlockhash, instructions }) {
+    this.transaction = new Transaction({
+      feePayer: new PublicKey(feePayer),
+      instructions: instructions.map(i => ({
+        programId: new PublicKey(i.programId),
+        data: i.data ? Buffer.from(i.data) : Buffer.from([]),
+        keys: i.keys.map(k => ({
+          ...k,
+          pubkey: new PublicKey(k.pubkey)
+        }))
+      })),
+      recentBlockhash,
+    })
+  }
+
   buildTokenTransaction({
     from,
     to,
@@ -325,7 +348,7 @@ class Tx {
 
     const info = {
       txId,
-      owner: tx.feePayer.toString(), // SOL sender
+      owner: tx.getFeePayer().toString(), // SOL sender
     }
     const txDetails = stakingInstructions.reduce((info, ix) => {
       const type = StakeInstruction.decodeInstructionType(ix)

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

@@ -30,13 +30,16 @@ export function createUnsignedTx({
   expectedMintAddress,
   metadataAddress,
   creators,
+  // Wallet Connect
+  instructions,
+  feePayer,
 }: ParsedTransaction): UnsignedTransaction {
   return {
     txData: {
       from,
       to,
-      amount: amount.toBase().toNumber(),
-      fee: fee.toBase().toNumber(),
+      amount: amount ? amount.toBase().toNumber() : null,
+      fee: fee ? fee.toBase().toNumber() : null,
       recentBlockhash,
       // Tokens related:
       tokenMintAddress,
@@ -60,6 +63,9 @@ export function createUnsignedTx({
       takerAddress,
       metadataAddress,
       creators,
+      // Wallet Connect
+      instructions,
+      feePayer,
     },
     txMeta: {
       assetName: asset.name,

package/src/tx/index.js

@@ -3,3 +3,4 @@ export * from './parse-unsigned-tx'
 export * from './create-unsigned-tx'
 export * from './create-and-sign-tx'
 export * from './simulate-and-sign-tx'
+export { default as signMessage } from './sign-message'

package/src/tx/sign-message.js

@@ -0,0 +1,11 @@
+import nacl from 'tweetnacl'
+import bs58 from 'bs58'
+
+import { getKeyPairFromPrivateKey } from '../keypair'
+
+export default function signMessage({ message, privateKey }) {
+  const { secretKey } = getKeyPairFromPrivateKey(privateKey)
+  const signature = nacl.sign.detached(bs58.decode(message), secretKey)
+  const bs58Signature = bs58.encode(signature)
+  return bs58Signature
+}

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

@@ -33,6 +33,9 @@ export function signUnsignedTx(
     expectedMintAddress,
     metadataAddress,
     creators,
+    // Wallet Connect
+    instructions,
+    feePayer,
   } = unsignedTx.txData
 
   const asset = assets.solana
@@ -112,6 +115,8 @@ export function signUnsignedTx(
         destinationAddressType,
         isAssociatedTokenAccountActive,
         fromTokenAddresses,
+        instructions,
+        feePayer,
       })
       break
   }

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

@@ -25,7 +25,7 @@ export function getTransactionSimulationParams(transaction) {
   }
 }
 
-const isSolAccount = (account) => account === '1111111111111111'
+const isSolAccount = (account) => account === '11111111111111111111111111111111'
 
 export function filterAccountsByOwner(futureAccountsState, accountAddresses, publicKey) {
   const solAccounts = []

package/src/vendor/transaction.js

@@ -152,15 +152,22 @@ export class Transaction {
     }
     return null
   }
+
   /**
+   * The transaction fee payer
+   */
+  feePayer: PublicKey;
+
+   /**
    * The transaction fee payer (first signer)
    */
-  get feePayer(): PublicKey | null {
+  getFeePayer(): PublicKey | null {
     if (this.signatures.length > 0) {
       return this.signatures[0].publicKey
     }
     return null
   }
+
   /**
    * The instructions to atomically execute
    */
@@ -222,8 +229,14 @@ export class Transaction {
       throw new Error('No instructions provided')
     }
 
-    if (this.feePayer === null) {
-      throw new Error('Transaction feePayer required')
+    let feePayer: PublicKey;
+    if (this.feePayer) {
+      feePayer = this.feePayer;
+    } else if (this.signatures.length > 0 && this.signatures[0].publicKey) {
+      // Use implicit fee payer
+      feePayer = this.signatures[0].publicKey;
+    } else {
+      throw new Error('Transaction fee payer required');
     }
 
     const programIds: string[] = []
@@ -268,6 +281,25 @@ export class Transaction {
         uniqueMetas.push(accountMeta)
       }
     })
+
+    const feePayerIndex = uniqueMetas.findIndex(x => {
+      return x.pubkey.equals(feePayer);
+    });
+
+    if (feePayerIndex > -1) {
+      const [payerMeta] = uniqueMetas.splice(feePayerIndex, 1);
+      payerMeta.isSigner = true;
+      payerMeta.isWritable = true;
+      uniqueMetas.unshift(payerMeta);
+    } else {
+      uniqueMetas.unshift({
+        pubkey: feePayer,
+        isSigner: true,
+        isWritable: true
+      });
+    } // Disallow unknown signers
+
+
     // Move payer to the front and disallow unknown signers
     this.signatures.forEach((signature, signatureIndex) => {
       const isPayer = signatureIndex === 0