Merge pull request CosmWasm#1234 from CosmWasm/fix-deadlink-bft-time

Fix deadlink to BFT time

Author: webmaster128

devtools/deadlinks.py

@@ -25,7 +25,7 @@ def _filter(elem):
     # Create a list containing all links
     links = [link.get("href") for link in filter(_filter, soup.find_all("a", href=True))]
     if links:
-        print(links)
+        print("Checking", links)
 
     # Initialize list for broken links.
     broken_links = []
@@ -50,17 +50,19 @@ def _validate_url(url):
 def check_project(project):
     project_path = doc_folder + project
     broken_links = {}
+    html_file_found = False
 
     for dirName, subdirList, fileList in os.walk(project_path):
         for fname in fileList:
             if fname.endswith(".html"):
+                html_file_found = True
                 fpath = dirName + '/' + fname
 
                 file_broken_links = get_broken_links(fpath)
                 if file_broken_links:
                     broken_links[fpath] = file_broken_links
 
-    return broken_links
+    return html_file_found, broken_links
 
 # main
 
@@ -76,7 +78,10 @@ def check_project(project):
 ]
 
 for project in projects:
-    broken_links.update(check_project(project))
+    html_file_found, broken = check_project(project)
+    if not html_file_found:
+        print("No .html file found in project " + project + ". Did you generate the docs?")
+    broken_links.update(broken)
 
 if len(broken_links) > 0:
     print("Dead links found!")

packages/std/examples/schema.rs

@@ -2,14 +2,15 @@ use std::env::current_dir;
 use std::fs::create_dir_all;
 
 use cosmwasm_schema::{export_schema, export_schema_with_title, remove_schemas, schema_for};
-use cosmwasm_std::{CosmosMsg, Empty, QueryRequest, Timestamp};
+use cosmwasm_std::{BlockInfo, CosmosMsg, Empty, QueryRequest, Timestamp};
 
 fn main() {
     let mut out_dir = current_dir().unwrap();
     out_dir.push("schema");
     create_dir_all(&out_dir).unwrap();
     remove_schemas(&out_dir).unwrap();
 
+    export_schema(&schema_for!(BlockInfo), &out_dir);
     export_schema(&schema_for!(Timestamp), &out_dir);
     export_schema_with_title(&schema_for!(CosmosMsg), &out_dir, "CosmosMsg");
     export_schema_with_title(&schema_for!(QueryRequest<Empty>), &out_dir, "QueryRequest");

packages/std/schema/block_info.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "BlockInfo",
+  "type": "object",
+  "required": [
+    "chain_id",
+    "height",
+    "time"
+  ],
+  "properties": {
+    "chain_id": {
+      "type": "string"
+    },
+    "height": {
+      "description": "The height of a block is the number of blocks preceding it in the blockchain.",
+      "type": "integer",
+      "format": "uint64",
+      "minimum": 0.0
+    },
+    "time": {
+      "description": "Absolute time of the block creation in seconds since the UNIX epoch (00:00:00 on 1970-01-01 UTC).\n\nThe source of this is the [BFT Time in Tendermint](https://github.com/tendermint/tendermint/blob/58dc1726/spec/consensus/bft-time.md), which has the same nanosecond precision as the `Timestamp` type.\n\n# Examples\n\nUsing chrono:\n\n``` # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; # let env = Env { #     block: BlockInfo { #         height: 12_345, #         time: Timestamp::from_nanos(1_571_797_419_879_305_533), #         chain_id: \"cosmos-testnet-14002\".to_string(), #     }, #     transaction: Some(TransactionInfo { index: 3 }), #     contract: ContractInfo { #         address: Addr::unchecked(\"contract\"), #     }, # }; # extern crate chrono; use chrono::NaiveDateTime; let seconds = env.block.time.seconds(); let nsecs = env.block.time.subsec_nanos(); let dt = NaiveDateTime::from_timestamp(seconds as i64, nsecs as u32); ```\n\nCreating a simple millisecond-precision timestamp (as used in JavaScript):\n\n``` # use cosmwasm_std::{Addr, BlockInfo, ContractInfo, Env, MessageInfo, Timestamp, TransactionInfo}; # let env = Env { #     block: BlockInfo { #         height: 12_345, #         time: Timestamp::from_nanos(1_571_797_419_879_305_533), #         chain_id: \"cosmos-testnet-14002\".to_string(), #     }, #     transaction: Some(TransactionInfo { index: 3 }), #     contract: ContractInfo { #         address: Addr::unchecked(\"contract\"), #     }, # }; let millis = env.block.time.nanos() / 1_000_000; ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Timestamp"
+        }
+      ]
+    }
+  },
+  "definitions": {
+    "Timestamp": {
+      "description": "A point in time in nanosecond precision.\n\nThis type can represent times from 1970-01-01T00:00:00Z to 2554-07-21T23:34:33Z.\n\n## Examples\n\n``` # use cosmwasm_std::Timestamp; let ts = Timestamp::from_nanos(1_000_000_202); assert_eq!(ts.nanos(), 1_000_000_202); assert_eq!(ts.seconds(), 1); assert_eq!(ts.subsec_nanos(), 202);\n\nlet ts = ts.plus_seconds(2); assert_eq!(ts.nanos(), 3_000_000_202); assert_eq!(ts.seconds(), 3); assert_eq!(ts.subsec_nanos(), 202); ```",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Uint64"
+        }
+      ]
+    },
+    "Uint64": {
+      "description": "A thin wrapper around u64 that is using strings for JSON encoding/decoding, such that the full u64 range can be used for clients that convert JSON numbers to floats, like JavaScript and jq.\n\n# Examples\n\nUse `from` to create instances of this and `u64` to get the value out:\n\n``` # use cosmwasm_std::Uint64; let a = Uint64::from(42u64); assert_eq!(a.u64(), 42);\n\nlet b = Uint64::from(70u32); assert_eq!(b.u64(), 70); ```",
+      "type": "string"
+    }
+  }
+}

packages/std/src/types.rs

@@ -1,3 +1,4 @@
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::addresses::Addr;
@@ -25,13 +26,13 @@ pub struct TransactionInfo {
     pub index: u32,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct BlockInfo {
     /// The height of a block is the number of blocks preceding it in the blockchain.
     pub height: u64,
     /// Absolute time of the block creation in seconds since the UNIX epoch (00:00:00 on 1970-01-01 UTC).
     ///
-    /// The source of this is the [BFT Time in Tendermint](https://docs.tendermint.com/master/spec/consensus/bft-time.html),
+    /// The source of this is the [BFT Time in Tendermint](https://github.com/tendermint/tendermint/blob/58dc1726/spec/consensus/bft-time.md),
     /// which has the same nanosecond precision as the `Timestamp` type.
     ///
     /// # Examples