[Sui 15/x] - Pyth upgrade script + bug fix (#936)

* upgrade script for Pyth, so far getting the dependencies and digest works

* upgrade_pyth

* made progress: works up until verify_vaa

* delete some comments

* upgrade almost works, on last step now

* comments

* edit

* upgrade process pretty much works (we got an IncompatibleUpgrade error)

* fix bug in pyth migrate process (handle_migrate threw error because take_digest was destroying non-empty cursor and not removing prefix bytes)

* comments and toml file

* revert change to Move.lock file

* remove migrate__v__0_1_1

* prettier

Author: optke3

target_chains/sui/contracts/Move.testnet.toml

@@ -12,7 +12,7 @@ local = "../../../../wormhole/sui/wormhole"
 
 [addresses]
 pyth = "0x0"
-wormhole = "0x80c60bff35fe5026e319cf3d66ae671f2b4e12923c92c45df75eaf4de79e3ce7"
+wormhole = "0xf47329f4344f3bf0f8e436e2f7b485466cff300f12a166563995d3888c296a94"
 
 [dev-addresses]
 pyth = "0x100"

target_chains/sui/contracts/sources/governance/contract_upgrade.move

@@ -12,6 +12,7 @@ module pyth::contract_upgrade {
     use sui::object::{ID};
     use sui::package::{UpgradeReceipt, UpgradeTicket};
     use wormhole::bytes32::{Self, Bytes32};
+    use wormhole::bytes::{Self};
     use wormhole::cursor::{Self};
     use wormhole::governance_message::{Self, DecreeTicket, DecreeReceipt};
 
@@ -123,13 +124,17 @@ module pyth::contract_upgrade {
 
     fun deserialize(payload: vector<u8>): UpgradeContract {
         let cur = cursor::new(payload);
+        // Pyth upgrade governance message payloads are 40 bytes long. The breakdown looks like
+        // 4 (magic) + 1 (module name) + 1 (action) + 2 (target chain) + 32 (digest)
 
+        bytes::take_bytes(&mut cur, 8); // ignore the first 8 bytes here (they were used for verification in a different code path)
         // This amount cannot be greater than max u64.
         let digest = bytes32::take_bytes(&mut cur);
         assert!(bytes32::is_nonzero(&digest), E_DIGEST_ZERO_BYTES);
 
-        cursor::destroy_empty(cur);
-
+        // there might be additional appended to payload in the future,
+        // which is why we don't cursor::destroy_empty(&mut cur)
+        cursor::take_rest(cur);
         UpgradeContract { digest }
     }
 

target_chains/sui/contracts/sources/migrate.move

@@ -26,8 +26,6 @@ module pyth::migrate {
         pyth_state: &mut State,
         receipt: DecreeReceipt<GovernanceWitness>
     ) {
-        // This should be removed in an upgrade from 0.1.1.
-        state::migrate__v__0_1_1(pyth_state);
 
         // Perform standard migrate.
         handle_migrate(pyth_state, receipt);
@@ -55,8 +53,6 @@ module pyth::migrate {
         pyth_state: &mut State,
         receipt: DecreeReceipt<GovernanceWitness>
     ) {
-        // Update the version first.
-        //
         // See `version_control` module for hard-coded configuration.
         state::migrate_version(pyth_state);
 

target_chains/sui/scripts/pyth/pyth_deploy.ts

@@ -18,8 +18,8 @@ import { REGISTRY, NETWORK } from "../registry";
 dotenv.config({ path: "~/.env" });
 
 // Network dependent settings.
-let network = NETWORK.MAINNET; // <= NOTE: Update this when changing network
-const walletPrivateKey = process.env.SUI_MAINNET; // <= NOTE: Update this when changing network
+let network = NETWORK.TESTNET; // <= NOTE: Update this when changing network
+const walletPrivateKey = process.env.SUI_TESTNET_ALT_KEY; // <= NOTE: Update this when changing network
 
 const registry = REGISTRY[network];
 const provider = new JsonRpcProvider(
@@ -47,7 +47,7 @@ async function publishPackage(signer: RawSigner, packagePath: string) {
       dependencies: string[];
     } = JSON.parse(
       execSync(
-        `sui move build --dump-bytecode-as-base64 --path ${packagePath} 2> /dev/null`,
+        `sui move build --dump-bytecode-as-base64 --path ${__dirname}/${packagePath} 2> /dev/null`,
         {
           encoding: "utf-8",
         }

target_chains/sui/scripts/pyth/pyth_init_state.ts

@@ -12,8 +12,8 @@ import { REGISTRY, NETWORK, INITIAL_DATA_SOURCES } from "../registry";
 dotenv.config({ path: "~/.env" });
 
 // Network dependent settings.
-let network = NETWORK.MAINNET; // <= NOTE: Update this when changing network
-let walletPrivateKey = process.env.SUI_MAINNET; // <= NOTE: Update this when changing network
+let network = NETWORK.TESTNET; // <= NOTE: Update this when changing network
+let walletPrivateKey = process.env.SUI_TESTNET_ALT_KEY; // <= NOTE: Update this when changing network
 
 const registry = REGISTRY[network];
 const initial_data_sources = INITIAL_DATA_SOURCES[network];
@@ -35,9 +35,9 @@ async function main() {
 
   // NOTE: Set these before calling init_pyth
   const upgradeCap =
-    "0x92d51150b762fd694877b23ecaba79a3fc1032bc24914d145a393b62e1e61894";
+    "0x3009604c845875def6c08d6bba8769f13e8fd4c600210063cdb5bf3b3c650eca";
   const deployerCap =
-    "0x645ba70c9087d54a3e5e6abed0d506516dddb71d987b0ee503593de2677caefe";
+    "0x6655c230a23dc642d97fa9f8ab2a23a92813f23930e33f3fe20e63acfe3b60e9";
 
   init_pyth(wallet, PYTH_PACKAGE, deployerCap, upgradeCap);
 }