@haven-fi/solauto-sdk 1.0.787 → 1.0.788
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CA0BtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAetC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAW3E"}
|
|
@@ -17,6 +17,7 @@ const constants_1 = require("../../constants");
|
|
|
17
17
|
const marginfi_1 = require("../../externalSdks/marginfi");
|
|
18
18
|
const numberUtils_1 = require("../numberUtils");
|
|
19
19
|
const accountUtils_1 = require("../accountUtils");
|
|
20
|
+
const pythUtils_1 = require("../pythUtils");
|
|
20
21
|
const solanaUtils_1 = require("../solanaUtils");
|
|
21
22
|
function createDynamicMarginfiProgram(env) {
|
|
22
23
|
return {
|
|
@@ -44,7 +45,8 @@ async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
|
|
|
44
45
|
const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
|
|
45
46
|
const banksData = await (0, marginfi_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
|
|
46
47
|
const oracles = banksData
|
|
47
|
-
.map((bank) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(
|
|
48
|
+
.map((bank) => bank.config.oracleKeys.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x)))
|
|
49
|
+
.flat()
|
|
48
50
|
.map((x) => x.toString());
|
|
49
51
|
const otherAccounts = Object.entries(bankAccountsMap).flatMap(([groupName, tokenMap]) => Object.values(tokenMap).flatMap((accounts) => [
|
|
50
52
|
groupName,
|
|
@@ -72,7 +74,10 @@ async function getMarginfiPriceOracle(umi, bank) {
|
|
|
72
74
|
if (!bank.data) {
|
|
73
75
|
bank.data = await (0, marginfi_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
|
|
74
76
|
}
|
|
75
|
-
|
|
77
|
+
const priceOracle = bank.data.config.oracleSetup === marginfi_1.OracleSetup.PythPushOracle
|
|
78
|
+
? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, bank.data.config.oracleKeys.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x)))
|
|
79
|
+
: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
|
|
80
|
+
return priceOracle;
|
|
76
81
|
}
|
|
77
82
|
function findMarginfiAccounts(bank) {
|
|
78
83
|
const search = (bankAccounts) => {
|
package/package.json
CHANGED
|
@@ -23,7 +23,10 @@ import {
|
|
|
23
23
|
} from "../../externalSdks/marginfi";
|
|
24
24
|
import { bytesToI80F48, fromBaseUnit, toBps } from "../numberUtils";
|
|
25
25
|
import { getTokenAccountData } from "../accountUtils";
|
|
26
|
-
import {
|
|
26
|
+
import {
|
|
27
|
+
getMostUpToDatePythOracle,
|
|
28
|
+
getPythPushOracleAddress,
|
|
29
|
+
} from "../pythUtils";
|
|
27
30
|
import { getAccountMeta } from "../solanaUtils";
|
|
28
31
|
|
|
29
32
|
export function createDynamicMarginfiProgram(env?: ProgramEnv): Program {
|
|
@@ -66,7 +69,8 @@ export async function getAllBankRelatedAccounts(
|
|
|
66
69
|
);
|
|
67
70
|
|
|
68
71
|
const oracles = banksData
|
|
69
|
-
.map((bank) =>
|
|
72
|
+
.map((bank) => bank.config.oracleKeys.map((x) => toWeb3JsPublicKey(x)))
|
|
73
|
+
.flat()
|
|
70
74
|
.map((x) => x.toString());
|
|
71
75
|
|
|
72
76
|
const otherAccounts = Object.entries(bankAccountsMap).flatMap(
|
|
@@ -106,7 +110,15 @@ export async function getMarginfiPriceOracle(
|
|
|
106
110
|
bank.data = await fetchBank(umi, fromWeb3JsPublicKey(bank.pk!));
|
|
107
111
|
}
|
|
108
112
|
|
|
109
|
-
|
|
113
|
+
const priceOracle =
|
|
114
|
+
bank.data.config.oracleSetup === OracleSetup.PythPushOracle
|
|
115
|
+
? await getMostUpToDatePythOracle(
|
|
116
|
+
umi,
|
|
117
|
+
bank.data.config.oracleKeys.map((x) => toWeb3JsPublicKey(x))
|
|
118
|
+
)
|
|
119
|
+
: toWeb3JsPublicKey(bank.data.config.oracleKeys[0]);
|
|
120
|
+
|
|
121
|
+
return priceOracle;
|
|
110
122
|
}
|
|
111
123
|
|
|
112
124
|
interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
|