@pythnetwork/price-pusher 6.7.0 → 7.0.0-alpha

package/README.md

@@ -83,14 +83,14 @@ To run the price pusher, please run the following commands, replacing the comman
 
 ```sh
 # Please run the two following commands once from the root of the repo to build the code.
-npm install
-npx lerna run build --scope @pythnetwork/price-pusher --include-dependencies
+pnpm install
+pnpm exec lerna run build --scope @pythnetwork/price-pusher --include-dependencies
 
 # Navigate to the price_pusher folder
 cd apps/price_pusher
 
 # For EVM
-npm run start -- evm --endpoint wss://example-rpc.com \
+pnpm run start evm --endpoint wss://example-rpc.com \
     --pyth-contract-address 0xff1a0f4744e8582DF...... \
     --price-service-endpoint https://example-hermes-rpc.com \
     --price-config-file "path/to/price-config.beta.sample.yaml" \
@@ -100,7 +100,7 @@ npm run start -- evm --endpoint wss://example-rpc.com \
     [--override-gas-price-multiplier 1.1]
 
 # For Injective
-npm run start -- injective --grpc-endpoint https://grpc-endpoint.com \
+pnpm run start injective --grpc-endpoint https://grpc-endpoint.com \
     --pyth-contract-address inj1z60tg0... --price-service-endpoint "https://example-hermes-rpc.com" \
     --price-config-file "path/to/price-config.beta.sample.yaml" \
     --mnemonic-file "path/to/mnemonic.txt" \
@@ -110,7 +110,7 @@ npm run start -- injective --grpc-endpoint https://grpc-endpoint.com \
     [--polling-frequency 5]
 
 # For Aptos
-npm run start -- aptos --endpoint https://fullnode.testnet.aptoslabs.com/v1 \
+pnpm run start aptos --endpoint https://fullnode.testnet.aptoslabs.com/v1 \
     --pyth-contract-address 0x7e783b349d3e89cf5931af376ebeadbfab855b3fa239b7ada8f5a92fbea6b387 \
     --price-service-endpoint "https://example-hermes-rpc.com" \
     --price-config-file "path/to/price-config.beta.sample.yaml" \
@@ -119,7 +119,7 @@ npm run start -- aptos --endpoint https://fullnode.testnet.aptoslabs.com/v1 \
     [--polling-frequency 5]
 
 # For Sui
-npm run start -- sui \
+pnpm run start sui \
   --endpoint https://sui-testnet-rpc.allthatnode.com \
   --pyth-package-id 0x975e063f398f720af4f33ec06a927f14ea76ca24f7f8dd544aa62ab9d5d15f44 \
   --pyth-state-id 0xd8afde3a48b4ff7212bd6829a150f43f59043221200d63504d981f62bff2e27a \
@@ -134,7 +134,7 @@ npm run start -- sui \
   [--num-gas-objects 30]
 
 # For Near
-npm run start -- near \
+pnpm run start near \
   --node-url https://rpc.testnet.near.org \
   --network testnet \
   --account-id payer.testnet \
@@ -146,7 +146,7 @@ npm run start -- near \
   [--polling-frequency 5]
 
 # For Solana, using Jito (recommended)
-npm run start -- solana \
+pnpm run start solana \
   --endpoint https://api.mainnet-beta.solana.com \
   --keypair-file ./id.json \
   --shard-id 1 \
@@ -161,7 +161,7 @@ npm run start -- solana \
   [--polling-frequency 5]
 
 # For Solana, using Solana RPC
-npm run start -- solana \
+pnpm run start solana \
   --endpoint https://api.devnet.solana.com \
   --keypair-file ./id.json \
   --shard-id 1 \
@@ -184,23 +184,35 @@ docker run public.ecr.aws/pyth-network/xc-price-pusher:v<version> -- <above-argu
 To know more about the arguments the price-pusher accepts. You can run:
 
 ```sh
-npm run start -- --help
+pnpm run start --help
 
 # for specific network run
-npm run start -- {network} --help
+pnpm run start {network} --help
 ```
 
+### Logging
+
+By default, the logging is set to `info`. You can change the logging level by passing the argument `--log-level` with the desired level.
+The available levels are `error`, `warn`, `info`, `debug`, and `trace`. Also, the logs have JSON format. If you wish to run the code with
+human-readable logs, you can pipe the output of the program to `pino-pretty`. See the example below for more information on how to do this.
+
+You can configure the log level of some of the modules of the price pusher as well. The available modules are PriceServiceConnection, which
+is responsible for connecting to the Hermes price service, and Controller, which is responsible for checking the prices from the Hermes
+and the on-chain Pyth contract and deciding whether to push a new price. You can configure the log level of these modules by passing the
+`--price-service-connection-log-level` and `--controller-log-level` arguments, respectively.
+
 ### Example
 
 For example, to push `BTC/USD` and `BNB/USD` prices on Fantom testnet, run the following command:
 
 ```sh
-npm run dev -- evm \
+pnpm run dev evm \
   --endpoint https://endpoints.omniatech.io/v1/fantom/testnet/public \
   --pyth-contract-address 0x5744Cbf430D99456a0A8771208b674F27f8EF0Fb \
   --price-service-endpoint https://hermes.pyth.network \
   --mnemonic-file "./mnemonic" \
-  --price-config-file "./price-config.stable.sample.yaml"
+  --price-config-file "./price-config.stable.sample.yaml" \
+  | pnpm exec pino-pretty # Make logs human-readable
 ```
 
 [`price-config.stable.sample.yaml`](./price-config.stable.sample.yaml) contains configuration for `BTC/USD`
@@ -210,7 +222,7 @@ contains the same configuration for `BTC/USD` and `BNB/USD` on Pyth beta data so
 You can also provide a config file instead of providing command line options, run the following command:
 
 ```sh
-npm run start -- injective --config "./config.injective.sample.json"
+pnpm run start injective --config "./config.injective.sample.json"
 ```
 
 [`config.injective.sample.json`](./config.injective.sample.json) contains configuration to publish on Injective testnet.

package/lib/aptos/aptos.d.ts

@@ -1,10 +1,12 @@
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { Logger } from "pino";
 export declare class AptosPriceListener extends ChainPriceListener {
     private pythModule;
     private endpoint;
-    constructor(pythModule: string, endpoint: string, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(pythModule: string, endpoint: string, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
@@ -22,13 +24,14 @@ export declare const APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
  */
 export declare class AptosPricePusher implements IPricePusher {
     private priceServiceConnection;
+    private logger;
     private pythContractAddress;
     private endpoint;
     private mnemonic;
     private overrideGasPriceMultiplier;
     private lastSequenceNumber;
     private sequenceNumberLocked;
-    constructor(priceServiceConnection: PriceServiceConnection, pythContractAddress: string, endpoint: string, mnemonic: string, overrideGasPriceMultiplier: number);
+    constructor(priceServiceConnection: PriceServiceConnection, logger: Logger, pythContractAddress: string, endpoint: string, mnemonic: string, overrideGasPriceMultiplier: number);
     /**
      * Gets price update data which then can be submitted to the Pyth contract to update the prices.
      * This will throw an axios error if there is a network problem or the price service returns a non-ok response (e.g: Invalid price ids)

package/lib/aptos/aptos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;gBADR,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACxB,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;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IATpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAQhE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAiEF,8BAA8B;YAsB9B,wBAAwB;CA+BvC"}
+{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,MAAM;gBAHN,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EACxB,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;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IAVpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAQhE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAkEF,8BAA8B;YAwB9B,wBAAwB;CA+BvC"}

package/lib/aptos/aptos.js

@@ -6,10 +6,12 @@ const aptos_1 = require("aptos");
 class AptosPriceListener extends interface_1.ChainPriceListener {
     pythModule;
     endpoint;
-    constructor(pythModule, endpoint, priceItems, config) {
-        super("aptos", config.pollingFrequency, priceItems);
+    logger;
+    constructor(pythModule, endpoint, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.pythModule = pythModule;
         this.endpoint = endpoint;
+        this.logger = logger;
     }
     async getOnChainPriceInfo(priceId) {
         try {
@@ -27,16 +29,15 @@ class AptosPriceListener extends interface_1.ChainPriceListener {
             });
             const multiplier = priceItemRes.price_feed.price.price.negative === true ? -1 : 1;
             const price = multiplier * Number(priceItemRes.price_feed.price.price.magnitude);
-            console.log(`Polled an Aptos on-chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+            this.logger.debug(`Polled an Aptos on-chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
             return {
                 price: price.toString(),
                 conf: priceItemRes.price_feed.price.conf,
                 publishTime: Number(priceItemRes.price_feed.price.timestamp),
             };
         }
-        catch (e) {
-            console.error(`Polling Aptos on-chain price for ${priceId} failed. Error:`);
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, `Polling Aptos on-chain price for ${priceId} failed.`);
             return undefined;
         }
     }
@@ -56,6 +57,7 @@ exports.APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
  */
 class AptosPricePusher {
     priceServiceConnection;
+    logger;
     pythContractAddress;
     endpoint;
     mnemonic;
@@ -64,8 +66,9 @@ class AptosPricePusher {
     lastSequenceNumber;
     // If true, we are trying to fetch the most recent sequence number from the blockchain.
     sequenceNumberLocked;
-    constructor(priceServiceConnection, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier) {
+    constructor(priceServiceConnection, logger, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier) {
         this.priceServiceConnection = priceServiceConnection;
+        this.logger = logger;
         this.pythContractAddress = pythContractAddress;
         this.endpoint = endpoint;
         this.mnemonic = mnemonic;
@@ -95,9 +98,8 @@ class AptosPricePusher {
             // get the latest VAAs for updatePriceFeed and then push them
             priceFeedUpdateData = await this.getPriceFeedsUpdateData(priceIds);
         }
-        catch (e) {
-            console.error("Error fetching the latest vaas to push");
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, "Error fetching the latest vaas to push.");
             return;
         }
         try {
@@ -113,7 +115,7 @@ class AptosPricePusher {
             });
             const signedTx = await client.signTransaction(account, rawTx);
             const pendingTx = await client.submitTransaction(signedTx);
-            console.log("Successfully broadcasted txHash:", pendingTx.hash);
+            this.logger.debug({ hash: pendingTx.hash }, "Successfully broadcasted tx.");
             // Sometimes broadcasted txs don't make it on-chain and they cause our sequence number
             // to go out of sync. Missing transactions are rare and we don't want this check to block
             // the next price update. So we use spawn a promise without awaiting on it to wait for the
@@ -121,9 +123,8 @@ class AptosPricePusher {
             this.waitForTransactionConfirmation(client, pendingTx.hash);
             return;
         }
-        catch (e) {
-            console.error("Error executing messages");
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, "Error executing messages");
             // Reset the sequence number to re-sync it (in case that was the issue)
             this.lastSequenceNumber = undefined;
             return;
@@ -136,11 +137,10 @@ class AptosPricePusher {
                 checkSuccess: true,
                 timeoutSecs: 10,
             });
-            console.log(`Transaction with txHash "${txHash}" confirmed.`);
+            this.logger.info({ hash: txHash }, `Transaction confirmed.`);
         }
-        catch (e) {
-            console.error(`Transaction with txHash "${txHash}" failed to confirm.`);
-            console.error(e);
+        catch (err) {
+            this.logger.error({ err, hash: txHash }, `Transaction failed to confirm.`);
             this.lastSequenceNumber = undefined;
         }
     }
@@ -160,7 +160,7 @@ class AptosPricePusher {
                 try {
                     this.sequenceNumberLocked = true;
                     this.lastSequenceNumber = Number((await client.getAccount(account.address())).sequence_number);
-                    console.log(`Fetched account sequence number: ${this.lastSequenceNumber}`);
+                    this.logger.debug(`Fetched account sequence number: ${this.lastSequenceNumber}`);
                     return this.lastSequenceNumber;
                 }
                 catch (e) {

package/lib/aptos/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;
         "pyth-contract-address": Options;

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;oBAkCL,GAAG;;AA1B9B,wBA2FE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;oBAsCL,GAAG;;AA7B9B,wBAqGE"}

package/lib/aptos/command.js

@@ -34,6 +34,7 @@ const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const aptos_1 = require("./aptos");
 const aptos_2 = require("aptos");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "aptos",
     describe: "run price pusher for aptos",
@@ -57,29 +58,26 @@ exports.default = {
         ...options.pythContractAddress,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: function (argv) {
         // FIXME: type checks for this
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, overrideGasPriceMultiplier, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, overrideGasPriceMultiplier, 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 mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
         const account = aptos_2.AptosAccount.fromDerivePath(aptos_1.APTOS_ACCOUNT_HD_PATH, mnemonic);
-        console.log(`Pushing from account address: ${account.address()}`);
+        logger.info(`Pushing from account address: ${account.address()}`);
         const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
-        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
-        const aptosListener = new aptos_1.AptosPriceListener(pythContractAddress, endpoint, priceItems, { pollingFrequency });
-        const aptosPusher = new aptos_1.AptosPricePusher(priceServiceConnection, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier);
-        const controller = new controller_1.Controller(priceConfigs, pythListener, aptosListener, aptosPusher, { pushingFrequency });
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        const aptosListener = new aptos_1.AptosPriceListener(pythContractAddress, endpoint, priceItems, logger.child({ module: "AptosPriceListener" }), { pollingFrequency });
+        const aptosPusher = new aptos_1.AptosPricePusher(priceServiceConnection, logger.child({ module: "AptosPricePusher" }), pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier);
+        const controller = new controller_1.Controller(priceConfigs, pythListener, aptosListener, aptosPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };

package/lib/controller.d.ts

@@ -1,13 +1,15 @@
 import { DurationInSeconds } from "./utils";
 import { IPriceListener, IPricePusher } from "./interface";
 import { PriceConfig } from "./price-config";
+import { Logger } from "pino";
 export declare class Controller {
     private priceConfigs;
     private sourcePriceListener;
     private targetPriceListener;
     private targetChainPricePusher;
+    private logger;
     private pushingFrequency;
-    constructor(priceConfigs: PriceConfig[], sourcePriceListener: IPriceListener, targetPriceListener: IPriceListener, targetChainPricePusher: IPricePusher, config: {
+    constructor(priceConfigs: PriceConfig[], sourcePriceListener: IPriceListener, targetPriceListener: IPriceListener, targetChainPricePusher: IPricePusher, logger: Logger, config: {
         pushingFrequency: DurationInSeconds;
     });
     start(): Promise<void>;

package/lib/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAS,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAE5E,qBAAa,UAAU;IAGnB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,sBAAsB;IALhC,OAAO,CAAC,gBAAgB,CAAoB;gBAElC,YAAY,EAAE,WAAW,EAAE,EAC3B,mBAAmB,EAAE,cAAc,EACnC,mBAAmB,EAAE,cAAc,EACnC,sBAAsB,EAAE,YAAY,EAC5C,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,KAAK;CA2DZ"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAS,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAiC,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,UAAU;IAGnB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,gBAAgB,CAAoB;gBAElC,YAAY,EAAE,WAAW,EAAE,EAC3B,mBAAmB,EAAE,cAAc,EACnC,mBAAmB,EAAE,cAAc,EACnC,sBAAsB,EAAE,YAAY,EACpC,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,KAAK;CAgEZ"}

package/lib/controller.js

@@ -8,12 +8,14 @@ class Controller {
     sourcePriceListener;
     targetPriceListener;
     targetChainPricePusher;
+    logger;
     pushingFrequency;
-    constructor(priceConfigs, sourcePriceListener, targetPriceListener, targetChainPricePusher, config) {
+    constructor(priceConfigs, sourcePriceListener, targetPriceListener, targetChainPricePusher, logger, config) {
         this.priceConfigs = priceConfigs;
         this.sourcePriceListener = sourcePriceListener;
         this.targetPriceListener = targetPriceListener;
         this.targetChainPricePusher = targetChainPricePusher;
+        this.logger = logger;
         this.pushingFrequency = config.pushingFrequency;
     }
     async start() {
@@ -34,7 +36,7 @@ class Controller {
                 const priceId = priceConfig.id;
                 const targetLatestPrice = this.targetPriceListener.getLatestPriceInfo(priceId);
                 const sourceLatestPrice = this.sourcePriceListener.getLatestPriceInfo(priceId);
-                const priceShouldUpdate = (0, price_config_1.shouldUpdate)(priceConfig, sourceLatestPrice, targetLatestPrice);
+                const priceShouldUpdate = (0, price_config_1.shouldUpdate)(priceConfig, sourceLatestPrice, targetLatestPrice, this.logger);
                 if (priceShouldUpdate == price_config_1.UpdateCondition.YES) {
                     pushThresholdMet = true;
                 }
@@ -45,13 +47,18 @@ class Controller {
                 }
             }
             if (pushThresholdMet) {
-                console.log("Some of the above values passed the threshold. Will push the price.");
+                this.logger.info({
+                    priceIds: pricesToPush.map((priceConfig) => ({
+                        id: priceConfig.id,
+                        alias: priceConfig.alias,
+                    })),
+                }, "Some of the checks triggered pushing update. Will push the updates for some feeds.");
                 // note that the priceIds are without leading "0x"
                 const priceIds = pricesToPush.map((priceConfig) => priceConfig.id);
                 this.targetChainPricePusher.updatePriceFeed(priceIds, pubTimesToPush);
             }
             else {
-                console.log("None of the above values passed the threshold. No push needed.");
+                this.logger.info("None of the checks were triggered. No push needed.");
             }
             await (0, utils_1.sleep)(this.pushingFrequency * 1000);
         }

package/lib/evm/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;
         "pyth-contract-address": Options;

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;oBAqEL,GAAG;;AAjE9B,wBA8IE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;oBA6EL,GAAG;;AApE9B,wBA+JE"}

package/lib/evm/command.js

@@ -27,13 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const price_service_client_1 = require("@pythnetwork/price-service-client");
+const fs_1 = __importDefault(require("fs"));
 const options = __importStar(require("../options"));
 const price_config_1 = require("../price-config");
-const fs_1 = __importDefault(require("fs"));
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const evm_1 = require("./evm");
 const custom_gas_station_1 = require("./custom-gas-station");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "evm",
     describe: "run price pusher for evm",
@@ -92,34 +93,31 @@ exports.default = {
         ...options.pythContractAddress,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: function (argv) {
         // FIXME: type checks for this
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, gasLimit, updateFeeMultiplier, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, gasLimit, updateFeeMultiplier, 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 mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
         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 pythContractFactory = new evm_1.PythContractFactory(endpoint, mnemonic, pythContractAddress);
-        console.log(`Pushing updates from wallet address: ${pythContractFactory
+        logger.info(`Pushing updates from wallet address: ${pythContractFactory
             .createWeb3PayerProvider()
             .getAddress()}`);
-        const evmListener = new evm_1.EvmPriceListener(pythContractFactory, priceItems, {
+        const evmListener = new evm_1.EvmPriceListener(pythContractFactory, priceItems, logger.child({ module: "EvmPriceListener" }), {
             pollingFrequency,
         });
-        const gasStation = (0, custom_gas_station_1.getCustomGasStation)(customGasStation, txSpeed);
-        const evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, pythContractFactory, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, gasStation);
-        const controller = new controller_1.Controller(priceConfigs, pythListener, evmListener, evmPusher, { pushingFrequency });
+        const gasStation = (0, custom_gas_station_1.getCustomGasStation)(logger.child({ module: "CustomGasStation" }), customGasStation, txSpeed);
+        const evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, pythContractFactory, logger.child({ module: "EvmPricePusher" }), overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, gasStation);
+        const controller = new controller_1.Controller(priceConfigs, pythListener, evmListener, evmPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };

package/lib/evm/custom-gas-station.d.ts

@@ -1,10 +1,12 @@
+import { Logger } from "pino";
 export declare class CustomGasStation {
     private chain;
     private speed;
     private chainMethods;
-    constructor(chain: number, speed: string);
+    private logger;
+    constructor(logger: Logger, chain: number, speed: string);
     getCustomGasPrice(): Promise<string | undefined>;
     private fetchMaticMainnetGasPrice;
 }
-export declare function getCustomGasStation(customGasStation?: number, txSpeed?: string): CustomGasStation | undefined;
+export declare function getCustomGasStation(logger: Logger, customGasStation?: number, txSpeed?: string): CustomGasStation | undefined;
 //# sourceMappingURL=custom-gas-station.d.ts.map

package/lib/evm/custom-gas-station.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom-gas-station.d.ts","sourceRoot":"","sources":["../../src/evm/custom-gas-station.ts"],"names":[],"mappings":"AAWA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,YAAY,CAElB;gBACU,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKlC,iBAAiB;YAIT,yBAAyB;CAexC;AAED,wBAAgB,mBAAmB,CACjC,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,MAAM,gCAKjB"}
+{"version":3,"file":"custom-gas-station.d.ts","sourceRoot":"","sources":["../../src/evm/custom-gas-station.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,YAAY,CAElB;IACF,OAAO,CAAC,MAAM,CAAS;gBACX,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAMlD,iBAAiB;YAIT,yBAAyB;CAexC;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,MAAM,gCAKjB"}

package/lib/evm/custom-gas-station.js

@@ -12,7 +12,9 @@ class CustomGasStation {
     chainMethods = {
         137: this.fetchMaticMainnetGasPrice.bind(this),
     };
-    constructor(chain, speed) {
+    logger;
+    constructor(logger, chain, speed) {
+        this.logger = logger;
         this.speed = (0, utils_1.verifyValidOption)(speed, utils_1.txSpeeds);
         this.chain = (0, utils_1.verifyValidOption)(chain, utils_1.customGasChainIds);
     }
@@ -27,17 +29,16 @@ class CustomGasStation {
             const gweiGasPrice = web3_1.default.utils.toWei(gasPrice.toFixed(2), "Gwei");
             return gweiGasPrice.toString();
         }
-        catch (e) {
-            console.error("Failed to fetch gas price from Matic mainnet. Returning undefined");
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, "Failed to fetch gas price from Matic mainnet. Returning undefined");
             return undefined;
         }
     }
 }
 exports.CustomGasStation = CustomGasStation;
-function getCustomGasStation(customGasStation, txSpeed) {
+function getCustomGasStation(logger, customGasStation, txSpeed) {
     if (customGasStation && txSpeed) {
-        return new CustomGasStation(customGasStation, txSpeed);
+        return new CustomGasStation(logger, customGasStation, txSpeed);
     }
 }
 exports.getCustomGasStation = getCustomGasStation;

package/lib/evm/evm.d.ts

@@ -2,12 +2,15 @@ import { Contract } from "web3-eth-contract";
 import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import HDWalletProvider from "@truffle/hdwallet-provider";
+import { HttpProvider, WebsocketProvider } from "web3-core";
+import { Logger } from "pino";
 import { PriceServiceConnection, HexString, UnixTimestamp } from "@pythnetwork/price-service-client";
 import { CustomGasStation } from "./custom-gas-station";
 export declare class EvmPriceListener extends ChainPriceListener {
     private pythContractFactory;
     private pythContract;
-    constructor(pythContractFactory: PythContractFactory, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(pythContractFactory: PythContractFactory, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     start(): Promise<void>;
@@ -17,6 +20,7 @@ export declare class EvmPriceListener extends ChainPriceListener {
 }
 export declare class EvmPricePusher implements IPricePusher {
     private connection;
+    private logger;
     private overrideGasPriceMultiplier;
     private overrideGasPriceMultiplierCap;
     private updateFeeMultiplier;
@@ -26,7 +30,7 @@ export declare class EvmPricePusher implements IPricePusher {
     private web3;
     private pusherAddress;
     private lastPushAttempt;
-    constructor(connection: PriceServiceConnection, pythContractFactory: PythContractFactory, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation);
+    constructor(connection: PriceServiceConnection, pythContractFactory: PythContractFactory, logger: Logger, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation);
     updatePriceFeed(priceIds: string[], pubTimesToPush: UnixTimestamp[]): Promise<void>;
     private getPriceFeedsUpdateData;
 }
@@ -51,7 +55,7 @@ export declare class PythContractFactory {
      */
     createPythContract(): Contract;
     hasWebsocketProvider(): boolean;
-    createWeb3Provider(): import("web3-core").HttpProvider | import("web3-core").WebsocketProvider;
+    createWeb3Provider(): HttpProvider | WebsocketProvider;
     createWeb3PayerProvider(): HDWalletProvider;
 }
 //# sourceMappingURL=evm.d.ts.map

package/lib/evm/evm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/evm/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAgB,iBAAiB,EAAmB,MAAM,UAAU,CAAC;AAE5E,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EACL,sBAAsB,EACtB,SAAS,EACT,aAAa,EACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,YAAY,CAAW;gBAG7B,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,KAAK;YAeG,iBAAiB;IAc/B,OAAO,CAAC,iBAAiB;IAsBnB,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAwBlC;AAED,qBAAa,cAAe,YAAW,YAAY;IAQ/C,OAAO,CAAC,UAAU;IAElB,OAAO,CAAC,0BAA0B;IAClC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ,CAAC;IAZnB,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,YAAY,CAAW;IAC/B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,eAAe,CAA0B;gBAGvC,UAAU,EAAE,sBAAsB,EAC1C,mBAAmB,EAAE,mBAAmB,EAChC,0BAA0B,EAAE,MAAM,EAClC,6BAA6B,EAAE,MAAM,EACrC,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,CAAC,oBAAQ,EACzB,gBAAgB,CAAC,EAAE,gBAAgB;IAa/B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC;YAuJF,uBAAuB;CAQtC;AAED,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;gBAFnB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM;IAGrC;;;;;;OAMG;IACH,2BAA2B,IAAI,QAAQ;IAcvC;;;;;OAKG;IACH,kBAAkB,IAAI,QAAQ;IAS9B,oBAAoB,IAAI,OAAO;IAI/B,kBAAkB;IA0BlB,uBAAuB;CAQxB"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/evm/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,mBAAmB,CAAC;AACxD,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAgB,iBAAiB,EAAmB,MAAM,UAAU,CAAC;AAE5E,OAAO,gBAAgB,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EACL,sBAAsB,EACtB,SAAS,EACT,aAAa,EACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,YAAY,CAAW;IAC/B,OAAO,CAAC,MAAM,CAAS;gBAGrB,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAWG,KAAK;YAiBG,iBAAiB;IAc/B,OAAO,CAAC,iBAAiB;IAyBnB,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAuBlC;AAED,qBAAa,cAAe,YAAW,YAAY;IAQ/C,OAAO,CAAC,UAAU;IAElB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,0BAA0B;IAClC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ,CAAC;IAbnB,OAAO,CAAC,gBAAgB,CAAC,CAAmB;IAC5C,OAAO,CAAC,YAAY,CAAW;IAC/B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,eAAe,CAA0B;gBAGvC,UAAU,EAAE,sBAAsB,EAC1C,mBAAmB,EAAE,mBAAmB,EAChC,MAAM,EAAE,MAAM,EACd,0BAA0B,EAAE,MAAM,EAClC,6BAA6B,EAAE,MAAM,EACrC,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,CAAC,oBAAQ,EACzB,gBAAgB,CAAC,EAAE,gBAAgB;IAa/B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC;YAgKF,uBAAuB;CAQtC;AAED,qBAAa,mBAAmB;IAE5B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;gBAFnB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM;IAGrC;;;;;;OAMG;IACH,2BAA2B,IAAI,QAAQ;IAcvC;;;;;OAKG;IACH,kBAAkB,IAAI,QAAQ;IAS9B,oBAAoB,IAAI,OAAO;IAI/B,kBAAkB,IAAI,YAAY,GAAG,iBAAiB;IA0BtD,uBAAuB;CAQxB"}