@haven-fi/solauto-sdk 1.0.812 → 1.0.814

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAetC,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AAqLF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,WAKrD"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAetC,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AA0LF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,WAKrD"}

package/dist/constants/marginfiAccounts.js

@@ -162,6 +162,11 @@ const MARGINFI_PROD_ACCOUNTS = {
             bank: "61Qx9kgWo9RVtPHf8Rku6gbaUtcnzgkpAuifQBUcMRVK",
             liquidityVault: "6FxnrCaJNHLyrFy6EPtqFjoUK5iRxDQbaVo1bA69nDhH",
             vaultAuthority: "6VL2QW6sy8cjxL24xHL7eFbnUSi35DMJd8AzRwssSs9y"
+        },
+        [tokens.CBBTC]: {
+            bank: "Ac4KV5K5isDqtABtg6h5DiwzZMe3Sp9bc3pBiCUvUpaQ",
+            liquidityVault: "FvrJsHu7X9jkT9rTuR6Kfs6wSjPvjV6zhH4gVSiJ8LFT",
+            vaultAuthority: "jfBsYE2sAkNj1pwE6U1gQ515JU5vn9huZMDYVvZagb4",
         }
     },
     ["DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q"]: {

package/dist/constants/pythConstants.d.ts

@@ -19,6 +19,7 @@ export declare const PYTH_PRICE_FEED_IDS: {
     DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263: string;
     EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm: string;
     pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn: string;
+    cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij: string;
 };
 export declare const PYTH_ORACLE_ACCOUNTS: {
     pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn: string;

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

@@ -1 +1 @@
-{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAE7B,CAAC;AAGF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;CAqC/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;CAEhC,CAAC"}
+{"version":3,"file":"pythConstants.d.ts","sourceRoot":"","sources":["../../src/constants/pythConstants.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAE7B,CAAC;AAGF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;CAuC/B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;CAEhC,CAAC"}

package/dist/constants/pythConstants.js

@@ -58,6 +58,7 @@ exports.PYTH_PRICE_FEED_IDS = {
     [tokens.BONK]: "0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419",
     [tokens.WIF]: "0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc",
     [tokens.PUMP]: "0x7a01fca212788bba7c5bf8c9efd576a8a722f070d2c17596ff7bb609b8d5c3b9",
+    [tokens.CBBTC]: "0x2817d7bfe5c64b8ea956e9a26f573ef64e72e4d7891f2d6af9bcc93f7aff9a97",
 };
 exports.PYTH_ORACLE_ACCOUNTS = {
     [tokens.PUMP]: "HMm3GPbdnqGwbkTnUUqCFsH8AMHDdEC3Lg8gcPD3HJSH",

package/dist/constants/solautoConstants.d.ts

@@ -20,5 +20,6 @@ export declare const CHORES_TX_NAME = "account chores";
 export declare const JITO_TIP_ACCOUNTS: string[];
 export declare const SOLAUTO_LUT = "8b7KefQDroVLGao71J5H3hFwABeyMCgCrLpXWssNFhk9";
 export declare const STANDARD_LUT_ACCOUNTS: string[];
+export declare const UPDATE_ORACLE_TX_NAME = "update oracle";
 export {};
 //# sourceMappingURL=solautoConstants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,UAAU,UAAU;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAO,CAAC;AAExD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,UAAU,UAAU;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AACD,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAA;CAAO,CAAC;AAExD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC;AAE3B,eAAO,MAAM,qBAAqB,kBAAkB,CAAC"}

package/dist/constants/solautoConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.JITO_TIP_ACCOUNTS = exports.CHORES_TX_NAME = exports.PRICES = exports.REFERRER_PERCENTAGE = exports.OFFSET_FROM_MAX_LTV = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
+exports.UPDATE_ORACLE_TX_NAME = exports.STANDARD_LUT_ACCOUNTS = exports.SOLAUTO_LUT = exports.JITO_TIP_ACCOUNTS = exports.CHORES_TX_NAME = exports.PRICES = exports.REFERRER_PERCENTAGE = exports.OFFSET_FROM_MAX_LTV = exports.MIN_USD_SUPPORTED_POSITION = exports.MIN_BOOST_GAP_BPS = exports.MIN_REPAY_GAP_BPS = exports.SOLAUTO_TEST_PROGRAM = exports.SOLAUTO_PROD_PROGRAM = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const generalConstants_1 = require("./generalConstants");
@@ -39,3 +39,4 @@ exports.STANDARD_LUT_ACCOUNTS = [
     web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
     jupiter_1.JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
+exports.UPDATE_ORACLE_TX_NAME = "update oracle";

package/dist/constants/tokenConstants.d.ts

@@ -21,6 +21,7 @@ export declare const RETARDIO = "6ogzHhzdrQr9Pgv6hZ2MNze7UrzBMAFyBBWUYp1Fhitx";
 export declare const BILLY = "3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump";
 export declare const HMTR = "7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2";
 export declare const PUMP = "pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn";
+export declare const CBBTC = "cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij";
 export declare const ALL_SUPPORTED_TOKENS: string[];
 export interface TokenInfo {
     ticker: string;
@@ -37,6 +38,7 @@ export declare const TOKEN_INFO: {
 export declare const MAJORS_PRIO: {
     [x: string]: number;
     "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh": number;
+    cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij: number;
     "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs": number;
 };
 //# 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;AACnE,eAAO,MAAM,IAAI,gDAAgD,CAAC;AAElE,eAAO,MAAM,oBAAoB,UAyBhC,CAAC;AAEF,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,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;CAyIlD,CAAC;AAEF,eAAO,MAAM,WAAW;;;;CAIvB,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;AACnE,eAAO,MAAM,IAAI,gDAAgD,CAAC;AAClE,eAAO,MAAM,KAAK,gDAAgD,CAAC;AAEnE,eAAO,MAAM,oBAAoB,UA0BhC,CAAC;AAEF,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,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;CA+IlD,CAAC;AAEF,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC"}

package/dist/constants/tokenConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAJORS_PRIO = exports.TOKEN_INFO = exports.ALL_SUPPORTED_TOKENS = exports.PUMP = exports.HMTR = exports.BILLY = exports.RETARDIO = exports.POPCAT = exports.WIF = exports.BONK = exports.USDT = exports.USDC = exports.PYTH = exports.HNT = exports.WETH = exports.WBTC = exports.JLP = exports.JTO = exports.JUP = exports.JUP_SOL = exports.H_SOL = exports.INF = exports.M_SOL = exports.LST = exports.JITO_SOL = exports.B_SOL = void 0;
+exports.MAJORS_PRIO = exports.TOKEN_INFO = exports.ALL_SUPPORTED_TOKENS = exports.CBBTC = exports.PUMP = exports.HMTR = exports.BILLY = exports.RETARDIO = exports.POPCAT = exports.WIF = exports.BONK = exports.USDT = exports.USDC = exports.PYTH = exports.HNT = exports.WETH = exports.WBTC = exports.JLP = exports.JTO = exports.JUP = exports.JUP_SOL = exports.H_SOL = exports.INF = exports.M_SOL = exports.LST = exports.JITO_SOL = exports.B_SOL = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
 // When adding token ensure a price feed is provided in pythConstants.ts & the token is in TOKEN_INFO
@@ -27,6 +27,7 @@ exports.RETARDIO = "6ogzHhzdrQr9Pgv6hZ2MNze7UrzBMAFyBBWUYp1Fhitx";
 exports.BILLY = "3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump";
 exports.HMTR = "7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2";
 exports.PUMP = "pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn";
+exports.CBBTC = "cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij";
 exports.ALL_SUPPORTED_TOKENS = [
     spl_token_1.NATIVE_MINT.toString(),
     exports.B_SOL,
@@ -52,6 +53,7 @@ exports.ALL_SUPPORTED_TOKENS = [
     exports.BILLY,
     exports.HMTR,
     exports.PUMP,
+    exports.CBBTC,
 ];
 exports.TOKEN_INFO = {
     [web3_js_1.PublicKey.default.toString()]: {
@@ -189,10 +191,17 @@ exports.TOKEN_INFO = {
         ticker: "PUMP",
         name: "Pump.fun",
         decimals: 6,
-    }
+    },
+    [exports.CBBTC]: {
+        ticker: "CBBTC",
+        name: "Coinbase BTC",
+        decimals: 8,
+        isMajor: true,
+    },
 };
 exports.MAJORS_PRIO = {
     [exports.WBTC]: 0,
+    [exports.CBBTC]: 0,
     [exports.WETH]: 1,
     [spl_token_1.NATIVE_MINT.toString()]: 2,
 };

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

@@ -3,7 +3,6 @@ import { TransactionsManager } from "./transactionsManager";
 import { TransactionItem } from "../types";
 export declare class ClientTransactionsManager extends TransactionsManager<SolautoClient> {
     private updateLut;
-    private addSwbOraclePullTxs;
     private addChoreTxs;
     send(transactions: TransactionItem[]): Promise<import("./transactionsManager").TransactionManagerStatuses>;
 }

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;AAO5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,mBAAmB;YAwCnB,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}
+{"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;AAQ5D,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,qBAAa,yBAA0B,SAAQ,mBAAmB,CAAC,aAAa,CAAC;YACjE,SAAS;YAmBT,WAAW;IA4CZ,IAAI,CAAC,YAAY,EAAE,eAAe,EAAE;CAmClD"}

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

@@ -14,26 +14,6 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
         await (0, utils_1.retryWithExponentialBackoff)(async (attemptNum, prevError) => await this.sendTransaction(tx.setAddressLookupTables(lutInputs), updateLutTxName, attemptNum, this.getUpdatedPriorityFeeSetting(prevError, attemptNum), "skip-simulation"), this.signableRetries, 150, this.errorsToThrow);
         await this.txHandler.refetchReferralState();
     }
-    async addSwbOraclePullTxs(txs) {
-        const switchboardMints = [
-            ...((0, utils_1.isSwitchboardMint)(this.txHandler.pos.supplyMint)
-                ? [this.txHandler.pos.supplyMint]
-                : []),
-            ...((0, utils_1.isSwitchboardMint)(this.txHandler.pos.debtMint)
-                ? [this.txHandler.pos.debtMint]
-                : []),
-        ];
-        if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
-            this.txHandler.log("Checking if oracle update(s) needed...");
-            const staleOracles = (await (0, utils_1.getSwitchboardFeedData)(this.txHandler.connection, switchboardMints)).filter((x) => x.stale).length > 0;
-            if (staleOracles) {
-                this.txHandler.log("Requires oracle update(s)...");
-                const oracleTxs = switchboardMints.map((x) => new types_1.TransactionItem(async () => await (0, utils_1.buildSwbSubmitResponseTx)(this.txHandler.connection, this.txHandler.signer, x), this.updateOracleTxName));
-                this.txHandler.log("Set crank IXs in TX");
-                txs.unshift(...oracleTxs);
-            }
-        }
-    }
     async addChoreTxs(txs, updateLutTx) {
         let [choresBefore, choresAfter] = await (0, transactionUtils_1.getTransactionChores)(this.txHandler, (0, umi_1.transactionBuilder)().add(txs
             .filter((x) => x.tx && x.tx.getInstructions().length > 0)
@@ -63,7 +43,7 @@ class ClientTransactionsManager extends transactionsManager_1.TransactionsManage
             await this.updateLut(updateLut.tx, updateLut.new);
         }
         this.lookupTables.defaultLuts = client.defaultLookupTables();
-        await this.addSwbOraclePullTxs(items);
+        // await addSwbOraclePullTxs(this.txHandler, items);
         for (const item of items) {
             await item.initialize();
         }

package/dist/services/transactions/manager/transactionsManager.d.ts

@@ -50,7 +50,6 @@ export declare class TransactionsManager<T extends TxHandler> {
     protected totalRetries: number;
     protected retryDelay: number;
     protected abortController?: AbortController;
-    updateOracleTxName: string;
     constructor(args: TransactionsManagerArgs<T>);
     private assembleTransactionSets;
     private updateStatus;

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

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

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

@@ -10,6 +10,7 @@ const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const transactionUtils_1 = require("../transactionUtils");
 const types_2 = require("../types");
+const constants_1 = require("../../../constants");
 class TransactionTooLargeError extends Error {
     constructor(message) {
         super(message);
@@ -29,7 +30,6 @@ var TransactionStatus;
 class TransactionsManager {
     constructor(args) {
         this.statuses = [];
-        this.updateOracleTxName = "update oracle";
         this.txHandler = args.txHandler;
         this.statusCallback = args.statusCallback;
         this.txRunType = args.txRunType;
@@ -102,7 +102,9 @@ class TransactionsManager {
                 this.statuses.push(args);
             }
         }
-        (0, utils_1.consoleLog)(`${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`);
+        (0, utils_1.consoleLog)(`${args.name} ${args.attemptNum} is ${args.status
+            .toString()
+            .toLowerCase()}`);
         this.statusCallback?.([...this.statuses]);
     }
     async debugAccounts(itemSet, tx) {
@@ -171,7 +173,7 @@ class TransactionsManager {
         }
         const newItemSetNames = itemSets.flatMap((x) => x.items.map((y) => y.name ?? ""));
         if (newItemSetNames.length === 1 &&
-            newItemSetNames[0] === this.updateOracleTxName) {
+            newItemSetNames[0] === constants_1.UPDATE_ORACLE_TX_NAME) {
             (0, utils_1.consoleLog)("Skipping unnecessary oracle update");
             this.updateStatusForSets(itemSets.map((x) => x.name()), {
                 status: TransactionStatus.Skipped,

package/dist/utils/stringUtils.js

@@ -13,7 +13,7 @@ const generalUtils_1 = require("./generalUtils");
 exports.StrategyTypes = ["Long", "Short", "Ratio"];
 function adjustedTicker(mint) {
     const info = (0, generalUtils_1.tokenInfo)(mint);
-    if (info.ticker.toLowerCase() === "wbtc") {
+    if (info.ticker.toLowerCase().includes("btc")) {
         return "BTC";
     }
     else if (info.ticker.toLowerCase() === "weth") {

package/dist/utils/switchboardUtils.d.ts

@@ -1,10 +1,11 @@
 import { Connection, PublicKey } from "@solana/web3.js";
 import { Signer } from "@metaplex-foundation/umi";
-import { PullFeed } from "@haven-fi/test-swb";
+import * as OnDemand from "@switchboard-xyz/on-demand";
 import { TransactionItemInputs } from "../types";
+import { SolautoClient, TransactionItem } from "../services";
 export declare function getPullFeed(conn: Connection, mint: PublicKey, wallet?: PublicKey): Promise<{
-    gateway: import("@haven-fi/test-swb").Gateway;
-    feed: PullFeed;
+    gateway: OnDemand.Gateway;
+    feed: OnDemand.PullFeed;
 }>;
 export declare function buildSwbSubmitResponseTx(conn: Connection, signer: Signer, mint: PublicKey): Promise<TransactionItemInputs | undefined>;
 export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKey[]): Promise<{
@@ -13,4 +14,5 @@ export declare function getSwitchboardFeedData(conn: Connection, mints: PublicKe
     stale: boolean;
 }[]>;
 export declare function isSwitchboardMint(mint: PublicKey | string): boolean;
+export declare function addSwbOraclePullTxs(client: SolautoClient, txs: TransactionItem[]): Promise<void>;
 //# sourceMappingURL=switchboardUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,EACL,QAAQ,EAGT,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAmCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAoD5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD"}
+{"version":3,"file":"switchboardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/switchboardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EAGV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAsB,MAAM,0BAA0B,CAAC;AAGtE,OAAO,KAAK,QAAQ,MAAM,4BAA4B,CAAC;AAOvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,wBAAsB,WAAW,CAC/B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,SAAS;;;GAkCnB;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAiD5C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,CAuB/D;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,WAEzD;AAED,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,eAAe,EAAE,iBAkCvB"}

package/dist/utils/switchboardUtils.js

@@ -1,18 +1,53 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPullFeed = getPullFeed;
 exports.buildSwbSubmitResponseTx = buildSwbSubmitResponseTx;
 exports.getSwitchboardFeedData = getSwitchboardFeedData;
 exports.isSwitchboardMint = isSwitchboardMint;
+exports.addSwbOraclePullTxs = addSwbOraclePullTxs;
 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 anchor_1 = require("@coral-xyz/anchor");
-const test_swb_1 = require("@haven-fi/test-swb");
+const OnDemand = __importStar(require("@switchboard-xyz/on-demand"));
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
 const solanaUtils_1 = require("./solanaUtils");
 const common_1 = require("@switchboard-xyz/common");
+const services_1 = require("../services");
 async function getPullFeed(conn, mint, wallet) {
     const dummyWallet = {
         publicKey: wallet ?? new web3_js_1.PublicKey("11111111111111111111111111111111"),
@@ -21,17 +56,16 @@ async function getPullFeed(conn, mint, wallet) {
     };
     const provider = new anchor_1.AnchorProvider(conn, dummyWallet, anchor_1.AnchorProvider.defaultOptions());
     (0, generalUtils_1.consoleLog)("Pulling SWB program...");
-    const sbProgram = await anchor_1.Program.at(test_swb_1.ON_DEMAND_MAINNET_PID, provider);
+    const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
+    const sbProgram = await anchor_1.Program.at(ON_DEMAND_MAINNET_PID, provider);
     const crossbar = new common_1.CrossbarClient("https://integrator-crossbar.mrgn.app/");
-    const queue = await test_swb_1.Queue.loadDefault(sbProgram);
+    const queue = await Queue.loadDefault(sbProgram);
     const gateway = await queue.fetchGatewayFromCrossbar(crossbar);
-    (0, generalUtils_1.consoleLog)("Gateway URL: ", gateway.gatewayUrl);
-    (0, generalUtils_1.consoleLog)("Gateway endpoint: ", gateway.endpoint());
     (0, generalUtils_1.consoleLog)("Pulled SWB program!");
     (0, generalUtils_1.consoleLog)("Feed id:", constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
     return {
         gateway,
-        feed: new test_swb_1.PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)),
+        feed: new PullFeed(sbProgram, new web3_js_1.PublicKey(constants_1.SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId)),
     };
 }
 async function buildSwbSubmitResponseTx(conn, signer, mint) {
@@ -42,7 +76,7 @@ async function buildSwbSubmitResponseTx(conn, signer, mint) {
             gateway: gateway.endpoint(),
             chain: "solana",
             network: "mainnet-beta",
-        }, true);
+        });
         if (!res[1] || !res[1][0].value) {
             throw new Error("Unable to fetch Switchboard pull IX");
         }
@@ -87,3 +121,21 @@ async function getSwitchboardFeedData(conn, mints) {
 function isSwitchboardMint(mint) {
     return Object.keys(constants_1.SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
 }
+async function addSwbOraclePullTxs(client, txs) {
+    const switchboardMints = [
+        ...(isSwitchboardMint(client.pos.supplyMint)
+            ? [client.pos.supplyMint]
+            : []),
+        ...(isSwitchboardMint(client.pos.debtMint) ? [client.pos.debtMint] : []),
+    ];
+    if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+        (0, generalUtils_1.consoleLog)("Checking if oracle update(s) needed...");
+        const staleOracles = (await getSwitchboardFeedData(client.connection, switchboardMints)).filter((x) => x.stale).length > 0;
+        if (staleOracles) {
+            (0, generalUtils_1.consoleLog)("Requires oracle update(s)...");
+            const oracleTxs = switchboardMints.map((x) => new services_1.TransactionItem(async () => await buildSwbSubmitResponseTx(client.connection, client.signer, x), constants_1.UPDATE_ORACLE_TX_NAME));
+            (0, generalUtils_1.consoleLog)("Set crank IXs in TX");
+            txs.unshift(...oracleTxs);
+        }
+    }
+}

package/local/txSandbox.ts

@@ -2,41 +2,34 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  buildSwbSubmitResponseTx,
   ClientTransactionsManager,
   consoleLog,
-  deposit,
+  fetchBank,
   getBatches,
   getClient,
-  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
-  H_SOL,
-  JITO_SOL,
-  JUP_SOL,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
-  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
+  safeFetchBank,
+  safeFetchMarginfiAccount,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
-  toBaseUnit,
   TransactionItem,
-  USDC,
 } from "../src";
 import { getSecretKey } from "./shared";
-import { NATIVE_MINT } from "@solana/spl-token";
 
 const payForTransaction = true;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
-let [conn, umi] = getSolanaRpcConnection(
+let [, umi] = getSolanaRpcConnection(
   LOCAL_IRONFORGE_API_URL,
   testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
   lpEnv
@@ -44,7 +37,7 @@ let [conn, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("id")))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
 );
 
 export async function main() {
@@ -56,34 +49,30 @@ export async function main() {
     lpEnv,
   });
 
-  await client.initializeExistingSolautoPosition({
-    positionId: 1,
-    authority: new PublicKey("8zYDnyACnJeHsG3fAiXUAa4EHitDu1G6ztjso6mruYVS")
-    // supplyMint: NATIVE_MINT,
-    // debtMint: new PublicKey(USDC),
-    // lpPoolAccount: getMarginfiAccounts("Prod").defaultGroup,
-  });
+  // await client.initializeExistingSolautoPosition({
+  //   positionId: 1,
+  //   authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
+  //   // lpUserAccount: new PublicKey(
+  //   //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+  //   // ),
+  // });
 
-  // const transactionItems = [
-  //   rebalance(client, 3000),
-  // ];
-  const transactionItems = [
-    new TransactionItem(
-      async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(NATIVE_MINT)),
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JUP_SOL)),
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(JITO_SOL))
-      // async () => await buildSwbSubmitResponseTx(conn, signer, new PublicKey(H_SOL))
-    ),
-  ];
+  // const transactionItems = [rebalance(client)];
 
-  const txManager = new ClientTransactionsManager({
-    txHandler: client,
-    txRunType: payForTransaction ? "normal" : "only-simulate",
-    priorityFeeSetting: PriorityFeeSetting.Default,
-    retryConfig: { totalRetries: 2 },
-  });
-  const statuses = await txManager.send(transactionItems);
-  consoleLog(statuses);
+  const account = await fetchBank(umi, publicKey("Ac4KV5K5isDqtABtg6h5DiwzZMe3Sp9bc3pBiCUvUpaQ"));
+  console.log(account.config.oracleKeys[0]);
+  console.log(account.config.oracleKeys[1]);
+  console.log(account.config.oracleKeys[2]);
+  console.log(account.config.oracleKeys[3]);
+
+  // const txManager = new ClientTransactionsManager({
+  //   txHandler: client,
+  //   txRunType: payForTransaction ? "normal" : "only-simulate",
+  //   priorityFeeSetting: PriorityFeeSetting.Default,
+  //   retryConfig: { totalRetries: 2 },
+  // });
+  // const statuses = await txManager.send(transactionItems);
+  // consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.812",
+  "version": "1.0.814",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -21,7 +21,7 @@
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "=1.98.2",
     "@switchboard-xyz/common": "=3.4.1",
-    "@haven-fi/test-swb": "=2.17.9",
+    "@switchboard-xyz/on-demand": "=2.17.4",
     "axios": "^1.7.8",
     "big.js": "^6.2.2",
     "bs58": "^5.0.0",

package/src/constants/marginfiAccounts.ts

@@ -142,6 +142,11 @@ const MARGINFI_PROD_ACCOUNTS: MarginfiBankAccountsMap = {
       bank: "61Qx9kgWo9RVtPHf8Rku6gbaUtcnzgkpAuifQBUcMRVK",
       liquidityVault: "6FxnrCaJNHLyrFy6EPtqFjoUK5iRxDQbaVo1bA69nDhH",
       vaultAuthority: "6VL2QW6sy8cjxL24xHL7eFbnUSi35DMJd8AzRwssSs9y"
+    },
+    [tokens.CBBTC]: {
+      bank: "Ac4KV5K5isDqtABtg6h5DiwzZMe3Sp9bc3pBiCUvUpaQ",
+      liquidityVault: "FvrJsHu7X9jkT9rTuR6Kfs6wSjPvjV6zhH4gVSiJ8LFT",
+      vaultAuthority: "jfBsYE2sAkNj1pwE6U1gQ515JU5vn9huZMDYVvZagb4",
     }
   },
   ["DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q"]: {

package/src/constants/pythConstants.ts

@@ -44,6 +44,8 @@ export const PYTH_PRICE_FEED_IDS = {
     "0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc",
   [tokens.PUMP]:
     "0x7a01fca212788bba7c5bf8c9efd576a8a722f070d2c17596ff7bb609b8d5c3b9",
+  [tokens.CBBTC]:
+    "0x2817d7bfe5c64b8ea956e9a26f573ef64e72e4d7891f2d6af9bcc93f7aff9a97",
 };
 
 export const PYTH_ORACLE_ACCOUNTS = {

package/src/constants/solautoConstants.ts

@@ -65,3 +65,5 @@ export const STANDARD_LUT_ACCOUNTS = [
   SYSVAR_INSTRUCTIONS_PUBKEY,
   JUPITER_PROGRAM_ID,
 ].map((x) => x.toString());
+
+export const UPDATE_ORACLE_TX_NAME = "update oracle";

package/src/constants/tokenConstants.ts

@@ -25,6 +25,7 @@ export const RETARDIO = "6ogzHhzdrQr9Pgv6hZ2MNze7UrzBMAFyBBWUYp1Fhitx";
 export const BILLY = "3B5wuUrMEi5yATD7on46hKfej3pfmd7t1RKgrsN3pump";
 export const HMTR = "7JhmUcZrrfhyt5nTSu3AfsrUq2L9992a7AhwdSDxdoL2";
 export const PUMP = "pumpCmXqMfrsAkQ5r49WcJnRayYRqmXz6ae8H7H9Dfn";
+export const CBBTC = "cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij";
 
 export const ALL_SUPPORTED_TOKENS = [
   NATIVE_MINT.toString(),
@@ -51,6 +52,7 @@ export const ALL_SUPPORTED_TOKENS = [
   BILLY,
   HMTR,
   PUMP,
+  CBBTC,
 ];
 
 export interface TokenInfo {
@@ -199,11 +201,18 @@ export const TOKEN_INFO: { [key: string]: TokenInfo } = {
     ticker: "PUMP",
     name: "Pump.fun",
     decimals: 6,
-  }
+  },
+  [CBBTC]: {
+    ticker: "CBBTC",
+    name: "Coinbase BTC",
+    decimals: 8,
+    isMajor: true,
+  },
 };
 
 export const MAJORS_PRIO = {
   [WBTC]: 0,
+  [CBBTC]: 0,
   [WETH]: 1,
   [NATIVE_MINT.toString()]: 2,
-};
+};

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

@@ -5,6 +5,7 @@ import {
 import { SolautoClient } from "../../solauto";
 import { TransactionsManager } from "./transactionsManager";
 import {
+  addSwbOraclePullTxs,
   buildSwbSubmitResponseTx,
   getSwitchboardFeedData,
   isSwitchboardMint,
@@ -34,46 +35,6 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     await this.txHandler.refetchReferralState();
   }
 
-  private async addSwbOraclePullTxs(txs: TransactionItem[]) {
-    const switchboardMints = [
-      ...(isSwitchboardMint(this.txHandler.pos.supplyMint)
-        ? [this.txHandler.pos.supplyMint]
-        : []),
-      ...(isSwitchboardMint(this.txHandler.pos.debtMint)
-        ? [this.txHandler.pos.debtMint]
-        : []),
-    ];
-
-    if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
-        this.txHandler.log("Checking if oracle update(s) needed...");
-      const staleOracles =
-        (
-          await getSwitchboardFeedData(
-            this.txHandler.connection,
-            switchboardMints
-          )
-        ).filter((x) => x.stale).length > 0;
-
-      if (staleOracles) {
-        this.txHandler.log("Requires oracle update(s)...");
-        const oracleTxs = switchboardMints.map(
-          (x) =>
-            new TransactionItem(
-              async () =>
-                await buildSwbSubmitResponseTx(
-                  this.txHandler.connection,
-                  this.txHandler.signer,
-                  x
-                ),
-              this.updateOracleTxName
-            )
-        );
-        this.txHandler.log("Set crank IXs in TX");
-        txs.unshift(...oracleTxs);
-      }
-    }
-  }
-
   private async addChoreTxs(
     txs: TransactionItem[],
     updateLutTx?: TransactionBuilder
@@ -131,7 +92,7 @@ export class ClientTransactionsManager extends TransactionsManager<SolautoClient
     }
     this.lookupTables.defaultLuts = client.defaultLookupTables();
 
-    await this.addSwbOraclePullTxs(items);
+    // await addSwbOraclePullTxs(this.txHandler, items);
 
     for (const item of items) {
       await item.initialize();

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

@@ -16,6 +16,7 @@ import {
 import { TxHandler } from "../../solauto";
 import { getErrorInfo } from "../transactionUtils";
 import { LookupTables, TransactionItem, TransactionSet } from "../types";
+import { UPDATE_ORACLE_TX_NAME } from "../../../constants";
 
 export class TransactionTooLargeError extends Error {
   constructor(message: string) {
@@ -75,8 +76,6 @@ export class TransactionsManager<T extends TxHandler> {
   protected retryDelay: number;
   protected abortController?: AbortController;
 
-  updateOracleTxName = "update oracle";
-
   constructor(args: TransactionsManagerArgs<T>) {
     this.txHandler = args.txHandler;
     this.statusCallback = args.statusCallback;
@@ -118,7 +117,9 @@ export class TransactionsManager<T extends TxHandler> {
       );
       if (!transaction.fitsInOneTransaction(this.txHandler.umi)) {
         throw new TransactionTooLargeError(
-          `Exceeds max transaction size (${transaction.getTransactionSize(this.txHandler.umi)})`
+          `Exceeds max transaction size (${transaction.getTransactionSize(
+            this.txHandler.umi
+          )})`
         );
       } else {
         let newSet = new TransactionSet(this.txHandler, this.lookupTables, [
@@ -166,7 +167,9 @@ export class TransactionsManager<T extends TxHandler> {
       }
     }
     consoleLog(
-      `${args.name} ${args.attemptNum} is ${args.status.toString().toLowerCase()}`
+      `${args.name} ${args.attemptNum} is ${args.status
+        .toString()
+        .toLowerCase()}`
     );
     this.statusCallback?.([...this.statuses]);
   }
@@ -180,7 +183,11 @@ export class TransactionsManager<T extends TxHandler> {
         (x) => !lutAccounts.includes(x)
       );
       consoleLog(
-        `Program ${ix.programId}, data len: ${ix.data.length}, LUT accounts data: ${ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3}`
+        `Program ${ix.programId}, data len: ${
+          ix.data.length
+        }, LUT accounts data: ${
+          ix.keys.filter((x) => lutAccounts.includes(x.pubkey)).length * 3
+        }`
       );
       if (accountsNotInLut.length > 0) {
         consoleLog(`${accountsNotInLut.length} accounts not in LUT:`);
@@ -273,7 +280,7 @@ export class TransactionsManager<T extends TxHandler> {
     );
     if (
       newItemSetNames.length === 1 &&
-      newItemSetNames[0] === this.updateOracleTxName
+      newItemSetNames[0] === UPDATE_ORACLE_TX_NAME
     ) {
       consoleLog("Skipping unnecessary oracle update");
       this.updateStatusForSets(
@@ -570,7 +577,9 @@ export class TransactionsManager<T extends TxHandler> {
       this.priorityFeeSetting
     );
 
-    const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${errorDetails.errorInfo?.split("\n")[0] ?? "unknown"}`;
+    const errorString = `${errorDetails.errorName ?? "Unknown error"}: ${
+      errorDetails.errorInfo?.split("\n")[0] ?? "unknown"
+    }`;
     const errorInfo =
       errorDetails.errorName || errorDetails.errorInfo
         ? errorString

package/src/utils/stringUtils.ts

@@ -9,7 +9,7 @@ export type StrategyType = (typeof StrategyTypes)[number];
 export function adjustedTicker(mint?: PublicKey) {
   const info = tokenInfo(mint);
 
-  if (info.ticker.toLowerCase() === "wbtc") {
+  if (info.ticker.toLowerCase().includes("btc")) {
     return "BTC";
   } else if (info.ticker.toLowerCase() === "weth") {
     return "ETH";

package/src/utils/switchboardUtils.ts

@@ -6,14 +6,14 @@ import {
 } from "@solana/web3.js";
 import { Signer, transactionBuilder } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { AnchorProvider, Program } from "@coral-xyz/anchor";
-import {
-  PullFeed,
-  Queue,
-  ON_DEMAND_MAINNET_PID,
-} from "@haven-fi/test-swb";
+import { AnchorProvider, Idl, Program } from "@coral-xyz/anchor";
+import * as OnDemand from "@switchboard-xyz/on-demand";
 import Big from "big.js";
-import { PRICES, SWITCHBOARD_PRICE_FEED_IDS } from "../constants";
+import {
+  PRICES,
+  SWITCHBOARD_PRICE_FEED_IDS,
+  UPDATE_ORACLE_TX_NAME,
+} from "../constants";
 import { TransactionItemInputs } from "../types";
 import {
   consoleLog,
@@ -22,6 +22,7 @@ import {
 } from "./generalUtils";
 import { getWrappedInstruction } from "./solanaUtils";
 import { CrossbarClient } from "@switchboard-xyz/common";
+import { SolautoClient, TransactionItem } from "../services";
 
 export async function getPullFeed(
   conn: Connection,
@@ -44,14 +45,13 @@ export async function getPullFeed(
   );
 
   consoleLog("Pulling SWB program...");
+  const { PullFeed, Queue, ON_DEMAND_MAINNET_PID } = OnDemand;
   const sbProgram = await Program.at(ON_DEMAND_MAINNET_PID, provider);
 
   const crossbar = new CrossbarClient("https://integrator-crossbar.mrgn.app/");
   const queue = await Queue.loadDefault(sbProgram);
   const gateway = await queue.fetchGatewayFromCrossbar(crossbar as any);
 
-  consoleLog("Gateway URL: ", gateway.gatewayUrl);
-  consoleLog("Gateway endpoint: ", gateway.endpoint());
   consoleLog("Pulled SWB program!");
   consoleLog("Feed id:", SWITCHBOARD_PRICE_FEED_IDS[mint.toString()].feedId);
   return {
@@ -77,14 +77,11 @@ export async function buildSwbSubmitResponseTx(
   consoleLog("Fetching crank IX...");
   const [pullIxs, responses] = await retryWithExponentialBackoff(
     async () => {
-      const res = await feed.fetchUpdateIx(
-        {
-          gateway: gateway.endpoint(),
-          chain: "solana",
-          network: "mainnet-beta",
-        },
-        true
-      );
+      const res = await feed.fetchUpdateIx({
+        gateway: gateway.endpoint(),
+        chain: "solana",
+        network: "mainnet-beta",
+      });
       if (!res[1] || !res[1][0].value) {
         throw new Error("Unable to fetch Switchboard pull IX");
       }
@@ -152,3 +149,41 @@ export async function getSwitchboardFeedData(
 export function isSwitchboardMint(mint: PublicKey | string) {
   return Object.keys(SWITCHBOARD_PRICE_FEED_IDS).includes(mint.toString());
 }
+
+export async function addSwbOraclePullTxs(
+  client: SolautoClient,
+  txs: TransactionItem[]
+) {
+  const switchboardMints = [
+    ...(isSwitchboardMint(client.pos.supplyMint)
+      ? [client.pos.supplyMint]
+      : []),
+    ...(isSwitchboardMint(client.pos.debtMint) ? [client.pos.debtMint] : []),
+  ];
+
+  if (txs.find((x) => x.oracleInteractor) && switchboardMints.length) {
+    consoleLog("Checking if oracle update(s) needed...");
+    const staleOracles =
+      (
+        await getSwitchboardFeedData(client.connection, switchboardMints)
+      ).filter((x) => x.stale).length > 0;
+
+    if (staleOracles) {
+      consoleLog("Requires oracle update(s)...");
+      const oracleTxs = switchboardMints.map(
+        (x) =>
+          new TransactionItem(
+            async () =>
+              await buildSwbSubmitResponseTx(
+                client.connection,
+                client.signer,
+                x
+              ),
+            UPDATE_ORACLE_TX_NAME
+          )
+      );
+      consoleLog("Set crank IXs in TX");
+      txs.unshift(...oracleTxs);
+    }
+  }
+}