Merge remote-tracking branch 'origin/master' into transfer-history-total-count

Author: reuvenpo

schema/query_answer.json

@@ -219,6 +219,14 @@
         "sender"
       ],
       "properties": {
+        "block_height": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
+        },
         "coins": {
           "$ref": "#/definitions/Coin"
         },
@@ -235,6 +243,14 @@
         },
         "sender": {
           "$ref": "#/definitions/HumanAddr"
+        },
+        "timestamp": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint64",
+          "minimum": 0.0
         }
       }
     },

src/contract.rs

@@ -61,7 +61,7 @@ pub fn init<S: Storage, A: Api, Q: Querier>(
         return Err(StdError::generic_err("Decimals must not exceed 18"));
     }
 
-    let admin = msg.admin.unwrap_or_else(|| env.message.sender);
+    let admin = msg.admin.unwrap_or(env.message.sender);
 
     let prng_seed_hashed = sha_256(&msg.prng_seed.0);
 
@@ -559,7 +559,7 @@ fn try_transfer_impl<S: Storage, A: Api, Q: Querier>(
         &recipient_address,
         amount,
         symbol,
-        env.block.time,
+        env.block
     )?;
 
     Ok(())
@@ -707,7 +707,7 @@ fn try_transfer_from_impl<S: Storage, A: Api, Q: Querier>(
         &recipient_address,
         amount,
         symbol,
-        env.block.time,
+        env.block,
     )?;
 
     Ok(())
@@ -1052,14 +1052,14 @@ fn check_if_admin<S: Storage>(config: &Config<S>, account: &HumanAddr) -> StdRes
 
 fn is_valid_name(name: &str) -> bool {
     let len = name.len();
-    3 <= len && len <= 30
+    (3..=30).contains(&len)
 }
 
 fn is_valid_symbol(symbol: &str) -> bool {
     let len = symbol.len();
-    let len_is_valid = 3 <= len && len <= 6;
+    let len_is_valid = (3..=6).contains(&len);
 
-    len_is_valid && symbol.bytes().all(|byte| b'A' <= byte && byte <= b'Z')
+    len_is_valid && symbol.bytes().all(|byte| (b'A'..=b'Z').contains(&byte))
 }
 
 // pub fn migrate<S: Storage, A: Api, Q: Querier>(

src/msg.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::field_reassign_with_default)] // This is triggered in `#[derive(JsonSchema)]`
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

src/receiver.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::field_reassign_with_default)] // This is triggered in `#[derive(JsonSchema)]`
+
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

src/state.rs

@@ -41,7 +41,10 @@ pub struct Tx {
     pub sender: HumanAddr,
     pub receiver: HumanAddr,
     pub coins: Coin,
-    pub timestamp: u64,
+    // The timestamp and block height are optional so that the JSON schema
+    // reflects that some SNIP-20 contracts may not include this info.
+    pub timestamp: Option<u64>,
+    pub block_height: Option<u64>,
 }
 
 impl Tx {
@@ -52,7 +55,8 @@ impl Tx {
             sender: api.canonical_address(&self.sender)?,
             receiver: api.canonical_address(&self.receiver)?,
             coins: self.coins,
-            timestamp: self.timestamp,
+            timestamp: self.timestamp.unwrap_or(0),
+            block_height: self.block_height.unwrap_or(0),
         };
         Ok(tx)
     }
@@ -66,6 +70,7 @@ pub struct StoredTx {
     pub receiver: CanonicalAddr,
     pub coins: Coin,
     pub timestamp: u64,
+    pub block_height: u64,
 }
 
 impl StoredTx {
@@ -76,7 +81,8 @@ impl StoredTx {
             sender: api.human_address(&self.sender)?,
             receiver: api.human_address(&self.receiver)?,
             coins: self.coins,
-            timestamp: self.timestamp,
+            timestamp: Some(self.timestamp),
+            block_height: Some(self.block_height),
         };
         Ok(tx)
     }
@@ -89,7 +95,7 @@ pub fn store_transfer<S: Storage>(
     receiver: &CanonicalAddr,
     amount: Uint128,
     denom: String,
-    timestamp: u64,
+    block: cosmwasm_std::BlockInfo,
 ) -> StdResult<()> {
     let mut config = Config::from_storage(store);
     let id = config.tx_count() + 1;
@@ -102,7 +108,8 @@ pub fn store_transfer<S: Storage>(
         sender: sender.clone(),
         receiver: receiver.clone(),
         coins,
-        timestamp,
+        timestamp: block.time,
+        block_height: block.height,
     };
 
     if owner != sender {