@voltr/vault-sdk 2.0.0 → 2.1.1

package/src/generated/instructions/harvestFee.ts

@@ -59,14 +59,14 @@ export type HarvestFeeInstruction<
   TAccountHarvester extends string | AccountMeta<string> = string,
   TAccountVaultManager extends string | AccountMeta<string> = string,
   TAccountVaultAdmin extends string | AccountMeta<string> = string,
-  TAccountProtocolAdmin extends string | AccountMeta<string> = string,
+  TAccountProtocolTreasury extends string | AccountMeta<string> = string,
   TAccountProtocol extends string | AccountMeta<string> = string,
   TAccountVault extends string | AccountMeta<string> = string,
   TAccountVaultLpMint extends string | AccountMeta<string> = string,
   TAccountVaultLpMintAuth extends string | AccountMeta<string> = string,
   TAccountVaultManagerLpAta extends string | AccountMeta<string> = string,
   TAccountVaultAdminLpAta extends string | AccountMeta<string> = string,
-  TAccountProtocolAdminLpAta extends string | AccountMeta<string> = string,
+  TAccountProtocolTreasuryLpAta extends string | AccountMeta<string> = string,
   TAccountLpTokenProgram extends string | AccountMeta<string> =
     "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
   TRemainingAccounts extends readonly AccountMeta<string>[] = [],
@@ -84,9 +84,9 @@ export type HarvestFeeInstruction<
       TAccountVaultAdmin extends string
         ? ReadonlyAccount<TAccountVaultAdmin>
         : TAccountVaultAdmin,
-      TAccountProtocolAdmin extends string
-        ? ReadonlyAccount<TAccountProtocolAdmin>
-        : TAccountProtocolAdmin,
+      TAccountProtocolTreasury extends string
+        ? ReadonlyAccount<TAccountProtocolTreasury>
+        : TAccountProtocolTreasury,
       TAccountProtocol extends string
         ? ReadonlyAccount<TAccountProtocol>
         : TAccountProtocol,
@@ -105,9 +105,9 @@ export type HarvestFeeInstruction<
       TAccountVaultAdminLpAta extends string
         ? WritableAccount<TAccountVaultAdminLpAta>
         : TAccountVaultAdminLpAta,
-      TAccountProtocolAdminLpAta extends string
-        ? WritableAccount<TAccountProtocolAdminLpAta>
-        : TAccountProtocolAdminLpAta,
+      TAccountProtocolTreasuryLpAta extends string
+        ? WritableAccount<TAccountProtocolTreasuryLpAta>
+        : TAccountProtocolTreasuryLpAta,
       TAccountLpTokenProgram extends string
         ? ReadonlyAccount<TAccountLpTokenProgram>
         : TAccountLpTokenProgram,
@@ -146,27 +146,27 @@ export type HarvestFeeAsyncInput<
   TAccountHarvester extends string = string,
   TAccountVaultManager extends string = string,
   TAccountVaultAdmin extends string = string,
-  TAccountProtocolAdmin extends string = string,
+  TAccountProtocolTreasury extends string = string,
   TAccountProtocol extends string = string,
   TAccountVault extends string = string,
   TAccountVaultLpMint extends string = string,
   TAccountVaultLpMintAuth extends string = string,
   TAccountVaultManagerLpAta extends string = string,
   TAccountVaultAdminLpAta extends string = string,
-  TAccountProtocolAdminLpAta extends string = string,
+  TAccountProtocolTreasuryLpAta extends string = string,
   TAccountLpTokenProgram extends string = string,
 > = {
   harvester: TransactionSigner<TAccountHarvester>;
   vaultManager: Address<TAccountVaultManager>;
   vaultAdmin: Address<TAccountVaultAdmin>;
-  protocolAdmin: Address<TAccountProtocolAdmin>;
+  protocolTreasury: Address<TAccountProtocolTreasury>;
   protocol?: Address<TAccountProtocol>;
   vault: Address<TAccountVault>;
   vaultLpMint?: Address<TAccountVaultLpMint>;
   vaultLpMintAuth?: Address<TAccountVaultLpMintAuth>;
   vaultManagerLpAta?: Address<TAccountVaultManagerLpAta>;
   vaultAdminLpAta?: Address<TAccountVaultAdminLpAta>;
-  protocolAdminLpAta?: Address<TAccountProtocolAdminLpAta>;
+  protocolTreasuryLpAta?: Address<TAccountProtocolTreasuryLpAta>;
   lpTokenProgram?: Address<TAccountLpTokenProgram>;
 };
 
@@ -174,14 +174,14 @@ export async function getHarvestFeeInstructionAsync<
   TAccountHarvester extends string,
   TAccountVaultManager extends string,
   TAccountVaultAdmin extends string,
-  TAccountProtocolAdmin extends string,
+  TAccountProtocolTreasury extends string,
   TAccountProtocol extends string,
   TAccountVault extends string,
   TAccountVaultLpMint extends string,
   TAccountVaultLpMintAuth extends string,
   TAccountVaultManagerLpAta extends string,
   TAccountVaultAdminLpAta extends string,
-  TAccountProtocolAdminLpAta extends string,
+  TAccountProtocolTreasuryLpAta extends string,
   TAccountLpTokenProgram extends string,
   TProgramAddress extends Address = typeof VOLTR_VAULT_PROGRAM_ADDRESS,
 >(
@@ -189,14 +189,14 @@ export async function getHarvestFeeInstructionAsync<
     TAccountHarvester,
     TAccountVaultManager,
     TAccountVaultAdmin,
-    TAccountProtocolAdmin,
+    TAccountProtocolTreasury,
     TAccountProtocol,
     TAccountVault,
     TAccountVaultLpMint,
     TAccountVaultLpMintAuth,
     TAccountVaultManagerLpAta,
     TAccountVaultAdminLpAta,
-    TAccountProtocolAdminLpAta,
+    TAccountProtocolTreasuryLpAta,
     TAccountLpTokenProgram
   >,
   config?: { programAddress?: TProgramAddress },
@@ -206,14 +206,14 @@ export async function getHarvestFeeInstructionAsync<
     TAccountHarvester,
     TAccountVaultManager,
     TAccountVaultAdmin,
-    TAccountProtocolAdmin,
+    TAccountProtocolTreasury,
     TAccountProtocol,
     TAccountVault,
     TAccountVaultLpMint,
     TAccountVaultLpMintAuth,
     TAccountVaultManagerLpAta,
     TAccountVaultAdminLpAta,
-    TAccountProtocolAdminLpAta,
+    TAccountProtocolTreasuryLpAta,
     TAccountLpTokenProgram
   >
 > {
@@ -225,7 +225,10 @@ export async function getHarvestFeeInstructionAsync<
     harvester: { value: input.harvester ?? null, isWritable: false },
     vaultManager: { value: input.vaultManager ?? null, isWritable: false },
     vaultAdmin: { value: input.vaultAdmin ?? null, isWritable: false },
-    protocolAdmin: { value: input.protocolAdmin ?? null, isWritable: false },
+    protocolTreasury: {
+      value: input.protocolTreasury ?? null,
+      isWritable: false,
+    },
     protocol: { value: input.protocol ?? null, isWritable: false },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultLpMint: { value: input.vaultLpMint ?? null, isWritable: true },
@@ -238,8 +241,8 @@ export async function getHarvestFeeInstructionAsync<
       isWritable: true,
     },
     vaultAdminLpAta: { value: input.vaultAdminLpAta ?? null, isWritable: true },
-    protocolAdminLpAta: {
-      value: input.protocolAdminLpAta ?? null,
+    protocolTreasuryLpAta: {
+      value: input.protocolTreasuryLpAta ?? null,
       isWritable: true,
     },
     lpTokenProgram: { value: input.lpTokenProgram ?? null, isWritable: false },
@@ -325,15 +328,15 @@ export async function getHarvestFeeInstructionAsync<
       ],
     });
   }
-  if (!accounts.protocolAdminLpAta.value) {
-    accounts.protocolAdminLpAta.value = await getProgramDerivedAddress({
+  if (!accounts.protocolTreasuryLpAta.value) {
+    accounts.protocolTreasuryLpAta.value = await getProgramDerivedAddress({
       programAddress:
         "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL" as Address<"ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL">,
       seeds: [
         getAddressEncoder().encode(
           getAddressFromResolvedInstructionAccount(
-            "protocolAdmin",
-            accounts.protocolAdmin.value,
+            "protocolTreasury",
+            accounts.protocolTreasury.value,
           ),
         ),
         getAddressEncoder().encode(
@@ -358,14 +361,14 @@ export async function getHarvestFeeInstructionAsync<
       getAccountMeta("harvester", accounts.harvester),
       getAccountMeta("vaultManager", accounts.vaultManager),
       getAccountMeta("vaultAdmin", accounts.vaultAdmin),
-      getAccountMeta("protocolAdmin", accounts.protocolAdmin),
+      getAccountMeta("protocolTreasury", accounts.protocolTreasury),
       getAccountMeta("protocol", accounts.protocol),
       getAccountMeta("vault", accounts.vault),
       getAccountMeta("vaultLpMint", accounts.vaultLpMint),
       getAccountMeta("vaultLpMintAuth", accounts.vaultLpMintAuth),
       getAccountMeta("vaultManagerLpAta", accounts.vaultManagerLpAta),
       getAccountMeta("vaultAdminLpAta", accounts.vaultAdminLpAta),
-      getAccountMeta("protocolAdminLpAta", accounts.protocolAdminLpAta),
+      getAccountMeta("protocolTreasuryLpAta", accounts.protocolTreasuryLpAta),
       getAccountMeta("lpTokenProgram", accounts.lpTokenProgram),
     ],
     data: getHarvestFeeInstructionDataEncoder().encode({}),
@@ -375,14 +378,14 @@ export async function getHarvestFeeInstructionAsync<
     TAccountHarvester,
     TAccountVaultManager,
     TAccountVaultAdmin,
-    TAccountProtocolAdmin,
+    TAccountProtocolTreasury,
     TAccountProtocol,
     TAccountVault,
     TAccountVaultLpMint,
     TAccountVaultLpMintAuth,
     TAccountVaultManagerLpAta,
     TAccountVaultAdminLpAta,
-    TAccountProtocolAdminLpAta,
+    TAccountProtocolTreasuryLpAta,
     TAccountLpTokenProgram
   >);
 }
@@ -391,27 +394,27 @@ export type HarvestFeeInput<
   TAccountHarvester extends string = string,
   TAccountVaultManager extends string = string,
   TAccountVaultAdmin extends string = string,
-  TAccountProtocolAdmin extends string = string,
+  TAccountProtocolTreasury extends string = string,
   TAccountProtocol extends string = string,
   TAccountVault extends string = string,
   TAccountVaultLpMint extends string = string,
   TAccountVaultLpMintAuth extends string = string,
   TAccountVaultManagerLpAta extends string = string,
   TAccountVaultAdminLpAta extends string = string,
-  TAccountProtocolAdminLpAta extends string = string,
+  TAccountProtocolTreasuryLpAta extends string = string,
   TAccountLpTokenProgram extends string = string,
 > = {
   harvester: TransactionSigner<TAccountHarvester>;
   vaultManager: Address<TAccountVaultManager>;
   vaultAdmin: Address<TAccountVaultAdmin>;
-  protocolAdmin: Address<TAccountProtocolAdmin>;
+  protocolTreasury: Address<TAccountProtocolTreasury>;
   protocol: Address<TAccountProtocol>;
   vault: Address<TAccountVault>;
   vaultLpMint: Address<TAccountVaultLpMint>;
   vaultLpMintAuth: Address<TAccountVaultLpMintAuth>;
   vaultManagerLpAta: Address<TAccountVaultManagerLpAta>;
   vaultAdminLpAta: Address<TAccountVaultAdminLpAta>;
-  protocolAdminLpAta: Address<TAccountProtocolAdminLpAta>;
+  protocolTreasuryLpAta: Address<TAccountProtocolTreasuryLpAta>;
   lpTokenProgram?: Address<TAccountLpTokenProgram>;
 };
 
@@ -419,14 +422,14 @@ export function getHarvestFeeInstruction<
   TAccountHarvester extends string,
   TAccountVaultManager extends string,
   TAccountVaultAdmin extends string,
-  TAccountProtocolAdmin extends string,
+  TAccountProtocolTreasury extends string,
   TAccountProtocol extends string,
   TAccountVault extends string,
   TAccountVaultLpMint extends string,
   TAccountVaultLpMintAuth extends string,
   TAccountVaultManagerLpAta extends string,
   TAccountVaultAdminLpAta extends string,
-  TAccountProtocolAdminLpAta extends string,
+  TAccountProtocolTreasuryLpAta extends string,
   TAccountLpTokenProgram extends string,
   TProgramAddress extends Address = typeof VOLTR_VAULT_PROGRAM_ADDRESS,
 >(
@@ -434,14 +437,14 @@ export function getHarvestFeeInstruction<
     TAccountHarvester,
     TAccountVaultManager,
     TAccountVaultAdmin,
-    TAccountProtocolAdmin,
+    TAccountProtocolTreasury,
     TAccountProtocol,
     TAccountVault,
     TAccountVaultLpMint,
     TAccountVaultLpMintAuth,
     TAccountVaultManagerLpAta,
     TAccountVaultAdminLpAta,
-    TAccountProtocolAdminLpAta,
+    TAccountProtocolTreasuryLpAta,
     TAccountLpTokenProgram
   >,
   config?: { programAddress?: TProgramAddress },
@@ -450,14 +453,14 @@ export function getHarvestFeeInstruction<
   TAccountHarvester,
   TAccountVaultManager,
   TAccountVaultAdmin,
-  TAccountProtocolAdmin,
+  TAccountProtocolTreasury,
   TAccountProtocol,
   TAccountVault,
   TAccountVaultLpMint,
   TAccountVaultLpMintAuth,
   TAccountVaultManagerLpAta,
   TAccountVaultAdminLpAta,
-  TAccountProtocolAdminLpAta,
+  TAccountProtocolTreasuryLpAta,
   TAccountLpTokenProgram
 > {
   // Program address.
@@ -468,7 +471,10 @@ export function getHarvestFeeInstruction<
     harvester: { value: input.harvester ?? null, isWritable: false },
     vaultManager: { value: input.vaultManager ?? null, isWritable: false },
     vaultAdmin: { value: input.vaultAdmin ?? null, isWritable: false },
-    protocolAdmin: { value: input.protocolAdmin ?? null, isWritable: false },
+    protocolTreasury: {
+      value: input.protocolTreasury ?? null,
+      isWritable: false,
+    },
     protocol: { value: input.protocol ?? null, isWritable: false },
     vault: { value: input.vault ?? null, isWritable: true },
     vaultLpMint: { value: input.vaultLpMint ?? null, isWritable: true },
@@ -481,8 +487,8 @@ export function getHarvestFeeInstruction<
       isWritable: true,
     },
     vaultAdminLpAta: { value: input.vaultAdminLpAta ?? null, isWritable: true },
-    protocolAdminLpAta: {
-      value: input.protocolAdminLpAta ?? null,
+    protocolTreasuryLpAta: {
+      value: input.protocolTreasuryLpAta ?? null,
       isWritable: true,
     },
     lpTokenProgram: { value: input.lpTokenProgram ?? null, isWritable: false },
@@ -504,14 +510,14 @@ export function getHarvestFeeInstruction<
       getAccountMeta("harvester", accounts.harvester),
       getAccountMeta("vaultManager", accounts.vaultManager),
       getAccountMeta("vaultAdmin", accounts.vaultAdmin),
-      getAccountMeta("protocolAdmin", accounts.protocolAdmin),
+      getAccountMeta("protocolTreasury", accounts.protocolTreasury),
       getAccountMeta("protocol", accounts.protocol),
       getAccountMeta("vault", accounts.vault),
       getAccountMeta("vaultLpMint", accounts.vaultLpMint),
       getAccountMeta("vaultLpMintAuth", accounts.vaultLpMintAuth),
       getAccountMeta("vaultManagerLpAta", accounts.vaultManagerLpAta),
       getAccountMeta("vaultAdminLpAta", accounts.vaultAdminLpAta),
-      getAccountMeta("protocolAdminLpAta", accounts.protocolAdminLpAta),
+      getAccountMeta("protocolTreasuryLpAta", accounts.protocolTreasuryLpAta),
       getAccountMeta("lpTokenProgram", accounts.lpTokenProgram),
     ],
     data: getHarvestFeeInstructionDataEncoder().encode({}),
@@ -521,14 +527,14 @@ export function getHarvestFeeInstruction<
     TAccountHarvester,
     TAccountVaultManager,
     TAccountVaultAdmin,
-    TAccountProtocolAdmin,
+    TAccountProtocolTreasury,
     TAccountProtocol,
     TAccountVault,
     TAccountVaultLpMint,
     TAccountVaultLpMintAuth,
     TAccountVaultManagerLpAta,
     TAccountVaultAdminLpAta,
-    TAccountProtocolAdminLpAta,
+    TAccountProtocolTreasuryLpAta,
     TAccountLpTokenProgram
   >);
 }
@@ -542,14 +548,14 @@ export type ParsedHarvestFeeInstruction<
     harvester: TAccountMetas[0];
     vaultManager: TAccountMetas[1];
     vaultAdmin: TAccountMetas[2];
-    protocolAdmin: TAccountMetas[3];
+    protocolTreasury: TAccountMetas[3];
     protocol: TAccountMetas[4];
     vault: TAccountMetas[5];
     vaultLpMint: TAccountMetas[6];
     vaultLpMintAuth: TAccountMetas[7];
     vaultManagerLpAta: TAccountMetas[8];
     vaultAdminLpAta: TAccountMetas[9];
-    protocolAdminLpAta: TAccountMetas[10];
+    protocolTreasuryLpAta: TAccountMetas[10];
     lpTokenProgram: TAccountMetas[11];
   };
   data: HarvestFeeInstructionData;
@@ -584,14 +590,14 @@ export function parseHarvestFeeInstruction<
       harvester: getNextAccount(),
       vaultManager: getNextAccount(),
       vaultAdmin: getNextAccount(),
-      protocolAdmin: getNextAccount(),
+      protocolTreasury: getNextAccount(),
       protocol: getNextAccount(),
       vault: getNextAccount(),
       vaultLpMint: getNextAccount(),
       vaultLpMintAuth: getNextAccount(),
       vaultManagerLpAta: getNextAccount(),
       vaultAdminLpAta: getNextAccount(),
-      protocolAdminLpAta: getNextAccount(),
+      protocolTreasuryLpAta: getNextAccount(),
       lpTokenProgram: getNextAccount(),
     },
     data: getHarvestFeeInstructionDataDecoder().decode(instruction.data),

package/src/generated/instructions/index.ts

@@ -29,6 +29,7 @@ export * from "./instantWithdrawVault";
 export * from "./removeAdaptor";
 export * from "./requestWithdrawVault";
 export * from "./updateProtocol";
+export * from "./updateVaultAdaptorPolicy";
 export * from "./updateVaultConfig";
 export * from "./updateVaultProtocolFee";
 export * from "./withdrawStrategy";

package/src/generated/instructions/initProtocol.ts

@@ -10,6 +10,8 @@ import {
   combineCodec,
   fixDecoderSize,
   fixEncoderSize,
+  getAddressDecoder,
+  getAddressEncoder,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
@@ -84,15 +86,20 @@ export type InitProtocolInstruction<
 
 export type InitProtocolInstructionData = {
   discriminator: ReadonlyUint8Array;
+  treasury: Address;
   operationalState: number;
 };
 
-export type InitProtocolInstructionDataArgs = { operationalState: number };
+export type InitProtocolInstructionDataArgs = {
+  treasury: Address;
+  operationalState: number;
+};
 
 export function getInitProtocolInstructionDataEncoder(): FixedSizeEncoder<InitProtocolInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ["discriminator", fixEncoderSize(getBytesEncoder(), 8)],
+      ["treasury", getAddressEncoder()],
       ["operationalState", getU16Encoder()],
     ]),
     (value) => ({ ...value, discriminator: INIT_PROTOCOL_DISCRIMINATOR }),
@@ -102,6 +109,7 @@ export function getInitProtocolInstructionDataEncoder(): FixedSizeEncoder<InitPr
 export function getInitProtocolInstructionDataDecoder(): FixedSizeDecoder<InitProtocolInstructionData> {
   return getStructDecoder([
     ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
+    ["treasury", getAddressDecoder()],
     ["operationalState", getU16Decoder()],
   ]);
 }
@@ -126,6 +134,7 @@ export type InitProtocolAsyncInput<
   admin: TransactionSigner<TAccountAdmin>;
   protocol?: Address<TAccountProtocol>;
   systemProgram?: Address<TAccountSystemProgram>;
+  treasury: InitProtocolInstructionDataArgs["treasury"];
   operationalState: InitProtocolInstructionDataArgs["operationalState"];
 };
 
@@ -210,6 +219,7 @@ export type InitProtocolInput<
   admin: TransactionSigner<TAccountAdmin>;
   protocol: Address<TAccountProtocol>;
   systemProgram?: Address<TAccountSystemProgram>;
+  treasury: InitProtocolInstructionDataArgs["treasury"];
   operationalState: InitProtocolInstructionDataArgs["operationalState"];
 };