@pythnetwork/price-pusher 5.4.2 → 5.4.4

package/lib/aptos/aptos.d.ts

@@ -9,14 +9,15 @@ 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'";
 export declare class AptosPricePusher implements IPricePusher {
     private priceServiceConnection;
     private pythContractAddress;
     private endpoint;
     private mnemonic;
     private overrideGasPriceMultiplier;
-    private lastPushAttempt;
-    private readonly accountHDPath;
+    private lastSequenceNumber;
+    private sequenceNumberLocked;
     constructor(priceServiceConnection: PriceServiceConnection, pythContractAddress: string, endpoint: string, mnemonic: string, overrideGasPriceMultiplier: number);
     /**
      * Gets price update data which then can be submitted to the Pyth contract to update the prices.
@@ -27,5 +28,6 @@ export declare class AptosPricePusher implements IPricePusher {
      */
     getPriceFeedsUpdateData(priceIds: string[]): Promise<number[][]>;
     updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+    private tryGetNextSequenceNumber;
 }
 //# sourceMappingURL=aptos.d.ts.map

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;AAG3E,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;AAED,qBAAa,gBAAiB,YAAW,YAAY;IAKjD,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,0BAA0B;IARpC,OAAO,CAAC,eAAe,CAA0B;IAEjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;gBAE7C,sBAAsB,EAAE,sBAAsB,EAC9C,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,0BAA0B,EAAE,MAAM;IAG5C;;;;;;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;CAyFjB"}
+{"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;YA4DF,wBAAwB;CA+BvC"}

package/lib/aptos/aptos.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AptosPricePusher = exports.AptosPriceListener = void 0;
+exports.AptosPricePusher = exports.APTOS_ACCOUNT_HD_PATH = exports.AptosPriceListener = void 0;
 const interface_1 = require("../interface");
 const aptos_1 = require("aptos");
 class AptosPriceListener extends interface_1.ChainPriceListener {
@@ -42,20 +42,25 @@ 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'";
 class AptosPricePusher {
     priceServiceConnection;
     pythContractAddress;
     endpoint;
     mnemonic;
     overrideGasPriceMultiplier;
-    lastPushAttempt;
-    accountHDPath = "m/44'/637'/0'/0'/0'";
+    // The last sequence number that has a transaction submitted.
+    lastSequenceNumber;
+    // If true, we are trying to fetch the most recent sequence number from the blockchain.
+    sequenceNumberLocked;
     constructor(priceServiceConnection, pythContractAddress, endpoint, mnemonic, overrideGasPriceMultiplier) {
         this.priceServiceConnection = priceServiceConnection;
         this.pythContractAddress = pythContractAddress;
         this.endpoint = endpoint;
         this.mnemonic = mnemonic;
         this.overrideGasPriceMultiplier = overrideGasPriceMultiplier;
+        this.sequenceNumberLocked = false;
     }
     /**
      * Gets price update data which then can be submitted to the Pyth contract to update the prices.
@@ -86,54 +91,59 @@ class AptosPricePusher {
             return;
         }
         try {
-            const account = aptos_1.AptosAccount.fromDerivePath(this.accountHDPath, this.mnemonic);
+            const account = aptos_1.AptosAccount.fromDerivePath(exports.APTOS_ACCOUNT_HD_PATH, this.mnemonic);
             const client = new aptos_1.AptosClient(this.endpoint);
+            const sequenceNumber = await this.tryGetNextSequenceNumber(client, account);
             const rawTx = await client.generateTransaction(account.address(), {
-                function: `${this.pythContractAddress}::pyth::update_price_feeds_if_fresh_with_funder`,
+                function: `${this.pythContractAddress}::pyth::update_price_feeds_with_funder`,
                 type_arguments: [],
-                arguments: [
-                    priceFeedUpdateData,
-                    priceIds.map((priceId) => Buffer.from(priceId, "hex")),
-                    pubTimesToPush,
-                ],
+                arguments: [priceFeedUpdateData],
+            }, {
+                sequence_number: sequenceNumber.toFixed(),
             });
-            const simulation = await client.simulateTransaction(account, rawTx, {
-                estimateGasUnitPrice: true,
-                estimateMaxGasAmount: true,
-                estimatePrioritizedGasUnitPrice: true,
-            });
-            // Transactions on Aptos can be prioritized by paying a higher gas unit price.
-            // We are storing the gas unit price paid for the last transaction.
-            // If that transaction is not added to the block, we are increasing the gas unit price
-            // by multiplying the old gas unit price with `this.overrideGasPriceMultiplier`.
-            // After which we are sending a transaction with the same sequence number as the last
-            // transaction. Since they have the same sequence number only one of them will be added to
-            // the block and we won't be paying fees twice.
-            let gasUnitPrice = Number(simulation[0].gas_unit_price);
-            if (this.lastPushAttempt !== undefined &&
-                Number(simulation[0].sequence_number) === this.lastPushAttempt.nonce) {
-                const newGasUnitPrice = Number(this.lastPushAttempt.gasPrice * this.overrideGasPriceMultiplier);
-                if (gasUnitPrice < newGasUnitPrice)
-                    gasUnitPrice = newGasUnitPrice;
-            }
-            const gasUsed = Number(simulation[0].gas_used) * 1.5;
-            const maxGasAmount = Number(gasUnitPrice * gasUsed);
-            const rawTxWithFee = new aptos_1.TxnBuilderTypes.RawTransaction(rawTx.sender, rawTx.sequence_number, rawTx.payload, BigInt(maxGasAmount.toFixed()), BigInt(gasUnitPrice.toFixed()), rawTx.expiration_timestamp_secs, rawTx.chain_id);
-            const signedTx = await client.signTransaction(account, rawTxWithFee);
+            const signedTx = await client.signTransaction(account, rawTx);
             const pendingTx = await client.submitTransaction(signedTx);
-            console.log("Succesfully broadcasted txHash:", pendingTx.hash);
-            // Update lastAttempt
-            this.lastPushAttempt = {
-                nonce: Number(pendingTx.sequence_number),
-                gasPrice: gasUnitPrice,
-            };
+            console.log("Successfully broadcasted txHash:", pendingTx.hash);
             return;
         }
         catch (e) {
             console.error("Error executing messages");
             console.log(e);
+            // Reset the sequence number to re-sync it (in case that was the issue)
+            this.lastSequenceNumber = undefined;
             return;
         }
     }
+    // Try to get the next sequence number for account. This function uses a local cache
+    // to predict the next sequence number if possible; if not, it fetches the number from
+    // the blockchain itself (and caches it for later).
+    async tryGetNextSequenceNumber(client, account) {
+        if (this.lastSequenceNumber !== undefined) {
+            this.lastSequenceNumber += 1;
+            return this.lastSequenceNumber;
+        }
+        else {
+            // Fetch from the blockchain if we don't have the local cache.
+            // Note that this is locked so that only 1 fetch occurs regardless of how many updates
+            // happen during that fetch.
+            if (!this.sequenceNumberLocked) {
+                try {
+                    this.sequenceNumberLocked = true;
+                    this.lastSequenceNumber = Number((await client.getAccount(account.address())).sequence_number);
+                    console.log(`Fetched account sequence number: ${this.lastSequenceNumber}`);
+                    return this.lastSequenceNumber;
+                }
+                catch (e) {
+                    throw new Error("Failed to retrieve sequence number");
+                }
+                finally {
+                    this.sequenceNumberLocked = false;
+                }
+            }
+            else {
+                throw new Error("Waiting for sequence number in another thread.");
+            }
+        }
+    }
 }
 exports.AptosPricePusher = AptosPricePusher;

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

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;oBA6BL,GAAG;;AA1B9B,wBAsFE"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/aptos/command.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;oBAkCL,GAAG;;AA1B9B,wBA2FE"}

package/lib/aptos/command.js

@@ -33,6 +33,7 @@ const fs_1 = __importDefault(require("fs"));
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const aptos_1 = require("./aptos");
+const aptos_2 = require("aptos");
 exports.default = {
     command: "aptos",
     describe: "run price pusher for aptos",
@@ -72,6 +73,8 @@ exports.default = {
             },
         });
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
+        const account = aptos_2.AptosAccount.fromDerivePath(aptos_1.APTOS_ACCOUNT_HD_PATH, mnemonic);
+        console.log(`Pushing from account address: ${account.address()}`);
         const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
         const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
         const aptosListener = new aptos_1.AptosPriceListener(pythContractAddress, endpoint, priceItems, { pollingFrequency });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "5.4.2",
+  "version": "5.4.4",
   "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": "5e44fa4c95ae7120ee8a05f145b27470d2c48e7b"
+  "gitHead": "2c334b6b9249914c1f88541cb55235388e404030"
 }