Ver código fonte

Move deps to the workspace level (#1332)

guibescos 1 ano atrás
pai
commit
f9de5430d1

+ 1 - 1
target_chains/solana/Cargo.lock

@@ -6173,7 +6173,7 @@ dependencies = [
 [[package]]
 name = "wormhole-core-bridge-solana"
 version = "0.0.1-alpha.5"
-source = "git+https://github.com/wormhole-foundation/wormhole?branch=wen/solana-rewrite#7bd40b595e22c5512dfaa2ed8e6d7441df743a69"
+source = "git+https://github.com/wormhole-foundation/wormhole?rev=7bd40b595e22c5512dfaa2ed8e6d7441df743a69#7bd40b595e22c5512dfaa2ed8e6d7441df743a69"
 dependencies = [
  "anchor-lang",
  "cfg-if",

+ 7 - 1
target_chains/solana/Cargo.toml

@@ -16,6 +16,12 @@ incremental = false
 codegen-units = 1
 
 [workspace.dependencies]
-wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", branch = "wen/solana-rewrite"}
+wormhole-core-bridge-solana = {git = "https://github.com/wormhole-foundation/wormhole", rev = "7bd40b595e22c5512dfaa2ed8e6d7441df743a69"}
 wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "rust-sdk-2024-01-25" }
 serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "rust-sdk-2024-01-25" }
+anchor-lang = "0.28.0"
+anchor-client = "0.28.0"
+solana-program = "1.16.20"
+solana-program-test = "1.16.20"
+solana-sdk = "1.16.20"
+solana-client = "1.16.20"

+ 3 - 3
target_chains/solana/cli/Cargo.toml

@@ -7,9 +7,9 @@ edition = "2021"
 anyhow = "1.0.65"
 base64 = "0.13.0"
 shellexpand = "2.1.2"
-solana-sdk = "1.16.20"
-solana-client = "1.16.20"
-anchor-client = "0.28.0"
+solana-sdk = { workspace = true }
+solana-client = { workspace = true }
+anchor-client = { workspace = true }
 clap = {version ="3.2.22", features = ["derive"]}
 pyth-solana-receiver = {path = "../programs/pyth-solana-receiver" }
 wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana"} # Used for initializing the wormhole receiver

+ 7 - 7
target_chains/solana/program_simulator/Cargo.toml

@@ -9,10 +9,10 @@ name = "program_simulator"
 
 
 [dependencies]
-solana-sdk = "1.16.20"
-solana-client = "1.16.20"
-solana-program-test = "1.16.20"
-solana-program = "1.16.20"
-bincode = "1.3.3"
-borsh = "0.10.3"
-anchor-lang = "0.28.0"
+solana-sdk = "*"
+solana-client = "*"
+solana-program-test = "*"
+solana-program = "*"
+bincode = "*"
+borsh = "*"
+anchor-lang = ">=0.28.0"

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

@@ -16,9 +16,9 @@ cpi = ["no-entrypoint"]
 test-bpf = []
 
 [dependencies]
-anchor-lang = "0.28.0"
+anchor-lang = { workspace = true }
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
-solana-program = "1.16.20"
+solana-program = { workspace = true }
 byteorder = "1.4.3"
 wormhole-core-bridge-solana = {workspace = true}
 wormhole-raw-vaas = {version = "0.1.3", features = ["ruint", "on-chain"], default-features = false }
@@ -27,8 +27,8 @@ pyth-solana-receiver-state = { path = "../../pyth_solana_receiver_state"}
 [dev-dependencies]
 pyth-sdk = "0.8.0"
 pyth-sdk-solana = "0.8.0"
-solana-program-test = "1.16.20"
-solana-sdk = "1.16.20"
+solana-program-test = { workspace = true }
+solana-sdk = { workspace = true }
 tokio = "1.14.1"
 bincode = "1.3.3"
 libsecp256k1 = "0.7.1"