@kamino-finance/klend-sdk 7.4.0-beta.0 → 7.4.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/@codegen/kvault/accounts/LendingMarket.d.ts +480 -0
- package/dist/@codegen/kvault/accounts/LendingMarket.d.ts.map +1 -0
- package/dist/@codegen/kvault/accounts/LendingMarket.js +480 -0
- package/dist/@codegen/kvault/accounts/LendingMarket.js.map +1 -0
- package/dist/@codegen/kvault/accounts/Obligation.d.ts +208 -0
- package/dist/@codegen/kvault/accounts/Obligation.d.ts.map +1 -0
- package/dist/@codegen/kvault/accounts/Obligation.js +298 -0
- package/dist/@codegen/kvault/accounts/Obligation.js.map +1 -0
- package/dist/@codegen/kvault/accounts/ReferrerTokenState.d.ts +51 -0
- package/dist/@codegen/kvault/accounts/ReferrerTokenState.d.ts.map +1 -0
- package/dist/@codegen/kvault/accounts/ReferrerTokenState.js +137 -0
- package/dist/@codegen/kvault/accounts/ReferrerTokenState.js.map +1 -0
- package/dist/@codegen/kvault/accounts/Reserve.d.ts +6 -0
- package/dist/@codegen/kvault/accounts/Reserve.d.ts.map +1 -1
- package/dist/@codegen/kvault/accounts/Reserve.js +9 -2
- package/dist/@codegen/kvault/accounts/Reserve.js.map +1 -1
- package/dist/@codegen/kvault/accounts/VaultState.d.ts +45 -3
- package/dist/@codegen/kvault/accounts/VaultState.d.ts.map +1 -1
- package/dist/@codegen/kvault/accounts/VaultState.js +28 -4
- package/dist/@codegen/kvault/accounts/VaultState.js.map +1 -1
- package/dist/@codegen/kvault/accounts/WithdrawTicket.d.ts +144 -0
- package/dist/@codegen/kvault/accounts/WithdrawTicket.d.ts.map +1 -0
- package/dist/@codegen/kvault/accounts/WithdrawTicket.js +205 -0
- package/dist/@codegen/kvault/accounts/WithdrawTicket.js.map +1 -0
- package/dist/@codegen/kvault/accounts/index.d.ts +8 -0
- package/dist/@codegen/kvault/accounts/index.d.ts.map +1 -1
- package/dist/@codegen/kvault/accounts/index.js +9 -1
- package/dist/@codegen/kvault/accounts/index.js.map +1 -1
- package/dist/@codegen/kvault/errors/custom.d.ts +81 -1
- package/dist/@codegen/kvault/errors/custom.d.ts.map +1 -1
- package/dist/@codegen/kvault/errors/custom.js +141 -1
- package/dist/@codegen/kvault/errors/custom.js.map +1 -1
- package/dist/@codegen/kvault/instructions/index.d.ts +4 -0
- package/dist/@codegen/kvault/instructions/index.d.ts.map +1 -1
- package/dist/@codegen/kvault/instructions/index.js +5 -1
- package/dist/@codegen/kvault/instructions/index.js.map +1 -1
- package/dist/@codegen/kvault/instructions/invest.d.ts +9 -0
- package/dist/@codegen/kvault/instructions/invest.d.ts.map +1 -1
- package/dist/@codegen/kvault/instructions/invest.js +7 -0
- package/dist/@codegen/kvault/instructions/invest.js.map +1 -1
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillOrder.d.ts +51 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillOrder.d.ts.map +1 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillOrder.js +154 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillOrder.js.map +1 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillWithdrawalTicket.d.ts +54 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillWithdrawalTicket.d.ts.map +1 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillWithdrawalTicket.js +166 -0
- package/dist/@codegen/kvault/instructions/investInVirtualReserveAndFillWithdrawalTicket.js.map +1 -0
- package/dist/@codegen/kvault/instructions/updateKlendQueueAccounting.d.ts +1 -0
- package/dist/@codegen/kvault/instructions/updateKlendQueueAccounting.d.ts.map +1 -0
- package/dist/@codegen/kvault/instructions/updateKlendQueueAccounting.js +72 -0
- package/dist/@codegen/kvault/instructions/updateKlendQueueAccounting.js.map +1 -0
- package/dist/@codegen/kvault/instructions/updateReserveAllocation.d.ts +3 -1
- package/dist/@codegen/kvault/instructions/updateReserveAllocation.d.ts.map +1 -1
- package/dist/@codegen/kvault/instructions/updateReserveAllocation.js +3 -0
- package/dist/@codegen/kvault/instructions/updateReserveAllocation.js.map +1 -1
- package/dist/@codegen/kvault/types/BorrowOrder.d.ts +192 -0
- package/dist/@codegen/kvault/types/BorrowOrder.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/BorrowOrder.js +194 -0
- package/dist/@codegen/kvault/types/BorrowOrder.js.map +1 -0
- package/dist/@codegen/kvault/types/ElevationGroup.d.ts +67 -0
- package/dist/@codegen/kvault/types/ElevationGroup.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/ElevationGroup.js +137 -0
- package/dist/@codegen/kvault/types/ElevationGroup.js.map +1 -0
- package/dist/@codegen/kvault/types/FixedTermBorrowRolloverConfig.d.ts +145 -0
- package/dist/@codegen/kvault/types/FixedTermBorrowRolloverConfig.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/FixedTermBorrowRolloverConfig.js +144 -0
- package/dist/@codegen/kvault/types/FixedTermBorrowRolloverConfig.js.map +1 -0
- package/dist/@codegen/kvault/types/ObligationCollateral.d.ts +72 -0
- package/dist/@codegen/kvault/types/ObligationCollateral.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/ObligationCollateral.js +119 -0
- package/dist/@codegen/kvault/types/ObligationCollateral.js.map +1 -0
- package/dist/@codegen/kvault/types/ObligationLiquidity.d.ts +143 -0
- package/dist/@codegen/kvault/types/ObligationLiquidity.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/ObligationLiquidity.js +165 -0
- package/dist/@codegen/kvault/types/ObligationLiquidity.js.map +1 -0
- package/dist/@codegen/kvault/types/ObligationOrder.d.ts +284 -0
- package/dist/@codegen/kvault/types/ObligationOrder.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/ObligationOrder.js +205 -0
- package/dist/@codegen/kvault/types/ObligationOrder.js.map +1 -0
- package/dist/@codegen/kvault/types/ReserveConfig.d.ts +60 -5
- package/dist/@codegen/kvault/types/ReserveConfig.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/ReserveConfig.js +36 -7
- package/dist/@codegen/kvault/types/ReserveConfig.js.map +1 -1
- package/dist/@codegen/kvault/types/ReserveLiquidity.d.ts +26 -8
- package/dist/@codegen/kvault/types/ReserveLiquidity.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/ReserveLiquidity.js +14 -8
- package/dist/@codegen/kvault/types/ReserveLiquidity.js.map +1 -1
- package/dist/@codegen/kvault/types/ReserveType.d.ts +32 -0
- package/dist/@codegen/kvault/types/ReserveType.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/ReserveType.js +108 -0
- package/dist/@codegen/kvault/types/ReserveType.js.map +1 -0
- package/dist/@codegen/kvault/types/VaultAllocation.d.ts +60 -0
- package/dist/@codegen/kvault/types/VaultAllocation.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/VaultAllocation.js +38 -2
- package/dist/@codegen/kvault/types/VaultAllocation.js.map +1 -1
- package/dist/@codegen/kvault/types/WithdrawQueue.d.ts +64 -0
- package/dist/@codegen/kvault/types/WithdrawQueue.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/WithdrawQueue.js +104 -0
- package/dist/@codegen/kvault/types/WithdrawQueue.js.map +1 -0
- package/dist/@codegen/kvault/types/WithdrawTicketProgressEvent.d.ts +19 -0
- package/dist/@codegen/kvault/types/WithdrawTicketProgressEvent.d.ts.map +1 -0
- package/dist/@codegen/kvault/types/WithdrawTicketProgressEvent.js +82 -0
- package/dist/@codegen/kvault/types/WithdrawTicketProgressEvent.js.map +1 -0
- package/dist/@codegen/kvault/types/index.d.ts +34 -0
- package/dist/@codegen/kvault/types/index.d.ts.map +1 -1
- package/dist/@codegen/kvault/types/index.js +19 -1
- package/dist/@codegen/kvault/types/index.js.map +1 -1
- package/dist/classes/action.d.ts +21 -91
- package/dist/classes/action.d.ts.map +1 -1
- package/dist/classes/action.js +141 -119
- package/dist/classes/action.js.map +1 -1
- package/dist/classes/actionTypes.d.ts +310 -0
- package/dist/classes/actionTypes.d.ts.map +1 -0
- package/dist/classes/actionTypes.js +3 -0
- package/dist/classes/actionTypes.js.map +1 -0
- package/dist/classes/market.d.ts +109 -15
- package/dist/classes/market.d.ts.map +1 -1
- package/dist/classes/market.js +186 -26
- package/dist/classes/market.js.map +1 -1
- package/dist/classes/obligation.d.ts +11 -11
- package/dist/classes/obligation.d.ts.map +1 -1
- package/dist/classes/obligation.js +56 -56
- package/dist/classes/obligation.js.map +1 -1
- package/dist/classes/obligationOrder.d.ts.map +1 -1
- package/dist/classes/obligationOrder.js +6 -3
- package/dist/classes/obligationOrder.js.map +1 -1
- package/dist/classes/reserve.d.ts +9 -1
- package/dist/classes/reserve.d.ts.map +1 -1
- package/dist/classes/reserve.js +20 -0
- package/dist/classes/reserve.js.map +1 -1
- package/dist/classes/shared.d.ts +1 -0
- package/dist/classes/shared.d.ts.map +1 -1
- package/dist/classes/utils.d.ts +2 -0
- package/dist/classes/utils.d.ts.map +1 -1
- package/dist/classes/utils.js +12 -1
- package/dist/classes/utils.js.map +1 -1
- package/dist/classes/vault.d.ts +4 -2
- package/dist/classes/vault.d.ts.map +1 -1
- package/dist/classes/vault.js +12 -2
- package/dist/classes/vault.js.map +1 -1
- package/dist/client/commands/borrow.d.ts +1 -1
- package/dist/client/commands/borrow.d.ts.map +1 -1
- package/dist/client/commands/borrow.js +11 -2
- package/dist/client/commands/borrow.js.map +1 -1
- package/dist/client/commands/deposit.d.ts +1 -1
- package/dist/client/commands/deposit.d.ts.map +1 -1
- package/dist/client/commands/deposit.js +11 -2
- package/dist/client/commands/deposit.js.map +1 -1
- package/dist/client/commands/printReserve.d.ts +1 -1
- package/dist/client/commands/printReserve.d.ts.map +1 -1
- package/dist/client/commands/printReserve.js +2 -4
- package/dist/client/commands/printReserve.js.map +1 -1
- package/dist/client/commands/repay.d.ts +1 -1
- package/dist/client/commands/repay.d.ts.map +1 -1
- package/dist/client/commands/repay.js +12 -2
- package/dist/client/commands/repay.js.map +1 -1
- package/dist/client/commands/withdraw.d.ts +1 -1
- package/dist/client/commands/withdraw.d.ts.map +1 -1
- package/dist/client/commands/withdraw.js +11 -2
- package/dist/client/commands/withdraw.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.d.ts +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_calcs.js +2 -2
- package/dist/lending_operations/repay_with_collateral_calcs.js.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.d.ts +4 -4
- package/dist/lending_operations/repay_with_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/repay_with_collateral_operations.js +43 -10
- package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.d.ts +4 -4
- package/dist/lending_operations/swap_collateral_operations.d.ts.map +1 -1
- package/dist/lending_operations/swap_collateral_operations.js +40 -21
- package/dist/lending_operations/swap_collateral_operations.js.map +1 -1
- package/dist/leverage/operations.d.ts +6 -6
- package/dist/leverage/operations.d.ts.map +1 -1
- package/dist/leverage/operations.js +167 -52
- package/dist/leverage/operations.js.map +1 -1
- package/dist/leverage/types.d.ts +2 -2
- package/dist/leverage/types.d.ts.map +1 -1
- package/dist/manager/client_kamino_manager.js +0 -2
- package/dist/manager/client_kamino_manager.js.map +1 -1
- package/dist/obligation_orders/price_based.js +5 -3
- package/dist/obligation_orders/price_based.js.map +1 -1
- package/dist/utils/ObligationType.d.ts +33 -1
- package/dist/utils/ObligationType.d.ts.map +1 -1
- package/dist/utils/ObligationType.js +81 -2
- package/dist/utils/ObligationType.js.map +1 -1
- package/dist/utils/ReserveKind.d.ts +57 -0
- package/dist/utils/ReserveKind.d.ts.map +1 -0
- package/dist/utils/ReserveKind.js +76 -0
- package/dist/utils/ReserveKind.js.map +1 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/userMetadata.d.ts +2 -2
- package/dist/utils/userMetadata.d.ts.map +1 -1
- package/dist/utils/userMetadata.js +49 -25
- package/dist/utils/userMetadata.js.map +1 -1
- package/dist/utils/validations.d.ts +1 -0
- package/dist/utils/validations.d.ts.map +1 -1
- package/dist/utils/validations.js +5 -0
- package/dist/utils/validations.js.map +1 -1
- package/dist/utils/vault.d.ts.map +1 -1
- package/dist/utils/vault.js +2 -0
- package/dist/utils/vault.js.map +1 -1
- package/package.json +1 -1
- package/src/@codegen/kvault/accounts/LendingMarket.ts +837 -0
- package/src/@codegen/kvault/accounts/Obligation.ts +459 -0
- package/src/@codegen/kvault/accounts/ReferrerTokenState.ts +160 -0
- package/src/@codegen/kvault/accounts/Reserve.ts +13 -2
- package/src/@codegen/kvault/accounts/VaultState.ts +59 -7
- package/src/@codegen/kvault/accounts/WithdrawTicket.ts +280 -0
- package/src/@codegen/kvault/accounts/index.ts +11 -0
- package/src/@codegen/kvault/errors/custom.ts +152 -0
- package/src/@codegen/kvault/instructions/index.ts +10 -0
- package/src/@codegen/kvault/instructions/invest.ts +16 -0
- package/src/@codegen/kvault/instructions/investInVirtualReserveAndFillOrder.ts +189 -0
- package/src/@codegen/kvault/instructions/investInVirtualReserveAndFillWithdrawalTicket.ts +205 -0
- package/src/@codegen/kvault/instructions/updateKlendQueueAccounting.ts +76 -0
- package/src/@codegen/kvault/instructions/updateReserveAllocation.ts +4 -1
- package/src/@codegen/kvault/types/BorrowOrder.ts +267 -0
- package/src/@codegen/kvault/types/ElevationGroup.ts +134 -0
- package/src/@codegen/kvault/types/FixedTermBorrowRolloverConfig.ts +199 -0
- package/src/@codegen/kvault/types/ObligationCollateral.ts +129 -0
- package/src/@codegen/kvault/types/ObligationLiquidity.ts +226 -0
- package/src/@codegen/kvault/types/ObligationOrder.ts +348 -0
- package/src/@codegen/kvault/types/ReserveConfig.ts +72 -9
- package/src/@codegen/kvault/types/ReserveLiquidity.ts +30 -12
- package/src/@codegen/kvault/types/ReserveType.ts +89 -0
- package/src/@codegen/kvault/types/VaultAllocation.ts +74 -2
- package/src/@codegen/kvault/types/WithdrawQueue.ts +117 -0
- package/src/@codegen/kvault/types/WithdrawTicketProgressEvent.ts +59 -0
- package/src/@codegen/kvault/types/index.ts +52 -0
- package/src/classes/action.ts +321 -347
- package/src/classes/actionTypes.ts +295 -0
- package/src/classes/manager.ts +1 -1
- package/src/classes/market.ts +232 -30
- package/src/classes/obligation.ts +62 -59
- package/src/classes/obligationOrder.ts +6 -3
- package/src/classes/reserve.ts +24 -0
- package/src/classes/shared.ts +2 -0
- package/src/classes/utils.ts +8 -0
- package/src/classes/vault.ts +35 -4
- package/src/client/client.ts +17 -18
- package/src/client/commands/borrow.ts +10 -9
- package/src/client/commands/deposit.ts +10 -9
- package/src/client/commands/printReserve.ts +2 -4
- package/src/client/commands/repay.ts +11 -10
- package/src/client/commands/withdraw.ts +15 -9
- package/src/idl/kvault.json +2336 -299
- package/src/lending_operations/repay_with_collateral_calcs.ts +3 -4
- package/src/lending_operations/repay_with_collateral_operations.ts +40 -38
- package/src/lending_operations/swap_collateral_operations.ts +47 -41
- package/src/leverage/operations.ts +168 -129
- package/src/leverage/types.ts +2 -2
- package/src/manager/client_kamino_manager.ts +0 -2
- package/src/obligation_orders/price_based.ts +7 -5
- package/src/utils/ObligationType.ts +92 -1
- package/src/utils/ReserveKind.ts +94 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/userMetadata.ts +64 -30
- package/src/utils/validations.ts +5 -0
- package/src/utils/vault.ts +2 -0
|
@@ -5,21 +5,22 @@ import { KaminoAction } from '../../classes';
|
|
|
5
5
|
import { Scope } from '@kamino-finance/scope-sdk';
|
|
6
6
|
import { CliEnv, SendTxMode } from '../tx/CliEnv';
|
|
7
7
|
import { processTx } from '../tx/processor';
|
|
8
|
+
import { address } from '@solana/kit';
|
|
8
9
|
|
|
9
|
-
export async function borrow(env: CliEnv, mode: SendTxMode,
|
|
10
|
+
export async function borrow(env: CliEnv, mode: SendTxMode, reserveAddress: string, borrowAmount: BN): Promise<void> {
|
|
10
11
|
const signer = await env.getSigner();
|
|
11
12
|
const programId = getProgramId('staging');
|
|
12
13
|
const kaminoMarket = await getMarket(env.c.rpc, programId);
|
|
13
14
|
const scope = new Scope('mainnet-beta', env.c.rpc);
|
|
14
|
-
const kaminoAction = await KaminoAction.buildBorrowTxns(
|
|
15
|
+
const kaminoAction = await KaminoAction.buildBorrowTxns({
|
|
15
16
|
kaminoMarket,
|
|
16
|
-
borrowAmount,
|
|
17
|
-
|
|
18
|
-
signer,
|
|
19
|
-
new VanillaObligation(STAGING_LENDING_MARKET),
|
|
20
|
-
true,
|
|
21
|
-
{ scope, scopeConfigurations: await scope.getAllConfigurations() }
|
|
22
|
-
);
|
|
17
|
+
amount: borrowAmount,
|
|
18
|
+
reserveAddress: address(reserveAddress),
|
|
19
|
+
owner: signer,
|
|
20
|
+
obligation: new VanillaObligation(STAGING_LENDING_MARKET),
|
|
21
|
+
useV2Ixs: true,
|
|
22
|
+
scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
|
|
23
|
+
});
|
|
23
24
|
console.log('User obligation', await kaminoAction.getObligationPda());
|
|
24
25
|
|
|
25
26
|
console.log('Borrow SetupIxs:', kaminoAction.setupIxsLabels);
|
|
@@ -5,21 +5,22 @@ import { Scope } from '@kamino-finance/scope-sdk';
|
|
|
5
5
|
import { CliEnv, SendTxMode } from '../tx/CliEnv';
|
|
6
6
|
import { getMarket, STAGING_LENDING_MARKET } from '../services/market';
|
|
7
7
|
import { processTx } from '../tx/processor';
|
|
8
|
+
import { address } from '@solana/kit';
|
|
8
9
|
|
|
9
|
-
export async function deposit(env: CliEnv, mode: SendTxMode,
|
|
10
|
+
export async function deposit(env: CliEnv, mode: SendTxMode, reserveAddress: string, depositAmount: BN): Promise<void> {
|
|
10
11
|
const signer = await env.getSigner();
|
|
11
12
|
const programId = getProgramId('staging');
|
|
12
13
|
const kaminoMarket = await getMarket(env.c.rpc, programId);
|
|
13
14
|
const scope = new Scope('mainnet-beta', env.c.rpc);
|
|
14
|
-
const kaminoAction = await KaminoAction.buildDepositTxns(
|
|
15
|
+
const kaminoAction = await KaminoAction.buildDepositTxns({
|
|
15
16
|
kaminoMarket,
|
|
16
|
-
depositAmount,
|
|
17
|
-
|
|
18
|
-
signer,
|
|
19
|
-
new VanillaObligation(STAGING_LENDING_MARKET),
|
|
20
|
-
true,
|
|
21
|
-
{ scope, scopeConfigurations: await scope.getAllConfigurations() }
|
|
22
|
-
);
|
|
17
|
+
amount: depositAmount,
|
|
18
|
+
reserveAddress: address(reserveAddress),
|
|
19
|
+
owner: signer,
|
|
20
|
+
obligation: new VanillaObligation(STAGING_LENDING_MARKET),
|
|
21
|
+
useV2Ixs: true,
|
|
22
|
+
scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
|
|
23
|
+
});
|
|
23
24
|
console.log('User obligation', await kaminoAction.getObligationPda());
|
|
24
25
|
|
|
25
26
|
console.log('Deposit SetupIxs:', kaminoAction.setupIxsLabels);
|
|
@@ -2,12 +2,10 @@ import { getProgramId } from '../../utils';
|
|
|
2
2
|
import { getMarket } from '../services/market';
|
|
3
3
|
import { address, Rpc, SolanaRpcApi } from '@solana/kit';
|
|
4
4
|
|
|
5
|
-
export async function printReserve(rpc: Rpc<SolanaRpcApi>, reserve
|
|
5
|
+
export async function printReserve(rpc: Rpc<SolanaRpcApi>, reserve: string): Promise<void> {
|
|
6
6
|
const programId = getProgramId('staging');
|
|
7
7
|
const kaminoMarket = await getMarket(rpc, programId);
|
|
8
|
-
const result = reserve
|
|
9
|
-
? kaminoMarket.getReserveByAddress(address(reserve))
|
|
10
|
-
: kaminoMarket.getReserveBySymbol(symbol!);
|
|
8
|
+
const result = kaminoMarket.getReserveByAddress(address(reserve));
|
|
11
9
|
console.log(result);
|
|
12
10
|
console.log(result?.stats?.reserveDepositLimit.toString());
|
|
13
11
|
}
|
|
@@ -5,22 +5,23 @@ import { KaminoAction } from '../../classes';
|
|
|
5
5
|
import { Scope } from '@kamino-finance/scope-sdk';
|
|
6
6
|
import { processTx } from '../tx/processor';
|
|
7
7
|
import { CliEnv, SendTxMode } from '../tx/CliEnv';
|
|
8
|
+
import { address } from '@solana/kit';
|
|
8
9
|
|
|
9
|
-
export async function repay(env: CliEnv, mode: SendTxMode,
|
|
10
|
+
export async function repay(env: CliEnv, mode: SendTxMode, reserveAddress: string, borrowAmount: BN): Promise<void> {
|
|
10
11
|
const signer = await env.getSigner();
|
|
11
12
|
const programId = getProgramId('staging');
|
|
12
13
|
const kaminoMarket = await getMarket(env.c.rpc, programId);
|
|
13
14
|
const scope = new Scope('mainnet-beta', env.c.rpc);
|
|
14
|
-
const kaminoAction = await KaminoAction.buildRepayTxns(
|
|
15
|
+
const kaminoAction = await KaminoAction.buildRepayTxns({
|
|
15
16
|
kaminoMarket,
|
|
16
|
-
borrowAmount,
|
|
17
|
-
|
|
18
|
-
signer,
|
|
19
|
-
new VanillaObligation(STAGING_LENDING_MARKET),
|
|
20
|
-
true,
|
|
21
|
-
{ scope, scopeConfigurations: await scope.getAllConfigurations() },
|
|
22
|
-
await env.c.rpc.getSlot().send()
|
|
23
|
-
);
|
|
17
|
+
amount: borrowAmount,
|
|
18
|
+
reserveAddress: address(reserveAddress),
|
|
19
|
+
owner: signer,
|
|
20
|
+
obligation: new VanillaObligation(STAGING_LENDING_MARKET),
|
|
21
|
+
useV2Ixs: true,
|
|
22
|
+
scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
|
|
23
|
+
currentSlot: await env.c.rpc.getSlot().send(),
|
|
24
|
+
});
|
|
24
25
|
console.log('User obligation', await kaminoAction.getObligationPda());
|
|
25
26
|
|
|
26
27
|
console.log('Repay SetupIxs:', kaminoAction.setupIxsLabels);
|
|
@@ -5,21 +5,27 @@ import { Scope } from '@kamino-finance/scope-sdk';
|
|
|
5
5
|
import { CliEnv, SendTxMode } from '../tx/CliEnv';
|
|
6
6
|
import { getMarket, STAGING_LENDING_MARKET } from '../services/market';
|
|
7
7
|
import { processTx } from '../tx/processor';
|
|
8
|
+
import { address } from '@solana/kit';
|
|
8
9
|
|
|
9
|
-
export async function withdraw(
|
|
10
|
+
export async function withdraw(
|
|
11
|
+
env: CliEnv,
|
|
12
|
+
mode: SendTxMode,
|
|
13
|
+
reserveAddress: string,
|
|
14
|
+
depositAmount: BN
|
|
15
|
+
): Promise<void> {
|
|
10
16
|
const signer = await env.getSigner();
|
|
11
17
|
const programId = getProgramId('staging');
|
|
12
18
|
const kaminoMarket = await getMarket(env.c.rpc, programId);
|
|
13
19
|
const scope = new Scope('mainnet-beta', env.c.rpc);
|
|
14
|
-
const kaminoAction = await KaminoAction.buildWithdrawTxns(
|
|
20
|
+
const kaminoAction = await KaminoAction.buildWithdrawTxns({
|
|
15
21
|
kaminoMarket,
|
|
16
|
-
depositAmount,
|
|
17
|
-
|
|
18
|
-
signer,
|
|
19
|
-
new VanillaObligation(STAGING_LENDING_MARKET),
|
|
20
|
-
true,
|
|
21
|
-
{ scope, scopeConfigurations: await scope.getAllConfigurations() }
|
|
22
|
-
);
|
|
22
|
+
amount: depositAmount,
|
|
23
|
+
reserveAddress: address(reserveAddress),
|
|
24
|
+
owner: signer,
|
|
25
|
+
obligation: new VanillaObligation(STAGING_LENDING_MARKET),
|
|
26
|
+
useV2Ixs: true,
|
|
27
|
+
scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
|
|
28
|
+
});
|
|
23
29
|
console.log('User obligation', await kaminoAction.getObligationPda());
|
|
24
30
|
|
|
25
31
|
console.log('Withdraw SetupIxs:', kaminoAction.setupIxsLabels);
|