[Solana] Elevate wormhole core bridge dependency to workspace, stop using my branch (#1228)

* Do it

* Do it

target_chains/solana/Cargo.lock

@@ -3039,7 +3039,7 @@ dependencies = [
  "solana-program-test",
  "solana-sdk",
  "tokio",
- "wormhole-core-bridge-solana 0.0.1-alpha.5",
+ "wormhole-core-bridge-solana",
  "wormhole-raw-vaas 0.0.1-alpha.2",
  "wormhole-sdk",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
  "shellexpand",
  "solana-client",
  "solana-sdk",
- "wormhole-core-bridge-solana 0.0.1-alpha.3",
+ "wormhole-core-bridge-solana",
  "wormhole-sdk",
  "wormhole-solana",
 ]
@@ -6153,24 +6153,10 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "wormhole-core-bridge-solana"
-version = "0.0.1-alpha.3"
-source = "git+https://github.com/guibescos/wormhole?branch=variable-sigs#a9b970c1bc09b9678777949bcfcac8d498f7c1fc"
-dependencies = [
- "anchor-lang",
- "cfg-if",
- "hex",
- "ruint",
- "solana-program",
- "wormhole-io",
- "wormhole-raw-vaas 0.0.1-alpha.2",
-]
-
 [[package]]
 name = "wormhole-core-bridge-solana"
 version = "0.0.1-alpha.5"
-source = "git+https://github.com/wormhole-foundation/wormhole?branch=wen/solana-rewrite#076ae39ea5227f2e7e454cdf3287c8db9dda197d"
+source = "git+https://github.com/wormhole-foundation/wormhole?branch=wen/solana-rewrite#7bd40b595e22c5512dfaa2ed8e6d7441df743a69"
 dependencies = [
  "anchor-lang",
  "cfg-if",

target_chains/solana/Cargo.toml

@@ -15,3 +15,6 @@ codegen-units = 1
 
 [patch.crates-io]
 serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
+
+[workspace.dependencies]
+wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", branch = "wen/solana-rewrite"}

target_chains/solana/cli/Cargo.toml

@@ -18,4 +18,4 @@ wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag =
 serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"} # Used to deserialize VAAs
 hex = "0.4.3"
 borsh = "0.9.3" # Old version of borsh needed for wormhole-solana
-wormhole-core-bridge-solana = {git = "https://github.com/guibescos/wormhole", branch = "variable-sigs"} # Used to post VAAs to the wormhole receiver
+wormhole-core-bridge-solana = {workspace = true}

target_chains/solana/cli/src/main.rs

@@ -43,9 +43,9 @@ use {
         system_instruction,
         transaction::Transaction,
     },
-    wormhole_core_bridge_solana::{
-        processor::WriteEncodedVaaArgs,
-        state::EncodedVaa,
+    wormhole_core_bridge_solana::sdk::{
+        WriteEncodedVaaArgs,
+        VAA_START,
     },
     wormhole_sdk::{
         vaa::{
@@ -385,7 +385,7 @@ pub fn process_write_encoded_vaa_and_post_price_update(
     merkle_price_update: &MerklePriceUpdate,
 ) -> Result<Pubkey> {
     let encoded_vaa_keypair = Keypair::new();
-    let encoded_vaa_size: usize = vaa.len() + EncodedVaa::VAA_START;
+    let encoded_vaa_size: usize = vaa.len() + VAA_START;
 
     let create_encoded_vaa = system_instruction::create_account(
         &payer.pubkey(),

target_chains/solana/programs/pyth-solana-receiver/Cargo.toml

@@ -20,7 +20,7 @@ anchor-lang = "0.28.0"
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", version = "2.0.0" }
 solana-program = "1.16.20"
 byteorder = "1.4.3"
-wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", branch = "wen/solana-rewrite", features = ["cpi"]}
+wormhole-core-bridge-solana = {workspace = true}
 wormhole-raw-vaas = {version = "0.0.1-alpha.1", features = ["ruint", "on-chain"], default-features = false }
 
 [dev-dependencies]