Merge branch 'master' of https:/kaspanet/rusty-kaspa into…

… weight_ip_prefix
kaspanet · Jul 19, 2023 · 7160a52 · 7160a52
2 parents c2a3970 + 9671380
commit 7160a52
Show file tree

Hide file tree

Showing 20 changed files with 572 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -135,7 +135,7 @@ clap = { version = "4.0.23", features = ["derive", "string", "cargo"] }
 derive_more = { version = "0.99" }
 log = "0.4"
 cfg-if = "1.0.0"
-rocksdb = "0.19"
+rocksdb = "0.21"
 num_cpus = "1.15.0"
 async-trait = "0.1.57"
 paste = "1.0.11"
@@ -146,7 +146,7 @@ wasm-bindgen-futures = "0.4.33"
 js-sys = "0.3.56"
 getrandom = { version = "0.2.8", features = ["js"] }
 uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] }
-
+serde_bytes = "0.11.11"
 # bip32 dependencies
 rand_core = { version = "0.6", features = ["std"] }
 bs58 = { version = "0.4", features = ["check"], default-features = false }

diff --git a/components/addressmanager/Cargo.toml b/components/addressmanager/Cargo.toml
@@ -9,6 +9,7 @@ license.workspace = true
 [dependencies]
 rocksdb.workspace = true
 kaspa-utils.workspace = true
+kaspa-consensus-core.workspace = true
 kaspa-core.workspace = true
 kaspa-database.workspace = true
 serde.workspace = true
@@ -17,6 +18,7 @@ rand.workspace = true
 parking_lot.workspace = true
 borsh.workspace = true
 log.workspace = true
+local-ip-address = "0.5.3"
 
 [dev-dependencies]
 statrs = "0.13.0"