@haven-fi/solauto-sdk 1.0.387 → 1.0.389

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/constants/marginfiAccounts.js +14 -14
  2. package/dist/constants/tokenConstants.js +6 -6
  3. package/dist/utils/jupiterUtils.d.ts +3 -0
  4. package/dist/utils/jupiterUtils.d.ts.map +1 -1
  5. package/dist/utils/jupiterUtils.js +9 -0
  6. package/dist/utils/priceUtils.d.ts.map +1 -1
  7. package/dist/utils/priceUtils.js +3 -6
  8. package/package.json +1 -1
  9. package/src/constants/marginfiAccounts.ts +14 -14
  10. package/src/constants/tokenConstants.ts +6 -6
  11. package/src/utils/jupiterUtils.ts +15 -1
  12. package/src/utils/priceUtils.ts +4 -11
package/dist/constants/marginfiAccounts.js CHANGED
@@ -190,19 +190,19 @@ exports.MARGINFI_ACCOUNTS = {
190
190
  priceOracle: USDC_PRICE_ORACLE,
191
191
  },
192
192
  },
193
- // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
194
- // [tokens.HMTR]: {
195
- // bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
196
- // liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
197
- // vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
198
- // priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
199
- // },
200
- // [tokens.USDC]: {
201
- // bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
202
- // liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
203
- // vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
204
- // priceOracle: USDC_PRICE_ORACLE,
205
- // }
206
- // }
193
+ ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
194
+ [tokens.HMTR]: {
195
+ bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
196
+ liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
197
+ vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
198
+ priceOracle: switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
199
+ },
200
+ [tokens.USDC]: {
201
+ bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
202
+ liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
203
+ vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
204
+ priceOracle: USDC_PRICE_ORACLE,
205
+ }
206
+ }
207
207
  };
208
208
  exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
package/dist/constants/tokenConstants.js CHANGED
@@ -49,7 +49,7 @@ exports.ALL_SUPPORTED_TOKENS = [
49
49
  exports.POPCAT,
50
50
  exports.RETARDIO,
51
51
  exports.BILLY,
52
- // HMTR,
52
+ exports.HMTR,
53
53
  ];
54
54
  exports.TOKEN_INFO = {
55
55
  [web3_js_1.PublicKey.default.toString()]: {
@@ -161,9 +161,9 @@ exports.TOKEN_INFO = {
161
161
  decimals: 6,
162
162
  isMeme: true,
163
163
  },
164
- // [HMTR]: {
165
- // ticker: "HMTR",
166
- // decimals: 0,
167
- // isMeme: true,
168
- // },
164
+ [exports.HMTR]: {
165
+ ticker: "HMTR",
166
+ decimals: 0,
167
+ isMeme: true,
168
+ },
169
169
  };
package/dist/utils/jupiterUtils.d.ts CHANGED
@@ -19,4 +19,7 @@ export interface JupSwapTransaction {
19
19
  swapIx: TransactionBuilder;
20
20
  }
21
21
  export declare function getJupSwapTransaction(signer: Signer, swapDetails: JupSwapDetails, attemptNum?: number): Promise<JupSwapTransaction>;
22
+ export declare function getJupPriceData(mints: PublicKey[], extraInfo?: boolean): Promise<{
23
+ [key: string]: any;
24
+ }>;
22
25
  //# sourceMappingURL=jupiterUtils.d.ts.map
package/dist/utils/jupiterUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAsF7B"}
1
+ {"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAsF7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GAY5E"}
package/dist/utils/jupiterUtils.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getJupSwapTransaction = getJupSwapTransaction;
4
+ exports.getJupPriceData = getJupPriceData;
4
5
  const umi_1 = require("@metaplex-foundation/umi");
5
6
  const web3_js_1 = require("@solana/web3.js");
6
7
  const solanaUtils_1 = require("./solanaUtils");
@@ -70,3 +71,11 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
70
71
  swapIx: (0, umi_1.transactionBuilder)().add((0, solanaUtils_1.getWrappedInstruction)(signer, createTransactionInstruction(instructions.swapInstruction))),
71
72
  };
72
73
  }
74
+ async function getJupPriceData(mints, extraInfo) {
75
+ const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
76
+ const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +
77
+ mints.map((x) => x.toString()).join(",") + (extraInfo ? "&showExtraInfo=true" : ""))).json();
78
+ return res;
79
+ }, 6);
80
+ return data.data;
81
+ }
package/dist/utils/priceUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAarE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA6CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAoBzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}
1
+ {"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAcrE,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAqC5E;AAED,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,qBAwCrD;AAED,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC,CA6CnB;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,qBAYzD;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,SAAS,GACzC,MAAM,GAAG,SAAS,CAKpB"}
package/dist/utils/priceUtils.js CHANGED
@@ -11,6 +11,7 @@ const solautoConstants_1 = require("../constants/solautoConstants");
11
11
  const switchboardConstants_1 = require("../constants/switchboardConstants");
12
12
  const generalUtils_1 = require("./generalUtils");
13
13
  const on_demand_1 = require("@switchboard-xyz/on-demand");
14
+ const jupiterUtils_1 = require("./jupiterUtils");
14
15
  async function fetchTokenPrices(mints) {
15
16
  const currentTime = (0, generalUtils_1.currentUnixSeconds)();
16
17
  if (!mints.some((mint) => !(mint.toString() in solautoConstants_1.PRICES) ||
@@ -94,12 +95,8 @@ async function getJupTokenPrices(mints) {
94
95
  if (mints.length == 0) {
95
96
  return [];
96
97
  }
97
- const data = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
98
- const res = await (await fetch("https://api.jup.ag/price/v2?ids=" +
99
- mints.map((x) => x.toString()).join(","))).json();
100
- return res;
101
- }, 6);
102
- const prices = Object.values(data.data).map((x) => parseFloat(x.price));
98
+ const data = await (0, jupiterUtils_1.getJupPriceData)(mints);
99
+ const prices = Object.values(data).map((x) => parseFloat(x.price));
103
100
  return prices;
104
101
  }
105
102
  function safeGetPrice(mint) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.387",
3
+ "version": "1.0.389",
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/constants/marginfiAccounts.ts CHANGED
@@ -172,20 +172,20 @@ export const MARGINFI_ACCOUNTS: {
172
172
  priceOracle: USDC_PRICE_ORACLE,
173
173
  },
174
174
  },
175
- // ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
176
- // [tokens.HMTR]: {
177
- // bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
178
- // liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
179
- // vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
180
- // priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
181
- // },
182
- // [tokens.USDC]: {
183
- // bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
184
- // liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
185
- // vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
186
- // priceOracle: USDC_PRICE_ORACLE,
187
- // }
188
- // }
175
+ ["DESG67cExEcw7d6MmENLEzaocR8pLrhfiw9VrNtGWUKD"]: {
176
+ [tokens.HMTR]: {
177
+ bank: "Br3yzg2WSb81RaFWK9UsKtq8fD5viwooZG34mKqQWxdM",
178
+ liquidityVault: "J45Je52qv2rDBuCQWPwp3bjRhf3bGzRWhKZtGDuLooCX",
179
+ vaultAuthority: "CKDsAKjNruDSz4tmUairh8PDGD1Rqh9WMTLWERYnnZrH",
180
+ priceOracle: SWITCHBOARD_PRICE_FEED_IDS[tokens.HMTR.toString()],
181
+ },
182
+ [tokens.USDC]: {
183
+ bank: "9yNnhJ8c1vGbu3DMf6eeeUi6TDJ2ddGgaRA88rL2R3rP",
184
+ liquidityVault: "4U1UBjXrPrW7JuQ894JbLUBqcb5LFfK9rfkWFwT7EdQ9",
185
+ vaultAuthority: "CY74V1r48kuuHA6APD3AaU2oPV1mBqe9srikrQQSHNR6",
186
+ priceOracle: USDC_PRICE_ORACLE,
187
+ }
188
+ }
189
189
  };
190
190
 
191
191
  export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =
package/src/constants/tokenConstants.ts CHANGED
@@ -48,7 +48,7 @@ export const ALL_SUPPORTED_TOKENS = [
48
48
  POPCAT,
49
49
  RETARDIO,
50
50
  BILLY,
51
- // HMTR,
51
+ HMTR,
52
52
  ];
53
53
 
54
54
  interface TokenInfo {
@@ -170,9 +170,9 @@ export const TOKEN_INFO: { [key: string]: TokenInfo } = {
170
170
  decimals: 6,
171
171
  isMeme: true,
172
172
  },
173
- // [HMTR]: {
174
- // ticker: "HMTR",
175
- // decimals: 0,
176
- // isMeme: true,
177
- // },
173
+ [HMTR]: {
174
+ ticker: "HMTR",
175
+ decimals: 0,
176
+ isMeme: true,
177
+ },
178
178
  };
package/src/utils/jupiterUtils.ts CHANGED
@@ -140,4 +140,18 @@ export async function getJupSwapTransaction(
140
140
  )
141
141
  ),
142
142
  };
143
- }
143
+ }
144
+
145
+ export async function getJupPriceData(mints: PublicKey[], extraInfo?: boolean) {
146
+ const data = await retryWithExponentialBackoff(async () => {
147
+ const res = await (
148
+ await fetch(
149
+ "https://api.jup.ag/price/v2?ids=" +
150
+ mints.map((x) => x.toString()).join(",") + (extraInfo ? "&showExtraInfo=true" : "")
151
+ )
152
+ ).json();
153
+ return res;
154
+ }, 6);
155
+
156
+ return data.data as { [key: string]: any };
157
+ }
package/src/utils/priceUtils.ts CHANGED
@@ -11,6 +11,7 @@ import {
11
11
  zip,
12
12
  } from "./generalUtils";
13
13
  import { CrossbarClient } from "@switchboard-xyz/on-demand";
14
+ import { getJupPriceData } from "./jupiterUtils";
14
15
 
15
16
  export async function fetchTokenPrices(mints: PublicKey[]): Promise<number[]> {
16
17
  const currentTime = currentUnixSeconds();
@@ -147,17 +148,9 @@ export async function getJupTokenPrices(mints: PublicKey[]) {
147
148
  return [];
148
149
  }
149
150
 
150
- const data = await retryWithExponentialBackoff(async () => {
151
- const res = await (
152
- await fetch(
153
- "https://api.jup.ag/price/v2?ids=" +
154
- mints.map((x) => x.toString()).join(",")
155
- )
156
- ).json();
157
- return res;
158
- }, 6);
159
-
160
- const prices = Object.values(data.data as { [key: string]: any }).map(
151
+ const data = await getJupPriceData(mints);
152
+
153
+ const prices = Object.values(data).map(
161
154
  (x) => parseFloat(x.price as string) as number
162
155
  );
163
156