From 14433dc3d41875dee45f2410018475683a87349e Mon Sep 17 00:00:00 2001
From: Yigit Sever
Date: Wed, 14 Apr 2021 14:56:46 +0300
Subject: Simplify the block validation process
2 TODOs down!
---
src/handlers.rs | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/handlers.rs b/src/handlers.rs
index cc71ba7..e34abbe 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -199,27 +199,25 @@ pub async fn authorized_propose_block(
let hashvalue = Blake2s::digest(&naked_block_flat);
let hash_string = format!("{:x}", hashvalue);
- // 6 rightmost bits are zero?
- let should_zero = hashvalue[31] as i32 + hashvalue[30] as i32 + hashvalue[29] as i32;
- // TODO: this can be offloaded to validator <13-04-21, yigit> //
-
- if should_zero != 0 {
- debug!("the hash does not have 6 rightmost zero bits");
+ // Does the hash claimed in block matched with the actual hash?
+ if hash_string != new_block.hash {
+ debug!("request was not telling the truth, hash values do not match");
let res_json = warp::reply::json(&GradeCoinResponse {
res: ResponseType::Error,
- message: "Given block hash is larger than target value".to_owned(),
+ message: "Given hash value does not match the actual block hash".to_owned(),
});
return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
}
- // one last check to see if block is telling the truth
- if hash_string != new_block.hash {
- debug!("request was not telling the truth, hash values do not match");
- // TODO: does this condition make more sense _before_ the hash 0s check? <13-04-21, yigit> //
+ // Are the 6 rightmost characters (=24 bits) zero?
+ let should_zero = hashvalue[31] as i32 + hashvalue[30] as i32 + hashvalue[29] as i32;
+
+ if should_zero != 0 {
+ debug!("the hash does not have 6 rightmost zero bits");
let res_json = warp::reply::json(&GradeCoinResponse {
res: ResponseType::Error,
- message: "Given hash value does not match the actual block hash".to_owned(),
+ message: "Given block hash is larger than target value".to_owned(),
});
return Ok(warp::reply::with_status(res_json, StatusCode::BAD_REQUEST));
@@ -292,23 +290,23 @@ pub async fn authorized_propose_transaction(
// `user` is an authenticated student, can propose
// check if user can afford the transaction
- if new_transaction.by == new_transaction.source { // Propose to transact with another user
+ if new_transaction.by == new_transaction.source {
+ // Propose to transact with another user
if internal_user.balance < new_transaction.amount {
return Ok(warp::reply::with_status(
warp::reply::json(&GradeCoinResponse {
res: ResponseType::Error,
- message: "User does not have enough balance in their account"
- .to_owned(),
+ message: "User does not have enough balance in their account".to_owned(),
}),
StatusCode::BAD_REQUEST,
));
}
- } else { // todo: add bank mechanism
+ } else {
+ // todo: add bank mechanism
return Ok(warp::reply::with_status(
warp::reply::json(&GradeCoinResponse {
res: ResponseType::Error,
- message: "Invalid by field for the proposed transaction"
- .to_owned(),
+ message: "Invalid by field for the proposed transaction".to_owned(),
}),
StatusCode::BAD_REQUEST,
));
@@ -354,7 +352,6 @@ pub async fn authorized_propose_transaction(
debug!("clear for transaction proposal");
-
let mut transactions = db.pending_transactions.write();
transactions.insert(new_transaction.source.to_owned(), new_transaction);
Ok(warp::reply::with_status(
--
cgit v1.2.3-70-g09d2