Merge pull request #520 from cryptape/release-0.23.0

Release 0.23.0

.circleci/config.yml

@@ -107,7 +107,7 @@ alias:
 
   - &job-default
     docker:
-      - image: cita/cita-build:ubuntu-18.04-20190107
+      - image: cita/cita-build:ubuntu-18.04-20190413
     working_directory: ~/cita-build
     resource_class: xlarge
 
@@ -261,6 +261,16 @@ jobs:
           name: Test Executor Process Invalid Proof
           command: ./tests/integrate_test/cita_bft_resend.sh
 
+  "Discovery Test for network":
+    <<: *job-default
+    steps:
+    - restore_cache: *restore-source-codes-cache
+    - restore_cache: *restore-release-cache
+    - run: *after-restore-release-cache
+    - run:
+        name: Discovery test for network
+        command: ./tests/integrate_test/cita_discovery.sh
+
   "Byzantine Test in Quota Mode":
     <<: *job-default
     steps:
@@ -366,6 +376,9 @@ workflows:
       - "Integrate Test Part-2":
           requires:
             - "Release"
+      - "Discovery Test for network":
+          requires:
+            - "Release"
       - "Byzantine Test in Quota Mode":
           requires:
             - "Release"
@@ -393,6 +406,7 @@ workflows:
           requires:
             - "Integrate Test Part-1"
             - "Integrate Test Part-2"
+            - "Discovery Test for network"
             - "Byzantine Test in Quota Mode"
             - "Byzantine Test in Charge Mode"
             - "Crosschain Test"

.editorconfig

@@ -0,0 +1,38 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+# Set default charset
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+# Follow https://github.com/rust-dev-tools/fmt-rfcs/blob/master/guide/guide.md
+[*.rs]
+indent_style = space
+indent_size = 4
+max_line_length = 100
+
+# Matches multiple files with brace expansion notation
+[*.{json,py,md,markdown}]
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+# Indentation override for all JS under scripts directory
+[scripts/**.js]
+indent_style = space
+indent_size = 2

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 First off, thanks for taking the time to contribute!
 
-The following is a set of guidelines for contributing to CITA and its packages. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request. 
+The following is a set of guidelines for contributing to CITA and its packages. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request.
 
 ## Table of Contents
 
@@ -91,40 +91,40 @@ Here we use [rustdoc](https://doc.rust-lang.org/book/first-edition/documentation
 
 Documents are essential parts to communicate with our users. We need to make our documents well-structured and readable. Everyone who contributes to the documents should have a **strong responsibility** for creating the great experience.
 
-- Everyone who modifies the documents needs to visualize the documents before making a pull request, in case there are some mistakes. 
+- Everyone who modifies the documents needs to visualize the documents before making a pull request, in case there are some mistakes.
 
 - Separate Chinese and English characters by a blank space. [Chinese Version Only]
     - Normally we need to add a blank space before the first character of English words and after the last character of English words.
     - If the character before the first character of English words is punctuation mark, then we don’t need to add a blank space.
     - If the character after the last character of English words is punctuation mark, then we don’t need to add a blank space.
 
     Example:
-    
+
     - Bad Style：
-    
+
         我们采用 CITA 作为我们的blockchain基础设施服务。
-    
+
     - Good Style：
-    
+
         我们采用 CITA 作为我们的 blockchain 基础设施服务。
 
 - Separate Chinese characters and numbers by a blank space. [Chinese Version Only]
     - Detailed rules are same as above.
 
     Example:
-    
+
     - Bad Style:
-    
+
         CITA 的速度超乎想象，比我用过的其他10几个区块链服务都要快。
-        
+
     - Good Style:
 
         CITA 的速度超乎想象，比我用过的其他 10 几个区块链服务都要快。
-    
+
 - Please do remember to indent the contents below any ordered list or unordered list.
 
     Example:
-    
+
     ![Bad Style](https://ws4.sinaimg.cn/large/006tKfTcly1frtlvhnbfdj31kw0zkjvu.jpg)
-    
+
     ![Good Style](https://ws3.sinaimg.cn/large/006tKfTcly1frtlwl2hq9j31kw0zktd5.jpg)

ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,4 +1,11 @@
-# Issue Template
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: kaikai1024
+
+---
 
 ## Description
 

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,16 @@
+---
+name: Custom issue template
+about: Any question that isn't answered in docs or forum
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Description
+
+[Description of the issue]
+
+## Additional Information
+
+[Any other information which would be helpful to reproduce the issue].

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE/simple.md

@@ -0,0 +1,10 @@
+# Pull Request Template
+
+## Requirements
+
+- Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
+
+## Templates
+
+### Description of the Change
+### Applicable Issues

PULL_REQUEST_TEMPLATE.md → .github/pull_request_template.md

@@ -1,14 +1,15 @@
 # Pull Request Template
 
-### Requirements
+## Requirements
+
 - Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion.
 - All new codes require tests to ensure against regressions.
 
-### Templates 
+## Templates
 
-#### Description of the Change
-#### Alternate Design
-#### Benefits
-#### Possible Drawbacks
-#### Verification Process
-#### Applicable Issues
+### Description of the Change
+### Alternate Design
+### Benefits
+### Possible Drawbacks
+### Verification Process
+### Applicable Issues

.gitmodules

@@ -19,3 +19,6 @@
 	path = scripts/config_tool/genesis
 	url = https://github.com/cryptape/genesis.git
 	branch = v0.22.0
+[submodule "tests/jsondata"]
+	path = tests/jsondata
+	url = https://github.com/cryptape/cita-testdata.git

.travis.yml

@@ -14,7 +14,7 @@ stages:
   - Release
   - IntegrateTest
 before_install:
-  - docker pull cita/cita-build:ubuntu-18.04-20190107
+  - docker pull cita/cita-build:ubuntu-18.04-20190413
 jobs:
   include:
 
@@ -54,11 +54,11 @@ jobs:
       install:
         - rm -rf /opt/cita-run/test-chain
         - cd $TRAVIS_BUILD_DIR/target/install
-        - ./env.sh ./scripts/create_cita_config.py create
+        - ./bin/cita create
             --nodes "127.0.0.1:4100"
             --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
-        - ./env.sh ./bin/cita setup test-chain/0
-        - ./daemon.sh ./bin/cita start test-chain/0
+        - ./bin/cita setup test-chain/0
+        - ./bin/cita start test-chain/0
       before_script:
         - cd $TRAVIS_BUILD_DIR/target/install/scripts/contracts/tests
         - travis_retry yarn install
@@ -104,12 +104,12 @@ jobs:
       name: Unit Node
       install:
         - cd $TRAVIS_BUILD_DIR/target/install
-        - ./env.sh ./scripts/create_cita_config.py create
+        - ./bin/cita create
             --nodes "127.0.0.1:4000,127.0.0.1:4001,127.0.0.1:4002"
             --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
         - for i in {0..2} ; do
-             ./env.sh bin/cita setup test-chain/$i
-             && ./daemon.sh bin/cita start test-chain/$i ;
+             ./bin/cita setup test-chain/$i
+             && ./bin/cita start test-chain/$i ;
           done
       script:
         - npm run-script unit_node
@@ -118,37 +118,37 @@ jobs:
       name: Integrate Quota
       install:
         - cd $TRAVIS_BUILD_DIR/target/install
-        - ./env.sh ./scripts/create_cita_config.py create
+        - ./bin/cita create
             --nodes "127.0.0.1:4100"
             --contract_arguments "SysConfig.checkQuota=true"
             --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
-        - ./env.sh ./bin/cita setup test-chain/0
-        - ./daemon.sh ./bin/cita start test-chain/0
+        - ./bin/cita setup test-chain/0
+        - ./bin/cita start test-chain/0
       script:
         - npm run-script integrate_quota
 
     - <<: *stage-contract-test-sha3-secp256k1
       name: Integrate Permission
       install:
         - cd $TRAVIS_BUILD_DIR/target/install
-        - ./env.sh ./scripts/create_cita_config.py create
+        - ./bin/cita create
             --nodes "127.0.0.1:4100"
             --contract_arguments "SysConfig.checkCallPermission=true"
             --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
-        - ./env.sh ./bin/cita setup test-chain/0
-        - ./daemon.sh ./bin/cita start test-chain/0
+        - ./bin/cita setup test-chain/0
+        - ./bin/cita start test-chain/0
       script:
         - npm run-script permission
 
     - <<: *stage-contract-test-sha3-secp256k1
       name: Integrate AutoExec
       install:
         - cd $TRAVIS_BUILD_DIR/target/install
-        - ./env.sh ./scripts/create_cita_config.py create
+        - ./bin/cita create
             --nodes "127.0.0.1:4100"
             --contract_arguments "SysConfig.autoExec=true"
             --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
-        - ./env.sh ./bin/cita setup test-chain/0
-        - ./daemon.sh ./bin/cita start test-chain/0
+        - ./bin/cita setup test-chain/0
+        - ./bin/cita start test-chain/0
       script:
         - npm run-script auto_exec