@pyron-finance/pyron-client 2.8.0 → 2.8.2

package/dist/index.cjs

@@ -11392,13 +11392,13 @@ async function makePulseHealthIx(ldProgram, accounts, remainingAccounts = []) {
     lendrAccount: accounts.lendrAccount
   }).remainingAccounts(remainingAccounts).instruction();
 }
-async function makeHandleBankruptcyIx(ldProgram, accounts) {
+async function makeHandleBankruptcyIx(ldProgram, accounts, remainingAccounts = []) {
   const { bank, lendrAccount, tokenProgram, ...optionalAccounts } = accounts;
   return ldProgram.methods.lendingPoolHandleBankruptcy().accounts({
     bank,
     lendrAccount,
     tokenProgram
-  }).accountsPartial(optionalAccounts).instruction();
+  }).accountsPartial(optionalAccounts).remainingAccounts(remainingAccounts).instruction();
 }
 var instructions = {
   makeDepositIx,
@@ -23312,14 +23312,19 @@ var BankConfig = class _BankConfig {
 };
 
 // src/models/account/pure.ts
-function makeSessionWrapSolIxs(walletAddress, sessionKey, payer, amount, existingBalance) {
-  const nativeAmount = uiToNative(amount, 9).toNumber();
-  const TOKEN_ACCOUNT_RENT_EXEMPT = 2039280;
-  const existingBalanceNative = existingBalance ? uiToNative(existingBalance, 9).toNumber() : 0;
-  let totalAmount = nativeAmount;
-  if (existingBalanceNative < TOKEN_ACCOUNT_RENT_EXEMPT) {
-    const rentNeeded = Math.max(0, TOKEN_ACCOUNT_RENT_EXEMPT - existingBalanceNative);
-    totalAmount = nativeAmount + rentNeeded;
+var TOKEN_ACCOUNT_RENT_EXEMPT = 2039280;
+function makeSessionWrapSolIxs(walletAddress, sessionKey, amount, options) {
+  let totalAmount;
+  if (options?.wrapAmountUi !== void 0) {
+    totalAmount = uiToNative(options.wrapAmountUi, 9).toNumber();
+  } else {
+    const nativeAmount = uiToNative(amount, 9).toNumber();
+    const existingBalanceNative = options?.existingBalance ? uiToNative(options.existingBalance, 9).toNumber() : 0;
+    totalAmount = nativeAmount;
+    if (existingBalanceNative < TOKEN_ACCOUNT_RENT_EXEMPT) {
+      const rentNeeded = Math.max(0, TOKEN_ACCOUNT_RENT_EXEMPT - existingBalanceNative);
+      totalAmount = nativeAmount + rentNeeded;
+    }
   }
   return (0, import_sessions_sdk.createSessionWrapInstructions)(sessionKey, walletAddress, BigInt(totalAmount));
 }
@@ -23859,10 +23864,8 @@ var LendrAccount = class _LendrAccount {
       const wrapIxs = makeSessionWrapSolIxs(
         session.walletPublicKey,
         session.sessionPublicKey,
-        session.payer,
         wrapAmount,
-        wSolBalanceUi
-        // Pass existing balance to calculate rent correctly
+        { existingBalance: wSolBalanceUi }
       );
       depositIxs.push(...wrapIxs);
     }
@@ -23977,17 +23980,15 @@ var LendrAccount = class _LendrAccount {
     );
     if (bank.mint.equals(import_spl_token6.NATIVE_MINT)) {
       const wSolBalanceUi = opts.wSolBalanceUi ?? 0;
-      let wrapAmount = new import_bignumber14.default(amount).minus(wSolBalanceUi);
-      if (repayAll) {
-        wrapAmount = wrapAmount.plus(96071e-8);
-      }
+      const neededAmount = new import_bignumber14.default(amount).minus(wSolBalanceUi);
       const wrapIxs = makeSessionWrapSolIxs(
         session.walletPublicKey,
         session.sessionPublicKey,
-        session.payer,
-        wrapAmount,
-        wSolBalanceUi
-        // Pass existing balance to calculate rent correctly
+        neededAmount,
+        {
+          existingBalance: wSolBalanceUi,
+          wrapAmountUi: opts.wrapAmountUi
+        }
       );
       repayIxs.push(...wrapIxs);
     }
@@ -26513,12 +26514,25 @@ var LendrAccountWrapper = class _LendrAccountWrapper {
     if (!bank) throw Error(`Bank ${bankAddress.toBase58()} not found`);
     const mintData = this.client.mintDatas.get(bankAddress.toBase58());
     if (!mintData) throw Error(`Mint data for bank ${bankAddress.toBase58()} not found`);
-    const ix = await instructions_default.makeHandleBankruptcyIx(this._program, {
-      bank: bankAddress,
-      lendrAccount: this.address,
-      tokenProgram: mintData.tokenProgram,
-      group: this.client.group.address
-    });
+    const remainingAccounts = [];
+    for (const balance of this.activeBalances) {
+      const balBank = this.client.getBankByPk(balance.bankPk);
+      if (!balBank) continue;
+      remainingAccounts.push(
+        { pubkey: balBank.address, isSigner: false, isWritable: false },
+        { pubkey: balBank.config.oracleKeys[0], isSigner: false, isWritable: false }
+      );
+    }
+    const ix = await instructions_default.makeHandleBankruptcyIx(
+      this._program,
+      {
+        bank: bankAddress,
+        lendrAccount: this.address,
+        tokenProgram: mintData.tokenProgram,
+        group: this.client.group.address
+      },
+      remainingAccounts
+    );
     return {
       instructions: [ix],
       keys: []

package/dist/index.d.cts

@@ -448,6 +448,7 @@ interface MakeDepositWithSessionIxOpts extends MakeDepositIxOpts {
 interface MakeRepayIxOpts {
     wrapAndUnwrapSol?: boolean;
     wSolBalanceUi?: number;
+    wrapAmountUi?: number;
     overrideInferAccounts?: {
         group?: PublicKey;
         authority?: PublicKey;
@@ -3041,7 +3042,7 @@ declare function makeHandleBankruptcyIx(ldProgram: LendrProgram, accounts: {
     liquidityVault?: PublicKey;
     insuranceVault?: PublicKey;
     insuranceVaultAuthority?: PublicKey;
-}): Promise<_solana_web3_js.TransactionInstruction>;
+}, remainingAccounts?: AccountMeta[]): Promise<_solana_web3_js.TransactionInstruction>;
 declare const instructions: {
     makeDepositIx: typeof makeDepositIx;
     makeDepositWithSessionIx: typeof makeDepositWithSessionIx;

package/dist/index.d.ts

@@ -448,6 +448,7 @@ interface MakeDepositWithSessionIxOpts extends MakeDepositIxOpts {
 interface MakeRepayIxOpts {
     wrapAndUnwrapSol?: boolean;
     wSolBalanceUi?: number;
+    wrapAmountUi?: number;
     overrideInferAccounts?: {
         group?: PublicKey;
         authority?: PublicKey;
@@ -3041,7 +3042,7 @@ declare function makeHandleBankruptcyIx(ldProgram: LendrProgram, accounts: {
     liquidityVault?: PublicKey;
     insuranceVault?: PublicKey;
     insuranceVaultAuthority?: PublicKey;
-}): Promise<_solana_web3_js.TransactionInstruction>;
+}, remainingAccounts?: AccountMeta[]): Promise<_solana_web3_js.TransactionInstruction>;
 declare const instructions: {
     makeDepositIx: typeof makeDepositIx;
     makeDepositWithSessionIx: typeof makeDepositWithSessionIx;

package/dist/index.js

@@ -11181,13 +11181,13 @@ async function makePulseHealthIx(ldProgram, accounts, remainingAccounts = []) {
     lendrAccount: accounts.lendrAccount
   }).remainingAccounts(remainingAccounts).instruction();
 }
-async function makeHandleBankruptcyIx(ldProgram, accounts) {
+async function makeHandleBankruptcyIx(ldProgram, accounts, remainingAccounts = []) {
   const { bank, lendrAccount, tokenProgram, ...optionalAccounts } = accounts;
   return ldProgram.methods.lendingPoolHandleBankruptcy().accounts({
     bank,
     lendrAccount,
     tokenProgram
-  }).accountsPartial(optionalAccounts).instruction();
+  }).accountsPartial(optionalAccounts).remainingAccounts(remainingAccounts).instruction();
 }
 var instructions = {
   makeDepositIx,
@@ -23135,14 +23135,19 @@ var BankConfig = class _BankConfig {
 };
 
 // src/models/account/pure.ts
-function makeSessionWrapSolIxs(walletAddress, sessionKey, payer, amount, existingBalance) {
-  const nativeAmount = uiToNative(amount, 9).toNumber();
-  const TOKEN_ACCOUNT_RENT_EXEMPT = 2039280;
-  const existingBalanceNative = existingBalance ? uiToNative(existingBalance, 9).toNumber() : 0;
-  let totalAmount = nativeAmount;
-  if (existingBalanceNative < TOKEN_ACCOUNT_RENT_EXEMPT) {
-    const rentNeeded = Math.max(0, TOKEN_ACCOUNT_RENT_EXEMPT - existingBalanceNative);
-    totalAmount = nativeAmount + rentNeeded;
+var TOKEN_ACCOUNT_RENT_EXEMPT = 2039280;
+function makeSessionWrapSolIxs(walletAddress, sessionKey, amount, options) {
+  let totalAmount;
+  if (options?.wrapAmountUi !== void 0) {
+    totalAmount = uiToNative(options.wrapAmountUi, 9).toNumber();
+  } else {
+    const nativeAmount = uiToNative(amount, 9).toNumber();
+    const existingBalanceNative = options?.existingBalance ? uiToNative(options.existingBalance, 9).toNumber() : 0;
+    totalAmount = nativeAmount;
+    if (existingBalanceNative < TOKEN_ACCOUNT_RENT_EXEMPT) {
+      const rentNeeded = Math.max(0, TOKEN_ACCOUNT_RENT_EXEMPT - existingBalanceNative);
+      totalAmount = nativeAmount + rentNeeded;
+    }
   }
   return createSessionWrapInstructions(sessionKey, walletAddress, BigInt(totalAmount));
 }
@@ -23682,10 +23687,8 @@ var LendrAccount = class _LendrAccount {
       const wrapIxs = makeSessionWrapSolIxs(
         session.walletPublicKey,
         session.sessionPublicKey,
-        session.payer,
         wrapAmount,
-        wSolBalanceUi
-        // Pass existing balance to calculate rent correctly
+        { existingBalance: wSolBalanceUi }
       );
       depositIxs.push(...wrapIxs);
     }
@@ -23800,17 +23803,15 @@ var LendrAccount = class _LendrAccount {
     );
     if (bank.mint.equals(NATIVE_MINT2)) {
       const wSolBalanceUi = opts.wSolBalanceUi ?? 0;
-      let wrapAmount = new BigNumber14(amount).minus(wSolBalanceUi);
-      if (repayAll) {
-        wrapAmount = wrapAmount.plus(96071e-8);
-      }
+      const neededAmount = new BigNumber14(amount).minus(wSolBalanceUi);
       const wrapIxs = makeSessionWrapSolIxs(
         session.walletPublicKey,
         session.sessionPublicKey,
-        session.payer,
-        wrapAmount,
-        wSolBalanceUi
-        // Pass existing balance to calculate rent correctly
+        neededAmount,
+        {
+          existingBalance: wSolBalanceUi,
+          wrapAmountUi: opts.wrapAmountUi
+        }
       );
       repayIxs.push(...wrapIxs);
     }
@@ -26355,12 +26356,25 @@ var LendrAccountWrapper = class _LendrAccountWrapper {
     if (!bank) throw Error(`Bank ${bankAddress.toBase58()} not found`);
     const mintData = this.client.mintDatas.get(bankAddress.toBase58());
     if (!mintData) throw Error(`Mint data for bank ${bankAddress.toBase58()} not found`);
-    const ix = await instructions_default.makeHandleBankruptcyIx(this._program, {
-      bank: bankAddress,
-      lendrAccount: this.address,
-      tokenProgram: mintData.tokenProgram,
-      group: this.client.group.address
-    });
+    const remainingAccounts = [];
+    for (const balance of this.activeBalances) {
+      const balBank = this.client.getBankByPk(balance.bankPk);
+      if (!balBank) continue;
+      remainingAccounts.push(
+        { pubkey: balBank.address, isSigner: false, isWritable: false },
+        { pubkey: balBank.config.oracleKeys[0], isSigner: false, isWritable: false }
+      );
+    }
+    const ix = await instructions_default.makeHandleBankruptcyIx(
+      this._program,
+      {
+        bank: bankAddress,
+        lendrAccount: this.address,
+        tokenProgram: mintData.tokenProgram,
+        group: this.client.group.address
+      },
+      remainingAccounts
+    );
     return {
       instructions: [ix],
       keys: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyron-finance/pyron-client",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "keywords": [],
   "license": "MIT",
   "type": "module",