@epicentral/sos-sdk 0.2.8 → 0.2.10

package/index.ts

@@ -31,5 +31,6 @@ export {
   getUnwrapSOLInstructions,
   getSyncNativeInstruction,
   getCloseAccountInstruction,
+  getCreateAssociatedTokenIdempotentInstructionWithAddress,
   NATIVE_MINT,
 } from "./wsol/instructions";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epicentral/sos-sdk",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "private": false,
   "description": "Solana Option Standard SDK. The frontend-first SDK for Native Options Trading on Solana. Created by Epicentral Labs.",
   "type": "module",

package/short/builders.ts

@@ -21,6 +21,7 @@ import {
   appendRemainingAccounts,
   type RemainingAccountInput,
 } from "../shared/remaining-accounts";
+import { getCreateAssociatedTokenIdempotentInstructionWithAddress } from "../wsol/instructions";
 
 export interface BuildOptionMintParams {
   optionType: OptionType;
@@ -199,7 +200,7 @@ export interface BuildOptionMintTransactionWithDerivationParams {
   makerCollateralAmount: bigint | number;
   borrowedAmount: bigint | number;
   maker: AddressLike;
-  makerCollateralAccount: AddressLike;
+  makerCollateralAccount?: AddressLike;
   rpc: KitRpc;
   programId?: AddressLike;
   vault?: AddressLike;
@@ -242,21 +243,20 @@ export async function buildOptionMintTransactionWithDerivation(
     rpc: params.rpc,
   });
 
-  invariant(
-    !!resolved.escrowLongAccount && !!resolved.premiumVault && !!resolved.collateralVault,
-    "Option pool and collateral pool must exist; ensure rpc is provided and pools are initialized."
-  );
-
   const underlyingMint = resolved.underlyingMint ?? params.underlyingMint;
   const [makerLongAccount, makerShortAccount] = await Promise.all([
     deriveAssociatedTokenAddress(params.maker, resolved.longMint),
     deriveAssociatedTokenAddress(params.maker, resolved.shortMint),
   ]);
+  const makerCollateralAccount = params.makerCollateralAccount
+    ? toAddress(params.makerCollateralAccount)
+    : await deriveAssociatedTokenAddress(params.maker, underlyingMint);
 
-  return buildOptionMintTransaction({
+  const tx = await buildOptionMintTransaction({
     ...params,
     underlyingAsset: params.underlyingAsset,
     underlyingMint,
+    makerCollateralAccount,
     optionAccount: resolved.optionAccount,
     longMint: resolved.longMint,
     shortMint: resolved.shortMint,
@@ -277,6 +277,18 @@ export async function buildOptionMintTransactionWithDerivation(
     poolLoan: params.poolLoan,
     remainingAccounts: params.remainingAccounts,
   });
+
+  const createAtaIx =
+    await getCreateAssociatedTokenIdempotentInstructionWithAddress(
+      params.maker,
+      params.maker,
+      underlyingMint,
+      makerCollateralAccount
+    );
+
+  return {
+    instructions: [createAtaIx, ...tx.instructions],
+  };
 }
 
 export async function buildUnwindWriterUnsoldInstruction(

package/wsol/instructions.ts

@@ -100,6 +100,32 @@ export function getCloseAccountInstruction(
   });
 }
 
+/**
+ * Builds the Associated Token Program CreateIdempotent instruction with payer as
+ * AddressLike (no signer object). Safe to add even if the ATA already exists.
+ * The payer must sign the transaction when it is submitted.
+ */
+export async function getCreateAssociatedTokenIdempotentInstructionWithAddress(
+  payer: AddressLike,
+  owner: AddressLike,
+  mint: AddressLike,
+  associatedToken: Address
+): Promise<Instruction<string>> {
+  const programAddress = ASSOCIATED_TOKEN_PROGRAM_ADDRESS;
+  return Object.freeze({
+    programAddress,
+    accounts: [
+      accountMeta(toAddress(payer), AccountRole.WRITABLE_SIGNER),
+      accountMeta(associatedToken, AccountRole.WRITABLE),
+      accountMeta(toAddress(owner), AccountRole.READONLY),
+      accountMeta(toAddress(mint), AccountRole.READONLY),
+      accountMeta(SYSTEM_PROGRAM_ADDRESS, AccountRole.READONLY),
+      accountMeta(TOKEN_PROGRAM_ADDRESS, AccountRole.READONLY),
+    ],
+    data: new Uint8Array([CREATE_ASSOCIATED_TOKEN_IDEMPOTENT_DISCRIMINATOR]),
+  });
+}
+
 /**
  * Builds the Associated Token Program CreateIdempotent instruction. Safe to add
  * even if the ATA already exists.