@haven-fi/solauto-sdk 1.0.784 → 1.0.786

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/idls/switchboard.json +1949 -0
  2. package/dist/utils/instructionUtils.d.ts +1 -1
  3. package/dist/utils/instructionUtils.d.ts.map +1 -1
  4. package/dist/utils/instructionUtils.js +2 -2
  5. package/dist/utils/switchboardUtils.d.ts +1 -1
  6. package/dist/utils/switchboardUtils.d.ts.map +1 -1
  7. package/dist/utils/switchboardUtils.js +14 -13
  8. package/local/txSandbox.ts +2 -2
  9. package/package.json +5 -5
  10. package/src/idls/switchboard.json +1949 -0
  11. package/src/utils/instructionUtils.ts +3 -2
  12. package/src/utils/switchboardUtils.ts +12 -20
package/dist/utils/instructionUtils.d.ts CHANGED
@@ -10,6 +10,6 @@ export declare function deposit(client: SolautoClient, baseUnitAmount: bigint):
10
10
  export declare function borrow(client: SolautoClient, baseUnitAmount: bigint): TransactionItem;
11
11
  export declare function withdraw(client: SolautoClient, amount: "All" | bigint): TransactionItem;
12
12
  export declare function repay(client: SolautoClient, amount: "All" | bigint): TransactionItem;
13
- export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number, bpsDistanceFromRebalance?: number): TransactionItem;
13
+ export declare function rebalance(client: SolautoClient, targetLiqUtilizationRateBps?: number, bpsDistanceFromRebalance?: number, optimizeSize?: boolean): TransactionItem;
14
14
  export declare function swapThenDeposit(client: SolautoClient, depositMint: PublicKey, depositAmountBaseUnit: bigint): TransactionItem[];
15
15
  //# sourceMappingURL=instructionUtils.d.ts.map
package/dist/utils/instructionUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,EACxB,YAAY,CAAC,EAAE,YAAY,mBAQ5B;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAWnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAerE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,wBAAwB,CAAC,EAAE,MAAM,mBAalC;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}
1
+ {"version":3,"file":"instructionUtils.d.ts","sourceRoot":"","sources":["../../src/utils/instructionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,0BAA0B,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,aAAa,EAEb,eAAe,EAEhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,gCAAgC,EAC/C,GAAG,CAAC,EAAE,kBAAkB,EACxB,YAAY,CAAC,EAAE,YAAY,mBAQ5B;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,mBAOzD;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,gBAAgB,CAAC,gCAAgC,CAAC,EAC5D,GAAG,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,mBAY1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,mBAOrD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAUpE;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,mBAWnE;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAerE;AAED,wBAAgB,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,mBAclE;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,wBAAwB,CAAC,EAAE,MAAM,EACjC,YAAY,CAAC,EAAE,OAAO,mBAavB;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,SAAS,EACtB,qBAAqB,EAAE,MAAM,qBAyC9B"}
package/dist/utils/instructionUtils.js CHANGED
@@ -77,8 +77,8 @@ function repay(client, amount) {
77
77
  }),
78
78
  }), "repay");
79
79
  }
80
- function rebalance(client, targetLiqUtilizationRateBps, bpsDistanceFromRebalance) {
81
- return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError, bpsDistanceFromRebalance).buildRebalanceTx(attemptNum), "rebalance", true);
80
+ function rebalance(client, targetLiqUtilizationRateBps, bpsDistanceFromRebalance, optimizeSize) {
81
+ return new services_1.TransactionItem(async (attemptNum, prevError) => await new services_1.RebalanceTxBuilder(client, targetLiqUtilizationRateBps, optimizeSize || (attemptNum > 2 && prevError instanceof services_1.TransactionTooLargeError), bpsDistanceFromRebalance).buildRebalanceTx(attemptNum), "rebalance", true);
82
82
  }
83
83
  function swapThenDeposit(client, depositMint, depositAmountBaseUnit) {
84
84
  return [
package/dist/utils/switchboardUtils.d.ts CHANGED
@@ -2,7 +2,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
2
2
  import { Signer } from "@metaplex-foundation/umi";
3
3
  import * as OnDemand from "@switchboard-xyz/on-demand";
4
4
  import { TransactionItemInputs } from "../types";
5
- export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<OnDemand.PullFeed>;
5
+ export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): OnDemand.PullFeed;
6
6
  export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
7
7
  export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
8
8
  mint: PublicKey;
package/dist/utils/switchboardUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,8BAwBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CA4C5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
1
+ {"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAIvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAOjD,wBAAgB,WAAW,CACzB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS,qBAuBnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoC5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
package/dist/utils/switchboardUtils.js CHANGED
@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
25
28
  Object.defineProperty(exports, "__esModule", { value: true });
26
29
  exports.getPullFeed = getPullFeed;
27
30
  exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
@@ -32,36 +35,34 @@ const umi_1 = require("@metaplex-foundation/umi");
32
35
  const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
33
36
  const anchor_1 = require("@coral-xyz/anchor");
34
37
  const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
38
+ const switchboard_json_1 = __importDefault(require("../idls/switchboard.json"));
35
39
  const constants_1 = require("../constants");
36
40
  const generalUtils_1 = require("./generalUtils");
37
41
  const solanaUtils_1 = require("./solanaUtils");
38
- async function getPullFeed(conn, mint, wallet) {
42
+ function getPullFeed(conn, mint, wallet) {
39
43
  const dummyWallet = {
40
44
  publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
41
45
  signTransaction: async (tx) => tx,
42
46
  signAllTransactions: async (txs) => txs,
43
47
  };
44
48
  const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
45
- const { PullFeed, ON_DEMAND_MAINNET_PID } = OnDemand;
46
- const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
47
- console.log(new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId).toString());
48
- return new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
49
+ const program = new anchor_1.Program(switchboard_json_1.default, provider);
50
+ const { PullFeed } = OnDemand;
51
+ return new PullFeed(program, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId));
49
52
  }
50
53
  async function buildSwbSubmitResponseTx(conn, signer, mint) {
51
- const feed = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
52
- const gateway = await feed.fetchGatewayUrl();
53
- const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
54
+ const feed = getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
55
+ const [pullIx, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
54
56
  const res = await feed.fetchUpdateIx({
55
- gateway: gateway,
56
57
  chain: "solana",
57
- network: "mainnet",
58
+ network: "mainnet-beta",
58
59
  });
59
60
  if (!res[1] || !res[1][0].value) {
60
61
  throw new Error("Unable to fetch Switchboard pull IX");
61
62
  }
62
63
  return res;
63
64
  }, 3, 200);
64
- if (!pullIxs || !pullIxs.length) {
65
+ if (!pullIx) {
65
66
  throw new Error("Unable to fetch SWB crank IX");
66
67
  }
67
68
  const price = responses[0].value.toNumber();
@@ -73,7 +74,7 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
73
74
  time: (0, generalUtils_1.currentUnixSeconds)(),
74
75
  };
75
76
  return {
76
- tx: (0, umi_1.transactionBuilder)(pullIxs.map((x) => (0, solanaUtils_1.getWrappedInstruction)(signer, x))),
77
+ tx: (0, umi_1.transactionBuilder)([(0, solanaUtils_1.getWrappedInstruction)(signer, pullIx)]),
77
78
  lookupTableAddresses: responses
78
79
  .filter((x) => Boolean(x.oracle.lut?.key))
79
80
  .map((x) => x.oracle.lut.key.toString()),
@@ -85,7 +86,7 @@ async function getSwitchboardFeedData(conn, mints) {
85
86
  }
86
87
  const currSlot = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await conn.getSlot("confirmed"), 5);
87
88
  const results = await Promise.all(mints.map(async (mint) => {
88
- const feed = await getPullFeed(conn, mint);
89
+ const feed = getPullFeed(conn, mint);
89
90
  const result = await feed.loadData();
90
91
  const price = Number(result.result.value) / Math.pow(10, 18);
91
92
  const stale = currSlot > result.result.slot.toNumber() + result.maxStaleness;
package/local/txSandbox.ts CHANGED
@@ -22,7 +22,7 @@ import {
22
22
  } from "../src";
23
23
  import { getSecretKey } from "./shared";
24
24
 
25
- const payForTransaction = false;
25
+ const payForTransaction = true;
26
26
  const testProgram = false;
27
27
  const lpEnv: ProgramEnv = "Prod";
28
28
 
@@ -48,7 +48,7 @@ export async function main() {
48
48
 
49
49
  await client.initializeExistingSolautoPosition({
50
50
  positionId: 1,
51
- authority: new PublicKey("HLdUMx3kdM2QDQfHFaDw1QUwLXtRytyaBYm7C1DPG9uX"),
51
+ authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
52
52
  // lpUserAccount: new PublicKey(
53
53
  // "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
54
54
  // ),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.784",
3
+ "version": "1.0.786",
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",
@@ -12,16 +12,16 @@
12
12
  "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts"
13
13
  },
14
14
  "dependencies": {
15
- "@coral-xyz/anchor": "=0.31.1",
15
+ "@coral-xyz/anchor": "^0.30.1",
16
16
  "@jup-ag/api": "=6.0.24",
17
17
  "@metaplex-foundation/umi": "^0.9.1",
18
18
  "@metaplex-foundation/umi-bundle-defaults": "^0.9.1",
19
19
  "@metaplex-foundation/umi-signer-wallet-adapters": "^0.9.1",
20
20
  "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
21
21
  "@solana/spl-token": "^0.4.0",
22
- "@solana/web3.js": "=1.98.2",
23
- "@switchboard-xyz/common": "=3.4.1",
24
- "@switchboard-xyz/on-demand": "=2.11.0",
22
+ "@solana/web3.js": "=1.95.8",
23
+ "@switchboard-xyz/common": "=3.0.12",
24
+ "@switchboard-xyz/on-demand": "=1.2.51",
25
25
  "axios": "^1.7.8",
26
26
  "big.js": "^6.2.2",
27
27
  "bs58": "^5.0.0",