Cleanup local environment (#487)

* Cleanup local environment

* Default Pyth address to match Pythnet

* Cleanup

* Make vault the same as on mainnet

* Fix mesh

* Pyth owner address updated

* Revert some changes lol

* Revert more changes

* Restore oracle address

* Add comment to create key

Author: guibescos

third_party/pyth/multisig-wh-message-builder/src/index.ts

@@ -66,7 +66,7 @@ export const CONFIG: Record<Cluster, Config> = {
   },
   localdevnet: {
     wormholeClusterName: "DEVNET",
-    vault: new PublicKey("DFkA5ubJSETKiFnniAsm8qRXUa7RrnnE7U9awTzbcrJF"),
+    vault: new PublicKey("FVQyHcooAtThJ83XFrNnv74BcinbRH3bRmfFamAHBfuj"),
     wormholeRpcEndpoint: "http://guardian:7071",
   },
 };

third_party/pyth/prepare_multisig.py

@@ -11,14 +11,13 @@
 
 MESH_KEY_DIR = "/solana-secrets/squads/"
 MESH_PROGRAM_ADDR = "SMPLVC8MxZ5Bf5EfF7PaMiTCxoBAcmkbM2vkrvMK8ho"
-MESH_CREATE_KEY_PATH = MESH_KEY_DIR + "create_key.json"
 MESH_VAULT_EXT_AUTHORITY_KEY_PATH = MESH_KEY_DIR + "external_authority.json"
 
 ALICE_KEY_PATH = MESH_KEY_DIR + "member_alice.json"
 BOB_KEY_PATH = MESH_KEY_DIR + "member_bob.json"
 CAROL_KEY_PATH = MESH_KEY_DIR + "member_carol.json"
 
-create_key_addr = sol_run_or_die("address", ["--keypair", MESH_CREATE_KEY_PATH], capture_output=True).stdout.strip()
+create_key_addr = "73UuSY2yXat7h7T49MMGg8TiHPqJJKKVc33DmC4b41Hf" # The person that instantiated the multisig on mainnet used this create key, it never needs to sign but we're using it to match mainnet
 ext_authority_addr = sol_run_or_die("address", ["--keypair", MESH_VAULT_EXT_AUTHORITY_KEY_PATH], capture_output=True).stdout.strip()
 
 alice_addr = sol_run_or_die("address", ["--keypair", ALICE_KEY_PATH], capture_output=True).stdout.strip()

tilt-devnet/docker-images/Dockerfile.solana

@@ -63,11 +63,9 @@ RUN --mount=type=cache,target=/usr/src/bridge/wormhole/solana/target \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/root/.cache \
     cargo build-bpf --manifest-path "bridge/wormhole/solana/bridge/program/Cargo.toml" -- --locked && \
-    cargo build-bpf --manifest-path "bridge/wormhole/solana/bridge/cpi_poster/Cargo.toml" -- --locked && \
     cargo build-bpf --manifest-path "wormhole-attester/program/Cargo.toml" -- --locked && \
     cargo build-bpf --manifest-path "squads/squads-mpl/programs/mesh/Cargo.toml" -- --locked && \
     cp bridge/wormhole/solana/target/deploy/bridge.so /opt/solana/deps/bridge.so && \
-    cp bridge/wormhole/solana/target/deploy/cpi_poster.so /opt/solana/deps/cpi_poster.so && \
     cp wormhole-attester/target/deploy/pyth_wormhole_attester.so /opt/solana/deps/pyth_wormhole_attester.so && \
     cp squads/squads-mpl/target/deploy/mesh.so /opt/solana/deps/mesh.so
 

tilt-devnet/k8s/solana-devnet.yaml

@@ -42,9 +42,6 @@ spec:
             - Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
             - /opt/solana/deps/bridge.so
             - --bpf-program
-            - CP1co2QMMoDPbsmV7PGcUTLFwyhgCgTXt25gLQ5LewE1
-            - /opt/solana/deps/cpi_poster.so
-            - --bpf-program
             - gMYYig2utAxVoXnM9UhtTWrt8e7x2SVBZqsWZJeT5Gw # Derived from pyth_program.json
             - /opt/solana/deps/pyth_oracle.so
             - --bpf-program

tilt-devnet/secrets/solana/squads/create_key.json

@@ -6,6 +6,6 @@ export const WORMHOLE_ADDRESS: Record<PythCluster, PublicKey | undefined> = {
   pythtest: new PublicKey("EUrRARh92Cdc54xrDn6qzaqjA77NRrCcfbr8kPwoTL4z"),
   devnet: new PublicKey("3u8hJUVTA4jH1wYAyUur7FFZVQ8H635K3tSHHF4ssjQ5"),
   pythnet: new PublicKey("H3fxXJ86ADW2PNuDDmZJg6mzTtPxkYCpNuQUTgmJ7AjU"),
-  localnet: new PublicKey("gMYYig2utAxVoXnM9UhtTWrt8e7x2SVBZqsWZJeT5Gw"),
+  localnet: new PublicKey("Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"),
   testnet: undefined,
 };