@pythnetwork/price-pusher 6.1.0 → 6.4.2

package/README.md

@@ -133,6 +133,18 @@ npm run start -- sui \
   [--polling-frequency 5] \
   [--num-gas-objects 30]
 
+# For Near
+npm run start -- near \
+  --node-url https://rpc.testnet.near.org \
+  --network testnet \
+  --account-id payer.testnet \
+  --pyth-contract-address pyth-oracle.testnet \
+  --price-service-endpoint "https://hermes-beta.pyth.network" \
+  --price-config-file ./price-config.beta.sample.yaml \
+  [--private-key-path ./payer.testnet.json] \
+  [--pushing-frequency 10] \
+  [--polling-frequency 5]
+
 
 # Or, run the price pusher docker image instead of building from the source
 docker run public.ecr.aws/pyth-network/xc-price-pusher:v<version> -- <above-arguments>
@@ -195,9 +207,9 @@ It will take a few minutes until all the services are up and running.
 ## Reliability
 
 You can run multiple instances of the price pusher to increase the reliability. It is better to use
-difference RPCs to get better reliability in case an RPC goes down. **If you use the same payer account
+different RPCs to get better reliability in case an RPC goes down. **If you use the same payer account
 in different pushers, then due to blockchains nonce or sequence for accounts, a transaction won't be
-pushed twiced and you won't pay additional costs most of the time.** However, there might be some race
-condiitons in the RPCs because they are often behind a load balancer than can sometimes cause rejected
-transactions land on-chain. You can reduce the chances of additional cost overhead by reducing the
+pushed twice and you won't pay additional costs most of the time.** However, there might be some race
+conditions in the RPCs because they are often behind a load balancer which can sometimes cause rejected
+transactions to land on-chain. You can reduce the chances of additional cost overhead by reducing the
 pushing frequency.

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;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"}
+{"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;YAiJF,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

@@ -158,8 +158,9 @@ class EvmPricePusher {
                 return;
             }
             if (err.message.includes("the tx doesn't have the correct nonce.") ||
-                err.message.includes("nonce too low")) {
-                console.log("Multiple users are using the same accounts and nonce is incorrect. Skipping this push.");
+                err.message.includes("nonce too low") ||
+                err.message.includes("invalid nonce")) {
+                console.log("The nonce is incorrect (are multiple users using this account?). Skipping this push.");
                 return;
             }
             if (err.message.includes("max fee per gas less than block base fee")) {

package/lib/index.js

@@ -10,6 +10,8 @@ const command_1 = __importDefault(require("./injective/command"));
 const command_2 = __importDefault(require("./evm/command"));
 const command_3 = __importDefault(require("./aptos/command"));
 const command_4 = __importDefault(require("./sui/command"));
+const command_5 = __importDefault(require("./near/command"));
+const command_6 = __importDefault(require("./solana/command"));
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .config("config")
     .global("config")
@@ -17,4 +19,6 @@ const command_4 = __importDefault(require("./sui/command"));
     .command(command_1.default)
     .command(command_3.default)
     .command(command_4.default)
+    .command(command_5.default)
+    .command(command_6.default)
     .help().argv;

package/lib/near/command.d.ts

@@ -0,0 +1,19 @@
+import { Options } from "yargs";
+declare const _default: {
+    command: string;
+    describe: string;
+    builder: {
+        "pushing-frequency": Options;
+        "polling-frequency": Options;
+        "pyth-contract-address": Options;
+        "price-service-endpoint": Options;
+        "price-config-file": Options;
+        "node-url": Options;
+        network: Options;
+        "account-id": Options;
+        "private-key-path": Options;
+    };
+    handler: (argv: any) => void;
+};
+export default _default;
+//# sourceMappingURL=command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/near/command.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;oBAkCL,GAAG;;AA/B9B,wBA2FE"}

package/lib/near/command.js

@@ -0,0 +1,86 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const price_service_client_1 = require("@pythnetwork/price-service-client");
+const options = __importStar(require("../options"));
+const price_config_1 = require("../price-config");
+const pyth_price_listener_1 = require("../pyth-price-listener");
+const controller_1 = require("../controller");
+const near_1 = require("./near");
+exports.default = {
+    command: "near",
+    describe: "run price pusher for near",
+    builder: {
+        "node-url": {
+            description: "NEAR RPC API url. used to make JSON RPC calls to interact with NEAR.",
+            type: "string",
+            required: true,
+        },
+        network: {
+            description: "testnet or mainnet.",
+            type: "string",
+            required: true,
+        },
+        "account-id": {
+            description: "payer account identifier.",
+            type: "string",
+            required: true,
+        },
+        "private-key-path": {
+            description: "path to payer private key file.",
+            type: "string",
+            required: false,
+        },
+        ...options.priceConfigFile,
+        ...options.priceServiceEndpoint,
+        ...options.pythContractAddress,
+        ...options.pollingFrequency,
+        ...options.pushingFrequency,
+    },
+    handler: function (argv) {
+        // FIXME: type checks for this
+        const { nodeUrl, network, accountId, privateKeyPath, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, } = argv;
+        const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
+        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
+            logger: {
+                // Log only warnings and errors from the price service client
+                info: () => undefined,
+                warn: console.warn,
+                error: console.error,
+                debug: () => undefined,
+                trace: () => undefined,
+            },
+        });
+        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
+        const nearAccount = new near_1.NearAccount(network, accountId, nodeUrl, privateKeyPath, pythContractAddress);
+        const nearListener = new near_1.NearPriceListener(nearAccount, priceItems, {
+            pollingFrequency,
+        });
+        const nearPusher = new near_1.NearPricePusher(nearAccount, priceServiceConnection);
+        const controller = new controller_1.Controller(priceConfigs, pythListener, nearListener, nearPusher, { pushingFrequency });
+        controller.start();
+    },
+};

package/lib/near/near.d.ts

@@ -0,0 +1,28 @@
+import { IPricePusher, PriceInfo, ChainPriceListener, PriceItem } from "../interface";
+import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+import { DurationInSeconds } from "../utils";
+import { FinalExecutionOutcome } from "near-api-js/lib/providers/provider";
+export declare class NearPriceListener extends ChainPriceListener {
+    private account;
+    constructor(account: NearAccount, priceItems: PriceItem[], config: {
+        pollingFrequency: DurationInSeconds;
+    });
+    getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
+}
+export declare class NearPricePusher implements IPricePusher {
+    private account;
+    private connection;
+    constructor(account: NearAccount, connection: PriceServiceConnection);
+    updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+    private getPriceFeedsUpdateData;
+}
+export declare class NearAccount {
+    private pythAccountId;
+    private account;
+    constructor(network: string, accountId: string, nodeUrl: string, privateKeyPath: string | undefined, pythAccountId: string);
+    getPriceUnsafe(priceId: string): Promise<any>;
+    getUpdateFeeEstimate(data: string): Promise<any>;
+    updatePriceFeeds(data: string, updateFee: any): Promise<FinalExecutionOutcome>;
+    private getConnection;
+}
+//# sourceMappingURL=near.d.ts.map

package/lib/near/near.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../src/near/near.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,SAAS,EACV,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,sBAAsB,EAEvB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAGL,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAG5C,qBAAa,iBAAkB,SAAQ,kBAAkB;IAErD,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,WAAW,EAC5B,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;CAyB3E;AAED,qBAAa,eAAgB,YAAW,YAAY;IAEhD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,UAAU;gBADV,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,sBAAsB;IAGtC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;YAiEF,uBAAuB;CAMtC;AAED,qBAAa,WAAW;IAQpB,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,OAAO,CAAU;gBAGvB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GAAG,SAAS,EAC1B,aAAa,EAAE,MAAM;IAWzB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU7C,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAUhD,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,qBAAqB,CAAC;IAYjC,OAAO,CAAC,aAAa;CAkCtB"}

package/lib/near/near.js

@@ -0,0 +1,163 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NearAccount = exports.NearPricePusher = exports.NearPriceListener = void 0;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const interface_1 = require("../interface");
+const near_api_js_1 = require("near-api-js");
+const key_stores_1 = require("near-api-js/lib/key_stores");
+class NearPriceListener extends interface_1.ChainPriceListener {
+    account;
+    constructor(account, priceItems, config) {
+        super("near", config.pollingFrequency, priceItems);
+        this.account = account;
+    }
+    async getOnChainPriceInfo(priceId) {
+        try {
+            const priceRaw = await this.account.getPriceUnsafe(priceId);
+            console.log(`Polled a NEAR on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}) ${JSON.stringify(priceRaw)}.`);
+            if (priceRaw) {
+                return {
+                    conf: priceRaw.conf,
+                    price: priceRaw.price,
+                    publishTime: priceRaw.publish_time,
+                };
+            }
+            else {
+                return undefined;
+            }
+        }
+        catch (e) {
+            console.error(`Polling on-chain price for ${priceId} failed. Error:`);
+            console.error(e);
+            return undefined;
+        }
+    }
+}
+exports.NearPriceListener = NearPriceListener;
+class NearPricePusher {
+    account;
+    connection;
+    constructor(account, connection) {
+        this.account = account;
+        this.connection = connection;
+    }
+    async updatePriceFeed(priceIds, pubTimesToPush) {
+        if (priceIds.length === 0) {
+            return;
+        }
+        if (priceIds.length !== pubTimesToPush.length)
+            throw new Error("Invalid arguments");
+        let priceFeedUpdateData;
+        try {
+            priceFeedUpdateData = await this.getPriceFeedsUpdateData(priceIds);
+        }
+        catch (e) {
+            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+            return;
+        }
+        console.log("Pushing ", priceIds);
+        for (const data of priceFeedUpdateData) {
+            let updateFee;
+            try {
+                updateFee = await this.account.getUpdateFeeEstimate(data);
+                console.log(`Update fee: ${updateFee}`);
+            }
+            catch (e) {
+                console.error(new Date(), "getUpdateFeeEstimate failed:", e);
+                continue;
+            }
+            try {
+                const outcome = await this.account.updatePriceFeeds(data, updateFee);
+                const failureMessages = [];
+                const is_success = Object.values(outcome["receipts_outcome"]).reduce((is_success, receipt) => {
+                    if (Object.prototype.hasOwnProperty.call(receipt["outcome"]["status"], "Failure")) {
+                        failureMessages.push(receipt["outcome"]["status"]);
+                        return false;
+                    }
+                    return is_success;
+                }, true);
+                if (is_success) {
+                    console.log(new Date(), "updatePriceFeeds successful. Tx hash: ", outcome["transaction"]["hash"]);
+                }
+                else {
+                    console.error(new Date(), "updatePriceFeeds failed:", JSON.stringify(failureMessages, undefined, 2));
+                }
+            }
+            catch (e) {
+                console.error(new Date(), "updatePriceFeeds failed:", e);
+            }
+        }
+    }
+    async getPriceFeedsUpdateData(priceIds) {
+        const latestVaas = await this.connection.getLatestVaas(priceIds);
+        return latestVaas.map((vaa) => Buffer.from(vaa, "base64").toString("hex"));
+    }
+}
+exports.NearPricePusher = NearPricePusher;
+class NearAccount {
+    pythAccountId;
+    account;
+    constructor(network, accountId, nodeUrl, privateKeyPath, pythAccountId) {
+        this.pythAccountId = pythAccountId;
+        const connection = this.getConnection(network, accountId, nodeUrl, privateKeyPath);
+        this.account = new near_api_js_1.Account(connection, accountId);
+    }
+    async getPriceUnsafe(priceId) {
+        return await this.account.viewFunction({
+            contractId: this.pythAccountId,
+            methodName: "get_price_unsafe",
+            args: {
+                price_identifier: priceId,
+            },
+        });
+    }
+    async getUpdateFeeEstimate(data) {
+        return await this.account.viewFunction({
+            contractId: this.pythAccountId,
+            methodName: "get_update_fee_estimate",
+            args: {
+                data,
+            },
+        });
+    }
+    async updatePriceFeeds(data, updateFee) {
+        return await this.account.functionCall({
+            contractId: this.pythAccountId,
+            methodName: "update_price_feeds",
+            args: {
+                data,
+            },
+            gas: "300000000000000",
+            attachedDeposit: updateFee,
+        });
+    }
+    getConnection(network, accountId, nodeUrl, privateKeyPath) {
+        const content = fs_1.default.readFileSync(privateKeyPath ||
+            path_1.default.join(os_1.default.homedir(), ".near-credentials", network, accountId + ".json"));
+        const accountInfo = JSON.parse(content.toString());
+        let privateKey = accountInfo.private_key;
+        if (!privateKey && accountInfo.secret_key) {
+            privateKey = accountInfo.secret_key;
+        }
+        if (accountInfo.account_id && privateKey) {
+            const keyPair = near_api_js_1.KeyPair.fromString(privateKey);
+            const keyStore = new key_stores_1.InMemoryKeyStore();
+            keyStore.setKey(network, accountInfo.account_id, keyPair);
+            return near_api_js_1.Connection.fromConfig({
+                networkId: network,
+                provider: { type: "JsonRpcProvider", args: { url: nodeUrl } },
+                signer: { type: "InMemorySigner", keyStore },
+                jsvmAccountId: `jsvm.${network}`,
+            });
+        }
+        else {
+            throw new Error("Invalid key file!");
+        }
+    }
+}
+exports.NearAccount = NearAccount;

package/lib/price-config.js

@@ -56,7 +56,7 @@ var UpdateCondition;
     UpdateCondition[UpdateCondition["EARLY"] = 1] = "EARLY";
     // This price feed shouldn't be updated
     UpdateCondition[UpdateCondition["NO"] = 2] = "NO";
-})(UpdateCondition = exports.UpdateCondition || (exports.UpdateCondition = {}));
+})(UpdateCondition || (exports.UpdateCondition = UpdateCondition = {}));
 /**
  * Checks whether on-chain price needs to be updated with the latest pyth price information.
  *

package/lib/solana/command.d.ts

@@ -0,0 +1,19 @@
+import { Options } from "yargs";
+declare const _default: {
+    command: string;
+    describe: string;
+    builder: {
+        "pushing-frequency": Options;
+        "polling-frequency": Options;
+        "pyth-contract-address": Options;
+        "price-service-endpoint": Options;
+        "price-config-file": Options;
+        endpoint: Options;
+        "keypair-file": Options;
+        "shard-id": Options;
+        "compute-unit-price-micro-lamports": Options;
+    };
+    handler: (argv: any) => void;
+};
+export default _default;
+//# sourceMappingURL=command.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/solana/command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;;;;;;;;;;;;;;;oBA2CL,GAAG;;AA9B9B,wBAqGE"}

package/lib/solana/command.js

@@ -0,0 +1,96 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const options = __importStar(require("../options"));
+const price_config_1 = require("../price-config");
+const price_service_client_1 = require("@pythnetwork/price-service-client");
+const pyth_price_listener_1 = require("../pyth-price-listener");
+const solana_1 = require("./solana");
+const controller_1 = require("../controller");
+const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
+const nodewallet_1 = __importDefault(require("@coral-xyz/anchor/dist/cjs/nodewallet"));
+const web3_js_1 = require("@solana/web3.js");
+const fs_1 = __importDefault(require("fs"));
+const web3_js_2 = require("@solana/web3.js");
+exports.default = {
+    command: "solana",
+    describe: "run price pusher for solana",
+    builder: {
+        endpoint: {
+            description: "Solana RPC API endpoint",
+            type: "string",
+            required: true,
+        },
+        "keypair-file": {
+            description: "Path to a keypair file",
+            type: "string",
+            required: true,
+        },
+        "shard-id": {
+            description: "Shard ID",
+            type: "number",
+            required: true,
+        },
+        "compute-unit-price-micro-lamports": {
+            description: "Priority fee per compute unit",
+            type: "number",
+            default: 50000,
+        },
+        ...options.priceConfigFile,
+        ...options.priceServiceEndpoint,
+        ...options.pythContractAddress,
+        ...options.pollingFrequency,
+        ...options.pushingFrequency,
+    },
+    handler: function (argv) {
+        const { endpoint, keypairFile, shardId, computeUnitPriceMicroLamports, priceConfigFile, priceServiceEndpoint, pythContractAddress, pushingFrequency, pollingFrequency, } = argv;
+        const priceConfigs = (0, price_config_1.readPriceConfigFile)(priceConfigFile);
+        const priceServiceConnection = new price_service_client_1.PriceServiceConnection(priceServiceEndpoint, {
+            logger: {
+                // Log only warnings and errors from the price service client
+                info: () => undefined,
+                warn: console.warn,
+                error: console.error,
+                debug: () => undefined,
+                trace: () => undefined,
+            },
+        });
+        const priceItems = priceConfigs.map(({ id, alias }) => ({ id, alias }));
+        const pythListener = new pyth_price_listener_1.PythPriceListener(priceServiceConnection, priceItems);
+        const wallet = new nodewallet_1.default(web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(fs_1.default.readFileSync(keypairFile, "ascii")))));
+        const pythSolanaReceiver = new pyth_solana_receiver_1.PythSolanaReceiver({
+            connection: new web3_js_1.Connection(endpoint),
+            wallet,
+            pushOracleProgramId: new web3_js_2.PublicKey(pythContractAddress),
+        });
+        const solanaPricePusher = new solana_1.SolanaPricePusher(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports);
+        const solanaPriceListener = new solana_1.SolanaPriceListener(pythSolanaReceiver, shardId, priceItems, { pollingFrequency });
+        const controller = new controller_1.Controller(priceConfigs, pythListener, solanaPriceListener, solanaPricePusher, { pushingFrequency });
+        controller.start();
+    },
+};

package/lib/solana/solana.d.ts

@@ -0,0 +1,21 @@
+import { PythSolanaReceiver } from "@pythnetwork/pyth-solana-receiver";
+import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
+import { DurationInSeconds } from "../utils";
+import { PriceServiceConnection } from "@pythnetwork/price-service-client";
+export declare class SolanaPriceListener extends ChainPriceListener {
+    private pythSolanaReceiver;
+    private shardId;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, shardId: number, priceItems: PriceItem[], config: {
+        pollingFrequency: DurationInSeconds;
+    });
+    getOnChainPriceInfo(priceId: string): Promise<PriceInfo | undefined>;
+}
+export declare class SolanaPricePusher implements IPricePusher {
+    private pythSolanaReceiver;
+    private priceServiceConnection;
+    private shardId;
+    private computeUnitPriceMicroLamports;
+    constructor(pythSolanaReceiver: PythSolanaReceiver, priceServiceConnection: PriceServiceConnection, shardId: number, computeUnitPriceMicroLamports: number);
+    updatePriceFeed(priceIds: string[], pubTimesToPush: number[]): Promise<void>;
+}
+//# sourceMappingURL=solana.d.ts.map

package/lib/solana/solana.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/solana/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,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;AAE3E,qBAAa,mBAAoB,SAAQ,kBAAkB;IAEvD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,OAAO;gBADP,kBAAkB,EAAE,kBAAkB,EACtC,OAAO,EAAE,MAAM,EACvB,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;CA2B3E;AAED,qBAAa,iBAAkB,YAAW,YAAY;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,sBAAsB;IAC9B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,6BAA6B;gBAH7B,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,OAAO,EAAE,MAAM,EACf,6BAA6B,EAAE,MAAM;IAGzC,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;CAoCjB"}

package/lib/solana/solana.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaPricePusher = exports.SolanaPriceListener = void 0;
+const interface_1 = require("../interface");
+class SolanaPriceListener extends interface_1.ChainPriceListener {
+    pythSolanaReceiver;
+    shardId;
+    constructor(pythSolanaReceiver, shardId, priceItems, config) {
+        super("solana", config.pollingFrequency, priceItems);
+        this.pythSolanaReceiver = pythSolanaReceiver;
+        this.shardId = shardId;
+    }
+    async getOnChainPriceInfo(priceId) {
+        try {
+            const priceFeedAccount = await this.pythSolanaReceiver.fetchPriceFeedAccount(this.shardId, Buffer.from(priceId, "hex"));
+            console.log(`Polled a Solana on chain price for feed ${this.priceIdToAlias.get(priceId)} (${priceId}).`);
+            if (priceFeedAccount) {
+                return {
+                    conf: priceFeedAccount.priceMessage.conf.toString(),
+                    price: priceFeedAccount.priceMessage.price.toString(),
+                    publishTime: priceFeedAccount.priceMessage.publishTime.toNumber(),
+                };
+            }
+            else {
+                return undefined;
+            }
+        }
+        catch (e) {
+            console.error(`Polling on-chain price for ${priceId} failed. Error:`);
+            console.error(e);
+            return undefined;
+        }
+    }
+}
+exports.SolanaPriceListener = SolanaPriceListener;
+class SolanaPricePusher {
+    pythSolanaReceiver;
+    priceServiceConnection;
+    shardId;
+    computeUnitPriceMicroLamports;
+    constructor(pythSolanaReceiver, priceServiceConnection, shardId, computeUnitPriceMicroLamports) {
+        this.pythSolanaReceiver = pythSolanaReceiver;
+        this.priceServiceConnection = priceServiceConnection;
+        this.shardId = shardId;
+        this.computeUnitPriceMicroLamports = computeUnitPriceMicroLamports;
+    }
+    async updatePriceFeed(priceIds, pubTimesToPush) {
+        if (priceIds.length === 0) {
+            return;
+        }
+        let priceFeedUpdateData;
+        try {
+            priceFeedUpdateData = await this.priceServiceConnection.getLatestVaas(priceIds);
+        }
+        catch (e) {
+            console.error(new Date(), "getPriceFeedsUpdateData failed:", e);
+            return;
+        }
+        const transactionBuilder = this.pythSolanaReceiver.newTransactionBuilder({
+            closeUpdateAccounts: true,
+        });
+        await transactionBuilder.addUpdatePriceFeed(priceFeedUpdateData, this.shardId);
+        try {
+            await this.pythSolanaReceiver.provider.sendAll(await transactionBuilder.buildVersionedTransactions({
+                computeUnitPriceMicroLamports: this.computeUnitPriceMicroLamports,
+            }), { skipPreflight: true });
+            console.log(new Date(), "updatePriceFeed successful");
+        }
+        catch (e) {
+            console.error(new Date(), "updatePriceFeed failed", e);
+            return;
+        }
+    }
+}
+exports.SolanaPricePusher = SolanaPricePusher;

package/lib/sui/command.js

@@ -33,7 +33,7 @@ const fs_1 = __importDefault(require("fs"));
 const pyth_price_listener_1 = require("../pyth-price-listener");
 const controller_1 = require("../controller");
 const sui_1 = require("./sui");
-const sui_js_1 = require("@mysten/sui.js");
+const ed25519_1 = require("@mysten/sui.js/keypairs/ed25519");
 exports.default = {
     command: "sui",
     describe: "Run price pusher for sui. Most of the arguments below are" +
@@ -101,7 +101,7 @@ exports.default = {
             },
         });
         const mnemonic = fs_1.default.readFileSync(mnemonicFile, "utf-8").trim();
-        const keypair = sui_js_1.Ed25519Keypair.deriveKeypair(mnemonic, `m/44'/784'/${accountIndex}'/0'/0'`);
+        const keypair = ed25519_1.Ed25519Keypair.deriveKeypair(mnemonic, `m/44'/784'/${accountIndex}'/0'/0'`);
         console.log(`Pushing updates from wallet address: ${keypair
             .getPublicKey()
             .toSuiAddress()}`);

package/lib/sui/sui.d.ts

@@ -1,8 +1,10 @@
 import { ChainPriceListener, IPricePusher, PriceInfo, PriceItem } from "../interface";
 import { DurationInSeconds } from "../utils";
 import { PriceServiceConnection } from "@pythnetwork/price-service-client";
-import { JsonRpcProvider, Ed25519Keypair, RawSigner, SuiObjectRef, ObjectId } from "@mysten/sui.js";
 import { SuiPythClient } from "@pythnetwork/pyth-sui-js";
+import { Ed25519Keypair } from "@mysten/sui.js/keypairs/ed25519";
+import { SuiClient, SuiObjectRef } from "@mysten/sui.js/client";
+type ObjectId = string;
 export declare class SuiPriceListener extends ChainPriceListener {
     private pythClient;
     private provider;
@@ -27,6 +29,7 @@ export declare class SuiPriceListener extends ChainPriceListener {
  */
 export declare class SuiPricePusher implements IPricePusher {
     private readonly signer;
+    private readonly provider;
     private priceServiceConnection;
     private pythPackageId;
     private pythStateId;
@@ -35,7 +38,7 @@ export declare class SuiPricePusher implements IPricePusher {
     private gasBudget;
     private gasPool;
     private pythClient;
-    constructor(signer: RawSigner, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, gasBudget: number, gasPool: SuiObjectRef[], pythClient: SuiPythClient);
+    constructor(signer: Ed25519Keypair, provider: SuiClient, priceServiceConnection: PriceServiceConnection, pythPackageId: string, pythStateId: string, wormholePackageId: string, wormholeStateId: string, endpoint: string, keypair: Ed25519Keypair, 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.
@@ -43,7 +46,7 @@ export declare class SuiPricePusher implements IPricePusher {
      * @param objectId
      * @returns package id
      */
-    static getPackageId(provider: JsonRpcProvider, objectId: ObjectId): Promise<ObjectId>;
+    static getPackageId(provider: SuiClient, 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 keypair will be merged and then evenly split into `numGasObjects`.
@@ -60,4 +63,5 @@ export declare class SuiPricePusher implements IPricePusher {
     private static splitGasCoinEqually;
     private static mergeGasCoinsIntoOne;
 }
+export {};
 //# sourceMappingURL=sui.d.ts.map

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,EACL,eAAe,EAEf,cAAc,EACd,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,OAAO,EAAE,cAAc,EACf,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,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;IA8CpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBAwDb,iBAAiB;mBAuCjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAsCnB,oBAAoB;CA+D1C"}
+{"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,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAkB,MAAM,uBAAuB,CAAC;AAOhF,KAAK,QAAQ,GAAG,MAAM,CAAC;AAGvB,qBAAa,gBAAiB,SAAQ,kBAAkB;IACtD,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,QAAQ,CAAY;gBAG1B,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;CA2C3E;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,cAAe,YAAW,YAAY;IAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,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;gBAXD,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,SAAS,EAC5B,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,OAAO,EAAE,cAAc,EACf,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,YAAY,EAAE,EACvB,UAAU,EAAE,aAAa;IAGnC;;;;;;OAMG;WACU,YAAY,CACvB,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,QAAQ,CAAC;IAyBpB;;;OAGG;WACU,0BAA0B,CACrC,sBAAsB,EAAE,sBAAsB,EAC9C,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,cAAc,CAAC;IA6CpB,eAAe,CACnB,QAAQ,EAAE,MAAM,EAAE,EAClB,cAAc,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,IAAI,CAAC;IA0ChB,iGAAiG;YACnF,qBAAqB;IAMnC,sEAAsE;YACxD,oBAAoB;mBAyDb,iBAAiB;mBA4CjB,yBAAyB;mBAoBzB,cAAc;mBAiCd,mBAAmB;mBAwCnB,oBAAoB;CA4D1C"}

package/lib/sui/sui.js

@@ -2,8 +2,9 @@
 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 transactions_1 = require("@mysten/sui.js/transactions");
+const client_1 = require("@mysten/sui.js/client");
 const GAS_FEE_FOR_SPLIT = 2_000_000_000;
 // TODO: read this from on chain config
 const MAX_NUM_GAS_OBJECTS_IN_PTB = 256;
@@ -13,7 +14,7 @@ class SuiPriceListener extends interface_1.ChainPriceListener {
     provider;
     constructor(pythStateId, wormholeStateId, endpoint, priceItems, config) {
         super("sui", config.pollingFrequency, priceItems);
-        this.provider = new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: endpoint }));
+        this.provider = new client_1.SuiClient({ url: endpoint });
         this.pythClient = new pyth_sui_js_1.SuiPythClient(this.provider, pythStateId, wormholeStateId);
     }
     async getOnChainPriceInfo(priceId) {
@@ -27,17 +28,18 @@ class SuiPriceListener extends interface_1.ChainPriceListener {
                 id: priceInfoObjectId,
                 options: { showContent: true },
             });
-            if (priceInfoObject.data === undefined ||
-                priceInfoObject.data.content === undefined)
+            if (!priceInfoObject.data || !priceInfoObject.data.content)
                 throw new Error("Price not found on chain for price id " + priceId);
             if (priceInfoObject.data.content.dataType !== "moveObject")
                 throw new Error("fetched object datatype should be moveObject");
-            const { magnitude, negative } = priceInfoObject.data.content.fields.price_info.fields.price_feed.fields
-                .price.fields.price.fields;
-            const conf = priceInfoObject.data.content.fields.price_info.fields.price_feed.fields
-                .price.fields.conf;
-            const timestamp = priceInfoObject.data.content.fields.price_info.fields.price_feed.fields
-                .price.fields.timestamp;
+            const priceInfo = 
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            priceInfoObject.data.content.fields.price_info.fields.price_feed.fields
+                .price.fields;
+            const { magnitude, negative } = priceInfo.price.fields;
+            const conf = priceInfo.conf;
+            const timestamp = priceInfo.timestamp;
             return {
                 price: negative ? "-" + magnitude : magnitude,
                 conf,
@@ -68,6 +70,7 @@ exports.SuiPriceListener = SuiPriceListener;
  */
 class SuiPricePusher {
     signer;
+    provider;
     priceServiceConnection;
     pythPackageId;
     pythStateId;
@@ -76,8 +79,9 @@ class SuiPricePusher {
     gasBudget;
     gasPool;
     pythClient;
-    constructor(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient) {
+    constructor(signer, provider, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient) {
         this.signer = signer;
+        this.provider = provider;
         this.priceServiceConnection = priceServiceConnection;
         this.pythPackageId = pythPackageId;
         this.pythStateId = pythStateId;
@@ -109,6 +113,8 @@ class SuiPricePusher {
             throw new Error("not move object");
         });
         if ("upgrade_cap" in state) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             return state.upgrade_cap.fields.package;
         }
         throw new Error("upgrade_cap not found");
@@ -121,13 +127,12 @@ class SuiPricePusher {
         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 sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: endpoint }));
-        const signer = new sui_js_1.RawSigner(keypair, provider);
+        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(signer, numGasObjects);
+        const gasPool = await SuiPricePusher.initializeGasPool(keypair, provider, numGasObjects);
         const pythClient = new pyth_sui_js_1.SuiPythClient(provider, pythStateId, wormholeStateId);
-        return new SuiPricePusher(signer, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient);
+        return new SuiPricePusher(keypair, provider, priceServiceConnection, pythPackageId, pythStateId, wormholePackageId, wormholeStateId, endpoint, keypair, gasBudget, gasPool, pythClient);
     }
     async updatePriceFeed(priceIds, pubTimesToPush) {
         if (priceIds.length === 0) {
@@ -148,7 +153,7 @@ class SuiPricePusher {
                 throw new Error(`Expected a single VAA for all priceIds ${priceIdChunk} but received ${vaas.length} VAAs: ${vaas}`);
             }
             const vaa = vaas[0];
-            const tx = new sui_js_1.TransactionBlock();
+            const tx = new transactions_1.TransactionBlock();
             await this.pythClient.updatePriceFeeds(tx, [Buffer.from(vaa, "base64")], priceIdChunk);
             txBlocks.push(tx);
         }));
@@ -169,14 +174,15 @@ class SuiPricePusher {
         try {
             tx.setGasPayment([gasObject]);
             tx.setGasBudget(this.gasBudget);
-            const result = await this.signer.signAndExecuteTransactionBlock({
+            const result = await this.provider.signAndExecuteTransactionBlock({
+                signer: this.signer,
                 transactionBlock: tx,
                 options: {
                     showEffects: true,
                 },
             });
-            nextGasObject = (0, sui_js_1.getTransactionEffects)(result)
-                ?.mutated?.map((obj) => obj.reference)
+            nextGasObject = result.effects?.mutated
+                ?.map((obj) => obj.reference)
                 .find((ref) => ref.objectId === gasObject.objectId);
             console.log("Successfully updated price with transaction digest ", result.digest);
         }
@@ -189,7 +195,7 @@ class SuiPricePusher {
             }
             else {
                 // Refresh the coin object here in case the error is caused by an object version mismatch.
-                nextGasObject = await SuiPricePusher.tryRefreshObjectReference(this.signer.provider, gasObject);
+                nextGasObject = await SuiPricePusher.tryRefreshObjectReference(this.provider, gasObject);
             }
             console.error(e);
             if ("data" in e) {
@@ -203,10 +209,10 @@ 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, numGasObjects) {
-        const signerAddress = await signer.getAddress();
-        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, signerAddress);
-        const coinResult = await signer.provider.getObject({
+    static async initializeGasPool(signer, provider, numGasObjects) {
+        const signerAddress = await signer.toSuiAddress();
+        const consolidatedCoin = await SuiPricePusher.mergeGasCoinsIntoOne(signer, provider, signerAddress);
+        const coinResult = await provider.getObject({
             id: consolidatedCoin.objectId,
             options: { showContent: true },
         });
@@ -214,12 +220,14 @@ class SuiPricePusher {
         if (coinResult.data &&
             coinResult.data.content &&
             coinResult.data.content.dataType == "moveObject") {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             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 gasPool = await SuiPricePusher.splitGasCoinEqually(signer, signerAddress, Number(splitAmount), numGasObjects, consolidatedCoin);
+        const gasPool = await SuiPricePusher.splitGasCoinEqually(signer, provider, signerAddress, Number(splitAmount), numGasObjects, consolidatedCoin);
         console.log("Gas pool is filled with coins: ", gasPool);
         return gasPool;
     }
@@ -268,28 +276,29 @@ class SuiPricePusher {
         }
         return [...coins].map((item) => JSON.parse(item));
     }
-    static async splitGasCoinEqually(signer, signerAddress, splitAmount, numGasObjects, gasCoin) {
+    static async splitGasCoinEqually(signer, provider, signerAddress, splitAmount, numGasObjects, gasCoin) {
         // TODO: implement chunking if numGasObjects exceeds MAX_NUM_CREATED_OBJECTS
-        const tx = new sui_js_1.TransactionBlock();
+        const tx = new transactions_1.TransactionBlock();
         const coins = tx.splitCoins(tx.gas, Array.from({ length: numGasObjects }, () => tx.pure(splitAmount)));
         tx.transferObjects(Array.from({ length: numGasObjects }, (_, i) => coins[i]), tx.pure(signerAddress));
         tx.setGasPayment([gasCoin]);
-        const result = await signer.signAndExecuteTransactionBlock({
+        const result = await provider.signAndExecuteTransactionBlock({
+            signer,
             transactionBlock: tx,
             options: { showEffects: true },
         });
-        const error = (0, sui_js_1.getExecutionStatusError)(result);
+        const error = result?.effects?.status.error;
         if (error) {
             throw new Error(`Failed to initialize gas pool: ${error}. Try re-running the script`);
         }
-        const newCoins = (0, sui_js_1.getCreatedObjects)(result).map((obj) => obj.reference);
+        const newCoins = result.effects.created.map((obj) => obj.reference);
         if (newCoins.length !== numGasObjects) {
             throw new Error(`Failed to initialize gas pool. Expected ${numGasObjects}, got: ${newCoins}`);
         }
         return newCoins;
     }
-    static async mergeGasCoinsIntoOne(signer, owner) {
-        const gasCoins = await SuiPricePusher.getAllGasCoins(signer.provider, owner);
+    static async mergeGasCoinsIntoOne(signer, provider, owner) {
+        const gasCoins = await SuiPricePusher.getAllGasCoins(provider, owner);
         // skip merging if there is only one coin
         if (gasCoins.length === 1) {
             return gasCoins[0];
@@ -298,7 +307,7 @@ class SuiPricePusher {
         let finalCoin;
         const lockedAddresses = new Set();
         for (let i = 0; i < gasCoinsChunks.length; i++) {
-            const mergeTx = new sui_js_1.TransactionBlock();
+            const mergeTx = new transactions_1.TransactionBlock();
             let coins = gasCoinsChunks[i];
             coins = coins.filter((coin) => !lockedAddresses.has(coin.objectId));
             if (finalCoin) {
@@ -307,7 +316,8 @@ class SuiPricePusher {
             mergeTx.setGasPayment(coins);
             let mergeResult;
             try {
-                mergeResult = await signer.signAndExecuteTransactionBlock({
+                mergeResult = await provider.signAndExecuteTransactionBlock({
+                    signer,
                     transactionBlock: mergeTx,
                     options: { showEffects: true },
                 });
@@ -325,11 +335,11 @@ class SuiPricePusher {
                 }
                 throw e;
             }
-            const error = (0, sui_js_1.getExecutionStatusError)(mergeResult);
+            const error = mergeResult?.effects?.status.error;
             if (error) {
                 throw new Error(`Failed to merge coins when initializing gas pool: ${error}. Try re-running the script`);
             }
-            finalCoin = (0, sui_js_1.getTransactionEffects)(mergeResult).mutated.map((obj) => obj.reference)[0];
+            finalCoin = mergeResult.effects.mutated.map((obj) => obj.reference)[0];
         }
         return finalCoin;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/price-pusher",
-  "version": "6.1.0",
+  "version": "6.4.2",
   "description": "Pyth Price Pusher",
   "homepage": "https://pyth.network",
   "main": "lib/index.js",
@@ -45,24 +45,26 @@
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
     "eslint": "^8.13.0",
-    "jest": "^27.5.1",
+    "jest": "^29.7.0",
     "prettier": "^2.6.2",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.3"
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "@injectivelabs/sdk-ts": "1.10.72",
-    "@mysten/sui.js": "^0.37.1",
+    "@mysten/sui.js": "^0.49.1",
     "@pythnetwork/price-service-client": "*",
     "@pythnetwork/pyth-sdk-solidity": "*",
+    "@pythnetwork/pyth-solana-receiver": "*",
     "@pythnetwork/pyth-sui-js": "*",
     "@truffle/hdwallet-provider": "^2.1.3",
     "aptos": "^1.8.5",
     "joi": "^17.6.0",
+    "near-api-js": "^3.0.2",
     "web3": "^1.8.1",
     "web3-eth-contract": "^1.8.1",
     "yaml": "^2.1.1",
     "yargs": "^17.5.1"
   },
-  "gitHead": "1be8a02b94d2a09e5284da72e57eb0eb3943d3ae"
+  "gitHead": "62d189e3b5e3cdbbfba04c1ebd677b28f4a6f693"
 }