feat(hardfork): ckb2021 hardfork features

.travis.yml

@@ -64,17 +64,17 @@ matrix:
   include:
     # We don't run tests, linters and quck check in fork branch, since they will be covered in PR.
     - name: Tests on macOS
-      if: 'tag IS NOT present AND (type = pull_request OR branch IN (master, staging, staging2, trying))'
+      if: 'tag IS NOT present AND (type = pull_request OR branch IN (master, staging, staging2, trying) OR branch =~ /^ckb2021/)'
       os: osx
     - name: Tests on Linux
-      if: 'tag IS NOT present AND (type = pull_request OR branch IN (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
+      if: 'tag IS NOT present AND (type = pull_request OR branch IN (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR repo != nervosnetwork/ckb)'
       os: linux
     - name: PR Integration
       if: 'tag IS NOT present AND branch != develop AND branch !~ /^rc\// AND (type = pull_request OR repo != nervosnetwork/ckb)'
       os: linux
       script: make CKB_TEST_SEC_COEFFICIENT=5 CKB_TEST_ARGS="-c 4 --no-report" integration
     - name: Linters
-      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
+      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR repo != nervosnetwork/ckb)'
       os: linux
       install:
         - cargo fmt --version || travis_retry rustup component add rustfmt
@@ -99,7 +99,7 @@ matrix:
         - make clippy
         - mv rust-toolchain.bak rust-toolchain
     - name: Quick Check
-      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
+      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR repo != nervosnetwork/ckb)'
       os: linux
       cache: false
       addons: { apt: { packages: [] } }
@@ -119,7 +119,7 @@ matrix:
       script:
         - devtools/ci/check-cyclic-dependencies.py --dev
     - name: Security Audit & Licenses
-      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
+      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR repo != nervosnetwork/ckb)'
       os: linux
       install:
         - cargo deny --version || travis_retry cargo install cargo-deny --locked
@@ -129,7 +129,7 @@ matrix:
         - make check-licenses
 
     - name: WASM build
-      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR repo != nervosnetwork/ckb)'
+      if: 'tag IS NOT present AND (type = pull_request OR branch in (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR repo != nervosnetwork/ckb)'
       os: linux
       script:
         - export PATH=/usr/lib/llvm-8/bin:$PATH
@@ -141,11 +141,11 @@ matrix:
       os: linux
       script: make bench-test
     - name: Integration on macOS
-      if: 'tag IS NOT present AND type != pull_request AND (branch IN (master, staging, staging2, trying) OR branch =~ /^rc\// OR (branch = develop AND commit_message !~ /^Merge #\d+/))'
+      if: 'tag IS NOT present AND type != pull_request AND (branch IN (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR branch =~ /^rc\// OR (branch = develop AND commit_message !~ /^Merge #\d+/))'
       os: osx
       script: make CKB_TEST_ARGS="-c 1 --no-report" integration
     - name: Integration on Linux
-      if: 'tag IS NOT present AND type != pull_request AND (branch IN (master, staging, staging2, trying) OR branch =~ /^rc\// OR (branch = develop AND commit_message !~ /^Merge #\d+/))'
+      if: 'tag IS NOT present AND type != pull_request AND (branch IN (master, staging, staging2, trying) OR branch =~ /^ckb2021/ OR branch =~ /^rc\// OR (branch = develop AND commit_message !~ /^Merge #\d+/))'
       os: linux
       script: make CKB_TEST_ARGS="-c 1 --no-report" integration
     - name: Code Coverage

azure-pipelines.yml

@@ -19,7 +19,8 @@ jobs:
             eq(variables['Build.Reason'], 'PullRequest'),
             ne(variables['System.PullRequest.SourceBranch'], 'develop')
           ),
-          eq(variables['Build.SourceBranch'], 'refs/heads/master')
+          eq(variables['Build.SourceBranch'], 'refs/heads/master'),
+          startsWith(variables['Build.SourceBranch'], 'refs/heads/ckb2021')
         )
       )
     pool:
@@ -41,7 +42,8 @@ jobs:
         ne(variables['Build.Reason'], 'PullRequest'),
         or(
           startsWith(variables['Build.SourceBranch'], 'refs/heads/rc/'),
-          in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/develop', 'refs/heads/staging2', 'refs/heads/trying')
+          in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/develop', 'refs/heads/staging2', 'refs/heads/trying'),
+          startsWith(variables['Build.SourceBranch'], 'refs/heads/ckb2021')
         )
       )
     pool:

db-schema/src/lib.rs

@@ -3,7 +3,7 @@
 /// Column families alias type
 pub type Col = &'static str;
 /// Total column number
-pub const COLUMNS: u32 = 15;
+pub const COLUMNS: u32 = 16;
 /// Column store chain index
 pub const COLUMN_INDEX: Col = "0";
 /// Column store block's header
@@ -36,6 +36,8 @@ pub const COLUMN_CELL_DATA: Col = "12";
 pub const COLUMN_NUMBER_HASH: Col = "13";
 /// Column store cell data hash
 pub const COLUMN_CELL_DATA_HASH: Col = "14";
+/// Column store block extension data
+pub const COLUMN_BLOCK_EXTENSION: Col = "15";
 
 /// META_TIP_HEADER_KEY tracks the latest known best block header
 pub const META_TIP_HEADER_KEY: &[u8] = b"TIP_HEADER";

freezer/src/freezer.rs

@@ -55,9 +55,12 @@ impl Freezer {
                 .retrieve(freezer_number - 1)
                 .map_err(internal_error)?
                 .ok_or_else(|| internal_error("freezer inconsistent"))?;
-            let block = packed::BlockReader::from_slice(&raw_block)
+            let block = packed::BlockReader::from_compatible_slice(&raw_block)
                 .map_err(internal_error)?
                 .to_entity();
+            if block.count_extra_fields() > 1 {
+                return Err(internal_error("block has more than one extra fields"));
+            }
             tip = Some(block.header().into_view());
         }
 
@@ -147,9 +150,12 @@ impl Freezer {
                 .retrieve(item)
                 .map_err(internal_error)?
                 .expect("frozen number sync with files");
-            let block = packed::BlockReader::from_slice(&raw_block)
+            let block = packed::BlockReader::from_compatible_slice(&raw_block)
                 .map_err(internal_error)?
                 .to_entity();
+            if block.count_extra_fields() > 1 {
+                return Err(internal_error("block has more than one extra fields"));
+            }
             inner.tip = Some(block.header().into_view());
         }
         Ok(())

rpc/src/module/experiment.rs

@@ -13,7 +13,7 @@ use ckb_types::{
     prelude::*,
     H256,
 };
-use ckb_verification::ScriptVerifier;
+use ckb_verification::{ScriptVerifier, TxVerifyEnv};
 use jsonrpc_core::Result;
 use jsonrpc_derive::rpc;
 use std::collections::HashSet;
@@ -248,8 +248,15 @@ impl<'a> DryRunner<'a> {
             Ok(resolved) => {
                 let consensus = snapshot.consensus();
                 let max_cycles = consensus.max_block_cycles;
-                match ScriptVerifier::new(&resolved, &snapshot.as_data_provider())
-                    .verify(max_cycles)
+                let tip_header = snapshot.tip_header();
+                let tx_env = TxVerifyEnv::new_submit(&tip_header);
+                match ScriptVerifier::new(
+                    &resolved,
+                    consensus,
+                    &snapshot.as_data_provider(),
+                    &tx_env,
+                )
+                .verify(max_cycles)
                 {
                     Ok(cycles) => Ok(DryRunResult {
                         cycles: cycles.into(),

script/src/lib.rs

@@ -6,8 +6,10 @@ mod syscalls;
 mod type_id;
 mod types;
 mod verify;
+mod verify_env;
 
 pub use crate::error::{ScriptError, TransactionScriptError};
 pub use crate::ill_transaction_checker::IllTransactionChecker;
 pub use crate::types::{ScriptGroup, ScriptGroupType};
 pub use crate::verify::TransactionScriptsVerifier;
+pub use crate::verify_env::TxVerifyEnv;