Merge remote-tracking branch 'upstream/develop' into canary

.travis.yml

@@ -1,6 +1,5 @@
 language: rust
-rust:
-  - nightly
+rust: nightly-2020-02-07
 
 branches:
     only:
@@ -14,35 +13,38 @@ env:
 before_install:
     # Check how much space we've got on this machine.
     - df -h
-    - rustup target add wasm32-unknown-unknown
+    - rustup target add wasm32-unknown-unknown --toolchain nightly-2020-02-07
+
 
 jobs:
   include:
     - stage: Check & Prepare
       script: .maintain/ci/fmt_script.sh
 
     - stage: Build
-      env: RUST_TOOLCHAIN=nightly TARGET=native
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native
       script: .maintain/ci/build_script.sh
 
     - stage: Build
-      env: RUST_TOOLCHAIN=nightly TARGET=wasm
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=wasm
       script: .maintain/ci/build_script.sh
 
     - stage: Darwinia Test
-      env: RUST_TOOLCHAIN=nightly TARGET=native KTON
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native KTON
       script: .maintain/ci/darwinia_test_script.sh kton
 
     - stage: Darwinia Test
-      env: RUST_TOOLCHAIN=nightly TARGET=native RING
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native RING
       script: .maintain/ci/darwinia_test_script.sh ring
 
+  # TODO: remove this, when staking test case upgrade ready
+  allow_failures:
     - stage: Darwinia Test
-      env: RUST_TOOLCHAIN=nightly TARGET=native STAKING
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native STAKING
       script: .maintain/ci/darwinia_test_script.sh staking
 
     - stage: Overall Test 
-      env: RUST_TOOLCHAIN=nightly TARGET=native
+      env: RUST_TOOLCHAIN=nightly-2020-02-07 TARGET=native
       script: .maintain/ci/test_script.sh
 
 after_script:

primitives/sp-eth-primitives/src/pow.rs

@@ -81,6 +81,7 @@ impl EthashPartial {
 				let mut m = BTreeMap::new();
 				m.insert(4370000, 3000000);
 				m.insert(7280000, 2000000);
+				m.insert(0x8c6180, 0x3d0900);
 				m
 			},
 			expip2_transition: u64::max_value(),
@@ -107,6 +108,7 @@ impl EthashPartial {
 				let mut m = BTreeMap::new();
 				m.insert(0x19f0a0, 0x2dc6c0);
 				m.insert(0x408b70, 0x1e8480);
+				m.insert(0x6c993d, 0x3d0900);
 				m
 			},
 			expip2_transition: u64::max_value(),