Merge branch 'testnet' into feat/whitelist-paymaster-users

Cargo.toml

@@ -41,5 +41,5 @@ rand = "0.8.5"
 
 # required for solana SDK to work
 [patch.crates-io.curve25519-dalek]
-git = "https://github.com/solana-labs/curve25519-dalek.git"
-rev = "c14774464c4d38de553c6ef2f48a10982c1b4801"
+git = "https://github.com/anza-xyz/curve25519-dalek.git"
+rev = "b500cdc2a920cd5bff9e2dd974d7b97349d61464"

config.template.toml

@@ -6,7 +6,10 @@ port = 8080
 name = "starknetid"
 connection_string = "xxxxxx"
 [databases.sales]
-name = "goerli"
+name = "sepolia"
+connection_string = "xxxxxx"
+[databases.free_domains]
+name = "sepolia_free_domains"
 connection_string = "xxxxxx"
 
 [contracts]

src/config.rs

@@ -23,6 +23,7 @@ pub_struct!(Clone, Deserialize; Server { port: u16 });
 pub_struct!(Clone, Deserialize; Databases {
     starknetid: Database,
     sales: Database,
+    free_domains: Database,
 });
 
 pub_struct!(Clone, Deserialize; Database {

src/endpoints/campaigns/get_free_domain.rs

@@ -43,7 +43,7 @@ pub async fn handler(
     let domain_len = domain_parts[0].len();
 
     let free_domains = state
-        .starknetid_db
+        .free_domains_db
         .collection::<mongodb::bson::Document>("free_domain_ticket");
     match free_domains
         .find_one(

src/endpoints/crosschain/ethereum/utils.rs

@@ -362,7 +362,7 @@ pub async fn get_profile_picture_uri(
     match uri {
         Some(u) if u.contains("base64") => Some(parse_base64_image(u)),
         Some(u) => Some(fetch_image_url(config, u).await),
-        None if use_default_pfp => Some(format!("https://starknet.id/api/identicons/{}", id)),
+        None if use_default_pfp => Some(format!("https://identicon.starknet.id/{}", id)),
         _ => None,
     }
 }

src/endpoints/uri.rs

@@ -145,7 +145,7 @@ pub async fn handler(
                 description: "This token represents an identity on StarkNet.".to_string(),
                 image: match img_url {
                     Some(url) => url,
-                    None => format!("https://starknet.id/api/identicons/{}", &query.id),
+                    None => format!("https://identicon.starknet.id/{}", &query.id),
                 },
                 expiry: Some(expiry),
                 attributes: Some(vec![
@@ -171,7 +171,7 @@ pub async fn handler(
             let token_uri = TokenURI {
                 name: format!("Starknet ID: {}", &query.id),
                 description: "This token represents an identity on StarkNet.".to_string(),
-                image: format!("https://starknet.id/api/identicons/{}", &query.id),
+                image: format!("https://identicon.starknet.id/{}", &query.id),
                 expiry: None,
                 attributes: None,
             };

src/main.rs

@@ -37,6 +37,10 @@ async fn main() {
     let sales_client_options = ClientOptions::parse(&conf.databases.sales.connection_string)
         .await
         .unwrap();
+    let free_domains_client_options =
+        ClientOptions::parse(&conf.databases.free_domains.connection_string)
+            .await
+            .unwrap();
 
     let states = tax::sales_tax::load_sales_tax().await;
     if states.states.is_empty() {
@@ -52,6 +56,9 @@ async fn main() {
         sales_db: Client::with_options(sales_client_options)
             .unwrap()
             .database(&conf.databases.sales.name),
+        free_domains_db: Client::with_options(free_domains_client_options)
+            .unwrap()
+            .database(&conf.databases.free_domains.name),
         states,
         dynamic_offchain_resolvers: Arc::new(Mutex::new(HashMap::new())),
     });

src/models.rs

@@ -18,6 +18,7 @@ pub struct AppState {
     pub conf: Config,
     pub starknetid_db: Database,
     pub sales_db: Database,
+    pub free_domains_db: Database,
     pub states: States,
     pub dynamic_offchain_resolvers: Arc<Mutex<HashMap<String, OffchainResolver>>>,
 }