@haven-fi/solauto-sdk 1.0.350 → 1.0.351
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":"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":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,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;IA6D1C,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"}
|
|
@@ -27,11 +27,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
|
|
|
27
27
|
(0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
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
30
|
this.marginfiAccount = this.solautoPositionData
|
|
33
31
|
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolUserAccount)
|
|
34
|
-
:
|
|
32
|
+
: (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
|
|
35
33
|
}
|
|
36
34
|
this.marginfiAccountPk =
|
|
37
35
|
"publicKey" in this.marginfiAccount
|
package/dist/utils/priceUtils.js
CHANGED
|
@@ -75,7 +75,7 @@ async function getSwitchboardPrices(mints) {
|
|
|
75
75
|
throw new Error("Unable to fetch Switchboard prices");
|
|
76
76
|
}
|
|
77
77
|
return p;
|
|
78
|
-
},
|
|
78
|
+
}, 8, 250);
|
|
79
79
|
const missingPrices = (0, generalUtils_1.zip)(mints, prices).filter((x) => !x[1]);
|
|
80
80
|
const jupPrices = (0, generalUtils_1.zip)(missingPrices.map((x) => x[0]), await getJupTokenPrices(missingPrices.map((x) => x[0])));
|
|
81
81
|
prices = prices.map((x, i) => x ? x : jupPrices.find((y) => y[0].toString() === mints[i].toString())[1]);
|
package/package.json
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
fromWeb3JsKeypair,
|
|
3
2
|
fromWeb3JsPublicKey,
|
|
4
3
|
toWeb3JsPublicKey,
|
|
5
4
|
} from "@metaplex-foundation/umi-web3js-adapters";
|
|
@@ -12,11 +11,7 @@ import {
|
|
|
12
11
|
createSignerFromKeypair,
|
|
13
12
|
AccountMeta,
|
|
14
13
|
} from "@metaplex-foundation/umi";
|
|
15
|
-
import {
|
|
16
|
-
Keypair,
|
|
17
|
-
PublicKey,
|
|
18
|
-
SYSVAR_INSTRUCTIONS_PUBKEY,
|
|
19
|
-
} from "@solana/web3.js";
|
|
14
|
+
import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
|
|
20
15
|
import { SolautoClient, SolautoClientArgs } from "./solautoClient";
|
|
21
16
|
import { MarginfiAssetAccounts } from "../types/accounts";
|
|
22
17
|
import {
|
|
@@ -104,14 +99,11 @@ export class SolautoMarginfiClient extends SolautoClient {
|
|
|
104
99
|
args.marginfiAccount ??
|
|
105
100
|
createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
|
|
106
101
|
} else {
|
|
107
|
-
const signerKeypair = fromWeb3JsKeypair(Keypair.generate());
|
|
108
|
-
const signer = createSignerFromKeypair(this.umi, signerKeypair);
|
|
109
|
-
|
|
110
102
|
this.marginfiAccount = this.solautoPositionData
|
|
111
103
|
? toWeb3JsPublicKey(
|
|
112
104
|
this.solautoPositionData.position.protocolUserAccount
|
|
113
105
|
)
|
|
114
|
-
:
|
|
106
|
+
: createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
|
|
115
107
|
}
|
|
116
108
|
this.marginfiAccountPk =
|
|
117
109
|
"publicKey" in this.marginfiAccount
|