@haven-fi/solauto-sdk 1.0.483 → 1.0.485

package/dist/constants/tokenConstants.d.ts

@@ -21,7 +21,7 @@ export declare const RETARDIO = "6ogzHhzdrQr9Pgv6hZ2MNze7UrzBMAFyBBWUYp1Fhitx";
 export declare const BILLY = "3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump";
 export declare const HMTR = "7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2";
 export declare const ALL_SUPPORTED_TOKENS: string[];
-interface TokenInfo {
+export interface TokenInfo {
     ticker: string;
     decimals: number;
     isStableCoin?: boolean;
@@ -32,5 +32,4 @@ interface TokenInfo {
 export declare const TOKEN_INFO: {
     [key: string]: TokenInfo;
 };
-export {};
 //# sourceMappingURL=tokenConstants.d.ts.map

package/dist/constants/tokenConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,QAAQ,iDAAiD,CAAC;AACvE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,OAAO,gDAAgD,CAAC;AACrE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,MAAM,iDAAiD,CAAC;AACrE,eAAO,MAAM,QAAQ,iDAAiD,CAAC;AACvE,eAAO,MAAM,KAAK,iDAAiD,CAAC;AACpE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AAEnE,eAAO,MAAM,oBAAoB,UAwBhC,CAAC;AAEF,UAAU,SAAS;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,UAAU,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAmHlD,CAAC"}
+{"version":3,"file":"tokenConstants.d.ts","sourceRoot":"","sources":["../../src/constants/tokenConstants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,QAAQ,iDAAiD,CAAC;AACvE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AACnE,eAAO,MAAM,OAAO,gDAAgD,CAAC;AACrE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,GAAG,gDAAgD,CAAC;AACjE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AACnE,eAAO,MAAM,GAAG,iDAAiD,CAAC;AAClE,eAAO,MAAM,MAAM,iDAAiD,CAAC;AACrE,eAAO,MAAM,QAAQ,iDAAiD,CAAC;AACvE,eAAO,MAAM,KAAK,iDAAiD,CAAC;AACpE,eAAO,MAAM,IAAI,iDAAiD,CAAC;AAEnE,eAAO,MAAM,oBAAoB,UAwBhC,CAAC;AAEF,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,eAAO,MAAM,UAAU,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAmHlD,CAAC"}

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,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAY7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IA+FzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMzD,OAAO,EAEL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,oBAAoB,EAAa,MAAM,YAAY,CAAC;AAa7D,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,OAAO,EAAE,MAAM;CAK5B;AAqCD,qBAAa,eAAe;IAMjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM;IARtB,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;IACjB,WAAW,EAAE,OAAO,CAAS;gBAG3B,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,EACxC,IAAI,CAAC,EAAE,MAAM,YAAA;IAGhB,UAAU;IAKV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AA0FD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;IACzB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,UAAU,WAAW;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,mBAAmB;IAU5B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,aAAa,CAAC;IAdxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;IAE3B,kBAAkB,SAAmB;gBAG3B,SAAS,EAAE,aAAa,GAAG,oBAAoB,EAC/C,cAAc,CAAC,GAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,aAAA,EAC/D,MAAM,CAAC,EAAE,kBAAkB,YAAA,EAC3B,kBAAkB,GAAE,kBAA2C,EAC/D,UAAU,GAAE,OAAe,EAC3B,aAAa,CAAC,EAAE,aAAa,YAAA,EACrC,WAAW,CAAC,EAAE,WAAW;YAab,uBAAuB;IAwCrC,OAAO,CAAC,YAAY;YA6CN,aAAa;IAoB3B,OAAO,CAAC,4BAA4B;IAgBpC,OAAO,CAAC,mBAAmB;YAoBb,SAAS;IAiBV,UAAU,CACrB,YAAY,EAAE,eAAe,EAAE,GAC9B,OAAO,CAAC,0BAA0B,CAAC;IAmGzB,IAAI,CACf,KAAK,EAAE,eAAe,EAAE,GACvB,OAAO,CAAC,0BAA0B,CAAC;YAkCxB,6BAA6B;YAsI7B,qBAAqB;YAoDrB,eAAe;YA0Df,eAAe;CA4D9B"}

package/dist/transactions/transactionsManager.js

@@ -14,6 +14,7 @@ const web3_js_1 = require("@solana/web3.js");
 const switchboardConstants_1 = require("../constants/switchboardConstants");
 const utils_1 = require("../utils");
 const jitoUtils_1 = require("../utils/jitoUtils");
+const jupiter_sdk_1 = require("../jupiter-sdk");
 const CHORES_TX_NAME = "account chores";
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
 class TransactionTooLargeError extends Error {
@@ -270,7 +271,9 @@ class TransactionsManager {
         for (const item of items) {
             await item.initialize();
         }
-        const allAccounts = items.flatMap((x) => x.tx
+        const allAccounts = items
+            .filter((x) => x.tx?.getInstructions().find((x) => x.programId !== jupiter_sdk_1.JUPITER_PROGRAM_ID))
+            .flatMap((x) => x.tx
             ?.getInstructions()
             .flatMap((x) => x.keys.map((x) => x.pubkey.toString())));
         const swbOracle = allAccounts.find((x) => Object.values(switchboardConstants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(x ?? ""));

package/dist/utils/generalUtils.d.ts

@@ -1,6 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, Umi } from "@metaplex-foundation/umi";
+import { TokenInfo } from "../constants";
 export declare function consoleLog(...args: any[]): void;
+export declare function tokenInfo(mint?: PublicKey): TokenInfo;
+export declare function findMintByTicker(ticker: string): PublicKey;
+export declare function tokenInfoByTicker(ticker: string): TokenInfo | undefined;
 export declare function generateRandomU8(): number;
 export declare function generateRandomU64(): bigint;
 export declare function currentUnixSeconds(): number;

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

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAG3E,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AACD,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAQ/F"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../src/utils/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAc,SAAS,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,UAAU,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAI/C;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,CAErD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAW1D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,yBAQ/C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAO1C;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,OAAO,CAAC,CAKlB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAEnE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAU1E;AAED,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAS1D;AAED,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC,CAAC;AAEjE,wBAAgB,2BAA2B,CAAC,CAAC,EAC3C,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,EACvD,OAAO,GAAE,MAAU,EACnB,KAAK,GAAE,MAAY,EACnB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,CAAC,CAAC,CA8BZ;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAC1C,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,MAAM,GACZ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,CAUxB"}

package/dist/utils/generalUtils.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consoleLog = consoleLog;
+exports.tokenInfo = tokenInfo;
+exports.findMintByTicker = findMintByTicker;
+exports.tokenInfoByTicker = tokenInfoByTicker;
 exports.generateRandomU8 = generateRandomU8;
 exports.generateRandomU64 = generateRandomU64;
 exports.currentUnixSeconds = currentUnixSeconds;
@@ -10,12 +13,36 @@ exports.arraysAreEqual = arraysAreEqual;
 exports.zip = zip;
 exports.retryWithExponentialBackoff = retryWithExponentialBackoff;
 exports.toEnumValue = toEnumValue;
+const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
+const constants_1 = require("../constants");
 function consoleLog(...args) {
     if (globalThis.LOCAL_TEST) {
         console.log(...args);
     }
 }
+function tokenInfo(mint) {
+    return constants_1.TOKEN_INFO[mint ? mint.toString() : web3_js_1.PublicKey.default.toString()];
+}
+function findMintByTicker(ticker) {
+    for (const key in constants_1.TOKEN_INFO) {
+        const account = constants_1.TOKEN_INFO[key];
+        if (account.ticker.toString().toLowerCase() ===
+            ticker.toString().toLowerCase()) {
+            return new web3_js_1.PublicKey(key);
+        }
+    }
+    throw new Error(`Token mint not found by the ticker: ${ticker}`);
+}
+function tokenInfoByTicker(ticker) {
+    for (const key in constants_1.TOKEN_INFO) {
+        const token = constants_1.TOKEN_INFO[key];
+        if (token.ticker.toLowerCase() === ticker.toLowerCase()) {
+            return token;
+        }
+    }
+    return undefined;
+}
 function generateRandomU8() {
     return Math.floor(Math.random() * 255 + 1);
 }
@@ -87,7 +114,7 @@ function retryWithExponentialBackoff(fn, retries = 5, delay = 150, errorsToThrow
     });
 }
 function toEnumValue(enumObj, value) {
-    const numericValues = Object.values(enumObj).filter(v => typeof v === "number");
+    const numericValues = Object.values(enumObj).filter((v) => typeof v === "number");
     if (numericValues.includes(value)) {
         return value;
     }

package/dist/utils/index.d.ts

@@ -1,10 +1,11 @@
-export * from './solauto/index';
-export * from './accountUtils';
-export * from './generalUtils';
-export * from './jupiterUtils';
-export * from './marginfiUtils';
-export * from './numberUtils';
-export * from './solanaUtils';
-export * from './priceUtils';
-export * from './switchboardUtils';
+export * from "./solauto/index";
+export * from "./accountUtils";
+export * from "./generalUtils";
+export * from "./jupiterUtils";
+export * from "./marginfiUtils";
+export * from "./numberUtils";
+export * from "./solanaUtils";
+export * from "./stringUtils";
+export * from "./priceUtils";
+export * from "./switchboardUtils";
 //# sourceMappingURL=index.d.ts.map

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,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,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;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC"}

package/dist/utils/index.js

@@ -21,5 +21,6 @@ __exportStar(require("./jupiterUtils"), exports);
 __exportStar(require("./marginfiUtils"), exports);
 __exportStar(require("./numberUtils"), exports);
 __exportStar(require("./solanaUtils"), exports);
+__exportStar(require("./stringUtils"), exports);
 __exportStar(require("./priceUtils"), exports);
 __exportStar(require("./switchboardUtils"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CAqG7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}
+{"version":3,"file":"jupiterUtils.d.ts","sourceRoot":"","sources":["../../src/utils/jupiterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AAGpE,OAAO,EAGL,aAAa,EACd,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,EAAE,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAgBD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,aAAa,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,EAAE,kBAAkB,CAAC;IACtC,aAAa,EAAE,kBAAkB,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,cAAc,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,CAAC,CA2G7B;AAED,wBAAsB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE,OAAO;;GA0B5E"}

package/dist/utils/jupiterUtils.js

@@ -25,8 +25,10 @@ function createTransactionInstruction(instruction) {
 async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
     const memecoinSwap = constants_1.TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
         constants_1.TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
-    const usingPyth = swapDetails.inputMint.equals(new web3_js_1.PublicKey(constants_1.PYTH)) ||
-        swapDetails.outputMint.equals(new web3_js_1.PublicKey(constants_1.PYTH));
+    const tokensWithLowAccounts = [constants_1.PYTH, constants_1.INF];
+    // TEMP REVERT ME
+    const useLowAccounts = tokensWithLowAccounts.find((x) => swapDetails.inputMint.equals(new web3_js_1.PublicKey(x))) ||
+        tokensWithLowAccounts.find((x) => swapDetails.outputMint.equals(new web3_js_1.PublicKey(x)));
     const quoteResponse = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => await jupApi.quoteGet({
         amount: Number(swapDetails.amount),
         inputMint: swapDetails.inputMint.toString(),
@@ -37,7 +39,7 @@ async function getJupSwapTransaction(signer, swapDetails, attemptNum) {
                 ? "ExactIn"
                 : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut ? (usingPyth ? 15 : 40) : undefined,
+        maxAccounts: !swapDetails.exactOut ? (useLowAccounts ? 15 : 40) : undefined,
     }), 4, 200);
     const priceImpactBps = Math.round((0, numberUtils_1.toBps)(parseFloat(quoteResponse.priceImpactPct))) + 1;
     const finalPriceSlippageBps = Math.round(Math.max(50, quoteResponse.slippageBps, priceImpactBps) *

package/dist/utils/stringUtils.d.ts

@@ -0,0 +1,6 @@
+import { PublicKey } from "@solana/web3.js";
+export declare const StrategyTypes: readonly ["Long", "Short", "Ratio"];
+export type StrategyType = (typeof StrategyTypes)[number];
+export declare function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey): string;
+export declare function strategyType(supplyMint: PublicKey, debtMint: PublicKey): StrategyType;
+//# sourceMappingURL=stringUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stringUtils.d.ts","sourceRoot":"","sources":["../../src/utils/stringUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,aAAa,qCAAsC,CAAC;AACjE,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAoB1D,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,UAwBrB;AAED,wBAAgB,YAAY,CAC1B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,GAClB,YAAY,CAWd"}

package/dist/utils/stringUtils.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StrategyTypes = void 0;
+exports.solautoStrategyName = solautoStrategyName;
+exports.strategyType = strategyType;
+const spl_token_1 = require("@solana/spl-token");
+const constants_1 = require("../constants");
+const web3_js_1 = require("@solana/web3.js");
+const generalUtils_1 = require("./generalUtils");
+exports.StrategyTypes = ["Long", "Short", "Ratio"];
+const MAJORS_PRIO = {
+    [constants_1.WBTC.toString()]: 0,
+    [constants_1.WETH.toString()]: 1,
+    [spl_token_1.NATIVE_MINT.toString()]: 2,
+};
+function adjustedTicker(mint) {
+    const info = (0, generalUtils_1.tokenInfo)(mint);
+    if (info.ticker.toLowerCase() === "wbtc") {
+        return "BTC";
+    }
+    else if (info.ticker.toLowerCase() === "weth") {
+        return "ETH";
+    }
+    else {
+        return info.ticker;
+    }
+}
+function solautoStrategyName(supplyMint, debtMint) {
+    const supplyInfo = (0, generalUtils_1.tokenInfo)(supplyMint);
+    const strat = strategyType(supplyMint ?? web3_js_1.PublicKey.default, debtMint ?? web3_js_1.PublicKey.default);
+    if (strat === "Long") {
+        return `${adjustedTicker(supplyMint)} Long`;
+    }
+    else if (strat === "Ratio") {
+        if ((supplyInfo.isLST && debtMint?.equals(spl_token_1.NATIVE_MINT)) ||
+            (supplyMint &&
+                debtMint &&
+                MAJORS_PRIO[supplyMint.toString()] > MAJORS_PRIO[debtMint.toString()])) {
+            return `${adjustedTicker(supplyMint)}/${adjustedTicker(debtMint)} Long`;
+        }
+        else {
+            return `${adjustedTicker(debtMint)}/${adjustedTicker(supplyMint)} Short`;
+        }
+    }
+    else {
+        return `${adjustedTicker(debtMint)} Short`;
+    }
+}
+function strategyType(supplyMint, debtMint) {
+    const supplyInfo = (0, generalUtils_1.tokenInfo)(supplyMint);
+    const debtInfo = (0, generalUtils_1.tokenInfo)(debtMint);
+    if (!supplyInfo.isStableCoin && !debtInfo.isStableCoin) {
+        return "Ratio";
+    }
+    else if (debtInfo.isStableCoin) {
+        return "Long";
+    }
+    else {
+        return "Short";
+    }
+}

package/local/logPositions.ts

@@ -13,16 +13,13 @@ import {
   safeFetchAllSolautoPosition,
   safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
-  TOKEN_INFO,
+  solautoStrategyName,
   USD_DECIMALS,
-  WBTC,
-  WETH,
 } from "../src";
 import { PublicKey } from "@solana/web3.js";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import path from "path";
 import { config } from "dotenv";
-import { NATIVE_MINT } from "@solana/spl-token";
 
 config({ path: path.join(__dirname, ".env") });
 
@@ -34,60 +31,6 @@ function getBatches<T>(items: T[], batchSize: number): T[][] {
   return batches;
 }
 
-export function tokenInfo(mint?: PublicKey) {
-  return TOKEN_INFO[mint ? mint.toString() : PublicKey.default.toString()];
-}
-
-type StrategyType = "Long" | "Ratio" | "Short";
-
-const MAJORS_PRIO = {
-  [WBTC.toString()]: 0,
-  [WETH.toString()]: 1,
-  [NATIVE_MINT.toString()]: 2,
-};
-
-function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey) {
-  const supplyInfo = tokenInfo(supplyMint);
-  const debtInfo = tokenInfo(debtMint);
-  const strat = strategyType(
-    supplyMint ?? PublicKey.default,
-    debtMint ?? PublicKey.default
-  );
-
-  if (strat === "Long") {
-    return `${supplyInfo.ticker} Long`;
-  } else if (strat === "Ratio") {
-    if (
-      (supplyInfo.isLST && debtMint?.equals(NATIVE_MINT)) ||
-      (supplyMint &&
-        debtMint &&
-        MAJORS_PRIO[supplyMint!.toString()] > MAJORS_PRIO[debtMint!.toString()])
-    ) {
-      return `${supplyInfo.ticker}/${debtInfo.ticker} Long`;
-    } else {
-      return `${debtInfo.ticker}/${supplyInfo.ticker} Short`;
-    }
-  } else {
-    return `${debtInfo.ticker} Short`;
-  }
-}
-
-function strategyType(
-  supplyMint: PublicKey,
-  debtMint: PublicKey
-): StrategyType {
-  const supplyInfo = tokenInfo(supplyMint);
-  const debtInfo = tokenInfo(debtMint);
-
-  if (!supplyInfo.isStableCoin && !debtInfo.isStableCoin) {
-    return "Ratio";
-  } else if (debtInfo.isStableCoin) {
-    return "Long";
-  } else {
-    return "Short";
-  }
-}
-
 export function roundToDecimals(value: number, decimals: number = 2): number {
   if (!value || isNaN(value)) {
     return value;

package/package.json

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

package/src/constants/tokenConstants.ts

@@ -51,7 +51,7 @@ export const ALL_SUPPORTED_TOKENS = [
   HMTR,
 ];
 
-interface TokenInfo {
+export interface TokenInfo {
   ticker: string;
   decimals: number;
   isStableCoin?: boolean;

package/src/transactions/transactionsManager.ts

@@ -31,6 +31,7 @@ import {
 import { SWITCHBOARD_PRICE_FEED_IDS } from "../constants/switchboardConstants";
 import { buildSwbSubmitResponseTx, getSwitchboardFeedData } from "../utils";
 import { sendJitoBundledTransactions } from "../utils/jitoUtils";
+import { JUPITER_PROGRAM_ID } from "../jupiter-sdk";
 
 const CHORES_TX_NAME = "account chores";
 const MAX_SUPPORTED_ACCOUNT_LOCKS = 64;
@@ -433,11 +434,15 @@ export class TransactionsManager {
       await item.initialize();
     }
 
-    const allAccounts = items.flatMap((x) =>
-      x.tx
-        ?.getInstructions()
-        .flatMap((x) => x.keys.map((x) => x.pubkey.toString()))
-    );
+    const allAccounts = items
+      .filter((x) =>
+        x.tx?.getInstructions().find((x) => x.programId !== JUPITER_PROGRAM_ID)
+      )
+      .flatMap((x) =>
+        x.tx
+          ?.getInstructions()
+          .flatMap((x) => x.keys.map((x) => x.pubkey.toString()))
+      );
     const swbOracle = allAccounts.find((x) =>
       Object.values(SWITCHBOARD_PRICE_FEED_IDS).includes(x ?? "")
     );

package/src/utils/generalUtils.ts

@@ -1,12 +1,40 @@
 import { PublicKey } from "@solana/web3.js";
 import { MaybeRpcAccount, publicKey, Umi } from "@metaplex-foundation/umi";
-import { LendingPlatform } from "../generated";
+import { TOKEN_INFO, TokenInfo } from "../constants";
 
 export function consoleLog(...args: any[]): void {
   if ((globalThis as any).LOCAL_TEST) {
     console.log(...args);
   }
 }
+
+export function tokenInfo(mint?: PublicKey): TokenInfo {
+  return TOKEN_INFO[mint ? mint.toString() : PublicKey.default.toString()];
+}
+
+export function findMintByTicker(ticker: string): PublicKey {
+  for (const key in TOKEN_INFO) {
+    const account = TOKEN_INFO[key];
+    if (
+      account.ticker.toString().toLowerCase() ===
+      ticker.toString().toLowerCase()
+    ) {
+      return new PublicKey(key);
+    }
+  }
+  throw new Error(`Token mint not found by the ticker: ${ticker}`);
+}
+
+export function tokenInfoByTicker(ticker: string) {
+  for (const key in TOKEN_INFO) {
+    const token = TOKEN_INFO[key];
+    if (token.ticker.toLowerCase() === ticker.toLowerCase()) {
+      return token;
+    }
+  }
+  return undefined;
+}
+
 export function generateRandomU8(): number {
   return Math.floor(Math.random() * 255 + 1);
 }
@@ -100,12 +128,17 @@ export function retryWithExponentialBackoff<T>(
   });
 }
 
-export function toEnumValue<E extends object>(enumObj: E, value: number): E[keyof E] | undefined {
-  const numericValues = Object.values(enumObj).filter(v => typeof v === "number") as number[];
+export function toEnumValue<E extends object>(
+  enumObj: E,
+  value: number
+): E[keyof E] | undefined {
+  const numericValues = Object.values(enumObj).filter(
+    (v) => typeof v === "number"
+  ) as number[];
 
   if (numericValues.includes(value)) {
     return value as E[keyof E];
   }
-  
+
   return undefined;
-}
+}

package/src/utils/index.ts

@@ -1,9 +1,10 @@
-export * from './solauto/index';
-export * from './accountUtils';
-export * from './generalUtils';
-export * from './jupiterUtils';
-export * from './marginfiUtils';
-export * from './numberUtils';
-export * from './solanaUtils';
-export * from './priceUtils';
-export * from './switchboardUtils';
+export * from "./solauto/index";
+export * from "./accountUtils";
+export * from "./generalUtils";
+export * from "./jupiterUtils";
+export * from "./marginfiUtils";
+export * from "./numberUtils";
+export * from "./solanaUtils";
+export * from "./stringUtils";
+export * from "./priceUtils";
+export * from "./switchboardUtils";

package/src/utils/jupiterUtils.ts

@@ -13,7 +13,7 @@ import {
 } from "@jup-ag/api";
 import { getTokenAccount } from "./accountUtils";
 import { consoleLog, retryWithExponentialBackoff } from "./generalUtils";
-import { PYTH, TOKEN_INFO } from "../constants";
+import { INF, PYTH, TOKEN_INFO } from "../constants";
 
 const jupApi = createJupiterApiClient();
 
@@ -60,9 +60,15 @@ export async function getJupSwapTransaction(
     TOKEN_INFO[swapDetails.inputMint.toString()].isMeme ||
     TOKEN_INFO[swapDetails.outputMint.toString()].isMeme;
 
-  const usingPyth =
-    swapDetails.inputMint.equals(new PublicKey(PYTH)) ||
-    swapDetails.outputMint.equals(new PublicKey(PYTH));
+  const tokensWithLowAccounts = [PYTH, INF];
+  // TEMP REVERT ME
+  const useLowAccounts =
+    tokensWithLowAccounts.find((x) =>
+      swapDetails.inputMint.equals(new PublicKey(x))
+    ) ||
+    tokensWithLowAccounts.find((x) =>
+      swapDetails.outputMint.equals(new PublicKey(x))
+    );
 
   const quoteResponse = await retryWithExponentialBackoff(
     async () =>
@@ -76,7 +82,7 @@ export async function getJupSwapTransaction(
             ? "ExactIn"
             : undefined,
         slippageBps: memecoinSwap ? 500 : 200,
-        maxAccounts: !swapDetails.exactOut ? (usingPyth ? 15 : 40) : undefined,
+        maxAccounts: !swapDetails.exactOut ? (useLowAccounts ? 15 : 40) : undefined,
       }),
     4,
     200

package/src/utils/stringUtils.ts

@@ -0,0 +1,69 @@
+import { NATIVE_MINT } from "@solana/spl-token";
+import { WBTC, WETH } from "../constants";
+import { PublicKey } from "@solana/web3.js";
+import { tokenInfo } from "./generalUtils";
+
+export const StrategyTypes = ["Long", "Short", "Ratio"] as const;
+export type StrategyType = (typeof StrategyTypes)[number];
+
+const MAJORS_PRIO = {
+  [WBTC.toString()]: 0,
+  [WETH.toString()]: 1,
+  [NATIVE_MINT.toString()]: 2,
+};
+
+function adjustedTicker(mint?: PublicKey) {
+  const info = tokenInfo(mint);
+
+  if (info.ticker.toLowerCase() === "wbtc") {
+    return "BTC";
+  } else if (info.ticker.toLowerCase() === "weth") {
+    return "ETH";
+  } else {
+    return info.ticker;
+  }
+}
+
+export function solautoStrategyName(
+  supplyMint?: PublicKey,
+  debtMint?: PublicKey
+) {
+  const supplyInfo = tokenInfo(supplyMint);
+  const strat = strategyType(
+    supplyMint ?? PublicKey.default,
+    debtMint ?? PublicKey.default
+  );
+
+  if (strat === "Long") {
+    return `${adjustedTicker(supplyMint)} Long`;
+  } else if (strat === "Ratio") {
+    if (
+      (supplyInfo.isLST && debtMint?.equals(NATIVE_MINT)) ||
+      (supplyMint &&
+        debtMint &&
+        MAJORS_PRIO[supplyMint!.toString()] > MAJORS_PRIO[debtMint!.toString()])
+    ) {
+      return `${adjustedTicker(supplyMint)}/${adjustedTicker(debtMint)} Long`;
+    } else {
+      return `${adjustedTicker(debtMint)}/${adjustedTicker(supplyMint)} Short`;
+    }
+  } else {
+    return `${adjustedTicker(debtMint)} Short`;
+  }
+}
+
+export function strategyType(
+  supplyMint: PublicKey,
+  debtMint: PublicKey
+): StrategyType {
+  const supplyInfo = tokenInfo(supplyMint);
+  const debtInfo = tokenInfo(debtMint);
+
+  if (!supplyInfo.isStableCoin && !debtInfo.isStableCoin) {
+    return "Ratio";
+  } else if (debtInfo.isStableCoin) {
+    return "Long";
+  } else {
+    return "Short";
+  }
+}

package/tests/transactions/solautoMarginfi.ts

@@ -56,7 +56,7 @@ describe("Solauto Marginfi tests", async () => {
 
   const payForTransactions = true;
   const testProgram = false;
-  const positionId = 4;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(
@@ -72,7 +72,7 @@ describe("Solauto Marginfi tests", async () => {
     await client.initialize({
       signer,
       positionId,
-      authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+      authority: new PublicKey("9j53Z6bejUaAxJCEC64BbxozLPuvsuAFsr6iqWKKDvaw"),
       // new: true,
       // marginfiAccount: new PublicKey(
       //   ""