fix(ens): register name endpoint cleanup

reown-com · Feb 7, 2024 · 5803138 · 5803138
1 parent 328439f
commit 5803138
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 90 deletions.
diff --git a/integration/names.test.ts b/integration/names.test.ts
@@ -7,8 +7,7 @@ describe('Account profile names', () => {
   // Generate a new eth wallet
   const wallet = ethers.Wallet.createRandom();
   const address = wallet.address;
-  const coin_type = 60; // SLIP-44 Ethereum
-  const chain_id = 1; // Ethereum mainnet
+  const coin_type = 60; // ENSIP-11 Ethereum Mainnet
   const attributes = {
     bio: 'integration test domain',
   };
@@ -22,8 +21,6 @@ describe('Account profile names', () => {
   const messageObject = {
       name,
       coin_type,
-      chain_id,
-      address,
       attributes,
       timestamp: Math.round(Date.now() / 1000)
   };
@@ -40,7 +37,7 @@ describe('Account profile names', () => {
       address,
     };
     let resp: any = await httpClient.post(
-      `${baseUrl}/v1/profile/account/${name}`,
+      `${baseUrl}/v1/profile/account`,
       payload
     )
     expect(resp.status).toBe(401)
@@ -63,7 +60,7 @@ describe('Account profile names', () => {
       address,
     };
     let resp: any = await httpClient.post(
-      `${baseUrl}/v1/profile/account/${name}`,
+      `${baseUrl}/v1/profile/account`,
       payload
     )
     expect(resp.status).toBe(400)
@@ -80,7 +77,7 @@ describe('Account profile names', () => {
       address,
     };
     let resp: any = await httpClient.post(
-      `${baseUrl}/v1/profile/account/${name}`,
+      `${baseUrl}/v1/profile/account`,
       payload
     )
     expect(resp.status).toBe(200)
@@ -96,23 +93,7 @@ describe('Account profile names', () => {
       address,
     };
     let resp: any = await httpClient.post(
-      `${baseUrl}/v1/profile/account/${name}`,
-      payload
-    )
-    expect(resp.status).toBe(400)
-  })
-  it('inconsistent payload', async () => {
-    // Name in payload is different from the one in the request path
-    const signature = await wallet.signMessage(message);
-
-    const payload = {
-      message,
-      signature,
-      coin_type,
-      address,
-    };
-    let resp: any = await httpClient.post(
-      `${baseUrl}/v1/profile/account/someothername.connect.id`,
+      `${baseUrl}/v1/profile/account`,
       payload
     )
     expect(resp.status).toBe(400)

diff --git a/src/database/helpers.rs b/src/database/helpers.rs
@@ -1,8 +1,5 @@
 use {
-    crate::{
-        database::{error::DatabaseError, types, utils},
-        utils::crypto::convert_evm_chain_id_to_coin_type,
-    },
+    crate::database::{error::DatabaseError, types, utils},
     chrono::{DateTime, Utc},
     sqlx::{PgPool, Postgres},
     std::collections::HashMap,
@@ -149,17 +146,13 @@ pub async fn get_addresses_by_name(
             continue;
         }
 
-        // Return 60 for the ETH mainnet and ENSIP-11 chain ID for other
-        let ensip11_chain_id = if row.chain_id == "1" {
-            60
-        } else {
-            convert_evm_chain_id_to_coin_type(row.chain_id.parse::<u32>().unwrap_or_default())
-        };
-
-        result_map.insert(ensip11_chain_id, types::Address {
-            address: row.address,
-            created_at: Some(row.created_at),
-        });
+        result_map.insert(
+            row.chain_id.parse::<u32>().unwrap_or_default(),
+            types::Address {
+                address: row.address,
+                created_at: Some(row.created_at),
+            },
+        );
     }
 
     Ok(result_map)

diff --git a/src/handlers/profile/mod.rs b/src/handlers/profile/mod.rs
@@ -31,12 +31,6 @@ static SUPPORTED_ATTRIBUTES: Lazy<HashMap<String, Regex>> = Lazy::new(|| {
 pub struct RegisterPayload {
     /// Name to register
     pub name: String,
-    /// Coin type SLIP-44
-    pub coin_type: u32,
-    /// Chain ID for the EVM
-    pub chain_id: u32,
-    /// Address
-    pub address: String,
     /// Attributes
     pub attributes: Option<HashMap<String, String>>,
     /// Unixtime
@@ -50,7 +44,7 @@ pub struct RegisterRequest {
     pub message: String,
     /// Message signature
     pub signature: String,
-    /// Coin type SLIP-44
+    /// Coin type ENSIP-11
     pub coin_type: u32,
     /// Address
     pub address: String,

diff --git a/src/handlers/profile/register.rs b/src/handlers/profile/register.rs
@@ -17,7 +17,7 @@ use {
     },
     axum::{
         body::Bytes,
-        extract::{Path, State},
+        extract::State,
         response::{IntoResponse, Response},
         Json,
     },
@@ -28,20 +28,15 @@ use {
     wc::future::FutureExt,
 };
 
-pub async fn handler(
-    state: State<Arc<AppState>>,
-    name: Path<String>,
-    body: Bytes,
-) -> Result<Response, RpcError> {
-    handler_internal(state, name, body)
+pub async fn handler(state: State<Arc<AppState>>, body: Bytes) -> Result<Response, RpcError> {
+    handler_internal(state, body)
         .with_metrics(HANDLER_TASK_METRICS.with_name("profile_register"))
         .await
 }
 
 #[tracing::instrument(skip(state))]
 pub async fn handler_internal(
     state: State<Arc<AppState>>,
-    Path(name): Path<String>,
     body: Bytes,
 ) -> Result<Response, RpcError> {
     // Check the request body format
@@ -62,42 +57,25 @@ pub async fn handler_internal(
         }
     };
 
-    if payload.name != name {
-        return Ok((
-            StatusCode::BAD_REQUEST,
-            "Name in payload and path are not equal",
-        )
-            .into_response());
-    }
-
-    if payload.address != register_request.address {
+    // Check for the supported ENSIP-11 coin type
+    if register_request.coin_type != 60 {
+        info!("Unsupported coin type {}", register_request.coin_type);
         return Ok((
             StatusCode::BAD_REQUEST,
-            "Address in payload request and message are not equal",
+            "Only Ethereum Mainnet (60) coin type is supported for name registration",
         )
             .into_response());
     }
 
-    if payload.coin_type != register_request.coin_type {
-        return Ok((
-            StatusCode::BAD_REQUEST,
-            "Coin type in payload request and message are not equal",
-        )
-            .into_response());
-    }
-
-    // Check for the supported SLIP-44 coin types
-    if SupportedNamespaces::from_slip44(payload.coin_type).is_none() {
-        info!("Unsupported coin type {}", payload.coin_type);
-        return Ok((StatusCode::BAD_REQUEST, "Unsupported coin type").into_response());
-    }
-
     // Check is name already registered
-    if get_name_and_addresses_by_name(name.clone(), &state.postgres.clone())
+    if get_name_and_addresses_by_name(payload.name.clone(), &state.postgres.clone())
         .await
         .is_ok()
     {
-        info!("Registration request for registered name {}", name.clone());
+        info!(
+            "Registration request for already registered name {}",
+            payload.name.clone()
+        );
         return Ok((StatusCode::BAD_REQUEST, "Name is already registered").into_response());
     };
 
@@ -152,13 +130,13 @@ pub async fn handler_internal(
     }
 
     // Register (insert) a new domain with address
-    let addresses: ENSIP11AddressesMap = HashMap::from([(payload.chain_id, Address {
-        address: payload.address,
+    let addresses: ENSIP11AddressesMap = HashMap::from([(register_request.coin_type, Address {
+        address: register_request.address,
         created_at: None,
     })]);
 
     let insert_result = insert_name(
-        name.clone(),
+        payload.name.clone(),
         payload.attributes.unwrap_or(HashMap::new()),
         SupportedNamespaces::Eip155,
         addresses,
@@ -171,7 +149,7 @@ pub async fn handler_internal(
     }
 
     // Return the registered name and addresses
-    match get_name_and_addresses_by_name(name, &state.postgres.clone()).await {
+    match get_name_and_addresses_by_name(payload.name, &state.postgres.clone()).await {
         Ok(response) => Ok(Json(response).into_response()),
         Err(e) => match e {
             SqlxError::RowNotFound => {

diff --git a/src/lib.rs b/src/lib.rs
@@ -215,17 +215,17 @@ pub async fn bootstrap(config: Config) -> RpcResult<()> {
             "/v1/account/:address/portfolio",
             get(handlers::portfolio::handler),
         )
-        // Forward lookup
+        // Register account name
         .route(
-            "/v1/profile/account/:name",
-            get(handlers::profile::lookup::handler),
+            "/v1/profile/account",
+            post(handlers::profile::register::handler),
         )
-        // Register
+        // Forward address lookup
         .route(
             "/v1/profile/account/:name",
-            post(handlers::profile::register::handler),
+            get(handlers::profile::lookup::handler),
         )
-        // Reverse lookup
+        // Reverse name lookup
         .route(
             "/v1/profile/reverse/:address",
             get(handlers::profile::reverse::handler),