@haven-fi/solauto-sdk 1.0.811 → 1.0.813

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/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/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,10 @@
 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";
 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<{

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;AAGvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,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,CAmD5C;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"}

package/dist/utils/switchboardUtils.js

@@ -1,4 +1,37 @@
 "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;
@@ -8,7 +41,7 @@ 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");
@@ -21,28 +54,28 @@ 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) {
     const { feed, gateway } = await getPullFeed(conn, mint, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(signer.publicKey));
+    // Try to replicate locally in the lambda docker container
     (0, generalUtils_1.consoleLog)("Fetching crank IX...");
     const [pullIxs, responses] = await (0, generalUtils_1.retryWithExponentialBackoff)(async () => {
         const res = await feed.fetchUpdateIx({
             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");
         }

package/local/txSandbox.ts

@@ -2,22 +2,15 @@ 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,
   getBatches,
   getClient,
-  getMarginfiAccounts,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
-  H_SOL,
-  JITO_SOL,
-  JUP_SOL,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
-  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -25,18 +18,15 @@ import {
   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 +34,7 @@ let [conn, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("id")))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
 );
 
 export async function main() {
@@ -58,23 +48,13 @@ export async function main() {
 
   await client.initializeExistingSolautoPosition({
     positionId: 1,
-    authority: new PublicKey("8zYDnyACnJeHsG3fAiXUAa4EHitDu1G6ztjso6mruYVS")
-    // supplyMint: NATIVE_MINT,
-    // debtMint: new PublicKey(USDC),
-    // lpPoolAccount: getMarginfiAccounts("Prod").defaultGroup,
+    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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.811",
+  "version": "1.0.813",
   "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.8",
+    "@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/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/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,12 +6,8 @@ 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 { TransactionItemInputs } from "../types";
@@ -44,14 +40,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 {
@@ -74,17 +69,16 @@ export async function buildSwbSubmitResponseTx(
     toWeb3JsPublicKey(signer.publicKey)
   );
 
+  // Try to replicate locally in the lambda docker container
+
   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");
       }