@haven-fi/solauto-sdk 1.0.348 → 1.0.350
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/clients/solautoMarginfiClient.d.ts.map +1 -1
- package/dist/clients/solautoMarginfiClient.js +3 -3
- package/dist/transactions/transactionsManager.d.ts.map +1 -1
- package/dist/transactions/transactionsManager.js +2 -1
- package/package.json +1 -1
- package/src/clients/solautoMarginfiClient.ts +10 -7
- package/src/transactions/transactionsManager.ts +4 -1
- package/tests/transactions/solautoMarginfi.ts +11 -12
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAQzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAgE1C,8BAA8B;IA6CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgFrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA8ClE"}
|
@@ -8,7 +8,6 @@ const solautoClient_1 = require("./solautoClient");
|
|
8
8
|
const marginfiAccounts_1 = require("../constants/marginfiAccounts");
|
9
9
|
const generated_1 = require("../generated");
|
10
10
|
const accountUtils_1 = require("../utils/accountUtils");
|
11
|
-
const generalUtils_1 = require("../utils/generalUtils");
|
12
11
|
const marginfi_sdk_1 = require("../marginfi-sdk");
|
13
12
|
const marginfiUtils_1 = require("../utils/marginfiUtils");
|
14
13
|
const numberUtils_1 = require("../utils/numberUtils");
|
@@ -28,10 +27,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
|
|
28
27
|
(0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
|
29
28
|
}
|
30
29
|
else {
|
31
|
-
|
30
|
+
const signerKeypair = (0, umi_web3js_adapters_1.fromWeb3JsKeypair)(web3_js_1.Keypair.generate());
|
31
|
+
const signer = (0, umi_1.createSignerFromKeypair)(this.umi, signerKeypair);
|
32
32
|
this.marginfiAccount = this.solautoPositionData
|
33
33
|
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolUserAccount)
|
34
|
-
:
|
34
|
+
: signer;
|
35
35
|
}
|
36
36
|
this.marginfiAccountPk =
|
37
37
|
"publicKey" in this.marginfiAccount
|
@@ -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,EACL,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;AAW7D,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,qBAAa,mBAAmB;IAK5B,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;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,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;
|
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,EACL,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;AAW7D,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,qBAAa,mBAAmB;IAK5B,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;IACtB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAXpB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,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,EAC7B,OAAO,GAAE,MAAU,EACnB,UAAU,GAAE,MAAY;YAQpB,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;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAmCxB,6BAA6B;YAgG7B,qBAAqB;YAuDrB,cAAc;YAqCd,eAAe;CAoD9B"}
|
@@ -257,7 +257,8 @@ class TransactionsManager {
|
|
257
257
|
const items = [...transactions];
|
258
258
|
const client = this.txHandler;
|
259
259
|
const updateLookupTable = await client.updateLookupTable();
|
260
|
-
if (updateLookupTable &&
|
260
|
+
if (updateLookupTable &&
|
261
|
+
(updateLookupTable?.new || updateLookupTable.accountsToAdd.length > 4)) {
|
261
262
|
await this.updateLut(updateLookupTable.tx, updateLookupTable.new);
|
262
263
|
}
|
263
264
|
this.lookupTables.defaultLuts = client.defaultLookupTables();
|
package/package.json
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
import {
|
2
|
+
fromWeb3JsKeypair,
|
2
3
|
fromWeb3JsPublicKey,
|
3
4
|
toWeb3JsPublicKey,
|
4
5
|
} from "@metaplex-foundation/umi-web3js-adapters";
|
@@ -11,7 +12,11 @@ import {
|
|
11
12
|
createSignerFromKeypair,
|
12
13
|
AccountMeta,
|
13
14
|
} from "@metaplex-foundation/umi";
|
14
|
-
import {
|
15
|
+
import {
|
16
|
+
Keypair,
|
17
|
+
PublicKey,
|
18
|
+
SYSVAR_INSTRUCTIONS_PUBKEY,
|
19
|
+
} from "@solana/web3.js";
|
15
20
|
import { SolautoClient, SolautoClientArgs } from "./solautoClient";
|
16
21
|
import { MarginfiAssetAccounts } from "../types/accounts";
|
17
22
|
import {
|
@@ -99,16 +104,14 @@ export class SolautoMarginfiClient extends SolautoClient {
|
|
99
104
|
args.marginfiAccount ??
|
100
105
|
createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
|
101
106
|
} else {
|
102
|
-
|
107
|
+
const signerKeypair = fromWeb3JsKeypair(Keypair.generate());
|
108
|
+
const signer = createSignerFromKeypair(this.umi, signerKeypair);
|
109
|
+
|
103
110
|
this.marginfiAccount = this.solautoPositionData
|
104
111
|
? toWeb3JsPublicKey(
|
105
112
|
this.solautoPositionData.position.protocolUserAccount
|
106
113
|
)
|
107
|
-
:
|
108
|
-
this.solautoPosition,
|
109
|
-
this.marginfiAccountSeedIdx,
|
110
|
-
this.programId
|
111
|
-
);
|
114
|
+
: signer;
|
112
115
|
}
|
113
116
|
this.marginfiAccountPk =
|
114
117
|
"publicKey" in this.marginfiAccount
|
@@ -404,7 +404,10 @@ export class TransactionsManager {
|
|
404
404
|
|
405
405
|
const updateLookupTable = await client.updateLookupTable();
|
406
406
|
|
407
|
-
if (
|
407
|
+
if (
|
408
|
+
updateLookupTable &&
|
409
|
+
(updateLookupTable?.new || updateLookupTable.accountsToAdd.length > 4)
|
410
|
+
) {
|
408
411
|
await this.updateLut(updateLookupTable.tx, updateLookupTable.new);
|
409
412
|
}
|
410
413
|
this.lookupTables.defaultLuts = client.defaultLookupTables();
|
@@ -26,10 +26,7 @@ import {
|
|
26
26
|
SOLAUTO_TEST_PROGRAM,
|
27
27
|
USDC,
|
28
28
|
} from "../../src/constants";
|
29
|
-
import {
|
30
|
-
buildHeliusApiUrl,
|
31
|
-
getSolautoManagedPositions,
|
32
|
-
} from "../../src/utils";
|
29
|
+
import { buildHeliusApiUrl, getSolautoManagedPositions } from "../../src/utils";
|
33
30
|
import { PriorityFeeSetting } from "../../src/types";
|
34
31
|
|
35
32
|
describe("Solauto Marginfi tests", async () => {
|
@@ -64,6 +61,8 @@ describe("Solauto Marginfi tests", async () => {
|
|
64
61
|
// debtMint: new PublicKey(USDC),
|
65
62
|
});
|
66
63
|
|
64
|
+
console.log(await getSolautoManagedPositions(client.umi));
|
65
|
+
|
67
66
|
const transactionItems: TransactionItem[] = [];
|
68
67
|
// const settingParams: SolautoSettingsParametersInpArgs = {
|
69
68
|
// boostToBps: maxBoostToBps(
|
@@ -158,14 +157,14 @@ describe("Solauto Marginfi tests", async () => {
|
|
158
157
|
// )
|
159
158
|
// );
|
160
159
|
|
161
|
-
const statuses = await new TransactionsManager(
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
).clientSend(transactionItems);
|
160
|
+
// const statuses = await new TransactionsManager(
|
161
|
+
// client,
|
162
|
+
// undefined,
|
163
|
+
// !payForTransactions ? "only-simulate" : "normal",
|
164
|
+
// PriorityFeeSetting.Low,
|
165
|
+
// true
|
166
|
+
// ).clientSend(transactionItems);
|
168
167
|
|
169
|
-
console.log(statuses);
|
168
|
+
// console.log(statuses);
|
170
169
|
});
|
171
170
|
});
|