diff --git a/Cargo.lock b/Cargo.lock index ebfc76fdd..3eec42dc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1619,13 +1619,13 @@ source = "git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-suppo dependencies = [ "base64 0.21.7", "byteorder", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "prost", "rand 0.8.5", "rand_chacha 0.3.0", "rust_decimal", "serde", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", ] @@ -1788,7 +1788,7 @@ dependencies = [ "file-store", "futures", "futures-util", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "http-serde", "humantime-serde", @@ -2630,7 +2630,7 @@ dependencies = [ "axum 0.7.4", "bs58 0.4.0", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "notify", "serde", @@ -3212,7 +3212,7 @@ dependencies = [ "futures-util", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "hex-literal", "http 0.2.11", "lazy_static", @@ -3794,7 +3794,7 @@ dependencies = [ "h3o", "helium-anchor-gen", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)", "hex", "hex-literal", "itertools", @@ -3821,6 +3821,23 @@ dependencies = [ [[package]] name = "helium-proto" version = "0.1.0" +source = "git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support#fffce9d335b1e5d74ffd5da27ddba6e60b6d9d7c" +dependencies = [ + "bytes", + "prost", + "prost-build", + "serde", + "serde_json", + "strum", + "strum_macros", + "tonic", + "tonic-build", +] + +[[package]] +name = "helium-proto" +version = "0.1.0" +source = "git+https://github.com/helium/proto?branch=master#c5c67f5631b69ef696961995045c0a41f9a5b936" dependencies = [ "bytes", "prost", @@ -3874,7 +3891,7 @@ dependencies = [ "async-trait", "chrono", "derive_builder", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "hextree", "rust_decimal", "rust_decimal_macros", @@ -4290,7 +4307,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "humantime-serde", "metrics", @@ -4360,7 +4377,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "hextree", "http 0.2.11", "http-serde", @@ -4404,7 +4421,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "http-serde", "humantime-serde", @@ -4447,7 +4464,7 @@ dependencies = [ "h3o", "helium-crypto", "helium-lib", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http-serde", "humantime-serde", "iot-config", @@ -5035,7 +5052,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "hextree", "http 0.2.11", "http-serde", @@ -5077,7 +5094,7 @@ dependencies = [ "futures", "h3o", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "mobile-config", "prost", "rand 0.8.5", @@ -5113,7 +5130,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "http-serde", "humantime-serde", @@ -5158,7 +5175,7 @@ dependencies = [ "h3o", "helium-crypto", "helium-lib", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "hex-assignments", "hextree", "http-serde", @@ -5842,7 +5859,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "http 0.2.11", "hyper 0.14.28", "jsonrpsee", @@ -5925,7 +5942,7 @@ dependencies = [ "futures-util", "helium-anchor-gen", "helium-lib", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "humantime-serde", "metrics", "metrics-exporter-prometheus", @@ -6564,7 +6581,7 @@ dependencies = [ "futures", "futures-util", "helium-crypto", - "helium-proto", + "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=andymck/sub-dao-epoch-support)", "humantime-serde", "lazy_static", "metrics", @@ -9991,7 +10008,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.9.9", + "sha2 0.10.8", "thiserror", "twox-hash", "xorf", diff --git a/Cargo.toml b/Cargo.toml index fae3f6697..acac87a64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -132,6 +132,6 @@ sqlx = { git = "https://github.com/launchbadge/sqlx.git", rev = "42dd78fe931df65 # Patching for beacon must point directly to the crate, it will not look in the # repo for sibling crates. # - [patch.'https://github.com/helium/proto'] - helium-proto = { path = "../../proto" } +# [patch.'https://github.com/helium/proto'] +# helium-proto = { path = "../../proto" } # beacon = { path = "../../proto" }