diff --git a/Cargo.lock b/Cargo.lock index c4a7dda99..f1641dcf9 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=bbalser/ban_type#2ba02f8edfde219fdfea7e6413fc74fe96889213" +source = "git+https://github.com/helium/proto?branch=master#376765fe006051d6dcccf709def58e7ed291b845" dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "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=bbalser/ban_type)", + "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=bbalser/ban_type)", + "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=bbalser/ban_type)", + "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", @@ -3801,7 +3801,7 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=bbalser/ban_type#2ba02f8edfde219fdfea7e6413fc74fe96889213" +source = "git+https://github.com/helium/proto?branch=master#fdef2c6774416b1b361a22894078fb1cc5e89203" dependencies = [ "bytes", "prost", @@ -3812,18 +3812,6 @@ dependencies = [ "tonic-build", ] -[[package]] -name = "helium-proto" -version = "0.1.0" -source = "git+https://github.com/helium/proto?branch=master#fdef2c6774416b1b361a22894078fb1cc5e89203" -dependencies = [ - "bytes", - "prost", - "prost-build", - "serde", - "serde_json", -] - [[package]] name = "helium-sub-daos" version = "0.1.5" @@ -3865,7 +3853,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4281,7 +4269,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "http 0.2.11", "humantime-serde", "metrics", @@ -4350,7 +4338,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -4392,7 +4380,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -4434,7 +4422,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "http-serde", "humantime-serde", "iot-config", @@ -5022,7 +5010,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "hextree", "http 0.2.11", "http-serde", @@ -5062,7 +5050,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "mobile-config", "prost", "rand 0.8.5", @@ -5098,7 +5086,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "http 0.2.11", "http-serde", "humantime-serde", @@ -5142,7 +5130,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "hex-assignments", "hextree", "http-serde", @@ -5825,7 +5813,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5908,7 +5896,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6515,7 +6503,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=bbalser/ban_type)", + "helium-proto", "humantime-serde", "lazy_static", "metrics", diff --git a/Cargo.toml b/Cargo.toml index 30981fd7e..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 = "bbalser/ban_type", features = [ +helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [ "services", ] } -beacon = { git = "https://github.com/helium/proto", branch = "bbalser/ban_type" } +beacon = { git = "https://github.com/helium/proto", branch = "master" } solana-client = "1.18" solana-sdk = "1.18" solana-program = "1.18"