diff --git a/Cargo.lock b/Cargo.lock
index 971b57ae3..23a59fcfb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1617,17 +1617,17 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "beacon"
 version = "0.1.0"
-source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#effd56a31ab83a1079c7819cd1f783f4141c9c9b"
+source = "git+https://github.com/helium/proto?branch=master#197ff9c6cde7dc0d8334d6b4e27c58779e6a7ce0"
 dependencies = [
  "base64 0.21.7",
  "byteorder",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "prost",
  "rand 0.8.5",
  "rand_chacha 0.3.0",
  "rust_decimal",
  "serde",
- "sha2 0.9.9",
+ "sha2 0.10.8",
  "thiserror",
 ]
 
@@ -1791,7 +1791,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "http-serde",
  "humantime-serde",
@@ -2132,7 +2132,16 @@ dependencies = [
 [[package]]
 name = "circuit-breaker"
 version = "0.1.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "circuit-breaker"
+version = "0.1.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -2633,7 +2642,7 @@ dependencies = [
  "axum 0.7.4",
  "bs58 0.4.0",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "notify",
  "serde",
@@ -2774,7 +2783,16 @@ dependencies = [
 [[package]]
 name = "data-credits"
 version = "0.2.2"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "data-credits"
+version = "0.2.2"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3152,7 +3170,16 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 [[package]]
 name = "fanout"
 version = "0.1.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "fanout"
+version = "0.1.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3215,7 +3242,7 @@ dependencies = [
  "futures-util",
  "h3o",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "hex-literal",
  "http 0.2.11",
  "lazy_static",
@@ -3728,7 +3755,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 [[package]]
 name = "helium-anchor-gen"
 version = "0.1.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3779,7 +3806,7 @@ dependencies = [
  "bs58 0.5.0",
  "byteorder",
  "ed25519-compact",
- "getrandom 0.1.16",
+ "getrandom 0.2.10",
  "k256",
  "lazy_static",
  "multihash",
@@ -3796,8 +3823,17 @@ dependencies = [
 
 [[package]]
 name = "helium-entity-manager"
-version = "0.3.1"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+version = "0.2.11"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "helium-entity-manager"
+version = "0.2.11"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3806,7 +3842,7 @@ dependencies = [
 [[package]]
 name = "helium-lib"
 version = "0.0.0"
-source = "git+https://github.com/helium/helium-wallet-rs.git?branch=master#b54819ac4c4bd73be37d25d7d6d48842bbc95ea9"
+source = "git+https://github.com/helium/helium-wallet-rs.git?branch=master#4acf688beac3c507c33843a745516839e1f814b2"
 dependencies = [
  "anchor-client",
  "anchor-spl",
@@ -3819,7 +3855,7 @@ dependencies = [
  "h3o",
  "helium-anchor-gen 0.1.0 (git+https://github.com/helium/helium-anchor-gen.git?branch=main)",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=master)",
+ "helium-proto",
  "hex",
  "hex-literal",
  "itertools",
@@ -3846,7 +3882,7 @@ dependencies = [
 [[package]]
 name = "helium-proto"
 version = "0.1.0"
-source = "git+https://github.com/helium/proto?branch=map/subscriber-referral#effd56a31ab83a1079c7819cd1f783f4141c9c9b"
+source = "git+https://github.com/helium/proto?branch=master#197ff9c6cde7dc0d8334d6b4e27c58779e6a7ce0"
 dependencies = [
  "bytes",
  "prost",
@@ -3860,9 +3896,9 @@ dependencies = [
 ]
 
 [[package]]
-name = "helium-proto"
-version = "0.1.0"
-source = "git+https://github.com/helium/proto?branch=master#376765fe006051d6dcccf709def58e7ed291b845"
+name = "helium-sub-daos"
+version = "0.1.8"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3871,7 +3907,7 @@ dependencies = [
 [[package]]
 name = "helium-sub-daos"
 version = "0.1.8"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -3909,7 +3945,7 @@ dependencies = [
  "async-trait",
  "chrono",
  "derive_builder",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "hextree",
  "rust_decimal",
  "rust_decimal_macros",
@@ -3925,7 +3961,16 @@ checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 [[package]]
 name = "hexboosting"
 version = "0.1.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "hexboosting"
+version = "0.1.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -4325,7 +4370,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "humantime-serde",
  "metrics",
@@ -4394,7 +4439,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "hextree",
  "http 0.2.11",
  "http-serde",
@@ -4436,7 +4481,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "http-serde",
  "humantime-serde",
@@ -4478,7 +4523,7 @@ dependencies = [
  "futures-util",
  "h3o",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http-serde",
  "humantime-serde",
  "iot-config",
@@ -4736,7 +4781,25 @@ dependencies = [
 [[package]]
 name = "lazy-distributor"
 version = "0.2.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "lazy-distributor"
+version = "0.2.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "lazy-transactions"
+version = "0.2.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -4745,7 +4808,7 @@ dependencies = [
 [[package]]
 name = "lazy-transactions"
 version = "0.2.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -5066,7 +5129,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "hextree",
  "http 0.2.11",
  "http-serde",
@@ -5106,7 +5169,7 @@ dependencies = [
  "futures",
  "h3o",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "mobile-config",
  "prost",
  "rand 0.8.5",
@@ -5121,7 +5184,16 @@ dependencies = [
 [[package]]
 name = "mobile-entity-manager"
 version = "0.1.3"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "mobile-entity-manager"
+version = "0.1.3"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -5142,7 +5214,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "http-serde",
  "humantime-serde",
@@ -5186,7 +5258,7 @@ dependencies = [
  "futures-util",
  "h3o",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "hex-assignments",
  "hextree",
  "http-serde",
@@ -5554,7 +5626,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 2.0.58",
@@ -5870,7 +5942,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "http 0.2.11",
  "hyper 0.14.28",
  "jsonrpsee",
@@ -5953,7 +6025,7 @@ dependencies = [
  "futures-util",
  "helium-anchor-gen 0.1.0 (git+https://github.com/helium/helium-anchor-gen.git)",
  "helium-lib",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "humantime-serde",
  "metrics",
  "metrics-exporter-prometheus",
@@ -5977,7 +6049,16 @@ dependencies = [
 [[package]]
 name = "price-oracle"
 version = "0.2.1"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "price-oracle"
+version = "0.2.1"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -6069,7 +6150,7 @@ dependencies = [
  "custom-tracing",
  "file-store",
  "futures",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "humantime-serde",
  "metrics",
  "metrics-exporter-prometheus",
@@ -6120,7 +6201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
- "heck 0.4.0",
+ "heck 0.5.0",
  "itertools",
  "log",
  "multimap",
@@ -6621,7 +6702,7 @@ dependencies = [
  "futures",
  "futures-util",
  "helium-crypto",
- "helium-proto 0.1.0 (git+https://github.com/helium/proto?branch=map/subscriber-referral)",
+ "helium-proto",
  "humantime-serde",
  "lazy_static",
  "metrics",
@@ -6655,7 +6736,16 @@ dependencies = [
 [[package]]
 name = "rewards-oracle"
 version = "0.2.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "rewards-oracle"
+version = "0.2.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -9280,7 +9370,16 @@ dependencies = [
 [[package]]
 name = "treasury-management"
 version = "0.2.0"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "treasury-management"
+version = "0.2.0"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -9326,7 +9425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "rand 0.7.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -9528,7 +9627,16 @@ dependencies = [
 [[package]]
 name = "voter-stake-registry"
 version = "0.3.3"
-source = "git+https://github.com/helium/helium-anchor-gen.git#54392f522436bc8a8c8b8c0a0b4ec407a28f66ed"
+source = "git+https://github.com/helium/helium-anchor-gen.git?branch=main#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
+dependencies = [
+ "anchor-gen",
+ "anchor-lang 0.30.1",
+]
+
+[[package]]
+name = "voter-stake-registry"
+version = "0.3.3"
+source = "git+https://github.com/helium/helium-anchor-gen.git#761b839a71cc6d2aecf4be994af9d8206aeae0e1"
 dependencies = [
  "anchor-gen",
  "anchor-lang 0.30.1",
@@ -9996,7 +10104,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.9.9",
+ "sha2 0.10.8",
  "thiserror",
  "twox-hash",
  "xorf",