@kamino-finance/klend-sdk 7.3.10-beta.0 → 7.3.10-beta.1

package/dist/client/commands/deposit.d.ts

@@ -1,4 +1,4 @@
 import BN from 'bn.js';
 import { CliEnv, SendTxMode } from '../tx/CliEnv';
-export declare function deposit(env: CliEnv, mode: SendTxMode, token: string, depositAmount: BN): Promise<void>;
+export declare function deposit(env: CliEnv, mode: SendTxMode, reserveAddress: string, depositAmount: BN): Promise<void>;
 //# sourceMappingURL=deposit.d.ts.map

package/dist/client/commands/deposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../../src/client/commands/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAIlD,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB5G"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../../src/client/commands/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAKlD,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBrH"}

package/dist/client/commands/deposit.js

@@ -6,12 +6,21 @@ const classes_1 = require("../../classes");
 const scope_sdk_1 = require("@kamino-finance/scope-sdk");
 const market_1 = require("../services/market");
 const processor_1 = require("../tx/processor");
-async function deposit(env, mode, token, depositAmount) {
+const kit_1 = require("@solana/kit");
+async function deposit(env, mode, reserveAddress, depositAmount) {
     const signer = await env.getSigner();
     const programId = (0, utils_1.getProgramId)('staging');
     const kaminoMarket = await (0, market_1.getMarket)(env.c.rpc, programId);
     const scope = new scope_sdk_1.Scope('mainnet-beta', env.c.rpc);
-    const kaminoAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, depositAmount, kaminoMarket.getReserveBySymbol(token).getLiquidityMint(), signer, new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET), true, { scope, scopeConfigurations: await scope.getAllConfigurations() });
+    const kaminoAction = await classes_1.KaminoAction.buildDepositTxns({
+        kaminoMarket,
+        amount: depositAmount,
+        reserveAddress: (0, kit_1.address)(reserveAddress),
+        owner: signer,
+        obligation: new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET),
+        useV2Ixs: true,
+        scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
+    });
     console.log('User obligation', await kaminoAction.getObligationPda());
     console.log('Deposit SetupIxs:', kaminoAction.setupIxsLabels);
     console.log('Deposit LendingIxs:', kaminoAction.lendingIxsLabels);

package/dist/client/commands/deposit.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/client/commands/deposit.ts"],"names":[],"mappings":";;AAQA,0BAoBC;AA3BD,uCAA8D;AAC9D,2CAA6C;AAC7C,yDAAkD;AAElD,+CAAuE;AACvE,+CAA4C;AAErC,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,IAAgB,EAAE,KAAa,EAAE,aAAiB;IAC3F,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,gBAAgB,CACtD,YAAY,EACZ,aAAa,EACb,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAE,CAAC,gBAAgB,EAAE,EAC1D,MAAM,EACN,IAAI,yBAAiB,CAAC,+BAAsB,CAAC,EAC7C,IAAI,EACJ,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE,CACnE,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAClE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/client/commands/deposit.ts"],"names":[],"mappings":";;AASA,0BAoBC;AA5BD,uCAA8D;AAC9D,2CAA6C;AAC7C,yDAAkD;AAElD,+CAAuE;AACvE,+CAA4C;AAC5C,qCAAsC;AAE/B,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,IAAgB,EAAE,cAAsB,EAAE,aAAiB;IACpG,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,gBAAgB,CAAC;QACvD,YAAY;QACZ,MAAM,EAAE,aAAa;QACrB,cAAc,EAAE,IAAA,aAAO,EAAC,cAAc,CAAC;QACvC,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,IAAI,yBAAiB,CAAC,+BAAsB,CAAC;QACzD,QAAQ,EAAE,IAAI;QACd,kBAAkB,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE;KACvF,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAClE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}

package/dist/client/commands/printReserve.d.ts

@@ -1,3 +1,3 @@
 import { Rpc, SolanaRpcApi } from '@solana/kit';
-export declare function printReserve(rpc: Rpc<SolanaRpcApi>, reserve?: string, symbol?: string): Promise<void>;
+export declare function printReserve(rpc: Rpc<SolanaRpcApi>, reserve: string): Promise<void>;
 //# sourceMappingURL=printReserve.d.ts.map

package/dist/client/commands/printReserve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"printReserve.d.ts","sourceRoot":"","sources":["../../../src/client/commands/printReserve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEzD,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ3G"}
+{"version":3,"file":"printReserve.d.ts","sourceRoot":"","sources":["../../../src/client/commands/printReserve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEzD,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMzF"}

package/dist/client/commands/printReserve.js

@@ -4,12 +4,10 @@ exports.printReserve = printReserve;
 const utils_1 = require("../../utils");
 const market_1 = require("../services/market");
 const kit_1 = require("@solana/kit");
-async function printReserve(rpc, reserve, symbol) {
+async function printReserve(rpc, reserve) {
     const programId = (0, utils_1.getProgramId)('staging');
     const kaminoMarket = await (0, market_1.getMarket)(rpc, programId);
-    const result = reserve
-        ? kaminoMarket.getReserveByAddress((0, kit_1.address)(reserve))
-        : kaminoMarket.getReserveBySymbol(symbol);
+    const result = kaminoMarket.getReserveByAddress((0, kit_1.address)(reserve));
     console.log(result);
     console.log(result?.stats?.reserveDepositLimit.toString());
 }

package/dist/client/commands/printReserve.js.map

@@ -1 +1 @@
-{"version":3,"file":"printReserve.js","sourceRoot":"","sources":["../../../src/client/commands/printReserve.ts"],"names":[],"mappings":";;AAIA,oCAQC;AAZD,uCAA2C;AAC3C,+CAA+C;AAC/C,qCAAyD;AAElD,KAAK,UAAU,YAAY,CAAC,GAAsB,EAAE,OAAgB,EAAE,MAAe;IAC1F,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,OAAO;QACpB,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAA,aAAO,EAAC,OAAO,CAAC,CAAC;QACpD,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAAC,MAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC7D,CAAC"}
+{"version":3,"file":"printReserve.js","sourceRoot":"","sources":["../../../src/client/commands/printReserve.ts"],"names":[],"mappings":";;AAIA,oCAMC;AAVD,uCAA2C;AAC3C,+CAA+C;AAC/C,qCAAyD;AAElD,KAAK,UAAU,YAAY,CAAC,GAAsB,EAAE,OAAe;IACxE,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,YAAY,CAAC,mBAAmB,CAAC,IAAA,aAAO,EAAC,OAAO,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC7D,CAAC"}

package/dist/client/commands/repay.d.ts

@@ -1,4 +1,4 @@
 import BN from 'bn.js';
 import { CliEnv, SendTxMode } from '../tx/CliEnv';
-export declare function repay(env: CliEnv, mode: SendTxMode, token: string, borrowAmount: BN): Promise<void>;
+export declare function repay(env: CliEnv, mode: SendTxMode, reserveAddress: string, borrowAmount: BN): Promise<void>;
 //# sourceMappingURL=repay.d.ts.map

package/dist/client/commands/repay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repay.d.ts","sourceRoot":"","sources":["../../../src/client/commands/repay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAMvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAElD,wBAAsB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBzG"}
+{"version":3,"file":"repay.d.ts","sourceRoot":"","sources":["../../../src/client/commands/repay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAMvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGlD,wBAAsB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqBlH"}

package/dist/client/commands/repay.js

@@ -6,12 +6,22 @@ const market_1 = require("../services/market");
 const classes_1 = require("../../classes");
 const scope_sdk_1 = require("@kamino-finance/scope-sdk");
 const processor_1 = require("../tx/processor");
-async function repay(env, mode, token, borrowAmount) {
+const kit_1 = require("@solana/kit");
+async function repay(env, mode, reserveAddress, borrowAmount) {
     const signer = await env.getSigner();
     const programId = (0, utils_1.getProgramId)('staging');
     const kaminoMarket = await (0, market_1.getMarket)(env.c.rpc, programId);
     const scope = new scope_sdk_1.Scope('mainnet-beta', env.c.rpc);
-    const kaminoAction = await classes_1.KaminoAction.buildRepayTxns(kaminoMarket, borrowAmount, kaminoMarket.getReserveBySymbol(token).getLiquidityMint(), signer, new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET), true, { scope, scopeConfigurations: await scope.getAllConfigurations() }, await env.c.rpc.getSlot().send());
+    const kaminoAction = await classes_1.KaminoAction.buildRepayTxns({
+        kaminoMarket,
+        amount: borrowAmount,
+        reserveAddress: (0, kit_1.address)(reserveAddress),
+        owner: signer,
+        obligation: new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET),
+        useV2Ixs: true,
+        scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
+        currentSlot: await env.c.rpc.getSlot().send(),
+    });
     console.log('User obligation', await kaminoAction.getObligationPda());
     console.log('Repay SetupIxs:', kaminoAction.setupIxsLabels);
     console.log('Repay LendingIxs:', kaminoAction.lendingIxsLabels);

package/dist/client/commands/repay.js.map

@@ -1 +1 @@
-{"version":3,"file":"repay.js","sourceRoot":"","sources":["../../../src/client/commands/repay.ts"],"names":[],"mappings":";;AAQA,sBAqBC;AA5BD,uCAA8D;AAC9D,+CAAuE;AACvE,2CAA6C;AAC7C,yDAAkD;AAClD,+CAA4C;AAGrC,KAAK,UAAU,KAAK,CAAC,GAAW,EAAE,IAAgB,EAAE,KAAa,EAAE,YAAgB;IACxF,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,cAAc,CACpD,YAAY,EACZ,YAAY,EACZ,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAE,CAAC,gBAAgB,EAAE,EAC1D,MAAM,EACN,IAAI,yBAAiB,CAAC,+BAAsB,CAAC,EAC7C,IAAI,EACJ,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE,EAClE,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CACjC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"repay.js","sourceRoot":"","sources":["../../../src/client/commands/repay.ts"],"names":[],"mappings":";;AASA,sBAqBC;AA7BD,uCAA8D;AAC9D,+CAAuE;AACvE,2CAA6C;AAC7C,yDAAkD;AAClD,+CAA4C;AAE5C,qCAAsC;AAE/B,KAAK,UAAU,KAAK,CAAC,GAAW,EAAE,IAAgB,EAAE,cAAsB,EAAE,YAAgB;IACjG,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,cAAc,CAAC;QACrD,YAAY;QACZ,MAAM,EAAE,YAAY;QACpB,cAAc,EAAE,IAAA,aAAO,EAAC,cAAc,CAAC;QACvC,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,IAAI,yBAAiB,CAAC,+BAAsB,CAAC;QACzD,QAAQ,EAAE,IAAI;QACd,kBAAkB,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE;QACtF,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE;KAC9C,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}

package/dist/client/commands/withdraw.d.ts

@@ -1,4 +1,4 @@
 import BN from 'bn.js';
 import { CliEnv, SendTxMode } from '../tx/CliEnv';
-export declare function withdraw(env: CliEnv, mode: SendTxMode, token: string, depositAmount: BN): Promise<void>;
+export declare function withdraw(env: CliEnv, mode: SendTxMode, reserveAddress: string, depositAmount: BN): Promise<void>;
 //# sourceMappingURL=withdraw.d.ts.map

package/dist/client/commands/withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../../src/client/commands/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAIlD,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB7G"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../../src/client/commands/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,OAAO,CAAC;AAIvB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAKlD,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,EAChB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAoBf"}

package/dist/client/commands/withdraw.js

@@ -6,12 +6,21 @@ const classes_1 = require("../../classes");
 const scope_sdk_1 = require("@kamino-finance/scope-sdk");
 const market_1 = require("../services/market");
 const processor_1 = require("../tx/processor");
-async function withdraw(env, mode, token, depositAmount) {
+const kit_1 = require("@solana/kit");
+async function withdraw(env, mode, reserveAddress, depositAmount) {
     const signer = await env.getSigner();
     const programId = (0, utils_1.getProgramId)('staging');
     const kaminoMarket = await (0, market_1.getMarket)(env.c.rpc, programId);
     const scope = new scope_sdk_1.Scope('mainnet-beta', env.c.rpc);
-    const kaminoAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, depositAmount, kaminoMarket.getReserveBySymbol(token).getLiquidityMint(), signer, new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET), true, { scope, scopeConfigurations: await scope.getAllConfigurations() });
+    const kaminoAction = await classes_1.KaminoAction.buildWithdrawTxns({
+        kaminoMarket,
+        amount: depositAmount,
+        reserveAddress: (0, kit_1.address)(reserveAddress),
+        owner: signer,
+        obligation: new utils_1.VanillaObligation(market_1.STAGING_LENDING_MARKET),
+        useV2Ixs: true,
+        scopeRefreshConfig: { scope, scopeConfigurations: await scope.getAllConfigurations() },
+    });
     console.log('User obligation', await kaminoAction.getObligationPda());
     console.log('Withdraw SetupIxs:', kaminoAction.setupIxsLabels);
     console.log('Withdraw LendingIxs:', kaminoAction.lendingIxsLabels);

package/dist/client/commands/withdraw.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/client/commands/withdraw.ts"],"names":[],"mappings":";;AAQA,4BAoBC;AA3BD,uCAA8D;AAC9D,2CAA6C;AAC7C,yDAAkD;AAElD,+CAAuE;AACvE,+CAA4C;AAErC,KAAK,UAAU,QAAQ,CAAC,GAAW,EAAE,IAAgB,EAAE,KAAa,EAAE,aAAiB;IAC5F,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,iBAAiB,CACvD,YAAY,EACZ,aAAa,EACb,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAE,CAAC,gBAAgB,EAAE,EAC1D,MAAM,EACN,IAAI,yBAAiB,CAAC,+BAAsB,CAAC,EAC7C,IAAI,EACJ,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE,CACnE,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACnE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/client/commands/withdraw.ts"],"names":[],"mappings":";;AASA,4BAyBC;AAjCD,uCAA8D;AAC9D,2CAA6C;AAC7C,yDAAkD;AAElD,+CAAuE;AACvE,+CAA4C;AAC5C,qCAAsC;AAE/B,KAAK,UAAU,QAAQ,CAC5B,GAAW,EACX,IAAgB,EAChB,cAAsB,EACtB,aAAiB;IAEjB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,iBAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,iBAAiB,CAAC;QACxD,YAAY;QACZ,MAAM,EAAE,aAAa;QACrB,cAAc,EAAE,IAAA,aAAO,EAAC,cAAc,CAAC;QACvC,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,IAAI,yBAAiB,CAAC,+BAAsB,CAAC;QACzD,QAAQ,EAAE,IAAI;QACd,kBAAkB,EAAE,EAAE,KAAK,EAAE,mBAAmB,EAAE,MAAM,KAAK,CAAC,oBAAoB,EAAE,EAAE;KACvF,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAEtE,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACnE,MAAM,IAAA,qBAAS,EAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,sBAAY,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;AAC/E,CAAC"}

package/dist/lending_operations/repay_with_collateral_calcs.d.ts

@@ -25,7 +25,7 @@ export declare function estimateDebtRepaymentWithColl(props: {
     slippagePct: Decimal;
     flashLoanFeePct: Decimal;
     kaminoMarket: KaminoMarket;
-    debtTokenMint: Address;
+    debtReserveAddress: Address;
     obligation: KaminoObligation;
     currentSlot: Slot;
 }): Decimal;

package/dist/lending_operations/repay_with_collateral_calcs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repay_with_collateral_calcs.d.ts","sourceRoot":"","sources":["../../src/lending_operations/repay_with_collateral_calcs.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAA2B,MAAM,YAAY,CAAC;AACpG,OAAO,EAAE,OAAO,EAAU,MAAM,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAQ5D,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,aAAa,EAC1B,WAAW,EAAE,IAAI,EACjB,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,GACxB;IACD,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAsCA;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,yBAAyB,EAAE,OAAO,CAAC;CACpC,KAAG;IACF,wBAAwB,EAAE,OAAO,CAAC;CAanC,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAC5B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,OAAO,GAC3B;IACD,2BAA2B,EAAE,OAAO,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;CAC1B,CA4EA;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC;CACnB,GAAG,OAAO,CAkCV;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAgBV"}
+{"version":3,"file":"repay_with_collateral_calcs.d.ts","sourceRoot":"","sources":["../../src/lending_operations/repay_with_collateral_calcs.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAA2B,MAAM,YAAY,CAAC;AACpG,OAAO,EAAE,OAAO,EAAU,MAAM,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAQ5D,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,aAAa,EAC1B,WAAW,EAAE,IAAI,EACjB,UAAU,EAAE,gBAAgB,EAC5B,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,GACxB;IACD,WAAW,EAAE,OAAO,CAAC;IACrB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;CACnC,CAsCA;AAED,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,OAAO,EAAE,aAAa,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,yBAAyB,EAAE,OAAO,CAAC;CACpC,KAAG;IACF,wBAAwB,EAAE,OAAO,CAAC;CAanC,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,gBAAgB,EAC5B,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,OAAO,GAC3B;IACD,2BAA2B,EAAE,OAAO,CAAC;IACrC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,eAAe,EAAE,OAAO,CAAC;CAC1B,CA4EA;AAED,wBAAgB,6BAA6B,CAAC,KAAK,EAAE;IACnD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,WAAW,EAAE,IAAI,CAAC;CACnB,GAAG,OAAO,CAiCV;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,OAAO,CAAC;CAC1B,GAAG,OAAO,CAgBV"}

package/dist/lending_operations/repay_with_collateral_calcs.js

@@ -105,10 +105,10 @@ function calcMaxWithdrawCollateral(market, obligation, collReserveAddr, debtRese
     }
 }
 function estimateDebtRepaymentWithColl(props) {
-    const { collAmount, priceDebtToColl, slippagePct, flashLoanFeePct, kaminoMarket, debtTokenMint, obligation, currentSlot, } = props;
+    const { collAmount, priceDebtToColl, slippagePct, flashLoanFeePct, kaminoMarket, debtReserveAddress, obligation, currentSlot, } = props;
     const slippageMultiplier = new decimal_js_1.default(1.0).add(slippagePct.div('100'));
     const flashLoanFeeMultiplier = new decimal_js_1.default(1.0).add(flashLoanFeePct.div('100'));
-    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+    const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
     const debtAfterSwap = collAmount.div(slippageMultiplier).div(priceDebtToColl);
     const debtAfterFlashLoanRepay = debtAfterSwap.div(flashLoanFeeMultiplier);
     const accruedInterestRate = obligation

package/dist/lending_operations/repay_with_collateral_calcs.js.map

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

package/dist/lending_operations/repay_with_collateral_operations.d.ts

@@ -27,8 +27,8 @@ export type RepayWithCollInitialInputs<QuoteResponse> = {
 };
 interface RepayWithCollSwapInputsProps<QuoteResponse> {
     kaminoMarket: KaminoMarket;
-    debtTokenMint: Address;
-    collTokenMint: Address;
+    debtReserveAddress: Address;
+    collReserveAddress: Address;
     owner: TransactionSigner;
     obligation: KaminoObligation;
     referrer: Option<Address>;
@@ -44,7 +44,7 @@ export declare enum MaxWithdrawLtvCheck {
     MAX_LTV = 0,
     LIQUIDATION_THRESHOLD = 1
 }
-export declare function getRepayWithCollSwapInputs<QuoteResponse>({ collTokenMint, currentSlot, debtTokenMint, kaminoMarket, owner, obligation, quoter, referrer, repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, scopeRefreshIx, useV2Ixs, }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
+export declare function getRepayWithCollSwapInputs<QuoteResponse>({ collReserveAddress, currentSlot, debtReserveAddress, kaminoMarket, owner, obligation, quoter, referrer, repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, scopeRefreshIx, useV2Ixs, }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
     swapInputs: SwapInputs;
     flashLoanInfo: FlashLoanInfo;
     initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
@@ -53,7 +53,7 @@ interface RepayWithCollIxsProps<QuoteResponse> extends RepayWithCollSwapInputsPr
     swapper: SwapIxsProvider<QuoteResponse>;
     logger?: (msg: string, ...extra: any[]) => void;
 }
-export declare function getRepayWithCollIxs<QuoteResponse>({ repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, collTokenMint, currentSlot, debtTokenMint, kaminoMarket, owner, obligation, quoter, swapper, referrer, scopeRefreshIx, useV2Ixs, logger, }: RepayWithCollIxsProps<QuoteResponse>): Promise<Array<RepayWithCollIxsResponse<QuoteResponse>>>;
+export declare function getRepayWithCollIxs<QuoteResponse>({ repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, collReserveAddress, currentSlot, debtReserveAddress, kaminoMarket, owner, obligation, quoter, swapper, referrer, scopeRefreshIx, useV2Ixs, logger, }: RepayWithCollIxsProps<QuoteResponse>): Promise<Array<RepayWithCollIxsResponse<QuoteResponse>>>;
 export declare const getMaxWithdrawLtvCheck: (obligation: KaminoObligation, repayAmountLamports: Decimal, debtReserve: KaminoReserve, collWithdrawAmount: Decimal, collReserve: KaminoReserve) => MaxWithdrawLtvCheck;
 export declare function getMaxCollateralFromRepayAmount(repayAmount: Decimal, debtReserve: KaminoReserve, collReserve: KaminoReserve): Decimal;
 export {};

package/dist/lending_operations/repay_with_collateral_operations.d.ts.map

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

package/dist/lending_operations/repay_with_collateral_operations.js

@@ -18,9 +18,11 @@ var MaxWithdrawLtvCheck;
     MaxWithdrawLtvCheck[MaxWithdrawLtvCheck["MAX_LTV"] = 0] = "MAX_LTV";
     MaxWithdrawLtvCheck[MaxWithdrawLtvCheck["LIQUIDATION_THRESHOLD"] = 1] = "LIQUIDATION_THRESHOLD";
 })(MaxWithdrawLtvCheck || (exports.MaxWithdrawLtvCheck = MaxWithdrawLtvCheck = {}));
-async function getRepayWithCollSwapInputs({ collTokenMint, currentSlot, debtTokenMint, kaminoMarket, owner, obligation, quoter, referrer, repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, scopeRefreshIx, useV2Ixs, }) {
-    const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+async function getRepayWithCollSwapInputs({ collReserveAddress, currentSlot, debtReserveAddress, kaminoMarket, owner, obligation, quoter, referrer, repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, scopeRefreshIx, useV2Ixs, }) {
+    const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+    const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+    const collTokenMint = collReserve.getLiquidityMint();
+    const debtTokenMint = debtReserve.getLiquidityMint();
     const { repayAmountLamports, flashRepayAmountLamports, repayAmount: finalRepayAmount, } = (0, repay_with_collateral_calcs_1.calcRepayAmountWithSlippage)(kaminoMarket, debtReserve, currentSlot, obligation, repayAmount, referrer);
     const debtPosition = obligation.getBorrowByReserve(debtReserve.address);
     const collPosition = obligation.getDepositByReserve(collReserve.address);
@@ -73,11 +75,11 @@ async function getRepayWithCollSwapInputs({ collTokenMint, currentSlot, debtToke
         },
     };
 }
-async function getRepayWithCollIxs({ repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, collTokenMint, currentSlot, debtTokenMint, kaminoMarket, owner, obligation, quoter, swapper, referrer, scopeRefreshIx, useV2Ixs, logger = console.log, }) {
+async function getRepayWithCollIxs({ repayAmount, isClosingPosition, budgetAndPriorityFeeIxs, collReserveAddress, currentSlot, debtReserveAddress, kaminoMarket, owner, obligation, quoter, swapper, referrer, scopeRefreshIx, useV2Ixs, logger = console.log, }) {
     const { swapInputs, initialInputs } = await getRepayWithCollSwapInputs({
-        collTokenMint,
+        collReserveAddress,
         currentSlot,
-        debtTokenMint,
+        debtReserveAddress,
         kaminoMarket,
         owner,
         obligation,
@@ -91,8 +93,8 @@ async function getRepayWithCollIxs({ repayAmount, isClosingPosition, budgetAndPr
     });
     const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
     const { inputAmountLamports: collSwapInLamports } = swapInputs;
-    const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+    const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+    const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
     // the client should use these values to prevent this input, but the tx may succeed, so we don't want to fail
     // there is also a chance that the tx will consume debt token from the user's ata which they would not expect
     if (collSwapInLamports.greaterThan(maxCollateralWithdrawLamports)) {
@@ -144,10 +146,41 @@ async function buildRepayWithCollateralIxs(market, debtReserve, collReserve, own
     // 3. Repay using the flash borrowed funds & withdraw collateral to swap and pay the flash loan
     let repayAndWithdrawAction;
     if (maxWithdrawLtvCheck === MaxWithdrawLtvCheck.MAX_LTV) {
-        repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawTxns(market, isClosingPosition ? utils_1.U64_MAX : debtRepayAmountLamports.toString(), debtReserve.getLiquidityMint(), isClosingPosition ? utils_1.U64_MAX : collWithdrawLamports.toString(), collReserve.getLiquidityMint(), owner, currentSlot, obligation, useV2Ixs, undefined, 0, false, requestElevationGroup, undefined, referrer);
+        repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawTxns({
+            kaminoMarket: market,
+            repayAmount: isClosingPosition ? utils_1.U64_MAX : debtRepayAmountLamports.toString(),
+            repayReserveAddress: debtReserve.address,
+            withdrawAmount: isClosingPosition ? utils_1.U64_MAX : collWithdrawLamports.toString(),
+            withdrawReserveAddress: collReserve.address,
+            payer: owner,
+            currentSlot,
+            obligation,
+            useV2Ixs,
+            scopeRefreshConfig: undefined,
+            extraComputeBudget: 0,
+            includeAtaIxs: false,
+            requestElevationGroup,
+            initUserMetadata: undefined,
+            referrer,
+        });
     }
     else {
-        repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawV2Txns(market, isClosingPosition ? utils_1.U64_MAX : debtRepayAmountLamports.toString(), debtReserve.getLiquidityMint(), isClosingPosition ? utils_1.U64_MAX : collWithdrawLamports.toString(), collReserve.getLiquidityMint(), owner, currentSlot, obligation, undefined, 0, false, requestElevationGroup, undefined, referrer);
+        repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawV2Txns({
+            kaminoMarket: market,
+            repayAmount: isClosingPosition ? utils_1.U64_MAX : debtRepayAmountLamports.toString(),
+            repayReserveAddress: debtReserve.address,
+            withdrawAmount: isClosingPosition ? utils_1.U64_MAX : collWithdrawLamports.toString(),
+            withdrawReserveAddress: collReserve.address,
+            payer: owner,
+            currentSlot,
+            obligation,
+            scopeRefreshConfig: undefined,
+            extraComputeBudget: 0,
+            includeAtaIxs: false,
+            requestElevationGroup,
+            initUserMetadata: undefined,
+            referrer,
+        });
     }
     // 4. Swap collateral to debt to repay flash loan
     return swapQuoteIxsArray.map((swapQuoteIxs) => {

package/dist/lending_operations/repay_with_collateral_operations.js.map

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

package/dist/lending_operations/swap_collateral_operations.d.ts

@@ -19,13 +19,13 @@ export interface SwapCollIxsInputs<QuoteResponse> {
      */
     isClosingSourceColl: boolean;
     /**
-     * The mint of the source collateral token (i.e. the current one).
+     * The address of the source collateral reserve (i.e. the current one).
      */
-    sourceCollTokenMint: Address;
+    sourceCollReserveAddress: Address;
     /**
-     * The mint of the target collateral token (i.e. the new one).
+     * The address of the target collateral reserve (i.e. the new one).
      */
-    targetCollTokenMint: Address;
+    targetCollReserveAddress: Address;
     /**
      * An elevation group ID that the obligation should end up with after the collateral swap - it will be requested by
      * this operation (if different from the obligation's current elevation group).

package/dist/lending_operations/swap_collateral_operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swap_collateral_operations.d.ts","sourceRoot":"","sources":["../../src/lending_operations/swap_collateral_operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EACZ,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA2C,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAU1G,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3G,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,aAAa;IAC9C;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAI1B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC;IAClB,uBAAuB,CAAC,EAAE,WAAW,EAAE,CAAC;IACxC,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACzC,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,aAAa;IAC/C;;OAEG;IACH,GAAG,EAAE,WAAW,EAAE,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,iBAAiB,EAAE;QACjB;;WAEG;QACH,SAAS,EAAE;YACT;;;eAGG;YACH,6BAA6B,EAAE,OAAO,CAAC;YAEvC;;;eAGG;YACH,2BAA2B,EAAE,OAAO,CAAC;SACtC,CAAC;QAEF;;WAEG;QACH,YAAY,EAAE;YACZ;;;;eAIG;YACH,sBAAsB,EAAE,OAAO,CAAC;YAEhC;;;;eAIG;YACH,uBAAuB,EAAE,OAAO,CAAC;YAEjC;;eAEG;YACH,aAAa,CAAC,EAAE,aAAa,CAAC;SAC/B,CAAC;KACH,CAAC;CACH;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,aAAa,EAChD,MAAM,EAAE,iBAAiB,CAAC,aAAa,CAAC,GACvC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAoDnD"}
+{"version":3,"file":"swap_collateral_operations.d.ts","sourceRoot":"","sources":["../../src/lending_operations/swap_collateral_operations.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EACZ,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAA2C,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAU1G,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAgB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC3G,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,aAAa;IAC9C;;;;OAIG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC;IAElC;;OAEG;IACH,wBAAwB,EAAE,OAAO,CAAC;IAElC;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAI1B,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC;IAClB,uBAAuB,CAAC,EAAE,WAAW,EAAE,CAAC;IACxC,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACzC,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACjD;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,aAAa;IAC/C;;OAEG;IACH,GAAG,EAAE,WAAW,EAAE,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAE5C;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,iBAAiB,EAAE;QACjB;;WAEG;QACH,SAAS,EAAE;YACT;;;eAGG;YACH,6BAA6B,EAAE,OAAO,CAAC;YAEvC;;;eAGG;YACH,2BAA2B,EAAE,OAAO,CAAC;SACtC,CAAC;QAEF;;WAEG;QACH,YAAY,EAAE;YACZ;;;;eAIG;YACH,sBAAsB,EAAE,OAAO,CAAC;YAEhC;;;;eAIG;YACH,uBAAuB,EAAE,OAAO,CAAC;YAEjC;;eAEG;YACH,aAAa,CAAC,EAAE,aAAa,CAAC;SAC/B,CAAC;KACH,CAAC;CACH;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,aAAa,EAChD,MAAM,EAAE,iBAAiB,CAAC,aAAa,CAAC,GACvC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAoDnD"}

package/dist/lending_operations/swap_collateral_operations.js

@@ -57,7 +57,7 @@ async function getSwapCollIxs(inputs) {
     }));
 }
 function extractArgsAndContext(inputs) {
-    if (inputs.sourceCollTokenMint === inputs.targetCollTokenMint) {
+    if (inputs.sourceCollReserveAddress === inputs.targetCollReserveAddress) {
         throw new Error(`Cannot swap from/to the same collateral`);
     }
     if (inputs.sourceCollSwapAmount.lte(0)) {
@@ -71,8 +71,8 @@ function extractArgsAndContext(inputs) {
         },
         {
             budgetAndPriorityFeeIxs: inputs.budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(utils_1.DEFAULT_MAX_COMPUTE_UNITS),
-            sourceCollReserve: inputs.market.getExistingReserveByMint(inputs.sourceCollTokenMint, 'Current collateral'),
-            targetCollReserve: inputs.market.getExistingReserveByMint(inputs.targetCollTokenMint, 'Target collateral'),
+            sourceCollReserve: inputs.market.getExistingReserveByAddress(inputs.sourceCollReserveAddress, 'Current collateral'),
+            targetCollReserve: inputs.market.getExistingReserveByAddress(inputs.targetCollReserveAddress, 'Target collateral'),
             logger: console.log,
             market: inputs.market,
             obligation: inputs.obligation,
@@ -164,14 +164,22 @@ async function getTargetCollFlashLoanIxs(targetCollAmount, flashBorrowIxIndex, d
 }
 async function getDepositTargetCollIxs(targetCollAmount, context) {
     const removesElevationGroup = mustRemoveElevationGroupBeforeDeposit(context);
-    const depositCollAction = await classes_1.KaminoAction.buildDepositTxns(context.market, targetCollAmount.mul(context.targetCollReserve.getMintFactor()).toString(), // in lamports
-    context.targetCollReserve.getLiquidityMint(), context.owner, context.obligation, context.useV2Ixs, undefined, // we create the scope refresh ix outside of KaminoAction
-    0, // no extra compute budget
-    false, // we do not need ATA ixs here (we construct and close them ourselves)
-    removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
-    { skipInitialization: true, skipLutCreation: true }, // we are dealing with an existing obligation, no need to create user metadata
-    context.referrer, context.currentSlot, removesElevationGroup ? 0 : undefined // only applicable when removing the group
-    );
+    const depositCollAction = await classes_1.KaminoAction.buildDepositTxns({
+        kaminoMarket: context.market,
+        amount: targetCollAmount.mul(context.targetCollReserve.getMintFactor()).toString(), // in lamports
+        reserveAddress: context.targetCollReserve.address,
+        owner: context.owner,
+        obligation: context.obligation,
+        useV2Ixs: context.useV2Ixs,
+        scopeRefreshConfig: undefined, // we create the scope refresh ix outside of KaminoAction
+        extraComputeBudget: 0, // no extra compute budget
+        includeAtaIxs: false, // we do not need ATA ixs here (we construct and close them ourselves)
+        requestElevationGroup: removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
+        initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // we are dealing with an existing obligation, no need to create user metadata
+        referrer: context.referrer,
+        currentSlot: context.currentSlot,
+        overrideElevationGroupRequest: removesElevationGroup ? 0 : undefined, // only applicable when removing the group
+    });
     return {
         ixs: classes_1.KaminoAction.actionToIxs(depositCollAction),
         removesElevationGroup,
@@ -199,16 +207,27 @@ async function getWithdrawSourceCollIxs(args, depositRemovedElevationGroup, cont
         ? utils_1.U64_MAX
         : args.sourceCollSwapAmount.mul(context.sourceCollReserve.getMintFactor()).toString();
     const requestedElevationGroup = elevationGroupIdToRequestAfterWithdraw(args, depositRemovedElevationGroup, context);
-    const withdrawCollAction = await classes_1.KaminoAction.buildWithdrawTxns(context.market, withdrawnSourceCollLamports, context.sourceCollReserve.getLiquidityMint(), context.owner, context.obligation, context.useV2Ixs, undefined, // we create the scope refresh ix outside of KaminoAction
-    0, // no extra compute budget
-    false, // we do not need ATA ixs here (we construct and close them ourselves)
-    requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
-    { skipInitialization: true, skipLutCreation: true }, // we are dealing with an existing obligation, no need to create user metadata
-    context.referrer, context.currentSlot, requestedElevationGroup, context.obligation.deposits.has(context.targetCollReserve.address) // if our obligation already had the target coll...
-        ? undefined // ... then we need no customizations here, but otherwise...
-        : {
-            addedDepositReserves: [context.targetCollReserve.address], // ... we need to inform our infra that the obligation now has one more reserve that needs refreshing.
-        });
+    const withdrawCollAction = await classes_1.KaminoAction.buildWithdrawTxns({
+        kaminoMarket: context.market,
+        amount: withdrawnSourceCollLamports,
+        reserveAddress: context.sourceCollReserve.address,
+        owner: context.owner,
+        obligation: context.obligation,
+        useV2Ixs: context.useV2Ixs,
+        scopeRefreshConfig: undefined, // we create the scope refresh ix outside of KaminoAction
+        extraComputeBudget: 0, // no extra compute budget
+        includeAtaIxs: false, // we do not need ATA ixs here (we construct and close them ourselves)
+        requestElevationGroup: requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
+        initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // we are dealing with an existing obligation, no need to create user metadata
+        referrer: context.referrer,
+        currentSlot: context.currentSlot,
+        overrideElevationGroupRequest: requestedElevationGroup,
+        obligationCustomizations: context.obligation.deposits.has(context.targetCollReserve.address) // if our obligation already had the target coll...
+            ? undefined // ... then we need no customizations here, but otherwise...
+            : {
+                addedDepositReserves: [context.targetCollReserve.address], // ... we need to inform our infra that the obligation now has one more reserve that needs refreshing.
+            },
+    });
     return classes_1.KaminoAction.actionToIxs(withdrawCollAction);
 }
 function elevationGroupIdToRequestAfterWithdraw(args, depositRemovedElevationGroup, context) {