@haven-fi/solauto-sdk 1.0.94 → 1.0.96
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.
|
@@ -10,7 +10,7 @@ import { ReferralStateManager } from "./referralStateManager";
|
|
|
10
10
|
import { TxHandler } from "./txHandler";
|
|
11
11
|
export interface SolautoClientArgs {
|
|
12
12
|
authority?: PublicKey;
|
|
13
|
-
positionId
|
|
13
|
+
positionId?: number;
|
|
14
14
|
signer?: Signer;
|
|
15
15
|
wallet?: WalletAdapter;
|
|
16
16
|
supplyMint?: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAGL,SAAS,EACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAQnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,aAAa,EAEd,MAAM,iDAAiD,CAAC;AACzD,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,wBAAwB,EACxB,yBAAyB,EACzB,gCAAgC,EAChC,sBAAsB,EAMvB,MAAM,cAAc,CAAC;AAStB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAMvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ class SolautoClient extends txHandler_1.TxHandler {
|
|
|
35
35
|
: (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
|
|
36
36
|
this.signer = this.umi.identity;
|
|
37
37
|
this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey);
|
|
38
|
-
this.positionId = args.positionId;
|
|
38
|
+
this.positionId = args.positionId ?? 0;
|
|
39
39
|
this.selfManaged = this.positionId === 0;
|
|
40
40
|
this.lendingPlatform = lendingPlatform;
|
|
41
41
|
this.solautoPosition = (0, accountUtils_1.getSolautoPositionAccount)(this.authority, this.positionId);
|
|
@@ -77,7 +77,7 @@ class SolautoClient extends txHandler_1.TxHandler {
|
|
|
77
77
|
}
|
|
78
78
|
this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
|
|
79
79
|
this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyMint);
|
|
80
|
-
this.authorityLutAddress = authorityReferralStateData?.lookupTable
|
|
80
|
+
this.authorityLutAddress = authorityReferralStateData?.lookupTable && !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
|
|
81
81
|
? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData?.lookupTable)
|
|
82
82
|
: undefined;
|
|
83
83
|
this.upToDateLutAccounts = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey).equals(this.authority)
|
|
@@ -344,7 +344,8 @@ class SolautoClient extends txHandler_1.TxHandler {
|
|
|
344
344
|
return tx;
|
|
345
345
|
}
|
|
346
346
|
async getFreshPositionState() {
|
|
347
|
-
if (Boolean(this.
|
|
347
|
+
if (Boolean(this.solautoPositionData) &&
|
|
348
|
+
Boolean(this.solautoPositionState) &&
|
|
348
349
|
Number(this.solautoPositionState.lastUpdated) >
|
|
349
350
|
(0, generalUtils_1.currentUnixSeconds)() - solautoConstants_1.MIN_POSITION_STATE_FRESHNESS_SECS &&
|
|
350
351
|
!this.livePositionUpdates.hasUpdates()) {
|
package/package.json
CHANGED
|
@@ -63,7 +63,7 @@ import { TxHandler } from "./txHandler";
|
|
|
63
63
|
|
|
64
64
|
export interface SolautoClientArgs {
|
|
65
65
|
authority?: PublicKey;
|
|
66
|
-
positionId
|
|
66
|
+
positionId?: number;
|
|
67
67
|
signer?: Signer;
|
|
68
68
|
wallet?: WalletAdapter;
|
|
69
69
|
|
|
@@ -133,7 +133,7 @@ export abstract class SolautoClient extends TxHandler {
|
|
|
133
133
|
this.signer = this.umi.identity;
|
|
134
134
|
this.authority = args.authority ?? toWeb3JsPublicKey(this.signer.publicKey);
|
|
135
135
|
|
|
136
|
-
this.positionId = args.positionId;
|
|
136
|
+
this.positionId = args.positionId ?? 0;
|
|
137
137
|
this.selfManaged = this.positionId === 0;
|
|
138
138
|
this.lendingPlatform = lendingPlatform;
|
|
139
139
|
this.solautoPosition = getSolautoPositionAccount(
|
|
@@ -176,8 +176,8 @@ export abstract class SolautoClient extends TxHandler {
|
|
|
176
176
|
|
|
177
177
|
const authorityReferralStateData = this.referralStateManager.referralStateData;
|
|
178
178
|
const hasReferredBy =
|
|
179
|
-
|
|
180
|
-
|
|
179
|
+
authorityReferralStateData &&
|
|
180
|
+
authorityReferralStateData.referredByState !==
|
|
181
181
|
publicKey(PublicKey.default);
|
|
182
182
|
const referredByAuthority =
|
|
183
183
|
!hasReferredBy &&
|
|
@@ -204,7 +204,7 @@ export abstract class SolautoClient extends TxHandler {
|
|
|
204
204
|
this.supplyMint
|
|
205
205
|
);
|
|
206
206
|
|
|
207
|
-
this.authorityLutAddress = authorityReferralStateData?.lookupTable
|
|
207
|
+
this.authorityLutAddress = authorityReferralStateData?.lookupTable && !toWeb3JsPublicKey(authorityReferralStateData.lookupTable).equals(PublicKey.default)
|
|
208
208
|
? toWeb3JsPublicKey(authorityReferralStateData?.lookupTable)
|
|
209
209
|
: undefined;
|
|
210
210
|
this.upToDateLutAccounts = toWeb3JsPublicKey(this.signer.publicKey).equals(
|
|
@@ -586,6 +586,7 @@ export abstract class SolautoClient extends TxHandler {
|
|
|
586
586
|
|
|
587
587
|
async getFreshPositionState(): Promise<PositionState | undefined> {
|
|
588
588
|
if (
|
|
589
|
+
Boolean(this.solautoPositionData) &&
|
|
589
590
|
Boolean(this.solautoPositionState) &&
|
|
590
591
|
Number(this.solautoPositionState!.lastUpdated) >
|
|
591
592
|
currentUnixSeconds() - MIN_POSITION_STATE_FRESHNESS_SECS &&
|