@haven-fi/solauto-sdk 1.0.431 → 1.0.433

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,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,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA4F1C,8BAA8B;IAoCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgFrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA8ClE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AASzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,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,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,cAAc,CAAC,CAAY;IAE5B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA2F1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgFrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoF5D,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA8ClE"}

package/dist/clients/solautoMarginfiClient.js

@@ -21,11 +21,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         await super.initialize(args);
         this.lendingPlatform = generated_1.LendingPlatform.Marginfi;
         if (this.selfManaged) {
-            const marginfiAccSigner = (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
-            this.marginfiAccount = args.marginfiAccount ?? marginfiAccSigner;
-            if (!args.marginfiAccount) {
-                this.otherSigners.push(marginfiAccSigner);
-            }
+            this.marginfiAccount =
+                args.marginfiAccount ??
+                    (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
         }
         else {
             if (this.solautoPositionData) {
@@ -46,6 +44,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             "publicKey" in this.marginfiAccount
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccount.publicKey)
                 : this.marginfiAccount;
+        if ("publicKey" in this.marginfiAccount) {
+            this.otherSigners.push(this.marginfiAccount);
+        }
         const marginfiAccountData = !args.new
             ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(this.umi, (0, umi_1.publicKey)(this.marginfiAccountPk), { commitment: "confirmed" })
             : null;
@@ -90,6 +91,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             compatibleMarginfiAccounts.length > 0
                 ? compatibleMarginfiAccounts[0]
                 : undefined;
+        if (this.intermediaryMarginfiAccountSigner) {
+            this.otherSigners.push(this.intermediaryMarginfiAccountSigner);
+        }
     }
     protocolAccount() {
         return this.marginfiAccountPk;

package/dist/utils/jitoUtils.d.ts

@@ -1,8 +1,8 @@
-import { Connection, PublicKey, VersionedMessage } from "@solana/web3.js";
-import { Signer, TransactionBuilder, Umi } from "@metaplex-foundation/umi";
+import { Connection, PublicKey } from "@solana/web3.js";
+import { Signer, TransactionBuilder, Umi, TransactionMessage } from "@metaplex-foundation/umi";
 import { PriorityFeeSetting, TransactionRunType } from "../types";
 export declare function getRandomTipAccount(): PublicKey;
-export declare function getRequiredSigners(message: VersionedMessage): {
+export declare function getRequiredSigners(message: TransactionMessage): {
     index: number;
     publicKey: string;
     isWritable: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGT,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEJ,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AAqND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,gBAAgB;;;;IAkB3D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8F/B"}
+{"version":3,"file":"jitoUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jitoUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAKV,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,GAAG,EAEH,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAMlE,wBAAgB,mBAAmB,IAAI,SAAS,CAa/C;AA8ND,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB;;;;IAkB7D;AAED,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,GAAG,EAAE,kBAAkB,EAAE,EACzB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,CA8F/B"}

package/dist/utils/jitoUtils.js

@@ -116,8 +116,15 @@ async function umiToVersionedTransactions(umi, blockhash, userSigner, otherSigne
     }));
     if (sign) {
         builtTxs = await userSigner.signAllTransactions(builtTxs);
-        for (const s of otherSigners) {
-            builtTxs = await s.signAllTransactions(builtTxs);
+        for (const signer of otherSigners) {
+            for (let i = 0; i < builtTxs.length; i++) {
+                const requiredSigners = getRequiredSigners(builtTxs[i].message);
+                if (requiredSigners
+                    .map((x) => x.publicKey)
+                    .includes(signer.publicKey.toString())) {
+                    builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+                }
+            }
         }
     }
     return builtTxs.map((x) => (0, umi_web3js_adapters_1.toWeb3JsTransaction)(x));
@@ -182,7 +189,7 @@ function getRequiredSigners(message) {
     const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
     const signersInfo = [];
     for (let i = 0; i < numRequiredSignatures; i++) {
-        const publicKey = message.staticAccountKeys[i].toBase58();
+        const publicKey = message.accounts[i].toString();
         const isWritable = i < numWritableSigners;
         signersInfo.push({
             index: i,

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -95,14 +95,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.lendingPlatform = LendingPlatform.Marginfi;
 
     if (this.selfManaged) {
-      const marginfiAccSigner = createSignerFromKeypair(
-        this.umi,
-        this.umi.eddsa.generateKeypair()
-      );
-      this.marginfiAccount = args.marginfiAccount ?? marginfiAccSigner;
-      if (!args.marginfiAccount) {
-        this.otherSigners.push(marginfiAccSigner);
-      }
+      this.marginfiAccount =
+        args.marginfiAccount ??
+        createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
     } else {
       if (this.solautoPositionData) {
         this.marginfiAccount = toWeb3JsPublicKey(
@@ -138,6 +133,10 @@ export class SolautoMarginfiClient extends SolautoClient {
         ? toWeb3JsPublicKey(this.marginfiAccount.publicKey)
         : this.marginfiAccount;
 
+    if ("publicKey" in this.marginfiAccount) {
+      this.otherSigners.push(this.marginfiAccount);
+    }
+
     const marginfiAccountData = !args.new
       ? await safeFetchMarginfiAccount(
           this.umi,
@@ -215,6 +214,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       compatibleMarginfiAccounts.length > 0
         ? compatibleMarginfiAccounts[0]
         : undefined;
+
+    if (this.intermediaryMarginfiAccountSigner) {
+      this.otherSigners.push(this.intermediaryMarginfiAccountSigner);
+    }
   }
 
   protocolAccount(): PublicKey {

package/src/utils/jitoUtils.ts

@@ -13,6 +13,7 @@ import {
   TransactionBuilder,
   Umi,
   WrappedInstruction,
+  TransactionMessage,
 } from "@metaplex-foundation/umi";
 import {
   assembleFinalTransaction,
@@ -178,8 +179,17 @@ async function umiToVersionedTransactions(
 
   if (sign) {
     builtTxs = await userSigner.signAllTransactions(builtTxs);
-    for (const s of otherSigners) {
-      builtTxs = await s.signAllTransactions(builtTxs);
+    for (const signer of otherSigners) {
+      for (let i = 0; i < builtTxs.length; i++) {
+        const requiredSigners = getRequiredSigners(builtTxs[i].message);
+        if (
+          requiredSigners
+            .map((x) => x.publicKey)
+            .includes(signer.publicKey.toString())
+        ) {
+          builtTxs[i] = await signer.signTransaction(builtTxs[i]);
+        }
+      }
     }
   }
 
@@ -253,14 +263,14 @@ async function sendJitoBundle(
   return bundleId ? await pollBundleStatus(bundleId) : [];
 }
 
-export function getRequiredSigners(message: VersionedMessage) {
+export function getRequiredSigners(message: TransactionMessage) {
   const { numRequiredSignatures, numReadonlySignedAccounts } = message.header;
 
   const numWritableSigners = numRequiredSignatures - numReadonlySignedAccounts;
 
   const signersInfo = [];
   for (let i = 0; i < numRequiredSignatures; i++) {
-    const publicKey = message.staticAccountKeys[i].toBase58();
+    const publicKey = message.accounts[i].toString();
     const isWritable = i < numWritableSigners;
 
     signersInfo.push({