Merge branch 'release/0.2.2'

hging · hging · commit ddbb7a2c3ba6 · 2020-12-03T16:59:54.000+08:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,140 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug executable 'mathchain'",
+            "cargo": {
+                "args": [
+                    "build",
+                    "--bin=mathchain",
+                    "--package=mathchain"
+                ],
+                "filter": {
+                    "name": "mathchain",
+                    "kind": "bin"
+                }
+            },
+            "args": ["--dev", "--ws-external", "--rpc-external"],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in executable 'mathchain'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--bin=mathchain",
+                    "--package=mathchain"
+                ],
+                "filter": {
+                    "name": "mathchain",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'mathchain-runtime-galois'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=mathchain-runtime-galois"
+                ],
+                "filter": {
+                    "name": "mathchain-runtime-galois",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'mathchain-consensus'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=mathchain-consensus"
+                ],
+                "filter": {
+                    "name": "mathchain-consensus",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'mathchain-consensus-primitives'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=mathchain-consensus-primitives"
+                ],
+                "filter": {
+                    "name": "mathchain-consensus-primitives",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'mathchain-runtime'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=mathchain-runtime"
+                ],
+                "filter": {
+                    "name": "mathchain-runtime",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug unit tests in library 'mathchain-runtime-mathchain'",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--lib",
+                    "--package=mathchain-runtime-mathchain"
+                ],
+                "filter": {
+                    "name": "mathchain-runtime-mathchain",
+                    "kind": "lib"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build.sh b/build.sh
@@ -34,8 +34,8 @@ cargo build --release --target x86_64-apple-darwin #&> /dev/null
 echo -e "\e[1;32m🧬 Building mathchain-$1-x86_64-linux-gnu-glibc-2.17-llvm-3.8 \e[0m"
 cross build --release --target x86_64-unknown-linux-gnu --sub-targets wasm32-unknown-unknown #&> /dev/null
 
-echo -e "\e[1;32m🧬 Building mathchain-$1-aarch64-linux-gnu-glibc-2.23-llvm-3.8 \e[0m"
-RUSTFLAGS='-C link-args=-latomic' SKIP_WASM_BUILD=1 cross build --locked --release --target aarch64-unknown-linux-gnu #&> /dev/null
+# echo -e "\e[1;32m🧬 Building mathchain-$1-aarch64-linux-gnu-glibc-2.23-llvm-3.8 \e[0m"
+# RUSTFLAGS='-C link-args=-latomic' SKIP_WASM_BUILD=1 cross build --locked --release --target aarch64-unknown-linux-gnu #&> /dev/null
 
 echo -e '\e[1;32m📦 Packing WASM(s)\e[0m'
 rm -rf wasm
@@ -54,9 +54,9 @@ rm mathchain
 cp ../target/x86_64-unknown-linux-gnu/release/mathchain .
 tar cjSf mathchain-$1-x86_64-linux-gnu-glibc-2.17-llvm-3.8.tar.bz2 mathchain
 rm mathchain
-cp ../target/x86_64-unknown-linux-gnu/release/mathchain .
-tar cjSf mathchain-$1-aarch64-linux-gnu-glibc-2.23-llvm-3.8.tar.bz2 mathchain
-rm mathchain
+# cp ../target/x86_64-unknown-linux-gnu/release/mathchain .
+# tar cjSf mathchain-$1-aarch64-linux-gnu-glibc-2.23-llvm-3.8.tar.bz2 mathchain
+# rm mathchain
 
 echo -e '\e[1;32m🔑 Generating File(s) Hash\e[0m'
 for f in *
diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs
@@ -28,7 +28,7 @@ use sc_client_api::{BlockOf, backend::AuxStore};
 use sp_blockchain::{HeaderBackend, ProvideCache, well_known_cache_keys::Id as CacheKeyId};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_runtime::generic::OpaqueDigestItemId;
-use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, SaturatedConversion};
 use sp_api::ProvideRuntimeApi;
 use sp_consensus::{
 	BlockImportParams, Error as ConsensusError, BlockImport,
@@ -60,7 +60,7 @@ impl std::convert::From<Error> for ConsensusError {
 pub struct MathchainBlockImport<B: BlockT, I, C> {
 	inner: I,
 	client: Arc<C>,
-	enabled: bool,
+	is_galois: bool,
 	_marker: PhantomData<B>,
 }
 
@@ -69,7 +69,7 @@ impl<Block: BlockT, I: Clone + BlockImport<Block>, C> Clone for MathchainBlockIm
 		MathchainBlockImport {
 			inner: self.inner.clone(),
 			client: self.client.clone(),
-			enabled: self.enabled,
+			is_galois: self.is_galois,
 			_marker: PhantomData,
 		}
 	}
@@ -85,12 +85,12 @@ impl<B, I, C> MathchainBlockImport<B, I, C> where
 	pub fn new(
 		inner: I,
 		client: Arc<C>,
-		enabled: bool,
+		is_galois: bool,
 	) -> Self {
 		Self {
 			inner,
 			client,
-			enabled,
+			is_galois,
 			_marker: PhantomData,
 		}
 	}
@@ -128,7 +128,8 @@ impl<B, I, C> BlockImport<B> for MathchainBlockImport<B, I, C> where
 
 		let client = self.client.clone();
 
-		if self.enabled {
+		// support testnet aura block import
+		if !!!(self.is_galois && block.header.number().clone().saturated_into::<u64>() < 1_252_434) {
 			let log = find_mathchain_log::<B>(&block.header)?;
 			let hash = block.post_hash();
 
diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,2 @@
+Welcome
+欢迎
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
@@ -0,0 +1,2 @@
+- [English](en/README.md)
+- [中文](zh-CN/README.md)
diff --git a/docs/en/README.md b/docs/en/README.md
@@ -0,0 +1 @@
+EN
diff --git a/docs/en/_sidebar.md b/docs/en/_sidebar.md
@@ -0,0 +1,3 @@
+- Getting started
+
+  - [Quick start](en/a.md)
diff --git a/docs/en/a.md b/docs/en/a.md
@@ -0,0 +1,20 @@
+
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+
+To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works.
+
+Jekyll also offers powerful support for code snippets:
+
+{% highlight ruby %}
+def print_hi(name)
+  puts "Hi, #{name}"
+end
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
+{% endhighlight %}
+
+Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
+
+[jekyll-docs]: https://jekyllrb.com/docs/home
+[jekyll-gh]:   https://github.com/jekyll/jekyll
+[jekyll-talk]: https://talk.jekyllrb.com/
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Document</title>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <meta name="description" content="Description">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/lib/themes/vue.css">
+</head>
+<body>
+  <nav>
+    <a href="#/en/">EN</a>
+    <a href="#/zh-CN/">中文</a>
+  </nav>
+  <div id="app"></div>
+  <script>
+    window.$docsify = {
+      name: '',
+      repo: ''
+    }
+  </script>
+  <!-- Docsify v4 -->
+  <script>
+    window.$docsify = {
+      loadSidebar: true
+    }
+  </script>
+  <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
+</body>
+</html>
diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md
@@ -0,0 +1 @@
+ZH-CN
diff --git a/docs/zh-CN/_sidebar.md b/docs/zh-CN/_sidebar.md
@@ -0,0 +1,3 @@
+- Getting started
+
+  - [测试](zh-CN/a.md)
diff --git a/docs/zh-CN/a.md b/docs/zh-CN/a.md
@@ -0,0 +1 @@
+123123123
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -7,7 +7,7 @@ homepage = 'https://mathwallet.net/mathchain'
 license = 'Unlicense'
 name = 'mathchain'
 repository = 'https://github.com/mathwallet/MathChain/'
-version = '0.2.1'
+version = '0.2.2'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']
diff --git a/node/res/galois.json b/node/res/galois.json
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -14,12 +14,17 @@ use std::str::FromStr;
 
 const DEFAULT_PROTOCOL_ID: &str = "math";
 
+
 // The URL for the telemetry server.
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
 pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig>;
 
+pub fn galois_config() -> Result<ChainSpec, String> {
+	ChainSpec::from_json_bytes(&include_bytes!("../res/galois.json")[..])
+}
+
 pub fn math_testnet_properties() -> Properties {
 	let mut properties = Properties::new();
 
diff --git a/node/src/command.rs b/node/src/command.rs
@@ -56,6 +56,7 @@ impl SubstrateCli for Cli {
 		Ok(match id {
 			"dev" => Box::new(chain_spec::development_config()?),
 			"" | "local" => Box::new(chain_spec::local_testnet_config()?),
+			"galois" => Box::new(chain_spec::galois_config()?),
 			path => Box::new(chain_spec::ChainSpec::from_json_file(
 				std::path::PathBuf::from(path),
 			)?),
diff --git a/node/src/service.rs b/node/src/service.rs
@@ -84,7 +84,7 @@ pub trait IdentifyVariant {
 
 impl IdentifyVariant for Box<dyn sc_service::ChainSpec> {
 	fn is_galois(&self) -> bool {
-		self.id().starts_with("galois")
+		self.id().starts_with("Galois")
 	}
 
 	fn is_math(&self) -> bool {
@@ -122,7 +122,7 @@ pub fn new_partial(config: &Configuration, sealing: Option<Sealing>) -> Result<s
 		let mathchain_block_import = MathchainBlockImport::new(
 			client.clone(),
 			client.clone(),
-			true,
+			true
 		);
 
 		let import_queue = sc_consensus_manual_seal::import_queue(
@@ -145,7 +145,7 @@ pub fn new_partial(config: &Configuration, sealing: Option<Sealing>) -> Result<s
 	let mathchain_block_import = MathchainBlockImport::new(
 		grandpa_block_import.clone(),
 		client.clone(),
-		true
+		config.chain_spec.is_galois()
 	);
 
 	let aura_block_import = sc_consensus_aura::AuraBlockImport::<_, _, _, AuraPair>::new(

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- [English](en/README.md)`
	`2`	`+- [中文](zh-CN/README.md)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- Getting started`
	`2`	`+`
	`3`	`+ - [Quick start](en/a.md)`