@lavarage/sdk 8.0.6 → 8.0.8

package/crossbar.ts

@@ -15,12 +15,12 @@ export type ApiKeys = {
 export const SURGE_FEEDS = [
   {
     address: NATIVE_MINT.toBase58(),
-    feedId: '822512ee9add93518eca1c105a38422841a76c590db079eebb283deb2c14caa9',
+    feedId: '0x822512ee9add93518eca1c105a38422841a76c590db079eebb283deb2c14caa9',
     label: 'SOL-USD',
   },
   {
     address: USDC_MINT.toBase58(),
-    feedId: '883ea8295f70ae506e894679d124196bb07064ea530cefd835b58c33a5ab6549',
+    feedId: '0x883ea8295f70ae506e894679d124196bb07064ea530cefd835b58c33a5ab6549',
     label: 'USDC-USD',
   },
 ];

package/dist/index.js

@@ -7647,12 +7647,12 @@ function isSolProgram(program) {
 var SURGE_FEEDS = [
   {
     address: import_spl_token.NATIVE_MINT.toBase58(),
-    feedId: "822512ee9add93518eca1c105a38422841a76c590db079eebb283deb2c14caa9",
+    feedId: "0x822512ee9add93518eca1c105a38422841a76c590db079eebb283deb2c14caa9",
     label: "SOL-USD"
   },
   {
     address: USDC_MINT.toBase58(),
-    feedId: "883ea8295f70ae506e894679d124196bb07064ea530cefd835b58c33a5ab6549",
+    feedId: "0x883ea8295f70ae506e894679d124196bb07064ea530cefd835b58c33a5ab6549",
     label: "USDC-USD"
   }
 ];
@@ -9261,26 +9261,6 @@ function getPda(seed, programId) {
   const seedsBuffer = Array.isArray(seed) ? seed : [seed];
   return import_web33.PublicKey.findProgramAddressSync(seedsBuffer, programId)[0];
 }
-function idlAccountNamesToCamelCase(idl) {
-  if (idl === null || idl === void 0) return idl;
-  if (Array.isArray(idl)) return idl.map(idlAccountNamesToCamelCase);
-  if (typeof idl === "string") return idl;
-  if (typeof idl === "object") {
-    const out = {};
-    for (const [k, v] of Object.entries(idl)) {
-      let newV = idlAccountNamesToCamelCase(v);
-      if ((k === "name" || k === "path") && typeof newV === "string" && newV.includes("_")) {
-        newV = newV.split(".").map((s) => s.replace(/_([a-z])/g, (_, c) => c.toUpperCase())).join(".");
-      }
-      out[k] = newV;
-    }
-    return out;
-  }
-  return idl;
-}
-var LAVARAGE_USDC_IDL_CAMEL = idlAccountNamesToCamelCase(
-  lavarageUSDC_default
-);
 function getPositionAccountPDA(lavarageProgram, offer, seed) {
   return getPda(
     [
@@ -9661,7 +9641,9 @@ var borrowV2 = (lavarageProgram, offer, marginSOL, leverage, randomSeed, quoteTo
     ] : []
   ).instruction() : yield lavarageProgram.methods.tradingOpenBorrow(
     new import_anchor2.BN((marginSOL.toNumber() * leverage).toFixed(0)),
-    marginSOL
+    marginSOL,
+    null,
+    null
   ).accountsStrict({
     nodeWallet: offer.account.nodeWallet,
     instructions: import_web33.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -9990,7 +9972,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
   var _a;
   let partnerFeeMarkupAsPkey;
   const referralVaultProgram = new import_anchor2.Program(userVault_default, lavarageProgram.provider);
-  const program = new import_anchor2.Program(LAVARAGE_USDC_IDL_CAMEL, lavarageProgram.provider);
+  const program = new import_anchor2.Program(lavarageUSDC_default, lavarageProgram.provider);
   if (partnerFeeMarkup) {
     const feeBuffer = Buffer.alloc(8);
     feeBuffer.writeBigUInt64LE(BigInt(partnerFeeMarkup));
@@ -10003,7 +9985,6 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     offer,
     randomSeed.publicKey
   );
-  console.log("SDK: positionAccount", positionAccount.toBase58());
   const quoteMintAccount = (_a = optionalRPCResults == null ? void 0 : optionalRPCResults.quoteMintAccountInfo) != null ? _a : yield program.provider.connection.getAccountInfo(quoteToken);
   const quoteTokenProgram = quoteMintAccount == null ? void 0 : quoteMintAccount.owner;
   const fromTokenAccount = yield getTokenAccountOrCreateIfNotExists(
@@ -10141,41 +10122,6 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
       );
     }
   }
-  console.log("SDK: tradingOpenBorrowInstruction accounts", {
-    nodeWallet: offer.account.nodeWallet,
-    instructions: import_web33.SYSVAR_INSTRUCTIONS_PUBKEY,
-    tradingPool: offer.publicKey,
-    positionAccount,
-    trader: program.provider.publicKey,
-    systemProgram: import_web33.SystemProgram.programId,
-    clock: import_web33.SYSVAR_CLOCK_PUBKEY,
-    randomAccountAsId: randomSeed.publicKey.toBase58(),
-    feeTokenAccount: (0, import_spl_token3.getAssociatedTokenAddressSync)(
-      quoteToken,
-      new import_web33.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF"),
-      true,
-      quoteTokenProgram
-    ),
-    toTokenAccount: (0, import_spl_token3.getAssociatedTokenAddressSync)(
-      quoteToken,
-      program.provider.publicKey,
-      true,
-      quoteTokenProgram
-    ),
-    tokenProgram: quoteTokenProgram,
-    fromTokenAccount: (0, import_spl_token3.getAssociatedTokenAddressSync)(
-      quoteToken,
-      offer.account.nodeWallet,
-      true,
-      quoteTokenProgram
-    ),
-    positionTokenAccount: toTokenAccount.account.address,
-    collateralTokenProgram: tokenProgram,
-    associatedTokenProgram: import_spl_token3.ASSOCIATED_TOKEN_PROGRAM_ID,
-    collateralMint: offer.account.collateralType,
-    quoteMint: quoteToken,
-    feeRecipient: new import_web33.PublicKey("6JfTobDvwuwZxZP6FR5JPmjdvQ4h4MovkEVH2FPsMSrF")
-  });
   const updateOracleInstructions = yield getUpdateOracleIxs(
     // @ts-expect-error IDL mismatch
     program,
@@ -10238,7 +10184,9 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     ] : []
   ).instruction() : yield program.methods.tradingOpenBorrow(
     new import_anchor2.BN((marginSOL.toNumber() * leverage).toFixed(0)),
-    marginSOL
+    marginSOL,
+    null,
+    null
   ).accountsStrict({
     nodeWallet: offer.account.nodeWallet,
     instructions: import_web33.SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -10347,6 +10295,7 @@ var openTradeV2 = (lavarageProgram, offer, jupInstruction, marginSOL, leverage,
     // toTokenAccount.instruction!,
     partnerFeeRecipientVaultCreateIx,
     partnerFeeRecipientTokenAccountCreateIx,
+    ...updateOracleInstructions,
     tradingOpenBorrowInstruction,
     ...jupiterIxs,
     openAddCollateralInstruction,