@pythnetwork/price-pusher 7.1.0 → 8.0.0-alpha

package/lib/evm/command.d.ts

@@ -20,7 +20,7 @@ declare const _default: {
         "gas-limit": Options;
         "update-fee-multiplier": Options;
     };
-    handler: (argv: any) => void;
+    handler: (argv: any) => Promise<void>;
 };
 export default _default;
 //# sourceMappingURL=command.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;oBAgFC,GAAG;;AApEpC,wBAkKE"}

package/lib/evm/command.js

@@ -35,6 +35,9 @@ 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"));
+const super_wallet_1 = require("./super-wallet");
+const pyth_contract_1 = require("./pyth-contract");
+const utils_1 = require("../utils");
 exports.default = {
     command: "evm",
     describe: "run price pusher for evm",
@@ -97,7 +100,7 @@ exports.default = {
         ...options.priceServiceConnectionLogLevel,
         ...options.controllerLogLevel,
     },
-    handler: function (argv) {
+    handler: async function (argv) {
         // FIXME: type checks for this
         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 });
@@ -108,15 +111,18 @@ exports.default = {
         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, logger.child({ module: "PythPriceListener" }));
-        const pythContractFactory = new evm_1.PythContractFactory(endpoint, mnemonic, pythContractAddress);
-        logger.info(`Pushing updates from wallet address: ${pythContractFactory
-            .createWeb3PayerProvider()
-            .getAddress()}`);
-        const evmListener = new evm_1.EvmPriceListener(pythContractFactory, priceItems, logger.child({ module: "EvmPriceListener" }), {
+        const client = await (0, super_wallet_1.createClient)(endpoint, mnemonic);
+        const pythContract = (0, pyth_contract_1.createPythContract)(client, pythContractAddress);
+        logger.info(`Pushing updates from wallet address: ${client.account.address}`);
+        // It is possible to watch the events in the non-ws endpoints, either by getFilter
+        // or by getLogs, but it is very expensive and our polling mechanism does it
+        // in a more efficient way. So we only do it with ws endpoints.
+        const watchEvents = (0, utils_1.isWsEndpoint)(endpoint);
+        const evmListener = new evm_1.EvmPriceListener(pythContract, priceItems, watchEvents, logger.child({ module: "EvmPriceListener" }), {
             pollingFrequency,
         });
         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 evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, client, pythContract, 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

@@ -5,7 +5,7 @@ export declare class CustomGasStation {
     private chainMethods;
     private logger;
     constructor(logger: Logger, chain: number, speed: string);
-    getCustomGasPrice(): Promise<string | undefined>;
+    getCustomGasPrice(): Promise<bigint | undefined>;
     private fetchMaticMainnetGasPrice;
 }
 export declare function getCustomGasStation(logger: Logger, customGasStation?: number, txSpeed?: string): CustomGasStation | undefined;

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":"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"}
+{"version":3,"file":"custom-gas-station.d.ts","sourceRoot":"","sources":["../../src/evm/custom-gas-station.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,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;CAcxC;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

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCustomGasStation = exports.CustomGasStation = void 0;
-const web3_1 = __importDefault(require("web3"));
 const utils_1 = require("../utils");
+const viem_1 = require("viem");
 class CustomGasStation {
     chain;
     speed;
@@ -23,11 +20,10 @@ class CustomGasStation {
     }
     async fetchMaticMainnetGasPrice() {
         try {
-            const res = await fetch("https://gasstation-mainnet.matic.network/v2");
+            const res = await fetch("https://gasstation.polygon.technology/v2");
             const jsonRes = await res.json();
             const gasPrice = jsonRes[this.speed].maxFee;
-            const gweiGasPrice = web3_1.default.utils.toWei(gasPrice.toFixed(2), "Gwei");
-            return gweiGasPrice.toString();
+            return (0, viem_1.parseGwei)(gasPrice.toFixed(2));
         }
         catch (err) {
             this.logger.error(err, "Failed to fetch gas price from Matic mainnet. Returning undefined");

package/lib/evm/evm.d.ts

@@ -1,61 +1,37 @@
-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";
+import { PythContract } from "./pyth-contract";
+import { SuperWalletClient } from "./super-wallet";
 export declare class EvmPriceListener extends ChainPriceListener {
-    private pythContractFactory;
     private pythContract;
+    private watchEvents;
     private logger;
-    constructor(pythContractFactory: PythContractFactory, priceItems: PriceItem[], logger: Logger, config: {
+    constructor(pythContract: PythContract, priceItems: PriceItem[], watchEvents: boolean, logger: Logger, config: {
         pollingFrequency: DurationInSeconds;
     });
     start(): Promise<void>;
-    private startSubscription;
+    private startWatching;
     private onPriceFeedUpdate;
     getOnChainPriceInfo(priceId: HexString): Promise<PriceInfo | undefined>;
 }
 export declare class EvmPricePusher implements IPricePusher {
     private connection;
+    private client;
+    private pythContract;
     private logger;
     private overrideGasPriceMultiplier;
     private overrideGasPriceMultiplierCap;
     private updateFeeMultiplier;
     private gasLimit?;
     private customGasStation?;
-    private pythContract;
-    private web3;
     private pusherAddress;
     private lastPushAttempt;
-    constructor(connection: PriceServiceConnection, pythContractFactory: PythContractFactory, logger: Logger, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation);
+    constructor(connection: PriceServiceConnection, client: SuperWalletClient, pythContract: PythContract, logger: Logger, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, updateFeeMultiplier: number, gasLimit?: number | undefined, customGasStation?: CustomGasStation | undefined);
     updatePriceFeed(priceIds: string[], pubTimesToPush: UnixTimestamp[]): Promise<void>;
+    private waitForTransactionReceipt;
     private getPriceFeedsUpdateData;
 }
-export declare class PythContractFactory {
-    private endpoint;
-    private mnemonic;
-    private pythContractAddress;
-    constructor(endpoint: string, mnemonic: string, pythContractAddress: string);
-    /**
-     * This method creates a web3 Pyth contract with payer (based on HDWalletProvider). As this
-     * provider is an HDWalletProvider it does not support subscriptions even if the
-     * endpoint is a websocket endpoint.
-     *
-     * @returns Pyth contract
-     */
-    createPythContractWithPayer(): Contract;
-    /**
-     * This method creates a web3 Pyth contract with the given endpoint as its provider. If
-     * the endpoint is a websocket endpoint the contract will support subscriptions.
-     *
-     * @returns Pyth contract
-     */
-    createPythContract(): Contract;
-    hasWebsocketProvider(): boolean;
-    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;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"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/evm/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAGL,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EACL,sBAAsB,EACtB,SAAS,EACT,aAAa,EACd,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAYxD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,qBAAa,gBAAiB,SAAQ,kBAAkB;IAEpD,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,MAAM;gBAHN,YAAY,EAAE,YAAY,EAClC,UAAU,EAAE,SAAS,EAAE,EACf,WAAW,EAAE,OAAO,EACpB,MAAM,EAAE,MAAM,EACtB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAUG,KAAK;YAeG,aAAa;IAO3B,OAAO,CAAC,iBAAiB;IAuBnB,mBAAmB,CACvB,OAAO,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAuBlC;AAED,qBAAa,cAAe,YAAW,YAAY;IAK/C,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,0BAA0B;IAClC,OAAO,CAAC,6BAA6B;IACrC,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ,CAAC;IACjB,OAAO,CAAC,gBAAgB,CAAC;IAZ3B,OAAO,CAAC,aAAa,CAA4B;IACjD,OAAO,CAAC,eAAe,CAA0B;gBAGvC,UAAU,EAAE,sBAAsB,EAClC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,0BAA0B,EAAE,MAAM,EAClC,6BAA6B,EAAE,MAAM,EACrC,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,CAAC,oBAAQ,EACjB,gBAAgB,CAAC,8BAAkB;IASvC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,aAAa,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC;YAkOF,yBAAyB;YAuBzB,uBAAuB;CAQtC"}

package/lib/evm/evm.js

@@ -1,31 +1,27 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PythContractFactory = exports.EvmPricePusher = exports.EvmPriceListener = void 0;
+exports.EvmPricePusher = exports.EvmPriceListener = void 0;
 const interface_1 = require("../interface");
 const utils_1 = require("../utils");
-const AbstractPyth_json_1 = __importDefault(require("@pythnetwork/pyth-sdk-solidity/abis/AbstractPyth.json"));
-const hdwallet_provider_1 = __importDefault(require("@truffle/hdwallet-provider"));
-const web3_1 = __importDefault(require("web3"));
-const utils_2 = require("../utils");
+const viem_1 = require("viem");
 class EvmPriceListener extends interface_1.ChainPriceListener {
-    pythContractFactory;
     pythContract;
+    watchEvents;
     logger;
-    constructor(pythContractFactory, priceItems, logger, config) {
+    constructor(pythContract, priceItems, watchEvents, logger, config) {
         super(config.pollingFrequency, priceItems);
-        this.pythContractFactory = pythContractFactory;
-        this.pythContract = this.pythContractFactory.createPythContract();
+        this.pythContract = pythContract;
+        this.watchEvents = watchEvents;
+        this.logger = logger;
+        this.pythContract = pythContract;
         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()) {
-            this.logger.info("Subscribing to the target network pyth contract events...");
-            this.startSubscription();
+        if (this.watchEvents) {
+            this.logger.info("Watching target network pyth contract events...");
+            this.startWatching();
         }
         else {
             this.logger.info("The target network RPC endpoint is not Websocket. " +
@@ -34,36 +30,27 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
         // base class for polling
         await super.start();
     }
-    async startSubscription() {
-        for (const { id: priceId } of this.priceItems) {
-            this.pythContract.events.PriceFeedUpdate({
-                filter: {
-                    id: (0, utils_1.addLeading0x)(priceId),
-                    fresh: true,
-                },
-            }, this.onPriceFeedUpdate.bind(this));
-        }
+    async startWatching() {
+        this.pythContract.watchEvent.PriceFeedUpdate({ id: this.priceItems.map((item) => (0, utils_1.addLeading0x)(item.id)) }, { strict: true, onLogs: this.onPriceFeedUpdate.bind(this) });
     }
-    onPriceFeedUpdate(err, event) {
-        if (err !== null) {
-            this.logger.error(err, "PriceFeedUpdate EventEmitter received an error..");
-            throw err;
+    onPriceFeedUpdate(logs) {
+        for (const log of logs) {
+            const priceId = (0, utils_1.removeLeading0x)((0, utils_1.assertDefined)(log.args.id));
+            const priceInfo = {
+                conf: (0, utils_1.assertDefined)(log.args.conf).toString(),
+                price: (0, utils_1.assertDefined)(log.args.price).toString(),
+                publishTime: Number((0, utils_1.assertDefined)(log.args.publishTime)),
+            };
+            this.logger.debug({ priceInfo }, `Received a new Evm PriceFeedUpdate event for price feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+            this.updateLatestPriceInfo(priceId, priceInfo);
         }
-        const priceId = (0, utils_1.removeLeading0x)(event.returnValues.id);
-        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,
-            publishTime: Number(event.returnValues.publishTime),
-        };
-        this.updateLatestPriceInfo(priceId, priceInfo);
     }
     async getOnChainPriceInfo(priceId) {
         let priceRaw;
         try {
-            priceRaw = await this.pythContract.methods
-                .getPriceUnsafe((0, utils_1.addLeading0x)(priceId))
-                .call();
+            priceRaw = await this.pythContract.read.getPriceUnsafe([
+                (0, utils_1.addLeading0x)(priceId),
+            ]);
         }
         catch (err) {
             this.logger.error(err, `Polling on-chain price for ${priceId} failed.`);
@@ -80,26 +67,26 @@ class EvmPriceListener extends interface_1.ChainPriceListener {
 exports.EvmPriceListener = EvmPriceListener;
 class EvmPricePusher {
     connection;
+    client;
+    pythContract;
     logger;
     overrideGasPriceMultiplier;
     overrideGasPriceMultiplierCap;
     updateFeeMultiplier;
     gasLimit;
     customGasStation;
-    pythContract;
-    web3;
     pusherAddress;
     lastPushAttempt;
-    constructor(connection, pythContractFactory, logger, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
+    constructor(connection, client, pythContract, logger, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, updateFeeMultiplier, gasLimit, customGasStation) {
         this.connection = connection;
+        this.client = client;
+        this.pythContract = pythContract;
         this.logger = logger;
         this.overrideGasPriceMultiplier = overrideGasPriceMultiplier;
         this.overrideGasPriceMultiplierCap = overrideGasPriceMultiplierCap;
         this.updateFeeMultiplier = updateFeeMultiplier;
         this.gasLimit = gasLimit;
         this.customGasStation = customGasStation;
-        this.pythContract = pythContractFactory.createPythContractWithPayer();
-        this.web3 = new web3_1.default(pythContractFactory.createWeb3PayerProvider());
     }
     // The pubTimes are passed here to use the values that triggered the push.
     // This is an optimization to avoid getting a newer value (as an update comes)
@@ -114,174 +101,156 @@ class EvmPricePusher {
         if (priceIds.length !== pubTimesToPush.length)
             throw new Error("Invalid arguments");
         const priceIdsWith0x = priceIds.map((priceId) => (0, utils_1.addLeading0x)(priceId));
-        const priceFeedUpdateData = await this.getPriceFeedsUpdateData(priceIdsWith0x);
+        const priceFeedUpdateData = (await this.getPriceFeedsUpdateData(priceIdsWith0x));
         let updateFee;
         try {
-            updateFee = await this.pythContract.methods
-                .getUpdateFee(priceFeedUpdateData)
-                .call();
-            updateFee = Number(updateFee) * (this.updateFeeMultiplier || 1);
+            updateFee = await this.pythContract.read.getUpdateFee([
+                priceFeedUpdateData,
+            ]);
+            updateFee = BigInt(Math.round(Number(updateFee) * (this.updateFeeMultiplier || 1)));
             this.logger.debug(`Update fee: ${updateFee}`);
         }
         catch (e) {
             this.logger.error(e, "An unidentified error has occured when getting the update fee.");
             throw e;
         }
-        let gasPrice = Number((await this.customGasStation?.getCustomGasPrice()) ||
-            (await this.web3.eth.getGasPrice()));
+        const fees = await this.client.estimateFeesPerGas();
+        this.logger.debug({ fees }, "Estimated fees");
+        let gasPrice = Number(await this.customGasStation?.getCustomGasPrice()) ||
+            Number(fees.gasPrice) ||
+            Number(fees.maxFeePerGas);
         // Try to re-use the same nonce and increase the gas if the last tx is not landed yet.
         if (this.pusherAddress === undefined) {
-            this.pusherAddress = (await this.web3.eth.getAccounts())[0];
+            this.pusherAddress = this.client.account.address;
         }
-        const lastExecutedNonce = (await this.web3.eth.getTransactionCount(this.pusherAddress)) - 1;
+        const lastExecutedNonce = (await this.client.getTransactionCount({
+            address: this.pusherAddress,
+        })) - 1;
         let gasPriceToOverride = undefined;
         if (this.lastPushAttempt !== undefined) {
             if (this.lastPushAttempt.nonce <= lastExecutedNonce) {
                 this.lastPushAttempt = undefined;
             }
             else {
-                gasPriceToOverride = Math.ceil(this.lastPushAttempt.gasPrice * this.overrideGasPriceMultiplier);
+                gasPriceToOverride =
+                    this.lastPushAttempt.gasPrice * this.overrideGasPriceMultiplier;
             }
         }
-        if (gasPriceToOverride !== undefined && gasPriceToOverride > gasPrice) {
+        if (gasPriceToOverride !== undefined &&
+            gasPriceToOverride > Number(gasPrice)) {
             gasPrice = Math.min(gasPriceToOverride, gasPrice * this.overrideGasPriceMultiplierCap);
         }
         const txNonce = lastExecutedNonce + 1;
         this.logger.debug(`Using gas price: ${gasPrice} and nonce: ${txNonce}`);
-        this.pythContract.methods
-            .updatePriceFeedsIfNecessary(priceFeedUpdateData, priceIdsWith0x, pubTimesToPush)
-            .send({
-            value: updateFee,
-            gasPrice,
-            nonce: txNonce,
-            gasLimit: this.gasLimit,
-        })
-            .on("transactionHash", (hash) => {
-            this.logger.info({ hash }, "Price update successful");
-        })
-            .on("error", (err, receipt) => {
-            if (err.message.includes("revert")) {
-                // Since we are using custom error structs on solidity the rejection
-                // 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.
-                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")) {
-                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")) {
-                // We just have to handle this error and return.
-                // 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.
-                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.")) {
-                this.logger.error({ err, receipt }, "Payer is out of balance, please top it up.");
-                throw err;
-            }
-            if (err.message.includes("transaction underpriced")) {
-                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")) {
-                this.logger.error({ err, receipt }, "A transaction with the same nonce has been mined and this one is no longer needed.");
-                return;
+        const pubTimesToPushParam = pubTimesToPush.map((pubTime) => BigInt(pubTime));
+        try {
+            const { request } = await this.pythContract.simulate.updatePriceFeedsIfNecessary([priceFeedUpdateData, priceIdsWith0x, pubTimesToPushParam], {
+                value: updateFee,
+                gasPrice: BigInt(Math.ceil(gasPrice)),
+                nonce: txNonce,
+                gas: this.gasLimit !== undefined
+                    ? BigInt(Math.ceil(this.gasLimit))
+                    : undefined,
+            });
+            this.logger.debug({ request }, "Simulated request successfully");
+            const hash = await this.client.writeContract(request);
+            this.logger.info({ hash }, "Price update sent");
+            this.waitForTransactionReceipt(hash);
+        }
+        catch (err) {
+            this.logger.debug({ err }, "Simulating or sending transactions failed.");
+            if (err instanceof viem_1.BaseError) {
+                if (err.walk((e) => e instanceof viem_1.ContractFunctionRevertedError &&
+                    e.data?.errorName === "NoFreshUpdate")) {
+                    this.logger.info("Simulation reverted because none of the updates are fresh. This is an expected behaviour to save gas. Skipping this push.");
+                    return;
+                }
+                if (err.walk((e) => e instanceof viem_1.InsufficientFundsError)) {
+                    this.logger.error({ err }, "Wallet doesn't have enough balance. In rare cases, there might be issues with gas price " +
+                        "calculation in the RPC.");
+                    throw err;
+                }
+                if (err.walk((e) => e instanceof viem_1.FeeCapTooLowError) ||
+                    err.walk((e) => e instanceof viem_1.InternalRpcError &&
+                        e.details.includes("replacement transaction underpriced"))) {
+                    this.logger.warn("The gas price of the transaction is too low or there is an existing transaction with higher gas with the same nonce. " +
+                        "The price will be increased in the next push. Skipping this push. " +
+                        "If this keeps happening or transactions are not landing you need to increase the override gas price " +
+                        "multiplier and the cap to increase the likelihood of the transaction landing on-chain.");
+                    return;
+                }
+                if (err.walk((e) => e instanceof viem_1.TransactionExecutionError &&
+                    (e.details.includes("nonce too low") ||
+                        e.message.includes("Nonce provided for the transaction")))) {
+                    this.logger.info("The nonce is incorrect. This is an expected behaviour in high frequency or multi-instance setup. Skipping this push.");
+                    return;
+                }
+                // We normally crash on unknown failures but we believe that this type of error is safe to skip. The other reason is that
+                // wometimes we see a TransactionExecutionError because of the nonce without any details and it is not catchable.
+                if (err.walk((e) => e instanceof viem_1.TransactionExecutionError)) {
+                    this.logger.error({ err }, "Transaction execution failed. This is an expected behaviour in high frequency or multi-instance setup. " +
+                        "Please review this error and file an issue if it is a bug. Skipping this push.");
+                    return;
+                }
+                // The following errors are part of the legacy code and might not work as expected.
+                // We are keeping them in case they help with handling what is not covered above.
+                if (err.message.includes("the tx doesn't have the correct nonce.") ||
+                    err.message.includes("nonce too low") ||
+                    err.message.includes("invalid nonce")) {
+                    this.logger.info("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")) {
+                    // We just have to handle this error and return.
+                    // 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.
+                    this.logger.warn("The transaction failed with error: max fee per gas less than block base fee. " +
+                        "The fee will be increased in the next push. Skipping this push.");
+                    return;
+                }
+                if (err.message.includes("sender doesn't have enough funds to send tx.")) {
+                    this.logger.error("Payer is out of balance, please top it up.");
+                    throw new Error("Please top up the wallet");
+                }
+                if (err.message.includes("could not replace existing tx")) {
+                    this.logger.error("A transaction with the same nonce has been mined and this one is no longer needed. Skipping this push.");
+                    return;
+                }
             }
-            this.logger.error({ err, receipt }, "An unidentified error has occured.");
+            // If the error is not handled, we will crash the process.
+            this.logger.error({ err }, "The transaction failed with an unhandled error. crashing the process. " +
+                "Please review this error and file an issue if it is a bug.");
             throw err;
-        });
+        }
         // Update lastAttempt
         this.lastPushAttempt = {
             nonce: txNonce,
             gasPrice: gasPrice,
         };
     }
-    async getPriceFeedsUpdateData(priceIds) {
-        const latestVaas = await this.connection.getLatestVaas(priceIds);
-        return latestVaas.map((vaa) => "0x" + Buffer.from(vaa, "base64").toString("hex"));
-    }
-}
-exports.EvmPricePusher = EvmPricePusher;
-class PythContractFactory {
-    endpoint;
-    mnemonic;
-    pythContractAddress;
-    constructor(endpoint, mnemonic, pythContractAddress) {
-        this.endpoint = endpoint;
-        this.mnemonic = mnemonic;
-        this.pythContractAddress = pythContractAddress;
-    }
-    /**
-     * This method creates a web3 Pyth contract with payer (based on HDWalletProvider). As this
-     * provider is an HDWalletProvider it does not support subscriptions even if the
-     * endpoint is a websocket endpoint.
-     *
-     * @returns Pyth contract
-     */
-    createPythContractWithPayer() {
-        const provider = this.createWeb3PayerProvider();
-        const web3 = new web3_1.default(provider);
-        return new web3.eth.Contract(AbstractPyth_json_1.default, this.pythContractAddress, {
-            from: provider.getAddress(0),
-        });
-    }
-    /**
-     * This method creates a web3 Pyth contract with the given endpoint as its provider. If
-     * the endpoint is a websocket endpoint the contract will support subscriptions.
-     *
-     * @returns Pyth contract
-     */
-    createPythContract() {
-        const provider = this.createWeb3Provider();
-        const web3 = new web3_1.default(provider);
-        return new web3.eth.Contract(AbstractPyth_json_1.default, this.pythContractAddress);
-    }
-    hasWebsocketProvider() {
-        return (0, utils_2.isWsEndpoint)(this.endpoint);
-    }
-    createWeb3Provider() {
-        if ((0, utils_2.isWsEndpoint)(this.endpoint)) {
-            web3_1.default.providers.WebsocketProvider.prototype.sendAsync =
-                web3_1.default.providers.WebsocketProvider.prototype.send;
-            return new web3_1.default.providers.WebsocketProvider(this.endpoint, {
-                clientConfig: {
-                    keepalive: true,
-                    keepaliveInterval: 30000,
-                },
-                reconnect: {
-                    auto: true,
-                    delay: 1000,
-                    onTimeout: true,
-                },
-                timeout: 30000,
+    async waitForTransactionReceipt(hash) {
+        try {
+            const receipt = await this.client.waitForTransactionReceipt({
+                hash: hash,
             });
+            switch (receipt.status) {
+                case "success":
+                    this.logger.debug({ hash, receipt }, "Price update successful");
+                    this.logger.info({ hash }, "Price update successful");
+                    break;
+                default:
+                    this.logger.info({ hash, receipt }, "Price update did not succeed or its transaction did not land. " +
+                        "This is an expected behaviour in high frequency or multi-instance setup.");
+            }
         }
-        else {
-            web3_1.default.providers.HttpProvider.prototype.sendAsync =
-                web3_1.default.providers.HttpProvider.prototype.send;
-            return new web3_1.default.providers.HttpProvider(this.endpoint, {
-                keepAlive: true,
-                timeout: 30000,
-            });
+        catch (err) {
+            this.logger.warn({ err }, "Failed to get transaction receipt");
         }
     }
-    createWeb3PayerProvider() {
-        return new hdwallet_provider_1.default({
-            mnemonic: {
-                phrase: this.mnemonic,
-            },
-            providerOrUrl: this.createWeb3Provider(),
-        });
+    async getPriceFeedsUpdateData(priceIds) {
+        const latestVaas = await this.connection.getLatestVaas(priceIds);
+        return latestVaas.map((vaa) => "0x" + Buffer.from(vaa, "base64").toString("hex"));
     }
 }
-exports.PythContractFactory = PythContractFactory;
+exports.EvmPricePusher = EvmPricePusher;