@0dotxyz/p0-ts-sdk 2.6.1 → 2.6.2

package/dist/index.cjs

@@ -62703,11 +62703,11 @@ function deriveExponentClmmEventAuthority() {
     EXPONENT_CLMM_PROGRAM_ID
   )[0];
 }
-var MERGE_DISCRIMINATOR = Buffer.from([5]);
+var MERGE_DISCRIMINATOR = buffer.Buffer.from([5]);
 function makeExponentMergeIx(accounts, amountNative) {
   const tokenProgram = accounts.tokenProgram ?? TOKEN_PROGRAM_ID;
   const eventAuthority = deriveExponentEventAuthority();
-  const data = Buffer.alloc(MERGE_DISCRIMINATOR.length + 8);
+  const data = buffer.Buffer.alloc(MERGE_DISCRIMINATOR.length + 8);
   MERGE_DISCRIMINATOR.copy(data, 0);
   data.writeBigUInt64LE(amountNative, MERGE_DISCRIMINATOR.length);
   const keys = [
@@ -62736,14 +62736,14 @@ function makeExponentMergeIx(accounts, amountNative) {
     data
   });
 }
-Buffer.from([17]);
-Buffer.from([4]);
-Buffer.from([39]);
-Buffer.from([7]);
-var CLMM_TRADE_PT_DISCRIMINATOR = Buffer.from([3]);
+buffer.Buffer.from([17]);
+buffer.Buffer.from([4]);
+buffer.Buffer.from([39]);
+buffer.Buffer.from([7]);
+var CLMM_TRADE_PT_DISCRIMINATOR = buffer.Buffer.from([3]);
 function encodeOptionU64(value) {
-  if (value === null) return Buffer.from([0]);
-  const buf = Buffer.alloc(9);
+  if (value === null) return buffer.Buffer.from([0]);
+  const buf = buffer.Buffer.alloc(9);
   buf.writeUInt8(1, 0);
   buf.writeBigUInt64LE(value, 1);
   return buf;
@@ -62762,14 +62762,14 @@ function exponentClmmBuyPtArgs({
 function makeExponentClmmTradePtIx(accounts, args) {
   const tokenProgram = accounts.tokenProgram ?? TOKEN_PROGRAM_ID;
   const eventAuthority = deriveExponentClmmEventAuthority();
-  const head = Buffer.alloc(CLMM_TRADE_PT_DISCRIMINATOR.length + 9);
+  const head = buffer.Buffer.alloc(CLMM_TRADE_PT_DISCRIMINATOR.length + 9);
   CLMM_TRADE_PT_DISCRIMINATOR.copy(head, 0);
   head.writeBigUInt64LE(args.amountIn, CLMM_TRADE_PT_DISCRIMINATOR.length);
   head.writeUInt8(args.swapDirection, CLMM_TRADE_PT_DISCRIMINATOR.length + 8);
-  const data = Buffer.concat([
+  const data = buffer.Buffer.concat([
     head,
     encodeOptionU64(args.amountOutConstraint),
-    Buffer.from([0])
+    buffer.Buffer.from([0])
   ]);
   const keys = [
     { pubkey: accounts.trader, isSigner: true, isWritable: true },
@@ -75298,7 +75298,6 @@ async function tryBridgedCollateralSwap(params, bridgeOpts) {
 }
 var DEFAULT_ROLL_SLIPPAGE_BPS = 50;
 var TRADE_PT_EVENT_AMOUNT_OUT_OFFSET = 138;
-var MERGE_EVENT_AMOUNT_SY_OUT_OFFSET = 296;
 async function makeRollPtTx(params) {
   const {
     program,
@@ -75417,6 +75416,7 @@ async function buildRollPtFlashloanTx({
   const { withdrawBank, tokenProgram: withdrawTokenProgram, totalPositionAmount, withdrawAmount } = withdrawOpts;
   const { depositBank, tokenProgram: depositTokenProgram } = depositOpts;
   const authority = marginfiAccount.authority;
+  const simulateTx = params.simulateTx ?? defaultRollQuoteSimulator(connection);
   if (withdrawAmount !== void 0 && withdrawAmount <= 0) {
     throw new Error("withdrawAmount must be greater than 0");
   }
@@ -75470,24 +75470,13 @@ async function buildRollPtFlashloanTx({
       clmm.addressLookupTable
     ];
   }
-  const redeemIxs = [...setupIxs, ...cuRequestIxs, ...withdrawIxs.instructions, mergeIx];
-  const mergeReturn = await simulateRollReturn({
-    program,
-    marginfiAccount,
-    bankMap,
-    connection,
-    blockhash,
-    luts,
-    ixs: redeemIxs,
-    programId: EXPONENT_CORE_PROGRAM_ID,
-    label: "merge"
-  });
-  const syExact = readReturnU64(mergeReturn, MERGE_EVENT_AMOUNT_SY_OUT_OFFSET, "merge amount_sy_out");
+  const syExact = merge.computeRedeemedAmountNative(withdrawNative);
   if (syExact <= 0n) {
     throw new Error("roll-pt: merge would redeem 0 SY (empty/invalid matured vault state)");
   }
   const exactPtOut = await quoteClmmTradeOut({
     connection,
+    simulateTx,
     clmm,
     amountInSyNative: syExact,
     payer: authority
@@ -75550,62 +75539,40 @@ async function buildRollPtFlashloanTx({
   };
   return { flashloanTx, swapQuote, withdrawIxs, depositIxs };
 }
-async function simulateRollReturn({
-  program,
-  marginfiAccount,
-  bankMap,
-  connection,
-  blockhash,
-  luts,
-  ixs,
-  programId,
-  label
-}) {
-  const quoteTx = await makeFlashLoanTx({
-    program,
-    marginfiAccount,
-    bankMap,
-    addressLookupTableAccounts: luts,
-    blockhash,
-    ixs,
-    isSync: false
-  });
-  const sim = await connection.simulateTransaction(quoteTx, {
-    sigVerify: false,
-    replaceRecentBlockhash: true
-  });
-  const logs = sim.value.logs ?? [];
-  if (process.env.ROLL_DEBUG) {
-    console.error(
-      `[roll ${label} sim] err:`,
-      JSON.stringify(sim.value.err),
-      "returnData:",
-      JSON.stringify(sim.value.returnData),
-      "logsLen:",
-      logs.length,
-      "truncated:",
-      logs.some((l) => l.includes("truncated"))
-    );
-  }
-  const prefix = `Program return: ${programId.toBase58()} `;
-  const line = [...logs].reverse().find((l) => l.startsWith(prefix));
-  if (!line) {
-    throw new Error(
-      `roll-pt: could not read ${label} return data from quote simulation (err=${JSON.stringify(
-        sim.value.err
-      )})`
-    );
-  }
-  return Buffer.from(line.slice(prefix.length), "base64");
+function defaultRollQuoteSimulator(connection) {
+  return async (tx) => {
+    const sim = await connection.simulateTransaction(tx, {
+      sigVerify: false,
+      replaceRecentBlockhash: true
+    });
+    return {
+      err: sim.value.err,
+      logs: sim.value.logs,
+      returnData: sim.value.returnData
+    };
+  };
 }
-function readReturnU64(data, offset, what) {
-  if (data.length < offset + 8) {
-    throw new Error(`roll-pt: ${what} return data too short (${data.length} bytes)`);
+function tokenBalanceDelta(sim, mint, owner) {
+  if (!sim.preTokenBalances && !sim.postTokenBalances) return null;
+  const sum = (list) => (list ?? []).filter((b) => b.mint === mint && b.owner === owner).reduce((acc, b) => acc + BigInt(b.amount), 0n);
+  return sum(sim.postTokenBalances) - sum(sim.preTokenBalances);
+}
+function readTradePtOut(data, amountIn) {
+  if (data.length === 16) {
+    const a = data.readBigUInt64LE(0);
+    const b = data.readBigUInt64LE(8);
+    if (a === amountIn) return b;
+    if (b === amountIn) return a;
+    return null;
+  }
+  if (data.length >= TRADE_PT_EVENT_AMOUNT_OUT_OFFSET + 8) {
+    return data.readBigUInt64LE(TRADE_PT_EVENT_AMOUNT_OUT_OFFSET);
   }
-  return data.readBigUInt64LE(offset);
+  return null;
 }
 async function quoteClmmTradeOut({
   connection,
+  simulateTx,
   clmm,
   amountInSyNative,
   payer
@@ -75646,21 +75613,20 @@ async function quoteClmmTradeOut({
     recentBlockhash: blockhash,
     instructions: [createPtAta, quoteIx]
   }).compileToV0Message([clmm.addressLookupTable]);
-  const sim = await connection.simulateTransaction(new web3_js.VersionedTransaction(message), {
-    sigVerify: false,
-    replaceRecentBlockhash: true
-  });
-  const rd = sim.value.returnData;
+  const sim = await simulateTx(new web3_js.VersionedTransaction(message));
   if (process.env.ROLL_DEBUG) {
-    console.error("[roll trade quote] err:", JSON.stringify(sim.value.err), "returnData?", !!rd);
+    console.error("[roll trade quote] err:", JSON.stringify(sim.err), "returnData?", !!sim.returnData);
   }
-  if (!rd?.data || rd.programId !== EXPONENT_CLMM_PROGRAM_ID.toBase58()) {
-    throw new Error(
-      `roll-pt: CLMM trade quote produced no return data (err=${JSON.stringify(sim.value.err)})`
-    );
+  const delta = tokenBalanceDelta(sim, clmm.pt.mint.toBase58(), trader.toBase58());
+  if (delta !== null && delta > 0n) return delta;
+  const rd = sim.returnData;
+  if (rd?.data && rd.programId === EXPONENT_CLMM_PROGRAM_ID.toBase58()) {
+    const out = readTradePtOut(buffer.Buffer.from(rd.data[0], rd.data[1]), amountInSyNative);
+    if (out !== null && out > 0n) return out;
   }
-  const data = Buffer.from(rd.data[0], rd.data[1]);
-  return readReturnU64(data, TRADE_PT_EVENT_AMOUNT_OUT_OFFSET, "trade_pt amount_out");
+  throw new Error(
+    `roll-pt: CLMM trade quote produced no readable output (err=${JSON.stringify(sim.err)})`
+  );
 }
 var MAX_BALANCES = 16;
 var DEFAULT_MAX_TRANSFER_POSITIONS = 5;
@@ -79821,7 +79787,7 @@ async function computeStakedBankMultipliers(stakedBanks, connection) {
     }
     const stakeLamports = poolStakeInfo.lamports;
     const supplyBuffer = lstMintInfo.data.slice(36, 44);
-    const lstMintSupply = Number(Buffer.from(supplyBuffer).readBigUInt64LE(0));
+    const lstMintSupply = Number(buffer.Buffer.from(supplyBuffer).readBigUInt64LE(0));
     if (lstMintSupply === 0) {
       multiplierByBank.set(bankAddr, new BigNumber3__default.default(1));
       continue;