@exponent-labs/exponent-sdk 0.9.1 → 0.9.2

package/src/exponentVaults/vaultTransactionBuilder.test.ts

@@ -17,6 +17,7 @@ jest.mock("./loopscale", () => ({
 
 jest.mock("./vault-interaction", () => ({
   buildSetupStatePriceRefreshInstructions: jest.fn(),
+  createVaultSyncTransactions: jest.fn(),
   createVaultSyncTransaction: jest.fn(),
   createStrategySetupContext: jest.fn(),
 }))
@@ -26,10 +27,12 @@ const { LoopscaleClient: mockLoopscaleClient } = jest.requireMock("./loopscale")
 }
 const {
   buildSetupStatePriceRefreshInstructions: mockBuildSetupStatePriceRefreshInstructions,
+  createVaultSyncTransactions: mockCreateVaultSyncTransactions,
   createVaultSyncTransaction: mockCreateVaultSyncTransaction,
   createStrategySetupContext: mockCreateStrategySetupContext,
 } = jest.requireMock("./vault-interaction") as {
   buildSetupStatePriceRefreshInstructions: jest.Mock
+  createVaultSyncTransactions: jest.Mock
   createVaultSyncTransaction: jest.Mock
   createStrategySetupContext: jest.Mock
 }
@@ -92,6 +95,7 @@ describe("VaultTransactionBuilder Loopscale integration", () => {
     ;(mockLoopscaleClient as any).mockPrepareVaultTransactions = mockPrepareVaultTransactions
     ;(mockLoopscaleClient as any).mockCoSign = mockCoSign
     mockBuildSetupStatePriceRefreshInstructions.mockReset()
+    mockCreateVaultSyncTransactions.mockReset()
     mockCreateVaultSyncTransaction.mockReset()
     mockCreateStrategySetupContext.mockReset()
     mockCreateStrategySetupContext.mockReturnValue({ kind: "shared-setup-context" })
@@ -254,3 +258,92 @@ describe("VaultTransactionBuilder Loopscale integration", () => {
     expect(sendResult.ephemeralAlt).toBeNull()
   })
 })
+
+describe("VaultTransactionBuilder smart Kamino Vault withdraw fan-out", () => {
+  beforeEach(() => {
+    mockBuildSetupStatePriceRefreshInstructions.mockReset()
+    mockCreateVaultSyncTransactions.mockReset()
+    mockCreateStrategySetupContext.mockReset()
+    mockCreateStrategySetupContext.mockReturnValue({ kind: "shared-setup-context" })
+  })
+
+  it("splits a single instruction step into multiple sequential transaction sets when the sync helper returns chunks", async () => {
+    const config = createVault()
+    const refreshIx = ix(config.vault.programId, 90)
+    const setupIx = ix(config.vault.programId, 91)
+    const firstPreIx = ix(pk(60), 92)
+    const firstSyncIx = ix(pk(61), 93)
+    const secondSyncIx = ix(pk(62), 94)
+    const secondPostIx = ix(pk(63), 95)
+    const firstAlt = pk(64)
+    const secondAlt = pk(65)
+
+    mockBuildSetupStatePriceRefreshInstructions.mockImplementation(async () => [refreshIx])
+    mockCreateVaultSyncTransactions.mockImplementation(async () => [
+      {
+        setupInstructions: [setupIx],
+        preInstructions: [firstPreIx],
+        instruction: firstSyncIx,
+        postInstructions: [],
+        signers: [],
+        addressLookupTableAddresses: [firstAlt],
+      },
+      {
+        setupInstructions: [],
+        preInstructions: [],
+        instruction: secondSyncIx,
+        postInstructions: [secondPostIx],
+        signers: [],
+        addressLookupTableAddresses: [secondAlt],
+      },
+    ])
+
+    const result = await VaultTransactionBuilder
+      .create(config)
+      .addActions([{ action: "KAMINO_VAULT_WITHDRAW" } as any], { label: "withdraw" })
+      .build()
+
+    expect(mockCreateVaultSyncTransactions).toHaveBeenCalledTimes(1)
+    expect(result.labels).toEqual(["withdraw-1-setup", "withdraw-1", "withdraw-2"])
+
+    expect(result.transactionSets[0]).toEqual({
+      label: "withdraw-1-setup",
+      instructions: [
+        ComputeBudgetProgram.setComputeUnitLimit({ units: 987_654 }),
+        refreshIx,
+        setupIx,
+      ],
+      signers: [],
+      addressLookupTableAddresses: [firstAlt, config.vault.state.addressLookupTable],
+      coSignWithLoopscale: false,
+    })
+
+    expect(result.transactionSets[1]).toEqual({
+      label: "withdraw-1",
+      instructions: [
+        ComputeBudgetProgram.setComputeUnitLimit({ units: 987_654 }),
+        ComputeBudgetProgram.requestHeapFrame({ bytes: 256 * 1024 }),
+        refreshIx,
+        firstPreIx,
+        firstSyncIx,
+      ],
+      signers: [],
+      addressLookupTableAddresses: [firstAlt, config.vault.state.addressLookupTable],
+      coSignWithLoopscale: false,
+    })
+
+    expect(result.transactionSets[2]).toEqual({
+      label: "withdraw-2",
+      instructions: [
+        ComputeBudgetProgram.setComputeUnitLimit({ units: 987_654 }),
+        ComputeBudgetProgram.requestHeapFrame({ bytes: 256 * 1024 }),
+        refreshIx,
+        secondSyncIx,
+        secondPostIx,
+      ],
+      signers: [],
+      addressLookupTableAddresses: [secondAlt, config.vault.state.addressLookupTable],
+      coSignWithLoopscale: false,
+    })
+  })
+})

package/src/exponentVaults/vaultTransactionBuilder.ts

@@ -15,7 +15,7 @@ import { LoopscaleClient } from "./loopscale"
 import type { LoopscaleTransactionResponse } from "./loopscale"
 import {
   buildSetupStatePriceRefreshInstructions,
-  createVaultSyncTransaction,
+  createVaultSyncTransactions,
   createStrategySetupContext,
   type VaultInstruction,
 } from "./vault-interaction"
@@ -473,7 +473,7 @@ export class VaultTransactionBuilder {
 
       const stepCU = step.options.computeUnitLimit ?? defaultCU
       const stepHeap = step.options.heapFrameBytes ?? defaultHeap
-      const syncResult = await createVaultSyncTransaction({
+      const syncResults = await createVaultSyncTransactions({
         instructions: step.instructions,
         owner: vaultPda,
         connection,
@@ -487,14 +487,47 @@ export class VaultTransactionBuilder {
 
       const stepPriceRefreshIxs = await buildSetupStatePriceRefreshInstructions(sharedSetupContext)
 
-      if (syncResult.setupInstructions.length > 0) {
-        const setupSet: TransactionSet = {
-          label: `${step.label}-setup`,
+      for (const [syncIndex, syncResult] of syncResults.entries()) {
+        const txLabel = syncResults.length === 1
+          ? step.label
+          : `${step.label}-${syncIndex + 1}`
+
+        if (syncResult.setupInstructions.length > 0) {
+          const setupSet: TransactionSet = {
+            label: `${txLabel}-setup`,
+            instructions: [
+              ComputeBudgetProgram.setComputeUnitLimit({ units: defaultCU }),
+              ...syncResult.setupInstructions,
+            ],
+            signers: [],
+            addressLookupTableAddresses: mergeAddressLookupTableAddresses(
+              syncResult.addressLookupTableAddresses,
+              extraLookupTableAddresses,
+              vault.state.addressLookupTable ? [vault.state.addressLookupTable] : [],
+            ),
+            coSignWithLoopscale: false,
+          }
+          if (shouldInjectPriceRefresh(setupSet, vault.programId, squadsProgram)) {
+            setupSet.instructions = insertAfterLeadingComputeBudgetAndScopeInstructions(
+              setupSet.instructions,
+              stepPriceRefreshIxs,
+            )
+          }
+          transactionSets.push(setupSet)
+          for (const alt of setupSet.addressLookupTableAddresses) {
+            allAltAddresses.add(alt.toBase58())
+          }
+        }
+
+        const syncSet: TransactionSet = {
+          label: txLabel,
           instructions: [
-            ComputeBudgetProgram.setComputeUnitLimit({ units: defaultCU }),
-            ...syncResult.setupInstructions,
+            ...buildComputeBudgetIxs(stepCU, stepHeap, step.options.priorityFee),
+            ...syncResult.preInstructions,
+            syncResult.instruction,
+            ...syncResult.postInstructions,
           ],
-          signers: [],
+          signers: syncResult.signers,
           addressLookupTableAddresses: mergeAddressLookupTableAddresses(
             syncResult.addressLookupTableAddresses,
             extraLookupTableAddresses,
@@ -502,45 +535,18 @@ export class VaultTransactionBuilder {
           ),
           coSignWithLoopscale: false,
         }
-        if (shouldInjectPriceRefresh(setupSet, vault.programId, squadsProgram)) {
-          setupSet.instructions = insertAfterLeadingComputeBudgetAndScopeInstructions(
-            setupSet.instructions,
+        if (shouldInjectPriceRefresh(syncSet, vault.programId, squadsProgram)) {
+          syncSet.instructions = insertAfterLeadingComputeBudgetAndScopeInstructions(
+            syncSet.instructions,
             stepPriceRefreshIxs,
           )
         }
-        transactionSets.push(setupSet)
-        for (const alt of setupSet.addressLookupTableAddresses) {
+        transactionSets.push(syncSet)
+
+        for (const alt of syncSet.addressLookupTableAddresses) {
           allAltAddresses.add(alt.toBase58())
         }
       }
-
-      const syncSet: TransactionSet = {
-        label: step.label,
-        instructions: [
-          ...buildComputeBudgetIxs(stepCU, stepHeap, step.options.priorityFee),
-          ...syncResult.preInstructions,
-          syncResult.instruction,
-          ...syncResult.postInstructions,
-        ],
-        signers: syncResult.signers,
-        addressLookupTableAddresses: mergeAddressLookupTableAddresses(
-          syncResult.addressLookupTableAddresses,
-          extraLookupTableAddresses,
-          vault.state.addressLookupTable ? [vault.state.addressLookupTable] : [],
-        ),
-        coSignWithLoopscale: false,
-      }
-      if (shouldInjectPriceRefresh(syncSet, vault.programId, squadsProgram)) {
-        syncSet.instructions = insertAfterLeadingComputeBudgetAndScopeInstructions(
-          syncSet.instructions,
-          stepPriceRefreshIxs,
-        )
-      }
-      transactionSets.push(syncSet)
-
-      for (const alt of syncSet.addressLookupTableAddresses) {
-        allAltAddresses.add(alt.toBase58())
-      }
     }
 
     const lookupTableAddresses = [...allAltAddresses].map((a) => new PublicKey(a))