diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index f679363b8..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,12 +0,0 @@ -# Contributing to Parity - -## License - -By contributing to Parity, you agree that your contributions will be -licensed under the [BSD License](LICENSE). - -At the top of every source code file you alter, after the initial -licence section, please append a second section that reads: - -Portions contributed by YOUR NAME are hereby placed under the BSD licence. - diff --git a/Cargo.lock b/Cargo.lock index 93db82a2d..ce8b517a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,16 +1,16 @@ [root] name = "parity" -version = "0.9.0" +version = "0.9.99" dependencies = [ "clippy 0.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "ctrlc 1.0.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)", "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)", "docopt_macros 0.6.81 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore 0.9.0", - "ethcore-rpc 0.9.0", - "ethcore-util 0.9.0", - "ethsync 0.1.0", + "ethcore 0.9.99", + "ethcore-rpc 0.9.99", + "ethcore-util 0.9.99", + "ethsync 0.9.99", "fdlimit 0.1.0", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -156,7 +156,7 @@ dependencies = [ [[package]] name = "ethash" -version = "0.1.0" +version = "0.9.99" dependencies = [ "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -165,13 +165,13 @@ dependencies = [ [[package]] name = "ethcore" -version = "0.9.0" +version = "0.9.99" dependencies = [ "clippy 0.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ethash 0.1.0", - "ethcore-util 0.9.0", + "ethash 0.9.99", + "ethcore-util 0.9.99", "heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -184,12 +184,12 @@ dependencies = [ [[package]] name = "ethcore-rpc" -version = "0.9.0" +version = "0.9.99" dependencies = [ "clippy 0.0.41 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore 0.9.0", - "ethcore-util 0.9.0", - "ethsync 0.1.0", + "ethcore 0.9.99", + "ethcore-util 0.9.99", + "ethsync 0.9.99", "jsonrpc-core 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-http-server 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -201,7 +201,7 @@ dependencies = [ [[package]] name = "ethcore-util" -version = "0.9.0" +version = "0.9.99" dependencies = [ "arrayvec 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.41 (registry+https://github.com/rust-lang/crates.io-index)", @@ -231,12 +231,12 @@ dependencies = [ [[package]] name = "ethsync" -version = "0.1.0" +version = "0.9.99" dependencies = [ "clippy 0.0.41 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore 0.9.0", - "ethcore-util 0.9.0", + "ethcore 0.9.99", + "ethcore-util 0.9.99", "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index ca2ad9c6c..c58cacf0d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Ethcore client." name = "parity" -version = "0.9.0" +version = "0.9.99" license = "GPL-3.0" authors = ["Ethcore "] diff --git a/ethash/Cargo.toml b/ethash/Cargo.toml index 4c0b3d65e..4bba71a14 100644 --- a/ethash/Cargo.toml +++ b/ethash/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ethash" -version = "0.1.0" +version = "0.9.99" authors = ["arkpar "] [dependencies] diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json index 0d0c2489d..2e45c2edd 100644 --- a/ethcore/res/ethereum/morden.json +++ b/ethcore/res/ethereum/morden.json @@ -25,6 +25,9 @@ "extraData": "0x", "gasLimit": "0x2fefd8" }, + "nodes": [ + "enode://b1217cbaa440e35ed471157123fe468e19e8b5ad5bedb4b1fdbcbdab6fb2f5ed3e95dd9c24a22a79fdb2352204cea207df27d92bfd21bfd41545e8b16f637499@104.44.138.37:30303" + ], "accounts": { "0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "linear": { "base": 3000, "word": 0 } } }, "0000000000000000000000000000000000000002": { "balance": "1", "nonce": "1048576", "builtin": { "name": "sha256", "linear": { "base": 60, "word": 12 } } }, diff --git a/evmjit/Cargo.toml b/evmjit/Cargo.toml index ccd9cc718..9449af82d 100644 --- a/evmjit/Cargo.toml +++ b/evmjit/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "evmjit" -version = "0.9.0" +version = "0.9.99" authors = ["debris "] [lib] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 0bb255d98..b1af0a2fa 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Ethcore jsonrpc" name = "ethcore-rpc" -version = "0.9.0" +version = "0.9.99" license = "GPL-3.0" authors = ["Ethcore "] [dependencies]