@pythnetwork/price-pusher 5.4.8 → 5.4.10

package/lib/aptos/aptos.d.ts

@@ -10,6 +10,16 @@ export declare class AptosPriceListener extends ChainPriceListener {
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
 }
 export declare const APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
+/**
+ * The `AptosPricePusher` is designed for high-throughput of price updates.
+ * Achieving this property requires sacrificing some nice-to-have features of other
+ * pusher implementations that can reduce cost when running multiple pushers. Specifically,
+ * this implementation does not use `update_price_feeds_if_necssary` and simulate the transaction
+ * before submission.
+ *
+ * If multiple instances of this pusher are running in parallel, both of them will
+ * land all of their pushed updates on-chain.
+ */
 export declare class AptosPricePusher implements IPricePusher {
     private priceServiceConnection;
     private pythContractAddress;

package/lib/aptos/aptos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;gBADR,UAAU,EAAE,MAAM,EAClB,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;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAC3D,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IATpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAQhE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAiEF,8BAA8B;YAsB9B,wBAAwB;CA+BvC"}
+{"version":3,"file":"aptos.d.ts","sourceRoot":"","sources":["../../src/aptos/aptos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,qBAAa,kBAAmB,SAAQ,kBAAkB;IAEtD,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ;gBADR,UAAU,EAAE,MAAM,EAClB,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;CA6C3E;AAGD,eAAO,MAAM,qBAAqB,wBAAwB,CAAC;AAE3D;;;;;;;;;GASG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IAOjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IATpC,OAAO,CAAC,kBAAkB,CAAqB;IAE/C,OAAO,CAAC,oBAAoB,CAAU;gBAG5B,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAK5C;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;IAQhE,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAiEF,8BAA8B;YAsB9B,wBAAwB;CA+BvC"}

package/lib/aptos/aptos.js

@@ -44,6 +44,16 @@ class AptosPriceListener extends interface_1.ChainPriceListener {
 exports.AptosPriceListener = AptosPriceListener;
 // Derivation path for aptos accounts
 exports.APTOS_ACCOUNT_HD_PATH = "m/44'/637'/0'/0'/0'";
+/**
+ * The `AptosPricePusher` is designed for high-throughput of price updates.
+ * Achieving this property requires sacrificing some nice-to-have features of other
+ * pusher implementations that can reduce cost when running multiple pushers. Specifically,
+ * this implementation does not use `update_price_feeds_if_necssary` and simulate the transaction
+ * before submission.
+ *
+ * If multiple instances of this pusher are running in parallel, both of them will
+ * land all of their pushed updates on-chain.
+ */
 class AptosPricePusher {
     priceServiceConnection;
     pythContractAddress;

package/lib/injective/injective.js

@@ -69,31 +69,31 @@ class InjectivePricePusher {
         });
         const txService = new sdk_ts_1.TxGrpcClient(this.grpcEndpoint);
         // simulation
-        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,
-            message: msg,
-            chainId: this.chainConfig.chainId,
-            fee,
-            pubKey: this.wallet.toPublicKey().toBase64(),
-        });
-        const sig = await this.wallet.sign(Buffer.from(signBytes));
         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,
+                message: msg,
+                chainId: this.chainConfig.chainId,
+                fee,
+                pubKey: this.wallet.toPublicKey().toBase64(),
+            });
+            const sig = await this.wallet.sign(Buffer.from(signBytes));
             this.account.baseAccount.sequence++;
             /** Append Signatures */
             txRaw.signatures = [sig];

package/lib/sui/sui.d.ts

@@ -11,6 +11,20 @@ export declare class SuiPriceListener extends ChainPriceListener {
     });
     getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
 }
+/**
+ * The `SuiPricePusher` is designed for high-throughput of price updates.
+ * Achieving this property requires sacrificing some nice-to-have features of other
+ * pusher implementations that can reduce cost when running multiple pushers. It also requires
+ * jumping through some Sui-specific hoops in order to maximize parallelism.
+ *
+ * The two main design features are:
+ * 1. This implementation does not use `update_price_feeds_if_necssary` and simulate the transaction
+ *    before submission. If multiple instances of this pusher are running in parallel, all of them will
+ *    land all of their pushed updates on-chain.
+ * 2. The pusher will split the Coin balance in the provided account into a pool of different Coin objects.
+ *    Each transaction will be allocated a Coin object from this pool as needed. This process enables the
+ *    transactions to avoid referencing the same owned objects, which allows them to be processed in parallel.
+ */
 export declare class SuiPricePusher implements IPricePusher {
     private readonly signer;
     private priceServiceConnection;

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,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,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;mBAuCjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAsCnB,oBAAoB;CA+D1C"}

package/lib/sui/sui.js

@@ -51,6 +51,20 @@ class SuiPriceListener extends interface_1.ChainPriceListener {
     }
 }
 exports.SuiPriceListener = SuiPriceListener;
+/**
+ * The `SuiPricePusher` is designed for high-throughput of price updates.
+ * Achieving this property requires sacrificing some nice-to-have features of other
+ * pusher implementations that can reduce cost when running multiple pushers. It also requires
+ * jumping through some Sui-specific hoops in order to maximize parallelism.
+ *
+ * The two main design features are:
+ * 1. This implementation does not use `update_price_feeds_if_necssary` and simulate the transaction
+ *    before submission. If multiple instances of this pusher are running in parallel, all of them will
+ *    land all of their pushed updates on-chain.
+ * 2. The pusher will split the Coin balance in the provided account into a pool of different Coin objects.
+ *    Each transaction will be allocated a Coin object from this pool as needed. This process enables the
+ *    transactions to avoid referencing the same owned objects, which allows them to be processed in parallel.
+ */
 class SuiPricePusher {
     signer;
     priceServiceConnection;
@@ -239,11 +253,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;
@@ -321,17 +344,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`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "5.4.8",
+  "version": "5.4.10",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -63,5 +63,5 @@
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "55129e5b891b0ce0271dbee69a8b4b7512a222d1"
+  "gitHead": "f41cf822ff404de523c9d4e34bed816e140cfa83"
 }