Skip to content

Commit

Permalink
Merge release-20.2.0 to master (#913)
Browse files Browse the repository at this point in the history
* Fix the link of release guide. [skip ci]

* Update cita-bft: add panic info. [skip travis]

* Use cita-database from crates.

* Bump blake2 to `0.8.1` to fix security check.

* Hard code release version

* Add setBlockInterval interface

* Add test about block interval

* Update submodule[skip audit]

* Add upgrade

* Use utils

* Fix operation typo[skip travis]

* refact executive

* Do not use a magic number.

* Delete unused comments

* Separate bin_dir and work_dir

* CITA Release flow

Add CITA Release flow to review

* Add docker diretory for build release images

* Update and rename. [skip ci]

* Fix audit[skip travis]

* [skip audit]fix for shell check

* Fix some sub-commands error

* Fix error info when file not exit

* Bug fix for handling quota used error when Revert. (#870)

* Fix travis (#877)

* fix for dup tx hash in block

* use new cita-vm

* [skip audit] Add JSON-RPC interface: estimate_quota. (#882)

* Update "flow" to "Flow"

* for[skip ci.[skip ci]

* [skip audit] Bug fix: Error estimate for the first calling contract. (#883)

* [skip audit] Bug fix: executor block in estimate quota larger than BQL

* [skip audit]add black list judge

* [skip audit] refine estimateQuota's error info (#886)

* Fix update admin (#885)

* [skip audit]fix update admint solc
use new genensis

* [skip audit]fix test permission

* fix add admin permission error

* fix auth cancel error

* [skip audit] fix permission.js

* [skip audit]fix space

* [skip audit]fix bug address in black list can't dismiss

* update submodule url[skip ci] (#891)

* Remove circle resource restrictions (#890)

* Remove circle resource restrictions[skip audit]

* Use only one jobs[skip audit]

* update info (#892)

* [skip audit]update info; upgrade rust to 1.39

* update ci config

* [skip audit]update ci config

* [skip audit]limit to 1 job

* [skip audit]update info

* [skip audit]update sdk version

* [skip audit]update cita-common; remove unused bin; update cita-run docker image

* [skip audit][skip ci]docker reap zombie processes

* Reveal solc command stderr output [skip audit] (#895)

* [skip ci]fix release.sh; Don't use fixed container name; add crates mirror when necessary

* [skip ci]fix container name

* [skip audit]fix ci (#899)

* Remove set block interval interface (#900)

* update interaction submodule

* Revert "Merge pull request #857 from ouwenkg/upgrade-scripts"

This reverts commit 29897d2, reversing
changes made to 24f1649.

* Revert "Merge pull request #855 from
ouwenkg/interface-block-interval"[skip audit]

This reverts commit 24f1649, reversing
changes made to 9d209c2.

* [skip ci]set cita_build container as bridge model (#901)

* [skip ci]fix copyright info (#903)

* [skip audit]fix volume path when cita_run (#905)

* [skip audit]fix bound bug about filter (#904)

* [skip ci]Update README

* [skip audit]fix run-in-docker judge error. (#907)

* Fix gas calculation error.[skip audit] (#908)

* Refine quota-estimate.[skip audit] (#909)

* Bump to 20.2.0 [skip audit].

Co-authored-by: ka <kaikaifeng1024@gmail.com>
Co-authored-by: AsceticBear <wpf15701504487@gmail.com>
Co-authored-by: nanmuxiusi <42529063+nanmuxiusi@users.noreply.github.com>
Co-authored-by: yubo <anhuitianyu@163.com>
Co-authored-by: zhiwei <rink1969@gmail.com>
Co-authored-by: bsdelf <shen.elf@gmail.com>
  • Loading branch information
7 people committed Feb 13, 2020
1 parent d2313d4 commit d8f6587
Show file tree
Hide file tree
Showing 233 changed files with 2,818 additions and 1,934 deletions.
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projectName": "cita",
"projectOwner": "cryptape",
"projectOwner": "citahub",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,8 @@ alias:
- &job-default
docker:
- image: cita/cita-build:ubuntu-18.04-20190515
- image: cita/cita-build:ubuntu-18.04-20191128
working_directory: ~/cita-build
resource_class: xlarge

- &job-unit-test
<<: *job-default
Expand Down Expand Up @@ -508,3 +507,4 @@ workflows:
# - "Crosschain Test"
# - "Test Snapshot Taking And Restoring"
# - "JSON-RPC Mock Test in Charge Mode"

2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at <mailto:contact@cryptape.com>. All
reported by contacting the project team at <mailto:contact@rivtower.com>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
14 changes: 7 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
[submodule "cita-forever"]
path = cita-forever
url = https://github.com/cryptape/cita-forever.git
url = https://github.com/citahub/cita-forever.git
branch = develop
[submodule "cita-bft"]
path = cita-bft
url = https://github.com/cryptape/cita-bft.git
url = https://github.com/citahub/cita-bft.git
branch = develop
[submodule "scripts/txtool/txtool/proto"]
path = scripts/txtool/txtool/proto
url = https://github.com/cryptape/cita-proto.git
url = https://github.com/citahub/cita-proto.git
branch = master
[submodule "tests/contracts"]
path = tests/contracts
url = https://github.com/cryptape/test-contracts.git
url = https://github.com/citahub/test-contracts.git
branch = master
[submodule "scripts/contracts/interaction"]
path = scripts/contracts/interaction
url = https://github.com/cryptape/cita-sys-interaction.git
url = https://github.com/citahub/cita-sys-interaction.git
branch = master
[submodule "scripts/config_tool/genesis"]
path = scripts/config_tool/genesis
url = https://github.com/cryptape/genesis.git
url = https://github.com/citahub/genesis.git
branch = master
[submodule "tests/jsondata"]
path = tests/jsondata
url = https://github.com/cryptape/cita-testdata.git
url = https://github.com/citahub/cita-testdata.git
branch = master
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ stages:
- Release
- IntegrateTest
before_install:
- docker pull cita/cita-build:ubuntu-18.04-20190515
- docker pull cita/cita-build:ubuntu-18.04-20191128
jobs:
include:

Expand All @@ -28,7 +28,8 @@ jobs:
name: Release for Integrate Test
language: node_js
node_js:
- lts/*
# - lts/*
- 8.10.0
cache:
directories:
- $TRAVIS_BUILD_DIR/target/release-cache
Expand All @@ -48,7 +49,8 @@ jobs:
name: Unit Group
language: node_js
node_js:
- lts/*
# - lts/*
- 8.10.0
cache:
directories:
- $TRAVIS_BUILD_DIR/target/release-cache
Expand Down
58 changes: 29 additions & 29 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -841,13 +841,13 @@ Fixed a bug that Network could not process domain names.

Release the first version of CITA.

[#201]: https://github.com/cryptape/cita/issues/201
[#206]: https://github.com/cryptape/cita/issues/206
[#588]: https://github.com/cryptape/cita/issues/588
[Account model based zero-knowledge proof transaction.]: https://github.com/cryptape/cita/blob/develop/cita-executor/core/src/native/zk_privacy.md
[#201]: https://github.com/citahub/cita/issues/201
[#206]: https://github.com/citahub/cita/issues/206
[#588]: https://github.com/citahub/cita/issues/588
[Account model based zero-knowledge proof transaction.]: https://github.com/citahub/cita/blob/develop/cita-executor/core/src/native/zk_privacy.md
[CITA docker images]: https://hub.docker.com/r/cita/
[Emergency braking system contract]: https://docs.citahub.com/zh-CN/cita/system/emergency-brake
[Executor service]: https://github.com/cryptape/cita/tree/develop/cita-executor
[Executor service]: https://github.com/citahub/cita/tree/develop/cita-executor
[Get peer information]: https://docs.citahub.com/zh-CN/next/cita/rpc-guide/rpc#peersinfo
[Get software version]: https://docs.citahub.com/zh-CN/next/cita/rpc-guide/rpc#getversion
[GetMetaData]: https://docs.citahub.com/zh-CN/cita/rpc-guide/rpc#getmetadata
Expand All @@ -858,36 +858,36 @@ Release the first version of CITA.
[`BlockTag`]: https://docs.citahub.com/zh-CN/cita/rpc-guide/rpc-types#tag
[`getMetaData`]: https://docs.nervos.org/cita/#/rpc_guide/rpc?id=getmetadata&version=v0.20
[`sendRawTransaction`]: https://docs.citahub.com/zh-CN/cita/rpc-guide/rpc#sendrawtransaction
[cita-cli]: https://github.com/cryptape/cita-cli
[cita-cli]: https://github.com/citahub/cita-cli
[documentation website]: https://docs.citahub.com/en-US/cita/cita-intro
[quota price manager system contract]: https://docs.citahub.com/zh-CN/cita/system/price
[return to the certain address]: https://docs.citahub.com/zh-CN/cita/system/fee-back
[set quota price]: https://docs.citahub.com/zh-CN/cita/system/price
[sidechain exit mechanism]: https://docs.nervos.org/cita/#/crosschain/crosschain_contract_example

[Unreleased]: https://github.com/cryptape/cita/compare/v0.25.1...HEAD
[v0.25.1]: https://github.com/cryptape/cita/compare/v0.25.0...v0.25.1
[v0.25.0]: https://github.com/cryptape/cita/compare/v0.24.1...v0.25.0
[v0.24.1]: https://github.com/cryptape/cita/compare/v0.24.0...v0.24.1
[v0.24.0]: https://github.com/cryptape/cita/compare/v0.23.0...v0.24.0
[v0.23.1]: https://github.com/cryptape/cita/compare/v0.23.0...v0.23.1
[v0.23.0]: https://github.com/cryptape/cita/compare/v0.22.0...v0.23.0
[v0.22.0]: https://github.com/cryptape/cita/compare/v0.21...v0.22.0
[v0.21.1]: https://github.com/cryptape/cita/compare/v0.21...v0.21.1
[v0.21.0]: https://github.com/cryptape/cita/compare/v0.20...v0.21
[v0.20.3]: https://github.com/cryptape/cita/compare/v0.20.2...v0.20.3
[v0.20.2]: https://github.com/cryptape/cita/compare/v0.20.1...v0.20.2
[v0.20.1]: https://github.com/cryptape/cita/compare/v0.20...v0.20.1
[v0.20.0]: https://github.com/cryptape/cita/compare/v0.19...v0.20
[v0.19.1]: https://github.com/cryptape/cita/compare/v0.19...v0.19.1
[v0.19.0]: https://github.com/cryptape/cita/compare/v0.18...v0.19
[v0.18.0]: https://github.com/cryptape/cita/compare/v0.17...v0.18
[v0.17.0]: https://github.com/cryptape/cita/compare/v0.16...v0.17
[v0.16.0]: https://github.com/cryptape/cita/compare/v0.15...v0.16
[v0.15.0]: https://github.com/cryptape/cita/compare/v0.13...v0.15
[v0.13.0]: https://github.com/cryptape/cita/compare/v0.12...v0.13
[v0.12.0]: https://github.com/cryptape/cita/compare/v0.10...v0.12
[v0.10.0]: https://github.com/cryptape/cita/releases/tag/v0.10
[Unreleased]: https://github.com/citahub/cita/compare/v0.25.1...HEAD
[v0.25.1]: https://github.com/citahub/cita/compare/v0.25.0...v0.25.1
[v0.25.0]: https://github.com/citahub/cita/compare/v0.24.1...v0.25.0
[v0.24.1]: https://github.com/citahub/cita/compare/v0.24.0...v0.24.1
[v0.24.0]: https://github.com/citahub/cita/compare/v0.23.0...v0.24.0
[v0.23.1]: https://github.com/citahub/cita/compare/v0.23.0...v0.23.1
[v0.23.0]: https://github.com/citahub/cita/compare/v0.22.0...v0.23.0
[v0.22.0]: https://github.com/citahub/cita/compare/v0.21...v0.22.0
[v0.21.1]: https://github.com/citahub/cita/compare/v0.21...v0.21.1
[v0.21.0]: https://github.com/citahub/cita/compare/v0.20...v0.21
[v0.20.3]: https://github.com/citahub/cita/compare/v0.20.2...v0.20.3
[v0.20.2]: https://github.com/citahub/cita/compare/v0.20.1...v0.20.2
[v0.20.1]: https://github.com/citahub/cita/compare/v0.20...v0.20.1
[v0.20.0]: https://github.com/citahub/cita/compare/v0.19...v0.20
[v0.19.1]: https://github.com/citahub/cita/compare/v0.19...v0.19.1
[v0.19.0]: https://github.com/citahub/cita/compare/v0.18...v0.19
[v0.18.0]: https://github.com/citahub/cita/compare/v0.17...v0.18
[v0.17.0]: https://github.com/citahub/cita/compare/v0.16...v0.17
[v0.16.0]: https://github.com/citahub/cita/compare/v0.15...v0.16
[v0.15.0]: https://github.com/citahub/cita/compare/v0.13...v0.15
[v0.13.0]: https://github.com/citahub/cita/compare/v0.12...v0.13
[v0.12.0]: https://github.com/citahub/cita/compare/v0.10...v0.12
[v0.10.0]: https://github.com/citahub/cita/releases/tag/v0.10

[@77liyan]: https://github.com/77liyan
[@EighteenZi]: https://github.com/EighteenZi
Expand Down
Loading

0 comments on commit d8f6587

Please sign in to comment.