Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8113530
Do it
guibescos Jan 15, 2024
9770820
Do it
guibescos Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions target_chains/solana/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions target_chains/solana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
2 changes: 1 addition & 1 deletion target_chains/solana/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
8 changes: 4 additions & 4 deletions target_chains/solana/cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion target_chains/solana/programs/pyth-solana-receiver/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down