@pythnetwork/price-pusher 6.8.0 → 7.0.0

package/lib/evm/evm.js

@@ -13,20 +13,22 @@ const utils_2 = require("../utils");
 class EvmPriceListener extends interface_1.ChainPriceListener {
     pythContractFactory;
     pythContract;
-    constructor(pythContractFactory, priceItems, config) {
-        super("Evm", config.pollingFrequency, priceItems);
+    logger;
+    constructor(pythContractFactory, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.pythContractFactory = pythContractFactory;
         this.pythContract = this.pythContractFactory.createPythContract();
+        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).
     async start() {
         if (this.pythContractFactory.hasWebsocketProvider()) {
-            console.log("Subscribing to the target network pyth contract events...");
+            this.logger.info("Subscribing to the target network pyth contract events...");
             this.startSubscription();
         }
         else {
-            console.log("The target network RPC endpoint is not Websocket. " +
+            this.logger.info("The target network RPC endpoint is not Websocket. " +
                 "Listening for updates only via polling....");
         }
         // base class for polling
@@ -44,11 +46,11 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
     }
     onPriceFeedUpdate(err, event) {
         if (err !== null) {
-            console.error("PriceFeedUpdate EventEmitter received an error..");
+            this.logger.error(err, "PriceFeedUpdate EventEmitter received an error..");
             throw err;
         }
         const priceId = (0, utils_1.removeLeading0x)(event.returnValues.id);
-        console.log(`Received a new Evm PriceFeedUpdate event for price feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+        this.logger.debug(`Received a new Evm PriceFeedUpdate event for price feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
         const priceInfo = {
             conf: event.returnValues.conf,
             price: event.returnValues.price,
@@ -63,12 +65,11 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
                 .getPriceUnsafe((0, utils_1.addLeading0x)(priceId))
                 .call();
         }
-        catch (e) {
-            console.error(`Polling on-chain price for ${priceId} failed. Error:`);
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, `Polling on-chain price for ${priceId} failed.`);
             return undefined;
         }
-        console.log(`Polled an EVM on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+        this.logger.debug(`Polled an EVM on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
         return {
             conf: priceRaw.conf,
             price: priceRaw.price,
@@ -79,6 +80,7 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
 exports.EvmPriceListener = EvmPriceListener;
 class EvmPricePusher {
     connection;
+    logger;
     overrideGasPriceMultiplier;
     overrideGasPriceMultiplierCap;
     updateFeeMultiplier;
@@ -88,8 +90,9 @@ class EvmPricePusher {
     web3;
     pusherAddress;
     lastPushAttempt;
-    constructor(connection, pythContractFactory, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
+    constructor(connection, pythContractFactory, logger, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
         this.connection = connection;
+        this.logger = logger;
         this.overrideGasPriceMultiplier = overrideGasPriceMultiplier;
         this.overrideGasPriceMultiplierCap = overrideGasPriceMultiplierCap;
         this.updateFeeMultiplier = updateFeeMultiplier;
@@ -112,17 +115,16 @@ class EvmPricePusher {
             throw new Error("Invalid arguments");
         const priceIdsWith0x = priceIds.map((priceId) => (0, utils_1.addLeading0x)(priceId));
         const priceFeedUpdateData = await this.getPriceFeedsUpdateData(priceIdsWith0x);
-        console.log("Pushing ", priceIdsWith0x);
         let updateFee;
         try {
             updateFee = await this.pythContract.methods
                 .getUpdateFee(priceFeedUpdateData)
                 .call();
             updateFee = Number(updateFee) * (this.updateFeeMultiplier || 1);
-            console.log(`Update fee: ${updateFee}`);
+            this.logger.debug(`Update fee: ${updateFee}`);
         }
         catch (e) {
-            console.error("An unidentified error has occured when getting the update fee:");
+            this.logger.error(e, "An unidentified error has occured when getting the update fee.");
             throw e;
         }
         let gasPrice = Number((await this.customGasStation?.getCustomGasPrice()) ||
@@ -145,7 +147,7 @@ class EvmPricePusher {
             gasPrice = Math.min(gasPriceToOverride, gasPrice * this.overrideGasPriceMultiplierCap);
         }
         const txNonce = lastExecutedNonce + 1;
-        console.log(`Using gas price: ${gasPrice} and nonce: ${txNonce}`);
+        this.logger.debug(`Using gas price: ${gasPrice} and nonce: ${txNonce}`);
         this.pythContract.methods
             .updatePriceFeedsIfNecessary(priceFeedUpdateData, priceIdsWith0x, pubTimesToPush)
             .send({
@@ -155,7 +157,7 @@ class EvmPricePusher {
             gasLimit: this.gasLimit,
         })
             .on("transactionHash", (hash) => {
-            console.log(`Successful. Tx hash: ${hash}`);
+            this.logger.info({ hash }, "Price update successful");
         })
             .on("error", (err, receipt) => {
             if (err.message.includes("revert")) {
@@ -163,14 +165,14 @@ class EvmPricePusher {
                 // doesn't return any information why the call has reverted. Assuming that
                 // the update data is valid there is no possible rejection cause other than
                 // the target chain price being already updated.
-                console.log("Execution reverted. With high probability, the target chain price " +
+                this.logger.info({ err, receipt }, "Execution reverted. With high probability, the target chain price " +
                     "has already updated, Skipping this push.");
                 return;
             }
             if (err.message.includes("the tx doesn't have the correct nonce.") ||
                 err.message.includes("nonce too low") ||
                 err.message.includes("invalid nonce")) {
-                console.log("The nonce is incorrect (are multiple users using this account?). Skipping this push.");
+                this.logger.info({ err, receipt }, "The nonce is incorrect (are multiple users using this account?). Skipping this push.");
                 return;
             }
             if (err.message.includes("max fee per gas less than block base fee")) {
@@ -178,25 +180,24 @@ class EvmPricePusher {
                 // LastPushAttempt was stored with the class
                 // Next time the update will be executing, it will check the last attempt
                 // and increase the gas price accordingly.
-                console.log("The transaction failed with error: max fee per gas less than block base fee ");
+                this.logger.info({ err, receipt }, "The transaction failed with error: max fee per gas less than block base fee ");
                 return;
             }
             if (err.message.includes("sender doesn't have enough funds to send tx.")) {
-                console.error("Payer is out of balance, please top it up.");
+                this.logger.error({ err, receipt }, "Payer is out of balance, please top it up.");
                 throw err;
             }
             if (err.message.includes("transaction underpriced")) {
-                console.error("The gas price of the transaction is too low. Skipping this push. " +
+                this.logger.error({ err, receipt }, "The gas price of the transaction is too low. Skipping this push. " +
                     "You might want to use a custom gas station or increase the override gas price " +
                     "multiplier to increase the likelihood of the transaction landing on-chain.");
                 return;
             }
             if (err.message.includes("could not replace existing tx")) {
-                console.log("A transaction with the same nonce has been mined and this one is no longer needed.");
+                this.logger.error({ err, receipt }, "A transaction with the same nonce has been mined and this one is no longer needed.");
                 return;
             }
-            console.error("An unidentified error has occured:");
-            console.error(receipt);
+            this.logger.error({ err, receipt }, "An unidentified error has occured.");
             throw err;
         });
         // Update lastAttempt

package/lib/injective/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/injective/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/injective/command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;oBA+BL,GAAG;;AA5B9B,wBAkGE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/injective/command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;oBAmCL,GAAG;;AA/B9B,wBA0GE"}

package/lib/injective/command.js

@@ -34,6 +34,7 @@ const injective_1 = require("./injective");
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const networks_1 = require("@injectivelabs/networks");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "injective",
     describe: "run price pusher for injective",
@@ -60,35 +61,32 @@ exports.default = {
         ...options.pythContractAddress,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: function (argv) {
         // FIXME: type checks for this
-        const { gasPrice, grpcEndpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, network, } = argv;
+        const { gasPrice, grpcEndpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, network, logLevel, priceServiceConnectionLogLevel, controllerLogLevel, } = argv;
+        const logger = (0, pino_1.default)({ level: logLevel });
         if (network !== "testnet" && network !== "mainnet") {
             throw new Error("Please specify network. One of [testnet, mainnet]");
         }
         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 injectiveListener = new injective_1.InjectivePriceListener(pythContractAddress, grpcEndpoint, priceItems, {
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems, logger.child({ module: "PythPriceListener" }));
+        const injectiveListener = new injective_1.InjectivePriceListener(pythContractAddress, grpcEndpoint, priceItems, logger.child({ module: "InjectivePriceListener" }), {
             pollingFrequency,
         });
-        const injectivePusher = new injective_1.InjectivePricePusher(priceServiceConnection, pythContractAddress, grpcEndpoint, mnemonic, {
+        const injectivePusher = new injective_1.InjectivePricePusher(priceServiceConnection, pythContractAddress, grpcEndpoint, logger.child({ module: "InjectivePricePusher" }), mnemonic, {
             chainId: (0, networks_1.getNetworkInfo)(network).chainId,
             gasPrice,
         });
-        const controller = new controller_1.Controller(priceConfigs, pythListener, injectiveListener, injectivePusher, { pushingFrequency });
+        const controller = new controller_1.Controller(priceConfigs, pythListener, injectiveListener, injectivePusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };

package/lib/injective/injective.d.ts

@@ -1,10 +1,12 @@
 import { HexString, PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
+import { Logger } from "pino";
 export declare class InjectivePriceListener extends ChainPriceListener {
     private pythContractAddress;
     private grpcEndpoint;
-    constructor(pythContractAddress: string, grpcEndpoint: string, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(pythContractAddress: string, grpcEndpoint: string, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: HexString): Promise<PriceInfo | undefined>;
@@ -18,10 +20,11 @@ export declare class InjectivePricePusher implements IPricePusher {
     private priceServiceConnection;
     private pythContractAddress;
     private grpcEndpoint;
+    private logger;
     private wallet;
     private chainConfig;
     private account;
-    constructor(priceServiceConnection: PriceServiceConnection, pythContractAddress: string, grpcEndpoint: string, mnemonic: string, chainConfig?: Partial<InjectiveConfig>);
+    constructor(priceServiceConnection: PriceServiceConnection, pythContractAddress: string, grpcEndpoint: string, logger: Logger, mnemonic: string, chainConfig?: Partial<InjectiveConfig>);
     private injectiveAddress;
     private signAndBroadcastMsg;
     getPriceFeedUpdateObject(priceIds: string[]): Promise<any>;

package/lib/injective/injective.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injective.d.ts","sourceRoot":"","sources":["../../src/injective/injective.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAiC7C,qBAAa,sBAAuB,SAAQ,kBAAkB;IAE1D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;gBADZ,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EAC5B,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA6BlC;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,qBAAa,oBAAqB,YAAW,YAAY;IAMrD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IAPtB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,OAAO,CAAwB;gBAG7B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EAC5B,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAWxC,OAAO,CAAC,gBAAgB;YAIV,mBAAmB;IAkE3B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAU1D,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAmEjB"}
+{"version":3,"file":"injective.d.ts","sourceRoot":"","sources":["../../src/injective/injective.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,sBAAsB,EACvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAW7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAuB9B,qBAAa,sBAAuB,SAAQ,kBAAkB;IAE1D,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,MAAM;gBAHN,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EAC5B,UAAU,EAAE,SAAS,EAAE,EACf,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA4BlC;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,qBAAa,oBAAqB,YAAW,YAAY;IAMrD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,OAAO,CAAwB;gBAG7B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAWxC,OAAO,CAAC,gBAAgB;YAIV,mBAAmB;IAkE3B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAU1D,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAiEjB"}

package/lib/injective/injective.js

@@ -8,10 +8,12 @@ const DEFAULT_GAS_PRICE = 500000000;
 class InjectivePriceListener extends interface_1.ChainPriceListener {
     pythContractAddress;
     grpcEndpoint;
-    constructor(pythContractAddress, grpcEndpoint, priceItems, config) {
-        super("Injective", config.pollingFrequency, priceItems);
+    logger;
+    constructor(pythContractAddress, grpcEndpoint, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.pythContractAddress = pythContractAddress;
         this.grpcEndpoint = grpcEndpoint;
+        this.logger = logger;
     }
     async getOnChainPriceInfo(priceId) {
         let priceQueryResponse;
@@ -21,12 +23,11 @@ class InjectivePriceListener extends interface_1.ChainPriceListener {
             const json = Buffer.from(data).toString();
             priceQueryResponse = JSON.parse(json);
         }
-        catch (e) {
-            console.error(`Polling on-chain price for ${priceId} failed. Error:`);
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, `Polling on-chain price for ${priceId} failed.`);
             return undefined;
         }
-        console.log(`Polled an Injective on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+        this.logger.debug(`Polled an Injective on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
         return {
             conf: priceQueryResponse.price_feed.price.conf,
             price: priceQueryResponse.price_feed.price.price,
@@ -39,13 +40,15 @@ class InjectivePricePusher {
     priceServiceConnection;
     pythContractAddress;
     grpcEndpoint;
+    logger;
     wallet;
     chainConfig;
     account = null;
-    constructor(priceServiceConnection, pythContractAddress, grpcEndpoint, mnemonic, chainConfig) {
+    constructor(priceServiceConnection, pythContractAddress, grpcEndpoint, logger, mnemonic, chainConfig) {
         this.priceServiceConnection = priceServiceConnection;
         this.pythContractAddress = pythContractAddress;
         this.grpcEndpoint = grpcEndpoint;
+        this.logger = logger;
         this.wallet = sdk_ts_1.PrivateKey.fromMnemonic(mnemonic);
         this.chainConfig = {
             chainId: chainConfig?.chainId ?? "injective-888",
@@ -129,9 +132,8 @@ class InjectivePricePusher {
             // get the latest VAAs for updatePriceFeed and then push them
             priceFeedUpdateObject = await this.getPriceFeedUpdateObject(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;
         }
         let updateFeeQueryResponse;
@@ -145,10 +147,10 @@ class InjectivePricePusher {
             const json = Buffer.from(data).toString();
             updateFeeQueryResponse = JSON.parse(json);
         }
-        catch (e) {
-            console.error("Error fetching update fee");
-            console.error(e);
-            return;
+        catch (err) {
+            this.logger.error(err, "Error fetching update fee");
+            // Throwing an error because it is likely an RPC issue
+            throw err;
         }
         try {
             const executeMsg = sdk_ts_1.MsgExecuteContract.fromJSON({
@@ -158,20 +160,19 @@ class InjectivePricePusher {
                 funds: [updateFeeQueryResponse],
             });
             const rs = await this.signAndBroadcastMsg(executeMsg);
-            console.log("Succesfully broadcasted txHash:", rs.txHash);
+            this.logger.info({ hash: rs.txHash }, "Succesfully broadcasted txHash");
         }
-        catch (e) {
-            if (e.message.match(/account inj[a-zA-Z0-9]+ not found/) !== null) {
-                console.error(e);
+        catch (err) {
+            if (err.message.match(/account inj[a-zA-Z0-9]+ not found/) !== null) {
+                this.logger.error(err, "Account not found");
                 throw new Error("Please check the mnemonic");
             }
-            if (e.message.match(/insufficient/) !== null &&
-                e.message.match(/funds/) !== null) {
-                console.error(e);
+            if (err.message.match(/insufficient/) !== null &&
+                err.message.match(/funds/) !== null) {
+                this.logger.error(err, "Insufficient funds");
                 throw new Error("Insufficient funds");
             }
-            console.error("Error executing messages");
-            console.log(e);
+            this.logger.error(err, "Error executing messages");
         }
     }
 }

package/lib/interface.d.ts

@@ -14,12 +14,11 @@ export interface IPriceListener {
     getLatestPriceInfo(priceId: string): PriceInfo | undefined;
 }
 export declare abstract class ChainPriceListener implements IPriceListener {
-    private chain;
     private pollingFrequency;
     protected priceItems: PriceItem[];
     private latestPriceInfo;
     protected priceIdToAlias: Map<HexString, string>;
-    constructor(chain: string, pollingFrequency: DurationInSeconds, priceItems: PriceItem[]);
+    constructor(pollingFrequency: DurationInSeconds, priceItems: PriceItem[]);
     start(): Promise<void>;
     private pollPrices;
     protected updateLatestPriceInfo(priceId: HexString, observedPrice: PriceInfo): void;

package/lib/interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5D;AAED,8BAAsB,kBAAmB,YAAW,cAAc;IAK9D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE;IANnC,OAAO,CAAC,eAAe,CAA4B;IACnD,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAGvC,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,iBAAiB,EACjC,UAAU,EAAE,SAAS,EAAE;IAQ7B,KAAK;YASG,UAAU;IASxB,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,SAAS;IAkB1B,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI1D,QAAQ,CAAC,mBAAmB,CAC1B,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,eAAe,CACb,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}
+{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,aAAa,CAAC;CAC5B,CAAC;AAEF,MAAM,WAAW,cAAc;IAE7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5D;AAED,8BAAsB,kBAAmB,YAAW,cAAc;IAK9D,OAAO,CAAC,gBAAgB;IACxB,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE;IALnC,OAAO,CAAC,eAAe,CAA4B;IACnD,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAGvC,gBAAgB,EAAE,iBAAiB,EACjC,UAAU,EAAE,SAAS,EAAE;IAQ7B,KAAK;YAMG,UAAU;IASxB,SAAS,CAAC,qBAAqB,CAC7B,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,SAAS;IAkB1B,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI1D,QAAQ,CAAC,mBAAmB,CAC1B,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IAC3B,eAAe,CACb,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB"}

package/lib/interface.js

@@ -2,20 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChainPriceListener = void 0;
 class ChainPriceListener {
-    chain;
     pollingFrequency;
     priceItems;
     latestPriceInfo;
     priceIdToAlias;
-    constructor(chain, pollingFrequency, priceItems) {
-        this.chain = chain;
+    constructor(pollingFrequency, priceItems) {
         this.pollingFrequency = pollingFrequency;
         this.priceItems = priceItems;
         this.latestPriceInfo = new Map();
         this.priceIdToAlias = new Map(priceItems.map(({ id, alias }) => [id, alias]));
     }
     async start() {
-        console.log(`Polling the prices on ${this.chain} every ${this.pollingFrequency} seconds...`);
         setInterval(this.pollPrices.bind(this), this.pollingFrequency * 1000);
         await this.pollPrices();
     }

package/lib/near/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/near/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/near/command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;oBAkCL,GAAG;;AA/B9B,wBA2FE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/near/command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;oBAsCL,GAAG;;AAlC9B,wBA0GE"}

package/lib/near/command.js

@@ -22,6 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const price_service_client_1 = require("@pythnetwork/price-service-client");
 const options = __importStar(require("../options"));
@@ -29,6 +32,7 @@ const price_config_1 = require("../price-config");
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const near_1 = require("./near");
+const pino_1 = __importDefault(require("pino"));
 exports.default = {
     command: "near",
     describe: "run price pusher for near",
@@ -58,29 +62,26 @@ exports.default = {
         ...options.pythContractAddress,
         ...options.pollingFrequency,
         ...options.pushingFrequency,
+        ...options.logLevel,
+        ...options.priceServiceConnectionLogLevel,
+        ...options.controllerLogLevel,
     },
     handler: function (argv) {
         // FIXME: type checks for this
-        const { nodeUrl, network, accountId, privateKeyPath, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, } = argv;
+        const { nodeUrl, network, accountId, privateKeyPath, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, 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);
         const nearAccount = new near_1.NearAccount(network, accountId, nodeUrl, privateKeyPath, pythContractAddress);
-        const nearListener = new near_1.NearPriceListener(nearAccount, priceItems, {
+        const nearListener = new near_1.NearPriceListener(nearAccount, priceItems, logger.child({ module: "NearPriceListener" }), {
             pollingFrequency,
         });
-        const nearPusher = new near_1.NearPricePusher(nearAccount, priceServiceConnection);
-        const controller = new controller_1.Controller(priceConfigs, pythListener, nearListener, nearPusher, { pushingFrequency });
+        const nearPusher = new near_1.NearPricePusher(nearAccount, priceServiceConnection, logger.child({ module: "NearPricePusher" }));
+        const controller = new controller_1.Controller(priceConfigs, pythListener, nearListener, nearPusher, logger.child({ module: "Controller" }, { level: controllerLogLevel }), { pushingFrequency });
         controller.start();
     },
 };

package/lib/near/near.d.ts

@@ -2,9 +2,11 @@ import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../inter
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
 import { DurationInSeconds } from "../utils";
 import { FinalExecutionOutcome } from "near-api-js/lib/providers/provider";
+import { Logger } from "pino";
 export declare class NearPriceListener extends ChainPriceListener {
     private account;
-    constructor(account: NearAccount, priceItems: PriceItem[], config: {
+    private logger;
+    constructor(account: NearAccount, priceItems: PriceItem[], logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
@@ -12,7 +14,8 @@ export declare class NearPriceListener extends ChainPriceListener {
 export declare class NearPricePusher implements IPricePusher {
     private account;
     private connection;
-    constructor(account: NearAccount, connection: PriceServiceConnection);
+    private logger;
+    constructor(account: NearAccount, connection: PriceServiceConnection, logger: Logger);
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
     private getPriceFeedsUpdateData;
 }

package/lib/near/near.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../src/near/near.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,sBAAsB,EAEvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAGL,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAG5C,qBAAa,iBAAkB,SAAQ,kBAAkB;IAErD,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,WAAW,EAC5B,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;CAyB3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAEhD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBADV,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,sBAAsB;IAGtC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAiEF,uBAAuB;CAMtC;AAED,qBAAa,WAAW;IAQpB,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,OAAO,CAAU;gBAGvB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM;IAWzB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAUhD,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,qBAAqB,CAAC;IAYjC,OAAO,CAAC,aAAa;CAkCtB"}
+{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../src/near/near.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,sBAAsB,EAEvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAGL,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,qBAAa,iBAAkB,SAAQ,kBAAkB;IAErD,OAAO,CAAC,OAAO;IAEf,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EAC5B,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;CAwB3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAEhD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;gBAFN,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,MAAM;IAGlB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YA0DF,uBAAuB;CAMtC;AAED,qBAAa,WAAW;IAQpB,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,OAAO,CAAU;gBAGvB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM;IAWzB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAUhD,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,qBAAqB,CAAC;IAYjC,OAAO,CAAC,aAAa;CAkCtB"}

package/lib/near/near.js

@@ -12,14 +12,16 @@ const near_api_js_1 = require("near-api-js");
 const key_stores_1 = require("near-api-js/lib/key_stores");
 class NearPriceListener extends interface_1.ChainPriceListener {
     account;
-    constructor(account, priceItems, config) {
-        super("near", config.pollingFrequency, priceItems);
+    logger;
+    constructor(account, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.account = account;
+        this.logger = logger;
     }
     async getOnChainPriceInfo(priceId) {
         try {
             const priceRaw = await this.account.getPriceUnsafe(priceId);
-            console.log(`Polled a NEAR on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}) ${JSON.stringify(priceRaw)}.`);
+            this.logger.debug(`Polled a NEAR on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}) ${JSON.stringify(priceRaw)}.`);
             if (priceRaw) {
                 return {
                     conf: priceRaw.conf,
@@ -31,9 +33,8 @@ class NearPriceListener 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, `Polling on-chain price for ${priceId} failed.:`);
             return undefined;
         }
     }
@@ -42,9 +43,11 @@ exports.NearPriceListener = NearPriceListener;
 class NearPricePusher {
     account;
     connection;
-    constructor(account, connection) {
+    logger;
+    constructor(account, connection, logger) {
         this.account = account;
         this.connection = connection;
+        this.logger = logger;
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -56,19 +59,18 @@ class NearPricePusher {
         try {
             priceFeedUpdateData = await this.getPriceFeedsUpdateData(priceIds);
         }
-        catch (e) {
-            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+        catch (err) {
+            this.logger.error(err, "getPriceFeedsUpdateData failed");
             return;
         }
-        console.log("Pushing ", priceIds);
         for (const data of priceFeedUpdateData) {
             let updateFee;
             try {
                 updateFee = await this.account.getUpdateFeeEstimate(data);
-                console.log(`Update fee: ${updateFee}`);
+                this.logger.debug(`Update fee: ${updateFee}`);
             }
-            catch (e) {
-                console.error(new Date(), "getUpdateFeeEstimate failed:", e);
+            catch (err) {
+                this.logger.error(err, "getUpdateFeeEstimate failed");
                 continue;
             }
             try {
@@ -82,14 +84,14 @@ class NearPricePusher {
                     return is_success;
                 }, true);
                 if (is_success) {
-                    console.log(new Date(), "updatePriceFeeds successful. Tx hash: ", outcome["transaction"]["hash"]);
+                    this.logger.info({ hash: outcome["transaction"]["hash"] }, "updatePriceFeeds successful.");
                 }
                 else {
-                    console.error(new Date(), "updatePriceFeeds failed:", JSON.stringify(failureMessages, undefined, 2));
+                    this.logger.error({ failureMessages }, "updatePriceFeeds failed");
                 }
             }
-            catch (e) {
-                console.error(new Date(), "updatePriceFeeds failed:", e);
+            catch (err) {
+                this.logger.error(err, "updatePriceFeeds failed");
             }
         }
     }

package/lib/options.d.ts

@@ -17,4 +17,13 @@ export declare const pushingFrequency: {
 export declare const mnemonicFile: {
     "mnemonic-file": Options;
 };
+export declare const logLevel: {
+    "log-level": Options;
+};
+export declare const priceServiceConnectionLogLevel: {
+    "price-service-connection-log-level": Options;
+};
+export declare const controllerLogLevel: {
+    "controller-log-level": Options;
+};
 //# sourceMappingURL=options.d.ts.map

package/lib/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,eAAO,MAAM,oBAAoB;;CAOhC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;CAQ/B,CAAC;AAEF,eAAO,MAAM,eAAe;;CAM3B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAQ5B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAU5B,CAAC;AAEF,eAAO,MAAM,YAAY;;CAMxB,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,eAAO,MAAM,oBAAoB;;CAOhC,CAAC;AAEF,eAAO,MAAM,mBAAmB;;CAQ/B,CAAC;AAEF,eAAO,MAAM,eAAe;;CAM3B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAQ5B,CAAC;AAEF,eAAO,MAAM,gBAAgB;;CAU5B,CAAC;AAEF,eAAO,MAAM,YAAY;;CAMxB,CAAC;AAEF,eAAO,MAAM,QAAQ;;CAQpB,CAAC;AAEF,eAAO,MAAM,8BAA8B;;CAQ1C,CAAC;AAEF,eAAO,MAAM,kBAAkB;;CAQ9B,CAAC"}