@haven-fi/solauto-sdk 1.0.364 → 1.0.366

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/utils/jupiterUtils.js +1 -1
  2. package/dist/utils/solanaUtils.d.ts.map +1 -1
  3. package/dist/utils/solanaUtils.js +7 -0
  4. package/dist/utils/solauto/rebalanceUtils.js +1 -1
  5. package/package.json +1 -1
  6. package/src/utils/jupiterUtils.ts +1 -1
  7. package/src/utils/solanaUtils.ts +9 -5
  8. package/src/utils/solauto/rebalanceUtils.ts +1 -1
  9. package/tests/transactions/solautoMarginfi.ts +2 -2
package/dist/utils/jupiterUtils.js CHANGED
@@ -34,7 +34,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
34
34
  ? "ExactIn"
35
35
  : undefined,
36
36
  slippageBps: memecoinSwap ? 150 : 50,
37
- maxAccounts: !swapDetails.exactOut ? 60 : undefined,
37
+ maxAccounts: !swapDetails.exactOut ? 50 : undefined,
38
38
  }), 4, 200);
39
39
  const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
40
40
  const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *
package/dist/utils/solanaUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmC7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAgEjC"}
1
+ {"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmC7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoEjC"}
package/dist/utils/solanaUtils.js CHANGED
@@ -220,6 +220,13 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, txType, prior
220
220
  (0, generalUtils_1.consoleLog)("Sending single optimized transaction...");
221
221
  (0, generalUtils_1.consoleLog)("Instructions: ", tx.getInstructions().length);
222
222
  (0, generalUtils_1.consoleLog)("Serialized transaction size: ", tx.getTransactionSize(umi));
223
+ const accounts = tx
224
+ .getInstructions()
225
+ .flatMap((x) => [
226
+ x.programId.toString(),
227
+ ...x.keys.map((y) => y.pubkey.toString()),
228
+ ]);
229
+ (0, generalUtils_1.consoleLog)("Unique account locks: ", Array.from(new Set(accounts)).length);
223
230
  const blockhash = await connection.getLatestBlockhash("confirmed");
224
231
  let computeUnitLimit = undefined;
225
232
  if (txType !== "skip-simulation") {
package/dist/utils/solauto/rebalanceUtils.js CHANGED
@@ -105,7 +105,7 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
105
105
  ? "boost"
106
106
  : "repay",
107
107
  rebalanceDirection,
108
- feesUsd: debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps),
108
+ feesUsd: Math.abs(debtAdjustmentUsd * (0, numberUtils_1.fromBps)(adjustmentFeeBps)),
109
109
  };
110
110
  }
111
111
  function getFlashLoanDetails(client, values, jupQuote) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.364",
3
+ "version": "1.0.366",
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/utils/jupiterUtils.ts CHANGED
@@ -71,7 +71,7 @@ export async function getJupSwapTransaction(
71
71
  ? "ExactIn"
72
72
  : undefined,
73
73
  slippageBps: memecoinSwap ? 150 : 50,
74
- maxAccounts: !swapDetails.exactOut ? 60 : undefined,
74
+ maxAccounts: !swapDetails.exactOut ? 50 : undefined,
75
75
  }),
76
76
  4,
77
77
  200
package/src/utils/solanaUtils.ts CHANGED
@@ -385,6 +385,14 @@ export async function sendSingleOptimizedTransaction(
385
385
  consoleLog("Instructions: ", tx.getInstructions().length);
386
386
  consoleLog("Serialized transaction size: ", tx.getTransactionSize(umi));
387
387
 
388
+ const accounts = tx
389
+ .getInstructions()
390
+ .flatMap((x) => [
391
+ x.programId.toString(),
392
+ ...x.keys.map((y) => y.pubkey.toString()),
393
+ ]);
394
+ consoleLog("Unique account locks: ", Array.from(new Set(accounts)).length);
395
+
388
396
  const blockhash = await connection.getLatestBlockhash("confirmed");
389
397
 
390
398
  let computeUnitLimit = undefined;
@@ -410,11 +418,7 @@ export async function sendSingleOptimizedTransaction(
410
418
 
411
419
  let cuPrice: number | undefined;
412
420
  if (prioritySetting !== PriorityFeeSetting.None) {
413
- cuPrice = await getComputeUnitPriceEstimate(
414
- umi,
415
- tx,
416
- prioritySetting,
417
- );
421
+ cuPrice = await getComputeUnitPriceEstimate(umi, tx, prioritySetting);
418
422
  if (!cuPrice) {
419
423
  cuPrice = 1000000;
420
424
  }
package/src/utils/solauto/rebalanceUtils.ts CHANGED
@@ -232,7 +232,7 @@ export function getRebalanceValues(
232
232
  ? "boost"
233
233
  : "repay",
234
234
  rebalanceDirection,
235
- feesUsd: debtAdjustmentUsd * fromBps(adjustmentFeeBps),
235
+ feesUsd: Math.abs(debtAdjustmentUsd * fromBps(adjustmentFeeBps)),
236
236
  };
237
237
  }
238
238
 
package/tests/transactions/solautoMarginfi.ts CHANGED
@@ -40,7 +40,7 @@ describe("Solauto Marginfi tests", async () => {
40
40
  const signer = setupTest("solauto-manager");
41
41
 
42
42
  const payForTransactions = false;
43
- const testProgram = true;
43
+ const testProgram = false;
44
44
  const positionId = 1;
45
45
 
46
46
  it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
@@ -57,7 +57,7 @@ describe("Solauto Marginfi tests", async () => {
57
57
  await client.initialize({
58
58
  signer,
59
59
  positionId,
60
- authority: new PublicKey("rC5dMP5dmSsfQ66rynzfFzuc122Eex9h1RJHVDkeH6D"),
60
+ authority: new PublicKey("5FALSVLRjuRZHSmQVdT2RUZC6KadCuDmxY7gaQFWFBxf"),
61
61
  // new: true,
62
62
  // marginfiAccount: new PublicKey(
63
63
  // "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"