@haven-fi/solauto-sdk 1.0.207 → 1.0.208

package/dist/transactions/transactionUtils.d.ts

@@ -1,7 +1,7 @@
-import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
-import { ReferralState } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
+import { ReferralStateManager } from "../clients";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
 export declare function getTransactionChores(client: SolautoClient, tx: TransactionBuilder): Promise<[TransactionBuilder, TransactionBuilder]>;
 export declare function requiresRefreshBeforeRebalance(client: SolautoClient): Promise<boolean>;
@@ -9,7 +9,7 @@ export declare function buildSolautoRebalanceTransaction(client: SolautoClient,
     tx: TransactionBuilder;
     lookupTableAddresses: string[];
 } | undefined>;
-export declare function convertReferralFeesToDestination(umi: Umi, referralState: ReferralState, tokenAccount: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
+export declare function convertReferralFeesToDestination(referralManager: ReferralStateManager, tokenAccount: PublicKey, destinationMint: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
 export declare function getErrorInfo(tx: TransactionBuilder, error: any): {
     errorName: string | undefined;
     errorInfo: undefined;

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,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqOzD,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,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;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;AAsBxE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqCzD,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAgM7D,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,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}

package/dist/transactions/transactionUtils.js

@@ -400,26 +400,26 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
         lookupTableAddresses,
     };
 }
-async function convertReferralFeesToDestination(umi, referralState, tokenAccount) {
-    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(umi, tokenAccount);
+async function convertReferralFeesToDestination(referralManager, tokenAccount, destinationMint) {
+    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(referralManager.umi, tokenAccount);
     if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
         return undefined;
     }
-    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(umi.identity, {
+    const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(referralManager.umi.identity, {
         amount: tokenAccountData.amount,
-        destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.publicKey),
+        destinationWallet: referralManager.referralState,
         inputMint: tokenAccountData.mint,
-        outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.destFeesMint),
+        outputMint: destinationMint,
         exactIn: true,
         slippageIncFactor: 0.25,
     });
     let tx = (0, umi_1.transactionBuilder)()
         .add(setupInstructions)
-        .add((0, generated_1.convertReferralFees)(umi, {
-        signer: umi.identity,
-        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(umi.identity.publicKey), tokenAccountData.mint)),
+        .add((0, generated_1.convertReferralFees)(referralManager.umi, {
+        signer: referralManager.umi.identity,
+        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralManager.umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: (0, umi_1.publicKey)(referralManager.referralState),
         referralFeesTa: (0, umi_1.publicKey)(tokenAccount),
     }))
         .add(swapIx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.207",
+  "version": "1.0.208",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -22,7 +22,6 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.92.1",
-    "@sqds/multisig": "^2.1.3",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
     "rpc-websockets": "7.11.0"

package/src/transactions/transactionUtils.ts

@@ -26,6 +26,7 @@ import {
   getMarginfiRebalanceInstructionDataSerializer,
   getSolautoErrorFromCode,
   isSolautoAction,
+  safeFetchReferralState,
   solautoAction,
 } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
@@ -65,7 +66,7 @@ import {
   getMarginfiErrorFromName,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
-import { TxHandler } from "../clients";
+import { ReferralStateManager, TxHandler } from "../clients";
 import {
   createJupiterProgram,
   getJupiterErrorFromName,
@@ -750,21 +751,21 @@ export async function buildSolautoRebalanceTransaction(
 }
 
 export async function convertReferralFeesToDestination(
-  umi: Umi,
-  referralState: ReferralState,
-  tokenAccount: PublicKey
+  referralManager: ReferralStateManager,
+  tokenAccount: PublicKey,
+  destinationMint: PublicKey
 ): Promise<[TransactionBuilder, string[]] | undefined> {
-  const tokenAccountData = await getTokenAccountData(umi, tokenAccount);
+  const tokenAccountData = await getTokenAccountData(referralManager.umi, tokenAccount);
   if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
     return undefined;
   }
 
   const { lookupTableAddresses, setupInstructions, swapIx } =
-    await getJupSwapTransaction(umi.identity, {
+    await getJupSwapTransaction(referralManager.umi.identity, {
       amount: tokenAccountData.amount,
-      destinationWallet: toWeb3JsPublicKey(referralState.publicKey),
+      destinationWallet: referralManager.referralState,
       inputMint: tokenAccountData.mint,
-      outputMint: toWeb3JsPublicKey(referralState.destFeesMint),
+      outputMint: destinationMint,
       exactIn: true,
       slippageIncFactor: 0.25,
     });
@@ -772,16 +773,16 @@ export async function convertReferralFeesToDestination(
   let tx = transactionBuilder()
     .add(setupInstructions)
     .add(
-      convertReferralFees(umi, {
-        signer: umi.identity,
+      convertReferralFees(referralManager.umi, {
+        signer: referralManager.umi.identity,
         intermediaryTa: publicKey(
           getTokenAccount(
-            toWeb3JsPublicKey(umi.identity.publicKey),
+            toWeb3JsPublicKey(referralManager.umi.identity.publicKey),
             tokenAccountData.mint
           )
         ),
         ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
-        referralState: referralState.publicKey,
+        referralState: publicKey(referralManager.referralState),
         referralFeesTa: publicKey(tokenAccount),
       })
     )