@exodus/solana-lib 3.11.1 → 3.11.2

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.11.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.11.1...@exodus/solana-lib@3.11.2) (2025-05-05)
+
+**Note:** Version bump only for package @exodus/solana-lib
+
+
+
+
+
 ## [3.11.1](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.11.0...@exodus/solana-lib@3.11.1) (2025-04-21)
 
 **Note:** Version bump only for package @exodus/solana-lib

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.11.1",
+  "version": "3.11.2",
   "description": "Solana utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -46,5 +46,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "2e550990ef9db4209f8fe4e6e0485579d1afeedf"
+  "gitHead": "aeb2c9fa295b25d05938640f32aa6f3d318c6922"
 }

package/src/transaction.js

@@ -277,7 +277,7 @@ class Tx {
   }
 
   static undelegate({ address, stakeAddresses, recentBlockhash }) {
-    // undelegate all stake addresses
+    // undelegate all stake addresses, in a single tx
     assert(Array.isArray(stakeAddresses), 'stakeAddresses Array is required')
 
     const fromPubkey = new PublicKey(address)
@@ -295,19 +295,29 @@ class Tx {
     return transaction
   }
 
-  static withdraw({ address, stakeAddresses, amount, recentBlockhash }) {
+  static withdraw({ address, accounts, recentBlockhash }) {
+    // withdraw all inactive unstaked addresses, in a single tx
+    assert(typeof accounts === 'object', 'accounts object is required')
     const fromPubkey = new PublicKey(address)
-    const stakeAddress = Array.isArray(stakeAddresses) ? stakeAddresses[0] : stakeAddresses
-    const stakePublicKey = new PublicKey(stakeAddress)
 
-    // TODO: why don't we put all withdraw in a single tx??
-    const transaction = StakeProgram.withdraw({
-      stakePubkey: stakePublicKey,
-      authorizedPubkey: fromPubkey,
-      toPubkey: fromPubkey,
-      lamports: amount,
-    })
-    transaction.recentBlockhash = recentBlockhash
+    const transaction = new Transaction({ recentBlockhash })
+
+    // putting all withdraw instructions in a single tx
+    for (const [stakeAddress, account] of Object.entries(accounts)) {
+      if (!account.canWithdraw) continue // skip non-withdrawable accounts
+      if (!account.lamports) continue // skip empty accounts
+
+      const stakePublicKey = new PublicKey(stakeAddress)
+
+      const instruction = StakeProgram.withdraw({
+        stakePubkey: stakePublicKey,
+        authorizedPubkey: fromPubkey,
+        toPubkey: fromPubkey,
+        lamports: account.lamports,
+      })
+      transaction.add(instruction)
+    }
+
     return transaction
   }
 

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

@@ -18,6 +18,7 @@ export function createUnsignedTx({
   method,
   // Staking related:
   stakeAddresses,
+  accounts,
   seed,
   pool,
   // MagicEden escrow/related:
@@ -54,6 +55,7 @@ export function createUnsignedTx({
       // Staking related:
       method,
       stakeAddresses,
+      accounts,
       seed,
       pool,
       // MagicEden escrow/related:

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

@@ -9,6 +9,7 @@ export function parseUnsignedTx({ asset, unsignedTx }) {
     fromTokenAddresses,
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
     initializerAddress,
@@ -41,6 +42,7 @@ export function parseUnsignedTx({ asset, unsignedTx }) {
     // staking related
     method,
     stakeAddresses,
+    accounts,
     seed,
     pool,
     // MagicEden escrow/related:

package/src/tx/prepare-for-signing.js

@@ -141,12 +141,12 @@ const createUndelegateTransaction = ({ address, recentBlockhash, stakeAddresses
     stakeAddresses,
   })
 
-const createWithdrawTransaction = ({ address, amount, recentBlockhash, stakeAddresses }) =>
+const createWithdrawTransaction = ({ address, amount, recentBlockhash, accounts }) =>
   Transaction.withdraw({
     address,
     amount,
     recentBlockhash,
-    stakeAddresses,
+    accounts,
   })
 
 const createMagicEdenInitializeEscrowTransaction = ({