Merge pull request #672 from cryptape/release-0.25.0

Release 0.25.0

.all-contributorsrc

@@ -7,7 +7,7 @@
     "README.md",
     "README-CN.md"
   ],
-  "imageSize": 100,
+  "imageSize": 50,
   "commit": true,
   "commitConvention": "none",
   "contributors": [
@@ -498,5 +498,5 @@
       ]
     }
   ],
-  "contributorsPerLine": 7
+  "contributorsPerLine": 9
 }

.circleci/config.yml

@@ -107,7 +107,7 @@ alias:
 
   - &job-default
     docker:
-      - image: cita/cita-build:ubuntu-18.04-20190429
+      - image: cita/cita-build:ubuntu-18.04-20190515
     working_directory: ~/cita-build
     resource_class: xlarge
 
@@ -145,9 +145,7 @@ jobs:
       - restore_cache: *restore-security-audit-cache
       - run:
           name: Check Security Audit
-          command: |
-            echo "Add it back when bump protobuf to `v2.6.0`."
-            # make security_audit
+          command: make security_audit
       - save_cache: *save-security-audit-cache
 
   "Check Contracts":
@@ -220,20 +218,27 @@ jobs:
       HASH_ALGO: sm3hash
       CRYPTO_ALGO: sm2
 
-  "Integrate Test Part-1":
+  "Basic Test":
     <<: *job-default
     steps:
       - restore_cache: *restore-source-codes-cache
       - restore_cache: *restore-release-cache
       - run: *after-restore-release-cache
       - run:
-          name: Basic Integrate Test
+          name: Basic Test
           command: ./tests/integrate_test/cita_basic.sh
+
+  "Basic Tls Test":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
-          name: Basic Tls Integrate Test
-          command: ./tests/integrate_test/cita_tls_basic.sh
+          name: Basic Tls Test
+          command: ./tests/integrate_test/cita_basic.sh --enable_tls
 
-  "Integrate Test Part-2":
+  "JSON-RPC Mock Test in Charge Mode":
     <<: *job-default
     steps:
       - restore_cache: *restore-source-codes-cache
@@ -247,18 +252,63 @@ jobs:
           command: |
               echo "We should add it back later."
               # ./tests/integrate_test/cita_jsonrpc_schema_mock.sh charge
+
+  "JSON-RPC Mock Test in Quota Mode":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
+      - run:
+          name: JSON-RPC Mock Test in Quota Mode
+          command: ./tests/integrate_test/cita_jsonrpc_schema_mock.sh quota
+
+  "Test Transfer Value in Charge Mode":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
           name: Test Transfer Value in Charge Mode
           command: ./tests/integrate_test/cita_charge_mode.sh
+
+  "Test Executor Process SignProposal/BlockWithProof":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
           name: Test Executor Process SignProposal/BlockWithProof
           command: ./tests/integrate_test/box_executor_test.sh
+
+  "Test Snapshot Taking And Restoring":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
           name: Test Snapshot Taking And Restoring
           command: ./tests/integrate_test/cita_snapshot_test.sh
+
+  "Test Amend":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
           name: Test Amend
           command: ./tests/integrate_test/cita_amend_test.sh
+
+  "Test Executor Process Invalid Proof":
+    <<: *job-default
+    steps:
+      - restore_cache: *restore-source-codes-cache
+      - restore_cache: *restore-release-cache
+      - run: *after-restore-release-cache
       - run:
           name: Test Executor Process Invalid Proof
           command: ./tests/integrate_test/cita_bft_resend.sh
@@ -372,12 +422,32 @@ workflows:
           requires:
             - "Release"
 
-      - "Integrate Test Part-1":
+      - "Basic Test":
+          requires:
+            - "Release"
+      - "Basic Tls Test":
+          requires:
+            - "Release"
+
+      - "JSON-RPC Mock Test in Charge Mode":
+          requires:
+            - "Release"
+      - "JSON-RPC Mock Test in Quota Mode":
           requires:
             - "Release"
-      - "Integrate Test Part-2":
+      - "Test Transfer Value in Charge Mode":
           requires:
             - "Release"
+      - "Test Snapshot Taking And Restoring":
+          requires:
+            - "Release"
+      - "Test Amend":
+          requires:
+            - "Release"
+      - "Test Executor Process Invalid Proof":
+          requires:
+            - "Release"
+
       - "Discovery Test for network":
           requires:
             - "Release"
@@ -406,8 +476,14 @@ workflows:
 
       - "Passed":
           requires:
-            - "Integrate Test Part-1"
-            - "Integrate Test Part-2"
+            - "Basic Test"
+            - "Basic Tls Test"
+            - "JSON-RPC Mock Test in Charge Mode"
+            - "JSON-RPC Mock Test in Quota Mode"
+            - "Test Transfer Value in Charge Mode"
+            - "Test Snapshot Taking And Restoring"
+            - "Test Amend"
+            - "Test Executor Process Invalid Proof"
             - "Discovery Test for network"
             - "Byzantine Test in Quota Mode"
             - "Byzantine Test in Charge Mode"

.gitmodules

@@ -10,8 +10,8 @@
 	path = scripts/txtool/txtool/proto
 	url = https://github.com/cryptape/cita-proto.git
 	branch = master
-[submodule "scripts/contracts/tests/contracts"]
-	path = scripts/contracts/tests/contracts
+[submodule "tests/contracts"]
+	path = tests/contracts
 	url = https://github.com/cryptape/test-contracts.git
 	branch = master
 [submodule "scripts/contracts/interaction"]

.travis.yml

@@ -11,13 +11,19 @@ services:
 git:
   depth: 1
 stages:
+  - CheckShell
   - Release
   - IntegrateTest
 before_install:
-  - docker pull cita/cita-build:ubuntu-18.04-20190429
+  - docker pull cita/cita-build:ubuntu-18.04-20190515
 jobs:
   include:
 
+    - stage: CheckShell
+      script:
+        # Fail if any of these files have warnings
+        - shellcheck scripts/*.sh env.sh
+
     - stage: Release
       name: Release for Integrate Test
       language: node_js
@@ -84,6 +90,9 @@ jobs:
     - <<: *stage-contract-test-sha3-secp256k1
       name: Unit Quota Management
       script: npm run-script unit_qm
+    - <<: *stage-contract-test-sha3-secp256k1
+      name: Unit Quota
+      script: npm run-script unit_quota
     - <<: *stage-contract-test-sha3-secp256k1
       name: Unit Abi
       script: npm run-script abi
@@ -99,6 +108,9 @@ jobs:
     - <<: *stage-contract-test-sha3-secp256k1
       name: Unit Uint8
       script: npm run-script uint8
+    - <<: *stage-contract-test-sha3-secp256k1
+      name: Unit VersionManager
+      script: npm run-script unit_vm
 
     - <<: *stage-contract-test-sha3-secp256k1
       name: Unit Node
@@ -152,3 +164,17 @@ jobs:
         - ./bin/cita start test-chain/0
       script:
         - npm run-script auto_exec
+
+    - <<: *stage-contract-test-sha3-secp256k1
+      name: Integrate Lifetime
+      install:
+        - cd $TRAVIS_BUILD_DIR/target/install
+        - ./bin/cita create
+            --nodes "127.0.0.1:4100"
+            --contract_arguments "SysConfig.economicalModel=1 PriceManager.quotaPrice=1"
+            --super_admin "0x4b5ae4567ad5d9fb92bc9afd6a657e6fa13a2523"
+            --init_token 0x1000000
+        - ./bin/cita setup test-chain/0
+        - ./bin/cita start test-chain/0
+      script:
+        - npm run-script lifetime

CHANGELOG.md

@@ -4,6 +4,48 @@ All notable changes to this project will be documented in this file. And this pr
 
 ## [Unreleased]
 
+### Framework
+
+- [Optimization] Bump Rust toolchain to `1.34.2`. [@kaikai1024]
+- [Optimization] Use Rust 2018 edition. [@kaikai1024] [@ouwenkg]
+- [Optimization] Use `cita-logger` crate. [@kaikai1024]
+
+### Network
+
+- [Fix] Fix the bug that save wrong session. [@leeyr338]
+- [Fix] Should not unwrap on handle_remote_msg. [@leeyr338]
+- [Fix] Fix the operation of repeated peer key. [@jerry-yu]
+- [Feature] Add retransfer message for P2P network. [@jerry-yu]
+
+### System Contracts
+
+- [Fix] Fix the import path. [@ouwenkg]
+- [Optimization] Use `protocol version` instead of version. [@kaikai1024]
+- [Optimization] Rename `emergency brake` to `emergency intervention`. [@kaikai1024]
+
+### Tools
+
+- [Refactor] Rewrite the tool of creating genesis using Rust. [@ouwenkg]
+
+### Test
+
+- [Refactor] Refactor scripts of integrate test. [@kaikai1024]
+- [Optimization] Add quota unit test in travisCI. [@ouwenkg]
+
+### Scripts
+
+- [Fix] Node path should not consider bin path. [@rainchen]
+- [Refactor] Refactor the `cita.sh` script. [@kaikai1024]
+- [Fix] Fix amend help info and latest version. [@leeyr338]
+- [Optimization] Rename `config_example` to `default_config`. [@kaikai1024]
+
+### Doc
+
+- [Doc] Add file naming style doc. [@kaikai1024]
+- [Doc] New CITA contents structure of CITAHub-Docs. [@kaikai1024] [@zhouyun-zoe] [@ouwenkg] [@leeyr338] [@wuyuyue]
+- [Doc] Add wiki about RocksDB. [@leeyr338]
+- [Doc] Update the description about `getTransactionCount`. [@ouwenkg]
+
 ## [v0.24.1] - 2019-06-14
 
 Fix the issue about memory leak in cita-executor.
@@ -854,6 +896,7 @@ Release the first version of CITA.
 [@leeyr338]: https://github.com/leeyr338
 [@luqz]: https://github.com/luqz
 [@ouwenkg]: https://github.com/ouwenkg
+[@rainchen]: https://github.com/rainchen
 [@rev-chaos]: https://github.com/rev-chaos
 [@rink1969]: https://github.com/rink1969
 [@u2]: https://github.com/u2