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

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.
Files changed (108) hide show
  1. package/dist/classes/action.d.ts +21 -91
  2. package/dist/classes/action.d.ts.map +1 -1
  3. package/dist/classes/action.js +141 -119
  4. package/dist/classes/action.js.map +1 -1
  5. package/dist/classes/actionTypes.d.ts +310 -0
  6. package/dist/classes/actionTypes.d.ts.map +1 -0
  7. package/dist/classes/actionTypes.js +3 -0
  8. package/dist/classes/actionTypes.js.map +1 -0
  9. package/dist/classes/market.d.ts +15 -10
  10. package/dist/classes/market.d.ts.map +1 -1
  11. package/dist/classes/market.js +49 -26
  12. package/dist/classes/market.js.map +1 -1
  13. package/dist/classes/obligation.d.ts +9 -9
  14. package/dist/classes/obligation.d.ts.map +1 -1
  15. package/dist/classes/obligation.js +48 -50
  16. package/dist/classes/obligation.js.map +1 -1
  17. package/dist/classes/obligationOrder.d.ts.map +1 -1
  18. package/dist/classes/obligationOrder.js +6 -3
  19. package/dist/classes/obligationOrder.js.map +1 -1
  20. package/dist/classes/shared.d.ts +1 -0
  21. package/dist/classes/shared.d.ts.map +1 -1
  22. package/dist/client/commands/borrow.d.ts +1 -1
  23. package/dist/client/commands/borrow.d.ts.map +1 -1
  24. package/dist/client/commands/borrow.js +11 -2
  25. package/dist/client/commands/borrow.js.map +1 -1
  26. package/dist/client/commands/deposit.d.ts +1 -1
  27. package/dist/client/commands/deposit.d.ts.map +1 -1
  28. package/dist/client/commands/deposit.js +11 -2
  29. package/dist/client/commands/deposit.js.map +1 -1
  30. package/dist/client/commands/printReserve.d.ts +1 -1
  31. package/dist/client/commands/printReserve.d.ts.map +1 -1
  32. package/dist/client/commands/printReserve.js +2 -4
  33. package/dist/client/commands/printReserve.js.map +1 -1
  34. package/dist/client/commands/repay.d.ts +1 -1
  35. package/dist/client/commands/repay.d.ts.map +1 -1
  36. package/dist/client/commands/repay.js +12 -2
  37. package/dist/client/commands/repay.js.map +1 -1
  38. package/dist/client/commands/withdraw.d.ts +1 -1
  39. package/dist/client/commands/withdraw.d.ts.map +1 -1
  40. package/dist/client/commands/withdraw.js +11 -2
  41. package/dist/client/commands/withdraw.js.map +1 -1
  42. package/dist/lending_operations/repay_with_collateral_calcs.d.ts +1 -1
  43. package/dist/lending_operations/repay_with_collateral_calcs.d.ts.map +1 -1
  44. package/dist/lending_operations/repay_with_collateral_calcs.js +2 -2
  45. package/dist/lending_operations/repay_with_collateral_calcs.js.map +1 -1
  46. package/dist/lending_operations/repay_with_collateral_operations.d.ts +4 -4
  47. package/dist/lending_operations/repay_with_collateral_operations.d.ts.map +1 -1
  48. package/dist/lending_operations/repay_with_collateral_operations.js +43 -10
  49. package/dist/lending_operations/repay_with_collateral_operations.js.map +1 -1
  50. package/dist/lending_operations/swap_collateral_operations.d.ts +4 -4
  51. package/dist/lending_operations/swap_collateral_operations.d.ts.map +1 -1
  52. package/dist/lending_operations/swap_collateral_operations.js +40 -21
  53. package/dist/lending_operations/swap_collateral_operations.js.map +1 -1
  54. package/dist/leverage/operations.d.ts +6 -6
  55. package/dist/leverage/operations.d.ts.map +1 -1
  56. package/dist/leverage/operations.js +167 -52
  57. package/dist/leverage/operations.js.map +1 -1
  58. package/dist/leverage/types.d.ts +2 -2
  59. package/dist/leverage/types.d.ts.map +1 -1
  60. package/dist/manager/client_kamino_manager.js +0 -2
  61. package/dist/manager/client_kamino_manager.js.map +1 -1
  62. package/dist/obligation_orders/price_based.js +5 -3
  63. package/dist/obligation_orders/price_based.js.map +1 -1
  64. package/dist/utils/Logger.d.ts +14 -0
  65. package/dist/utils/Logger.d.ts.map +1 -0
  66. package/dist/utils/Logger.js +12 -0
  67. package/dist/utils/Logger.js.map +1 -0
  68. package/dist/utils/ObligationType.d.ts +33 -1
  69. package/dist/utils/ObligationType.d.ts.map +1 -1
  70. package/dist/utils/ObligationType.js +81 -2
  71. package/dist/utils/ObligationType.js.map +1 -1
  72. package/dist/utils/api.d.ts +13 -4
  73. package/dist/utils/api.d.ts.map +1 -1
  74. package/dist/utils/api.js +33 -31
  75. package/dist/utils/api.js.map +1 -1
  76. package/dist/utils/userMetadata.d.ts +2 -2
  77. package/dist/utils/userMetadata.d.ts.map +1 -1
  78. package/dist/utils/userMetadata.js +49 -25
  79. package/dist/utils/userMetadata.js.map +1 -1
  80. package/dist/utils/validations.d.ts +1 -0
  81. package/dist/utils/validations.d.ts.map +1 -1
  82. package/dist/utils/validations.js +5 -0
  83. package/dist/utils/validations.js.map +1 -1
  84. package/package.json +1 -1
  85. package/src/classes/action.ts +321 -347
  86. package/src/classes/actionTypes.ts +295 -0
  87. package/src/classes/market.ts +74 -31
  88. package/src/classes/obligation.ts +54 -53
  89. package/src/classes/obligationOrder.ts +6 -3
  90. package/src/classes/shared.ts +2 -0
  91. package/src/client/client.ts +17 -18
  92. package/src/client/commands/borrow.ts +10 -9
  93. package/src/client/commands/deposit.ts +10 -9
  94. package/src/client/commands/printReserve.ts +2 -4
  95. package/src/client/commands/repay.ts +11 -10
  96. package/src/client/commands/withdraw.ts +15 -9
  97. package/src/lending_operations/repay_with_collateral_calcs.ts +3 -4
  98. package/src/lending_operations/repay_with_collateral_operations.ts +40 -38
  99. package/src/lending_operations/swap_collateral_operations.ts +47 -41
  100. package/src/leverage/operations.ts +168 -129
  101. package/src/leverage/types.ts +2 -2
  102. package/src/manager/client_kamino_manager.ts +0 -2
  103. package/src/obligation_orders/price_based.ts +7 -5
  104. package/src/utils/Logger.ts +14 -0
  105. package/src/utils/ObligationType.ts +92 -1
  106. package/src/utils/api.ts +56 -33
  107. package/src/utils/userMetadata.ts +64 -30
  108. package/src/utils/validations.ts +5 -0
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.LendingObligation = exports.LeverageObligation = exports.MultiplyObligation = exports.VanillaObligation = exports.ObligationTypeTag = void 0;
3
+ exports.LendingObligationFixedRate = exports.LendingObligation = exports.LeverageObligationFixedRate = exports.LeverageObligation = exports.MultiplyObligationFixedRate = exports.MultiplyObligation = exports.VanillaObligation = exports.ObligationTypeTag = void 0;
4
4
  exports.getObligationPdaWithArgs = getObligationPdaWithArgs;
5
5
  exports.getObligationType = getObligationType;
6
6
  exports.getObligationTypeFromObligation = getObligationTypeFromObligation;
@@ -13,6 +13,9 @@ var ObligationTypeTag;
13
13
  ObligationTypeTag[ObligationTypeTag["Multiply"] = 1] = "Multiply";
14
14
  ObligationTypeTag[ObligationTypeTag["Lending"] = 2] = "Lending";
15
15
  ObligationTypeTag[ObligationTypeTag["Leverage"] = 3] = "Leverage";
16
+ ObligationTypeTag[ObligationTypeTag["MultiplyFixedRate"] = 4] = "MultiplyFixedRate";
17
+ ObligationTypeTag[ObligationTypeTag["LendingFixedRate"] = 5] = "LendingFixedRate";
18
+ ObligationTypeTag[ObligationTypeTag["LeverageFixedRate"] = 6] = "LeverageFixedRate";
16
19
  })(ObligationTypeTag || (exports.ObligationTypeTag = ObligationTypeTag = {}));
17
20
  class VanillaObligation {
18
21
  programId;
@@ -62,6 +65,32 @@ class MultiplyObligation {
62
65
  }
63
66
  }
64
67
  exports.MultiplyObligation = MultiplyObligation;
68
+ class MultiplyObligationFixedRate {
69
+ collReserveAddress;
70
+ debtReserveAddress;
71
+ programId;
72
+ id;
73
+ static tag = 4;
74
+ constructor(collReserveAddress, debtReserveAddress, programId, id) {
75
+ this.collReserveAddress = collReserveAddress;
76
+ this.debtReserveAddress = debtReserveAddress;
77
+ this.programId = programId;
78
+ this.id = id ?? 0;
79
+ }
80
+ toArgs() {
81
+ const initObligationArgs = {
82
+ tag: MultiplyObligationFixedRate.tag,
83
+ id: this.id,
84
+ seed1: this.collReserveAddress,
85
+ seed2: this.debtReserveAddress,
86
+ };
87
+ return initObligationArgs;
88
+ }
89
+ toPda(market, user) {
90
+ return getObligationPdaWithArgs(market, user, this.toArgs(), this.programId);
91
+ }
92
+ }
93
+ exports.MultiplyObligationFixedRate = MultiplyObligationFixedRate;
65
94
  class LeverageObligation {
66
95
  collToken;
67
96
  debtToken;
@@ -88,6 +117,32 @@ class LeverageObligation {
88
117
  }
89
118
  }
90
119
  exports.LeverageObligation = LeverageObligation;
120
+ class LeverageObligationFixedRate {
121
+ collReserveAddress;
122
+ debtReserveAddress;
123
+ programId;
124
+ id;
125
+ static tag = 6;
126
+ constructor(collReserveAddress, debtReserveAddress, programId, id) {
127
+ this.collReserveAddress = collReserveAddress;
128
+ this.debtReserveAddress = debtReserveAddress;
129
+ this.programId = programId;
130
+ this.id = id ?? 0;
131
+ }
132
+ toArgs() {
133
+ const initObligationArgs = {
134
+ tag: LeverageObligationFixedRate.tag,
135
+ id: this.id,
136
+ seed1: this.collReserveAddress,
137
+ seed2: this.debtReserveAddress,
138
+ };
139
+ return initObligationArgs;
140
+ }
141
+ toPda(market, user) {
142
+ return getObligationPdaWithArgs(market, user, this.toArgs(), this.programId);
143
+ }
144
+ }
145
+ exports.LeverageObligationFixedRate = LeverageObligationFixedRate;
91
146
  class LendingObligation {
92
147
  token;
93
148
  programId;
@@ -101,7 +156,7 @@ class LendingObligation {
101
156
  toArgs() {
102
157
  const initObligationArgs = {
103
158
  tag: LendingObligation.tag,
104
- id: 0,
159
+ id: this.id,
105
160
  seed1: this.token,
106
161
  seed2: this.token,
107
162
  };
@@ -112,6 +167,30 @@ class LendingObligation {
112
167
  }
113
168
  }
114
169
  exports.LendingObligation = LendingObligation;
170
+ class LendingObligationFixedRate {
171
+ reserveAddress;
172
+ programId;
173
+ id;
174
+ static tag = 5;
175
+ constructor(reserveAddress, programId, id) {
176
+ this.reserveAddress = reserveAddress;
177
+ this.programId = programId;
178
+ this.id = id ?? 0;
179
+ }
180
+ toArgs() {
181
+ const initObligationArgs = {
182
+ tag: LendingObligationFixedRate.tag,
183
+ id: this.id,
184
+ seed1: this.reserveAddress,
185
+ seed2: this.reserveAddress,
186
+ };
187
+ return initObligationArgs;
188
+ }
189
+ toPda(market, user) {
190
+ return getObligationPdaWithArgs(market, user, this.toArgs(), this.programId);
191
+ }
192
+ }
193
+ exports.LendingObligationFixedRate = LendingObligationFixedRate;
115
194
  async function getObligationPdaWithArgs(market, user, args, programId) {
116
195
  const seeds = [
117
196
  Buffer.from([args.tag]),
@@ -1 +1 @@
1
- {"version":3,"file":"ObligationType.js","sourceRoot":"","sources":["../../src/utils/ObligationType.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ObligationType.js","sourceRoot":"","sources":["../../src/utils/ObligationType.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { Address } from '@solana/kit';
2
2
  import { ConfigType } from '../classes';
3
- import { IBackOffOptions } from 'exponential-backoff';
3
+ import { Logger, LogLevel } from './Logger';
4
4
  export type ApiRequestOptions = {
5
5
  programId?: Address;
6
6
  source?: 'API' | 'CDN';
@@ -9,6 +9,15 @@ export type ApiRequestOptions = {
9
9
  export type ApiFilterOptions = {
10
10
  isCurated?: boolean;
11
11
  };
12
+ export type ApiLoggerOptions = {
13
+ logger?: Logger;
14
+ errorLevel?: LogLevel;
15
+ };
16
+ export type MarketsApiRequest = {
17
+ api?: ApiRequestOptions;
18
+ filter?: ApiFilterOptions;
19
+ log?: ApiLoggerOptions;
20
+ };
12
21
  /**
13
22
  * Fetch config from the API
14
23
  * A good place to start to find active klend markets without expensive RPC calls
@@ -17,8 +26,8 @@ export type ApiFilterOptions = {
17
26
  * @param source - CDN is a json file hosted in the cloud, API is a webserver
18
27
  * @param apiBaseUrl - Optional base URL for the API, if not provided, defaults to the standard API endpoint, not used for CDN
19
28
  * @param filterOptions - Config options to filter markets by
29
+ * @param logger - pass a custom logger instance to log retries
30
+ * @param errorLevel - retry log level, NONE for no logs
20
31
  */
21
- export declare function getMarketsFromApi({ programId, source, apiBaseUrl }?: ApiRequestOptions, filterOptions?: ApiFilterOptions): Promise<ConfigType>;
22
- export declare const KAMINO_CDN_RETRY: Partial<IBackOffOptions>;
23
- export declare const KAMINO_API_RETRY: Partial<IBackOffOptions>;
32
+ export declare function getMarketsFromApi({ api: { programId, source, apiBaseUrl }, filter: filterOptions, log: { logger, errorLevel }, }?: MarketsApiRequest): Promise<ConfigType>;
24
33
  //# sourceMappingURL=api.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAW,MAAM,qBAAqB,CAAC;AAG/D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,EAAE,SAAsB,EAAE,MAAc,EAAE,UAAU,EAAE,GAAE,iBAAsB,EAC9E,aAAa,GAAE,gBAAqB,GACnC,OAAO,CAAC,UAAU,CAAC,CAkBrB;AAED,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAYrD,CAAC"}
1
+ {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAiB,MAAM,YAAY,CAAC;AAIvD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,CAAC,EAAE,iBAAiB,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,GAAG,CAAC,EAAE,gBAAgB,CAAC;CACxB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,GAAG,EAAE,EAAE,SAAsB,EAAE,MAAc,EAAE,UAAU,EAAO,EAChE,MAAM,EAAE,aAAkB,EAC1B,GAAG,EAAE,EAAE,MAAgB,EAAE,UAA0B,EAAO,GAC3D,GAAE,iBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,CAwB9C"}
package/dist/utils/api.js CHANGED
@@ -3,13 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.KAMINO_API_RETRY = exports.KAMINO_CDN_RETRY = void 0;
7
6
  exports.getMarketsFromApi = getMarketsFromApi;
8
7
  const axios_1 = __importDefault(require("axios"));
9
8
  const classes_1 = require("../classes");
10
9
  const utils_1 = require("../utils");
11
10
  const exponential_backoff_1 = require("exponential-backoff");
12
11
  const lib_1 = require("../lib");
12
+ const Logger_1 = require("./Logger");
13
13
  /**
14
14
  * Fetch config from the API
15
15
  * A good place to start to find active klend markets without expensive RPC calls
@@ -18,16 +18,17 @@ const lib_1 = require("../lib");
18
18
  * @param source - CDN is a json file hosted in the cloud, API is a webserver
19
19
  * @param apiBaseUrl - Optional base URL for the API, if not provided, defaults to the standard API endpoint, not used for CDN
20
20
  * @param filterOptions - Config options to filter markets by
21
+ * @param logger - pass a custom logger instance to log retries
22
+ * @param errorLevel - retry log level, NONE for no logs
21
23
  */
22
- async function getMarketsFromApi({ programId = lib_1.PROGRAM_ID, source = 'CDN', apiBaseUrl } = {}, filterOptions = {}) {
24
+ async function getMarketsFromApi({ api: { programId = lib_1.PROGRAM_ID, source = 'CDN', apiBaseUrl } = {}, filter: filterOptions = {}, log: { logger = console, errorLevel = Logger_1.LogLevel.WARN } = {}, } = {}) {
23
25
  let unfilteredConfigs = {};
24
26
  if (source === 'CDN') {
25
- unfilteredConfigs = (await (0, exponential_backoff_1.backOff)(() => axios_1.default.get(`${utils_1.CDN_ENDPOINT}/kamino_lend_config_v3.json`), exports.KAMINO_CDN_RETRY))
26
- .data[programId.toString()];
27
+ unfilteredConfigs = (await (0, exponential_backoff_1.backOff)(() => axios_1.default.get(`${utils_1.CDN_ENDPOINT}/kamino_lend_config_v3.json`), getKaminoCdnRetry(logger, errorLevel))).data[programId.toString()];
27
28
  }
28
29
  if (!unfilteredConfigs || (0, classes_1.isEmptyObject)(unfilteredConfigs)) {
29
30
  const API_ENDPOINT = (0, utils_1.getApiEndpoint)(programId, apiBaseUrl);
30
- unfilteredConfigs = (await (0, exponential_backoff_1.backOff)(() => axios_1.default.get(API_ENDPOINT), exports.KAMINO_API_RETRY)).data;
31
+ unfilteredConfigs = (await (0, exponential_backoff_1.backOff)(() => axios_1.default.get(API_ENDPOINT), getKaminoApiRetry(logger, errorLevel, API_ENDPOINT))).data;
31
32
  }
32
33
  return unfilteredConfigs.filter((c) => {
33
34
  if (filterOptions.isCurated !== undefined) {
@@ -36,30 +37,31 @@ async function getMarketsFromApi({ programId = lib_1.PROGRAM_ID, source = 'CDN',
36
37
  return true;
37
38
  });
38
39
  }
39
- exports.KAMINO_CDN_RETRY = {
40
- maxDelay: 1000,
41
- numOfAttempts: 3,
42
- startingDelay: 10,
43
- retry: (e, attemptNumber) => {
44
- console.warn(e);
45
- console.warn({
46
- attemptNumber,
47
- message: 'kamino CDN call failed, retrying with exponential backoff...',
48
- });
49
- return true;
50
- },
51
- };
52
- exports.KAMINO_API_RETRY = {
53
- maxDelay: 1000,
54
- numOfAttempts: 3,
55
- startingDelay: 10,
56
- retry: (e, attemptNumber) => {
57
- console.warn(e);
58
- console.warn({
59
- attemptNumber,
60
- message: 'api.kamino.finance call failed, retrying with exponential backoff...',
61
- });
62
- return true;
63
- },
64
- };
40
+ function getKaminoCdnRetry(logger, errorLevel) {
41
+ return {
42
+ maxDelay: 1000,
43
+ numOfAttempts: 3,
44
+ startingDelay: 10,
45
+ retry: (e, attemptNumber) => {
46
+ log(logger, errorLevel, `kamino CDN call #${attemptNumber} failed, retrying with exponential backoff...`, e);
47
+ return true;
48
+ },
49
+ };
50
+ }
51
+ function getKaminoApiRetry(logger, errorLevel, apiUrl) {
52
+ return {
53
+ maxDelay: 1000,
54
+ numOfAttempts: 3,
55
+ startingDelay: 10,
56
+ retry: (e, attemptNumber) => {
57
+ log(logger, errorLevel, `${apiUrl} call #${attemptNumber} failed, retrying with exponential backoff...`, e);
58
+ return true;
59
+ },
60
+ };
61
+ }
62
+ function log(logger, errorLevel, msg, ...meta) {
63
+ if (errorLevel !== Logger_1.LogLevel.NONE) {
64
+ logger[errorLevel](msg, ...meta);
65
+ }
66
+ }
65
67
  //# sourceMappingURL=api.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":";;;;;;AA0BA,8CAqBC;AA9CD,kDAA0B;AAC1B,wCAAuD;AACvD,oCAAwD;AACxD,6DAA+D;AAC/D,gCAAoC;AAYpC;;;;;;;;GAQG;AACI,KAAK,UAAU,iBAAiB,CACrC,EAAE,SAAS,GAAG,gBAAU,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,KAAwB,EAAE,EAC9E,gBAAkC,EAAE;IAEpC,IAAI,iBAAiB,GAAe,EAAgB,CAAC;IACrD,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACrB,iBAAiB,GAAG,CAAC,MAAM,IAAA,6BAAO,EAAC,GAAG,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,oBAAY,6BAA6B,CAAC,EAAE,wBAAgB,CAAC,CAAC;aACjH,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAe,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,iBAAiB,IAAI,IAAA,uBAAa,EAAC,iBAAiB,CAAC,EAAE,CAAC;QAC3D,MAAM,YAAY,GAAG,IAAA,sBAAc,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC3D,iBAAiB,GAAG,CAAC,MAAM,IAAA,6BAAO,EAAC,GAAG,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,wBAAgB,CAAC,CAAC,CAAC,IAAkB,CAAC;IAC1G,CAAC;IAED,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACpC,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,CAAC,CAAC,SAAS,KAAK,aAAa,CAAC,SAAS,CAAC;QACjD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAEY,QAAA,gBAAgB,GAA6B;IACxD,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAM,EAAE,aAAqB,EAAE,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,CAAC,IAAI,CAAC;YACX,aAAa;YACb,OAAO,EAAE,8DAA8D;SACxE,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAEW,QAAA,gBAAgB,GAA6B;IACxD,QAAQ,EAAE,IAAI;IACd,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,CAAC,CAAM,EAAE,aAAqB,EAAE,EAAE;QACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,OAAO,CAAC,IAAI,CAAC;YACX,aAAa;YACb,OAAO,EAAE,sEAAsE;SAChF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/utils/api.ts"],"names":[],"mappings":";;;;;AAwCA,8CA4BC;AAnED,kDAA0B;AAC1B,wCAAuD;AACvD,oCAAwD;AACxD,6DAA+D;AAC/D,gCAAoC;AACpC,qCAA4C;AAuB5C;;;;;;;;;;GAUG;AACI,KAAK,UAAU,iBAAiB,CAAC,EACtC,GAAG,EAAE,EAAE,SAAS,GAAG,gBAAU,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,EAChE,MAAM,EAAE,aAAa,GAAG,EAAE,EAC1B,GAAG,EAAE,EAAE,MAAM,GAAG,OAAO,EAAE,UAAU,GAAG,iBAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,MACrC,EAAE;IACvB,IAAI,iBAAiB,GAAe,EAAgB,CAAC;IACrD,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;QACrB,iBAAiB,GAAG,CAClB,MAAM,IAAA,6BAAO,EACX,GAAG,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,oBAAY,6BAA6B,CAAC,EAC7D,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,CACtC,CACF,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAe,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,iBAAiB,IAAI,IAAA,uBAAa,EAAC,iBAAiB,CAAC,EAAE,CAAC;QAC3D,MAAM,YAAY,GAAG,IAAA,sBAAc,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC3D,iBAAiB,GAAG,CAClB,MAAM,IAAA,6BAAO,EAAC,GAAG,EAAE,CAAC,eAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAClG,CAAC,IAAkB,CAAC;IACvB,CAAC;IAED,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACpC,IAAI,aAAa,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,CAAC,CAAC,SAAS,KAAK,aAAa,CAAC,SAAS,CAAC;QACjD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,UAAoB;IAC7D,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,CAAC,CAAM,EAAE,aAAqB,EAAE,EAAE;YACvC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,oBAAoB,aAAa,+CAA+C,EAAE,CAAC,CAAC,CAAC;YAC7G,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAc,EAAE,UAAoB,EAAE,MAAc;IAC7E,OAAO;QACL,QAAQ,EAAE,IAAI;QACd,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,EAAE;QACjB,KAAK,EAAE,CAAC,CAAM,EAAE,aAAqB,EAAE,EAAE;YACvC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,UAAU,aAAa,+CAA+C,EAAE,CAAC,CAAC,CAAC;YAC5G,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,GAAG,CAAC,MAAc,EAAE,UAAoB,EAAE,GAAW,EAAE,GAAG,IAAW;IAC5E,IAAI,UAAU,KAAK,iBAAQ,CAAC,IAAI,EAAE,CAAC;QACjC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACnC,CAAC;AACH,CAAC"}
@@ -5,10 +5,10 @@ export type KaminoUserMetadata = {
5
5
  address: Address;
6
6
  state: UserMetadata;
7
7
  };
8
- export declare const getUserLutAddressAndSetupIxs: (kaminoMarket: KaminoMarket, user: TransactionSigner, referrer?: Option<Address>, withExtendLut?: boolean, multiplyMints?: {
8
+ export declare const getUserLutAddressAndSetupIxs: (kaminoMarket: KaminoMarket, user: TransactionSigner, referrer?: Option<Address>, withExtendLut?: boolean, multiplyReserveAddresses?: {
9
9
  coll: Address;
10
10
  debt: Address;
11
- }[], leverageMints?: {
11
+ }[], leverageReserveAddresses?: {
12
12
  coll: Address;
13
13
  debt: Address;
14
14
  }[], repayWithCollObligation?: KaminoObligation | undefined, payer?: TransactionSigner) => Promise<[Address, Instruction[][]]>;
@@ -1 +1 @@
1
- {"version":3,"file":"userMetadata.d.ts","sourceRoot":"","sources":["../../src/utils/userMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,WAAW,EAGX,GAAG,EACH,qBAAqB,EACrB,8BAA8B,EAC9B,gCAAgC,EAChC,iBAAiB,EACjB,MAAM,EAEP,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAUL,YAAY,EAGb,MAAM,QAAQ,CAAC;AAOhB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,cAAc,YAAY,EAC1B,MAAM,iBAAiB,EACvB,WAAU,MAAM,CAAC,OAAO,CAAU,EAClC,gBAAe,OAAc,EAC7B,gBAAe;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,EAAO,EACtD,gBAAe;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,EAAO,EACtD,0BAAyB,gBAAgB,GAAG,SAAqB,EACjE,QAAO,iBAAwB,KAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,CAyDpC,CAAC;AAsQF,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,CAAC,qBAAqB,CAAC,EAC/B,MAAM,EAAE,CAAC,gCAAgC,GAAG,8BAA8B,CAAC,EAAE,EAC7E,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA4B/B"}
1
+ {"version":3,"file":"userMetadata.d.ts","sourceRoot":"","sources":["../../src/utils/userMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,WAAW,EAGX,GAAG,EACH,qBAAqB,EACrB,8BAA8B,EAC9B,gCAAgC,EAChC,iBAAiB,EACjB,MAAM,EAEP,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAUL,YAAY,EAKb,MAAM,QAAQ,CAAC;AAOhB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,cAAc,YAAY,EAC1B,MAAM,iBAAiB,EACvB,WAAU,MAAM,CAAC,OAAO,CAAU,EAClC,gBAAe,OAAc,EAC7B,2BAA0B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,EAAO,EACjE,2BAA0B;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,EAAO,EACjE,0BAAyB,gBAAgB,GAAG,SAAqB,EACjE,QAAO,iBAAwB,KAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,CAyDpC,CAAC;AAsSF,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,GAAG,CAAC,qBAAqB,CAAC,EAC/B,MAAM,EAAE,CAAC,gCAAgC,GAAG,8BAA8B,CAAC,EAAE,EAC7E,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA4B/B"}
@@ -8,7 +8,7 @@ const buffer_1 = require("buffer");
8
8
  const system_1 = require("@solana-program/system");
9
9
  const sysvars_1 = require("@solana/sysvars");
10
10
  const address_lookup_table_1 = require("@solana-program/address-lookup-table");
11
- const getUserLutAddressAndSetupIxs = async (kaminoMarket, user, referrer = (0, kit_1.none)(), withExtendLut = true, multiplyMints = [], leverageMints = [], repayWithCollObligation = undefined, payer = user) => {
11
+ const getUserLutAddressAndSetupIxs = async (kaminoMarket, user, referrer = (0, kit_1.none)(), withExtendLut = true, multiplyReserveAddresses = [], leverageReserveAddresses = [], repayWithCollObligation = undefined, payer = user) => {
12
12
  const [userMetadataAddress, userMetadataState] = await kaminoMarket.getUserMetadata(user.address);
13
13
  const initUserMetadataIxs = [];
14
14
  let userLookupTableAddress;
@@ -36,7 +36,7 @@ const getUserLutAddressAndSetupIxs = async (kaminoMarket, user, referrer = (0, k
36
36
  }
37
37
  const setupUserMetadataIxs = [initUserMetadataIxs];
38
38
  if (withExtendLut) {
39
- const dedupUserLutAddresses = await getDedupUserLookupTableAddresses(kaminoMarket, userLookupTableAddress, user.address, referrer, multiplyMints, leverageMints, userMetadataState !== null, repayWithCollObligation);
39
+ const dedupUserLutAddresses = await getDedupUserLookupTableAddresses(kaminoMarket, userLookupTableAddress, user.address, referrer, multiplyReserveAddresses, leverageReserveAddresses, userMetadataState !== null, repayWithCollObligation);
40
40
  const extendLookupTableChunkIxs = (0, lib_1.extendLookupTableIxs)(user, userLookupTableAddress, dedupUserLutAddresses, payer);
41
41
  for (const extendLutIx of extendLookupTableChunkIxs) {
42
42
  setupUserMetadataIxs.push([extendLutIx]);
@@ -45,8 +45,8 @@ const getUserLutAddressAndSetupIxs = async (kaminoMarket, user, referrer = (0, k
45
45
  return [userLookupTableAddress, setupUserMetadataIxs];
46
46
  };
47
47
  exports.getUserLutAddressAndSetupIxs = getUserLutAddressAndSetupIxs;
48
- const getDedupUserLookupTableAddresses = async (kaminoMarket, tableAddress, user, referrer, multiplyMints = [], leverageMints = [], tableExists, repayWithCollObligation = undefined) => {
49
- const requiredAddresses = await getUserLookupTableAddresses(kaminoMarket, user, referrer, multiplyMints, leverageMints, repayWithCollObligation);
48
+ const getDedupUserLookupTableAddresses = async (kaminoMarket, tableAddress, user, referrer, multiplyReserveAddresses = [], leverageReserveAddresses = [], tableExists, repayWithCollObligation = undefined) => {
49
+ const requiredAddresses = await getUserLookupTableAddresses(kaminoMarket, user, referrer, multiplyReserveAddresses, leverageReserveAddresses, repayWithCollObligation);
50
50
  if (tableExists) {
51
51
  const userLookupTable = (await (0, address_lookup_table_1.fetchAddressLookupTable)(kaminoMarket.getRpc(), tableAddress)).data;
52
52
  const addressesAndLogsNotInLut = requiredAddresses.filter((addressAndLogs) => userLookupTable.addresses.filter((a) => a === addressAndLogs.address).length === 0);
@@ -65,19 +65,28 @@ const getDedupUserLookupTableAddresses = async (kaminoMarket, tableAddress, user
65
65
  return [...new Set(addressNotInLut)];
66
66
  }
67
67
  };
68
- const getUserLookupTableAddresses = async (kaminoMarket, user, referrer, multiplyMints = [], leverageMints = [], repayWithCollObligation = undefined) => {
68
+ const getUserLookupTableAddresses = async (kaminoMarket, user, referrer, multiplyReserveAddresses = [], leverageReserveAddresses = [], repayWithCollObligation = undefined) => {
69
69
  const addresses = [];
70
70
  addresses.push({ address: user, log: 'user address' });
71
71
  const [userMetadataAddress] = await (0, lib_1.userMetadataPda)(user, kaminoMarket.programId);
72
72
  addresses.push({ address: userMetadataAddress, log: 'userMetadata address' });
73
73
  const allMints = [];
74
- multiplyMints.forEach(({ coll: collMint, debt: debtMint }) => {
75
- allMints.push(collMint);
76
- allMints.push(debtMint);
74
+ const allReserves = [];
75
+ multiplyReserveAddresses.forEach(({ coll: collReserveAddress, debt: debtReserveAddress }) => {
76
+ const collReserveMint = kaminoMarket.getExistingReserveByAddress(collReserveAddress).getLiquidityMint();
77
+ const debtReserveMint = kaminoMarket.getExistingReserveByAddress(debtReserveAddress).getLiquidityMint();
78
+ allMints.push(collReserveMint);
79
+ allMints.push(debtReserveMint);
80
+ allReserves.push(collReserveAddress);
81
+ allReserves.push(debtReserveAddress);
77
82
  });
78
- leverageMints.forEach(({ coll: collMint, debt: debtMint }) => {
79
- allMints.push(collMint);
80
- allMints.push(debtMint);
83
+ leverageReserveAddresses.forEach(({ coll: collReserveAddress, debt: debtReserveAddress }) => {
84
+ const collReserveMint = kaminoMarket.getExistingReserveByAddress(collReserveAddress).getLiquidityMint();
85
+ const debtReserveMint = kaminoMarket.getExistingReserveByAddress(debtReserveAddress).getLiquidityMint();
86
+ allMints.push(collReserveMint);
87
+ allMints.push(debtReserveMint);
88
+ allReserves.push(collReserveAddress);
89
+ allReserves.push(debtReserveAddress);
81
90
  });
82
91
  if (repayWithCollObligation) {
83
92
  repayWithCollObligation.borrows.forEach((borrow) => {
@@ -88,9 +97,10 @@ const getUserLookupTableAddresses = async (kaminoMarket, user, referrer, multipl
88
97
  });
89
98
  }
90
99
  const dedupMints = [...new Set(allMints)];
100
+ const dedupReserveAddresses = [...new Set(allReserves)];
91
101
  const reserves = [];
92
- dedupMints.forEach((mint) => {
93
- const kaminoReserve = kaminoMarket.getReserveByMint(mint);
102
+ dedupReserveAddresses.forEach((reserveAddress) => {
103
+ const kaminoReserve = kaminoMarket.getReserveByAddress(reserveAddress);
94
104
  if (kaminoReserve) {
95
105
  reserves.push(kaminoReserve);
96
106
  }
@@ -127,10 +137,10 @@ const getUserLookupTableAddresses = async (kaminoMarket, user, referrer, multipl
127
137
  }));
128
138
  addresses.push(...referrerTokenStates);
129
139
  }
130
- const [multiplyObligations, multiplyObligationsFarmUserStates] = await getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket, user, multiplyMints);
140
+ const [multiplyObligations, multiplyObligationsFarmUserStates] = await getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket, user, multiplyReserveAddresses);
131
141
  addresses.push(...multiplyObligations);
132
142
  addresses.push(...multiplyObligationsFarmUserStates);
133
- const [leverageObligations, leverageObligationsFarmUserStates] = await getLeverageObligationAndObligationFarmStateAddresses(kaminoMarket, user, leverageMints);
143
+ const [leverageObligations, leverageObligationsFarmUserStates] = await getLeverageObligationAndObligationFarmStateAddresses(kaminoMarket, user, leverageReserveAddresses);
134
144
  addresses.push(...leverageObligations);
135
145
  addresses.push(...leverageObligationsFarmUserStates);
136
146
  if (repayWithCollObligation) {
@@ -140,12 +150,14 @@ const getUserLookupTableAddresses = async (kaminoMarket, user, referrer, multipl
140
150
  }
141
151
  return addresses;
142
152
  };
143
- async function getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket, user, mints) {
153
+ async function getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket, user, reserveAddresses) {
144
154
  const obligationPdas = [];
145
155
  const farmUserStates = [];
146
- for (const { coll: collMint, debt: debtMint } of mints) {
147
- const collReserve = kaminoMarket.getReserveByMint(collMint);
148
- const debtReserve = kaminoMarket.getReserveByMint(debtMint);
156
+ for (const { coll: collReserveAddress, debt: debtReserveAddress } of reserveAddresses) {
157
+ const collReserve = kaminoMarket.getReserveByAddress(collReserveAddress);
158
+ const debtReserve = kaminoMarket.getReserveByAddress(debtReserveAddress);
159
+ const collMint = collReserve.getLiquidityMint();
160
+ const debtMint = debtReserve.getLiquidityMint();
149
161
  const collMintString = collMint.toString();
150
162
  const debtMintString = debtMint.toString();
151
163
  if (collReserve && debtReserve) {
@@ -154,6 +166,11 @@ async function getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket
154
166
  address: await multiplyObligation.toPda(kaminoMarket.getAddress(), user),
155
167
  log: 'multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,
156
168
  });
169
+ const multiplyObligationFixedRate = new lib_1.MultiplyObligationFixedRate(collReserveAddress, debtReserveAddress, kaminoMarket.programId);
170
+ obligationPdas.push({
171
+ address: await multiplyObligationFixedRate.toPda(kaminoMarket.getAddress(), user),
172
+ log: 'multiply obligation fixed rate coll: ' + collReserveAddress + ' debt: ' + debtReserveAddress,
173
+ });
157
174
  if (collReserve.state.farmCollateral !== lib_1.DEFAULT_PUBLIC_KEY) {
158
175
  farmUserStates.push({
159
176
  address: await (0, lib_1.obligationFarmStatePda)(collReserve.state.farmCollateral, await multiplyObligation.toPda(kaminoMarket.getAddress(), user)),
@@ -170,12 +187,14 @@ async function getMultiplyObligationAndObligationFarmStateAddresses(kaminoMarket
170
187
  }
171
188
  return [obligationPdas, farmUserStates];
172
189
  }
173
- async function getLeverageObligationAndObligationFarmStateAddresses(kaminoMarket, user, mints) {
190
+ async function getLeverageObligationAndObligationFarmStateAddresses(kaminoMarket, user, reserveAddresses) {
174
191
  const obligationPdas = [];
175
192
  const farmUserStates = [];
176
- for (const { coll: collMint, debt: debtMint } of mints) {
177
- const collReserve = kaminoMarket.getReserveByMint(collMint);
178
- const debtReserve = kaminoMarket.getReserveByMint(debtMint);
193
+ for (const { coll: collReserveAddress, debt: debtReserveAddress } of reserveAddresses) {
194
+ const collReserve = kaminoMarket.getReserveByAddress(collReserveAddress);
195
+ const debtReserve = kaminoMarket.getReserveByAddress(debtReserveAddress);
196
+ const collMint = collReserve.getLiquidityMint();
197
+ const debtMint = debtReserve.getLiquidityMint();
179
198
  const collMintString = collMint.toString();
180
199
  const debtMintString = debtMint.toString();
181
200
  if (collReserve && debtReserve) {
@@ -184,6 +203,11 @@ async function getLeverageObligationAndObligationFarmStateAddresses(kaminoMarket
184
203
  address: await leverageObligation.toPda(kaminoMarket.getAddress(), user),
185
204
  log: 'leverage obligation coll: ' + collMintString + ' debt: ' + debtMintString,
186
205
  });
206
+ const leverageObligationFixedRate = new lib_1.LeverageObligationFixedRate(collReserveAddress, debtReserveAddress, kaminoMarket.programId);
207
+ obligationPdas.push({
208
+ address: await leverageObligationFixedRate.toPda(kaminoMarket.getAddress(), user),
209
+ log: 'leverage obligation fixed rate coll: ' + collReserveAddress + ' debt: ' + debtReserveAddress,
210
+ });
187
211
  if (collReserve.state.farmCollateral !== lib_1.DEFAULT_PUBLIC_KEY) {
188
212
  farmUserStates.push({
189
213
  address: await (0, lib_1.obligationFarmStatePda)(collReserve.state.farmCollateral, await leverageObligation.toPda(kaminoMarket.getAddress(), user)),
@@ -204,7 +228,7 @@ async function getRepayWithCollObligationFarmStateAddresses(kaminoMarket, obliga
204
228
  const farmUserStates = [];
205
229
  const obligationString = obligation.obligationAddress.toString();
206
230
  for (const borrow of obligation.getBorrows()) {
207
- const borrowReserve = kaminoMarket.getReserveByMint(borrow.mintAddress);
231
+ const borrowReserve = kaminoMarket.getReserveByAddress(borrow.reserveAddress);
208
232
  if (borrowReserve.state.farmDebt !== lib_1.DEFAULT_PUBLIC_KEY) {
209
233
  farmUserStates.push({
210
234
  address: await (0, lib_1.obligationFarmStatePda)(borrowReserve.state.farmDebt, obligation.obligationAddress),
@@ -213,7 +237,7 @@ async function getRepayWithCollObligationFarmStateAddresses(kaminoMarket, obliga
213
237
  }
214
238
  }
215
239
  for (const deposit of obligation.getDeposits()) {
216
- const depositReserve = kaminoMarket.getReserveByMint(deposit.mintAddress);
240
+ const depositReserve = kaminoMarket.getReserveByAddress(deposit.reserveAddress);
217
241
  if (depositReserve.state.farmCollateral !== lib_1.DEFAULT_PUBLIC_KEY) {
218
242
  farmUserStates.push({
219
243
  address: await (0, lib_1.obligationFarmStatePda)(depositReserve.state.farmCollateral, obligation.obligationAddress),
@@ -1 +1 @@
1
- {"version":3,"file":"userMetadata.js","sourceRoot":"","sources":["../../src/utils/userMetadata.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"userMetadata.js","sourceRoot":"","sources":["../../src/utils/userMetadata.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  export declare function checkThat(evaluationResult: boolean, message?: string): void;
2
2
  export declare function checkDefined<T>(value: T | undefined, message?: string): T;
3
3
  export declare function checkNotNull<T>(value: T | null, message?: string): T;
4
+ export declare function checkArrayNotEmpty<T>(array: T[], message?: string): T[];
4
5
  export declare function getSingleElement<T>(iterable: Iterable<T>, nameWithinMessage?: string): T;
5
6
  //# sourceMappingURL=validations.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/utils/validations.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAE,MAA8B,GAAG,IAAI,CAIlG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,GAAE,MAA0B,GAAG,CAAC,CAG5F;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,MAAqB,GAAG,CAAC,CAGlF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,GAAE,MAAkB,GAAG,CAAC,CAcnG"}
1
+ {"version":3,"file":"validations.d.ts","sourceRoot":"","sources":["../../src/utils/validations.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,gBAAgB,EAAE,OAAO,EAAE,OAAO,GAAE,MAA8B,GAAG,IAAI,CAIlG;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,OAAO,GAAE,MAA0B,GAAG,CAAC,CAG5F;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,GAAE,MAAqB,GAAG,CAAC,CAGlF;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,GAAE,MAAyB,GAAG,CAAC,EAAE,CAGzF;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,iBAAiB,GAAE,MAAkB,GAAG,CAAC,CAcnG"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.checkThat = checkThat;
4
4
  exports.checkDefined = checkDefined;
5
5
  exports.checkNotNull = checkNotNull;
6
+ exports.checkArrayNotEmpty = checkArrayNotEmpty;
6
7
  exports.getSingleElement = getSingleElement;
7
8
  function checkThat(evaluationResult, message = 'precondition failed') {
8
9
  if (!evaluationResult) {
@@ -17,6 +18,10 @@ function checkNotNull(value, message = 'value null') {
17
18
  checkThat(value !== null, message);
18
19
  return value;
19
20
  }
21
+ function checkArrayNotEmpty(array, message = 'array is empty') {
22
+ checkThat(array.length > 0, message);
23
+ return array;
24
+ }
20
25
  function getSingleElement(iterable, nameWithinMessage = 'element') {
21
26
  const nothingReturnedMarker = {};
22
27
  let single = nothingReturnedMarker;
@@ -1 +1 @@
1
- {"version":3,"file":"validations.js","sourceRoot":"","sources":["../../src/utils/validations.ts"],"names":[],"mappings":";;AAAA,8BAIC;AAED,oCAGC;AAED,oCAGC;AAED,4CAcC;AA9BD,SAAgB,SAAS,CAAC,gBAAyB,EAAE,UAAkB,qBAAqB;IAC1F,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAAI,KAAoB,EAAE,UAAkB,iBAAiB;IACvF,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE,OAAO,CAAC,CAAC;IACxC,OAAO,KAAU,CAAC;AACpB,CAAC;AAED,SAAgB,YAAY,CAAI,KAAe,EAAE,UAAkB,YAAY;IAC7E,SAAS,CAAC,KAAK,KAAK,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,KAAU,CAAC;AACpB,CAAC;AAED,SAAgB,gBAAgB,CAAI,QAAqB,EAAE,oBAA4B,SAAS;IAC9F,MAAM,qBAAqB,GAAG,EAAE,CAAC;IACjC,IAAI,MAAM,GAAW,qBAAqB,CAAC;IAC3C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;YACrC,MAAM,GAAG,OAAO,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,eAAe,iBAAiB,+BAA+B,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IACD,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,eAAe,iBAAiB,2BAA2B,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAW,CAAC;AACrB,CAAC"}
1
+ {"version":3,"file":"validations.js","sourceRoot":"","sources":["../../src/utils/validations.ts"],"names":[],"mappings":";;AAAA,8BAIC;AAED,oCAGC;AAED,oCAGC;AAED,gDAGC;AAED,4CAcC;AAnCD,SAAgB,SAAS,CAAC,gBAAyB,EAAE,UAAkB,qBAAqB;IAC1F,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAAI,KAAoB,EAAE,UAAkB,iBAAiB;IACvF,SAAS,CAAC,KAAK,KAAK,SAAS,EAAE,OAAO,CAAC,CAAC;IACxC,OAAO,KAAU,CAAC;AACpB,CAAC;AAED,SAAgB,YAAY,CAAI,KAAe,EAAE,UAAkB,YAAY;IAC7E,SAAS,CAAC,KAAK,KAAK,IAAI,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,KAAU,CAAC;AACpB,CAAC;AAED,SAAgB,kBAAkB,CAAI,KAAU,EAAE,UAAkB,gBAAgB;IAClF,SAAS,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,gBAAgB,CAAI,QAAqB,EAAE,oBAA4B,SAAS;IAC9F,MAAM,qBAAqB,GAAG,EAAE,CAAC;IACjC,IAAI,MAAM,GAAW,qBAAqB,CAAC;IAC3C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;YACrC,MAAM,GAAG,OAAO,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,eAAe,iBAAiB,+BAA+B,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IACD,IAAI,MAAM,KAAK,qBAAqB,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,eAAe,iBAAiB,2BAA2B,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAW,CAAC;AACrB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kamino-finance/klend-sdk",
3
- "version": "7.3.9",
3
+ "version": "7.3.10-beta.1",
4
4
  "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
5
5
  "repository": {
6
6
  "type": "git",