Merge branch 'kaspanet:master' into master

aspectron · Oct 25, 2023 · a84719d · a84719d
2 parents 98d822e + c6b9a7b
commit a84719d
Show file tree

Hide file tree

Showing 51 changed files with 1,216 additions and 485 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 target
 web-root
-/.idea/*
+**/.idea/
 /rust-toolchain
 /.vscode/
 **/db-*

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/addressmanager/Cargo.toml b/components/addressmanager/Cargo.toml
@@ -19,7 +19,10 @@ rand.workspace = true
 parking_lot.workspace = true
 borsh.workspace = true
 log.workspace = true
+tokio.workspace = true
+thiserror.workspace = true
 local-ip-address = "0.5.3"
+igd-next = { version = "0.14.2", features = ["aio_tokio"] }
 
 [dev-dependencies]
 statrs = "0.13.0"