@epicentral/sos-sdk 0.9.1-beta → 0.10.0-beta

package/generated/instructions/claimMakerRemaining.ts

@@ -0,0 +1,452 @@
+/**
+ * This code was AUTOGENERATED using the Codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun Codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+
+import {
+  combineCodec,
+  fixDecoderSize,
+  fixEncoderSize,
+  getAddressEncoder,
+  getBytesDecoder,
+  getBytesEncoder,
+  getProgramDerivedAddress,
+  getStructDecoder,
+  getStructEncoder,
+  transformEncoder,
+  type AccountMeta,
+  type AccountSignerMeta,
+  type Address,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
+  type ReadonlyAccount,
+  type ReadonlyUint8Array,
+  type TransactionSigner,
+  type WritableAccount,
+  type WritableSignerAccount,
+} from "@solana/kit";
+import { OPTION_PROGRAM_PROGRAM_ADDRESS } from "../programs";
+import {
+  expectAddress,
+  getAccountMetaFactory,
+  type ResolvedAccount,
+} from "../shared";
+
+export const CLAIM_MAKER_REMAINING_DISCRIMINATOR = new Uint8Array([
+  108, 194, 135, 237, 155, 192, 199, 57,
+]);
+
+export function getClaimMakerRemainingDiscriminatorBytes() {
+  return fixEncoderSize(getBytesEncoder(), 8).encode(
+    CLAIM_MAKER_REMAINING_DISCRIMINATOR,
+  );
+}
+
+export type ClaimMakerRemainingInstruction<
+  TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+  TAccountCollateralPool extends string | AccountMeta<string> = string,
+  TAccountOptionAccount extends string | AccountMeta<string> = string,
+  TAccountMakerCollateralShare extends string | AccountMeta<string> = string,
+  TAccountWriterPosition extends string | AccountMeta<string> = string,
+  TAccountCollateralVault extends string | AccountMeta<string> = string,
+  TAccountMakerCollateralAccount extends string | AccountMeta<string> = string,
+  TAccountKeeper extends string | AccountMeta<string> = string,
+  TAccountTokenProgram extends string | AccountMeta<string> =
+    "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA",
+  TAccountSystemProgram extends string | AccountMeta<string> =
+    "11111111111111111111111111111111",
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
+    [
+      TAccountCollateralPool extends string
+        ? WritableAccount<TAccountCollateralPool>
+        : TAccountCollateralPool,
+      TAccountOptionAccount extends string
+        ? WritableAccount<TAccountOptionAccount>
+        : TAccountOptionAccount,
+      TAccountMakerCollateralShare extends string
+        ? WritableAccount<TAccountMakerCollateralShare>
+        : TAccountMakerCollateralShare,
+      TAccountWriterPosition extends string
+        ? WritableAccount<TAccountWriterPosition>
+        : TAccountWriterPosition,
+      TAccountCollateralVault extends string
+        ? WritableAccount<TAccountCollateralVault>
+        : TAccountCollateralVault,
+      TAccountMakerCollateralAccount extends string
+        ? WritableAccount<TAccountMakerCollateralAccount>
+        : TAccountMakerCollateralAccount,
+      TAccountKeeper extends string
+        ? WritableSignerAccount<TAccountKeeper> &
+            AccountSignerMeta<TAccountKeeper>
+        : TAccountKeeper,
+      TAccountTokenProgram extends string
+        ? ReadonlyAccount<TAccountTokenProgram>
+        : TAccountTokenProgram,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
+      ...TRemainingAccounts,
+    ]
+  >;
+
+export type ClaimMakerRemainingInstructionData = {
+  discriminator: ReadonlyUint8Array;
+};
+
+export type ClaimMakerRemainingInstructionDataArgs = {};
+
+export function getClaimMakerRemainingInstructionDataEncoder(): FixedSizeEncoder<ClaimMakerRemainingInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([["discriminator", fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({
+      ...value,
+      discriminator: CLAIM_MAKER_REMAINING_DISCRIMINATOR,
+    }),
+  );
+}
+
+export function getClaimMakerRemainingInstructionDataDecoder(): FixedSizeDecoder<ClaimMakerRemainingInstructionData> {
+  return getStructDecoder([
+    ["discriminator", fixDecoderSize(getBytesDecoder(), 8)],
+  ]);
+}
+
+export function getClaimMakerRemainingInstructionDataCodec(): FixedSizeCodec<
+  ClaimMakerRemainingInstructionDataArgs,
+  ClaimMakerRemainingInstructionData
+> {
+  return combineCodec(
+    getClaimMakerRemainingInstructionDataEncoder(),
+    getClaimMakerRemainingInstructionDataDecoder(),
+  );
+}
+
+export type ClaimMakerRemainingAsyncInput<
+  TAccountCollateralPool extends string = string,
+  TAccountOptionAccount extends string = string,
+  TAccountMakerCollateralShare extends string = string,
+  TAccountWriterPosition extends string = string,
+  TAccountCollateralVault extends string = string,
+  TAccountMakerCollateralAccount extends string = string,
+  TAccountKeeper extends string = string,
+  TAccountTokenProgram extends string = string,
+  TAccountSystemProgram extends string = string,
+> = {
+  collateralPool?: Address<TAccountCollateralPool>;
+  optionAccount: Address<TAccountOptionAccount>;
+  makerCollateralShare: Address<TAccountMakerCollateralShare>;
+  writerPosition: Address<TAccountWriterPosition>;
+  collateralVault: Address<TAccountCollateralVault>;
+  makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
+  keeper: TransactionSigner<TAccountKeeper>;
+  tokenProgram?: Address<TAccountTokenProgram>;
+  systemProgram?: Address<TAccountSystemProgram>;
+};
+
+export async function getClaimMakerRemainingInstructionAsync<
+  TAccountCollateralPool extends string,
+  TAccountOptionAccount extends string,
+  TAccountMakerCollateralShare extends string,
+  TAccountWriterPosition extends string,
+  TAccountCollateralVault extends string,
+  TAccountMakerCollateralAccount extends string,
+  TAccountKeeper extends string,
+  TAccountTokenProgram extends string,
+  TAccountSystemProgram extends string,
+  TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+>(
+  input: ClaimMakerRemainingAsyncInput<
+    TAccountCollateralPool,
+    TAccountOptionAccount,
+    TAccountMakerCollateralShare,
+    TAccountWriterPosition,
+    TAccountCollateralVault,
+    TAccountMakerCollateralAccount,
+    TAccountKeeper,
+    TAccountTokenProgram,
+    TAccountSystemProgram
+  >,
+  config?: { programAddress?: TProgramAddress },
+): Promise<
+  ClaimMakerRemainingInstruction<
+    TProgramAddress,
+    TAccountCollateralPool,
+    TAccountOptionAccount,
+    TAccountMakerCollateralShare,
+    TAccountWriterPosition,
+    TAccountCollateralVault,
+    TAccountMakerCollateralAccount,
+    TAccountKeeper,
+    TAccountTokenProgram,
+    TAccountSystemProgram
+  >
+> {
+  // Program address.
+  const programAddress =
+    config?.programAddress ?? OPTION_PROGRAM_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    collateralPool: { value: input.collateralPool ?? null, isWritable: true },
+    optionAccount: { value: input.optionAccount ?? null, isWritable: true },
+    makerCollateralShare: {
+      value: input.makerCollateralShare ?? null,
+      isWritable: true,
+    },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
+    collateralVault: { value: input.collateralVault ?? null, isWritable: true },
+    makerCollateralAccount: {
+      value: input.makerCollateralAccount ?? null,
+      isWritable: true,
+    },
+    keeper: { value: input.keeper ?? null, isWritable: true },
+    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  // Resolve default values.
+  if (!accounts.collateralPool.value) {
+    accounts.collateralPool.value = await getProgramDerivedAddress({
+      programAddress,
+      seeds: [
+        getBytesEncoder().encode(
+          new Uint8Array([
+            99, 111, 108, 108, 97, 116, 101, 114, 97, 108, 95, 112, 111, 111,
+            108,
+          ]),
+        ),
+        getAddressEncoder().encode(expectAddress(accounts.optionAccount.value)),
+      ],
+    });
+  }
+  if (!accounts.tokenProgram.value) {
+    accounts.tokenProgram.value =
+      "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
+  }
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value =
+      "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta(accounts.collateralPool),
+      getAccountMeta(accounts.optionAccount),
+      getAccountMeta(accounts.makerCollateralShare),
+      getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.collateralVault),
+      getAccountMeta(accounts.makerCollateralAccount),
+      getAccountMeta(accounts.keeper),
+      getAccountMeta(accounts.tokenProgram),
+      getAccountMeta(accounts.systemProgram),
+    ],
+    data: getClaimMakerRemainingInstructionDataEncoder().encode({}),
+    programAddress,
+  } as ClaimMakerRemainingInstruction<
+    TProgramAddress,
+    TAccountCollateralPool,
+    TAccountOptionAccount,
+    TAccountMakerCollateralShare,
+    TAccountWriterPosition,
+    TAccountCollateralVault,
+    TAccountMakerCollateralAccount,
+    TAccountKeeper,
+    TAccountTokenProgram,
+    TAccountSystemProgram
+  >);
+}
+
+export type ClaimMakerRemainingInput<
+  TAccountCollateralPool extends string = string,
+  TAccountOptionAccount extends string = string,
+  TAccountMakerCollateralShare extends string = string,
+  TAccountWriterPosition extends string = string,
+  TAccountCollateralVault extends string = string,
+  TAccountMakerCollateralAccount extends string = string,
+  TAccountKeeper extends string = string,
+  TAccountTokenProgram extends string = string,
+  TAccountSystemProgram extends string = string,
+> = {
+  collateralPool: Address<TAccountCollateralPool>;
+  optionAccount: Address<TAccountOptionAccount>;
+  makerCollateralShare: Address<TAccountMakerCollateralShare>;
+  writerPosition: Address<TAccountWriterPosition>;
+  collateralVault: Address<TAccountCollateralVault>;
+  makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
+  keeper: TransactionSigner<TAccountKeeper>;
+  tokenProgram?: Address<TAccountTokenProgram>;
+  systemProgram?: Address<TAccountSystemProgram>;
+};
+
+export function getClaimMakerRemainingInstruction<
+  TAccountCollateralPool extends string,
+  TAccountOptionAccount extends string,
+  TAccountMakerCollateralShare extends string,
+  TAccountWriterPosition extends string,
+  TAccountCollateralVault extends string,
+  TAccountMakerCollateralAccount extends string,
+  TAccountKeeper extends string,
+  TAccountTokenProgram extends string,
+  TAccountSystemProgram extends string,
+  TProgramAddress extends Address = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+>(
+  input: ClaimMakerRemainingInput<
+    TAccountCollateralPool,
+    TAccountOptionAccount,
+    TAccountMakerCollateralShare,
+    TAccountWriterPosition,
+    TAccountCollateralVault,
+    TAccountMakerCollateralAccount,
+    TAccountKeeper,
+    TAccountTokenProgram,
+    TAccountSystemProgram
+  >,
+  config?: { programAddress?: TProgramAddress },
+): ClaimMakerRemainingInstruction<
+  TProgramAddress,
+  TAccountCollateralPool,
+  TAccountOptionAccount,
+  TAccountMakerCollateralShare,
+  TAccountWriterPosition,
+  TAccountCollateralVault,
+  TAccountMakerCollateralAccount,
+  TAccountKeeper,
+  TAccountTokenProgram,
+  TAccountSystemProgram
+> {
+  // Program address.
+  const programAddress =
+    config?.programAddress ?? OPTION_PROGRAM_PROGRAM_ADDRESS;
+
+  // Original accounts.
+  const originalAccounts = {
+    collateralPool: { value: input.collateralPool ?? null, isWritable: true },
+    optionAccount: { value: input.optionAccount ?? null, isWritable: true },
+    makerCollateralShare: {
+      value: input.makerCollateralShare ?? null,
+      isWritable: true,
+    },
+    writerPosition: { value: input.writerPosition ?? null, isWritable: true },
+    collateralVault: { value: input.collateralVault ?? null, isWritable: true },
+    makerCollateralAccount: {
+      value: input.makerCollateralAccount ?? null,
+      isWritable: true,
+    },
+    keeper: { value: input.keeper ?? null, isWritable: true },
+    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+  };
+  const accounts = originalAccounts as Record<
+    keyof typeof originalAccounts,
+    ResolvedAccount
+  >;
+
+  // Resolve default values.
+  if (!accounts.tokenProgram.value) {
+    accounts.tokenProgram.value =
+      "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" as Address<"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA">;
+  }
+  if (!accounts.systemProgram.value) {
+    accounts.systemProgram.value =
+      "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
+  }
+
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+  return Object.freeze({
+    accounts: [
+      getAccountMeta(accounts.collateralPool),
+      getAccountMeta(accounts.optionAccount),
+      getAccountMeta(accounts.makerCollateralShare),
+      getAccountMeta(accounts.writerPosition),
+      getAccountMeta(accounts.collateralVault),
+      getAccountMeta(accounts.makerCollateralAccount),
+      getAccountMeta(accounts.keeper),
+      getAccountMeta(accounts.tokenProgram),
+      getAccountMeta(accounts.systemProgram),
+    ],
+    data: getClaimMakerRemainingInstructionDataEncoder().encode({}),
+    programAddress,
+  } as ClaimMakerRemainingInstruction<
+    TProgramAddress,
+    TAccountCollateralPool,
+    TAccountOptionAccount,
+    TAccountMakerCollateralShare,
+    TAccountWriterPosition,
+    TAccountCollateralVault,
+    TAccountMakerCollateralAccount,
+    TAccountKeeper,
+    TAccountTokenProgram,
+    TAccountSystemProgram
+  >);
+}
+
+export type ParsedClaimMakerRemainingInstruction<
+  TProgram extends string = typeof OPTION_PROGRAM_PROGRAM_ADDRESS,
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
+> = {
+  programAddress: Address<TProgram>;
+  accounts: {
+    collateralPool: TAccountMetas[0];
+    optionAccount: TAccountMetas[1];
+    makerCollateralShare: TAccountMetas[2];
+    writerPosition: TAccountMetas[3];
+    collateralVault: TAccountMetas[4];
+    makerCollateralAccount: TAccountMetas[5];
+    keeper: TAccountMetas[6];
+    tokenProgram: TAccountMetas[7];
+    systemProgram: TAccountMetas[8];
+  };
+  data: ClaimMakerRemainingInstructionData;
+};
+
+export function parseClaimMakerRemainingInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>,
+): ParsedClaimMakerRemainingInstruction<TProgram, TAccountMetas> {
+  if (instruction.accounts.length < 9) {
+    // TODO: Coded error.
+    throw new Error("Not enough accounts");
+  }
+  let accountIndex = 0;
+  const getNextAccount = () => {
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
+    accountIndex += 1;
+    return accountMeta;
+  };
+  return {
+    programAddress: instruction.programAddress,
+    accounts: {
+      collateralPool: getNextAccount(),
+      optionAccount: getNextAccount(),
+      makerCollateralShare: getNextAccount(),
+      writerPosition: getNextAccount(),
+      collateralVault: getNextAccount(),
+      makerCollateralAccount: getNextAccount(),
+      keeper: getNextAccount(),
+      tokenProgram: getNextAccount(),
+      systemProgram: getNextAccount(),
+    },
+    data: getClaimMakerRemainingInstructionDataDecoder().decode(
+      instruction.data,
+    ),
+  };
+}

package/generated/instructions/depositCollateral.ts

@@ -77,7 +77,7 @@ export type DepositCollateralInstruction<
         ? WritableAccount<TAccountCollateralPool>
         : TAccountCollateralPool,
       TAccountOptionAccount extends string
-        ? ReadonlyAccount<TAccountOptionAccount>
+        ? WritableAccount<TAccountOptionAccount>
         : TAccountOptionAccount,
       TAccountMakerCollateralShare extends string
         ? WritableAccount<TAccountMakerCollateralShare>
@@ -175,7 +175,7 @@ export type DepositCollateralAsyncInput<
   collateralPool: Address<TAccountCollateralPool>;
   optionAccount: Address<TAccountOptionAccount>;
   makerCollateralShare?: Address<TAccountMakerCollateralShare>;
-  /** Maker's WSOL account (source of maker's own collateral) */
+  /** Maker's collateral token account (source of maker's own collateral) */
   makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
   /** Pool's collateral vault (destination for both maker and borrowed funds) */
   collateralVault: Address<TAccountCollateralVault>;
@@ -257,7 +257,7 @@ export async function getDepositCollateralInstructionAsync<
   // Original accounts.
   const originalAccounts = {
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
-    optionAccount: { value: input.optionAccount ?? null, isWritable: false },
+    optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     makerCollateralShare: {
       value: input.makerCollateralShare ?? null,
       isWritable: true,
@@ -377,7 +377,7 @@ export type DepositCollateralInput<
   collateralPool: Address<TAccountCollateralPool>;
   optionAccount: Address<TAccountOptionAccount>;
   makerCollateralShare: Address<TAccountMakerCollateralShare>;
-  /** Maker's WSOL account (source of maker's own collateral) */
+  /** Maker's collateral token account (source of maker's own collateral) */
   makerCollateralAccount: Address<TAccountMakerCollateralAccount>;
   /** Pool's collateral vault (destination for both maker and borrowed funds) */
   collateralVault: Address<TAccountCollateralVault>;
@@ -457,7 +457,7 @@ export function getDepositCollateralInstruction<
   // Original accounts.
   const originalAccounts = {
     collateralPool: { value: input.collateralPool ?? null, isWritable: true },
-    optionAccount: { value: input.optionAccount ?? null, isWritable: false },
+    optionAccount: { value: input.optionAccount ?? null, isWritable: true },
     makerCollateralShare: {
       value: input.makerCollateralShare ?? null,
       isWritable: true,
@@ -552,7 +552,7 @@ export type ParsedDepositCollateralInstruction<
     collateralPool: TAccountMetas[0];
     optionAccount: TAccountMetas[1];
     makerCollateralShare: TAccountMetas[2];
-    /** Maker's WSOL account (source of maker's own collateral) */
+    /** Maker's collateral token account (source of maker's own collateral) */
     makerCollateralAccount: TAccountMetas[3];
     /** Pool's collateral vault (destination for both maker and borrowed funds) */
     collateralVault: TAccountMetas[4];

package/generated/instructions/index.ts

@@ -11,6 +11,7 @@ export * from "./autoExerciseAllExpired";
 export * from "./autoExerciseExpired";
 export * from "./borrowFromPool";
 export * from "./buyFromPool";
+export * from "./claimMakerRemaining";
 export * from "./closeLongToPool";
 export * from "./closeOption";
 export * from "./createEscrowV2";

package/generated/instructions/initCollateralPool.ts

@@ -152,7 +152,7 @@ export type InitCollateralPoolAsyncInput<
   optionAccount: Address<TAccountOptionAccount>;
   optionPool: Address<TAccountOptionPool>;
   collateralPool?: Address<TAccountCollateralPool>;
-  /** WSOL mint */
+  /** Settlement/collateral mint for this pool. */
   collateralMint: Address<TAccountCollateralMint>;
   /** Pool's collateral vault (ATA) */
   collateralVault?: Address<TAccountCollateralVault>;
@@ -328,7 +328,7 @@ export type InitCollateralPoolInput<
   optionAccount: Address<TAccountOptionAccount>;
   optionPool: Address<TAccountOptionPool>;
   collateralPool: Address<TAccountCollateralPool>;
-  /** WSOL mint */
+  /** Settlement/collateral mint for this pool. */
   collateralMint: Address<TAccountCollateralMint>;
   /** Pool's collateral vault (ATA) */
   collateralVault: Address<TAccountCollateralVault>;
@@ -461,7 +461,7 @@ export type ParsedInitCollateralPoolInstruction<
     optionAccount: TAccountMetas[0];
     optionPool: TAccountMetas[1];
     collateralPool: TAccountMetas[2];
-    /** WSOL mint */
+    /** Settlement/collateral mint for this pool. */
     collateralMint: TAccountMetas[3];
     /** Pool's collateral vault (ATA) */
     collateralVault: TAccountMetas[4];