@kamino-finance/klend-sdk 6.0.4 → 6.0.5-beta.1

package/dist/leverage/calcs.d.ts

@@ -1,4 +1,4 @@
-import { Address, Slot } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { Kamino, StrategyWithAddress, TokenAmounts } from '@kamino-finance/kliquidity-sdk';
 import { KaminoMarket, KaminoObligation, KaminoReserve } from '../classes';
@@ -14,9 +14,9 @@ export interface LeverageCalcsArgs {
     withdrawAmount: Decimal;
     deposited: Decimal;
     borrowed: Decimal;
-    debtTokenMint: Address;
-    selectedTokenMint: Address;
-    collTokenMint: Address;
+    debtTokenMint: PublicKey;
+    selectedTokenMint: PublicKey;
+    collTokenMint: PublicKey;
     targetLeverage: Decimal;
     activeLeverageOption: LeverageOption;
     flashLoanFeeRatio: Decimal;
@@ -32,7 +32,7 @@ export interface LeverageCalcsResult {
     netValueUsd: Decimal;
     ltv: Decimal;
 }
-export declare function calculateMultiplyEffects(getPriceByTokenMintDecimal: (mint: Address) => Promise<Decimal>, { depositAmount, withdrawAmount, deposited, borrowed, debtTokenMint, selectedTokenMint, collTokenMint, targetLeverage, activeLeverageOption, flashLoanFeeRatio, debtBorrowFactorPct, priceCollToDebt, priceDebtToColl, }: LeverageCalcsArgs, logEstimations?: boolean): Promise<LeverageCalcsResult>;
+export declare function calculateMultiplyEffects(getPriceByTokenMintDecimal: (mint: PublicKey | string) => Promise<Decimal>, { depositAmount, withdrawAmount, deposited, borrowed, debtTokenMint, selectedTokenMint, collTokenMint, targetLeverage, activeLeverageOption, flashLoanFeeRatio, debtBorrowFactorPct, priceCollToDebt, priceDebtToColl, }: LeverageCalcsArgs, logEstimations?: boolean): Promise<LeverageCalcsResult>;
 /**
  * returns how much borrowToken will be borrowed to reach leverage given initial collateral amount
  * @param depositTokenAmount
@@ -51,8 +51,8 @@ interface UseEstimateWithdrawAmountsProps {
     amount: Decimal.Value;
     deposited: Decimal;
     borrowed: Decimal;
-    collTokenMint: Address;
-    selectedTokenMint: Address;
+    collTokenMint: PublicKey;
+    selectedTokenMint: PublicKey;
 }
 export declare const estimateWithdrawMode: (props: UseEstimateWithdrawAmountsProps) => WithdrawResult;
 export interface WithdrawParams {
@@ -60,8 +60,8 @@ export interface WithdrawParams {
     currentDepositPosition: Decimal;
     priceCollToDebt: Decimal;
     withdrawAmount: Decimal;
-    selectedTokenMint: Address;
-    collTokenMint: Address;
+    selectedTokenMint: PublicKey;
+    collTokenMint: PublicKey;
 }
 interface WithdrawResult {
     adjustDepositPosition: Decimal;
@@ -70,8 +70,8 @@ interface WithdrawResult {
 export declare function calcWithdrawAmounts(params: WithdrawParams): WithdrawResult;
 interface UseEstimateAdjustAmountsProps {
     targetLeverage: Decimal;
-    debtTokenMint: Address;
-    collTokenMint: Address;
+    debtTokenMint: PublicKey;
+    collTokenMint: PublicKey;
     totalDeposited: Decimal;
     totalBorrowed: Decimal;
     flashLoanFee: Decimal;
@@ -110,8 +110,8 @@ interface UseTransactionInfoStats {
     priceDebtToColl: Decimal;
     amount: Decimal;
     targetLeverage: Decimal;
-    selectedTokenMint: Address;
-    collTokenMint: Address;
+    selectedTokenMint: PublicKey;
+    collTokenMint: PublicKey;
     flashLoanFee: Decimal;
     slippagePct?: Decimal;
 }
@@ -141,7 +141,7 @@ export declare const depositLeverageCalcs: (props: {
 export declare const depositLeverageKtokenCalcs: (props: {
     kamino: Kamino;
     strategy: StrategyWithAddress;
-    debtTokenMint: Address;
+    debtTokenMint: PublicKey;
     depositAmount: Decimal;
     depositTokenIsCollToken: boolean;
     depositTokenIsSol: boolean;
@@ -152,8 +152,8 @@ export declare const depositLeverageKtokenCalcs: (props: {
     priceAinB: PriceAinBProvider;
     strategyHoldings?: TokenAmounts;
 }) => Promise<DepositLeverageCalcsResult>;
-export declare function withdrawLeverageCalcs(market: KaminoMarket, collReserve: KaminoReserve, debtReserve: KaminoReserve, priceCollToDebt: Decimal, withdrawAmount: Decimal, deposited: Decimal, borrowed: Decimal, currentSlot: Slot, isClosingPosition: boolean, selectedTokenIsCollToken: boolean, selectedTokenMint: Address, obligation: KaminoObligation, flashLoanFee: Decimal, slippagePct: Decimal): WithdrawLeverageCalcsResult;
-export declare function adjustDepositLeverageCalcs(market: KaminoMarket, owner: Address, debtReserve: KaminoReserve, adjustDepositPosition: Decimal, adjustBorrowPosition: Decimal, priceDebtToColl: Decimal, flashLoanFee: Decimal, slippagePct: Decimal, collIsKtoken: boolean): Promise<AdjustLeverageCalcsResult>;
+export declare function withdrawLeverageCalcs(market: KaminoMarket, collReserve: KaminoReserve, debtReserve: KaminoReserve, priceCollToDebt: Decimal, withdrawAmount: Decimal, deposited: Decimal, borrowed: Decimal, currentSlot: number, isClosingPosition: boolean, selectedTokenIsCollToken: boolean, selectedTokenMint: PublicKey, obligation: KaminoObligation, flashLoanFee: Decimal, slippagePct: Decimal): WithdrawLeverageCalcsResult;
+export declare function adjustDepositLeverageCalcs(market: KaminoMarket, owner: PublicKey, debtReserve: KaminoReserve, adjustDepositPosition: Decimal, adjustBorrowPosition: Decimal, priceDebtToColl: Decimal, flashLoanFee: Decimal, slippagePct: Decimal, collIsKtoken: boolean): Promise<AdjustLeverageCalcsResult>;
 export declare function adjustWithdrawLeverageCalcs(adjustDepositPosition: Decimal, adjustBorrowPosition: Decimal, flashLoanFee: Decimal, slippagePct: Decimal): AdjustLeverageCalcsResult;
 export {};
 //# sourceMappingURL=calcs.d.ts.map

package/dist/leverage/calcs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calcs.d.ts","sourceRoot":"","sources":["../../src/leverage/calcs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAyB,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAClH,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAU,MAAM,YAAY,CAAC;AAEnF,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,iBAAiB,EACjB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAKjB,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,oBAAoB,EAAE,cAAc,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,wBAAwB,CAC5C,0BAA0B,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,EAC/D,EACE,aAAa,EACb,cAAc,EACd,SAAS,EACT,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,eAAe,GAChB,EAAE,iBAAiB,EACpB,cAAc,UAAQ,GACrB,OAAO,CAAC,mBAAmB,CAAC,CA8G9B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,6EAK9B;IACD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,YAWA,CAAC;AAEF,UAAU,+BAA+B;IACvC,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO,+BAA+B,mBAW1E,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAsC1E;AAED,UAAU,6BAA6B;IACrC,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAC7B,iBAAiB,OAAO,EACxB,iEAAiE,6BAA6B,yBAS/F,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,oBAAoB;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,YAAY,GACb,EAAE,oBAAoB,GAAG,oBAAoB,CAkB7C;AAED,UAAU,uBAAuB;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAID,eAAO,MAAM,mBAAmB,GAAI,4HASjC,uBAAuB;;;CAsBzB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,OAAO,EACnB,gBAAgB,CAAC,EAAE,YAAY,GAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAmDtC;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB,KAAG,0BAqDH,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAU,OAAO;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,KAAG,OAAO,CAAC,0BAA0B,CAyFrC,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,aAAa,EAC1B,WAAW,EAAE,aAAa,EAC1B,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,IAAI,EACjB,iBAAiB,EAAE,OAAO,EAC1B,wBAAwB,EAAE,OAAO,EACjC,iBAAiB,EAAE,OAAO,EAC1B,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,GACnB,2BAA2B,CAsD7B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,aAAa,EAC1B,qBAAqB,EAAE,OAAO,EAC9B,oBAAoB,EAAE,OAAO,EAC7B,eAAe,EAAE,OAAO,EACxB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,yBAAyB,CAAC,CA4BpC;AAED,wBAAgB,2BAA2B,CACzC,qBAAqB,EAAE,OAAO,EAC9B,oBAAoB,EAAE,OAAO,EAC7B,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,GACnB,yBAAyB,CAc3B"}
+{"version":3,"file":"calcs.d.ts","sourceRoot":"","sources":["../../src/leverage/calcs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAyB,MAAM,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAClH,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAU,MAAM,YAAY,CAAC;AAEnF,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAC1B,iBAAiB,EACjB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAKjB,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,oBAAoB,EAAE,cAAc,CAAC;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,wBAAwB,CAC5C,0BAA0B,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,EAC1E,EACE,aAAa,EACb,cAAc,EACd,SAAS,EACT,QAAQ,EACR,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,eAAe,GAChB,EAAE,iBAAiB,EACpB,cAAc,UAAQ,GACrB,OAAO,CAAC,mBAAmB,CAAC,CA8G9B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,gFAK1B;IACD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC5B,YAWA,CAAC;AAEF,UAAU,+BAA+B;IACvC,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,SAAS,CAAC;IACzB,iBAAiB,EAAE,SAAS,CAAC;CAC9B;AAED,eAAO,MAAM,oBAAoB,UAAW,+BAA+B,mBAW1E,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;CAC1B;AAED,UAAU,cAAc;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAuC1E;AAED,UAAU,6BAA6B;IACrC,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,aAAa,EAAE,SAAS,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,oBACZ,OAAO,mEACyC,6BAA6B,yBAS/F,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,sBAAsB,EAAE,OAAO,CAAC;IAChC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,oBAAoB;IAC5B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,YAAY,GACb,EAAE,oBAAoB,GAAG,oBAAoB,CAkB7C;AAED,UAAU,uBAAuB;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,aAAa,EAAE,SAAS,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAID,eAAO,MAAM,mBAAmB,+HAS7B,uBAAuB;;;CAsBzB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,OAAO,EACnB,gBAAgB,CAAC,EAAE,YAAY,GAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAmDtC;AAED,eAAO,MAAM,oBAAoB,UAAW;IAC1C,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB,KAAG,0BAqDH,CAAC;AAEF,eAAO,MAAM,0BAA0B,UAAiB;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,aAAa,EAAE,SAAS,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,iBAAiB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,KAAG,OAAO,CAAC,0BAA0B,CAwFrC,CAAC;AAEF,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,aAAa,EAC1B,WAAW,EAAE,aAAa,EAC1B,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,OAAO,EACjB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,OAAO,EAC1B,wBAAwB,EAAE,OAAO,EACjC,iBAAiB,EAAE,SAAS,EAC5B,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,GACnB,2BAA2B,CAsD7B;AAED,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,aAAa,EAC1B,qBAAqB,EAAE,OAAO,EAC9B,oBAAoB,EAAE,OAAO,EAC7B,eAAe,EAAE,OAAO,EACxB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,yBAAyB,CAAC,CA4BpC;AAED,wBAAgB,2BAA2B,CACzC,qBAAqB,EAAE,OAAO,EAC9B,oBAAoB,EAAE,OAAO,EAC7B,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,OAAO,GACnB,yBAAyB,CAc3B"}

package/dist/leverage/calcs.js

@@ -147,7 +147,9 @@ function calcWithdrawAmounts(params) {
     const currentNetPositionInCollateralToken = currentDepositInCollateralToken.minus(currentDebtInCollateralToken);
     const targetLeverage = currentDepositInCollateralToken.div(currentNetPositionInCollateralToken);
     const initialDepositInCollateralToken = currentDepositPosition.minus(currentBorrowPosition.div(priceCollToDebt));
-    const amountToWithdrawDepositToken = selectedTokenMint === collTokenMint ? withdrawAmount : withdrawAmount.div(priceCollToDebt);
+    const amountToWithdrawDepositToken = selectedTokenMint.equals(collTokenMint)
+        ? withdrawAmount
+        : withdrawAmount.div(priceCollToDebt);
     const targetDeposit = initialDepositInCollateralToken.minus(amountToWithdrawDepositToken).mul(targetLeverage);
     const targetBorrow = (0, exports.calcBorrowAmount)({
         depositTokenAmount: initialDepositInCollateralToken.minus(amountToWithdrawDepositToken),
@@ -208,7 +210,7 @@ function calcAdjustAmounts({ targetLeverage, currentBorrowPosition, currentDepos
 // Given a deposit amount of Deposit|Borrow token
 // and a target leverage, calculate final { collateral, debt } value
 const estimateDepositMode = ({ priceCollToDebt, priceDebtToColl, amount, targetLeverage, selectedTokenMint, collTokenMint, flashLoanFee, slippagePct = new decimal_js_1.default(0), }) => {
-    const isDepositingCollToken = selectedTokenMint === collTokenMint;
+    const isDepositingCollToken = selectedTokenMint.equals(collTokenMint);
     const finalCollTokenAmount = isDepositingCollToken
         ? new decimal_js_1.default(amount).mul(targetLeverage).toNumber()
         : new decimal_js_1.default(amount).mul(priceDebtToColl).mul(targetLeverage).toNumber();
@@ -355,9 +357,8 @@ const depositLeverageKtokenCalcs = async (props) => {
         // The actual amount of ktokens received may be less than the finalColl due to smart proportional contract logic
         // So we use the actualColl as the amount we will deposit
         const [estimatedA, estimatedB, actualColl] = await simulateMintKToken(kamino, strategy, finalColl, strategyHoldings);
-        const { tokenAMint, tokenBMint } = strategy.strategy;
-        const pxAinB = await priceAinB(tokenAMint, tokenBMint);
-        const isTokenADeposit = tokenAMint === debtTokenMint;
+        const pxAinB = await priceAinB(strategy.strategy.tokenAMint, strategy.strategy.tokenBMint);
+        const isTokenADeposit = strategy.strategy.tokenAMint.equals(debtTokenMint);
         // Calculate the amount we need to flash borrow by combining value of A and B into the debt token
         const singleSidedDepositAmount = isTokenADeposit
             ? estimatedA.add(estimatedB.div(pxAinB))
@@ -445,7 +446,7 @@ async function adjustDepositLeverageCalcs(market, owner, debtReserve, adjustDepo
         .mul(new decimal_js_1.default(1).plus(flashLoanFee))
         .mul(new decimal_js_1.default(new decimal_js_1.default(1).add(slippagePct.div(100))))
         .div(priceDebtToColl);
-    const expectedDebtTokenAtaBalance = await (0, utils_1.getExpectedTokenBalanceAfterBorrow)(market.getRpc(), debtReserve.getLiquidityMint(), owner, (0, kliquidity_sdk_1.collToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.state.liquidity.mintDecimals.toNumber());
+    const expectedDebtTokenAtaBalance = await (0, utils_1.getExpectedTokenBalanceAfterBorrow)(market.getConnection(), debtReserve.getLiquidityMint(), owner, (0, kliquidity_sdk_1.collToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.state.liquidity.mintDecimals.toNumber());
     return {
         adjustDepositPosition,
         adjustBorrowPosition,

package/dist/leverage/calcs.js.map

@@ -1 +1 @@
-{"version":3,"file":"calcs.js","sourceRoot":"","sources":["../../src/leverage/calcs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"calcs.js","sourceRoot":"","sources":["../../src/leverage/calcs.ts"],"names":[],"mappings":"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"}

package/dist/leverage/instructions.d.ts

@@ -1,42 +1,43 @@
-import { Address, Option, TransactionSigner } from '@solana/kit';
+import { PublicKey } from '@solana/web3.js';
+import * as anchor from '@coral-xyz/anchor';
 import { KaminoReserve } from '../classes';
 import Decimal from 'decimal.js';
 export declare const getFlashLoanInstructions: (args: {
     borrowIxIndex: number;
-    userTransferAuthority: TransactionSigner;
-    lendingMarketAuthority: Address;
-    lendingMarketAddress: Address;
+    walletPublicKey: PublicKey;
+    lendingMarketAuthority: PublicKey;
+    lendingMarketAddress: PublicKey;
     reserve: KaminoReserve;
     amountLamports: Decimal;
-    destinationAta: Address;
-    referrerAccount: Option<Address>;
-    referrerTokenState: Option<Address>;
-    programId: Address;
+    destinationAta: PublicKey;
+    referrerAccount: PublicKey;
+    referrerTokenState: PublicKey;
+    programId: PublicKey;
 }) => {
-    flashBorrowIx: import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>;
-    flashRepayIx: import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>;
+    flashBorrowIx: anchor.web3.TransactionInstruction;
+    flashRepayIx: anchor.web3.TransactionInstruction;
 };
-export declare const getBorrowFlashLoanInstruction: ({ userTransferAuthority, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, destinationAta, referrerAccount, referrerTokenState, programId, }: {
-    userTransferAuthority: TransactionSigner;
-    lendingMarketAuthority: Address;
-    lendingMarketAddress: Address;
+export declare const getBorrowFlashLoanInstruction: ({ walletPublicKey, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, destinationAta, referrerAccount, referrerTokenState, programId, }: {
+    walletPublicKey: PublicKey;
+    lendingMarketAuthority: PublicKey;
+    lendingMarketAddress: PublicKey;
     reserve: KaminoReserve;
     amountLamports: Decimal;
-    destinationAta: Address;
-    referrerAccount: Option<Address>;
-    referrerTokenState: Option<Address>;
-    programId: Address;
-}) => import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>;
-export declare const getRepayFlashLoanInstruction: ({ borrowIxIndex, userTransferAuthority, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, userSourceLiquidity, referrerAccount, referrerTokenState, programId, }: {
+    destinationAta: PublicKey;
+    referrerAccount: PublicKey;
+    referrerTokenState: PublicKey;
+    programId: PublicKey;
+}) => anchor.web3.TransactionInstruction;
+export declare const getRepayFlashLoanInstruction: ({ borrowIxIndex, walletPublicKey, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, userSourceLiquidity, referrerAccount, referrerTokenState, programId, }: {
     borrowIxIndex: number;
-    userTransferAuthority: TransactionSigner;
-    lendingMarketAuthority: Address;
-    lendingMarketAddress: Address;
+    walletPublicKey: PublicKey;
+    lendingMarketAuthority: PublicKey;
+    lendingMarketAddress: PublicKey;
     reserve: KaminoReserve;
     amountLamports: Decimal;
-    userSourceLiquidity: Address;
-    referrerAccount: Option<Address>;
-    referrerTokenState: Option<Address>;
-    programId: Address;
-}) => import("@solana/kit").IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>;
+    userSourceLiquidity: PublicKey;
+    referrerAccount: PublicKey;
+    referrerTokenState: PublicKey;
+    programId: PublicKey;
+}) => anchor.web3.TransactionInstruction;
 //# sourceMappingURL=instructions.d.ts.map

package/dist/leverage/instructions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/leverage/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAS3C,OAAO,OAAO,MAAM,YAAY,CAAC;AAIjC,eAAO,MAAM,wBAAwB,GAAI,MAAM;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,iBAAiB,CAAC;IACzC,sBAAsB,EAAE,OAAO,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;CACpB;;;CA0BA,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,mKAU3C;IACD,qBAAqB,EAAE,iBAAiB,CAAC;IACzC,sBAAsB,EAAE,OAAO,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;CACpB,mKAoBA,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,uLAW1C;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,iBAAiB,CAAC;IACzC,sBAAsB,EAAE,OAAO,CAAC;IAChC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACpC,SAAS,EAAE,OAAO,CAAC;CACpB,mKAsBA,CAAC"}
+{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/leverage/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAS3C,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,eAAO,MAAM,wBAAwB,SAAU;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,sBAAsB,EAAE,SAAS,CAAC;IAClC,oBAAoB,EAAE,SAAS,CAAC;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAC3B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACtB;;;CA0BA,CAAC;AAEF,eAAO,MAAM,6BAA6B,gKAUvC;IACD,eAAe,EAAE,SAAS,CAAC;IAC3B,sBAAsB,EAAE,SAAS,CAAC;IAClC,oBAAoB,EAAE,SAAS,CAAC;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAC3B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACtB,uCAoBA,CAAC;AAEF,eAAO,MAAM,4BAA4B,oLAWtC;IACD,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,sBAAsB,EAAE,SAAS,CAAC;IAClC,oBAAoB,EAAE,SAAS,CAAC;IAChC,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,eAAe,EAAE,SAAS,CAAC;IAC3B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,SAAS,EAAE,SAAS,CAAC;CACtB,uCAsBA,CAAC"}

package/dist/leverage/instructions.js

@@ -1,15 +1,45 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRepayFlashLoanInstruction = exports.getBorrowFlashLoanInstruction = exports.getFlashLoanInstructions = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const anchor = __importStar(require("@coral-xyz/anchor"));
 const lib_1 = require("../lib");
-const bn_js_1 = __importDefault(require("bn.js"));
-const sysvars_1 = require("@solana/sysvars");
 const getFlashLoanInstructions = (args) => {
     const flashBorrowIx = (0, exports.getBorrowFlashLoanInstruction)({
-        userTransferAuthority: args.userTransferAuthority,
+        walletPublicKey: args.walletPublicKey,
         lendingMarketAuthority: args.lendingMarketAuthority,
         lendingMarketAddress: args.lendingMarketAddress,
         reserve: args.reserve,
@@ -21,7 +51,7 @@ const getFlashLoanInstructions = (args) => {
     });
     const flashRepayIx = (0, exports.getRepayFlashLoanInstruction)({
         borrowIxIndex: args.borrowIxIndex,
-        userTransferAuthority: args.userTransferAuthority,
+        walletPublicKey: args.walletPublicKey,
         lendingMarketAuthority: args.lendingMarketAuthority,
         lendingMarketAddress: args.lendingMarketAddress,
         reserve: args.reserve,
@@ -34,34 +64,34 @@ const getFlashLoanInstructions = (args) => {
     return { flashBorrowIx, flashRepayIx };
 };
 exports.getFlashLoanInstructions = getFlashLoanInstructions;
-const getBorrowFlashLoanInstruction = ({ userTransferAuthority, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, destinationAta, referrerAccount, referrerTokenState, programId, }) => {
+const getBorrowFlashLoanInstruction = ({ walletPublicKey, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, destinationAta, referrerAccount, referrerTokenState, programId, }) => {
     const args = {
-        liquidityAmount: new bn_js_1.default(amountLamports.floor().toString()),
+        liquidityAmount: new anchor.BN(amountLamports.floor().toString()),
     };
     const accounts = {
-        userTransferAuthority,
-        lendingMarketAuthority,
+        userTransferAuthority: walletPublicKey,
+        lendingMarketAuthority: lendingMarketAuthority,
         lendingMarket: lendingMarketAddress,
         reserve: reserve.address,
         reserveLiquidityMint: reserve.getLiquidityMint(),
         reserveSourceLiquidity: reserve.state.liquidity.supplyVault,
         userDestinationLiquidity: destinationAta,
-        referrerAccount,
-        referrerTokenState,
+        referrerAccount: referrerAccount,
+        referrerTokenState: referrerTokenState,
         reserveLiquidityFeeReceiver: reserve.state.liquidity.feeVault,
-        sysvarInfo: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+        sysvarInfo: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         tokenProgram: reserve.getLiquidityTokenProgram(),
     };
     return (0, lib_1.flashBorrowReserveLiquidity)(args, accounts, programId);
 };
 exports.getBorrowFlashLoanInstruction = getBorrowFlashLoanInstruction;
-const getRepayFlashLoanInstruction = ({ borrowIxIndex, userTransferAuthority, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, userSourceLiquidity, referrerAccount, referrerTokenState, programId, }) => {
+const getRepayFlashLoanInstruction = ({ borrowIxIndex, walletPublicKey, lendingMarketAuthority, lendingMarketAddress, reserve, amountLamports, userSourceLiquidity, referrerAccount, referrerTokenState, programId, }) => {
     const args = {
         borrowInstructionIndex: borrowIxIndex,
-        liquidityAmount: new bn_js_1.default(amountLamports.floor().toString()),
+        liquidityAmount: new anchor.BN(amountLamports.floor().toString()),
     };
     const accounts = {
-        userTransferAuthority,
+        userTransferAuthority: walletPublicKey,
         lendingMarketAuthority: lendingMarketAuthority,
         lendingMarket: lendingMarketAddress,
         reserve: reserve.address,
@@ -71,7 +101,7 @@ const getRepayFlashLoanInstruction = ({ borrowIxIndex, userTransferAuthority, le
         referrerAccount: referrerAccount,
         referrerTokenState: referrerTokenState,
         reserveLiquidityFeeReceiver: reserve.state.liquidity.feeVault,
-        sysvarInfo: sysvars_1.SYSVAR_INSTRUCTIONS_ADDRESS,
+        sysvarInfo: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         tokenProgram: reserve.getLiquidityTokenProgram(),
     };
     return (0, lib_1.flashRepayReserveLiquidity)(args, accounts, programId);

package/dist/leverage/instructions.js.map

@@ -1 +1 @@
-{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/leverage/instructions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/leverage/instructions.ts"],"names":[],"mappings":"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"}

package/dist/leverage/operations.d.ts

@@ -1,4 +1,4 @@
-import { Address, IInstruction, Slot, Option, TransactionSigner } from '@solana/kit';
+import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { KaminoMarket, KaminoObligation, KaminoReserve } from '../classes';
 import { ObligationType, ScopePriceRefreshConfig } from '../utils';
 import { StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
@@ -15,17 +15,17 @@ export declare function getWithdrawWithLeverageSwapInputs<QuoteResponse>({ owner
     initialInputs: WithdrawLeverageInitialInputs<QuoteResponse>;
 }>;
 export declare function getWithdrawWithLeverageIxs<QuoteResponse>({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, swapper, useV2Ixs, }: WithdrawWithLeverageProps<QuoteResponse>): Promise<Array<WithdrawLeverageIxsResponse<QuoteResponse>>>;
-export declare function buildWithdrawWithLeverageIxs<QuoteResponse>(market: KaminoMarket, debtReserve: KaminoReserve, collReserve: KaminoReserve, owner: TransactionSigner, obligation: KaminoObligation, referrer: Option<Address>, currentSlot: Slot, isClosingPosition: boolean, depositTokenIsSol: boolean, scopeRefreshConfig: ScopePriceRefreshConfig | undefined, calcs: WithdrawLeverageCalcsResult, budgetAndPriorityFeeIxs: IInstruction[] | undefined, swapQuoteIxs: SwapIxs<QuoteResponse>, strategy: StrategyWithAddress | undefined, collIsKtoken: boolean, useV2Ixs: boolean): Promise<LeverageIxsOutput>;
+export declare function buildWithdrawWithLeverageIxs<QuoteResponse>(market: KaminoMarket, debtReserve: KaminoReserve, collReserve: KaminoReserve, owner: PublicKey, obligation: KaminoObligation, referrer: PublicKey, currentSlot: number, isClosingPosition: boolean, depositTokenIsSol: boolean, scopeRefreshConfig: ScopePriceRefreshConfig | undefined, calcs: WithdrawLeverageCalcsResult, budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined, swapQuoteIxs: SwapIxs<QuoteResponse>, strategy: StrategyWithAddress | undefined, collIsKtoken: boolean, useV2Ixs: boolean): Promise<LeverageIxsOutput>;
 export declare function getAdjustLeverageSwapInputs<QuoteResponse>({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }: AdjustLeverageSwapInputsProps<QuoteResponse>): Promise<{
     swapInputs: SwapInputs;
     flashLoanInfo: FlashLoanInfo;
     initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
 }>;
 export declare function getAdjustLeverageIxs<QuoteResponse>({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, }: AdjustLeverageProps<QuoteResponse>): Promise<Array<AdjustLeverageIxsResponse<QuoteResponse>>>;
-export declare const getSetupIxs: (owner: TransactionSigner, kaminoMarket: KaminoMarket, obligation: KaminoObligation | ObligationType | undefined, collTokenMint: Address, collReserve: KaminoReserve, collIsKtoken: boolean, debtTokenMint: Address, debtReserve: KaminoReserve, strategy: StrategyWithAddress | undefined, scopeRefreshConfig: ScopePriceRefreshConfig | undefined, budgetAndPriorityFeeIxs: IInstruction[] | undefined) => Promise<{
-    budgetIxs: IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>[];
-    createAtasIxs: IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>[];
-    scopeRefreshIx: IInstruction<string, readonly (import("@solana/kit").IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>[];
+export declare const getSetupIxs: (owner: PublicKey, kaminoMarket: KaminoMarket, obligation: KaminoObligation | ObligationType | undefined, collTokenMint: PublicKey, collReserve: KaminoReserve, collIsKtoken: boolean, debtTokenMint: PublicKey, debtReserve: KaminoReserve, strategy: StrategyWithAddress | undefined, scopeRefreshConfig: ScopePriceRefreshConfig | undefined, budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined) => Promise<{
+    budgetIxs: TransactionInstruction[];
+    createAtasIxs: TransactionInstruction[];
+    scopeRefreshIx: TransactionInstruction[];
 }>;
-export declare const getScopeRefreshIx: (market: KaminoMarket, collReserve: KaminoReserve, debtReserve: KaminoReserve, obligation: KaminoObligation | ObligationType | undefined, scopeRefreshConfig: ScopePriceRefreshConfig | undefined) => Promise<IInstruction[]>;
+export declare const getScopeRefreshIx: (market: KaminoMarket, collReserve: KaminoReserve, debtReserve: KaminoReserve, obligation: KaminoObligation | ObligationType | undefined, scopeRefreshConfig: ScopePriceRefreshConfig | undefined) => Promise<TransactionInstruction[]>;
 //# sourceMappingURL=operations.d.ts.map

package/dist/leverage/operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/leverage/operations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/leverage/operations.ts"],"names":[],"mappings":"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"}