fix: lowercase addresses (#173)

* fix: lowercase addresses * chore: format * chore: refactor and fix errors --------- Co-authored-by: Chris Smith <[email protected]>
WalletConnect · Feb 9, 2024 · 58c4b14 · 58c4b14
1 parent cf06689
commit 58c4b14
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ build = "build.rs"
 
 [dependencies]
 wc = { git = "https://github.com/WalletConnect/utils-rs.git", tag = "v0.7.0", features = ["geoip", "geoblock"] }
-relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", tag = "v0.26.0", features = ["cacao"] }
+relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", tag = "v0.26.1", features = ["cacao"] }
 
 aws-config = "0.56"
 aws-sdk-s3 = "0.31"

diff --git a/src/handlers/identity/register.rs b/src/handlers/identity/register.rs
@@ -63,6 +63,8 @@ pub async fn handler(
         error
     })?;
 
+    // Note to future: accounts can have both ERC-55 and lowercase variants, with duplicates. Make sure these are merged/treated as the same account
+    // See for context: https://github.com/WalletConnect/keys-server/pull/173
     state
         .keys_persitent_storage
         .create_account_if_not_exists_and_add_identity_key(

diff --git a/src/stores/keys.rs b/src/stores/keys.rs
@@ -166,24 +166,51 @@ impl KeysPersistentStorage for MongoPersistentStorage {
         account: &str,
         identity_key: &str,
     ) -> Result<(), StoreError> {
-        let filter = doc! {
-            "account": &account,
+        let err = || {
+            Err(StoreError::NotFound(
+                "Account".to_string(),
+                account.to_string(),
+            ))
         };
 
-        let update = doc! {
-            "$pull": {
-                "identities" : {
-                    "identity_key": &identity_key,
+        async fn query(
+            db: &Database,
+            account: &str,
+            identity_key: &str,
+        ) -> wither::Result<Option<MongoKeys>> {
+            let filter = doc! {
+                "account": account,
+            };
+
+            let update = doc! {
+                "$pull": {
+                    "identities" : {
+                        "identity_key": identity_key,
+                    }
                 }
-            }
-        };
+            };
 
-        match MongoKeys::find_one_and_update(&self.db, filter, update, None).await? {
+            MongoKeys::find_one_and_update(db, filter, update, None).await
+        }
+
+        match query(&self.db, account, identity_key).await? {
             Some(_) => Ok(()),
-            None => Err(StoreError::NotFound(
-                "Account".to_string(),
-                account.to_string(),
-            )),
+            None => {
+                // Note to future: accounts can have both ERC-55 and lowercase variants, with duplicates. Make sure these are merged/treated as the same account
+                // See for context: https://github.com/WalletConnect/keys-server/pull/173
+
+                // Checking if eip155 so we don't try to lowercase accounts from other chains that were
+                // not affected (and may have different case-sensitivity rules)
+                if account.starts_with("eip155") {
+                    let lowercase_account = account.to_lowercase();
+                    match query(&self.db, &lowercase_account, identity_key).await? {
+                        Some(_) => Ok(()),
+                        None => err(),
+                    }
+                } else {
+                    err()
+                }
+            }
         }
     }