@exponent-labs/exponent-sdk 0.1.8 → 0.9.1

package/build/exponentVaults/vaultTransactionBuilder.test.js

@@ -0,0 +1,214 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = require("@jest/globals");
+const web3_js_1 = require("@solana/web3.js");
+const vaultTransactionBuilder_1 = require("./vaultTransactionBuilder");
+globals_1.jest.mock("./loopscale", () => ({
+    LoopscaleClient: globals_1.jest.fn(),
+}));
+globals_1.jest.mock("./vault-interaction", () => ({
+    buildSetupStatePriceRefreshInstructions: globals_1.jest.fn(),
+    createVaultSyncTransaction: globals_1.jest.fn(),
+    createStrategySetupContext: globals_1.jest.fn(),
+}));
+const { LoopscaleClient: mockLoopscaleClient } = globals_1.jest.requireMock("./loopscale");
+const { buildSetupStatePriceRefreshInstructions: mockBuildSetupStatePriceRefreshInstructions, createVaultSyncTransaction: mockCreateVaultSyncTransaction, createStrategySetupContext: mockCreateStrategySetupContext, } = globals_1.jest.requireMock("./vault-interaction");
+const validLoopscaleOptions = { label: "loopscale-step" };
+// @ts-expect-error Loopscale builder steps only accept label metadata.
+const invalidLoopscaleOptions = { priorityFee: 123 };
+void invalidLoopscaleOptions;
+function pk(seed) {
+    return new web3_js_1.PublicKey(Uint8Array.from({ length: 32 }, () => seed));
+}
+function ix(programId, dataSeed) {
+    return new web3_js_1.TransactionInstruction({
+        programId,
+        keys: [],
+        data: Buffer.from([dataSeed]),
+    });
+}
+function createVault(overrides = {}) {
+    return {
+        vault: {
+            selfAddress: pk(10),
+            programId: pk(11),
+            state: {
+                addressLookupTable: pk(12),
+                squadsVault: pk(21),
+            },
+        },
+        connection: {
+            getAddressLookupTable: globals_1.jest.fn(async () => ({ value: null })),
+            getLatestBlockhash: globals_1.jest.fn(async () => ({
+                blockhash: web3_js_1.PublicKey.default.toBase58(),
+                lastValidBlockHeight: 123,
+            })),
+            sendTransaction: globals_1.jest.fn(async () => "sig-123"),
+            confirmTransaction: globals_1.jest.fn(async () => ({ value: { err: null } })),
+            getSlot: globals_1.jest.fn(),
+        },
+        signer: pk(20),
+        computeUnitLimit: 987_654,
+        heapFrameBytes: 256 * 1024,
+        ...overrides,
+    };
+}
+(0, globals_1.describe)("VaultTransactionBuilder Loopscale integration", () => {
+    (0, globals_1.beforeEach)(() => {
+        mockLoopscaleClient.mockClear();
+        const mockPrepareVaultTransactions = globals_1.jest.fn();
+        const mockCoSign = globals_1.jest.fn();
+        mockLoopscaleClient.mockImplementation((config) => ({
+            config,
+            prepareVaultTransactions: mockPrepareVaultTransactions,
+            coSign: mockCoSign,
+        }));
+        mockLoopscaleClient.mockPrepareVaultTransactions = mockPrepareVaultTransactions;
+        mockLoopscaleClient.mockCoSign = mockCoSign;
+        mockBuildSetupStatePriceRefreshInstructions.mockReset();
+        mockCreateVaultSyncTransaction.mockReset();
+        mockCreateStrategySetupContext.mockReset();
+        mockCreateStrategySetupContext.mockReturnValue({ kind: "shared-setup-context" });
+    });
+    (0, globals_1.it)("narrows Loopscale step options to label-only metadata", () => {
+        (0, globals_1.expect)(validLoopscaleOptions).toEqual({ label: "loopscale-step" });
+    });
+    (0, globals_1.it)("uses builder defaults and injects price refresh only into local Loopscale-derived vault transactions", async () => {
+        const config = createVault();
+        const refreshIx = ix(config.vault.programId, 200);
+        const vaultSetupIx = ix(config.vault.programId, 1);
+        const localVaultIx = ix(config.vault.programId, 2);
+        const plainSetupIx = ix(pk(30), 3);
+        const coSignedIx = ix(pk(31), 4);
+        const rawAlt = pk(32);
+        const preparedTransactions = [
+            {
+                setupInstructions: [vaultSetupIx],
+                instructions: [localVaultIx],
+                signers: [],
+                addressLookupTableAddresses: [rawAlt],
+                requiresLoopscaleCoSign: false,
+            },
+            {
+                setupInstructions: [plainSetupIx],
+                instructions: [coSignedIx],
+                signers: [],
+                addressLookupTableAddresses: [rawAlt],
+                requiresLoopscaleCoSign: true,
+            },
+        ];
+        const mockPrepareVaultTransactions = mockLoopscaleClient.mockPrepareVaultTransactions;
+        mockPrepareVaultTransactions.mockImplementation(async () => preparedTransactions);
+        mockBuildSetupStatePriceRefreshInstructions.mockImplementation(async () => [refreshIx]);
+        const result = await vaultTransactionBuilder_1.VaultTransactionBuilder
+            .create(config)
+            .addLoopscaleResponse({ message: "", signatures: [] }, { label: "loop" })
+            .build();
+        (0, globals_1.expect)(mockLoopscaleClient).toHaveBeenCalledTimes(1);
+        (0, globals_1.expect)(mockLoopscaleClient).toHaveBeenCalledWith({
+            connection: config.connection,
+            userWallet: config.vault.state.squadsVault,
+            baseUrl: undefined,
+            debug: undefined,
+        });
+        (0, globals_1.expect)(result.labels).toEqual(["loop-1-setup", "loop-1", "loop-2-setup", "loop-2"]);
+        const firstSetup = result.transactionSets[0];
+        (0, globals_1.expect)(firstSetup.instructions).toEqual([
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 987_654 }),
+            refreshIx,
+            vaultSetupIx,
+        ]);
+        (0, globals_1.expect)(firstSetup.addressLookupTableAddresses).toEqual([config.vault.state.addressLookupTable]);
+        (0, globals_1.expect)(firstSetup.coSignWithLoopscale).toBe(false);
+        const firstMain = result.transactionSets[1];
+        (0, globals_1.expect)(firstMain.instructions).toEqual([refreshIx, localVaultIx]);
+        (0, globals_1.expect)(firstMain.addressLookupTableAddresses).toEqual([rawAlt, config.vault.state.addressLookupTable]);
+        (0, globals_1.expect)(firstMain.coSignWithLoopscale).toBe(false);
+        const secondSetup = result.transactionSets[2];
+        (0, globals_1.expect)(secondSetup.instructions).toEqual([
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 987_654 }),
+            plainSetupIx,
+        ]);
+        (0, globals_1.expect)(secondSetup.addressLookupTableAddresses).toEqual([config.vault.state.addressLookupTable]);
+        (0, globals_1.expect)(secondSetup.coSignWithLoopscale).toBe(false);
+        const secondMain = result.transactionSets[3];
+        (0, globals_1.expect)(secondMain.instructions).toEqual([coSignedIx]);
+        (0, globals_1.expect)(secondMain.addressLookupTableAddresses).toEqual([rawAlt]);
+        (0, globals_1.expect)(secondMain.coSignWithLoopscale).toBe(true);
+    });
+    (0, globals_1.it)("only co-signs flagged transactions and forwards loopscale client config to build and send paths", async () => {
+        const payer = web3_js_1.Keypair.generate();
+        const persistentAlt = pk(50);
+        const config = createVault({
+            vault: {
+                selfAddress: pk(10),
+                programId: pk(11),
+                state: {
+                    addressLookupTable: persistentAlt,
+                    squadsVault: pk(51),
+                },
+            },
+            loopscale: {
+                baseUrl: "https://loopscale.test",
+                debug: true,
+            },
+        });
+        const localIx = ix(pk(40), 1);
+        const coSignedIx = ix(pk(41), 2);
+        const persistentAltAccount = new web3_js_1.AddressLookupTableAccount({
+            key: persistentAlt,
+            state: {
+                deactivationSlot: 0n,
+                lastExtendedSlot: 0,
+                lastExtendedSlotStartIndex: 0,
+                authority: payer.publicKey,
+                addresses: [config.signer, localIx.programId, coSignedIx.programId],
+            },
+        });
+        config.connection.getAddressLookupTable.mockImplementation(async (address) => ({
+            value: address.equals(persistentAlt) ? persistentAltAccount : null,
+        }));
+        const mockPrepareVaultTransactions = mockLoopscaleClient.mockPrepareVaultTransactions;
+        const mockCoSign = mockLoopscaleClient.mockCoSign;
+        mockPrepareVaultTransactions.mockImplementation(async () => [
+            {
+                setupInstructions: [],
+                instructions: [localIx],
+                signers: [],
+                addressLookupTableAddresses: [],
+                requiresLoopscaleCoSign: false,
+            },
+            {
+                setupInstructions: [],
+                instructions: [coSignedIx],
+                signers: [],
+                addressLookupTableAddresses: [],
+                requiresLoopscaleCoSign: true,
+            },
+        ]);
+        mockBuildSetupStatePriceRefreshInstructions.mockImplementation(async () => []);
+        mockCoSign.mockImplementation(async (transaction) => transaction);
+        const result = await vaultTransactionBuilder_1.VaultTransactionBuilder
+            .create(config)
+            .addLoopscaleResponse({ message: "", signatures: [] }, { label: "loop" })
+            .build();
+        const sendResult = await result.send({ signers: [payer] });
+        (0, globals_1.expect)(mockLoopscaleClient).toHaveBeenNthCalledWith(1, {
+            connection: config.connection,
+            userWallet: config.vault.state.squadsVault,
+            baseUrl: "https://loopscale.test",
+            debug: true,
+        });
+        (0, globals_1.expect)(mockLoopscaleClient).toHaveBeenNthCalledWith(2, {
+            connection: config.connection,
+            userWallet: config.vault.state.squadsVault,
+            baseUrl: "https://loopscale.test",
+            debug: true,
+        });
+        (0, globals_1.expect)(mockCoSign).toHaveBeenCalledTimes(1);
+        (0, globals_1.expect)(config.connection.sendTransaction).toHaveBeenCalledTimes(2);
+        (0, globals_1.expect)(sendResult.signatures).toEqual(["sig-123", "sig-123"]);
+        (0, globals_1.expect)(sendResult.ephemeralAlt).toBeNull();
+    });
+});
+//# sourceMappingURL=vaultTransactionBuilder.test.js.map

package/build/exponentVaults/vaultTransactionBuilder.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vaultTransactionBuilder.test.js","sourceRoot":"","sources":["../../src/exponentVaults/vaultTransactionBuilder.test.ts"],"names":[],"mappings":"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"}

package/build/flavors.d.ts

@@ -1,7 +1,7 @@
-import { web3 } from "@coral-xyz/anchor";
 import { ExponentFetcher } from "@exponent-labs/exponent-fetcher";
 import { CpiAccountsRaw, Flavor, FlavorDiscriminator, FlavorGeneric, FlavorGenericState, FlavorGenericStateJson, FlavorJitoRestaking, FlavorJitoRestakingState, FlavorJitoRestakingStateJson, FlavorKamino, FlavorKaminoState, FlavorKaminoStateJson, FlavorMarginfi, FlavorMarginfiState, FlavorMarginfiStateJson, FlavorPerena, FlavorPerenaState, FlavorPerenaStateJson } from "@exponent-labs/exponent-types";
 import { Environment } from "./environment";
+import { PublicKey } from "@solana/web3.js";
 export declare function serializeFlavorMarginfi(flavor: FlavorMarginfiState): FlavorMarginfiStateJson;
 export declare function deserializeFlavorMarginfi(flavor: FlavorMarginfiStateJson): FlavorMarginfiState;
 export declare function serializeFlavorKamino(flavor: FlavorKaminoState): FlavorKaminoStateJson;
@@ -20,10 +20,10 @@ export declare function makeFlavorPerenaSync(data: FlavorPerenaState): FlavorPer
 export declare function makeFlavorGenericSync(data: FlavorGenericState, syConfig?: {
     skipWrap?: boolean;
 }): FlavorGeneric;
-export declare function flavorFinder(env: Environment, syProgram: web3.PublicKey): FlavorDiscriminator;
+export declare function flavorFinder(env: Environment, syProgram: PublicKey): FlavorDiscriminator;
 export declare function makeFlavor(fetcher: ExponentFetcher, env: Environment, 
 /** The actual SY program linked to the market */
-syProgram: web3.PublicKey, cpiAccounts: CpiAccountsRaw, syConfig?: {
+syProgram: PublicKey, cpiAccounts: CpiAccountsRaw, syConfig?: {
     skipWrap?: boolean;
 }): Promise<Flavor>;
 export declare function serializeFlavor(flavor: Flavor): FlavorMarginfiStateJson | FlavorKaminoStateJson | FlavorJitoRestakingStateJson | FlavorPerenaStateJson | FlavorGenericStateJson;

package/build/flavors.js

@@ -1,7 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deserializeFlavor = exports.serializeFlavor = exports.makeFlavor = exports.flavorFinder = exports.makeFlavorGenericSync = exports.makeFlavorPerenaSync = exports.makeFlavorJitoRestakingSync = exports.makeFlavorKaminoSync = exports.makeFlavorMarginfiSync = exports.deserializeFlavorGeneric = exports.deserializeFlavorPerena = exports.serializeFlavorGeneric = exports.serializeFlavorPerena = exports.deserializeFlavorJitoRestaking = exports.serializeFlavorJitoRestaking = exports.deserializeFlavorKamino = exports.serializeFlavorKamino = exports.deserializeFlavorMarginfi = exports.serializeFlavorMarginfi = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
 const exponent_fetcher_1 = require("@exponent-labs/exponent-fetcher");
 const exponent_types_1 = require("@exponent-labs/exponent-types");
 const generic_sy_sdk_1 = require("@exponent-labs/generic-sy-sdk");
@@ -12,6 +14,8 @@ const kamino_sy_sdk_1 = require("@exponent-labs/kamino-sy-sdk");
 const marginfi_sy_sdk_1 = require("@exponent-labs/marginfi-sy-sdk");
 const perena_sy_sdk_1 = require("@exponent-labs/perena-sy-sdk");
 const precise_number_1 = require("@exponent-labs/precise-number");
+const bn_js_1 = __importDefault(require("bn.js"));
+const web3_js_1 = require("@solana/web3.js");
 function serializeFlavorMarginfi(flavor) {
     return {
         flavor: "marginfi",
@@ -63,45 +67,45 @@ function deserializeFlavorMarginfi(flavor) {
     return {
         flavor: "marginfi",
         currentSyExchangeRate: flavor.currentSyExchangeRate,
-        mintBase: new anchor_1.web3.PublicKey(flavor.mintBase),
-        baseTokenProgram: new anchor_1.web3.PublicKey(flavor.baseTokenProgram),
+        mintBase: new web3_js_1.PublicKey(flavor.mintBase),
+        baseTokenProgram: new web3_js_1.PublicKey(flavor.baseTokenProgram),
         emissions: flavor.emissions.map((e) => ({
             exchangeRate: new precise_number_1.PreciseNumber(e.exchangeRate.toString()).anchorify(),
-            mint: new anchor_1.web3.PublicKey(e.mint),
-            tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
+            mint: new web3_js_1.PublicKey(e.mint),
+            tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
         })),
-        bank: new anchor_1.web3.PublicKey(flavor.bank),
-        emissionMint: flavor.emissionMint ? new anchor_1.web3.PublicKey(flavor.emissionMint) : undefined,
-        emissionTokenProgram: flavor.emissionTokenProgram ? new anchor_1.web3.PublicKey(flavor.emissionTokenProgram) : undefined,
+        bank: new web3_js_1.PublicKey(flavor.bank),
+        emissionMint: flavor.emissionMint ? new web3_js_1.PublicKey(flavor.emissionMint) : undefined,
+        emissionTokenProgram: flavor.emissionTokenProgram ? new web3_js_1.PublicKey(flavor.emissionTokenProgram) : undefined,
         mfiSyState: {
-            selfAddress: new anchor_1.web3.PublicKey(flavor.mfiSyState.selfAddress),
-            marginfiSyProgramId: new anchor_1.web3.PublicKey(flavor.mfiSyState.marginfiSyProgramId),
+            selfAddress: new web3_js_1.PublicKey(flavor.mfiSyState.selfAddress),
+            marginfiSyProgramId: new web3_js_1.PublicKey(flavor.mfiSyState.marginfiSyProgramId),
             syRate: flavor.mfiSyState.syRate,
-            mintBase: new anchor_1.web3.PublicKey(flavor.mfiSyState.mintBase),
-            tokenProgramBase: new anchor_1.web3.PublicKey(flavor.mfiSyState.tokenProgramBase),
-            marginfiProgramId: new anchor_1.web3.PublicKey(flavor.mfiSyState.marginfiProgramId),
-            marginfiGroupId: new anchor_1.web3.PublicKey(flavor.mfiSyState.marginfiGroupId),
-            emissionsMint: flavor.mfiSyState.emissionsMint ? new anchor_1.web3.PublicKey(flavor.mfiSyState.emissionsMint) : null,
+            mintBase: new web3_js_1.PublicKey(flavor.mfiSyState.mintBase),
+            tokenProgramBase: new web3_js_1.PublicKey(flavor.mfiSyState.tokenProgramBase),
+            marginfiProgramId: new web3_js_1.PublicKey(flavor.mfiSyState.marginfiProgramId),
+            marginfiGroupId: new web3_js_1.PublicKey(flavor.mfiSyState.marginfiGroupId),
+            emissionsMint: flavor.mfiSyState.emissionsMint ? new web3_js_1.PublicKey(flavor.mfiSyState.emissionsMint) : null,
             emissionsTokenProgram: flavor.mfiSyState.emissionsTokenProgram
-                ? new anchor_1.web3.PublicKey(flavor.mfiSyState.emissionsTokenProgram)
+                ? new web3_js_1.PublicKey(flavor.mfiSyState.emissionsTokenProgram)
                 : null,
             account: {
-                marginfiBank: new anchor_1.web3.PublicKey(flavor.mfiSyState.account.marginfiBank),
-                marginfiAccount: new anchor_1.web3.PublicKey(flavor.mfiSyState.account.marginfiAccount),
-                mintSy: new anchor_1.web3.PublicKey(flavor.mfiSyState.account.mintSy),
-                tokenSyEscrow: new anchor_1.web3.PublicKey(flavor.mfiSyState.account.tokenSyEscrow),
+                marginfiBank: new web3_js_1.PublicKey(flavor.mfiSyState.account.marginfiBank),
+                marginfiAccount: new web3_js_1.PublicKey(flavor.mfiSyState.account.marginfiAccount),
+                mintSy: new web3_js_1.PublicKey(flavor.mfiSyState.account.mintSy),
+                tokenSyEscrow: new web3_js_1.PublicKey(flavor.mfiSyState.account.tokenSyEscrow),
                 maxSySupply: BigInt(flavor.mfiSyState.account.maxSySupply),
                 minMintSize: BigInt(flavor.mfiSyState.account.minMintSize),
                 minRedeemSize: BigInt(flavor.mfiSyState.account.minRedeemSize),
                 emissions: flavor.mfiSyState.account.emissions.map((emission) => ({
-                    mint: new anchor_1.web3.PublicKey(emission.mint),
-                    tokenProgram: new anchor_1.web3.PublicKey(emission.tokenProgram),
-                    escrowAccount: new anchor_1.web3.PublicKey(emission.escrowAccount),
+                    mint: new web3_js_1.PublicKey(emission.mint),
+                    tokenProgram: new web3_js_1.PublicKey(emission.tokenProgram),
+                    escrowAccount: new web3_js_1.PublicKey(emission.escrowAccount),
                     index: new precise_number_1.PreciseNumber(emission.index.toString()).anchorify(),
                     lastSeenIndex: new precise_number_1.PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
-                    lastSeenTotalAccruedEmissions: new anchor_1.BN(emission.lastSeenTotalAccruedEmissions),
-                    totalClaimedEmissions: new anchor_1.BN(emission.totalClaimedEmissions),
-                    treasuryEmission: new anchor_1.BN(emission.treasuryEmission),
+                    lastSeenTotalAccruedEmissions: new bn_js_1.default(emission.lastSeenTotalAccruedEmissions),
+                    totalClaimedEmissions: new bn_js_1.default(emission.totalClaimedEmissions),
+                    treasuryEmission: new bn_js_1.default(emission.treasuryEmission),
                 })),
             },
         },
@@ -158,44 +162,44 @@ function deserializeFlavorKamino(flavor) {
     return {
         flavor: "kamino",
         currentSyExchangeRate: flavor.currentSyExchangeRate,
-        mintBase: new anchor_1.web3.PublicKey(flavor.mintBase),
-        baseTokenProgram: new anchor_1.web3.PublicKey(flavor.baseTokenProgram),
+        mintBase: new web3_js_1.PublicKey(flavor.mintBase),
+        baseTokenProgram: new web3_js_1.PublicKey(flavor.baseTokenProgram),
         emissions: flavor.emissions.map((e) => ({
             exchangeRate: new precise_number_1.PreciseNumber(e.exchangeRate.toString()).anchorify(),
-            mint: new anchor_1.web3.PublicKey(e.mint),
-            tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
+            mint: new web3_js_1.PublicKey(e.mint),
+            tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
         })),
         kaminoSyState: {
-            selfAddress: new anchor_1.web3.PublicKey(flavor.kaminoSyState.selfAddress),
-            klendSyProgramId: new anchor_1.web3.PublicKey(flavor.kaminoSyState.klendSyProgramId),
+            selfAddress: new web3_js_1.PublicKey(flavor.kaminoSyState.selfAddress),
+            klendSyProgramId: new web3_js_1.PublicKey(flavor.kaminoSyState.klendSyProgramId),
             syRate: flavor.kaminoSyState.syRate,
-            mintBase: new anchor_1.web3.PublicKey(flavor.kaminoSyState.mintBase),
-            tokenProgramBase: new anchor_1.web3.PublicKey(flavor.kaminoSyState.tokenProgramBase),
-            klendProgramId: new anchor_1.web3.PublicKey(flavor.kaminoSyState.klendProgramId),
-            klendMarketId: new anchor_1.web3.PublicKey(flavor.kaminoSyState.klendMarketId),
+            mintBase: new web3_js_1.PublicKey(flavor.kaminoSyState.mintBase),
+            tokenProgramBase: new web3_js_1.PublicKey(flavor.kaminoSyState.tokenProgramBase),
+            klendProgramId: new web3_js_1.PublicKey(flavor.kaminoSyState.klendProgramId),
+            klendMarketId: new web3_js_1.PublicKey(flavor.kaminoSyState.klendMarketId),
             scopePriceFeed: flavor.kaminoSyState.scopePriceFeed
-                ? new anchor_1.web3.PublicKey(flavor.kaminoSyState.scopePriceFeed)
+                ? new web3_js_1.PublicKey(flavor.kaminoSyState.scopePriceFeed)
                 : undefined,
             account: {
-                kaminoReserve: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.kaminoReserve),
-                kaminoObligation: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.kaminoObligation),
-                kaminoFarm: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.kaminoFarm),
-                kaminoUserMetadata: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.kaminoUserMetadata),
-                mintSy: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.mintSy),
-                tokenSyEscrow: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.tokenSyEscrow),
+                kaminoReserve: new web3_js_1.PublicKey(flavor.kaminoSyState.account.kaminoReserve),
+                kaminoObligation: new web3_js_1.PublicKey(flavor.kaminoSyState.account.kaminoObligation),
+                kaminoFarm: new web3_js_1.PublicKey(flavor.kaminoSyState.account.kaminoFarm),
+                kaminoUserMetadata: new web3_js_1.PublicKey(flavor.kaminoSyState.account.kaminoUserMetadata),
+                mintSy: new web3_js_1.PublicKey(flavor.kaminoSyState.account.mintSy),
+                tokenSyEscrow: new web3_js_1.PublicKey(flavor.kaminoSyState.account.tokenSyEscrow),
                 minMintSize: flavor.kaminoSyState.account.minMintSize,
                 minRedeemSize: flavor.kaminoSyState.account.minRedeemSize,
-                userState: new anchor_1.web3.PublicKey(flavor.kaminoSyState.account.userState),
+                userState: new web3_js_1.PublicKey(flavor.kaminoSyState.account.userState),
                 maxSySupply: flavor.kaminoSyState.account.maxSySupply,
                 emissions: flavor.kaminoSyState.account.emissions.map((emission) => ({
-                    mint: new anchor_1.web3.PublicKey(emission.mint),
-                    tokenProgram: new anchor_1.web3.PublicKey(emission.tokenProgram),
-                    escrowAccount: new anchor_1.web3.PublicKey(emission.escrowAccount),
+                    mint: new web3_js_1.PublicKey(emission.mint),
+                    tokenProgram: new web3_js_1.PublicKey(emission.tokenProgram),
+                    escrowAccount: new web3_js_1.PublicKey(emission.escrowAccount),
                     index: new precise_number_1.PreciseNumber(emission.index.toString()).anchorify(),
                     lastSeenIndex: new precise_number_1.PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
-                    lastSeenTotalAccruedEmissions: new anchor_1.BN(emission.lastSeenTotalAccruedEmissions),
-                    totalClaimedEmissions: new anchor_1.BN(emission.totalClaimedEmissions),
-                    treasuryEmission: new anchor_1.BN(emission.treasuryEmission),
+                    lastSeenTotalAccruedEmissions: new bn_js_1.default(emission.lastSeenTotalAccruedEmissions),
+                    totalClaimedEmissions: new bn_js_1.default(emission.totalClaimedEmissions),
+                    treasuryEmission: new bn_js_1.default(emission.treasuryEmission),
                 })),
             },
         },
@@ -247,37 +251,37 @@ function deserializeFlavorJitoRestaking(flavor) {
     return {
         flavor: "jitoRestaking",
         currentSyExchangeRate: flavor.currentSyExchangeRate,
-        mintBase: new anchor_1.web3.PublicKey(flavor.mintBase),
-        baseTokenProgram: new anchor_1.web3.PublicKey(flavor.baseTokenProgram),
+        mintBase: new web3_js_1.PublicKey(flavor.mintBase),
+        baseTokenProgram: new web3_js_1.PublicKey(flavor.baseTokenProgram),
         emissions: flavor.emissions.map((e) => ({
             exchangeRate: new precise_number_1.PreciseNumber(e.exchangeRate.toString()).anchorify(),
-            mint: new anchor_1.web3.PublicKey(e.mint),
-            tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
+            mint: new web3_js_1.PublicKey(e.mint),
+            tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
         })),
         jitoSyState: {
-            selfAddress: new anchor_1.web3.PublicKey(flavor.jitoSyState.selfAddress),
+            selfAddress: new web3_js_1.PublicKey(flavor.jitoSyState.selfAddress),
             syRate: flavor.jitoSyState.syRate,
             underlyingExchangeRate: flavor.jitoSyState.underlyingExchangeRate,
-            mintBase: new anchor_1.web3.PublicKey(flavor.jitoSyState.mintBase),
-            tokenProgramBase: new anchor_1.web3.PublicKey(flavor.jitoSyState.tokenProgramBase),
+            mintBase: new web3_js_1.PublicKey(flavor.jitoSyState.mintBase),
+            tokenProgramBase: new web3_js_1.PublicKey(flavor.jitoSyState.tokenProgramBase),
             account: {
-                jitoVault: new anchor_1.web3.PublicKey(flavor.jitoSyState.account.jitoVault),
-                mintSy: new anchor_1.web3.PublicKey(flavor.jitoSyState.account.mintSy),
-                tokenSyEscrow: new anchor_1.web3.PublicKey(flavor.jitoSyState.account.tokenSyEscrow),
-                minMintSize: new anchor_1.BN(flavor.jitoSyState.account.minMintSize),
-                minRedeemSize: new anchor_1.BN(flavor.jitoSyState.account.minRedeemSize),
-                maxSySupply: new anchor_1.BN(flavor.jitoSyState.account.maxSySupply),
-                interfaceAccounts: flavor.jitoSyState.account.interfaceAccounts.map((a) => new anchor_1.web3.PublicKey(a)),
+                jitoVault: new web3_js_1.PublicKey(flavor.jitoSyState.account.jitoVault),
+                mintSy: new web3_js_1.PublicKey(flavor.jitoSyState.account.mintSy),
+                tokenSyEscrow: new web3_js_1.PublicKey(flavor.jitoSyState.account.tokenSyEscrow),
+                minMintSize: new bn_js_1.default(flavor.jitoSyState.account.minMintSize),
+                minRedeemSize: new bn_js_1.default(flavor.jitoSyState.account.minRedeemSize),
+                maxSySupply: new bn_js_1.default(flavor.jitoSyState.account.maxSySupply),
+                interfaceAccounts: flavor.jitoSyState.account.interfaceAccounts.map((a) => new web3_js_1.PublicKey(a)),
                 interfaceType: flavor.jitoSyState.account.interfaceType,
                 emissions: flavor.jitoSyState.account.emissions.map((emission) => ({
-                    mint: new anchor_1.web3.PublicKey(emission.mint),
-                    tokenProgram: new anchor_1.web3.PublicKey(emission.tokenProgram),
-                    escrowAccount: new anchor_1.web3.PublicKey(emission.escrowAccount),
+                    mint: new web3_js_1.PublicKey(emission.mint),
+                    tokenProgram: new web3_js_1.PublicKey(emission.tokenProgram),
+                    escrowAccount: new web3_js_1.PublicKey(emission.escrowAccount),
                     index: new precise_number_1.PreciseNumber(emission.index.toString()).anchorify(),
                     lastSeenIndex: new precise_number_1.PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
-                    lastSeenTotalAccruedEmissions: new anchor_1.BN(emission.lastSeenTotalAccruedEmissions),
-                    totalClaimedEmissions: new anchor_1.BN(emission.totalClaimedEmissions),
-                    treasuryEmission: new anchor_1.BN(emission.treasuryEmission),
+                    lastSeenTotalAccruedEmissions: new bn_js_1.default(emission.lastSeenTotalAccruedEmissions),
+                    totalClaimedEmissions: new bn_js_1.default(emission.totalClaimedEmissions),
+                    treasuryEmission: new bn_js_1.default(emission.treasuryEmission),
                 })),
             },
         },
@@ -378,37 +382,37 @@ function deserializeFlavorPerena(flavor) {
     return {
         flavor: "perena",
         currentSyExchangeRate: flavor.currentSyExchangeRate,
-        baseTokenProgram: new anchor_1.web3.PublicKey(flavor.baseTokenProgram),
-        mintBase: new anchor_1.web3.PublicKey(flavor.mintBase),
+        baseTokenProgram: new web3_js_1.PublicKey(flavor.baseTokenProgram),
+        mintBase: new web3_js_1.PublicKey(flavor.mintBase),
         perenaSyState: {
-            selfAddress: new anchor_1.web3.PublicKey(flavor.perenaSyState.selfAddress),
+            selfAddress: new web3_js_1.PublicKey(flavor.perenaSyState.selfAddress),
             syRate: flavor.perenaSyState.syRate,
             account: {
-                perenaStablePool: new anchor_1.web3.PublicKey(flavor.perenaSyState.account.perenaStablePool),
-                mintSy: new anchor_1.web3.PublicKey(flavor.perenaSyState.account.mintSy),
-                tokenSyEscrow: new anchor_1.web3.PublicKey(flavor.perenaSyState.account.tokenSyEscrow),
-                minMintSize: new anchor_1.BN(flavor.perenaSyState.account.minMintSize),
-                minRedeemSize: new anchor_1.BN(flavor.perenaSyState.account.minRedeemSize),
-                maxSySupply: new anchor_1.BN(flavor.perenaSyState.account.maxSySupply),
+                perenaStablePool: new web3_js_1.PublicKey(flavor.perenaSyState.account.perenaStablePool),
+                mintSy: new web3_js_1.PublicKey(flavor.perenaSyState.account.mintSy),
+                tokenSyEscrow: new web3_js_1.PublicKey(flavor.perenaSyState.account.tokenSyEscrow),
+                minMintSize: new bn_js_1.default(flavor.perenaSyState.account.minMintSize),
+                minRedeemSize: new bn_js_1.default(flavor.perenaSyState.account.minRedeemSize),
+                maxSySupply: new bn_js_1.default(flavor.perenaSyState.account.maxSySupply),
                 emissions: flavor.perenaSyState.account.emissions.map((emission) => ({
-                    mint: new anchor_1.web3.PublicKey(emission.mint),
-                    tokenProgram: new anchor_1.web3.PublicKey(emission.tokenProgram),
-                    escrowAccount: new anchor_1.web3.PublicKey(emission.escrowAccount),
+                    mint: new web3_js_1.PublicKey(emission.mint),
+                    tokenProgram: new web3_js_1.PublicKey(emission.tokenProgram),
+                    escrowAccount: new web3_js_1.PublicKey(emission.escrowAccount),
                     index: new precise_number_1.PreciseNumber(emission.index.toString()).anchorify(),
                     lastSeenIndex: new precise_number_1.PreciseNumber(emission.lastSeenIndex.toString()).anchorify(),
-                    lastSeenTotalAccruedEmissions: new anchor_1.BN(emission.lastSeenTotalAccruedEmissions),
-                    totalClaimedEmissions: new anchor_1.BN(emission.totalClaimedEmissions),
-                    treasuryEmission: new anchor_1.BN(emission.treasuryEmission),
+                    lastSeenTotalAccruedEmissions: new bn_js_1.default(emission.lastSeenTotalAccruedEmissions),
+                    totalClaimedEmissions: new bn_js_1.default(emission.totalClaimedEmissions),
+                    treasuryEmission: new bn_js_1.default(emission.treasuryEmission),
                 })),
-                interfaceAccounts: flavor.perenaSyState.account.interfaceAccounts.map((a) => new anchor_1.web3.PublicKey(a)),
+                interfaceAccounts: flavor.perenaSyState.account.interfaceAccounts.map((a) => new web3_js_1.PublicKey(a)),
             },
-            lpMint: new anchor_1.web3.PublicKey(flavor.perenaSyState.mintBase),
-            tokenProgramBase: new anchor_1.web3.PublicKey(flavor.perenaSyState.tokenProgramBase),
+            lpMint: new web3_js_1.PublicKey(flavor.perenaSyState.mintBase),
+            tokenProgramBase: new web3_js_1.PublicKey(flavor.perenaSyState.tokenProgramBase),
         },
         emissions: flavor.emissions.map((e) => ({
             exchangeRate: new precise_number_1.PreciseNumber(e.exchangeRate.toString()).anchorify(),
-            mint: new anchor_1.web3.PublicKey(e.mint),
-            tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
+            mint: new web3_js_1.PublicKey(e.mint),
+            tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
         })),
     };
 }
@@ -417,45 +421,45 @@ function deserializeFlavorGeneric(flavor) {
     return {
         flavor: "generic",
         currentSyExchangeRate: flavor.currentSyExchangeRate,
-        mintBase: new anchor_1.web3.PublicKey(flavor.mintBase),
-        baseTokenProgram: new anchor_1.web3.PublicKey(flavor.baseTokenProgram),
+        mintBase: new web3_js_1.PublicKey(flavor.mintBase),
+        baseTokenProgram: new web3_js_1.PublicKey(flavor.baseTokenProgram),
         emissions: flavor.emissions.map((e) => ({
             exchangeRate: new precise_number_1.PreciseNumber(e.exchangeRate.toString()).anchorify(),
-            mint: new anchor_1.web3.PublicKey(e.mint),
-            tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
+            mint: new web3_js_1.PublicKey(e.mint),
+            tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
         })),
         genericSyState: {
-            selfAddress: new anchor_1.web3.PublicKey(flavor.genericSyState.selfAddress),
+            selfAddress: new web3_js_1.PublicKey(flavor.genericSyState.selfAddress),
             syRate: flavor.genericSyState.syRate,
-            tokenProgramBase: new anchor_1.web3.PublicKey(flavor.genericSyState.tokenProgramBase),
+            tokenProgramBase: new web3_js_1.PublicKey(flavor.genericSyState.tokenProgramBase),
             additionalData: flavor.genericSyState.additionalData
                 ? (0, exponent_types_1.fromAdditionalDataGenericJson)(flavor.genericSyState.additionalData)
                 : undefined,
             account: {
-                mintSy: new anchor_1.web3.PublicKey(flavor.genericSyState.account.mintSy),
-                yieldBearingMint: new anchor_1.web3.PublicKey(flavor.genericSyState.account.yieldBearingMint),
-                tokenSyEscrow: new anchor_1.web3.PublicKey(flavor.genericSyState.account.tokenSyEscrow),
-                interfaceAccounts: flavor.genericSyState.account.interfaceAccounts.map((a) => new anchor_1.web3.PublicKey(a)),
+                mintSy: new web3_js_1.PublicKey(flavor.genericSyState.account.mintSy),
+                yieldBearingMint: new web3_js_1.PublicKey(flavor.genericSyState.account.yieldBearingMint),
+                tokenSyEscrow: new web3_js_1.PublicKey(flavor.genericSyState.account.tokenSyEscrow),
+                interfaceAccounts: flavor.genericSyState.account.interfaceAccounts.map((a) => new web3_js_1.PublicKey(a)),
                 interfaceType: (0, exponent_types_1.fromInterfaceTypeGenericJson)(flavor.genericSyState.account.interfaceType),
-                maxSySupply: new anchor_1.BN(flavor.genericSyState.account.maxSySupply),
-                minMintSize: new anchor_1.BN(flavor.genericSyState.account.minMintSize),
-                minRedeemSize: new anchor_1.BN(flavor.genericSyState.account.minRedeemSize),
+                maxSySupply: new bn_js_1.default(flavor.genericSyState.account.maxSySupply),
+                minMintSize: new bn_js_1.default(flavor.genericSyState.account.minMintSize),
+                minRedeemSize: new bn_js_1.default(flavor.genericSyState.account.minRedeemSize),
                 hook: {
                     enabled: flavor.genericSyState.account.hook.enabled,
                     interfaceEmissionsAccountsUntil: flavor.genericSyState.account.hook.interfaceEmissionsAccountsUntil,
                     preMintHookDiscriminator: Array.from(flavor.genericSyState.account.hook.preMintHookDiscriminator),
                     postRedeemHookDiscriminator: Array.from(flavor.genericSyState.account.hook.postRedeemHookDiscriminator),
-                    programId: new anchor_1.web3.PublicKey(flavor.genericSyState.account.hook.programId),
+                    programId: new web3_js_1.PublicKey(flavor.genericSyState.account.hook.programId),
                 },
                 emissions: flavor.genericSyState.account.emissions.map((e) => ({
-                    mint: new anchor_1.web3.PublicKey(e.mint),
-                    tokenProgram: new anchor_1.web3.PublicKey(e.tokenProgram),
-                    escrowAccount: new anchor_1.web3.PublicKey(e.escrowAccount),
+                    mint: new web3_js_1.PublicKey(e.mint),
+                    tokenProgram: new web3_js_1.PublicKey(e.tokenProgram),
+                    escrowAccount: new web3_js_1.PublicKey(e.escrowAccount),
                     index: new precise_number_1.PreciseNumber(e.index.toString()).anchorify(),
                     lastSeenIndex: new precise_number_1.PreciseNumber(e.lastSeenIndex.toString()).anchorify(),
-                    lastSeenTotalAccruedEmissions: new anchor_1.BN(e.lastSeenTotalAccruedEmissions),
-                    totalClaimedEmissions: new anchor_1.BN(e.totalClaimedEmissions),
-                    treasuryEmission: new anchor_1.BN(e.treasuryEmission),
+                    lastSeenTotalAccruedEmissions: new bn_js_1.default(e.lastSeenTotalAccruedEmissions),
+                    totalClaimedEmissions: new bn_js_1.default(e.totalClaimedEmissions),
+                    treasuryEmission: new bn_js_1.default(e.treasuryEmission),
                 })),
                 index: new precise_number_1.PreciseNumber(flavor.genericSyState.account.index.toString()).anchorify(),
             },
@@ -615,7 +619,7 @@ async function makeKaminoFlavor(fetcher, kaminoSyProgramId, cpiAccounts) {
     // Type error: 'a' is possibly 'null'.
     // @ts-ignore
     const baseTokenProgram = await fetcher.connection.getAccountInfo(mintBase).then((a) => a.owner);
-    const pda = new kamino_sy_pda_1.KaminoSyPda(new anchor_1.web3.PublicKey(kamino_sy_idl_1.PROGRAM_ID));
+    const pda = new kamino_sy_pda_1.KaminoSyPda(new web3_js_1.PublicKey(kamino_sy_idl_1.PROGRAM_ID));
     const meta = pda.syMeta({ kaminoReserve: reserve });
     const syMeta = await fetcher.fetchKaminoSyMeta(meta);
     const klendSdk = await kamino_sy_sdk_1.KlendSySdk.load({