Record claims only once tokens got claimed

tangle-network · Dec 1, 2023 · 5e6f790 · 5e6f790
1 parent b64b76b
commit 5e6f790
Showing 1 changed file with 33 additions and 29 deletions.
diff --git a/src/faucet.rs b/src/faucet.rs
@@ -335,27 +335,10 @@ pub async fn faucet(
         }
     }
 
-    let claim: ClaimsData = ClaimsData {
-        identity: twitter_user.id.into(),
-        address: wallet_address.clone().into(),
-        last_claimed_date: now,
-    };
-
-    auth_db
-        .put_last_claim_data(twitter_user.id.into(), typed_chain_id, claim)
-        .await?;
-    // Process the claim and build the response
     println!(
-        "{:?}  Claiming for user: {:?}",
-        Utc::now().to_rfc3339(),
+        "Paying {} ({wallet_address}) on chain: {typed_chain_id:?}",
         twitter_user.username,
     );
-    println!(
-        "{:?} Paying {} on chain: {:?}",
-        Utc::now().to_rfc3339(),
-        wallet_address,
-        typed_chain_id
-    );
 
     match handle_token_transfer(
         faucet_data,
@@ -368,17 +351,38 @@ pub async fn faucet(
     )
     .await
     {
-        Ok(tx_result) => Ok(status::Custom(
-            Status::Ok,
-            json!({
-                "wallet": wallet_address,
-                "typed_chain_id": typed_chain_id,
-                "last_claimed_date": now,
-                "user": twitter_user,
-                "tx_result": tx_result,
-            })
-            .to_string(),
-        )),
+        Ok(tx_result) => {
+            let claim: ClaimsData = ClaimsData {
+                identity: twitter_user.id.into(),
+                address: wallet_address.clone().into(),
+                last_claimed_date: now,
+            };
+
+            auth_db
+                .put_last_claim_data(
+                    twitter_user.id.into(),
+                    typed_chain_id,
+                    claim,
+                )
+                .await?;
+            println!(
+                "{:?} Paid {} on chain: {:?}",
+                Utc::now().to_rfc3339(),
+                wallet_address,
+                typed_chain_id
+            );
+            Ok(status::Custom(
+                Status::Ok,
+                json!({
+                    "wallet": wallet_address,
+                    "typed_chain_id": typed_chain_id,
+                    "last_claimed_date": now,
+                    "user": twitter_user,
+                    "tx_result": tx_result,
+                })
+                .to_string(),
+            ))
+        }
         Err(e) => {
             rocket::log::private::error!("Error transferring tokens: {e:?}");
             Ok(status::Custom(