瀏覽代碼

chore: use published version of wormhole packages (#1375)

* Go

* 0.1.0
guibescos 1 年之前
父節點
當前提交
4ffeb9f265

+ 3 - 3
pythnet/pythnet_sdk/Cargo.toml

@@ -11,7 +11,7 @@ crate-type = ["lib"]
 name = "pythnet_sdk"
 
 [features]
-test-utils = ["dep:wormhole-sdk", "dep:serde_wormhole", "dep:libsecp256k1", "dep:rand"]
+test-utils = ["dep:wormhole-vaas-serde", "dep:serde_wormhole", "dep:libsecp256k1", "dep:rand"]
 
 [dependencies]
 bincode = "1.3.1"
@@ -26,8 +26,8 @@ quickcheck = { version = "1", optional = true}
 sha3 = "0.10.4"
 slow_primes = "0.1.14"
 thiserror = "1.0.40"
-serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="rust-sdk-2024-01-25"}
-wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", optional = true, tag="rust-sdk-2024-01-25"}
+serde_wormhole = {version ="0.1.0", optional = true}
+wormhole-vaas-serde = {version = "0.1.0", optional = true}
 libsecp256k1 = {version ="0.7.1", optional = true}
 rand = {version = "0.8.5", optional = true}
 

+ 31 - 18
target_chains/solana/Cargo.lock

@@ -3043,7 +3043,7 @@ dependencies = [
  "tokio",
  "wormhole-core-bridge-solana",
  "wormhole-raw-vaas",
- "wormhole-sdk",
+ "wormhole-vaas-serde",
 ]
 
 [[package]]
@@ -3064,8 +3064,8 @@ dependencies = [
  "solana-client",
  "solana-sdk",
  "wormhole-core-bridge-solana",
- "wormhole-sdk",
  "wormhole-solana",
+ "wormhole-vaas-serde",
 ]
 
 [[package]]
@@ -3096,7 +3096,7 @@ dependencies = [
  "sha3 0.10.6",
  "slow_primes",
  "thiserror",
- "wormhole-sdk",
+ "wormhole-vaas-serde",
 ]
 
 [[package]]
@@ -3775,7 +3775,8 @@ dependencies = [
 [[package]]
 name = "serde_wormhole"
 version = "0.1.0"
-source = "git+https://github.com/wormhole-foundation/wormhole?tag=rust-sdk-2024-01-25#55faa9ca1fe456e90e957b33aa7bcc565a33c3fa"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b022bf813578a06341fd453c3fd6e64945d9975191193d5d45e8dbd97d1d84"
 dependencies = [
  "base64 0.13.1",
  "itoa",
@@ -6200,20 +6201,6 @@ dependencies = [
  "ruint-macro",
 ]
 
-[[package]]
-name = "wormhole-sdk"
-version = "0.1.0"
-source = "git+https://github.com/wormhole-foundation/wormhole?tag=rust-sdk-2024-01-25#55faa9ca1fe456e90e957b33aa7bcc565a33c3fa"
-dependencies = [
- "anyhow",
- "bstr 1.6.0",
- "schemars",
- "serde",
- "serde_wormhole",
- "sha3 0.10.6",
- "thiserror",
-]
-
 [[package]]
 name = "wormhole-solana"
 version = "0.1.0"
@@ -6232,6 +6219,32 @@ dependencies = [
  "wormhole-core",
 ]
 
+[[package]]
+name = "wormhole-supported-chains"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f42a80a24212937cc7d7b0ab8115bb87d82f949a1a42f75d500807072c94ba4"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "wormhole-vaas-serde"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240c5a6136dc66ecc65097bb6d159e849b5df4ecbbbb220868d0edbdcc568ed3"
+dependencies = [
+ "anyhow",
+ "bstr 1.6.0",
+ "schemars",
+ "serde",
+ "serde_wormhole",
+ "sha3 0.10.6",
+ "thiserror",
+ "wormhole-supported-chains",
+]
+
 [[package]]
 name = "x509-parser"
 version = "0.14.0"

+ 2 - 2
target_chains/solana/Cargo.toml

@@ -17,8 +17,8 @@ codegen-units = 1
 
 [workspace.dependencies]
 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" }
+wormhole-vaas-serde =  "0.1.0"
+serde_wormhole = "0.1.0"
 anchor-lang = "0.28.0"
 anchor-client = "0.28.0"
 solana-program = "1.16.20"

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

@@ -14,7 +14,7 @@ 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
 pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", version = "2.0.0" }
-wormhole-sdk = { workspace = true }
+wormhole-vaas-serde = { workspace = true }
 serde_wormhole = { workspace = true }
 hex = "0.4.3"
 borsh = "0.9.3" # Old version of borsh needed for wormhole-solana

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

@@ -35,6 +35,6 @@ libsecp256k1 = "0.7.1"
 rand = "0.8.5"
 lazy_static = "1.4.0"
 program-simulator = { path = "../../program_simulator" }
-wormhole-sdk = { workspace = true }
+wormhole-vaas-serde = { workspace = true }
 serde_wormhole = { workspace = true }
 pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", features = ["test-utils"] }