@haven-fi/solauto-sdk 1.0.212 → 1.0.213

package/dist/clients/referralStateManager.d.ts

@@ -16,12 +16,11 @@ export declare class ReferralStateManager extends TxHandler {
     referralAuthority: PublicKey;
     referralState: PublicKey;
     referralStateData: ReferralState | null;
-    referredByState?: PublicKey;
     constructor(heliusApiUrl: string, localTest?: boolean | undefined);
     initialize(args: ReferralStateManagerArgs): Promise<void>;
     defaultLookupTables(): string[];
     setReferredBy(referredBy?: PublicKey): void;
-    updateReferralStatesIx(destFeesMint?: PublicKey, referredBy?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;
+    updateReferralStatesIx(destFeesMint?: PublicKey, lookupTable?: PublicKey): TransactionBuilder;
     claimReferralFeesIx(destFeesMint?: PublicKey): TransactionBuilder;
     resetLiveTxUpdates(success?: boolean): Promise<void>;
 }

package/dist/clients/referralStateManager.d.ts.map

@@ -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,EAGL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,UAAU,wBAAwB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAYxC,SAAS,CAAC,EAAE,OAAO;IAXrB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAEhB,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;IAEzC,eAAe,CAAC,EAAE,SAAS,CAAC;gBAGjC,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAUtB,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAuB/C,mBAAmB,IAAI,MAAM,EAAE;IASxB,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAoB3C,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,GAAG,kBAAkB;IA8B3D,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}
+{"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,EAGL,aAAa,EAGd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,UAAU,wBAAwB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;CACjC;AAED,qBAAa,oBAAqB,SAAQ,SAAS;IAUxC,SAAS,CAAC,EAAE,OAAO;IATrB,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,MAAM,CAAC;IAEhB,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAC1B,iBAAiB,EAAG,aAAa,GAAG,IAAI,CAAC;gBAG9C,YAAY,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,OAAO,YAAA;IAUtB,UAAU,CAAC,IAAI,EAAE,wBAAwB;IAuB/C,mBAAmB,IAAI,MAAM,EAAE;IASxB,aAAa,CAAC,UAAU,CAAC,EAAE,SAAS;IAe3C,sBAAsB,CACpB,YAAY,CAAC,EAAE,SAAS,EACxB,WAAW,CAAC,EAAE,SAAS,GACtB,kBAAkB;IAerB,mBAAmB,CAAC,YAAY,CAAC,EAAE,SAAS,GAAG,kBAAkB;IA8B3D,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAC3D"}

package/dist/clients/referralStateManager.js

@@ -9,6 +9,7 @@ const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wa
 const generated_1 = require("../generated");
 const utils_1 = require("../utils");
 const txHandler_1 = require("./txHandler");
+const constants_1 = require("../constants");
 class ReferralStateManager extends txHandler_1.TxHandler {
     constructor(heliusApiUrl, localTest) {
         super(heliusApiUrl, localTest);
@@ -34,8 +35,8 @@ class ReferralStateManager extends txHandler_1.TxHandler {
     defaultLookupTables() {
         return this.referralStateData?.lookupTable &&
             !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
-            ? [this.referralStateData?.lookupTable.toString()]
-            : [];
+            ? [constants_1.SOLAUTO_LUT, this.referralStateData?.lookupTable.toString()]
+            : [constants_1.SOLAUTO_LUT];
     }
     setReferredBy(referredBy) {
         const authorityReferralStateData = this.referralStateData;
@@ -47,24 +48,19 @@ class ReferralStateManager extends txHandler_1.TxHandler {
             !referredBy.equals((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey))
             ? referredBy
             : undefined;
-        this.referredByState = hasReferredBy
-            ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(authorityReferralStateData.referredByState)
-            : referredByAuthority
-                ? (0, utils_1.getReferralState)(referredByAuthority)
-                : undefined;
         this.referredBy = referredByAuthority;
     }
-    updateReferralStatesIx(destFeesMint, referredBy, lookupTable) {
+    updateReferralStatesIx(destFeesMint, lookupTable) {
         return (0, generated_1.updateReferralStates)(this.umi, {
             signer: this.signer,
             signerReferralState: (0, umi_1.publicKey)(this.referralState),
             referralFeesDestMint: destFeesMint ? (0, umi_1.publicKey)(destFeesMint) : null,
-            referredByState: referredBy
-                ? (0, umi_1.publicKey)((0, utils_1.getReferralState)(referredBy))
-                : this.referredByState
-                    ? (0, umi_1.publicKey)(this.referredByState)
-                    : undefined,
-            referredByAuthority: referredBy ? (0, umi_1.publicKey)(referredBy) : undefined,
+            referredByState: this.referredBy
+                ? (0, umi_1.publicKey)((0, utils_1.getReferralState)(this.referredBy))
+                : undefined,
+            referredByAuthority: this.referredBy
+                ? (0, umi_1.publicKey)(this.referredBy)
+                : undefined,
             addressLookupTable: lookupTable ? (0, umi_1.publicKey)(lookupTable) : null,
         });
     }

package/dist/clients/solautoClient.js

@@ -65,8 +65,8 @@ class SolautoClient extends txHandler_1.TxHandler {
             signer: args.signer,
             wallet: args.wallet,
         });
-        if (this.referralStateManager.referredByState !== undefined) {
-            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referralStateManager.referredByState, this.supplyMint);
+        if (this.referralStateManager.referredBy !== undefined) {
+            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)((0, accountUtils_1.getReferralState)(this.referralStateManager.referredBy), this.supplyMint);
         }
         this.solautoFeesWallet = generalAccounts_1.SOLAUTO_FEES_WALLET;
         this.solautoFeesSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoFeesWallet, this.supplyMint);
@@ -85,8 +85,8 @@ class SolautoClient extends txHandler_1.TxHandler {
     }
     setReferredBy(referredBy) {
         this.referralStateManager.setReferredBy(referredBy);
-        if (this.referralStateManager.referredByState !== undefined) {
-            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)(this.referralStateManager.referredByState, this.supplyMint);
+        if (this.referralStateManager.referredBy !== undefined) {
+            this.referredBySupplyTa = (0, accountUtils_1.getTokenAccount)((0, accountUtils_1.getReferralState)(this.referralStateManager.referredBy), this.supplyMint);
         }
     }
     async resetLiveTxUpdates(success) {

package/dist/clients/solautoMarginfiClient.js

@@ -136,8 +136,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             signerReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
-            referredByState: this.referralStateManager.referredByState
-                ? (0, umi_1.publicKey)(this.referralStateManager.referredByState)
+            referredByState: this.referralStateManager.referredBy
+                ? (0, umi_1.publicKey)((0, accountUtils_1.getReferralState)(this.referralStateManager.referredBy))
                 : undefined,
             referredBySupplyTa: this.referredBySupplyTa
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa)

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAuBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA0LjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAwCzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkH5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAuBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAyLjD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,aAAa,oBAwCzE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAkH5C;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAsC5C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}

package/dist/transactions/transactionUtils.js

@@ -52,13 +52,13 @@ function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn)
 async function transactionChoresBefore(client, accountsGettingCreated, solautoActions, initiatingDcaIn) {
     let chores = (0, umi_1.transactionBuilder)();
     if (client.referralStateManager.referralStateData === null ||
-        (client.referralStateManager.referredByState !== undefined &&
+        (client.referralStateManager.referredBy !== undefined &&
             client.referralStateManager.referralStateData?.referredByState ===
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default)) ||
         (client.authorityLutAddress !== undefined &&
             client.referralStateManager.referralStateData.lookupTable ==
                 (0, umi_1.publicKey)(web3_js_1.PublicKey.default))) {
-        chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.referralStateManager.referredBy, client.authorityLutAddress));
+        chores = chores.add(client.referralStateManager.updateReferralStatesIx(undefined, client.authorityLutAddress));
     }
     if (client.selfManaged) {
         if (client.solautoPositionData === null) {
@@ -148,7 +148,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by TA for ", client.supplyMint.toString());
-        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referralStateManager.referredByState, client.supplyMint));
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, accountUtils_1.getReferralState)(client.referralStateManager.referredBy), client.supplyMint));
     }
     if (checkSolautoFeesTa && !(0, generalUtils_1.rpcAccountCreated)(solautoFeesSupplyTa)) {
         client.log("Creating Solauto fees TA for ", client.supplyMint.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.212",
+  "version": "1.0.213",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/clients/referralStateManager.ts

@@ -21,6 +21,7 @@ import {
 } from "../generated";
 import { getReferralState, getTokenAccount } from "../utils";
 import { TxHandler } from "./txHandler";
+import { SOLAUTO_LUT } from "../constants";
 
 interface ReferralStateManagerArgs {
   signer?: Signer;
@@ -37,8 +38,6 @@ export class ReferralStateManager extends TxHandler {
   public referralState!: PublicKey;
   public referralStateData!: ReferralState | null;
 
-  public referredByState?: PublicKey;
-
   constructor(
     heliusApiUrl: string,
     public localTest?: boolean
@@ -79,8 +78,8 @@ export class ReferralStateManager extends TxHandler {
       !toWeb3JsPublicKey(this.referralStateData!.lookupTable).equals(
         PublicKey.default
       )
-      ? [this.referralStateData?.lookupTable.toString()]
-      : [];
+      ? [SOLAUTO_LUT, this.referralStateData?.lookupTable.toString()]
+      : [SOLAUTO_LUT];
   }
 
   public setReferredBy(referredBy?: PublicKey) {
@@ -95,29 +94,23 @@ export class ReferralStateManager extends TxHandler {
       !referredBy.equals(toWeb3JsPublicKey(this.signer.publicKey))
         ? referredBy
         : undefined;
-    this.referredByState = hasReferredBy
-      ? toWeb3JsPublicKey(authorityReferralStateData!.referredByState)
-      : referredByAuthority
-        ? getReferralState(referredByAuthority!)
-        : undefined;
     this.referredBy = referredByAuthority;
   }
 
   updateReferralStatesIx(
     destFeesMint?: PublicKey,
-    referredBy?: PublicKey,
     lookupTable?: PublicKey
   ): TransactionBuilder {
     return updateReferralStates(this.umi, {
       signer: this.signer,
       signerReferralState: publicKey(this.referralState),
       referralFeesDestMint: destFeesMint ? publicKey(destFeesMint) : null,
-      referredByState: referredBy
-        ? publicKey(getReferralState(referredBy))
-        : this.referredByState
-          ? publicKey(this.referredByState)
-          : undefined,
-      referredByAuthority: referredBy ? publicKey(referredBy) : undefined,
+      referredByState: this.referredBy
+        ? publicKey(getReferralState(this.referredBy))
+        : undefined,
+      referredByAuthority: this.referredBy
+        ? publicKey(this.referredBy)
+        : undefined,
       addressLookupTable: lookupTable ? publicKey(lookupTable) : null,
     });
   }

package/src/clients/solautoClient.ts

@@ -174,9 +174,9 @@ export abstract class SolautoClient extends TxHandler {
       signer: args.signer,
       wallet: args.wallet,
     });
-    if (this.referralStateManager.referredByState !== undefined) {
+    if (this.referralStateManager.referredBy !== undefined) {
       this.referredBySupplyTa = getTokenAccount(
-        this.referralStateManager.referredByState,
+        getReferralState(this.referralStateManager.referredBy),
         this.supplyMint
       );
     }
@@ -213,9 +213,9 @@ export abstract class SolautoClient extends TxHandler {
 
   public setReferredBy(referredBy?: PublicKey) {
     this.referralStateManager.setReferredBy(referredBy);
-    if (this.referralStateManager.referredByState !== undefined) {
+    if (this.referralStateManager.referredBy !== undefined) {
       this.referredBySupplyTa = getTokenAccount(
-        this.referralStateManager.referredByState,
+        getReferralState(this.referralStateManager.referredBy),
         this.supplyMint
       );
     }

package/src/clients/solautoMarginfiClient.ts

@@ -32,7 +32,7 @@ import {
   marginfiRebalance,
   marginfiRefreshData,
 } from "../generated";
-import { getMarginfiAccountPDA, getTokenAccount } from "../utils/accountUtils";
+import { getMarginfiAccountPDA, getReferralState, getTokenAccount } from "../utils/accountUtils";
 import { generateRandomU64, safeGetPrice } from "../utils/generalUtils";
 import {
   MARGINFI_PROGRAM_ID,
@@ -263,8 +263,8 @@ export class SolautoMarginfiClient extends SolautoClient {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
       signerReferralState: publicKey(this.referralStateManager.referralState),
-      referredByState: this.referralStateManager.referredByState
-        ? publicKey(this.referralStateManager.referredByState)
+      referredByState: this.referralStateManager.referredBy
+        ? publicKey(getReferralState(this.referralStateManager.referredBy))
         : undefined,
       referredBySupplyTa: this.referredBySupplyTa
         ? publicKey(this.referredBySupplyTa)

package/src/transactions/transactionUtils.ts

@@ -57,7 +57,7 @@ import {
   eligibleForRebalance,
   positionStateWithLatestPrices,
 } from "../utils/solauto/generalUtils";
-import { getTokenAccount, getTokenAccountData } from "../utils/accountUtils";
+import { getReferralState, getTokenAccount, getTokenAccountData } from "../utils/accountUtils";
 import {
   createMarginfiProgram,
   getLendingAccountBorrowInstructionDataSerializer,
@@ -140,7 +140,7 @@ async function transactionChoresBefore(
 
   if (
     client.referralStateManager.referralStateData === null ||
-    (client.referralStateManager.referredByState !== undefined &&
+    (client.referralStateManager.referredBy !== undefined &&
       client.referralStateManager.referralStateData?.referredByState ===
         publicKey(PublicKey.default)) ||
     (client.authorityLutAddress !== undefined &&
@@ -150,7 +150,6 @@ async function transactionChoresBefore(
     chores = chores.add(
       client.referralStateManager.updateReferralStatesIx(
         undefined,
-        client.referralStateManager.referredBy,
         client.authorityLutAddress
       )
     );
@@ -315,7 +314,7 @@ export async function rebalanceChoresBefore(
     chores = chores.add(
       createAssociatedTokenAccountUmiIx(
         client.signer,
-        client.referralStateManager.referredByState!,
+        getReferralState(client.referralStateManager.referredBy!),
         client.supplyMint
       )
     );

package/tests/unit/rebalanceCalculations.ts

@@ -59,7 +59,7 @@ function assertAccurateRebalance(
   let adjustmentFeeBps = 0;
   if (increasingLeverage) {
     adjustmentFeeBps = getSolautoFeesBps(
-      client.referredByState !== undefined,
+      client.referredBy !== undefined,
       targetLiqUtilizationRateBps,
       fromBaseUnit(
         client.solautoPositionState?.netWorth.baseAmountUsdValue ?? BigInt(0),