feat: geoip improvements (#7)

WalletConnect · Sep 29, 2023 · c5d0d06 · c5d0d06
1 parent 4120127
commit c5d0d06
Show file tree

Hide file tree

Showing 13 changed files with 442 additions and 453 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ alloc = ["dep:alloc"]
 analytics = ["dep:analytics"]
 collections = ["dep:collections"]
 future = ["dep:future"]
-geoblock = ["dep:geoblock", "dep:geoip"]
+geoblock = ["geoip/middleware"]
 geoip = ["dep:geoip"]
 http = []
 metrics = ["dep:metrics", "future/metrics", "alloc/metrics", "http/metrics"]
@@ -39,7 +39,6 @@ alloc = { path = "./crates/alloc", optional = true }
 analytics = { path = "./crates/analytics", optional = true }
 collections = { path = "./crates/collections", optional = true }
 future = { path = "./crates/future", optional = true }
-geoblock = { path = "./crates/geoblock", optional = true }
 geoip = { path = "./crates/geoip", optional = true }
 http = { path = "./crates/http", optional = true }
 metrics = { path = "./crates/metrics", optional = true }

diff --git a/crates/analytics/Cargo.toml b/crates/analytics/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = "1"
 tap = "1.0"
 
 chrono = { version = "0.4" }
-aws-sdk-s3 = "0.25"
-bytes = "1.2"
+aws-sdk-s3 = "0.31"
+bytes = "1.5"
 parquet = { git = "https://github.com/WalletConnect/arrow-rs.git", rev = "99a1cc3", default-features = false, features = ["flate2"]  }
 parquet_derive = { git = "https://github.com/WalletConnect/arrow-rs.git", rev = "99a1cc3" }
diff --git a/crates/geoblock/Cargo.toml b/crates/geoblock/Cargo.toml
diff --git a/crates/geoblock/src/lib.rs b/crates/geoblock/src/lib.rs
diff --git a/crates/geoip/Cargo.toml b/crates/geoip/Cargo.toml
@@ -3,10 +3,25 @@ name = "geoip"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = []
+full = ["middleware"]
+middleware = ["dep:tower", "dep:tower-layer", "dep:axum-client-ip", "dep:http-body"]
 
 [dependencies]
+tower = { version = "0.4", optional = true }
+tower-layer = { version = "0.3", optional = true }
+http-body = { version = "0.4", optional = true }
+axum-client-ip = { version = "0.4", optional = true }
+bitflags = "2.4"
+hyper = "0.14"
+tracing = "0.1"
+thiserror = "1.0"
+futures = "0.3"
 bytes = "1.5"
-aws-sdk-s3 = "0.31.0"
+aws-sdk-s3 = "0.31"
 maxminddb = "0.23"
-thiserror = "1.0"
+
+[dev-dependencies]
+tokio = { version = "1", features = ["full"] }
+axum = "0.6"