@haven-fi/solauto-sdk 1.0.732 → 1.0.734

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 (12) hide show
  1. package/dist/services/rebalance/rebalanceTxBuilder.js +1 -1
  2. package/dist/services/transactions/transactionUtils.d.ts.map +1 -1
  3. package/dist/services/transactions/transactionUtils.js +2 -3
  4. package/dist/utils/stringUtils.d.ts +1 -0
  5. package/dist/utils/stringUtils.d.ts.map +1 -1
  6. package/dist/utils/stringUtils.js +1 -0
  7. package/local/.env +1 -1
  8. package/local/txSandbox.ts +3 -3
  9. package/package.json +1 -1
  10. package/src/services/rebalance/rebalanceTxBuilder.ts +1 -1
  11. package/src/services/transactions/transactionUtils.ts +2 -3
  12. package/src/utils/stringUtils.ts +1 -1
package/dist/services/rebalance/rebalanceTxBuilder.js CHANGED
@@ -38,7 +38,7 @@ class RebalanceTxBuilder {
38
38
  const insufficientDebtLiquidity = debtAdjustmentUsd > debtLiquidityUsdAvailable * 0.95;
39
39
  let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
40
40
  insufficientSupplyLiquidity ||
41
- (attemptNum >= 2 &&
41
+ (attemptNum > 2 &&
42
42
  debtLiquidityUsdAvailable > supplyLiquidityUsdAvailable * 5);
43
43
  if (useDebtLiquidity) {
44
44
  return !insufficientDebtLiquidity ? generated_1.TokenType.Debt : undefined;
package/dist/services/transactions/transactionUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EACL,qBAAqB,EAErB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAyLrB,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO,EAC9B,kBAAkB,CAAC,EAAE,kBAAkB;;;;EA2HxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAKrE"}
1
+ {"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA4BjE,OAAO,EACL,qBAAqB,EAErB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAyLrB,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA+LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO,EAC9B,kBAAkB,CAAC,EAAE,kBAAkB;;;;EA0HxC;AAED,wBAAgB,cAAc,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,8JAKrE"}
package/dist/services/transactions/transactionUtils.js CHANGED
@@ -357,14 +357,13 @@ function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting)
357
357
  try {
358
358
  if (error instanceof types_1.BundleSimulationError) {
359
359
  errTxIdx = error.details.transactionIdx;
360
- errIxIdx =
361
- error.details.instructionIdx -
362
- getComputeIxs(error.details.transactionIdx);
360
+ errIxIdx = error.details.instructionIdx - getComputeIxs(errTxIdx);
363
361
  errCode = error.details.errorCode;
364
362
  }
365
363
  else if (typeof error === "object" &&
366
364
  error["InstructionError"]) {
367
365
  const err = error["InstructionError"];
366
+ (0, utils_1.consoleLog)("err idx details", err[0], getComputeIxs(0), simulationSuccessful, usePriorityFee(priorityFeeSetting));
368
367
  errIxIdx = err[0] - getComputeIxs(0);
369
368
  errCode =
370
369
  typeof err[1] === "object" && "Custom" in err[1]
package/dist/utils/stringUtils.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { PublicKey } from "@solana/web3.js";
2
2
  export declare const StrategyTypes: readonly ["Long", "Short", "Ratio"];
3
3
  export type StrategyType = (typeof StrategyTypes)[number];
4
+ export declare function adjustedTicker(mint?: PublicKey): string;
4
5
  export declare function ratioMintDetails(supplyMint?: PublicKey, debtMint?: PublicKey): {
5
6
  order: (PublicKey | undefined)[];
6
7
  strategyName: string;
package/dist/utils/stringUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,eAAO,MAAM,aAAa,qCAAsC,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAc1D,wBAAgB,gBAAgB,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS;;;EAY5E;AAED,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,UAGrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,UAcrB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,GAClB,YAAY,CAWd"}
1
+ {"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,eAAO,MAAM,aAAa,qCAAsC,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,wBAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,UAU9C;AAED,wBAAgB,gBAAgB,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS;;;EAY5E;AAED,wBAAgB,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,UAGrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,UAcrB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,GAClB,YAAY,CAWd"}
package/dist/utils/stringUtils.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.StrategyTypes = void 0;
4
+ exports.adjustedTicker = adjustedTicker;
4
5
  exports.ratioMintDetails = ratioMintDetails;
5
6
  exports.ratioName = ratioName;
6
7
  exports.solautoStrategyName = solautoStrategyName;
package/local/.env CHANGED
@@ -1 +1 @@
1
- ADDRESS_WHITELIST=5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe,He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz,5LTSvc5LhGcHCitw815j9DcpYrTzKpmyjf31n1Kb6zeR,E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe,DRP5cgM1JpnMySvwg3jqRP2VA2DXSWUjo6VGLkNZ2etb
1
+ ADDRESS_WHITELIST=5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe,He4ka5Q3N1UvZikZvykdi47xyk5PoVP2tcQL5sVp31Sz,E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe,DRP5cgM1JpnMySvwg3jqRP2VA2DXSWUjo6VGLkNZ2etb
package/local/txSandbox.ts CHANGED
@@ -47,14 +47,14 @@ export async function main() {
47
47
  });
48
48
 
49
49
  await client.initializeExistingSolautoPosition({
50
- positionId: 2,
51
- authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
50
+ positionId: 1,
51
+ authority: new PublicKey("7ZN1w3ZE51FTXxdDjPPNpdZHuXWRvDK2h6osTHNXfsuL"),
52
52
  // lpUserAccount: new PublicKey(
53
53
  // "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
54
54
  // ),
55
55
  });
56
56
 
57
- const transactionItems = [rebalance(client)];
57
+ const transactionItems = [rebalance(client, undefined, 300)];
58
58
 
59
59
  const txManager = new ClientTransactionsManager({
60
60
  txHandler: client,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.732",
3
+ "version": "1.0.734",
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/services/rebalance/rebalanceTxBuilder.ts CHANGED
@@ -112,7 +112,7 @@ export class RebalanceTxBuilder {
112
112
  let useDebtLiquidity =
113
113
  this.values.rebalanceDirection === RebalanceDirection.Boost ||
114
114
  insufficientSupplyLiquidity ||
115
- (attemptNum >= 2 &&
115
+ (attemptNum > 2 &&
116
116
  debtLiquidityUsdAvailable > supplyLiquidityUsdAvailable * 5);
117
117
 
118
118
  if (useDebtLiquidity) {
package/src/services/transactions/transactionUtils.ts CHANGED
@@ -637,9 +637,7 @@ export function getErrorInfo(
637
637
  try {
638
638
  if (error instanceof BundleSimulationError) {
639
639
  errTxIdx = error.details.transactionIdx;
640
- errIxIdx =
641
- error.details.instructionIdx -
642
- getComputeIxs(error.details.transactionIdx);
640
+ errIxIdx = error.details.instructionIdx - getComputeIxs(errTxIdx);
643
641
  errCode = error.details.errorCode;
644
642
  } else if (
645
643
  typeof error === "object" &&
@@ -647,6 +645,7 @@ export function getErrorInfo(
647
645
  ) {
648
646
  const err = (error as any)["InstructionError"];
649
647
 
648
+ consoleLog("err idx details", err[0], getComputeIxs(0), simulationSuccessful, usePriorityFee(priorityFeeSetting));
650
649
  errIxIdx = err[0] - getComputeIxs(0);
651
650
  errCode =
652
651
  typeof err[1] === "object" && "Custom" in err[1]
package/src/utils/stringUtils.ts CHANGED
@@ -6,7 +6,7 @@ import { tokenInfo } from "./generalUtils";
6
6
  export const StrategyTypes = ["Long", "Short", "Ratio"] as const;
7
7
  export type StrategyType = (typeof StrategyTypes)[number];
8
8
 
9
- function adjustedTicker(mint?: PublicKey) {
9
+ export function adjustedTicker(mint?: PublicKey) {
10
10
  const info = tokenInfo(mint);
11
11
 
12
12
  if (info.ticker.toLowerCase() === "wbtc") {