@haven-fi/solauto-sdk 1.0.29 → 1.0.30
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/types/solauto.d.ts
CHANGED
|
@@ -2,12 +2,9 @@ import { PublicKey } from "@solana/web3.js";
|
|
|
2
2
|
import { LendingPlatform } from "../generated";
|
|
3
3
|
export interface SolautoPositionDetails {
|
|
4
4
|
positionId: number;
|
|
5
|
-
selfManaged: boolean;
|
|
6
5
|
lendingPlatform: LendingPlatform;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
supplyMint: PublicKey;
|
|
11
|
-
debtMint: PublicKey;
|
|
6
|
+
protocolAccount?: PublicKey;
|
|
7
|
+
supplyMint?: PublicKey;
|
|
8
|
+
debtMint?: PublicKey;
|
|
12
9
|
}
|
|
13
10
|
//# sourceMappingURL=solauto.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,
|
|
1
|
+
{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAoB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AAczB,OAAO,
|
|
1
|
+
{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAoB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAgB7D,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAgB3B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,GACf;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAYA;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GACvB,OAAO,CA+BT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAST;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACR;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,EAAE,CACJ,CAkDA;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAezE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6BnC;AA4DD,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAE/C,qBAAa,mBAAmB;IACvB,gBAAgB,EAAE,MAAM,CAAa;IACrC,cAAc,EAAE,MAAM,CAAa;IACnC,uBAAuB,EAAE,MAAM,CAAa;IAC5C,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAEtD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IAyD9B,KAAK;IAQL,UAAU,IAAI,OAAO;CAQtB"}
|
|
@@ -186,12 +186,10 @@ async function getAllPositionsByAuthority(umi, user) {
|
|
|
186
186
|
allPositions.push(...solautoManagedPositions.map((x) => ({
|
|
187
187
|
positionId: x.positionId,
|
|
188
188
|
lendingPlatform: x.lendingPlatform,
|
|
189
|
-
selfManaged: false,
|
|
190
189
|
})));
|
|
191
190
|
const marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
|
|
192
191
|
allPositions.push(...marginfiPositions.map((x) => ({
|
|
193
192
|
positionId: 0,
|
|
194
|
-
selfManaged: true,
|
|
195
193
|
lendingPlatform: generated_1.LendingPlatform.Marginfi,
|
|
196
194
|
protocolAccount: x.marginfiAccount,
|
|
197
195
|
supplyMint: x.supplyMint,
|
package/package.json
CHANGED
package/src/types/solauto.ts
CHANGED
|
@@ -3,12 +3,8 @@ import { LendingPlatform } from "../generated";
|
|
|
3
3
|
|
|
4
4
|
export interface SolautoPositionDetails {
|
|
5
5
|
positionId: number;
|
|
6
|
-
selfManaged: boolean;
|
|
7
6
|
lendingPlatform: LendingPlatform;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
protocolAccount: PublicKey;
|
|
12
|
-
supplyMint: PublicKey;
|
|
13
|
-
debtMint: PublicKey;
|
|
7
|
+
protocolAccount?: PublicKey;
|
|
8
|
+
supplyMint?: PublicKey;
|
|
9
|
+
debtMint?: PublicKey;
|
|
14
10
|
}
|
|
@@ -27,10 +27,7 @@ import {
|
|
|
27
27
|
getAllMarginfiAccountsByAuthority,
|
|
28
28
|
getMarginfiAccountPositionState,
|
|
29
29
|
} from "../marginfiUtils";
|
|
30
|
-
import {
|
|
31
|
-
SelfManagedPositionDetails,
|
|
32
|
-
SolautoPositionDetails,
|
|
33
|
-
} from "../../types/solauto";
|
|
30
|
+
import { SolautoPositionDetails } from "../../types/solauto";
|
|
34
31
|
|
|
35
32
|
function newPeriodsPassed(
|
|
36
33
|
automation: AutomationSettings,
|
|
@@ -293,7 +290,6 @@ export async function getAllPositionsByAuthority(
|
|
|
293
290
|
...solautoManagedPositions.map((x) => ({
|
|
294
291
|
positionId: x.positionId,
|
|
295
292
|
lendingPlatform: x.lendingPlatform,
|
|
296
|
-
selfManaged: false,
|
|
297
293
|
}))
|
|
298
294
|
);
|
|
299
295
|
|
|
@@ -303,17 +299,13 @@ export async function getAllPositionsByAuthority(
|
|
|
303
299
|
true
|
|
304
300
|
);
|
|
305
301
|
allPositions.push(
|
|
306
|
-
...marginfiPositions.map(
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
supplyMint: x.supplyMint,
|
|
314
|
-
debtMint: x.debtMint,
|
|
315
|
-
}) as SelfManagedPositionDetails
|
|
316
|
-
)
|
|
302
|
+
...marginfiPositions.map((x) => ({
|
|
303
|
+
positionId: 0,
|
|
304
|
+
lendingPlatform: LendingPlatform.Marginfi,
|
|
305
|
+
protocolAccount: x.marginfiAccount,
|
|
306
|
+
supplyMint: x.supplyMint,
|
|
307
|
+
debtMint: x.debtMint,
|
|
308
|
+
}))
|
|
317
309
|
);
|
|
318
310
|
|
|
319
311
|
// TODO support other platforms
|