@haven-fi/solauto-sdk 1.0.374 → 1.0.376

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 (9) hide show
  1. package/dist/transactions/transactionsManager.js +9 -8
  2. package/dist/utils/jitoUtils.d.ts.map +1 -1
  3. package/dist/utils/jitoUtils.js +0 -2
  4. package/dist/utils/marginfiUtils.d.ts.map +1 -1
  5. package/dist/utils/marginfiUtils.js +3 -1
  6. package/package.json +1 -1
  7. package/src/transactions/transactionsManager.ts +8 -8
  8. package/src/utils/jitoUtils.ts +0 -2
  9. package/src/utils/marginfiUtils.ts +2 -0
package/dist/transactions/transactionsManager.js CHANGED
@@ -171,14 +171,15 @@ class TransactionsManager {
171
171
  let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
172
172
  item,
173
173
  ]);
174
- // for (let j = i; j >= 0; j--) {
175
- // if (await newSet.fitsWith(items[j])) {
176
- // newSet.prepend(items[j]);
177
- // i--;
178
- // } else {
179
- // break;
180
- // }
181
- // }
174
+ for (let j = i; j >= 0; j--) {
175
+ if (await newSet.fitsWith(items[j])) {
176
+ newSet.prepend(items[j]);
177
+ i--;
178
+ }
179
+ else {
180
+ break;
181
+ }
182
+ }
182
183
  transactionSets.unshift(newSet);
183
184
  }
184
185
  }
package/dist/utils/jitoUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAoKD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAwE/B"}
1
+ {"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,SAAS,CAAC,CAa9D;AAmKD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CAuE/B"}
package/dist/utils/jitoUtils.js CHANGED
@@ -61,7 +61,6 @@ async function simulateJitoBundle(umi, txs) {
61
61
  (0, generalUtils_1.consoleLog)(y);
62
62
  });
63
63
  });
64
- (0, generalUtils_1.consoleLog)(JSON.stringify(transactionResults, null, 2));
65
64
  const txFailure = res.summary.failed.error.TransactionFailure;
66
65
  throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
67
66
  }
@@ -140,7 +139,6 @@ async function sendJitoBundledTransactions(umi, signer, txs, txType, priorityFee
140
139
  (0, generalUtils_1.consoleLog)("Sending Jito bundle...");
141
140
  (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
142
141
  (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
143
- // consoleLog(txs.map((x) => x.getInstructions().map((x) => x.programId)));
144
142
  txs[0] = txs[0].prepend(await getTipInstruction(signer, 150000));
145
143
  const feeEstimates = priorityFeeSetting !== types_1.PriorityFeeSetting.None
146
144
  ? await Promise.all(txs.map(async (x) => (await (0, solanaUtils_1.getComputeUnitPriceEstimate)(umi, x, priorityFeeSetting)) ??
package/dist/utils/marginfiUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAiEA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,OAAO,EAAE,OAAO,UAejB;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwLpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
1
+ {"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAazB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAY1B;AAED,wBAAgB,iCAAiC,CAC/C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4C3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAiEA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,OAAO,EAAE,OAAO,UAejB;AAsDD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
package/dist/utils/marginfiUtils.js CHANGED
@@ -234,7 +234,9 @@ async function getMarginfiAccountPositionState(umi, protocolAccount, marginfiGro
234
234
  }
235
235
  const supplyMint = constants_1.TOKEN_INFO[supplyBank.mint.toString()];
236
236
  const debtMint = constants_1.TOKEN_INFO[debtBank.mint.toString()];
237
- if ((!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
237
+ if (supplyMint === undefined ||
238
+ debtMint === undefined ||
239
+ (!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
238
240
  (supplyMint.isStableCoin && debtMint.isStableCoin)) {
239
241
  return undefined;
240
242
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.374",
3
+ "version": "1.0.376",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "description": "Typescript SDK for the Solauto program on the Solana blockchain",
package/src/transactions/transactionsManager.ts CHANGED
@@ -263,14 +263,14 @@ export class TransactionsManager {
263
263
  let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
264
264
  item,
265
265
  ]);
266
- // for (let j = i; j >= 0; j--) {
267
- // if (await newSet.fitsWith(items[j])) {
268
- // newSet.prepend(items[j]);
269
- // i--;
270
- // } else {
271
- // break;
272
- // }
273
- // }
266
+ for (let j = i; j >= 0; j--) {
267
+ if (await newSet.fitsWith(items[j])) {
268
+ newSet.prepend(items[j]);
269
+ i--;
270
+ } else {
271
+ break;
272
+ }
273
+ }
274
274
  transactionSets.unshift(newSet);
275
275
  }
276
276
  }
package/src/utils/jitoUtils.ts CHANGED
@@ -89,7 +89,6 @@ async function simulateJitoBundle(umi: Umi, txs: VersionedTransaction[]) {
89
89
  });
90
90
  });
91
91
 
92
- consoleLog(JSON.stringify(transactionResults, null, 2));
93
92
  const txFailure = res.summary.failed.error.TransactionFailure;
94
93
  throw new Error(txFailure ? txFailure[1] : res.summary.failed.toString());
95
94
  }
@@ -213,7 +212,6 @@ export async function sendJitoBundledTransactions(
213
212
  "Transaction sizes: ",
214
213
  txs.map((x) => x.getTransactionSize(umi))
215
214
  );
216
- // consoleLog(txs.map((x) => x.getInstructions().map((x) => x.programId)));
217
215
 
218
216
  txs[0] = txs[0].prepend(await getTipInstruction(signer, 150_000));
219
217
  const feeEstimates =
package/src/utils/marginfiUtils.ts CHANGED
@@ -424,6 +424,8 @@ export async function getMarginfiAccountPositionState(
424
424
  const debtMint = TOKEN_INFO[debtBank.mint.toString()];
425
425
 
426
426
  if (
427
+ supplyMint === undefined ||
428
+ debtMint === undefined ||
427
429
  (!supplyMint.isStableCoin && !debtMint.isStableCoin) ||
428
430
  (supplyMint.isStableCoin && debtMint.isStableCoin)
429
431
  ) {