@haven-fi/solauto-sdk 1.0.353 → 1.0.355
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/referralStateManager.d.ts +0 -1
- package/dist/clients/referralStateManager.d.ts.map +1 -1
- package/dist/clients/referralStateManager.js +6 -6
- package/dist/clients/solautoMarginfiClient.d.ts +1 -1
- package/dist/clients/solautoMarginfiClient.d.ts.map +1 -1
- package/dist/clients/solautoMarginfiClient.js +3 -3
- package/package.json +1 -1
- package/src/clients/referralStateManager.ts +7 -10
- package/src/clients/solautoMarginfiClient.ts +6 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAEL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAEL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"referralStateManager.d.ts","sourceRoot":"","sources":["../../src/clients/referralStateManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAEL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAEL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAC1C,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAEhB,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;IACzC,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,eAAe,CAAC,EAAE,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAwB/C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAsBpC,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,IAAI,kBAAkB;IA0BnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}
|
|
@@ -12,18 +12,18 @@ const txHandler_1 = require("./txHandler");
|
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
13
|
class ReferralStateManager extends txHandler_1.TxHandler {
|
|
14
14
|
async initialize(args) {
|
|
15
|
+
if (!args.signer && !args.wallet) {
|
|
16
|
+
throw new Error("Signer or wallet must be provided");
|
|
17
|
+
}
|
|
15
18
|
this.umi = this.umi.use(args.signer
|
|
16
19
|
? (0, umi_1.signerIdentity)(args.signer, true)
|
|
17
20
|
: (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
|
|
18
21
|
this.signer = this.umi.identity;
|
|
19
|
-
this.
|
|
20
|
-
|
|
21
|
-
: (0, utils_1.getReferralState)(args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.programId);
|
|
22
|
+
this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
|
|
23
|
+
this.referralState = (0, utils_1.getReferralState)(this.authority, this.programId);
|
|
22
24
|
this.referralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.referralState), { commitment: "confirmed" });
|
|
23
|
-
this.authority = this.referralStateData
|
|
24
|
-
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.authority)
|
|
25
|
-
: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
|
|
26
25
|
this.setReferredBy(args.referredByAuthority);
|
|
26
|
+
this.log("Referral state:", this.referralState);
|
|
27
27
|
}
|
|
28
28
|
defaultLookupTables() {
|
|
29
29
|
return this.referralStateData?.lookupTable &&
|
|
@@ -12,7 +12,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
|
|
|
12
12
|
marginfiGroup?: PublicKey;
|
|
13
13
|
}
|
|
14
14
|
export declare class SolautoMarginfiClient extends SolautoClient {
|
|
15
|
-
private
|
|
15
|
+
private initializedFor?;
|
|
16
16
|
marginfiProgram: PublicKey;
|
|
17
17
|
marginfiAccountSeedIdx: bigint;
|
|
18
18
|
marginfiAccount: PublicKey | Signer;
|
|
@@ -1 +1 @@
|
|
|
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;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,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,
|
|
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;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,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,cAAc,CAAC,CAAY;IAE5B,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;IAuF1C,8BAA8B;IAoCpC,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"}
|
|
@@ -15,7 +15,6 @@ const utils_1 = require("../utils");
|
|
|
15
15
|
class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
|
|
16
16
|
constructor() {
|
|
17
17
|
super(...arguments);
|
|
18
|
-
this.initialized = false;
|
|
19
18
|
this.marginfiAccountSeedIdx = BigInt(0);
|
|
20
19
|
}
|
|
21
20
|
async initialize(args) {
|
|
@@ -64,10 +63,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
|
|
|
64
63
|
// this.debtPriceOracle = toWeb3JsPublicKey(debtBank.config.oracleKeys[0]);
|
|
65
64
|
this.supplyPriceOracle = new web3_js_1.PublicKey(this.marginfiSupplyAccounts.priceOracle);
|
|
66
65
|
this.debtPriceOracle = new web3_js_1.PublicKey(this.marginfiDebtAccounts.priceOracle);
|
|
67
|
-
if (!this.
|
|
66
|
+
if (!this.initializedFor ||
|
|
67
|
+
!this.initializedFor.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))) {
|
|
68
68
|
await this.setIntermediaryMarginfiDetails();
|
|
69
|
+
this.initializedFor = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
|
|
69
70
|
}
|
|
70
|
-
this.initialized = true;
|
|
71
71
|
}
|
|
72
72
|
async setIntermediaryMarginfiDetails() {
|
|
73
73
|
const existingMarginfiAccounts = (await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.marginfiGroup))
|
package/package.json
CHANGED
|
@@ -26,7 +26,6 @@ export interface ReferralStateManagerArgs {
|
|
|
26
26
|
signer?: Signer;
|
|
27
27
|
wallet?: WalletAdapter;
|
|
28
28
|
authority?: PublicKey;
|
|
29
|
-
referralState?: PublicKey;
|
|
30
29
|
referredByAuthority?: PublicKey;
|
|
31
30
|
}
|
|
32
31
|
|
|
@@ -42,29 +41,27 @@ export class ReferralStateManager extends TxHandler {
|
|
|
42
41
|
public referredByState?: PublicKey;
|
|
43
42
|
|
|
44
43
|
async initialize(args: ReferralStateManagerArgs) {
|
|
44
|
+
if (!args.signer && !args.wallet) {
|
|
45
|
+
throw new Error("Signer or wallet must be provided");
|
|
46
|
+
}
|
|
45
47
|
this.umi = this.umi.use(
|
|
46
48
|
args.signer
|
|
47
49
|
? signerIdentity(args.signer, true)
|
|
48
50
|
: walletAdapterIdentity(args.wallet!, true)
|
|
49
51
|
);
|
|
50
52
|
this.signer = this.umi.identity;
|
|
53
|
+
this.authority = args.authority ?? toWeb3JsPublicKey(this.signer.publicKey);
|
|
54
|
+
|
|
55
|
+
this.referralState = getReferralState(this.authority, this.programId);
|
|
51
56
|
|
|
52
|
-
this.referralState = args.referralState
|
|
53
|
-
? args.referralState
|
|
54
|
-
: getReferralState(
|
|
55
|
-
args.authority ?? toWeb3JsPublicKey(this.signer.publicKey),
|
|
56
|
-
this.programId
|
|
57
|
-
);
|
|
58
57
|
this.referralStateData = await safeFetchReferralState(
|
|
59
58
|
this.umi,
|
|
60
59
|
publicKey(this.referralState),
|
|
61
60
|
{ commitment: "confirmed" }
|
|
62
61
|
);
|
|
63
|
-
this.authority = this.referralStateData
|
|
64
|
-
? toWeb3JsPublicKey(this.referralStateData.authority)
|
|
65
|
-
: toWeb3JsPublicKey(this.signer.publicKey);
|
|
66
62
|
|
|
67
63
|
this.setReferredBy(args.referredByAuthority);
|
|
64
|
+
this.log("Referral state:", this.referralState);
|
|
68
65
|
}
|
|
69
66
|
|
|
70
67
|
defaultLookupTables(): string[] {
|
|
@@ -69,7 +69,7 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
export class SolautoMarginfiClient extends SolautoClient {
|
|
72
|
-
private
|
|
72
|
+
private initializedFor?: PublicKey;
|
|
73
73
|
|
|
74
74
|
public marginfiProgram!: PublicKey;
|
|
75
75
|
|
|
@@ -167,10 +167,13 @@ export class SolautoMarginfiClient extends SolautoClient {
|
|
|
167
167
|
);
|
|
168
168
|
this.debtPriceOracle = new PublicKey(this.marginfiDebtAccounts.priceOracle);
|
|
169
169
|
|
|
170
|
-
if (
|
|
170
|
+
if (
|
|
171
|
+
!this.initializedFor ||
|
|
172
|
+
!this.initializedFor.equals(toWeb3JsPublicKey(this.signer.publicKey))
|
|
173
|
+
) {
|
|
171
174
|
await this.setIntermediaryMarginfiDetails();
|
|
175
|
+
this.initializedFor = toWeb3JsPublicKey(this.signer.publicKey);
|
|
172
176
|
}
|
|
173
|
-
this.initialized = true;
|
|
174
177
|
}
|
|
175
178
|
|
|
176
179
|
async setIntermediaryMarginfiDetails() {
|