Merge pull request #283 from AdExNetwork/update-eth_checksum

elpiel · web-flow · commit e0aeee2d9dfa · 2020-03-19T17:15:31.000+02:00
Move `eth_checksum` to primitives
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/adview-manager/src/lib.rs b/adview-manager/src/lib.rs
@@ -154,7 +154,7 @@ pub fn apply_selection(campaigns: &[MarketChannel], options: &AdViewManagerOptio
 }
 
 fn is_video(ad_unit: &AdUnit) -> bool {
-    ad_unit.media_mime.split('/').nth(0) == Some("video")
+    ad_unit.media_mime.split('/').next() == Some("video")
 }
 
 fn calculate_target_score(a: &[TargetingTag], b: &[TargetingTag]) -> TargetingScore {
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -25,7 +25,7 @@ time = "0.1.42"
 hex = "0.3.2"
 merkletree = "0.10.0"
 tiny-keccak = "1.5"
-eth_checksum = "0.1.1"
+rust-crypto = "0.2"
 # Numbers - BigNum, Numbers, Traits and Derives
 num-bigint = { version = "0.2", features = ["serde"] }
 num = "0.2.0"
diff --git a/primitives/src/big_num.rs b/primitives/src/big_num.rs
@@ -1,5 +1,4 @@
 use std::convert::TryFrom;
-use std::error::Error;
 use std::iter::Sum;
 use std::ops::{Add, AddAssign, Div, Mul, Sub};
 use std::str::FromStr;
@@ -195,7 +194,7 @@ impl TryFrom<&str> for BigNum {
 
     fn try_from(num: &str) -> Result<Self, Self::Error> {
         let big_uint = BigUint::from_str(&num)
-            .map_err(|err| super::DomainError::InvalidArgument(err.description().to_string()))?;
+            .map_err(|err| super::DomainError::InvalidArgument(err.to_string()))?;
 
         Ok(Self(big_uint))
     }
diff --git a/primitives/src/eth_checksum.rs b/primitives/src/eth_checksum.rs
@@ -0,0 +1,28 @@
+use crypto::{digest::Digest, sha3::Sha3};
+
+pub fn checksum(address: &str) -> String {
+    let address = address.trim_start_matches("0x").to_lowercase();
+
+    let address_hash = {
+        let mut hasher = Sha3::keccak256();
+        hasher.input(address.as_bytes());
+        hasher.result_str()
+    };
+
+    address
+        .char_indices()
+        .fold(String::from("0x"), |mut acc, (index, address_char)| {
+            // this cannot fail since it's Keccak256 hashed
+            let n = u16::from_str_radix(&address_hash[index..index + 1], 16).unwrap();
+
+            if n > 7 {
+                // make char uppercase if ith character is 9..f
+                acc.push_str(&address_char.to_uppercase().to_string())
+            } else {
+                // already lowercased
+                acc.push(address_char)
+            }
+
+            acc
+        })
+}
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -24,6 +24,7 @@ pub mod util {
     pub mod logging;
 }
 pub mod analytics;
+mod eth_checksum;
 pub mod validator;
 
 pub use self::ad_unit::AdUnit;
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -83,7 +83,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {
         .get("true-client-ip")
         .or_else(|| req.headers().get("x-forwarded-for"))
         .and_then(|hv| hv.to_str().map(ToString::to_string).ok())
-        .map(|token| token.split(',').nth(0).map(ToString::to_string))
+        .map(|token| token.split(',').next().map(ToString::to_string))
         .flatten()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ pub fn apply_selection(campaigns: &[MarketChannel], options: &AdViewManagerOptio`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`fn is_video(ad_unit: &AdUnit) -> bool {`
`157`		`- ad_unit.media_mime.split('/').nth(0) == Some("video")`
	`157`	`+ ad_unit.media_mime.split('/').next() == Some("video")`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`fn calculate_target_score(a: &[TargetingTag], b: &[TargetingTag]) -> TargetingScore {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ pub mod util {`
`24`	`24`	`pub mod logging;`
`25`	`25`	`}`
`26`	`26`	`pub mod analytics;`
	`27`	`+mod eth_checksum;`
`27`	`28`	`pub mod validator;`
`28`	`29`
`29`	`30`	`pub use self::ad_unit::AdUnit;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ fn get_request_ip(req: &Request<Body>) -> Option<String> {`
`83`	`83`	`.get("true-client-ip")`
`84`	`84`	`.or_else(\|\| req.headers().get("x-forwarded-for"))`
`85`	`85`	`.and_then(\|hv\| hv.to_str().map(ToString::to_string).ok())`
`86`		`- .map(\|token\| token.split(',').nth(0).map(ToString::to_string))`
	`86`	`+ .map(\|token\| token.split(',').next().map(ToString::to_string))`
`87`	`87`	`.flatten()`
`88`	`88`	`}`
`89`	`89`