@haven-fi/solauto-sdk 1.0.746 → 1.0.748

package/dist/services/transactions/manager/clientTransactionsManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAM5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YA4BnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAiClD"}
+{"version":3,"file":"clientTransactionsManager.d.ts","sourceRoot":"","sources":["../../../../src/services/transactions/manager/clientTransactionsManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAM5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YA4BnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAkClD"}

package/dist/services/transactions/manager/clientTransactionsManager.js

@@ -34,7 +34,7 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
             .map((x) => x.tx)));
         if (updateLutTx) {
-            choresBefore.prepend(updateLutTx);
+            choresBefore = choresBefore.prepend(updateLutTx);
         }
         if (choresBefore.getInstructions().length) {
             const chore = new types_1.TransactionItem(async () => ({ tx: choresBefore }), constants_1.CHORES_TX_NAME);
@@ -53,7 +53,8 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
         const items = [...transactions];
         const client = this.txHandler;
         const updateLut = await client.updateLookupTable();
-        if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
+        const updateLutInSepTx = updateLut?.new || (updateLut?.accountsToAdd ?? []).length > 4;
+        if (updateLut && updateLutInSepTx) {
             await this.updateLut(updateLut.tx, updateLut.new);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
@@ -61,7 +62,7 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
         for (const item of items) {
             await item.initialize();
         }
-        await this.addChoreTxs(items, updateLut && !updateLut?.new ? updateLut.tx : undefined);
+        await this.addChoreTxs(items, updateLut && !updateLutInSepTx ? updateLut.tx : undefined);
         const result = await super.send(items).catch((e) => {
             client.resetLiveTxUpdates(false);
             throw e;

package/local/txSandbox.ts

@@ -1,12 +1,14 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair } from "@metaplex-foundation/umi";
-import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
+import { fromWeb3JsKeypair, fromWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   ClientTransactionsManager,
   consoleLog,
+  fetchReferralState,
   getBatches,
   getClient,
   getPositionExBulk,
+  getReferralState,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
@@ -26,7 +28,7 @@ const payForTransaction = false;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
-let [, umi] = getSolanaRpcConnection(
+let [conn, umi] = getSolanaRpcConnection(
   LOCAL_IRONFORGE_API_URL,
   testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
   lpEnv
@@ -38,32 +40,39 @@ const signer = createSignerFromKeypair(
 );
 
 export async function main() {
-  const client = getClient(LendingPlatform.Marginfi, {
-    signer,
-    showLogs: true,
-    rpcUrl: LOCAL_IRONFORGE_API_URL,
-    programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-    lpEnv,
-  });
-
-  await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("Bk6mdg4mg9BD217vZwk8WDv7YJ66VyPPRhhQpaZsQPfL"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
-  });
-
-  const transactionItems = [rebalance(client)];
-
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 4 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  // const client = getClient(LendingPlatform.Marginfi, {
+  //   signer,
+  //   showLogs: true,
+  //   rpcUrl: LOCAL_IRONFORGE_API_URL,
+  //   programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+  //   lpEnv,
+  // });
+
+  // await client.initializeExistingSolautoPosition({
+  //   positionId: 1,
+  //   authority: new PublicKey("Bk6mdg4mg9BD217vZwk8WDv7YJ66VyPPRhhQpaZsQPfL"),
+  //   // lpUserAccount: new PublicKey(
+  //   //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+  //   // ),
+  // });
+
+  // const transactionItems = [rebalance(client)];
+
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 4 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
+
+  const ref = getReferralState(new PublicKey("9PCRbk8Gvt2zqewLKbxaSyTxA2JMtdQGhMff8EdELXNq"), SOLAUTO_PROD_PROGRAM);
+
+  const data = await fetchReferralState(umi, fromWeb3JsPublicKey(ref));
+
+  const accounts = await conn.getAddressLookupTable(new PublicKey(data.lookupTable));
+  console.log(accounts.value?.state?.addresses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/transactions/manager/clientTransactionsManager.ts

@@ -75,7 +75,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     );
 
     if (updateLutTx) {
-      choresBefore.prepend(updateLutTx);
+      choresBefore = choresBefore.prepend(updateLutTx);
     }
 
     if (choresBefore.getInstructions().length) {
@@ -111,7 +111,8 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
 
     const updateLut = await client.updateLookupTable();
 
-    if (updateLut && (updateLut?.new || updateLut.accountsToAdd.length > 4)) {
+    const updateLutInSepTx = updateLut?.new || (updateLut?.accountsToAdd ?? []).length > 4;
+    if (updateLut && updateLutInSepTx) {
       await this.updateLut(updateLut.tx, updateLut.new);
     }
     this.lookupTables.defaultLuts = client.defaultLookupTables();
@@ -124,7 +125,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
 
     await this.addChoreTxs(
       items,
-      updateLut && !updateLut?.new ? updateLut.tx : undefined
+      updateLut && !updateLutInSepTx ? updateLut.tx : undefined
     );
 
     const result = await super.send(items).catch((e) => {