@haven-fi/solauto-sdk 1.0.6 → 1.0.8

package/README.md

@@ -0,0 +1,3 @@
+# Solauto SDK
+
+TODO

package/dist/clients/solautoClient.d.ts

@@ -1,6 +1,7 @@
 import "rpc-websockets/dist/lib/client";
 import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 import { DCASettings, DCASettingsInpArgs, LendingPlatform, PositionState, ReferralState, SolautoActionArgs, SolautoPosition, SolautoRebalanceTypeArgs, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../generated";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
@@ -8,7 +9,8 @@ import { LivePositionUpdates } from "../utils/solauto/generalUtils";
 export interface SolautoClientArgs {
     authority?: PublicKey;
     positionId: number;
-    signer: Signer;
+    signer?: Signer;
+    wallet?: WalletAdapter;
     supplyLiquidityMint?: PublicKey;
     debtLiquidityMint?: PublicKey;
     referralFeesDestMint?: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoClient.js

@@ -5,6 +5,7 @@ require("rpc-websockets/dist/lib/client");
 const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
+const umi_signer_wallet_adapters_1 = require("@metaplex-foundation/umi-signer-wallet-adapters");
 const generated_1 = require("../generated");
 const accountUtils_1 = require("../utils/accountUtils");
 const generalAccounts_1 = require("../constants/generalAccounts");
@@ -20,9 +21,13 @@ class SolautoClient {
         this.localTest = Boolean(localTest);
     }
     async initialize(args, lendingPlatform) {
-        this.umi = solautoConstants_1.UMI.use((0, umi_1.signerIdentity)(args.signer));
-        this.signer = args.signer;
-        this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.signer.publicKey);
+        this.umi = solautoConstants_1.UMI;
+        if (!args.signer && !args.wallet) {
+            throw new Error("Signer or wallet must be provided");
+        }
+        this.umi = solautoConstants_1.UMI.use(args.signer ? (0, umi_1.signerIdentity)(args.signer) : (0, umi_signer_wallet_adapters_1.walletAdapterIdentity)(args.wallet, true));
+        this.signer = this.umi.identity;
+        this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.umi.identity.publicKey);
         this.positionId = args.positionId;
         this.selfManaged = this.positionId === 0;
         this.lendingPlatform = lendingPlatform;

package/dist/clients/solautoMarginfiClient.d.ts

@@ -6,12 +6,13 @@ import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceT
 import { MarginfiAccount } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
+import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
     marginfiAccount?: PublicKey | Signer;
     marginfiAccountSeedIdx?: bigint;
     marginfiGroup?: PublicKey;
 }
-export declare function newMarginfiSolautoManagedPositionArgs(positionId: number, signer: Signer, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
+export declare function newMarginfiSolautoManagedPositionArgs(positionId: number, signer: Signer | undefined, wallet: WalletAdapter | undefined, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
 export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiProgram: PublicKey;
     marginfiAccountSeedIdx?: bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAOhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,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,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAS3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAgEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAqBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAOhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,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,wBAAgB,qCAAqC,CACnD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAU3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAgEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAqBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -12,10 +12,11 @@ const generalUtils_1 = require("../utils/generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const marginfiUtils_1 = require("../utils/marginfiUtils");
 const numberUtils_1 = require("../utils/numberUtils");
-function newMarginfiSolautoManagedPositionArgs(positionId, signer, supplyMint, debtMint, referredByAuthority) {
+function newMarginfiSolautoManagedPositionArgs(positionId, signer, wallet, supplyMint, debtMint, referredByAuthority) {
     return {
         positionId,
         signer,
+        wallet,
         marginfiAccountSeedIdx: positionId > 0 ? (0, generalUtils_1.generateRandomU64)() : undefined,
         supplyLiquidityMint: supplyMint,
         debtLiquidityMint: debtMint,

package/dist/generated/types/lendingPlatform.d.ts

@@ -8,8 +8,7 @@
 import { Serializer } from '@metaplex-foundation/umi/serializers';
 export declare enum LendingPlatform {
     Marginfi = 0,
-    Kamino = 1,
-    Solend = 2
+    Kamino = 1
 }
 export type LendingPlatformArgs = LendingPlatform;
 export declare function getLendingPlatformSerializer(): Serializer<LendingPlatformArgs, LendingPlatform>;

package/dist/generated/types/lendingPlatform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lendingPlatform.d.ts","sourceRoot":"","sources":["../../../src/generated/types/lendingPlatform.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,eAAe;IACzB,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,MAAM,IAAA;CACP;AAED,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAElD,wBAAgB,4BAA4B,IAAI,UAAU,CACxD,mBAAmB,EACnB,eAAe,CAChB,CAIA"}
+{"version":3,"file":"lendingPlatform.d.ts","sourceRoot":"","sources":["../../../src/generated/types/lendingPlatform.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,eAAe;IACzB,QAAQ,IAAA;IACR,MAAM,IAAA;CACP;AAED,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAElD,wBAAgB,4BAA4B,IAAI,UAAU,CACxD,mBAAmB,EACnB,eAAe,CAChB,CAIA"}

package/dist/generated/types/lendingPlatform.js

@@ -13,7 +13,6 @@ var LendingPlatform;
 (function (LendingPlatform) {
     LendingPlatform[LendingPlatform["Marginfi"] = 0] = "Marginfi";
     LendingPlatform[LendingPlatform["Kamino"] = 1] = "Kamino";
-    LendingPlatform[LendingPlatform["Solend"] = 2] = "Solend";
 })(LendingPlatform = exports.LendingPlatform || (exports.LendingPlatform = {}));
 function getLendingPlatformSerializer() {
     return (0, serializers_1.scalarEnum)(LendingPlatform, {

package/dist/transactions/transactionsManager.d.ts

@@ -14,6 +14,7 @@ export declare class TransactionItem {
     } | undefined>, name?: string | undefined);
     initialize(): Promise<void>;
     refetch(attemptNum: number): Promise<void>;
+    uniqueAccounts(): string[];
 }
 export declare enum TransactionStatus {
     Skipped = "Skipped",

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuCzD,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;CAKjC;AAsED,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IARvB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS;YAKlB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CA8HX"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuCzD,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IARvB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS;YAKlB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CAqIX"}

package/dist/transactions/transactionsManager.js

@@ -45,6 +45,14 @@ class TransactionItem {
         this.tx = resp?.tx;
         this.lookupTableAddresses = resp?.lookupTableAddresses ?? [];
     }
+    uniqueAccounts() {
+        return Array.from(new Set(this.tx.getInstructions()
+            .map((x) => [
+            x.programId.toString(),
+            ...x.keys.map((y) => y.pubkey.toString()),
+        ])
+            .flat()));
+    }
 }
 exports.TransactionItem = TransactionItem;
 class TransactionSet {
@@ -57,6 +65,13 @@ class TransactionSet {
         if (!item.tx) {
             return true;
         }
+        const accountLocks = Array.from(new Set([
+            ...this.items.map((x) => x.uniqueAccounts()),
+            ...item.uniqueAccounts(),
+        ])).length;
+        if (accountLocks > 128) {
+            return false;
+        }
         return (await this.getSingleTransaction())
             .add(item.tx)
             .setAddressLookupTables(await this.lookupTables.getLutInputs([
@@ -177,7 +192,7 @@ class TransactionsManager {
             choresBefore.prepend(updateLookupTable.updateLutTx);
         }
         if (choresBefore.getInstructions().length > 0) {
-            this.items.unshift(new TransactionItem(async () => ({ tx: choresBefore })));
+            this.items.unshift(new TransactionItem(async () => ({ tx: choresBefore }), "create account(s)"));
             this.client.log("Chores before: ", choresBefore.getInstructions().length);
         }
         if (choresAfter.getInstructions().length > 0) {

package/dist/utils/accountUtils.d.ts

@@ -7,5 +7,4 @@ export declare function getTokenAccounts(wallet: PublicKey, tokenMints: PublicKe
 export declare function getSolautoPositionAccount(signer: PublicKey, positionId: number): Promise<PublicKey>;
 export declare function getReferralState(authority: PublicKey): Promise<PublicKey>;
 export declare function getMarginfiAccountPDA(solautoPositionAccount: PublicKey, marginfiAccountSeedIdx: bigint): Promise<PublicKey>;
-export declare function getSolendObligationAccount(solautoPositionAccount: PublicKey | undefined, signer: PublicKey, lendingMarket: PublicKey, solendProgram: PublicKey): Promise<PublicKey>;
 //# sourceMappingURL=accountUtils.d.ts.map

package/dist/utils/accountUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAe,MAAM,iBAAiB,CAAC;AAIzD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,sBAQnB;AAED,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,SAAS,sBAU1D;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B;AAED,wBAAsB,0BAA0B,CAC9C,sBAAsB,EAAE,SAAS,GAAG,SAAS,EAC7C,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,SAAS,EACxB,aAAa,EAAE,SAAS,sBAkBzB"}
+{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,sBAQnB;AAED,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,SAAS,sBAU1D;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B"}

package/dist/utils/accountUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSolendObligationAccount = exports.getMarginfiAccountPDA = exports.getReferralState = exports.getSolautoPositionAccount = exports.getTokenAccounts = exports.getTokenAccount = exports.bufferFromU64 = exports.bufferFromU8 = void 0;
+exports.getMarginfiAccountPDA = exports.getReferralState = exports.getSolautoPositionAccount = exports.getTokenAccounts = exports.getTokenAccount = exports.bufferFromU64 = exports.bufferFromU8 = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const generated_1 = require("../generated");
@@ -45,16 +45,3 @@ async function getMarginfiAccountPDA(solautoPositionAccount, marginfiAccountSeed
     return marginfiAccount;
 }
 exports.getMarginfiAccountPDA = getMarginfiAccountPDA;
-async function getSolendObligationAccount(solautoPositionAccount, signer, lendingMarket, solendProgram) {
-    const seeds = [
-        signer.toBuffer(),
-        lendingMarket.toBuffer(),
-        solendProgram.toBuffer(),
-    ];
-    if (solautoPositionAccount !== undefined) {
-        seeds.unshift(solautoPositionAccount.toBuffer());
-    }
-    const [obligationAccount, _] = await web3_js_1.PublicKey.findProgramAddress(seeds, new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
-    return obligationAccount;
-}
-exports.getSolendObligationAccount = getSolendObligationAccount;

package/dist/utils/index.d.ts

@@ -1,7 +1,6 @@
 export * from './solauto/index';
 export * from './accountUtils';
 export * from './generalUtils';
-export * from './jitoUtils';
 export * from './jupiterUtils';
 export * from './marginfiUtils';
 export * from './numberUtils';

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

package/dist/utils/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./solauto/index"), exports);
 __exportStar(require("./accountUtils"), exports);
 __exportStar(require("./generalUtils"), exports);
-__exportStar(require("./jitoUtils"), exports);
 __exportStar(require("./jupiterUtils"), exports);
 __exportStar(require("./marginfiUtils"), exports);
 __exportStar(require("./numberUtils"), exports);

package/dist/utils/numberUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAM3G;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAEH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAajE;AAED,wBAAgB,oBAAoB,CAClC,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,2BAA2B,EAAE,MAAM,EACnC,gBAAgB,CAAC,EAAE,MAAM,UAQ1B"}

package/{src/utils/local → local}/shared.ts

@@ -8,7 +8,7 @@ import {
   VersionedTransaction,
   PublicKey,
 } from "@solana/web3.js";
-import { CONNECTION } from "../../constants/solautoConstants";
+import { CONNECTION } from "../src/constants/solautoConstants";
 
 function loadSecretKey(keypairPath: string) {
   const secretKey = JSON.parse(fs.readFileSync(keypairPath, "utf8"));

package/{src/utils/local → local}/updateMarginfiLUT.ts

@@ -1,10 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
-import { MARGINFI_ACCOUNTS_LOOKUP_TABLE } from "../../constants/marginfiAccounts";
+import { MARGINFI_ACCOUNTS_LOOKUP_TABLE } from "../constants/marginfiAccounts";
 import {
   MARGINFI_ACCOUNTS,
   DEFAULT_MARGINFI_GROUP,
-} from "../../constants/marginfiAccounts";
-import { MARGINFI_PROGRAM_ID } from "../../marginfi-sdk";
+} from "../constants/marginfiAccounts";
+import { MARGINFI_PROGRAM_ID } from "../marginfi-sdk";
 import { updateLookupTable } from "./shared";
 
 const LOOKUP_TABLE_ADDRESS = new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE);

package/{src/utils/local → local}/updateSolautoLUT.ts

@@ -1,9 +1,9 @@
 import { PublicKey } from "@solana/web3.js";
-import { getTokenAccounts } from "../accountUtils";
-import { SOLAUTO_MANAGER } from "../../constants/generalAccounts";
-import { ALL_SUPPORTED_TOKENS } from "../../constants/tokenConstants";
+import { getTokenAccounts } from "../src/utils/accountUtils";
+import { SOLAUTO_MANAGER } from "../src/constants/generalAccounts";
+import { ALL_SUPPORTED_TOKENS } from "../src/constants/tokenConstants";
 import { updateLookupTable } from "./shared";
-import { STANDARD_LUT_ACCOUNTS } from "../../constants/solautoConstants";
+import { STANDARD_LUT_ACCOUNTS } from "../src/constants/solautoConstants";
 
 const solautoManagerTokenAccounts = getTokenAccounts(SOLAUTO_MANAGER, ALL_SUPPORTED_TOKENS.map((x) => new PublicKey(x)));
 

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
   "author": "Chelioso",
   "license": "MIT",
   "scripts": {
-    "build": "tsc",
+    "build": "rm -r dist && npx tsc",
     "test:txs": "ts-mocha -p ./tsconfig.json -t 1000000 tests/transactions/**/*.ts",
     "test:unit": "ts-mocha -p ./tsconfig.json -t 1000000 tests/unit/**/*.ts",
     "test:all": "pnpm test:unit && pnpm test:txs",
-    "update-lut:solauto": "npx ts-node src/utils/local/updateSolautoLUT.ts",
-    "update-lut:marginfi": "npx ts-node src/utils/local/updateMarginfiLUT.ts"
+    "update-lut:solauto": "npx ts-node local/updateSolautoLUT.ts",
+    "update-lut:marginfi": "npx ts-node local/updateMarginfiLUT.ts"
   },
   "dependencies": {
     "@jup-ag/api": "^6.0.24",
     "@metaplex-foundation/umi": "^0.9.1",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.1",
+    "@metaplex-foundation/umi-signer-wallet-adapters": "^0.9.1",
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.92.1",

package/src/clients/solautoClient.ts

@@ -13,6 +13,7 @@ import {
   some,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { WalletAdapter, walletAdapterIdentity } from "@metaplex-foundation/umi-signer-wallet-adapters";
 import {
   DCASettings,
   DCASettingsInpArgs,
@@ -65,7 +66,8 @@ import {
 export interface SolautoClientArgs {
   authority?: PublicKey;
   positionId: number;
-  signer: Signer;
+  signer?: Signer;
+  wallet?: WalletAdapter;
 
   supplyLiquidityMint?: PublicKey;
   debtLiquidityMint?: PublicKey;
@@ -119,10 +121,14 @@ export abstract class SolautoClient {
   }
 
   async initialize(args: SolautoClientArgs, lendingPlatform: LendingPlatform) {
-    this.umi = UMI.use(signerIdentity(args.signer));
-
-    this.signer = args.signer;
-    this.authority = args.authority ?? toWeb3JsPublicKey(args.signer.publicKey);
+    this.umi = UMI;
+    if (!args.signer && !args.wallet) {
+      throw new Error("Signer or wallet must be provided");
+    }
+    this.umi = UMI.use(args.signer ? signerIdentity(args.signer) : walletAdapterIdentity(args.wallet!, true));
+    
+    this.signer = this.umi.identity;
+    this.authority = args.authority ?? toWeb3JsPublicKey(this.umi.identity.publicKey);
 
     this.positionId = args.positionId;
     this.selfManaged = this.positionId === 0;

package/src/clients/solautoMarginfiClient.ts

@@ -55,6 +55,7 @@ import {
   getMarginfiAccountPositionState,
 } from "../utils/marginfiUtils";
 import { bytesToI80F48 } from "../utils/numberUtils";
+import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiAccount?: PublicKey | Signer;
@@ -64,7 +65,8 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
 
 export function newMarginfiSolautoManagedPositionArgs(
   positionId: number,
-  signer: Signer,
+  signer: Signer | undefined,
+  wallet: WalletAdapter | undefined,
   supplyMint: PublicKey,
   debtMint: PublicKey,
   referredByAuthority?: PublicKey
@@ -72,6 +74,7 @@ export function newMarginfiSolautoManagedPositionArgs(
   return {
     positionId,
     signer,
+    wallet,
     marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
     supplyLiquidityMint: supplyMint,
     debtLiquidityMint: debtMint,

package/src/generated/types/lendingPlatform.ts

@@ -11,7 +11,6 @@ import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 export enum LendingPlatform {
   Marginfi,
   Kamino,
-  Solend,
 }
 
 export type LendingPlatformArgs = LendingPlatform;

package/src/transactions/transactionsManager.ts

@@ -65,6 +65,19 @@ export class TransactionItem {
     this.tx = resp?.tx;
     this.lookupTableAddresses = resp?.lookupTableAddresses ?? [];
   }
+
+  uniqueAccounts(): string[] {
+    return Array.from(
+      new Set(
+        this.tx!.getInstructions()
+          .map((x) => [
+            x.programId.toString(),
+            ...x.keys.map((y) => y.pubkey.toString()),
+          ])
+          .flat()
+      )
+    );
+  }
 }
 
 class TransactionSet {
@@ -79,6 +92,16 @@ class TransactionSet {
       return true;
     }
 
+    const accountLocks = Array.from(
+      new Set([
+        ...this.items.map((x) => x.uniqueAccounts()),
+        ...item.uniqueAccounts(),
+      ])
+    ).length;
+    if (accountLocks > 128) {
+      return false;
+    }
+
     return (await this.getSingleTransaction())
       .add(item.tx)
       .setAddressLookupTables(
@@ -249,7 +272,12 @@ export class TransactionsManager {
       choresBefore.prepend(updateLookupTable.updateLutTx);
     }
     if (choresBefore.getInstructions().length > 0) {
-      this.items.unshift(new TransactionItem(async () => ({ tx: choresBefore })));
+      this.items.unshift(
+        new TransactionItem(
+          async () => ({ tx: choresBefore }),
+          "create account(s)"
+        )
+      );
       this.client.log("Chores before: ", choresBefore.getInstructions().length);
     }
     if (choresAfter.getInstructions().length > 0) {
@@ -264,7 +292,9 @@ export class TransactionsManager {
     }
 
     if (this.mustBeAtomic && itemSets.length > 1) {
-      throw new Error(`${itemSets.length} transactions required but jito bundles are not currently supported`);
+      throw new Error(
+        `${itemSets.length} transactions required but jito bundles are not currently supported`
+      );
       // itemSets.forEach((set) => {
       //   this.updateStatus(set.name(), TransactionStatus.Processing);
       // });

package/src/utils/accountUtils.ts

@@ -1,4 +1,4 @@
-import { PublicKey, AccountMeta } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 import { getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { SOLAUTO_PROGRAM_ID } from "../generated";
 
@@ -65,28 +65,4 @@ export async function getMarginfiAccountPDA(
   );
 
   return marginfiAccount;
-}
-
-export async function getSolendObligationAccount(
-  solautoPositionAccount: PublicKey | undefined,
-  signer: PublicKey,
-  lendingMarket: PublicKey,
-  solendProgram: PublicKey
-) {
-  const seeds = [
-    signer.toBuffer(),
-    lendingMarket.toBuffer(),
-    solendProgram.toBuffer(),
-  ];
-
-  if (solautoPositionAccount !== undefined) {
-    seeds.unshift(solautoPositionAccount.toBuffer());
-  }
-
-  const [obligationAccount, _] = await PublicKey.findProgramAddress(
-    seeds,
-    new PublicKey(SOLAUTO_PROGRAM_ID)
-  );
-
-  return obligationAccount;
-}
+}

package/src/utils/index.ts

@@ -1,7 +1,6 @@
 export * from './solauto/index';
 export * from './accountUtils';
 export * from './generalUtils';
-export * from './jitoUtils';
 export * from './jupiterUtils';
 export * from './marginfiUtils';
 export * from './numberUtils';

package/src/utils/numberUtils.ts

@@ -1,4 +1,3 @@
-
 export function getLiqUtilzationRateBps(supplyUsd: number, debtUsd: number, liqThresholdBps: number): number {
   if (supplyUsd === 0) {
     return 0;

package/tests/shared.ts

@@ -1,7 +1,7 @@
 import { Signer, createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { Connection, clusterApiUrl } from "@solana/web3.js";
 import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
-import { getSecretKey } from "../src/utils/local/shared";
+import { getSecretKey } from "../local/shared";
 
 export function setupTest(keypairFilename?: string): Signer {
   const umi = createUmi(

package/tests/transactions/solautoMarginfi.ts

@@ -36,6 +36,7 @@ describe("Solauto Marginfi tests", async () => {
       // newMarginfiSolautoManagedPositionArgs(
       //   positionId,
       //   signer,
+      //   undefined,
       //   supply,
       //   debt
       // )

package/dist/utils/local/shared.d.ts

@@ -1,4 +0,0 @@
-import { PublicKey } from "@solana/web3.js";
-export declare function getSecretKey(keypairFilename?: string): Uint8Array;
-export declare function updateLookupTable(accounts: string[], lookupTableAddress?: PublicKey): Promise<void>;
-//# sourceMappingURL=shared.d.ts.map

package/dist/utils/local/shared.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/utils/local/shared.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,wBAAgB,YAAY,CAAC,eAAe,GAAE,MAAa,GAAG,UAAU,CAIvE;AAoDD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAAE,EAClB,kBAAkB,CAAC,EAAE,SAAS,iBAqB/B"}

package/dist/utils/local/shared.js

@@ -1,75 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateLookupTable = exports.getSecretKey = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const web3_js_1 = require("@solana/web3.js");
-const solautoConstants_1 = require("../../constants/solautoConstants");
-function loadSecretKey(keypairPath) {
-    const secretKey = JSON.parse(fs_1.default.readFileSync(keypairPath, "utf8"));
-    return new Uint8Array(secretKey);
-}
-function getSecretKey(keypairFilename = "id") {
-    return loadSecretKey(path_1.default.join(process.env.HOME, ".config", "solana", keypairFilename + ".json"));
-}
-exports.getSecretKey = getSecretKey;
-const keypair = web3_js_1.Keypair.fromSecretKey(getSecretKey());
-async function createAndSendV0Tx(txInstructions) {
-    let latestBlockhash = await solautoConstants_1.CONNECTION.getLatestBlockhash("finalized");
-    const messageV0 = new web3_js_1.TransactionMessage({
-        payerKey: keypair.publicKey,
-        recentBlockhash: latestBlockhash.blockhash,
-        instructions: txInstructions,
-    }).compileToV0Message();
-    const transaction = new web3_js_1.VersionedTransaction(messageV0);
-    transaction.sign([keypair]);
-    const txid = await solautoConstants_1.CONNECTION.sendTransaction(transaction, {
-        maxRetries: 5,
-    });
-    const confirmation = await solautoConstants_1.CONNECTION.confirmTransaction({
-        signature: txid,
-        blockhash: latestBlockhash.blockhash,
-        lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
-    });
-    if (confirmation.value.err) {
-        throw new Error(confirmation.value.err.toString());
-    }
-    console.log(txid);
-}
-async function addAddressesIfNeeded(lookupTableAddress, existingAddresses, addressesToAdd) {
-    const addresses = addressesToAdd
-        .filter((x) => !existingAddresses.includes(x))
-        .map((x) => new web3_js_1.PublicKey(x));
-    if (addresses.length > 0) {
-        await createAndSendV0Tx([
-            web3_js_1.AddressLookupTableProgram.extendLookupTable({
-                payer: keypair.publicKey,
-                authority: keypair.publicKey,
-                lookupTable: lookupTableAddress,
-                addresses,
-            }),
-        ]);
-    }
-}
-async function updateLookupTable(accounts, lookupTableAddress) {
-    let lookupTable = lookupTableAddress
-        ? await solautoConstants_1.CONNECTION.getAddressLookupTable(lookupTableAddress)
-        : null;
-    if (lookupTable === null) {
-        const [createLutIx, addr] = web3_js_1.AddressLookupTableProgram.createLookupTable({
-            authority: keypair.publicKey,
-            payer: keypair.publicKey,
-            recentSlot: await solautoConstants_1.CONNECTION.getSlot({ commitment: "finalized" }),
-        });
-        lookupTableAddress = addr;
-        console.log("Lookup Table Address:", lookupTableAddress.toString());
-        createAndSendV0Tx([createLutIx]);
-    }
-    const existingAccounts = lookupTable?.value?.state.addresses.map((x) => x.toString()) ?? [];
-    console.log("Existing accounts: ", existingAccounts.length);
-    await addAddressesIfNeeded(lookupTableAddress, existingAccounts, accounts);
-}
-exports.updateLookupTable = updateLookupTable;

package/dist/utils/local/updateMarginfiLUT.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=updateMarginfiLUT.d.ts.map

package/dist/utils/local/updateMarginfiLUT.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateMarginfiLUT.d.ts","sourceRoot":"","sources":["../../../src/utils/local/updateMarginfiLUT.ts"],"names":[],"mappings":""}

package/dist/utils/local/updateMarginfiLUT.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const web3_js_1 = require("@solana/web3.js");
-const marginfiAccounts_1 = require("../../constants/marginfiAccounts");
-const marginfiAccounts_2 = require("../../constants/marginfiAccounts");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
-const shared_1 = require("./shared");
-const LOOKUP_TABLE_ADDRESS = new web3_js_1.PublicKey(marginfiAccounts_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE);
-async function addBanks() {
-    for (const key in marginfiAccounts_2.MARGINFI_ACCOUNTS) {
-        const accounts = marginfiAccounts_2.MARGINFI_ACCOUNTS[key];
-        await (0, shared_1.updateLookupTable)([
-            accounts.mint,
-            accounts.bank,
-            accounts.liquidityVault,
-            accounts.vaultAuthority,
-            accounts.priceOracle,
-        ], LOOKUP_TABLE_ADDRESS);
-    }
-}
-(0, shared_1.updateLookupTable)([marginfiAccounts_2.DEFAULT_MARGINFI_GROUP, marginfi_sdk_1.MARGINFI_PROGRAM_ID], LOOKUP_TABLE_ADDRESS);
-addBanks();

package/dist/utils/local/updateSolautoLUT.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=updateSolautoLUT.d.ts.map

package/dist/utils/local/updateSolautoLUT.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"updateSolautoLUT.d.ts","sourceRoot":"","sources":["../../../src/utils/local/updateSolautoLUT.ts"],"names":[],"mappings":""}

package/dist/utils/local/updateSolautoLUT.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const web3_js_1 = require("@solana/web3.js");
-const accountUtils_1 = require("../accountUtils");
-const generalAccounts_1 = require("../../constants/generalAccounts");
-const tokenConstants_1 = require("../../constants/tokenConstants");
-const shared_1 = require("./shared");
-const solautoConstants_1 = require("../../constants/solautoConstants");
-const solautoManagerTokenAccounts = (0, accountUtils_1.getTokenAccounts)(generalAccounts_1.SOLAUTO_MANAGER, tokenConstants_1.ALL_SUPPORTED_TOKENS.map((x) => new web3_js_1.PublicKey(x)));
-(0, shared_1.updateLookupTable)([
-    ...solautoConstants_1.STANDARD_LUT_ACCOUNTS,
-    ...solautoManagerTokenAccounts.map((x) => x.toString())
-]);