From bb9d5db9694647dd9394cf4885b8e90699632c5a Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 8 Feb 2016 15:03:44 +0100 Subject: [PATCH 1/6] Check for handshake expiration before attempting replace --- util/src/network/host.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/src/network/host.rs b/util/src/network/host.rs index 24c3460db..50cf294bc 100644 --- a/util/src/network/host.rs +++ b/util/src/network/host.rs @@ -599,6 +599,9 @@ impl Host where Message: Send + Sync + Clone { fn start_session(&self, token: StreamToken, io: &IoContext>) { let mut connections = self.connections.write().unwrap(); + if connections.get(token).is_none() { + return; // handshake expired + } connections.replace_with(token, |c| { match Arc::try_unwrap(c).ok().unwrap().into_inner().unwrap() { ConnectionEntry::Handshake(h) => { From 2cf7734897016f267c07b08aa8901030d80ab8e1 Mon Sep 17 00:00:00 2001 From: arkpar Date: Mon, 8 Feb 2016 15:54:13 +0100 Subject: [PATCH 2/6] Enable travis build for beta branch --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 227853669..cb3067056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ branches: - master - /^beta-.*$/ - /^stable-.*$/ + - /^beta$/ + - /^stable$/ matrix: fast_finish: true include: From 167c568d55b5dffc098dd649d18c92444675b6d0 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Tue, 9 Feb 2016 22:34:15 +0300 Subject: [PATCH 3/6] https link in the installer --- install-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-deps.sh b/install-deps.sh index 409f10d21..6b39001b1 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -669,7 +669,7 @@ function run_installer() function build_parity() { info "Downloading Parity..." - git clone git@github.com:ethcore/parity + git clone https://github.com/ethcore/parity cd parity git submodule init git submodule update From 00992069c51ed52a6277131e5fceb78df56c292e Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Sun, 14 Feb 2016 12:18:26 +0100 Subject: [PATCH 4/6] Delat Homestead transition. --- ethcore/res/ethereum/frontier.json | 2 +- ethcore/res/ethereum/frontier_like_test.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ethcore/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json index 4f0a836ff..33f0b833c 100644 --- a/ethcore/res/ethereum/frontier.json +++ b/ethcore/res/ethereum/frontier.json @@ -3,7 +3,7 @@ "engineName": "Ethash", "params": { "accountStartNonce": "0x00", - "frontierCompatibilityModeLimit": "0xf4240", + "frontierCompatibilityModeLimit": "0xf4240fff", "maximumExtraDataSize": "0x20", "tieBreakingGas": false, "minGasLimit": "0x1388", diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json index 84a6200fd..7ab6a58f4 100644 --- a/ethcore/res/ethereum/frontier_like_test.json +++ b/ethcore/res/ethereum/frontier_like_test.json @@ -3,7 +3,7 @@ "engineName": "Ethash", "params": { "accountStartNonce": "0x00", - "frontierCompatibilityModeLimit": "0xf4240", + "frontierCompatibilityModeLimit": "0xf4240fff", "maximumExtraDataSize": "0x20", "tieBreakingGas": false, "minGasLimit": "0x1388", From 29980d3e968c3818112a69d32b12833fbb22e779 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Tue, 16 Feb 2016 01:07:39 +0300 Subject: [PATCH 5/6] travis fix --- .travis.yml | 2 -- Cargo.lock | 52 +++++++++++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2859589b..b61486ed7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,6 @@ language: rust branches: only: - master - - /^beta-.*$/ - - /^stable-.*$/ - /^beta$/ - /^stable$/ matrix: diff --git a/Cargo.lock b/Cargo.lock index c451a6477..1fa63e621 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,10 +19,10 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -64,7 +64,7 @@ name = "clippy" version = "0.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex-syntax 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -113,7 +113,7 @@ name = "docopt" version = "0.6.78" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.1.48 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -137,7 +137,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.48 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -146,11 +146,11 @@ version = "0.5.4" source = "git+https://github.com/arkpar/rust-secp256k1.git#321e6c22a83606d1875f89cb61c9cb37c7d249ae" dependencies = [ "arrayvec 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "gcc 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -193,7 +193,7 @@ dependencies = [ "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)", - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -220,7 +220,7 @@ dependencies = [ "rocksdb 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "sha3 0.1.0", "slab 0.1.4 (git+https://github.com/arkpar/slab.git)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -250,7 +250,7 @@ dependencies = [ [[package]] name = "gcc" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -326,7 +326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hyper 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.48 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "xmltree 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -349,7 +349,7 @@ name = "jsonrpc-core" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -425,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memchr" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -437,7 +437,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -556,17 +556,18 @@ dependencies = [ [[package]] name = "regex" -version = "0.1.48" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -582,7 +583,7 @@ name = "rust-crypto" version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -617,7 +618,7 @@ dependencies = [ [[package]] name = "serde" -version = "0.6.12" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", @@ -639,7 +640,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "num 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -654,7 +655,7 @@ dependencies = [ name = "sha3" version = "0.1.0" dependencies = [ - "gcc 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -754,6 +755,11 @@ dependencies = [ "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "utf8-ranges" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "uuid" version = "0.1.18" From 6bbe551ce816365edd6e51b9fefda371142f0334 Mon Sep 17 00:00:00 2001 From: Nikolay Volf Date: Tue, 16 Feb 2016 01:39:58 +0300 Subject: [PATCH 6/6] returing beta dot-tags --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b61486ed7..b2859589b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ language: rust branches: only: - master + - /^beta-.*$/ + - /^stable-.*$/ - /^beta$/ - /^stable$/ matrix: