@pythnetwork/pyth-sui-js 1.2.5 → 2.0.0

package/lib/client.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
-import { JsonRpcProvider, ObjectId, TransactionBlock } from "@mysten/sui.js";
+import { SuiClient } from "@mysten/sui.js/client";
+import { TransactionBlock } from "@mysten/sui.js/transactions";
 import { HexString } from "@pythnetwork/price-service-client";
 import { Buffer } from "buffer";
+export type ObjectId = string;
 export declare class SuiPythClient {
-    provider: JsonRpcProvider;
+    provider: SuiClient;
     pythStateId: ObjectId;
     wormholeStateId: ObjectId;
     private pythPackageId;
@@ -11,7 +13,7 @@ export declare class SuiPythClient {
     private priceTableInfo;
     private priceFeedObjectIdCache;
     private baseUpdateFee;
-    constructor(provider: JsonRpcProvider, pythStateId: ObjectId, wormholeStateId: ObjectId);
+    constructor(provider: SuiClient, pythStateId: ObjectId, wormholeStateId: ObjectId);
     getBaseUpdateFee(): Promise<number>;
     /**
      * getPackageId returns the latest package id that the object belongs to. Use this to
@@ -25,21 +27,11 @@ export declare class SuiPythClient {
      * @param vaas array of vaas to verify
      * @param tx transaction block to add commands to
      */
-    verifyVaas(vaas: Buffer[], tx: TransactionBlock): Promise<({
-        kind: "Input";
-        index: number;
-        type?: "object" | "pure" | undefined;
-        value?: any;
-    } | {
-        kind: "GasCoin";
-    } | {
-        kind: "Result";
-        index: number;
-    } | {
-        kind: "NestedResult";
+    verifyVaas(vaas: Buffer[], tx: TransactionBlock): Promise<{
         index: number;
         resultIndex: number;
-    })[]>;
+        kind: "NestedResult";
+    }[]>;
     /**
      * Adds the necessary commands for updating the pyth price feeds to the transaction block.
      * @param tx transaction block to add commands to
@@ -69,5 +61,11 @@ export declare class SuiPythClient {
         id: ObjectId;
         fieldType: ObjectId;
     }>;
+    /**
+     * Obtains the vaa bytes embedded in an accumulator message.
+     * @param accumulatorMessage - the accumulator price update message
+     * @returns vaa bytes as a uint8 array
+     */
+    extractVaaBytesFromAccumulatorMessage(accumulatorMessage: Buffer): Buffer;
 }
 //# sourceMappingURL=client.d.ts.map

package/lib/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,eAAe,EACf,QAAQ,EAER,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,SAAS,EAGV,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,qBAAa,aAAa;IAOf,QAAQ,EAAE,eAAe;IACzB,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,QAAQ;IARlC,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,cAAc,CAAoD;IAC1E,OAAO,CAAC,sBAAsB,CAAuC;IACrE,OAAO,CAAC,aAAa,CAAqB;gBAEjC,QAAQ,EAAE,eAAe,EACzB,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ;IAM5B,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAkBzC;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAuBzD;;;;OAIG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,gBAAgB;;;;;;;;;;;;;;;IAuBrD;;;;;OAKG;IACG,gBAAgB,CACpB,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,SAAS,EAAE,GACnB,OAAO,CAAC,QAAQ,EAAE,CAAC;IA+EhB,eAAe,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE;IA4C7D;;OAEG;IACG,oBAAoB;IAO1B;;OAEG;IACG,gBAAgB;IAOtB;;;OAGG;IACG,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IA2B5E;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,SAAS,EAAE,QAAQ,CAAA;KAAE,CAAC;CAuB1E"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,qBAAa,aAAa;IAOf,QAAQ,EAAE,SAAS;IACnB,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,QAAQ;IARlC,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,cAAc,CAAoD;IAC1E,OAAO,CAAC,sBAAsB,CAAuC;IACrE,OAAO,CAAC,aAAa,CAAqB;gBAEjC,QAAQ,EAAE,SAAS,EACnB,WAAW,EAAE,QAAQ,EACrB,eAAe,EAAE,QAAQ;IAM5B,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAoBzC;;;;;OAKG;IACG,YAAY,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IA0BzD;;;;OAIG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,gBAAgB;;;;;IAuBrD;;;;;OAKG;IACG,gBAAgB,CACpB,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,SAAS,EAAE,GACnB,OAAO,CAAC,QAAQ,EAAE,CAAC;IA6DhB,eAAe,CAAC,EAAE,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE;IA0B7D;;OAEG;IACG,oBAAoB;IAO1B;;OAEG;IACG,gBAAgB;IAOtB;;;OAGG;IACG,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IA6B5E;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,QAAQ,CAAC;QAAC,SAAS,EAAE,QAAQ,CAAA;KAAE,CAAC;IAwBzE;;;;OAIG;IACH,qCAAqC,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM;CAY1E"}

package/lib/client.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuiPythClient = void 0;
-const sui_js_1 = require("@mysten/sui.js");
-const price_service_client_1 = require("@pythnetwork/price-service-client");
+const utils_1 = require("@mysten/sui.js/utils");
+const bcs_1 = require("@mysten/sui.js/bcs");
 const buffer_1 = require("buffer");
 const MAX_ARGUMENT_SIZE = 16 * 1024;
 class SuiPythClient {
@@ -31,6 +31,8 @@ class SuiPythClient {
                 !result.data.content ||
                 result.data.content.dataType !== "moveObject")
                 throw new Error("Unable to fetch pyth state object");
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             this.baseUpdateFee = result.data.content.fields.base_update_fee;
         }
         return this.baseUpdateFee;
@@ -53,9 +55,12 @@ class SuiPythClient {
             if (result.data?.content?.dataType == "moveObject") {
                 return result.data.content.fields;
             }
-            throw new Error("not move object");
+            console.log(result.data?.content);
+            throw new Error(`Cannot fetch package id for object ${objectId}`);
         });
         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");
@@ -73,12 +78,12 @@ class SuiPythClient {
                 target: `${wormholePackageId}::vaa::parse_and_verify`,
                 arguments: [
                     tx.object(this.wormholeStateId),
-                    tx.pure(sui_js_1.builder
+                    tx.pure(bcs_1.bcs
                         .ser("vector<u8>", Array.from(vaa), {
                         maxSize: MAX_ARGUMENT_SIZE,
                     })
                         .toBytes()),
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
+                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
                 ],
             });
             verifiedVaas.push(verifiedVaa);
@@ -92,46 +97,26 @@ class SuiPythClient {
      * @param feedIds array of feed ids to update (in hex format)
      */
     async updatePriceFeeds(tx, updates, feedIds) {
-        const wormholePackageId = await this.getWormholePackageId();
         const packageId = await this.getPythPackageId();
         let priceUpdatesHotPotato;
-        if (updates.every((update) => (0, price_service_client_1.isAccumulatorUpdateData)(update))) {
-            if (updates.length > 1) {
-                throw new Error("SDK does not support sending multiple accumulator messages in a single transaction");
-            }
-            const vaa = (0, price_service_client_1.parseAccumulatorUpdateData)(updates[0]).vaa;
-            const verifiedVaas = await this.verifyVaas([vaa], tx);
-            [priceUpdatesHotPotato] = tx.moveCall({
-                target: `${packageId}::pyth::create_authenticated_price_infos_using_accumulator`,
-                arguments: [
-                    tx.object(this.pythStateId),
-                    tx.pure(sui_js_1.builder
-                        .ser("vector<u8>", Array.from(updates[0]), {
-                        maxSize: MAX_ARGUMENT_SIZE,
-                    })
-                        .toBytes()),
-                    verifiedVaas[0],
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-        }
-        else if (updates.every((vaa) => !(0, price_service_client_1.isAccumulatorUpdateData)(vaa))) {
-            const verifiedVaas = await this.verifyVaas(updates, tx);
-            [priceUpdatesHotPotato] = tx.moveCall({
-                target: `${packageId}::pyth::create_price_infos_hot_potato`,
-                arguments: [
-                    tx.object(this.pythStateId),
-                    tx.makeMoveVec({
-                        type: `${wormholePackageId}::vaa::VAA`,
-                        objects: verifiedVaas,
-                    }),
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-        }
-        else {
-            throw new Error("Can't mix accumulator and non-accumulator messages");
+        if (updates.length > 1) {
+            throw new Error("SDK does not support sending multiple accumulator messages in a single transaction");
         }
+        const vaa = this.extractVaaBytesFromAccumulatorMessage(updates[0]);
+        const verifiedVaas = await this.verifyVaas([vaa], tx);
+        [priceUpdatesHotPotato] = tx.moveCall({
+            target: `${packageId}::pyth::create_authenticated_price_infos_using_accumulator`,
+            arguments: [
+                tx.object(this.pythStateId),
+                tx.pure(bcs_1.bcs
+                    .ser("vector<u8>", Array.from(updates[0]), {
+                    maxSize: MAX_ARGUMENT_SIZE,
+                })
+                    .toBytes()),
+                verifiedVaas[0],
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+            ],
+        });
         const priceInfoObjects = [];
         const baseUpdateFee = await this.getBaseUpdateFee();
         const coins = tx.splitCoins(tx.gas, feedIds.map(() => tx.pure(baseUpdateFee)));
@@ -149,7 +134,7 @@ class SuiPythClient {
                     priceUpdatesHotPotato,
                     tx.object(priceInfoObjectId),
                     coins[coinId],
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
+                    tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
                 ],
             });
             coinId++;
@@ -162,45 +147,25 @@ class SuiPythClient {
         return priceInfoObjects;
     }
     async createPriceFeed(tx, updates) {
-        const wormholePackageId = await this.getWormholePackageId();
         const packageId = await this.getPythPackageId();
-        if (updates.every((update) => (0, price_service_client_1.isAccumulatorUpdateData)(update))) {
-            if (updates.length > 1) {
-                throw new Error("SDK does not support sending multiple accumulator messages in a single transaction");
-            }
-            const vaa = (0, price_service_client_1.parseAccumulatorUpdateData)(updates[0]).vaa;
-            const verifiedVaas = await this.verifyVaas([vaa], tx);
-            tx.moveCall({
-                target: `${packageId}::pyth::create_price_feeds_using_accumulator`,
-                arguments: [
-                    tx.object(this.pythStateId),
-                    tx.pure(sui_js_1.builder
-                        .ser("vector<u8>", Array.from(updates[0]), {
-                        maxSize: MAX_ARGUMENT_SIZE,
-                    })
-                        .toBytes()),
-                    verifiedVaas[0],
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-        }
-        else if (updates.every((vaa) => !(0, price_service_client_1.isAccumulatorUpdateData)(vaa))) {
-            const verifiedVaas = await this.verifyVaas(updates, tx);
-            tx.moveCall({
-                target: `${packageId}::pyth::create_price_feeds`,
-                arguments: [
-                    tx.object(this.pythStateId),
-                    tx.makeMoveVec({
-                        type: `${wormholePackageId}::vaa::VAA`,
-                        objects: verifiedVaas,
-                    }),
-                    tx.object(sui_js_1.SUI_CLOCK_OBJECT_ID),
-                ],
-            });
-        }
-        else {
-            throw new Error("Can't mix accumulator and non-accumulator messages");
+        if (updates.length > 1) {
+            throw new Error("SDK does not support sending multiple accumulator messages in a single transaction");
         }
+        const vaa = this.extractVaaBytesFromAccumulatorMessage(updates[0]);
+        const verifiedVaas = await this.verifyVaas([vaa], tx);
+        tx.moveCall({
+            target: `${packageId}::pyth::create_price_feeds_using_accumulator`,
+            arguments: [
+                tx.object(this.pythStateId),
+                tx.pure(bcs_1.bcs
+                    .ser("vector<u8>", Array.from(updates[0]), {
+                    maxSize: MAX_ARGUMENT_SIZE,
+                })
+                    .toBytes()),
+                verifiedVaas[0],
+                tx.object(utils_1.SUI_CLOCK_OBJECT_ID),
+            ],
+        });
     }
     /**
      * Get the packageId for the wormhole package if not already cached
@@ -243,7 +208,10 @@ class SuiPythClient {
             if (result.data.content.dataType !== "moveObject") {
                 throw new Error("Price feed type mismatch");
             }
-            this.priceFeedObjectIdCache.set(normalizedFeedId, result.data.content.fields.value);
+            this.priceFeedObjectIdCache.set(normalizedFeedId, 
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            result.data.content.fields.value);
         }
         return this.priceFeedObjectIdCache.get(normalizedFeedId);
     }
@@ -269,5 +237,21 @@ class SuiPythClient {
         }
         return this.priceTableInfo;
     }
+    /**
+     * Obtains the vaa bytes embedded in an accumulator message.
+     * @param accumulatorMessage - the accumulator price update message
+     * @returns vaa bytes as a uint8 array
+     */
+    extractVaaBytesFromAccumulatorMessage(accumulatorMessage) {
+        // the first 6 bytes in the accumulator message encode the header, major, and minor bytes
+        // we ignore them, since we are only interested in the VAA bytes
+        const trailingPayloadSize = accumulatorMessage.readUint8(6);
+        const vaaSizeOffset = 7 + // header bytes (header(4) + major(1) + minor(1) + trailing payload size(1))
+            trailingPayloadSize + // trailing payload (variable number of bytes)
+            1; // proof_type (1 byte)
+        const vaaSize = accumulatorMessage.readUint16BE(vaaSizeOffset);
+        const vaaOffset = vaaSizeOffset + 2;
+        return accumulatorMessage.subarray(vaaOffset, vaaOffset + vaaSize);
+    }
 }
 exports.SuiPythClient = SuiPythClient;

package/lib/examples/SuiRelay.d.ts

@@ -1,3 +1,3 @@
-import { JsonRpcProvider } from "@mysten/sui.js";
-export declare function getProvider(url: string): JsonRpcProvider;
+import { SuiClient } from "@mysten/sui.js/client";
+export declare function getProvider(url: string): SuiClient;
 //# sourceMappingURL=SuiRelay.d.ts.map

package/lib/examples/SuiRelay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuiRelay.d.ts","sourceRoot":"","sources":["../../src/examples/SuiRelay.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAkCxB,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,mBAEtC"}
+{"version":3,"file":"SuiRelay.d.ts","sourceRoot":"","sources":["../../src/examples/SuiRelay.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAqClD,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,aAEtC"}

package/lib/examples/SuiRelay.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProvider = void 0;
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
-const sui_js_1 = require("@mysten/sui.js");
+const client_1 = require("@mysten/sui.js/client");
+const transactions_1 = require("@mysten/sui.js/transactions");
+const ed25519_1 = require("@mysten/sui.js/keypairs/ed25519");
 const buffer_1 = require("buffer");
-const client_1 = require("../client");
+const client_2 = require("../client");
 const index_1 = require("../index");
 const argvPromise = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .option("feed-id", {
@@ -37,7 +39,7 @@ const argvPromise = (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     demandOption: true,
 }).argv;
 function getProvider(url) {
-    return new sui_js_1.JsonRpcProvider(new sui_js_1.Connection({ fullnode: url }));
+    return new client_1.SuiClient({ url });
 }
 exports.getProvider = getProvider;
 async function run() {
@@ -48,22 +50,42 @@ async function run() {
     // Fetch the latest price feed update data from the Price Service
     const connection = new index_1.SuiPriceServiceConnection(argv["hermes"]);
     const feeds = argv["feed-id"];
-    const priceFeedUpdateData = await connection.getPriceFeedsUpdateData(feeds);
     const provider = getProvider(argv["full-node"]);
     const wormholeStateId = argv["wormhole-state-id"];
     const pythStateId = argv["pyth-state-id"];
-    const client = new client_1.SuiPythClient(provider, pythStateId, wormholeStateId);
-    const tx = new sui_js_1.TransactionBlock();
-    await client.updatePriceFeeds(tx, priceFeedUpdateData, feeds);
-    const wallet = new sui_js_1.RawSigner(sui_js_1.Ed25519Keypair.fromSecretKey(buffer_1.Buffer.from(process.env.SUI_KEY, "hex")), provider);
-    const txBlock = {
+    const client = new client_2.SuiPythClient(provider, pythStateId, wormholeStateId);
+    const newFeeds = [];
+    const existingFeeds = [];
+    for (const feed of feeds) {
+        if ((await client.getPriceFeedObjectId(feed)) == undefined) {
+            newFeeds.push(feed);
+        }
+        else {
+            existingFeeds.push(feed);
+        }
+    }
+    console.log({
+        newFeeds,
+        existingFeeds,
+    });
+    const tx = new transactions_1.TransactionBlock();
+    if (existingFeeds.length > 0) {
+        const updateData = await connection.getPriceFeedsUpdateData(existingFeeds);
+        await client.updatePriceFeeds(tx, updateData, existingFeeds);
+    }
+    if (newFeeds.length > 0) {
+        const updateData = await connection.getPriceFeedsUpdateData(newFeeds);
+        await client.createPriceFeed(tx, updateData);
+    }
+    const wallet = ed25519_1.Ed25519Keypair.fromSecretKey(buffer_1.Buffer.from(process.env.SUI_KEY, "hex"));
+    const result = await provider.signAndExecuteTransactionBlock({
+        signer: wallet,
         transactionBlock: tx,
         options: {
             showEffects: true,
             showEvents: true,
         },
-    };
-    const result = await wallet.signAndExecuteTransactionBlock(txBlock);
+    });
     console.dir(result, { depth: null });
 }
 run();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pythnetwork/pyth-sui-js",
-  "version": "1.2.5",
+  "version": "2.0.0",
   "description": "Pyth Network Sui Utilities",
   "homepage": "https://pyth.network",
   "author": {
@@ -48,14 +48,14 @@
     "jest": "^29.4.1",
     "prettier": "^2.6.2",
     "ts-jest": "^29.0.5",
-    "typescript": "^4.6.3",
+    "typescript": "^5.3.3",
     "web3": "^1.8.2",
     "yargs": "^17.0.20"
   },
   "dependencies": {
-    "@mysten/sui.js": "^0.37.1",
+    "@mysten/sui.js": "^0.49.1",
     "@pythnetwork/price-service-client": "*",
     "buffer": "^6.0.3"
   },
-  "gitHead": "0d49986eb1cd77c969059bcb72857e90ba8ae4f8"
+  "gitHead": "f14dd35d1abe0dc5e35752db4a77f4781d0a5c83"
 }