@haven-fi/solauto-sdk 1.0.490 → 1.0.491
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.
- package/dist/transactions/transactionsManager.d.ts.map +1 -1
- package/dist/transactions/transactionsManager.js +6 -2
- package/dist/utils/jupiterUtils.d.ts.map +1 -1
- package/dist/utils/jupiterUtils.js +8 -2
- package/package.json +1 -1
- package/src/transactions/transactionsManager.ts +9 -1
- package/src/utils/jupiterUtils.ts +8 -7
- package/tests/transactions/solautoMarginfi.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAc7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA0GzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}
|
|
@@ -14,7 +14,7 @@ const web3_js_1 = require("@solana/web3.js");
|
|
|
14
14
|
const switchboardConstants_1 = require("../constants/switchboardConstants");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
16
|
const jitoUtils_1 = require("../utils/jitoUtils");
|
|
17
|
-
const
|
|
17
|
+
const constants_1 = require("../constants");
|
|
18
18
|
const CHORES_TX_NAME = "account chores";
|
|
19
19
|
const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
|
|
20
20
|
class TransactionTooLargeError extends Error {
|
|
@@ -272,7 +272,10 @@ class TransactionsManager {
|
|
|
272
272
|
await item.initialize();
|
|
273
273
|
}
|
|
274
274
|
const allAccounts = items
|
|
275
|
-
.filter((x) => x.tx
|
|
275
|
+
.filter((x) => x.tx
|
|
276
|
+
?.getInstructions()
|
|
277
|
+
.find((x) => x.programId === constants_1.SOLAUTO_PROD_PROGRAM.toString() ||
|
|
278
|
+
x.programId === constants_1.SOLAUTO_TEST_PROGRAM.toString()))
|
|
276
279
|
.flatMap((x) => x.tx
|
|
277
280
|
?.getInstructions()
|
|
278
281
|
.flatMap((x) => x.keys.map((x) => x.pubkey.toString())));
|
|
@@ -283,6 +286,7 @@ class TransactionsManager {
|
|
|
283
286
|
.stale;
|
|
284
287
|
if (stale) {
|
|
285
288
|
this.txHandler.log("Requires oracle update...");
|
|
289
|
+
console.log(mint);
|
|
286
290
|
const swbTx = new TransactionItem(async () => (0, utils_1.buildSwbSubmitResponseTx)(client.connection, client.signer, mint), this.updateOracleTxName);
|
|
287
291
|
await swbTx.initialize();
|
|
288
292
|
items.unshift(swbTx);
|
|
@@ -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;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;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,
|
|
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;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;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,CAqH7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}
|
|
@@ -27,8 +27,14 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
|
|
|
27
27
|
constants_1.TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
|
|
28
28
|
const tokensWithLowAccounts = [constants_1.PYTH, constants_1.INF];
|
|
29
29
|
// TEMP REVERT ME
|
|
30
|
-
const useLowAccounts =
|
|
31
|
-
|
|
30
|
+
// const useLowAccounts =
|
|
31
|
+
// tokensWithLowAccounts.find((x) =>
|
|
32
|
+
// swapDetails.inputMint.equals(new PublicKey(x))
|
|
33
|
+
// ) ||
|
|
34
|
+
// tokensWithLowAccounts.find((x) =>
|
|
35
|
+
// swapDetails.outputMint.equals(new PublicKey(x))
|
|
36
|
+
// );
|
|
37
|
+
const useLowAccounts = true;
|
|
32
38
|
const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
|
|
33
39
|
amount: Number(swapDetails.amount),
|
|
34
40
|
inputMint: swapDetails.inputMint.toString(),
|
package/package.json
CHANGED
|
@@ -32,6 +32,7 @@ import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
|
|
|
32
32
|
import { buildSwbSubmitResponseTx, getSwitchboardFeedData } from "../utils";
|
|
33
33
|
import { sendJitoBundledTransactions } from "../utils/jitoUtils";
|
|
34
34
|
import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
|
|
35
|
+
import { SOLAUTO_PROD_PROGRAM, SOLAUTO_TEST_PROGRAM } from "../constants";
|
|
35
36
|
|
|
36
37
|
const CHORES_TX_NAME = "account chores";
|
|
37
38
|
const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
|
|
@@ -436,7 +437,13 @@ export class TransactionsManager {
|
|
|
436
437
|
|
|
437
438
|
const allAccounts = items
|
|
438
439
|
.filter((x) =>
|
|
439
|
-
x.tx
|
|
440
|
+
x.tx
|
|
441
|
+
?.getInstructions()
|
|
442
|
+
.find(
|
|
443
|
+
(x) =>
|
|
444
|
+
x.programId === SOLAUTO_PROD_PROGRAM.toString() ||
|
|
445
|
+
x.programId === SOLAUTO_TEST_PROGRAM.toString()
|
|
446
|
+
)
|
|
440
447
|
)
|
|
441
448
|
.flatMap((x) =>
|
|
442
449
|
x.tx
|
|
@@ -457,6 +464,7 @@ export class TransactionsManager {
|
|
|
457
464
|
|
|
458
465
|
if (stale) {
|
|
459
466
|
this.txHandler.log("Requires oracle update...");
|
|
467
|
+
console.log(mint);
|
|
460
468
|
const swbTx = new TransactionItem(
|
|
461
469
|
async () =>
|
|
462
470
|
buildSwbSubmitResponseTx(client.connection, client.signer, mint),
|
|
@@ -62,13 +62,14 @@ export async function getJupSwapTransaction(
|
|
|
62
62
|
|
|
63
63
|
const tokensWithLowAccounts = [PYTH, INF];
|
|
64
64
|
// TEMP REVERT ME
|
|
65
|
-
const useLowAccounts =
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
65
|
+
// const useLowAccounts =
|
|
66
|
+
// tokensWithLowAccounts.find((x) =>
|
|
67
|
+
// swapDetails.inputMint.equals(new PublicKey(x))
|
|
68
|
+
// ) ||
|
|
69
|
+
// tokensWithLowAccounts.find((x) =>
|
|
70
|
+
// swapDetails.outputMint.equals(new PublicKey(x))
|
|
71
|
+
// );
|
|
72
|
+
const useLowAccounts = true;
|
|
72
73
|
|
|
73
74
|
const quoteResponse = await retryWithExponentialBackoff(
|
|
74
75
|
async () =>
|
|
@@ -63,7 +63,7 @@ describe("Solauto Marginfi tests", async () => {
|
|
|
63
63
|
await client.initialize({
|
|
64
64
|
signer,
|
|
65
65
|
positionId,
|
|
66
|
-
authority: new PublicKey("
|
|
66
|
+
authority: new PublicKey("GAFLx1PRLc8UVc6tBbKH3KuGf3hPYahQ3SnnavpZQkQG"),
|
|
67
67
|
// new: true,
|
|
68
68
|
// marginfiAccount: new PublicKey(
|
|
69
69
|
// ""
|