@pythnetwork/price-pusher 9.2.0 → 9.3.0

package/lib/injective/injective.d.ts

@@ -1,7 +1,13 @@
 import { HexString, HermesClient } from "@pythnetwork/hermes-client";
-import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
+import { PriceItem, PriceInfo, IPricePusher, ChainPriceListener } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { Logger } from "pino";
+type InjectiveConfig = {
+    chainId: string;
+    gasMultiplier: number;
+    gasPrice: number;
+    priceIdsProcessChunkSize: number;
+};
 export declare class InjectivePriceListener extends ChainPriceListener {
     private pythContractAddress;
     private grpcEndpoint;
@@ -11,26 +17,34 @@ export declare class InjectivePriceListener extends ChainPriceListener {
     });
     getOnChainPriceInfo(priceId: HexString): Promise<PriceInfo | undefined>;
 }
-type InjectiveConfig = {
-    chainId: string;
-    gasMultiplier: number;
-    gasPrice: number;
-    priceIdsProcessChunkSize: number;
-};
 export declare class InjectivePricePusher implements IPricePusher {
     private hermesClient;
     private pythContractAddress;
     private grpcEndpoint;
     private logger;
-    private wallet;
+    private mnemonic;
     private chainConfig;
-    private account;
+    private accounts; /** { address: Account } */
     constructor(hermesClient: HermesClient, pythContractAddress: string, grpcEndpoint: string, logger: Logger, mnemonic: string, chainConfig?: Partial<InjectiveConfig>);
-    private injectiveAddress;
+    private getWallet;
     private signAndBroadcastMsg;
-    getPriceFeedUpdateObject(priceIds: string[]): Promise<any>;
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
     private updatePriceFeedChunk;
+    /**
+     * Get the fee for the transaction (using simulation).
+     *
+     * We also apply a multiplier to the gas used to apply a small
+     * buffer to the gas that'll be used.
+     */
+    private getStdFee;
+    /**
+     * Get the latest VAAs for updatePriceFeed and then push them
+     */
+    private getPriceFeedUpdateObject;
+    /**
+     * Get the update fee for the given VAAs (i.e the fee that is paid to the pyth contract)
+     */
+    private getUpdateFee;
 }
 export {};
 //# sourceMappingURL=injective.d.ts.map

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,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAa7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAyB9B,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;IACjB,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AACF,qBAAa,oBAAqB,YAAW,YAAY;IAMrD,OAAO,CAAC,YAAY;IACpB,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,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAcxC,OAAO,CAAC,gBAAgB;YAIV,mBAAmB;IAmE3B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAa1D,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAqBF,oBAAoB;CA0EnC"}
+{"version":3,"file":"injective.d.ts","sourceRoot":"","sources":["../../src/injective/injective.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,SAAS,EACT,SAAS,EACT,YAAY,EACZ,kBAAkB,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAa7C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAmB9B,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,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,qBAAa,oBAAqB,YAAW,YAAY;IAOrD,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,MAAM;IAThB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAkB;IACrC,OAAO,CAAC,QAAQ,CACX,CAAC,2BAA2B;gBAGvB,YAAY,EAAE,YAAY,EAC1B,mBAAmB,EAAE,MAAM,EAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC;IAaxC,OAAO,CAAC,SAAS;YAWH,mBAAmB;IA+C3B,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAuBF,oBAAoB;IA+ClC;;;;;OAKG;YACW,SAAS;IA0CvB;;OAEG;YACW,wBAAwB;IAsBtC;;OAEG;YACW,YAAY;CAwB3B"}

package/lib/injective/injective.js

@@ -45,15 +45,15 @@ class InjectivePricePusher {
     pythContractAddress;
     grpcEndpoint;
     logger;
-    wallet;
+    mnemonic;
     chainConfig;
-    account = null;
+    accounts = {}; /** { address: Account } */
     constructor(hermesClient, pythContractAddress, grpcEndpoint, logger, mnemonic, chainConfig) {
         this.hermesClient = hermesClient;
         this.pythContractAddress = pythContractAddress;
         this.grpcEndpoint = grpcEndpoint;
         this.logger = logger;
-        this.wallet = sdk_ts_1.PrivateKey.fromMnemonic(mnemonic);
+        this.mnemonic = mnemonic;
         this.chainConfig = {
             chainId: chainConfig?.chainId ?? INJECTIVE_TESTNET_CHAIN_ID,
             gasMultiplier: chainConfig?.gasMultiplier ?? DEFAULT_GAS_MULTIPLIER,
@@ -62,74 +62,46 @@ class InjectivePricePusher {
                 DEFAULT_PRICE_IDS_PROCESS_CHUNK_SIZE,
         };
     }
-    injectiveAddress() {
-        return this.wallet.toBech32();
+    getWallet(index) {
+        if (this.chainConfig.priceIdsProcessChunkSize === -1 ||
+            this.chainConfig.priceIdsProcessChunkSize === undefined) {
+            return sdk_ts_1.PrivateKey.fromMnemonic(this.mnemonic);
+        }
+        return sdk_ts_1.PrivateKey.fromMnemonic(this.mnemonic, `m/44'/60'/0'/0/${index}`);
     }
-    async signAndBroadcastMsg(msg) {
+    async signAndBroadcastMsg(msg, index) {
         const chainGrpcAuthApi = new sdk_ts_1.ChainGrpcAuthApi(this.grpcEndpoint);
+        const wallet = this.getWallet(index);
+        const injectiveAddress = wallet.toAddress().toBech32();
         // Fetch the latest account details only if it's not stored.
-        this.account ??= await chainGrpcAuthApi.fetchAccount(this.injectiveAddress());
-        const { txRaw: simulateTxRaw } = (0, sdk_ts_1.createTransactionFromMsg)({
-            sequence: this.account.baseAccount.sequence,
-            accountNumber: this.account.baseAccount.accountNumber,
-            message: msg,
-            chainId: this.chainConfig.chainId,
-            pubKey: this.wallet.toPublicKey().toBase64(),
-        });
-        const txService = new sdk_ts_1.TxGrpcApi(this.grpcEndpoint);
-        // simulation
+        this.accounts[injectiveAddress] ??=
+            await chainGrpcAuthApi.fetchAccount(injectiveAddress);
+        const account = this.accounts[injectiveAddress];
         try {
-            const { gasInfo: { gasUsed }, } = await txService.simulate(simulateTxRaw);
-            // simulation returns us the approximate gas used
-            // gas passed with the transaction should be more than that
-            // in order for it to be successfully executed
-            // this multiplier takes care of that
-            const gas = (gasUsed * this.chainConfig.gasMultiplier).toFixed();
-            const fee = {
-                amount: [
-                    {
-                        denom: "inj",
-                        amount: (Number(gas) * this.chainConfig.gasPrice).toFixed(),
-                    },
-                ],
-                gas,
-            };
             const { signBytes, txRaw } = (0, sdk_ts_1.createTransactionFromMsg)({
-                sequence: this.account.baseAccount.sequence,
-                accountNumber: this.account.baseAccount.accountNumber,
+                sequence: account.baseAccount.sequence,
+                accountNumber: account.baseAccount.accountNumber,
                 message: msg,
                 chainId: this.chainConfig.chainId,
-                fee,
-                pubKey: this.wallet.toPublicKey().toBase64(),
+                fee: await this.getStdFee(msg, index),
+                pubKey: wallet.toPublicKey().toBase64(),
             });
-            const sig = await this.wallet.sign(Buffer.from(signBytes));
-            this.account.baseAccount.sequence++;
+            const sig = await wallet.sign(Buffer.from(signBytes));
             /** Append Signatures */
             txRaw.signatures = [sig];
             // this takes approx 5 seconds
-            const txResponse = await txService.broadcast(txRaw);
+            const txResponse = await new sdk_ts_1.TxGrpcApi(this.grpcEndpoint).broadcast(txRaw);
+            account.baseAccount.sequence++;
             return txResponse;
         }
         catch (e) {
-            // The sequence number was invalid and hence we will have to fetch it again.
+            // The sequence number was invalid and hence we will have to fetch it again
             if (JSON.stringify(e).match(/account sequence mismatch/) !== null) {
-                // We need to fetch the account details again.
-                this.account = null;
+                this.accounts[injectiveAddress] = undefined;
             }
             throw e;
         }
     }
-    async getPriceFeedUpdateObject(priceIds) {
-        const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
-            encoding: "base64",
-        });
-        const vaas = response.binary.data;
-        return {
-            update_price_feeds: {
-                data: vaas,
-            },
-        };
-    }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
             return;
@@ -140,46 +112,22 @@ class InjectivePricePusher {
             ? [priceIds]
             : (0, utils_1.splitArrayToChunks)({
                 array: priceIds,
-                chunkSize: this.chainConfig.priceIdsProcessChunkSize,
+                chunkSize: Number(this.chainConfig.priceIdsProcessChunkSize),
             });
-        for (const [chunkIndex, priceIdChunk] of priceIdChunks.entries()) {
-            await this.updatePriceFeedChunk(priceIdChunk, chunkIndex);
-        }
+        await Promise.all(priceIdChunks.map((priceIdChunk, chunkIndex) => this.updatePriceFeedChunk(priceIdChunk, chunkIndex)));
     }
     async updatePriceFeedChunk(priceIds, chunkIndex) {
-        let priceFeedUpdateObject;
         try {
-            // get the latest VAAs for updatePriceFeed and then push them
-            priceFeedUpdateObject = await this.getPriceFeedUpdateObject(priceIds);
-        }
-        catch (err) {
-            this.logger.error(err, `Error fetching the latest vaas to push for chunk ${chunkIndex}`);
-            return;
-        }
-        let updateFeeQueryResponse;
-        try {
-            const api = new sdk_ts_1.ChainGrpcWasmApi(this.grpcEndpoint);
-            const { data } = await api.fetchSmartContractState(this.pythContractAddress, Buffer.from(JSON.stringify({
-                get_update_fee: {
-                    vaas: priceFeedUpdateObject.update_price_feeds.data,
-                },
-            })).toString("base64"));
-            const json = Buffer.from(data).toString();
-            updateFeeQueryResponse = JSON.parse(json);
-        }
-        catch (err) {
-            this.logger.error(err, `Error fetching update fee for chunk ${chunkIndex}`);
-            // Throwing an error because it is likely an RPC issue
-            throw err;
-        }
-        try {
-            const executeMsg = sdk_ts_1.MsgExecuteContract.fromJSON({
-                sender: this.injectiveAddress(),
+            const priceFeedUpdateObject = await this.getPriceFeedUpdateObject(priceIds);
+            const updateFeeQueryResponse = await this.getUpdateFee(priceFeedUpdateObject.update_price_feeds.data);
+            const wallet = this.getWallet(chunkIndex);
+            const msg = sdk_ts_1.MsgExecuteContract.fromJSON({
+                sender: wallet.toAddress().toBech32(),
                 contractAddress: this.pythContractAddress,
                 msg: priceFeedUpdateObject,
                 funds: [updateFeeQueryResponse],
             });
-            const rs = await this.signAndBroadcastMsg(executeMsg);
+            const rs = await this.signAndBroadcastMsg(msg, chunkIndex);
             this.logger.info({ hash: rs.txHash }, `Successfully broadcasted txHash for chunk ${chunkIndex}`);
         }
         catch (err) {
@@ -195,5 +143,84 @@ class InjectivePricePusher {
             this.logger.error(err, `Error executing messages for chunk ${chunkIndex}`);
         }
     }
+    /**
+     * Get the fee for the transaction (using simulation).
+     *
+     * We also apply a multiplier to the gas used to apply a small
+     * buffer to the gas that'll be used.
+     */
+    async getStdFee(msg, index) {
+        const wallet = this.getWallet(index);
+        const injectiveAddress = wallet.toAddress().toBech32();
+        const account = this.accounts[injectiveAddress];
+        if (!account) {
+            throw new Error("Account not found");
+        }
+        const { txRaw: simulateTxRaw } = (0, sdk_ts_1.createTransactionFromMsg)({
+            sequence: account.baseAccount.sequence,
+            accountNumber: account.baseAccount.accountNumber,
+            message: msg,
+            chainId: this.chainConfig.chainId,
+            pubKey: wallet.toPublicKey().toBase64(),
+        });
+        try {
+            const result = await new sdk_ts_1.TxGrpcApi(this.grpcEndpoint).simulate(simulateTxRaw);
+            const gas = (result.gasInfo.gasUsed * this.chainConfig.gasMultiplier).toFixed();
+            const fee = {
+                amount: [
+                    {
+                        denom: "inj",
+                        amount: (Number(gas) * this.chainConfig.gasPrice).toFixed(),
+                    },
+                ],
+                gas,
+            };
+            return fee;
+        }
+        catch (err) {
+            this.logger.error(err, `Error getting std fee`);
+            throw err;
+        }
+    }
+    /**
+     * Get the latest VAAs for updatePriceFeed and then push them
+     */
+    async getPriceFeedUpdateObject(priceIds) {
+        try {
+            const response = await this.hermesClient.getLatestPriceUpdates(priceIds, {
+                encoding: "base64",
+            });
+            const vaas = response.binary.data;
+            return {
+                update_price_feeds: {
+                    data: vaas,
+                },
+            };
+        }
+        catch (err) {
+            this.logger.error(err, `Error fetching the latest vaas to push`);
+            throw err;
+        }
+    }
+    /**
+     * Get the update fee for the given VAAs (i.e the fee that is paid to the pyth contract)
+     */
+    async getUpdateFee(vaas) {
+        try {
+            const api = new sdk_ts_1.ChainGrpcWasmApi(this.grpcEndpoint);
+            const { data } = await api.fetchSmartContractState(this.pythContractAddress, Buffer.from(JSON.stringify({
+                get_update_fee: {
+                    vaas,
+                },
+            })).toString("base64"));
+            const json = Buffer.from(data).toString();
+            return JSON.parse(json);
+        }
+        catch (err) {
+            this.logger.error(err, `Error fetching update fee.`);
+            // Throwing an error because it is likely an RPC issue
+            throw err;
+        }
+    }
 }
 exports.InjectivePricePusher = InjectivePricePusher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -19,18 +19,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsc",
-    "fix:format": "prettier --write \"src/**/*.ts\"",
-    "fix:lint": "eslint src/ --fix --max-warnings 0",
-    "test:format": "prettier --check \"src/**/*.ts\"",
-    "test:lint": "eslint src/ --max-warnings 0",
-    "start": "node lib/index.js",
-    "dev": "ts-node src/index.ts",
-    "prepublishOnly": "pnpm run build && pnpm run test:lint",
-    "preversion": "pnpm run test:lint",
-    "version": "pnpm run test:format && pnpm run test:lint && git add -A src"
-  },
   "keywords": [
     "pyth",
     "oracle",
@@ -53,25 +41,18 @@
     "eslint": "^8.13.0",
     "jest": "^29.7.0",
     "pino-pretty": "^11.2.1",
-    "prettier": "catalog:",
+    "prettier": "^3.5.3",
     "ts-jest": "^29.1.1",
-    "ts-node": "catalog:",
-    "typescript": "catalog:"
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.2"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.0",
     "@injectivelabs/networks": "1.14.47",
-    "@injectivelabs/sdk-ts": "1.14.49",
-    "@injectivelabs/utils": "^1.14.47",
+    "@injectivelabs/utils": "^1.14.48",
+    "@injectivelabs/sdk-ts": "1.14.50",
     "@mysten/sui": "^1.3.0",
     "@pythnetwork/hermes-client": "^1.3.1",
-    "@pythnetwork/price-service-sdk": "^1.8.0",
-    "@pythnetwork/pyth-fuel-js": "1.0.7",
-    "@pythnetwork/pyth-sdk-solidity": "4.0.0",
-    "@pythnetwork/pyth-solana-receiver": "0.10.0",
-    "@pythnetwork/pyth-sui-js": "2.1.0",
-    "@pythnetwork/pyth-ton-js": "0.1.2",
-    "@pythnetwork/solana-utils": "0.4.4",
     "@solana/web3.js": "^1.93.0",
     "@ton/core": "^0.59.0",
     "@ton/crypto": "^3.3.0",
@@ -87,7 +68,24 @@
     "prom-client": "^15.1.0",
     "viem": "^2.19.4",
     "yaml": "^2.1.1",
-    "yargs": "^17.5.1"
+    "yargs": "^17.5.1",
+    "@pythnetwork/pyth-fuel-js": "1.0.7",
+    "@pythnetwork/price-service-sdk": "^1.8.0",
+    "@pythnetwork/pyth-sdk-solidity": "4.0.0",
+    "@pythnetwork/pyth-ton-js": "0.1.2",
+    "@pythnetwork/pyth-solana-receiver": "0.10.0",
+    "@pythnetwork/solana-utils": "0.4.4",
+    "@pythnetwork/pyth-sui-js": "2.1.0"
   },
-  "gitHead": "da6c1185d9fce5e6ca2df4f7e6e1f5edc9b366eb"
-}
+  "scripts": {
+    "build": "tsc",
+    "fix:format": "prettier --write \"src/**/*.ts\"",
+    "fix:lint": "eslint src/ --fix --max-warnings 0",
+    "test:format": "prettier --check \"src/**/*.ts\"",
+    "test:lint": "eslint src/ --max-warnings 0",
+    "start": "node lib/index.js",
+    "dev": "ts-node src/index.ts",
+    "preversion": "pnpm run test:lint",
+    "version": "pnpm run test:format && pnpm run test:lint && git add -A src"
+  }
+}