@pythnetwork/price-pusher 6.8.0 → 7.0.0-alpha

package/lib/options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mnemonicFile = exports.pushingFrequency = exports.pollingFrequency = exports.priceConfigFile = exports.pythContractAddress = exports.priceServiceEndpoint = void 0;
+exports.controllerLogLevel = exports.priceServiceConnectionLogLevel = exports.logLevel = exports.mnemonicFile = exports.pushingFrequency = exports.pollingFrequency = exports.priceConfigFile = exports.pythContractAddress = exports.priceServiceEndpoint = void 0;
 exports.priceServiceEndpoint = {
     "price-service-endpoint": {
         description: "Endpoint URL for the price service. e.g: https://endpoint/example",
@@ -48,3 +48,30 @@ exports.mnemonicFile = {
         required: true,
     },
 };
+exports.logLevel = {
+    "log-level": {
+        description: "Log level",
+        type: "string",
+        required: false,
+        default: "info",
+        choices: ["trace", "debug", "info", "warn", "error"],
+    },
+};
+exports.priceServiceConnectionLogLevel = {
+    "price-service-connection-log-level": {
+        description: "Log level for the price service connection.",
+        type: "string",
+        required: false,
+        default: "warn",
+        choices: ["trace", "debug", "info", "warn", "error"],
+    },
+};
+exports.controllerLogLevel = {
+    "controller-log-level": {
+        description: "Log level for the controller.",
+        type: "string",
+        required: false,
+        default: "info",
+        choices: ["trace", "debug", "info", "warn", "error"],
+    },
+};

package/lib/price-config.d.ts

@@ -1,4 +1,5 @@
 import { HexString } from "@pythnetwork/price-service-client";
+import { Logger } from "pino";
 import { DurationInSeconds, PctNumber } from "./utils";
 import { PriceInfo } from "./interface";
 export type PriceConfig = {
@@ -24,5 +25,5 @@ export declare enum UpdateCondition {
  * @param priceConfig Config of the price feed to check
  * @returns True if the on-chain price needs to be updated.
  */
-export declare function shouldUpdate(priceConfig: PriceConfig, sourceLatestPrice: PriceInfo | undefined, targetLatestPrice: PriceInfo | undefined): UpdateCondition;
+export declare function shouldUpdate(priceConfig: PriceConfig, sourceLatestPrice: PriceInfo | undefined, targetLatestPrice: PriceInfo | undefined, logger: Logger): UpdateCondition;
 //# sourceMappingURL=price-config.d.ts.map

package/lib/price-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"price-config.d.ts","sourceRoot":"","sources":["../src/price-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAI9D,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAmB,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAuBxC,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,EAAE,iBAAiB,CAAC;IAClC,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAU3B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,yBAAyB,EAAE,SAAS,GAAG,SAAS,CAAC;IACjD,0BAA0B,EAAE,SAAS,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAuB/D;AAED,oBAAY,eAAe;IAEzB,GAAG,IAAA;IAEH,KAAK,IAAA;IAEL,EAAE,IAAA;CACH;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,iBAAiB,EAAE,SAAS,GAAG,SAAS,GACvC,eAAe,CAqEjB"}
+{"version":3,"file":"price-config.d.ts","sourceRoot":"","sources":["../src/price-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAI9D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAmB,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAuBxC,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,EAAE,iBAAiB,CAAC;IAClC,cAAc,EAAE,SAAS,CAAC;IAC1B,eAAe,EAAE,SAAS,CAAC;IAU3B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;IACvC,yBAAyB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACzD,yBAAyB,EAAE,SAAS,GAAG,SAAS,CAAC;IACjD,0BAA0B,EAAE,SAAS,GAAG,SAAS,CAAC;CACnD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAuB/D;AAED,oBAAY,eAAe;IAEzB,GAAG,IAAA;IAEH,KAAK,IAAA;IAEL,EAAE,IAAA;CACH;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAC1B,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,iBAAiB,EAAE,SAAS,GAAG,SAAS,EACxC,MAAM,EAAE,MAAM,GACb,eAAe,CAkEjB"}

package/lib/price-config.js

@@ -63,7 +63,7 @@ var UpdateCondition;
  * @param priceConfig Config of the price feed to check
  * @returns True if the on-chain price needs to be updated.
  */
-function shouldUpdate(priceConfig, sourceLatestPrice, targetLatestPrice) {
+function shouldUpdate(priceConfig, sourceLatestPrice, targetLatestPrice, logger) {
     const priceId = priceConfig.id;
     // There is no price to update the target with.
     if (sourceLatestPrice === undefined) {
@@ -71,7 +71,7 @@ function shouldUpdate(priceConfig, sourceLatestPrice, targetLatestPrice) {
     }
     // It means that price never existed there. So we should push the latest price feed.
     if (targetLatestPrice === undefined) {
-        console.log(`${priceConfig.alias} (${priceId}) is not available on the target network. Pushing the price.`);
+        logger.info(`${priceConfig.alias} (${priceId}) is not available on the target network. Pushing the price.`);
         return UpdateCondition.YES;
     }
     // The current price is not newer than the price onchain
@@ -83,10 +83,8 @@ function shouldUpdate(priceConfig, sourceLatestPrice, targetLatestPrice) {
         Number(targetLatestPrice.price)) *
         100;
     const confidenceRatioPct = Math.abs((Number(sourceLatestPrice.conf) / Number(sourceLatestPrice.price)) * 100);
-    console.log(`Analyzing price ${priceConfig.alias} (${priceId})`);
-    console.log("Source latest price: ", sourceLatestPrice);
-    console.log("Target latest price: ", targetLatestPrice);
-    console.log(`Time difference: ${timeDifference} (< ${priceConfig.timeDifference}? / early: < ${priceConfig.earlyUpdateTimeDifference}) OR ` +
+    logger.info({ sourcePrice: sourceLatestPrice, targetPrice: targetLatestPrice }, `Analyzing price ${priceConfig.alias} (${priceId}). ` +
+        `Time difference: ${timeDifference} (< ${priceConfig.timeDifference}? / early: < ${priceConfig.earlyUpdateTimeDifference}) OR ` +
         `Price deviation: ${priceDeviationPct.toFixed(5)}% (< ${priceConfig.priceDeviation}%? / early: < ${priceConfig.earlyUpdatePriceDeviation}%?) OR ` +
         `Confidence ratio: ${confidenceRatioPct.toFixed(5)}% (< ${priceConfig.confidenceRatio}%? / early: < ${priceConfig.earlyUpdatePriceDeviation}%?)`);
     if (timeDifference >= priceConfig.timeDifference ||

package/lib/pyth-price-listener.d.ts

@@ -1,11 +1,13 @@
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { PriceInfo, IPriceListener, PriceItem } from "./interface";
+import { Logger } from "pino";
 export declare class PythPriceListener implements IPriceListener {
     private connection;
     private priceIds;
     private priceIdToAlias;
     private latestPriceInfo;
-    constructor(connection: PriceServiceConnection, priceItems: PriceItem[]);
+    private logger;
+    constructor(connection: PriceServiceConnection, priceItems: PriceItem[], logger: Logger);
     start(): Promise<void>;
     private onNewPriceFeed;
     getLatestPriceInfo(priceId: string): PriceInfo | undefined;

package/lib/pyth-price-listener.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pyth-price-listener.d.ts","sourceRoot":"","sources":["../src/pyth-price-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEnE,qBAAa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,eAAe,CAA4B;gBAEvC,UAAU,EAAE,sBAAsB,EAAE,UAAU,EAAE,SAAS,EAAE;IAWjE,KAAK;IAmBX,OAAO,CAAC,cAAc;IAsBtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;CAG3D"}
+{"version":3,"file":"pyth-price-listener.d.ts","sourceRoot":"","sources":["../src/pyth-price-listener.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,MAAM,CAAS;gBAGrB,UAAU,EAAE,sBAAsB,EAClC,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM;IAaV,KAAK;IAmBX,OAAO,CAAC,cAAc;IAsBtB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;CAG3D"}

package/lib/pyth-price-listener.js

@@ -6,11 +6,13 @@ class PythPriceListener {
     priceIds;
     priceIdToAlias;
     latestPriceInfo;
-    constructor(connection, priceItems) {
+    logger;
+    constructor(connection, priceItems, logger) {
         this.connection = connection;
         this.priceIds = priceItems.map((priceItem) => priceItem.id);
         this.priceIdToAlias = new Map(priceItems.map((priceItem) => [priceItem.id, priceItem.alias]));
         this.latestPriceInfo = new Map();
+        this.logger = logger;
     }
     // This method should be awaited on and once it finishes it has the latest value
     // for the given price feeds (if they exist).
@@ -29,7 +31,7 @@ class PythPriceListener {
         });
     }
     onNewPriceFeed(priceFeed) {
-        console.log(`Received new price feed update from Pyth price service: ${this.priceIdToAlias.get(priceFeed.id)} ${priceFeed.id}`);
+        this.logger.debug(`Received new price feed update from Pyth price service: ${this.priceIdToAlias.get(priceFeed.id)} ${priceFeed.id}`);
         // Consider price to be currently available if it is not older than 60s
         const currentPrice = priceFeed.getPriceNoOlderThan(60);
         if (currentPrice === undefined) {

package/lib/solana/command.d.ts

@@ -1,9 +1,13 @@
 import { Options } from "yargs";
 import { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
+import { Logger } from "pino";
 declare const _default: {
     command: string;
     describe: string;
     builder: {
+        "controller-log-level": Options;
+        "price-service-connection-log-level": Options;
+        "log-level": Options;
         "pushing-frequency": Options;
         "polling-frequency": Options;
         "pyth-contract-address": Options;
@@ -21,5 +25,5 @@ declare const _default: {
     handler: (argv: any) => void;
 };
 export default _default;
-export declare const onBundleResult: (c: SearcherClient) => void;
+export declare const onBundleResult: (c: SearcherClient, logger: Logger) => void;
 //# sourceMappingURL=command.d.ts.map

package/lib/solana/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/solana/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAgBhC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;;;;;;;;;;;;;;;;;;;oBAqDrB,GAAG;;AAnD9B,wBAkJE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,SAO/C,CAAC"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/solana/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAgBhC,OAAO,EACL,cAAc,EAEf,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;oBAwDH,GAAG;;AAtD9B,wBA2JE;AAEF,eAAO,MAAM,cAAc,MAAO,cAAc,UAAU,MAAM,SAO/D,CAAC"}

package/lib/solana/command.js

@@ -39,6 +39,7 @@ const web3_js_1 = require("@solana/web3.js");
 const fs_1 = __importDefault(require("fs"));
 const web3_js_2 = require("@solana/web3.js");
 const searcher_1 = require("jito-ts/dist/sdk/block-engine/searcher");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "solana",
     describe: "run price pusher for solana",
@@ -88,22 +89,19 @@ exports.default = {
         ...options.pythContractAddress,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: function (argv) {
-        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, jitoBundleSize, } = argv;
+        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, jitoEndpoint, jitoKeypairFile, jitoTipLamports, jitoBundleSize, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const logger = (0, pino_1.default)({ level: logLevel });
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: {
-                // Log only warnings and errors from the price service client
-                info: () => undefined,
-                warn: console.warn,
-                error: console.error,
-                debug: () => undefined,
-                trace: () => undefined,
-            },
+            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
         });
         const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
         const wallet = new nodewallet_1.default(web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(fs_1.default.readFileSync(keypairFile, "ascii")))));
         const pythSolanaReceiver = new pyth_solana_receiver_1.PythSolanaReceiver({
             connection: new web3_js_1.Connection(endpoint, "processed"),
@@ -114,20 +112,20 @@ exports.default = {
         if (jitoTipLamports) {
             const jitoKeypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(fs_1.default.readFileSync(jitoKeypairFile, "ascii"))));
             const jitoClient = (0, searcher_1.searcherClient)(jitoEndpoint, jitoKeypair);
-            solanaPricePusher = new solana_1.SolanaPricePusherJito(pythSolanaReceiver, priceServiceConnection, shardId, jitoTipLamports, jitoClient, jitoBundleSize);
-            (0, exports.onBundleResult)(jitoClient);
+            solanaPricePusher = new solana_1.SolanaPricePusherJito(pythSolanaReceiver, priceServiceConnection, logger.child({ module: "SolanaPricePusherJito" }), shardId, jitoTipLamports, jitoClient, jitoBundleSize);
+            (0, exports.onBundleResult)(jitoClient, logger.child({ module: "JitoClient" }));
         }
         else {
-            solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports);
+            solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, logger.child({ module: "SolanaPricePusher" }), shardId, computeUnitPriceMicroLamports);
         }
-        const solanaPriceListener = new solana_1.SolanaPriceListener(pythSolanaReceiver, shardId, priceItems, { pollingFrequency });
-        const controller = new controller_1.Controller(priceConfigs, pythListener, solanaPriceListener, solanaPricePusher, { pushingFrequency });
+        const solanaPriceListener = new solana_1.SolanaPriceListener(pythSolanaReceiver, shardId, priceItems, logger.child({ module: "SolanaPriceListener" }), { pollingFrequency });
+        const controller = new controller_1.Controller(priceConfigs, pythListener, solanaPriceListener, solanaPricePusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };
-const onBundleResult = (c) => {
-    c.onBundleResult(() => undefined, (e) => {
-        console.log("Error in bundle result: ", e);
+const onBundleResult = (c, logger) => {
+    c.onBundleResult(() => undefined, (err) => {
+        logger.error(err, "Error in bundle result");
     });
 };
 exports.onBundleResult = onBundleResult;

package/lib/solana/solana.d.ts

@@ -3,10 +3,12 @@ import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../inter
 import { DurationInSeconds } from "../utils";
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { SearcherClient } from "jito-ts/dist/sdk/block-engine/searcher";
+import { Logger } from "pino";
 export declare class SolanaPriceListener extends ChainPriceListener {
     private pythSolanaReceiver;
     private shardId;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, shardId: number, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, shardId: number, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
@@ -14,19 +16,21 @@ export declare class SolanaPriceListener extends ChainPriceListener {
 export declare class SolanaPricePusher implements IPricePusher {
     private pythSolanaReceiver;
     private priceServiceConnection;
+    private logger;
     private shardId;
     private computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, computeUnitPriceMicroLamports: number);
-    updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, computeUnitPriceMicroLamports: number);
+    updatePriceFeed(priceIds: string[], _pubTimesToPush: number[]): Promise<void>;
 }
 export declare class SolanaPricePusherJito implements IPricePusher {
     private pythSolanaReceiver;
     private priceServiceConnection;
+    private logger;
     private shardId;
     private jitoTipLamports;
     private searcherClient;
     private jitoBundleSize;
-    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, jitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number);
-    updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, logger: Logger, shardId: number, jitoTipLamports: number, searcherClient: SearcherClient, jitoBundleSize: number);
+    updatePriceFeed(priceIds: string[], _pubTimesToPush: number[]): Promise<void>;
 }
 //# sourceMappingURL=solana.d.ts.map

package/lib/solana/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAK3E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;gBADP,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA2B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAH7B,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAwCjB;AAID,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBALd,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM;IAG1B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAuCjB"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAK3E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAHN,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA0B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAJ7B,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CAwCjB;AAID,qBAAa,qBAAsB,YAAW,YAAY;IAEtD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBANd,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,MAAM;IAG1B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAElB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,IAAI,CAAC;CAuCjB"}

package/lib/solana/solana.js

@@ -7,15 +7,17 @@ const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
 class SolanaPriceListener extends interface_1.ChainPriceListener {
     pythSolanaReceiver;
     shardId;
-    constructor(pythSolanaReceiver, shardId, priceItems, config) {
-        super("solana", config.pollingFrequency, priceItems);
+    logger;
+    constructor(pythSolanaReceiver, shardId, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.pythSolanaReceiver = pythSolanaReceiver;
         this.shardId = shardId;
+        this.logger = logger;
     }
     async getOnChainPriceInfo(priceId) {
         try {
             const priceFeedAccount = await this.pythSolanaReceiver.fetchPriceFeedAccount(this.shardId, Buffer.from(priceId, "hex"));
-            console.log(`Polled a Solana on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+            this.logger.debug(`Polled a Solana on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
             if (priceFeedAccount) {
                 return {
                     conf: priceFeedAccount.priceMessage.conf.toString(),
@@ -27,9 +29,8 @@ class SolanaPriceListener extends interface_1.ChainPriceListener {
                 return undefined;
             }
         }
-        catch (e) {
-            console.error(`Polling on-chain price for ${priceId} failed. Error:`);
-            console.error(e);
+        catch (err) {
+            this.logger.error({ err, priceId }, `Polling on-chain price failed.`);
             return undefined;
         }
     }
@@ -38,15 +39,19 @@ exports.SolanaPriceListener = SolanaPriceListener;
 class SolanaPricePusher {
     pythSolanaReceiver;
     priceServiceConnection;
+    logger;
     shardId;
     computeUnitPriceMicroLamports;
-    constructor(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports) {
+    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, computeUnitPriceMicroLamports) {
         this.pythSolanaReceiver = pythSolanaReceiver;
         this.priceServiceConnection = priceServiceConnection;
+        this.logger = logger;
         this.shardId = shardId;
         this.computeUnitPriceMicroLamports = computeUnitPriceMicroLamports;
     }
-    async updatePriceFeed(priceIds, pubTimesToPush) {
+    async updatePriceFeed(priceIds, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _pubTimesToPush) {
         if (priceIds.length === 0) {
             return;
         }
@@ -54,8 +59,8 @@ class SolanaPricePusher {
         try {
             priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
         }
-        catch (e) {
-            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+        catch (err) {
+            this.logger.error(err, "getPriceFeedsUpdateData failed:");
             return;
         }
         const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
@@ -67,11 +72,11 @@ class SolanaPricePusher {
             tightComputeBudget: true,
         });
         try {
-            await (0, solana_utils_1.sendTransactions)(transactions, this.pythSolanaReceiver.connection, this.pythSolanaReceiver.wallet);
-            console.log(new Date(), "updatePriceFeed successful");
+            const signatures = await (0, solana_utils_1.sendTransactions)(transactions, this.pythSolanaReceiver.connection, this.pythSolanaReceiver.wallet);
+            this.logger.info({ signatures }, "updatePriceFeed successful");
         }
-        catch (e) {
-            console.error(new Date(), "updatePriceFeed failed", e);
+        catch (err) {
+            this.logger.error(err, "updatePriceFeed failed");
             return;
         }
     }
@@ -81,25 +86,29 @@ const UPDATES_PER_JITO_BUNDLE = 7;
 class SolanaPricePusherJito {
     pythSolanaReceiver;
     priceServiceConnection;
+    logger;
     shardId;
     jitoTipLamports;
     searcherClient;
     jitoBundleSize;
-    constructor(pythSolanaReceiver, priceServiceConnection, shardId, jitoTipLamports, searcherClient, jitoBundleSize) {
+    constructor(pythSolanaReceiver, priceServiceConnection, logger, shardId, jitoTipLamports, searcherClient, jitoBundleSize) {
         this.pythSolanaReceiver = pythSolanaReceiver;
         this.priceServiceConnection = priceServiceConnection;
+        this.logger = logger;
         this.shardId = shardId;
         this.jitoTipLamports = jitoTipLamports;
         this.searcherClient = searcherClient;
         this.jitoBundleSize = jitoBundleSize;
     }
-    async updatePriceFeed(priceIds, pubTimesToPush) {
+    async updatePriceFeed(priceIds, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _pubTimesToPush) {
         let priceFeedUpdateData;
         try {
             priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
         }
-        catch (e) {
-            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+        catch (err) {
+            this.logger.error(err, "getPriceFeedsUpdateData failed");
             return;
         }
         for (let i = 0; i < priceIds.length; i += UPDATES_PER_JITO_BUNDLE) {

package/lib/sui/command.d.ts

@@ -3,6 +3,9 @@ declare const _default: {
     command: string;
     describe: string;
     builder: {
+        "controller-log-level": Options;
+        "price-service-connection-log-level": Options;
+        "log-level": Options;
         "pushing-frequency": Options;
         "polling-frequency": Options;
         "mnemonic-file": Options;

package/lib/sui/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;oBAiEC,GAAG;;AA7DpC,wBA4IE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;oBAqEC,GAAG;;AAhEpC,wBAoJE"}

package/lib/sui/command.js

@@ -34,6 +34,7 @@ const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const sui_1 = require("./sui");
 const ed25519_1 = require("@mysten/sui.js/keypairs/ed25519");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "sui",
     describe: "Run price pusher for sui. Most of the arguments below are" +
@@ -89,33 +90,30 @@ exports.default = {
         ...options.mnemonicFile,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: async function (argv) {
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythStateId, wormholeStateId, numGasObjects, ignoreGasObjects, gasBudget, accountIndex, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythStateId, wormholeStateId, numGasObjects, ignoreGasObjects, gasBudget, accountIndex, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const logger = (0, pino_1.default)({ level: logLevel });
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
-            logger: {
-                // Log only warnings and errors from the price service client
-                info: () => undefined,
-                warn: console.warn,
-                error: console.error,
-                debug: () => undefined,
-                trace: () => undefined,
-            },
+            logger: logger.child({ module: "PriceServiceConnection" }, { level: priceServiceConnectionLogLevel }),
             priceFeedRequestConfig: {
                 binary: true,
             },
         });
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
         const keypair = ed25519_1.Ed25519Keypair.deriveKeypair(mnemonic, `m/44'/784'/${accountIndex}'/0'/0'`);
-        console.log(`Pushing updates from wallet address: ${keypair
+        logger.info(`Pushing updates from wallet address: ${keypair
             .getPublicKey()
             .toSuiAddress()}`);
         const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
-        const suiListener = new sui_1.SuiPriceListener(pythStateId, wormholeStateId, endpoint, priceItems, { pollingFrequency });
-        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(priceServiceConnection, pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects);
-        const controller = new controller_1.Controller(priceConfigs, pythListener, suiListener, suiPusher, { pushingFrequency });
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        const suiListener = new sui_1.SuiPriceListener(pythStateId, wormholeStateId, endpoint, priceItems, logger.child({ module: "SuiPriceListener" }), { pollingFrequency });
+        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(priceServiceConnection, logger.child({ module: "SuiPricePusher" }), pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects);
+        const controller = new controller_1.Controller(priceConfigs, pythListener, suiListener, suiPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };

package/lib/sui/sui.d.ts

@@ -4,11 +4,13 @@ import { PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
 import { Ed25519Keypair } from "@mysten/sui.js/keypairs/ed25519";
 import { SuiClient, SuiObjectRef } from "@mysten/sui.js/client";
+import { Logger } from "pino";
 type ObjectId = string;
 export declare class SuiPriceListener extends ChainPriceListener {
     private pythClient;
     private provider;
-    constructor(pythStateId: ObjectId, wormholeStateId: ObjectId, endpoint: string, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(pythStateId: ObjectId, wormholeStateId: ObjectId, endpoint: string, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
@@ -30,6 +32,7 @@ export declare class SuiPriceListener extends ChainPriceListener {
 export declare class SuiPricePusher implements IPricePusher {
     private readonly signer;
     private readonly provider;
+    private logger;
     private priceServiceConnection;
     private pythPackageId;
     private pythStateId;
@@ -38,7 +41,7 @@ export declare class SuiPricePusher implements IPricePusher {
     private gasBudget;
     private gasPool;
     private pythClient;
-    constructor(signer: Ed25519Keypair, provider: SuiClient, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
+    constructor(signer: Ed25519Keypair, provider: SuiClient, logger: Logger, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
     /**
      * getPackageId returns the latest package id that the object belongs to. Use this to
      * fetch the latest package id for a given object id and handle package upgrades automatically.
@@ -51,7 +54,7 @@ export declare class SuiPricePusher implements IPricePusher {
      * Create a price pusher with a pool of `numGasObjects` gas coins that will be used to send transactions.
      * The gas coins of the wallet for the provided keypair will be merged and then evenly split into `numGasObjects`.
      */
-    static createWithAutomaticGasPool(priceServiceConnection: PriceServiceConnection, pythStateId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, numGasObjects: number, ignoreGasObjects: string[]): Promise<SuiPricePusher>;
+    static createWithAutomaticGasPool(priceServiceConnection: PriceServiceConnection, logger: Logger, pythStateId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, numGasObjects: number, ignoreGasObjects: string[]): Promise<SuiPricePusher>;
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
     /** Send every transaction in txs in parallel, returning when all transactions have completed. */
     private sendTransactionBlocks;

package/lib/sui/sui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAkB,MAAM,uBAAuB,CAAC;AAOhF,KAAK,QAAQ,GAAG,MAAM,CAAC;AAGvB,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAY;gBAG1B,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ,EACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAWG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA2C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,eAAe;IAGvB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBAXD,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,EAC5B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC;IA8CpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBA2Db,iBAAiB;mBAmDjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAwCnB,oBAAoB;CAkE1C"}
+{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAkB,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAO9B,KAAK,QAAQ,GAAG,MAAM,CAAC;AAGvB,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAY;IAC5B,OAAO,CAAC,MAAM,CAAS;gBAGrB,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ,EACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAYG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,eAAe;IAGvB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBAZD,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,EAC5B,MAAM,EAAE,MAAM,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,cAAc,CAAC;IAgDpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBAyDb,iBAAiB;mBAuDjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAwCnB,oBAAoB;CAiE1C"}