@pythnetwork/price-pusher 6.7.0 → 7.0.0-alpha

package/lib/sui/sui.js

@@ -12,10 +12,12 @@ const MAX_NUM_OBJECTS_IN_ARGUMENT = 510;
 class SuiPriceListener extends interface_1.ChainPriceListener {
     pythClient;
     provider;
-    constructor(pythStateId, wormholeStateId, endpoint, priceItems, config) {
-        super("sui", config.pollingFrequency, priceItems);
+    logger;
+    constructor(pythStateId, wormholeStateId, endpoint, priceItems, logger, config) {
+        super(config.pollingFrequency, priceItems);
         this.provider = new client_1.SuiClient({ url: endpoint });
         this.pythClient = new pyth_sui_js_1.SuiPythClient(this.provider, pythStateId, wormholeStateId);
+        this.logger = logger;
     }
     async getOnChainPriceInfo(priceId) {
         try {
@@ -46,9 +48,8 @@ class SuiPriceListener extends interface_1.ChainPriceListener {
                 publishTime: Number(timestamp),
             };
         }
-        catch (e) {
-            console.error(`Polling Sui on-chain price for ${priceId} failed. Error:`);
-            console.error(e);
+        catch (err) {
+            this.logger.error(err, `Polling Sui on-chain price for ${priceId} failed.`);
             return undefined;
         }
     }
@@ -71,6 +72,7 @@ exports.SuiPriceListener = SuiPriceListener;
 class SuiPricePusher {
     signer;
     provider;
+    logger;
     priceServiceConnection;
     pythPackageId;
     pythStateId;
@@ -79,9 +81,10 @@ class SuiPricePusher {
     gasBudget;
     gasPool;
     pythClient;
-    constructor(signer, provider, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient) {
+    constructor(signer, provider, logger, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient) {
         this.signer = signer;
         this.provider = provider;
+        this.logger = logger;
         this.priceServiceConnection = priceServiceConnection;
         this.pythPackageId = pythPackageId;
         this.pythStateId = pythStateId;
@@ -123,16 +126,16 @@ class SuiPricePusher {
      * Create a price pusher with a pool of `numGasObjects` gas coins that will be used to send transactions.
      * The gas coins of the wallet for the provided keypair will be merged and then evenly split into `numGasObjects`.
      */
-    static async createWithAutomaticGasPool(priceServiceConnection, pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects) {
+    static async createWithAutomaticGasPool(priceServiceConnection, logger, pythStateId, wormholeStateId, endpoint, keypair, gasBudget, numGasObjects, ignoreGasObjects) {
         if (numGasObjects > MAX_NUM_OBJECTS_IN_ARGUMENT) {
             throw new Error(`numGasObjects cannot be greater than ${MAX_NUM_OBJECTS_IN_ARGUMENT} until we implement split chunking`);
         }
         const provider = new client_1.SuiClient({ url: endpoint });
         const pythPackageId = await SuiPricePusher.getPackageId(provider, pythStateId);
         const wormholePackageId = await SuiPricePusher.getPackageId(provider, wormholeStateId);
-        const gasPool = await SuiPricePusher.initializeGasPool(keypair, provider, numGasObjects);
+        const gasPool = await SuiPricePusher.initializeGasPool(keypair, provider, numGasObjects, ignoreGasObjects, logger);
         const pythClient = new pyth_sui_js_1.SuiPythClient(provider, pythStateId, wormholeStateId);
-        return new SuiPricePusher(keypair, provider, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient);
+        return new SuiPricePusher(keypair, provider, logger, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient);
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -141,7 +144,7 @@ class SuiPricePusher {
         if (priceIds.length !== pubTimesToPush.length)
             throw new Error("Invalid arguments");
         if (this.gasPool.length === 0) {
-            console.warn("Skipping update: no available gas coin.");
+            this.logger.warn("Skipping update: no available gas coin.");
             return;
         }
         // 3 price feeds per transaction is the optimal number for gas cost.
@@ -167,7 +170,7 @@ class SuiPricePusher {
     async sendTransactionBlock(tx) {
         const gasObject = this.gasPool.shift();
         if (gasObject === undefined) {
-            console.warn("No available gas coin. Skipping push.");
+            this.logger.warn("No available gas coin. Skipping push.");
             return;
         }
         let nextGasObject = undefined;
@@ -184,24 +187,20 @@ class SuiPricePusher {
             nextGasObject = result.effects?.mutated
                 ?.map((obj) => obj.reference)
                 .find((ref) => ref.objectId === gasObject.objectId);
-            console.log("Successfully updated price with transaction digest ", result.digest);
+            this.logger.info({ hash: result.digest }, "Successfully updated price with transaction digest");
         }
-        catch (e) {
-            console.log("Error when signAndExecuteTransactionBlock");
-            if (String(e).includes("Balance of gas object") ||
-                String(e).includes("GasBalanceTooLow")) {
+        catch (err) {
+            if (String(err).includes("Balance of gas object") ||
+                String(err).includes("GasBalanceTooLow")) {
+                this.logger.error(err, "Insufficient gas balance");
                 // If the error is caused by insufficient gas, we should panic
-                throw e;
+                throw err;
             }
             else {
+                this.logger.error(err, "Failed to update price. Trying to refresh gas object references.");
                 // Refresh the coin object here in case the error is caused by an object version mismatch.
                 nextGasObject = await SuiPricePusher.tryRefreshObjectReference(this.provider, gasObject);
             }
-            console.error(e);
-            if ("data" in e) {
-                console.error("Error has .data field:");
-                console.error(JSON.stringify(e.data));
-            }
         }
         if (nextGasObject !== undefined) {
             this.gasPool.push(nextGasObject);
@@ -209,9 +208,14 @@ class SuiPricePusher {
     }
     // This function will smash all coins owned by the signer into one, and then
     // split them equally into numGasObjects.
-    static async initializeGasPool(signer, provider, numGasObjects) {
+    // ignoreGasObjects is a list of gas objects that will be ignored during the
+    // merging -- use this to store any locked objects on initialization.
+    static async initializeGasPool(signer, provider, numGasObjects, ignoreGasObjects, logger) {
         const signerAddress = await signer.toSuiAddress();
-        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, provider, signerAddress);
+        if (ignoreGasObjects.length > 0) {
+            logger.info({ ignoreGasObjects }, "Ignoring some gas objects for coin merging");
+        }
+        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, provider, signerAddress, ignoreGasObjects, logger);
         const coinResult = await provider.getObject({
             id: consolidatedCoin.objectId,
             options: { showContent: true },
@@ -228,7 +232,7 @@ class SuiPricePusher {
             throw new Error("Bad coin object");
         const splitAmount = (BigInt(balance) - BigInt(GAS_FEE_FOR_SPLIT)) / BigInt(numGasObjects);
         const gasPool = await SuiPricePusher.splitGasCoinEqually(signer, provider, signerAddress, Number(splitAmount), numGasObjects, consolidatedCoin);
-        console.log("Gas pool is filled with coins: ", gasPool);
+        logger.info({ gasPool }, "Gas pool is filled with coins");
         return gasPool;
     }
     // Attempt to refresh the version of the provided object reference to point to the current version
@@ -297,7 +301,7 @@ class SuiPricePusher {
         }
         return newCoins;
     }
-    static async mergeGasCoinsIntoOne(signer, provider, owner) {
+    static async mergeGasCoinsIntoOne(signer, provider, owner, initialLockedAddresses, logger) {
         const gasCoins = await SuiPricePusher.getAllGasCoins(provider, owner);
         // skip merging if there is only one coin
         if (gasCoins.length === 1) {
@@ -306,6 +310,7 @@ class SuiPricePusher {
         const gasCoinsChunks = chunkArray(gasCoins, MAX_NUM_GAS_OBJECTS_IN_PTB - 2);
         let finalCoin;
         const lockedAddresses = new Set();
+        initialLockedAddresses.forEach((value) => lockedAddresses.add(value));
         for (let i = 0; i < gasCoinsChunks.length; i++) {
             const mergeTx = new transactions_1.TransactionBlock();
             let coins = gasCoinsChunks[i];
@@ -322,9 +327,10 @@ class SuiPricePusher {
                     options: { showEffects: true },
                 });
             }
-            catch (e) {
-                if (String(e).includes("quorum of validators because of locked objects. Retried a conflicting transaction")) {
-                    Object.values(e.data).forEach((lockedObjects) => {
+            catch (err) {
+                logger.error(err, "Merge transaction failed with error");
+                if (String(err).includes("quorum of validators because of locked objects. Retried a conflicting transaction")) {
+                    Object.values(err.data).forEach((lockedObjects) => {
                         lockedObjects.forEach((lockedObject) => {
                             lockedAddresses.add(lockedObject[0]);
                         });
@@ -333,7 +339,7 @@ class SuiPricePusher {
                     i--;
                     continue;
                 }
-                throw e;
+                throw err;
             }
             const error = mergeResult?.effects?.status.error;
             if (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "6.7.0",
+  "version": "7.0.0-alpha",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -26,9 +26,9 @@
     "lint": "eslint src/",
     "start": "node lib/index.js",
     "dev": "ts-node src/index.ts",
-    "prepublishOnly": "npm run build && npm test && npm run lint",
-    "preversion": "npm run lint",
-    "version": "npm run format && git add -A src"
+    "prepublishOnly": "pnpm run build && pnpm test && pnpm run lint",
+    "preversion": "pnpm run lint",
+    "version": "pnpm run format && git add -A src"
   },
   "keywords": [
     "pyth",
@@ -42,30 +42,40 @@
     "@types/ethereum-protocol": "^1.0.2",
     "@types/jest": "^27.4.1",
     "@types/yargs": "^17.0.10",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.13.0",
     "jest": "^29.7.0",
+    "pino-pretty": "^11.2.1",
     "prettier": "^2.6.2",
     "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@coral-xyz/anchor": "^0.30.0",
+    "@injectivelabs/networks": "^1.14.6",
     "@injectivelabs/sdk-ts": "1.10.72",
     "@mysten/sui.js": "^0.49.1",
-    "@pythnetwork/price-service-client": "*",
-    "@pythnetwork/pyth-sdk-solidity": "*",
-    "@pythnetwork/pyth-solana-receiver": "*",
-    "@pythnetwork/pyth-sui-js": "*",
+    "@pythnetwork/price-service-client": "1.9.0",
+    "@pythnetwork/price-service-sdk": "^1.7.1",
+    "@pythnetwork/pyth-sdk-solidity": "3.1.0",
+    "@pythnetwork/pyth-solana-receiver": "0.8.0",
+    "@pythnetwork/pyth-sui-js": "2.0.0",
+    "@pythnetwork/solana-utils": "0.4.1",
+    "@solana/web3.js": "^1.93.0",
     "@truffle/hdwallet-provider": "^2.1.3",
+    "@types/pino": "^7.0.5",
     "aptos": "^1.8.5",
     "jito-ts": "^3.0.1",
     "joi": "^17.6.0",
     "near-api-js": "^3.0.2",
+    "pino": "^9.2.0",
     "web3": "^1.8.1",
+    "web3-core": "^1.8.1",
     "web3-eth-contract": "^1.8.1",
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "586a4398bd2b1f178ee70a38ff101bd1aec8971f"
+  "gitHead": "40a63bf8f80d9f929eeddfb7c4e4f9d0e56d93fb"
 }