Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rc/v0.7.0 #290

Closed
wants to merge 6 commits into from
Closed

Rc/v0.7.0 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e83582c
docs: update README OS names (#288)
classicalliu Feb 23, 2019
4804f94
chore: use upstream rust-rocksdb as all patches merged (#287)
Feb 23, 2019
5367c85
chore: bump to 0.7.0-pre
doitian Feb 25, 2019
8276d9a
Revert "chore: bump to 0.7.0-pre"
doitian Feb 25, 2019
342bc35
Merge branch 'master' into develop
doitian Feb 25, 2019
2ef37a7
chore: bump to 0.7.0-pre
doitian Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
381 changes: 184 additions & 197 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ You also need to get the following packages：
sudo apt-get install git gcc libc6-dev pkg-config libssl-dev libclang-dev clang
```

* Archlinux
* Arch Linux

```shell
sudo pacman -Sy git gcc pkgconf openssl-1.0 clang
Expand All @@ -65,7 +65,7 @@ If you get openssl related errors in compiling, try the following environment va
OPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 OPENSSL_LIB_DIR=/usr/lib/openssl-1.0 cargo build --release
```

* OSX:
* macOS:

```shell
brew install autoconf libtool
Expand Down
2 changes: 1 addition & 1 deletion benches/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-benches"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-chain"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-core"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
4 changes: 2 additions & 2 deletions db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "ckb-db"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

[dependencies]
bincode = "1.1"
ckb-util = { path = "../util" }
rocksdb = { git = "https://github.com/nervosnetwork/rust-rocksdb", branch = "pinnable-v0.11.0" }
rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1038c71df85a58b7f48894ca4cbf7c9228cb1cdf" }
fnv = "1.0.3"
serde = "1.0"
serde_derive = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion miner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-miner"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-network"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion notify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-notify"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-pool"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion pow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-pow"
version = "0.6.0"
version = "0.7.0-pre"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-protocol"
version = "0.6.0"
version = "0.7.0-pre"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-rpc"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion script/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-script"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-shared"
version = "0.6.0"
version = "0.7.0-pre"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion spec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-chain-spec"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-sync"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-util"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/build-info/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "build-info"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "crypto"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/dir/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dir"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
2 changes: 1 addition & 1 deletion util/hash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hash"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/instrument/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-instrument"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/jsonrpc-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "jsonrpc-types"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/logger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "logger"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/merkle-tree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-merkle-tree"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/occupied-capacity-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "occupied-capacity-derive"
version = "0.6.0"
version = "0.7.0-pre"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion util/occupied-capacity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "occupied-capacity"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion util/stop-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "stop-handler"
version = "0.6.0"
version = "0.7.0-pre"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion verification/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-verification"
version = "0.6.0"
version = "0.7.0-pre"
license = "MIT"
authors = ["Nervos Core Dev <[email protected]>"]
edition = "2018"
Expand Down