@exodus/solana-lib 1.2.7 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Exodus internal Solana low-level library",
   "main": "src/index.js",
   "files": [
@@ -22,5 +22,5 @@
     "create-hash": "~1.1.3",
     "tweetnacl": "^1.0.3"
   },
-  "gitHead": "892c55db784616256e065a2c931a5e5611f5404f"
+  "gitHead": "0dc8adf4a7d4d6dc3d0785f5b5d39e0a6bfb23cd"
 }

package/src/transaction.js

@@ -130,15 +130,17 @@ class Tx {
     assert(amountLeft === 0, `Not enough balance to send ${amount} ${token.tokenSymbol}`)
   }
 
-  static createStakeAccountTransaction({ address, amount, seed = SEED, recentBlockhash }) {
+  static createStakeAccountTransaction({ address, amount, seed = SEED, pool, recentBlockhash }) {
     const fromPubkey = new PublicKey(address)
     const stakeAddress = createStakeAddress(address, seed)
     const stakePublicKey = new PublicKey(stakeAddress)
+    const poolKey = new PublicKey(pool)
 
     const authorized = new Authorized(fromPubkey, fromPubkey) // staker, withdrawer
     const lockup = new Lockup(0, 0, fromPubkey) // no lockup
 
-    const transaction = StakeProgram.createAccountWithSeed({
+    // create account instruction
+    const programTx = StakeProgram.createAccountWithSeed({
       fromPubkey,
       stakePubkey: stakePublicKey,
       basePubkey: fromPubkey,
@@ -147,6 +149,48 @@ class Tx {
       lockup,
       lamports: amount, // number
     })
+
+    // delegate funds instruction
+    const delegateTx = StakeProgram.delegate({
+      stakePubkey: stakePublicKey,
+      authorizedPubkey: fromPubkey,
+      votePubkey: poolKey, // pool vote key
+    })
+
+    const transaction = new Transaction({ recentBlockhash }).add(programTx).add(delegateTx)
+    return transaction
+  }
+
+  static undelegate({ address, stakeAddresses, recentBlockhash }) {
+    // undelegate all stake addresses
+    assert(Array.isArray(stakeAddresses), 'stakeAddresses Array is required')
+
+    const fromPubkey = new PublicKey(address)
+    const transaction = new Transaction({ recentBlockhash })
+
+    stakeAddresses.forEach((stakeAddress) => {
+      const stakePublicKey = new PublicKey(stakeAddress)
+      const programTx = StakeProgram.deactivate({
+        stakePubkey: stakePublicKey,
+        authorizedPubkey: fromPubkey,
+      })
+      transaction.add(programTx)
+    })
+
+    return transaction
+  }
+
+  static withdraw({ address, stakeAddresses, amount, recentBlockhash }) {
+    const fromPubkey = new PublicKey(address)
+    const stakeAddress = Array.isArray(stakeAddresses) ? stakeAddresses[0] : stakeAddresses
+    const stakePublicKey = new PublicKey(stakeAddress)
+
+    const transaction = StakeProgram.withdraw({
+      stakePubkey: stakePublicKey,
+      authorizedPubkey: fromPubkey,
+      toPubkey: fromPubkey,
+      lamports: amount,
+    })
     transaction.recentBlockhash = recentBlockhash
     return transaction
   }
@@ -182,6 +226,15 @@ class Tx {
     }
     return bs58.encode(this.transaction.signature)
   }
+
+  static getTxId(tx) {
+    let transaction = tx
+    if (tx instanceof Tx) transaction = tx.transaction
+    if (!transaction.signature) {
+      throw new Error('Cannot get txId, tx is not signed')
+    }
+    return bs58.encode(transaction.signature)
+  }
 }
 
 export default Tx

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

@@ -11,6 +11,11 @@ export function createUnsignedTx({
   destinationAddressType,
   isAssociatedTokenAccountActive, // true when recipient balance !== 0
   fromTokenAddresses, // sender token addresses
+  // Staking related:
+  method,
+  stakeAddresses,
+  seed,
+  pool,
 }: ParsedTransaction): UnsignedTransaction {
   return {
     txData: {
@@ -23,6 +28,11 @@ export function createUnsignedTx({
       destinationAddressType,
       isAssociatedTokenAccountActive,
       fromTokenAddresses,
+      // Staking related:
+      method,
+      stakeAddresses,
+      seed,
+      pool,
     },
     txMeta: {
       assetName: asset.name,

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

@@ -11,6 +11,10 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
+    method,
+    stakeAddresses,
+    seed,
+    pool,
     ...txData
   } = unsignedTx.txData
 
@@ -26,5 +30,10 @@ export function parseUnsignedTx(unsignedTx: UnsignedTransaction): ParsedTransact
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
+    // staking related
+    method,
+    stakeAddresses,
+    seed,
+    pool,
   }
 }

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

@@ -9,30 +9,70 @@ export function signUnsignedTx(
   const {
     from,
     to,
-    amount,
+    amount: unitAmount,
     recentBlockhash,
+    // tokens related
     tokenName,
     destinationAddressType,
     isAssociatedTokenAccountActive,
     fromTokenAddresses,
+    // staking related
+    stakeAddresses,
+    method,
+    seed,
+    pool,
   } = unsignedTx.txData
 
   const asset = assets.solana
-  const tx = new Transaction({
-    from,
-    to,
-    amount: asset.currency.baseUnit(amount).toNumber(),
-    recentBlockhash,
-    tokenName,
-    destinationAddressType,
-    isAssociatedTokenAccountActive,
-    fromTokenAddresses,
-  })
+
+  const address = from
+  const amount = unitAmount ? asset.currency.baseUnit(unitAmount).toNumber() : unitAmount
+
+  let tx
+  switch (method) {
+    case 'delegate':
+      tx = Transaction.createStakeAccountTransaction({
+        address,
+        amount,
+        recentBlockhash,
+        seed,
+        pool,
+      })
+      break
+    case 'undelegate':
+      tx = Transaction.undelegate({
+        address,
+        stakeAddresses,
+        recentBlockhash,
+      })
+      break
+    case 'withdraw':
+      tx = Transaction.withdraw({
+        address,
+        stakeAddresses,
+        amount,
+        recentBlockhash,
+      })
+      break
+    default:
+      // SOL and Token tx
+      tx = new Transaction({
+        from,
+        to,
+        amount,
+        recentBlockhash,
+        tokenName,
+        destinationAddressType,
+        isAssociatedTokenAccountActive,
+        fromTokenAddresses,
+      })
+      break
+  }
 
   // sign plain tx
   Transaction.sign(tx, privateKey)
-  const rawTx = tx.serialize()
-  const txId = tx.getTxId()
+  const rawTx = Transaction.serialize(tx)
+  const txId = Transaction.getTxId(tx)
 
   return { txId, rawTx }
 }

package/src/vendor/stake-program.js

@@ -298,68 +298,6 @@ export class StakeInstruction {
     }
   }
 
-  /**
-   * Decode an authorize stake instruction and retrieve the instruction params.
-   */
-  static decodeAuthorize(instruction: TransactionInstruction): AuthorizeStakeParams {
-    this.checkProgramId(instruction.programId)
-    this.checkKeyLength(instruction.keys, 3)
-    const { newAuthorized, stakeAuthorizationType } = decodeData(
-      STAKE_INSTRUCTION_LAYOUTS.Authorize,
-      instruction.data
-    )
-
-    return {
-      stakePubkey: instruction.keys[0].pubkey,
-      authorizedPubkey: instruction.keys[2].pubkey,
-      newAuthorizedPubkey: new PublicKey(newAuthorized),
-      stakeAuthorizationType: {
-        index: stakeAuthorizationType,
-      },
-    }
-  }
-
-  /**
-   * Decode an authorize-with-seed stake instruction and retrieve the instruction params.
-   */
-  static decodeAuthorizeWithSeed(
-    instruction: TransactionInstruction
-  ): AuthorizeWithSeedStakeParams {
-    this.checkProgramId(instruction.programId)
-    this.checkKeyLength(instruction.keys, 2)
-    const { newAuthorized, stakeAuthorizationType, authoritySeed, authorityOwner } = decodeData(
-      STAKE_INSTRUCTION_LAYOUTS.AuthorizeWithSeed,
-      instruction.data
-    )
-
-    return {
-      stakePubkey: instruction.keys[0].pubkey,
-      authorityBase: instruction.keys[1].pubkey,
-      authoritySeed: authoritySeed,
-      authorityOwner: new PublicKey(authorityOwner),
-      newAuthorizedPubkey: new PublicKey(newAuthorized),
-      stakeAuthorizationType: {
-        index: stakeAuthorizationType,
-      },
-    }
-  }
-
-  /**
-   * Decode a split stake instruction and retrieve the instruction params.
-   */
-  static decodeSplit(instruction: TransactionInstruction): SplitStakeParams {
-    this.checkProgramId(instruction.programId)
-    this.checkKeyLength(instruction.keys, 3)
-    const { lamports } = decodeData(STAKE_INSTRUCTION_LAYOUTS.Split, instruction.data)
-
-    return {
-      stakePubkey: instruction.keys[0].pubkey,
-      splitStakePubkey: instruction.keys[1].pubkey,
-      authorizedPubkey: instruction.keys[2].pubkey,
-      lamports,
-    }
-  }
-
   /**
    * Decode a withdraw stake instruction and retrieve the instruction params.
    */
@@ -543,92 +481,6 @@ export class StakeProgram {
     })
   }
 
-  /**
-   * Generate a Transaction that authorizes a new PublicKey as Staker
-   * or Withdrawer on the Stake account.
-   */
-  static authorize(params: AuthorizeStakeParams): Transaction {
-    const { stakePubkey, authorizedPubkey, newAuthorizedPubkey, stakeAuthorizationType } = params
-
-    const type = STAKE_INSTRUCTION_LAYOUTS.Authorize
-    const data = encodeData(type, {
-      newAuthorized: newAuthorizedPubkey.toBuffer(),
-      stakeAuthorizationType: stakeAuthorizationType.index,
-    })
-
-    return new Transaction().add({
-      keys: [
-        { pubkey: stakePubkey, isSigner: false, isWritable: true },
-        { pubkey: SYSVAR_CLOCK_PUBKEY, isSigner: false, isWritable: true },
-        { pubkey: authorizedPubkey, isSigner: true, isWritable: false },
-      ],
-      programId: this.programId,
-      data,
-    })
-  }
-
-  /**
-   * Generate a Transaction that authorizes a new PublicKey as Staker
-   * or Withdrawer on the Stake account.
-   */
-  static authorizeWithSeed(params: AuthorizeWithSeedStakeParams): Transaction {
-    const {
-      stakePubkey,
-      authorityBase,
-      authoritySeed,
-      authorityOwner,
-      newAuthorizedPubkey,
-      stakeAuthorizationType,
-    } = params
-
-    const type = STAKE_INSTRUCTION_LAYOUTS.AuthorizeWithSeed
-    const data = encodeData(type, {
-      newAuthorized: newAuthorizedPubkey.toBuffer(),
-      stakeAuthorizationType: stakeAuthorizationType.index,
-      authoritySeed: authoritySeed,
-      authorityOwner: authorityOwner.toBuffer(),
-    })
-
-    return new Transaction().add({
-      keys: [
-        { pubkey: stakePubkey, isSigner: false, isWritable: true },
-        { pubkey: authorityBase, isSigner: true, isWritable: false },
-      ],
-      programId: this.programId,
-      data,
-    })
-  }
-
-  /**
-   * Generate a Transaction that splits Stake tokens into another stake account
-   */
-  static split(params: SplitStakeParams): Transaction {
-    const { stakePubkey, authorizedPubkey, splitStakePubkey, lamports } = params
-
-    const transaction = new Transaction()
-    transaction.add(
-      SystemProgram.createAccount({
-        fromPubkey: authorizedPubkey,
-        newAccountPubkey: splitStakePubkey,
-        lamports: 0,
-        space: this.space,
-        programId: this.programId,
-      })
-    )
-    const type = STAKE_INSTRUCTION_LAYOUTS.Split
-    const data = encodeData(type, { lamports })
-
-    return transaction.add({
-      keys: [
-        { pubkey: stakePubkey, isSigner: false, isWritable: true },
-        { pubkey: splitStakePubkey, isSigner: false, isWritable: true },
-        { pubkey: authorizedPubkey, isSigner: true, isWritable: false },
-      ],
-      programId: this.programId,
-      data,
-    })
-  }
-
   /**
    * Generate a Transaction that withdraws deactivated Stake tokens.
    */