diff --git a/Cargo.lock b/Cargo.lock index 3084edc6f..2487342b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,11 +1617,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#fdef2c6774416b1b361a22894078fb1cc5e89203" +source = "git+https://github.com/helium/proto?branch=master#2916bcd01d740171ac8d49a29d1ea892419820f0" dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "prost", "rand 0.8.5", "rand_chacha 0.3.0", @@ -1776,7 +1776,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -2618,7 +2618,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "notify", "serde", @@ -3200,7 +3200,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "hex-literal", "http 0.2.11", "lazy_static", @@ -3776,7 +3776,7 @@ dependencies = [ "h3o", "helium-anchor-gen", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", + "helium-proto", "hex", "itertools", "jsonrpc_client", @@ -3811,18 +3811,6 @@ dependencies = [ "tonic-build", ] -[[package]] -name = "helium-proto" -version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#62e22b2a4fb7de6f2ba7d67f933d77d4ad52a882" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", - "serde_json", -] - [[package]] name = "helium-sub-daos" version = "0.1.5" @@ -3864,7 +3852,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4280,7 +4268,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "humantime-serde", "metrics", @@ -4349,7 +4337,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -4391,7 +4379,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -4433,7 +4421,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http-serde", "humantime-serde", "iot-config", @@ -5021,7 +5009,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -5061,7 +5049,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "mobile-config", "prost", "rand 0.8.5", @@ -5097,7 +5085,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -5141,7 +5129,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "hex-assignments", "hextree", "http-serde", @@ -5824,7 +5812,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5907,7 +5895,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6514,7 +6502,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=macpie/verification_mapping)", + "helium-proto", "humantime-serde", "lazy_static", "metrics", diff --git a/Cargo.toml b/Cargo.toml index 8f6db3618..a45355a99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,10 +70,10 @@ helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch = hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [ "disktree", ] } -helium-proto = { git = "https://github.com/helium/proto", branch = "macpie/verification_mapping", features = [ +helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [ "services", ] } -beacon = { git = "https://github.com/helium/proto", branch = "macpie/verification_mapping" } +beacon = { git = "https://github.com/helium/proto", branch = "master" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18" @@ -133,4 +133,3 @@ sqlx = { git = "https://github.com/helium/sqlx.git", rev = "92a2268f02e0cac6fccb # [patch.'https://github.com/helium/proto'] # helium-proto = { path = "../proto" } # beacon = { path = "../proto/beacon" } -# Temporary patch