@pythnetwork/price-pusher 5.4.9 → 5.6.2

package/lib/evm/command.d.ts

@@ -13,6 +13,7 @@ declare const _default: {
         "custom-gas-station": Options;
         "tx-speed": Options;
         "override-gas-price-multiplier": Options;
+        "override-gas-price-multiplier-cap": Options;
     };
     handler: (argv: any) => void;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;oBA4CL,GAAG;;AAxC9B,wBA+GE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/evm/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;oBAuDL,GAAG;;AAnD9B,wBA4HE"}

package/lib/evm/command.js

@@ -58,11 +58,21 @@ exports.default = {
             required: false,
         },
         "override-gas-price-multiplier": {
-            description: "Multiply the gas price by this number if the transaction is not landing to override it. Default to 1.1",
+            description: "Multiply the previous gas price by this number if the transaction is not landing to override. " +
+                "Please note that the gas price can grow exponentially on consecutive failures; " +
+                "to set a cap on the multiplier, use the `override-gas-price-multiplier-cap` option." +
+                "Default to 1.1",
             type: "number",
             required: false,
             default: 1.1,
         },
+        "override-gas-price-multiplier-cap": {
+            description: "Maximum gas price multiplier to use in override compared to the RPC returned " +
+                "gas price. Default to 5",
+            type: "number",
+            required: false,
+            default: 5,
+        },
         ...options.priceConfigFile,
         ...options.priceServiceEndpoint,
         ...options.mnemonicFile,
@@ -72,7 +82,7 @@ exports.default = {
     },
     handler: function (argv) {
         // FIXME: type checks for this
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pythContractAddress, pushingFrequency, pollingFrequency, customGasStation, txSpeed, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, } = argv;
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
             logger: {
@@ -95,7 +105,7 @@ exports.default = {
             pollingFrequency,
         });
         const gasStation = (0, custom_gas_station_1.getCustomGasStation)(customGasStation, txSpeed);
-        const evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, pythContractFactory, overrideGasPriceMultiplier, gasStation);
+        const evmPusher = new evm_1.EvmPricePusher(priceServiceConnection, pythContractFactory, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, gasStation);
         const controller = new controller_1.Controller(priceConfigs, pythListener, evmListener, evmPusher, { pushingFrequency });
         controller.start();
     },

package/lib/evm/evm.d.ts

@@ -18,12 +18,13 @@ export declare class EvmPriceListener extends ChainPriceListener {
 export declare class EvmPricePusher implements IPricePusher {
     private connection;
     private overrideGasPriceMultiplier;
+    private overrideGasPriceMultiplierCap;
     private customGasStation?;
     private pythContract;
     private web3;
     private pusherAddress;
     private lastPushAttempt;
-    constructor(connection: PriceServiceConnection, pythContractFactory: PythContractFactory, overrideGasPriceMultiplier: number, customGasStation?: CustomGasStation);
+    constructor(connection: PriceServiceConnection, pythContractFactory: PythContractFactory, overrideGasPriceMultiplier: number, overrideGasPriceMultiplierCap: number, customGasStation?: CustomGasStation);
     updatePriceFeed(priceIds: string[], pubTimesToPush: UnixTimestamp[]): Promise<void>;
     private getPriceFeedsUpdateData;
 }

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

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

package/lib/evm/evm.js

@@ -80,14 +80,16 @@ exports.EvmPriceListener = EvmPriceListener;
 class EvmPricePusher {
     connection;
     overrideGasPriceMultiplier;
+    overrideGasPriceMultiplierCap;
     customGasStation;
     pythContract;
     web3;
     pusherAddress;
     lastPushAttempt;
-    constructor(connection, pythContractFactory, overrideGasPriceMultiplier, customGasStation) {
+    constructor(connection, pythContractFactory, overrideGasPriceMultiplier, overrideGasPriceMultiplierCap, customGasStation) {
         this.connection = connection;
         this.overrideGasPriceMultiplier = overrideGasPriceMultiplier;
+        this.overrideGasPriceMultiplierCap = overrideGasPriceMultiplierCap;
         this.customGasStation = customGasStation;
         this.pythContract = pythContractFactory.createPythContractWithPayer();
         this.web3 = new web3_1.default(pythContractFactory.createWeb3PayerProvider());
@@ -135,7 +137,7 @@ class EvmPricePusher {
             }
         }
         if (gasPriceToOverride !== undefined && gasPriceToOverride > gasPrice) {
-            gasPrice = gasPriceToOverride;
+            gasPrice = Math.min(gasPriceToOverride, gasPrice * this.overrideGasPriceMultiplierCap);
         }
         const txNonce = lastExecutedNonce + 1;
         console.log(`Using gas price: ${gasPrice} and nonce: ${txNonce}`);

package/lib/sui/command.d.ts

@@ -9,12 +9,8 @@ declare const _default: {
         "price-service-endpoint": Options;
         "price-config-file": Options;
         endpoint: Options;
-        "pyth-package-id": Options;
         "pyth-state-id": Options;
-        "wormhole-package-id": Options;
         "wormhole-state-id": Options;
-        "price-feed-to-price-info-object-table-id": Options;
-        "max-vaas-per-ptb": Options;
         "num-gas-objects": Options;
         "gas-budget": Options;
     };

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;oBAgFC,GAAG;;AA5EpC,wBA8JE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/sui/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;;oBAoDC,GAAG;;AAhDpC,wBA0HE"}

package/lib/sui/command.js

@@ -48,42 +48,18 @@ exports.default = {
             type: "string",
             required: true,
         },
-        "pyth-package-id": {
-            description: "Pyth Package Id. Can be found here" +
-                "https://docs.pyth.network/documentation/pythnet-price-feeds/sui",
-            type: "string",
-            required: true,
-        },
         "pyth-state-id": {
             description: "Pyth State Id. Can be found here" +
                 "https://docs.pyth.network/documentation/pythnet-price-feeds/sui",
             type: "string",
             required: true,
         },
-        "wormhole-package-id": {
-            description: "Wormhole Package Id. Can be found here" +
-                "https://docs.pyth.network/documentation/pythnet-price-feeds/sui",
-            type: "string",
-            required: true,
-        },
         "wormhole-state-id": {
             description: "Wormhole State Id. Can be found here" +
                 "https://docs.pyth.network/documentation/pythnet-price-feeds/sui",
             type: "string",
             required: true,
         },
-        "price-feed-to-price-info-object-table-id": {
-            description: "This is the id of the table which stored the information related to price data. You can find it here: " +
-                "https://docs.pyth.network/documentation/pythnet-price-feeds/sui",
-            type: "string",
-            required: true,
-        },
-        "max-vaas-per-ptb": {
-            description: "Maximum number of VAAs that can be included in a single PTB.",
-            type: "number",
-            required: true,
-            default: 1,
-        },
         "num-gas-objects": {
             description: "Number of gas objects in the pool.",
             type: "number",
@@ -103,7 +79,7 @@ exports.default = {
         ...options.pushingFrequency,
     },
     handler: async function (argv) {
-        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, priceFeedToPriceInfoObjectTableId, maxVaasPerPtb, numGasObjects, gasBudget, } = argv;
+        const { endpoint, priceConfigFile, priceServiceEndpoint, mnemonicFile, pushingFrequency, pollingFrequency, pythStateId, wormholeStateId, numGasObjects, gasBudget, } = argv;
         const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
         const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
             logger: {
@@ -124,8 +100,8 @@ exports.default = {
             .toSuiAddress()}`);
         const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
         const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
-        const suiListener = new sui_1.SuiPriceListener(pythPackageId, priceFeedToPriceInfoObjectTableId, endpoint, priceItems, { pollingFrequency });
-        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, priceFeedToPriceInfoObjectTableId, maxVaasPerPtb, endpoint, mnemonic, gasBudget, numGasObjects);
+        const suiListener = new sui_1.SuiPriceListener(pythStateId, wormholeStateId, endpoint, priceItems, { pollingFrequency });
+        const suiPusher = await sui_1.SuiPricePusher.createWithAutomaticGasPool(priceServiceConnection, pythStateId, wormholeStateId, endpoint, mnemonic, gasBudget, numGasObjects);
         const controller = new controller_1.Controller(priceConfigs, pythListener, suiListener, suiPusher, { pushingFrequency });
         controller.start();
     },

package/lib/sui/sui.d.ts

@@ -1,12 +1,12 @@
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
-import { RawSigner, SuiObjectRef } from "@mysten/sui.js";
+import { JsonRpcProvider, RawSigner, SuiObjectRef, ObjectId } from "@mysten/sui.js";
+import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
 export declare class SuiPriceListener extends ChainPriceListener {
-    private pythPackageId;
-    private priceFeedToPriceInfoObjectTableId;
-    private endpoint;
-    constructor(pythPackageId: string, priceFeedToPriceInfoObjectTableId: string, endpoint: string, priceItems: PriceItem[], config: {
+    private pythClient;
+    private provider;
+    constructor(pythStateId: ObjectId, wormholeStateId: ObjectId, endpoint: string, priceItems: PriceItem[], config: {
         pollingFrequency: DurationInSeconds;
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
@@ -32,18 +32,24 @@ export declare class SuiPricePusher implements IPricePusher {
     private pythStateId;
     private wormholePackageId;
     private wormholeStateId;
-    private priceFeedToPriceInfoObjectTableId;
-    private maxVaasPerPtb;
     private gasBudget;
     private gasPool;
-    constructor(signer: RawSigner, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, priceFeedToPriceInfoObjectTableId: string, maxVaasPerPtb: number, endpoint: string, mnemonic: string, gasBudget: number, gasPool: SuiObjectRef[]);
+    private pythClient;
+    constructor(signer: RawSigner, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, endpoint: string, mnemonic: string, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
+    /**
+     * getPackageId returns the latest package id that the object belongs to. Use this to
+     * fetch the latest package id for a given object id and handle package upgrades automatically.
+     * @param provider
+     * @param objectId
+     * @returns package id
+     */
+    static getPackageId(provider: JsonRpcProvider, objectId: ObjectId): Promise<ObjectId>;
     /**
      * 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 mnemonic will be merged and then evenly split into `numGasObjects`.
      */
-    static createWithAutomaticGasPool(priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, priceFeedToPriceInfoObjectTableId: string, maxVaasPerPtb: number, endpoint: string, mnemonic: string, gasBudget: number, numGasObjects: number): Promise<SuiPricePusher>;
+    static createWithAutomaticGasPool(priceServiceConnection: PriceServiceConnection, pythStateId: string, wormholeStateId: string, endpoint: string, mnemonic: string, gasBudget: number, numGasObjects: number): Promise<SuiPricePusher>;
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
-    private createPriceUpdateTransaction;
     /** Send every transaction in txs in parallel, returning when all transactions have completed. */
     private sendTransactionBlocks;
     /** Send a single transaction block using a gas coin from the pool. */

package/lib/sui/sui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAIL,SAAS,EAIT,YAAY,EAKb,MAAM,gBAAgB,CAAC;AAMxB,qBAAa,gBAAiB,SAAQ,kBAAkB;IAEpD,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iCAAiC;IACzC,OAAO,CAAC,QAAQ;gBAFR,aAAa,EAAE,MAAM,EACrB,iCAAiC,EAAE,MAAM,EACzC,QAAQ,EAAE,MAAM,EACxB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAKG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CAmD3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,iCAAiC;IACzC,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;gBAXE,MAAM,EAAE,SAAS,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,iCAAiC,EAAE,MAAM,EACzC,aAAa,EAAE,MAAM,EAC7B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE;IAGjC;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EACvB,iCAAiC,EAAE,MAAM,EACzC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;IAiCpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAsDF,4BAA4B;IA2E1C,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBAsDb,iBAAiB;mBA8BjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAsCnB,oBAAoB;CA2C1C"}
+{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/sui/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EACL,eAAe,EAGf,SAAS,EAGT,YAAY,EAKZ,QAAQ,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAOzD,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAkB;gBAGhC,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ,EACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,SAAS,EAAE,EACvB,MAAM,EAAE;QACN,gBAAgB,EAAE,iBAAiB,CAAC;KACrC;IAWG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;CA+C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,eAAe;IAGvB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBAVD,MAAM,EAAE,SAAS,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,EAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAuBpB;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;IAiDpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBAsDb,iBAAiB;mBAuCjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAsCnB,oBAAoB;CA+D1C"}

package/lib/sui/sui.js

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiPricePusher = exports.SuiPriceListener = void 0;
 const interface_1 = require("../interface");
 const sui_js_1 = require("@mysten/sui.js");
+const pyth_sui_js_1 = require("@pythnetwork/pyth-sui-js");
 const GAS_FEE_FOR_SPLIT = 2_000_000_000;
 // TODO: read this from on chain config
 const MAX_NUM_GAS_OBJECTS_IN_PTB = 256;
 const MAX_NUM_OBJECTS_IN_ARGUMENT = 510;
 class SuiPriceListener extends interface_1.ChainPriceListener {
-    pythPackageId;
-    priceFeedToPriceInfoObjectTableId;
-    endpoint;
-    constructor(pythPackageId, priceFeedToPriceInfoObjectTableId, endpoint, priceItems, config) {
+    pythClient;
+    provider;
+    constructor(pythStateId, wormholeStateId, endpoint, priceItems, config) {
         super("sui", config.pollingFrequency, priceItems);
-        this.pythPackageId = pythPackageId;
-        this.priceFeedToPriceInfoObjectTableId = priceFeedToPriceInfoObjectTableId;
-        this.endpoint = endpoint;
+        this.provider = new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: endpoint }));
+        this.pythClient = new pyth_sui_js_1.SuiPythClient(this.provider, pythStateId, wormholeStateId);
     }
     async getOnChainPriceInfo(priceId) {
         try {
-            const provider = new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: this.endpoint }));
-            const priceInfoObjectId = await priceIdToPriceInfoObjectId(provider, this.pythPackageId, this.priceFeedToPriceInfoObjectTableId, priceId);
+            const priceInfoObjectId = await this.pythClient.getPriceFeedObjectId(priceId);
+            if (priceInfoObjectId === undefined) {
+                throw new Error("Price not found on chain for price id " + priceId);
+            }
             // Fetching the price info object for the above priceInfoObjectId
-            const priceInfoObject = await provider.getObject({
+            const priceInfoObject = await this.provider.getObject({
                 id: priceInfoObjectId,
                 options: { showContent: true },
             });
@@ -72,33 +73,61 @@ class SuiPricePusher {
     pythStateId;
     wormholePackageId;
     wormholeStateId;
-    priceFeedToPriceInfoObjectTableId;
-    maxVaasPerPtb;
     gasBudget;
     gasPool;
-    constructor(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, priceFeedToPriceInfoObjectTableId, maxVaasPerPtb, endpoint, mnemonic, gasBudget, gasPool) {
+    pythClient;
+    constructor(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, mnemonic, gasBudget, gasPool, pythClient) {
         this.signer = signer;
         this.priceServiceConnection = priceServiceConnection;
         this.pythPackageId = pythPackageId;
         this.pythStateId = pythStateId;
         this.wormholePackageId = wormholePackageId;
         this.wormholeStateId = wormholeStateId;
-        this.priceFeedToPriceInfoObjectTableId = priceFeedToPriceInfoObjectTableId;
-        this.maxVaasPerPtb = maxVaasPerPtb;
         this.gasBudget = gasBudget;
         this.gasPool = gasPool;
+        this.pythClient = pythClient;
+    }
+    /**
+     * getPackageId returns the latest package id that the object belongs to. Use this to
+     * fetch the latest package id for a given object id and handle package upgrades automatically.
+     * @param provider
+     * @param objectId
+     * @returns package id
+     */
+    static async getPackageId(provider, objectId) {
+        const state = await provider
+            .getObject({
+            id: objectId,
+            options: {
+                showContent: true,
+            },
+        })
+            .then((result) => {
+            if (result.data?.content?.dataType == "moveObject") {
+                return result.data.content.fields;
+            }
+            throw new Error("not move object");
+        });
+        if ("upgrade_cap" in state) {
+            return state.upgrade_cap.fields.package;
+        }
+        throw new Error("upgrade_cap not found");
     }
     /**
      * 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 mnemonic will be merged and then evenly split into `numGasObjects`.
      */
-    static async createWithAutomaticGasPool(priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, priceFeedToPriceInfoObjectTableId, maxVaasPerPtb, endpoint, mnemonic, gasBudget, numGasObjects) {
+    static async createWithAutomaticGasPool(priceServiceConnection, pythStateId, wormholeStateId, endpoint, mnemonic, gasBudget, numGasObjects) {
         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 signer = new sui_js_1.RawSigner(sui_js_1.Ed25519Keypair.deriveKeypair(mnemonic), new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: endpoint })));
+        const provider = new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: endpoint }));
+        const signer = new sui_js_1.RawSigner(sui_js_1.Ed25519Keypair.deriveKeypair(mnemonic), provider);
+        const pythPackageId = await SuiPricePusher.getPackageId(provider, pythStateId);
+        const wormholePackageId = await SuiPricePusher.getPackageId(provider, wormholeStateId);
         const gasPool = await SuiPricePusher.initializeGasPool(signer, numGasObjects);
-        return new SuiPricePusher(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, priceFeedToPriceInfoObjectTableId, maxVaasPerPtb, endpoint, mnemonic, gasBudget, gasPool);
+        const pythClient = new pyth_sui_js_1.SuiPythClient(provider, pythStateId, wormholeStateId);
+        return new SuiPricePusher(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, mnemonic, gasBudget, gasPool, pythClient);
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -110,99 +139,20 @@ class SuiPricePusher {
             console.warn("Skipping update: no available gas coin.");
             return;
         }
-        const priceFeeds = await this.priceServiceConnection.getLatestPriceFeeds(priceIds);
-        if (priceFeeds === undefined) {
-            console.warn("Failed to fetch price updates. Skipping push.");
-            return;
-        }
-        const vaaToPriceFeedIds = new Map();
-        for (const priceFeed of priceFeeds) {
-            // The ! will succeed as long as the priceServiceConnection is configured to return binary vaa data (which it is).
-            const vaa = priceFeed.getVAA();
-            if (!vaaToPriceFeedIds.has(vaa)) {
-                vaaToPriceFeedIds.set(vaa, []);
-            }
-            vaaToPriceFeedIds.get(vaa).push(priceFeed.id);
-        }
-        const txs = [];
-        let currentBatchVaas = [];
-        let currentBatchPriceFeedIds = [];
-        for (const [vaa, priceFeedIds] of vaaToPriceFeedIds.entries()) {
-            currentBatchVaas.push(vaa);
-            currentBatchPriceFeedIds.push(...priceFeedIds);
-            if (currentBatchVaas.length >= this.maxVaasPerPtb) {
-                const tx = await this.createPriceUpdateTransaction(currentBatchVaas, currentBatchPriceFeedIds);
-                if (tx !== undefined) {
-                    txs.push(tx);
-                }
-                currentBatchVaas = [];
-                currentBatchPriceFeedIds = [];
-            }
-        }
-        await this.sendTransactionBlocks(txs);
-    }
-    async createPriceUpdateTransaction(vaas, priceIds) {
-        const tx = new sui_js_1.TransactionBlock();
-        // Parse our batch price attestation VAA bytes using Wormhole.
-        // Check out the Wormhole cross-chain bridge and generic messaging protocol here:
-        //     https://github.com/wormhole-foundation/wormhole
-        let verified_vaas = [];
-        for (const vaa of vaas) {
-            const [verified_vaa] = tx.moveCall({
-                target: `${this.wormholePackageId}::vaa::parse_and_verify`,
-                arguments: [
-                    tx.object(this.wormholeStateId),
-                    tx.pure([...Buffer.from(vaa, "base64")]),
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-            verified_vaas = verified_vaas.concat(verified_vaa);
-        }
-        // Create a hot potato vector of price feed updates that will
-        // be used to update price feeds.
-        let [price_updates_hot_potato] = tx.moveCall({
-            target: `${this.pythPackageId}::pyth::create_price_infos_hot_potato`,
-            arguments: [
-                tx.object(this.pythStateId),
-                tx.makeMoveVec({
-                    type: `${this.wormholePackageId}::vaa::VAA`,
-                    objects: verified_vaas,
-                }),
-                tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-            ],
-        });
-        // Update each price info object (containing our price feeds of interest)
-        // using the hot potato vector.
-        for (const priceId of priceIds) {
-            let priceInfoObjectId;
-            try {
-                priceInfoObjectId = await priceIdToPriceInfoObjectId(this.signer.provider, this.pythPackageId, this.priceFeedToPriceInfoObjectTableId, priceId);
-            }
-            catch (e) {
-                console.log("Error fetching price info object id for ", priceId);
-                console.error(e);
-                return undefined;
+        // 3 price feeds per transaction is the optimal number for gas cost.
+        const priceIdChunks = chunkArray(priceIds, 3);
+        const txBlocks = [];
+        await Promise.all(priceIdChunks.map(async (priceIdChunk) => {
+            const vaas = await this.priceServiceConnection.getLatestVaas(priceIdChunk);
+            if (vaas.length !== 1) {
+                throw new Error(`Expected a single VAA for all priceIds ${priceIdChunk} but received ${vaas.length} VAAs: ${vaas}`);
             }
-            const coin = tx.splitCoins(tx.gas, [tx.pure(1)]);
-            [price_updates_hot_potato] = tx.moveCall({
-                target: `${this.pythPackageId}::pyth::update_single_price_feed`,
-                arguments: [
-                    tx.object(this.pythStateId),
-                    price_updates_hot_potato,
-                    tx.object(priceInfoObjectId),
-                    coin,
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-        }
-        // Explicitly destroy the hot potato vector, since it can't be dropped
-        // automatically.
-        tx.moveCall({
-            target: `${this.pythPackageId}::hot_potato_vector::destroy`,
-            arguments: [price_updates_hot_potato],
-            typeArguments: [`${this.pythPackageId}::price_info::PriceInfo`],
-        });
-        return tx;
+            const vaa = vaas[0];
+            const tx = new sui_js_1.TransactionBlock();
+            await this.pythClient.updatePriceFeeds(tx, [Buffer.from(vaa, "base64")], priceIdChunk);
+            txBlocks.push(tx);
+        }));
+        await this.sendTransactionBlocks(txBlocks);
     }
     /** Send every transaction in txs in parallel, returning when all transactions have completed. */
     async sendTransactionBlocks(txs) {
@@ -253,11 +203,20 @@ class SuiPricePusher {
     // split them equally into numGasObjects.
     static async initializeGasPool(signer, numGasObjects) {
         const signerAddress = await signer.getAddress();
-        const { totalBalance: balance } = await signer.provider.getBalance({
-            owner: signerAddress,
+        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, signerAddress);
+        const coinResult = await signer.provider.getObject({
+            id: consolidatedCoin.objectId,
+            options: { showContent: true },
         });
+        let balance;
+        if (coinResult.data &&
+            coinResult.data.content &&
+            coinResult.data.content.dataType == "moveObject") {
+            balance = coinResult.data.content.fields.balance;
+        }
+        else
+            throw new Error("Bad coin object");
         const splitAmount = (BigInt(balance) - BigInt(GAS_FEE_FOR_SPLIT)) / BigInt(numGasObjects);
-        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, signerAddress);
         const gasPool = await SuiPricePusher.splitGasCoinEqually(signer, signerAddress, Number(splitAmount), numGasObjects, consolidatedCoin);
         console.log("Gas pool is filled with coins: ", gasPool);
         return gasPool;
@@ -335,17 +294,35 @@ class SuiPricePusher {
         }
         const gasCoinsChunks = chunkArray(gasCoins, MAX_NUM_GAS_OBJECTS_IN_PTB - 2);
         let finalCoin;
+        const lockedAddresses = new Set();
         for (let i = 0; i < gasCoinsChunks.length; i++) {
             const mergeTx = new sui_js_1.TransactionBlock();
             let coins = gasCoinsChunks[i];
+            coins = coins.filter((coin) => !lockedAddresses.has(coin.objectId));
             if (finalCoin) {
                 coins = [finalCoin, ...coins];
             }
             mergeTx.setGasPayment(coins);
-            const mergeResult = await signer.signAndExecuteTransactionBlock({
-                transactionBlock: mergeTx,
-                options: { showEffects: true },
-            });
+            let mergeResult;
+            try {
+                mergeResult = await signer.signAndExecuteTransactionBlock({
+                    transactionBlock: mergeTx,
+                    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) => {
+                        lockedObjects.forEach((lockedObject) => {
+                            lockedAddresses.add(lockedObject[0]);
+                        });
+                    });
+                    // retry merging without the locked coins
+                    i--;
+                    continue;
+                }
+                throw e;
+            }
             const error = (0, sui_js_1.getExecutionStatusError)(mergeResult);
             if (error) {
                 throw new Error(`Failed to merge coins when initializing gas pool: ${error}. Try re-running the script`);
@@ -356,37 +333,6 @@ class SuiPricePusher {
     }
 }
 exports.SuiPricePusher = SuiPricePusher;
-// We are calculating stored price info object id for given price id
-// The mapping between which is static. Hence, we are caching it here.
-const CACHE = {};
-// For given priceid, this method will fetch the price info object id
-// where the price information for the corresponding price feed is stored
-async function priceIdToPriceInfoObjectId(provider, pythPackageId, priceFeedToPriceInfoObjectTableId, priceId) {
-    // Check if this was fetched before.
-    if (CACHE[priceId] !== undefined)
-        return CACHE[priceId];
-    const storedObjectID = await provider.getDynamicFieldObject({
-        parentId: priceFeedToPriceInfoObjectTableId,
-        name: {
-            type: `${pythPackageId}::price_identifier::PriceIdentifier`,
-            value: {
-                bytes: "0x" + priceId,
-            },
-        },
-    });
-    if (storedObjectID.error !== undefined)
-        throw storedObjectID.error;
-    if (storedObjectID.data === undefined ||
-        storedObjectID.data.content === undefined)
-        throw new Error("Price not found on chain for price id " + priceId);
-    if (storedObjectID.data.content.dataType !== "moveObject")
-        throw new Error("fetched object datatype should be moveObject");
-    // This ID points to the price info object for the given price id stored on chain
-    const priceInfoObjectId = storedObjectID.data.content.fields.value;
-    // cache the price info object id
-    CACHE[priceId] = priceInfoObjectId;
-    return priceInfoObjectId;
-}
 function chunkArray(array, size) {
     const chunked = [];
     let index = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "5.4.9",
+  "version": "5.6.2",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -52,9 +52,10 @@
   },
   "dependencies": {
     "@injectivelabs/sdk-ts": "1.10.72",
-    "@mysten/sui.js": "^0.34.0",
+    "@mysten/sui.js": "^0.37.1",
     "@pythnetwork/price-service-client": "*",
     "@pythnetwork/pyth-sdk-solidity": "*",
+    "@pythnetwork/pyth-sui-js": "*",
     "@truffle/hdwallet-provider": "^2.1.3",
     "aptos": "^1.8.5",
     "joi": "^17.6.0",
@@ -63,5 +64,5 @@
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "d5c3090442940a6a1d7c254be9896fa38b827e40"
+  "gitHead": "eb9526675cc3aa5f6dd99e43986ea767128bfd4f"
 }