Backporting to beta (#3623)

* Ropsten network (#3539) * Ropsten network * Sorted premine * Comas * Removed trailing coma * --testnet set to ropset * New registry contract address for ropsten (#3549) * New registry for ropsten * Registry address * Registry with payable modifier * Fix panic on importing own invalid transaction (#3550) * Use patched MIO * Trim whitespace from recovery phrase * v1.4.5 * Appending logs by default * Fixing phrases generated on windows * Manually add \r to Windows phrases pre 1.4.4 * < 1.4.5 * Update test, fix number. (#3612) * Set default tx price to 0.0025 USD * Only support 1.4.x dictionary Former-commit-id: 793003af5ff14bccb34e24b8b57897762647e03d
2016-11-25 20:57:34 +01:00 · 2016-11-25 20:57:34 +01:00 · e7d7280a89
commit e7d7280a89
parent e84819c72d
22 changed files with 434 additions and 71 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.4.4"
+version = "1.4.5"
 dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
@ -21,7 +21,7 @@ dependencies = [
 "ethcore-rpc 1.4.0",
 "ethcore-signer 1.4.0",
 "ethcore-stratum 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "ethsync 1.4.0",
 "fdlimit 0.1.0",
 "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -289,7 +289,7 @@ dependencies = [
 "ethcore-ipc 1.4.0",
 "ethcore-ipc-codegen 1.4.0",
 "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
 "ethstore 0.1.0",
@ -336,7 +336,7 @@ dependencies = [
 "ethabi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-devtools 1.4.0",
 "ethcore-rpc 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "fetch 0.1.0",
 "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
 "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -371,7 +371,7 @@ version = "1.4.0"
 dependencies = [
 "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.1 (git+https://github.com/carllerche/mio)",
+ "mio 0.6.1 (git+https://github.com/ethcore/mio)",
 "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -381,7 +381,7 @@ name = "ethcore-ipc"
 version = "1.4.0"
 dependencies = [
 "ethcore-devtools 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@ -428,7 +428,7 @@ dependencies = [
 "ethcore-ipc 1.4.0",
 "ethcore-ipc-codegen 1.4.0",
 "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -439,7 +439,7 @@ name = "ethcore-logger"
 version = "1.4.0"
 dependencies = [
 "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -455,13 +455,13 @@ dependencies = [
 "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-devtools 1.4.0",
 "ethcore-io 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "ethcrypto 0.1.0",
 "ethkey 0.2.0",
 "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.1 (git+https://github.com/carllerche/mio)",
+ "mio 0.6.1 (git+https://github.com/ethcore/mio)",
 "parking_lot 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)",
 "rlp 0.1.0",
@ -482,7 +482,7 @@ dependencies = [
 "ethcore-devtools 1.4.0",
 "ethcore-io 1.4.0",
 "ethcore-ipc 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "ethcrypto 0.1.0",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
@ -511,7 +511,7 @@ dependencies = [
 "ethcore-devtools 1.4.0",
 "ethcore-io 1.4.0",
 "ethcore-rpc 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -530,7 +530,7 @@ dependencies = [
 "ethcore-ipc 1.4.0",
 "ethcore-ipc-codegen 1.4.0",
 "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "json-tcp-server 0.1.0 (git+https://github.com/ethcore/json-tcp-server)",
 "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -541,7 +541,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.4.4"
+version = "1.4.5"
 dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -590,7 +590,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_codegen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
@ -643,7 +643,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.4.0",
 "ethcore-ipc-nano 1.4.0",
 "ethcore-network 1.4.0",
- "ethcore-util 1.4.4",
+ "ethcore-util 1.4.5",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1012,7 +1012,7 @@ dependencies = [
 [[package]]
 name = "mio"
 version = "0.6.1"
-source = "git+https://github.com/carllerche/mio#56f8663510196fdca04bdf7c5f4d60b24297826f"
+source = "git+https://github.com/ethcore/mio#ef182bae193a9c7457cd2cf661fcaffb226e3eef"
 dependencies = [
 "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2039,7 +2039,7 @@ dependencies = [
 "checksum mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)" = "<none>"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
 "checksum mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)" = "<none>"
-"checksum mio 0.6.1 (git+https://github.com/carllerche/mio)" = "<none>"
+"checksum mio 0.6.1 (git+https://github.com/ethcore/mio)" = "<none>"
 "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a"
 "checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
 "checksum nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)" = "<none>"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.4.4"
+version = "1.4.5"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@ -0,0 +1,304 @@
+{
+	"name": "Ropsten",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"gasLimitBoundDivisor": "0x0400",
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
+				"registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2",
+				"homesteadTransition": 0,
+				"eip150Transition": 0,
+				"eip155Transition": 10,
+				"eip160Transition": 10,
+				"eip161abcTransition": 10,
+				"eip161dTransition": 10
+			}
+		}
+	},
+	"params": {
+		"accountStartNonce": "0x0",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x3"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000042",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x100000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x3535353535353535353535353535353535353535353535353535353535353535",
+		"gasLimit": "0x1000000"
+	},
+	"nodes": [
+		"enode://a22f0977ce02653bf95e38730106356342df48b5222e2c2a1a6f9ef34769bf593bae9ca0a888cf60839edd52efc1b6e393c63a57d76f4c4fe14e641f1f9e637e@128.199.55.137:30303",
+		"enode://012239fccf3ff1d92b036983a430cb6705c6528c96c0354413f8854802138e5135c084ab36e7c54efb621c46728df8c3a6f4c1db9bb48a1330efe3f82f2dd7a6@52.169.94.142:30303"
+	],
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "0", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000000": { "balance": "1" },
+		"0000000000000000000000000000000000000005": { "balance": "1" },
+		"0000000000000000000000000000000000000006": { "balance": "1" },
+		"0000000000000000000000000000000000000007": { "balance": "1" },
+		"0000000000000000000000000000000000000008": { "balance": "1" },
+		"0000000000000000000000000000000000000009": { "balance": "1" },
+		"000000000000000000000000000000000000000a": { "balance": "0" },
+		"000000000000000000000000000000000000000b": { "balance": "0" },
+		"000000000000000000000000000000000000000c": { "balance": "0" },
+		"000000000000000000000000000000000000000d": { "balance": "0" },
+		"000000000000000000000000000000000000000e": { "balance": "0" },
+		"000000000000000000000000000000000000000f": { "balance": "0" },
+		"0000000000000000000000000000000000000010": { "balance": "0" },
+		"0000000000000000000000000000000000000011": { "balance": "0" },
+		"0000000000000000000000000000000000000012": { "balance": "0" },
+		"0000000000000000000000000000000000000013": { "balance": "0" },
+		"0000000000000000000000000000000000000014": { "balance": "0" },
+		"0000000000000000000000000000000000000015": { "balance": "0" },
+		"0000000000000000000000000000000000000016": { "balance": "0" },
+		"0000000000000000000000000000000000000017": { "balance": "0" },
+		"0000000000000000000000000000000000000018": { "balance": "0" },
+		"0000000000000000000000000000000000000019": { "balance": "0" },
+		"000000000000000000000000000000000000001a": { "balance": "0" },
+		"000000000000000000000000000000000000001b": { "balance": "0" },
+		"000000000000000000000000000000000000001c": { "balance": "0" },
+		"000000000000000000000000000000000000001d": { "balance": "0" },
+		"000000000000000000000000000000000000001e": { "balance": "0" },
+		"000000000000000000000000000000000000001f": { "balance": "0" },
+		"0000000000000000000000000000000000000020": { "balance": "0" },
+		"0000000000000000000000000000000000000021": { "balance": "0" },
+		"0000000000000000000000000000000000000022": { "balance": "0" },
+		"0000000000000000000000000000000000000023": { "balance": "0" },
+		"0000000000000000000000000000000000000024": { "balance": "0" },
+		"0000000000000000000000000000000000000025": { "balance": "0" },
+		"0000000000000000000000000000000000000026": { "balance": "0" },
+		"0000000000000000000000000000000000000027": { "balance": "0" },
+		"0000000000000000000000000000000000000028": { "balance": "0" },
+		"0000000000000000000000000000000000000029": { "balance": "0" },
+		"000000000000000000000000000000000000002a": { "balance": "0" },
+		"000000000000000000000000000000000000002b": { "balance": "0" },
+		"000000000000000000000000000000000000002c": { "balance": "0" },
+		"000000000000000000000000000000000000002d": { "balance": "0" },
+		"000000000000000000000000000000000000002e": { "balance": "0" },
+		"000000000000000000000000000000000000002f": { "balance": "0" },
+		"0000000000000000000000000000000000000030": { "balance": "0" },
+		"0000000000000000000000000000000000000031": { "balance": "0" },
+		"0000000000000000000000000000000000000032": { "balance": "0" },
+		"0000000000000000000000000000000000000033": { "balance": "0" },
+		"0000000000000000000000000000000000000034": { "balance": "0" },
+		"0000000000000000000000000000000000000035": { "balance": "0" },
+		"0000000000000000000000000000000000000036": { "balance": "0" },
+		"0000000000000000000000000000000000000037": { "balance": "0" },
+		"0000000000000000000000000000000000000038": { "balance": "0" },
+		"0000000000000000000000000000000000000039": { "balance": "0" },
+		"000000000000000000000000000000000000003a": { "balance": "0" },
+		"000000000000000000000000000000000000003b": { "balance": "0" },
+		"000000000000000000000000000000000000003c": { "balance": "0" },
+		"000000000000000000000000000000000000003d": { "balance": "0" },
+		"000000000000000000000000000000000000003e": { "balance": "0" },
+		"000000000000000000000000000000000000003f": { "balance": "0" },
+		"0000000000000000000000000000000000000040": { "balance": "0" },
+		"0000000000000000000000000000000000000041": { "balance": "0" },
+		"0000000000000000000000000000000000000042": { "balance": "0" },
+		"0000000000000000000000000000000000000043": { "balance": "0" },
+		"0000000000000000000000000000000000000044": { "balance": "0" },
+		"0000000000000000000000000000000000000045": { "balance": "0" },
+		"0000000000000000000000000000000000000046": { "balance": "0" },
+		"0000000000000000000000000000000000000047": { "balance": "0" },
+		"0000000000000000000000000000000000000048": { "balance": "0" },
+		"0000000000000000000000000000000000000049": { "balance": "0" },
+		"000000000000000000000000000000000000004a": { "balance": "0" },
+		"000000000000000000000000000000000000004b": { "balance": "0" },
+		"000000000000000000000000000000000000004c": { "balance": "0" },
+		"000000000000000000000000000000000000004d": { "balance": "0" },
+		"000000000000000000000000000000000000004e": { "balance": "0" },
+		"000000000000000000000000000000000000004f": { "balance": "0" },
+		"0000000000000000000000000000000000000050": { "balance": "0" },
+		"0000000000000000000000000000000000000051": { "balance": "0" },
+		"0000000000000000000000000000000000000052": { "balance": "0" },
+		"0000000000000000000000000000000000000053": { "balance": "0" },
+		"0000000000000000000000000000000000000054": { "balance": "0" },
+		"0000000000000000000000000000000000000055": { "balance": "0" },
+		"0000000000000000000000000000000000000056": { "balance": "0" },
+		"0000000000000000000000000000000000000057": { "balance": "0" },
+		"0000000000000000000000000000000000000058": { "balance": "0" },
+		"0000000000000000000000000000000000000059": { "balance": "0" },
+		"000000000000000000000000000000000000005a": { "balance": "0" },
+		"000000000000000000000000000000000000005b": { "balance": "0" },
+		"000000000000000000000000000000000000005c": { "balance": "0" },
+		"000000000000000000000000000000000000005d": { "balance": "0" },
+		"000000000000000000000000000000000000005e": { "balance": "0" },
+		"000000000000000000000000000000000000005f": { "balance": "0" },
+		"0000000000000000000000000000000000000060": { "balance": "0" },
+		"0000000000000000000000000000000000000061": { "balance": "0" },
+		"0000000000000000000000000000000000000062": { "balance": "0" },
+		"0000000000000000000000000000000000000063": { "balance": "0" },
+		"0000000000000000000000000000000000000064": { "balance": "0" },
+		"0000000000000000000000000000000000000065": { "balance": "0" },
+		"0000000000000000000000000000000000000066": { "balance": "0" },
+		"0000000000000000000000000000000000000067": { "balance": "0" },
+		"0000000000000000000000000000000000000068": { "balance": "0" },
+		"0000000000000000000000000000000000000069": { "balance": "0" },
+		"000000000000000000000000000000000000006a": { "balance": "0" },
+		"000000000000000000000000000000000000006b": { "balance": "0" },
+		"000000000000000000000000000000000000006c": { "balance": "0" },
+		"000000000000000000000000000000000000006d": { "balance": "0" },
+		"000000000000000000000000000000000000006e": { "balance": "0" },
+		"000000000000000000000000000000000000006f": { "balance": "0" },
+		"0000000000000000000000000000000000000070": { "balance": "0" },
+		"0000000000000000000000000000000000000071": { "balance": "0" },
+		"0000000000000000000000000000000000000072": { "balance": "0" },
+		"0000000000000000000000000000000000000073": { "balance": "0" },
+		"0000000000000000000000000000000000000074": { "balance": "0" },
+		"0000000000000000000000000000000000000075": { "balance": "0" },
+		"0000000000000000000000000000000000000076": { "balance": "0" },
+		"0000000000000000000000000000000000000077": { "balance": "0" },
+		"0000000000000000000000000000000000000078": { "balance": "0" },
+		"0000000000000000000000000000000000000079": { "balance": "0" },
+		"000000000000000000000000000000000000007a": { "balance": "0" },
+		"000000000000000000000000000000000000007b": { "balance": "0" },
+		"000000000000000000000000000000000000007c": { "balance": "0" },
+		"000000000000000000000000000000000000007d": { "balance": "0" },
+		"000000000000000000000000000000000000007e": { "balance": "0" },
+		"000000000000000000000000000000000000007f": { "balance": "0" },
+		"0000000000000000000000000000000000000080": { "balance": "0" },
+		"0000000000000000000000000000000000000081": { "balance": "0" },
+		"0000000000000000000000000000000000000082": { "balance": "0" },
+		"0000000000000000000000000000000000000083": { "balance": "0" },
+		"0000000000000000000000000000000000000084": { "balance": "0" },
+		"0000000000000000000000000000000000000085": { "balance": "0" },
+		"0000000000000000000000000000000000000086": { "balance": "0" },
+		"0000000000000000000000000000000000000087": { "balance": "0" },
+		"0000000000000000000000000000000000000088": { "balance": "0" },
+		"0000000000000000000000000000000000000089": { "balance": "0" },
+		"000000000000000000000000000000000000008a": { "balance": "0" },
+		"000000000000000000000000000000000000008b": { "balance": "0" },
+		"000000000000000000000000000000000000008c": { "balance": "0" },
+		"000000000000000000000000000000000000008d": { "balance": "0" },
+		"000000000000000000000000000000000000008e": { "balance": "0" },
+		"000000000000000000000000000000000000008f": { "balance": "0" },
+		"0000000000000000000000000000000000000090": { "balance": "0" },
+		"0000000000000000000000000000000000000091": { "balance": "0" },
+		"0000000000000000000000000000000000000092": { "balance": "0" },
+		"0000000000000000000000000000000000000093": { "balance": "0" },
+		"0000000000000000000000000000000000000094": { "balance": "0" },
+		"0000000000000000000000000000000000000095": { "balance": "0" },
+		"0000000000000000000000000000000000000096": { "balance": "0" },
+		"0000000000000000000000000000000000000097": { "balance": "0" },
+		"0000000000000000000000000000000000000098": { "balance": "0" },
+		"0000000000000000000000000000000000000099": { "balance": "0" },
+		"000000000000000000000000000000000000009a": { "balance": "0" },
+		"000000000000000000000000000000000000009b": { "balance": "0" },
+		"000000000000000000000000000000000000009c": { "balance": "0" },
+		"000000000000000000000000000000000000009d": { "balance": "0" },
+		"000000000000000000000000000000000000009e": { "balance": "0" },
+		"000000000000000000000000000000000000009f": { "balance": "0" },
+		"00000000000000000000000000000000000000a0": { "balance": "0" },
+		"00000000000000000000000000000000000000a1": { "balance": "0" },
+		"00000000000000000000000000000000000000a2": { "balance": "0" },
+		"00000000000000000000000000000000000000a3": { "balance": "0" },
+		"00000000000000000000000000000000000000a4": { "balance": "0" },
+		"00000000000000000000000000000000000000a5": { "balance": "0" },
+		"00000000000000000000000000000000000000a6": { "balance": "0" },
+		"00000000000000000000000000000000000000a7": { "balance": "0" },
+		"00000000000000000000000000000000000000a8": { "balance": "0" },
+		"00000000000000000000000000000000000000a9": { "balance": "0" },
+		"00000000000000000000000000000000000000aa": { "balance": "0" },
+		"00000000000000000000000000000000000000ab": { "balance": "0" },
+		"00000000000000000000000000000000000000ac": { "balance": "0" },
+		"00000000000000000000000000000000000000ad": { "balance": "0" },
+		"00000000000000000000000000000000000000ae": { "balance": "0" },
+		"00000000000000000000000000000000000000af": { "balance": "0" },
+		"00000000000000000000000000000000000000b0": { "balance": "0" },
+		"00000000000000000000000000000000000000b1": { "balance": "0" },
+		"00000000000000000000000000000000000000b2": { "balance": "0" },
+		"00000000000000000000000000000000000000b3": { "balance": "0" },
+		"00000000000000000000000000000000000000b4": { "balance": "0" },
+		"00000000000000000000000000000000000000b5": { "balance": "0" },
+		"00000000000000000000000000000000000000b6": { "balance": "0" },
+		"00000000000000000000000000000000000000b7": { "balance": "0" },
+		"00000000000000000000000000000000000000b8": { "balance": "0" },
+		"00000000000000000000000000000000000000b9": { "balance": "0" },
+		"00000000000000000000000000000000000000ba": { "balance": "0" },
+		"00000000000000000000000000000000000000bb": { "balance": "0" },
+		"00000000000000000000000000000000000000bc": { "balance": "0" },
+		"00000000000000000000000000000000000000bd": { "balance": "0" },
+		"00000000000000000000000000000000000000be": { "balance": "0" },
+		"00000000000000000000000000000000000000bf": { "balance": "0" },
+		"00000000000000000000000000000000000000c0": { "balance": "0" },
+		"00000000000000000000000000000000000000c1": { "balance": "0" },
+		"00000000000000000000000000000000000000c2": { "balance": "0" },
+		"00000000000000000000000000000000000000c3": { "balance": "0" },
+		"00000000000000000000000000000000000000c4": { "balance": "0" },
+		"00000000000000000000000000000000000000c5": { "balance": "0" },
+		"00000000000000000000000000000000000000c6": { "balance": "0" },
+		"00000000000000000000000000000000000000c7": { "balance": "0" },
+		"00000000000000000000000000000000000000c8": { "balance": "0" },
+		"00000000000000000000000000000000000000c9": { "balance": "0" },
+		"00000000000000000000000000000000000000ca": { "balance": "0" },
+		"00000000000000000000000000000000000000cb": { "balance": "0" },
+		"00000000000000000000000000000000000000cc": { "balance": "0" },
+		"00000000000000000000000000000000000000cd": { "balance": "0" },
+		"00000000000000000000000000000000000000ce": { "balance": "0" },
+		"00000000000000000000000000000000000000cf": { "balance": "0" },
+		"00000000000000000000000000000000000000d0": { "balance": "0" },
+		"00000000000000000000000000000000000000d1": { "balance": "0" },
+		"00000000000000000000000000000000000000d2": { "balance": "0" },
+		"00000000000000000000000000000000000000d3": { "balance": "0" },
+		"00000000000000000000000000000000000000d4": { "balance": "0" },
+		"00000000000000000000000000000000000000d5": { "balance": "0" },
+		"00000000000000000000000000000000000000d6": { "balance": "0" },
+		"00000000000000000000000000000000000000d7": { "balance": "0" },
+		"00000000000000000000000000000000000000d8": { "balance": "0" },
+		"00000000000000000000000000000000000000d9": { "balance": "0" },
+		"00000000000000000000000000000000000000da": { "balance": "0" },
+		"00000000000000000000000000000000000000db": { "balance": "0" },
+		"00000000000000000000000000000000000000dc": { "balance": "0" },
+		"00000000000000000000000000000000000000dd": { "balance": "0" },
+		"00000000000000000000000000000000000000de": { "balance": "0" },
+		"00000000000000000000000000000000000000df": { "balance": "0" },
+		"00000000000000000000000000000000000000e0": { "balance": "0" },
+		"00000000000000000000000000000000000000e1": { "balance": "0" },
+		"00000000000000000000000000000000000000e2": { "balance": "0" },
+		"00000000000000000000000000000000000000e3": { "balance": "0" },
+		"00000000000000000000000000000000000000e4": { "balance": "0" },
+		"00000000000000000000000000000000000000e5": { "balance": "0" },
+		"00000000000000000000000000000000000000e6": { "balance": "0" },
+		"00000000000000000000000000000000000000e7": { "balance": "0" },
+		"00000000000000000000000000000000000000e8": { "balance": "0" },
+		"00000000000000000000000000000000000000e9": { "balance": "0" },
+		"00000000000000000000000000000000000000ea": { "balance": "0" },
+		"00000000000000000000000000000000000000eb": { "balance": "0" },
+		"00000000000000000000000000000000000000ec": { "balance": "0" },
+		"00000000000000000000000000000000000000ed": { "balance": "0" },
+		"00000000000000000000000000000000000000ee": { "balance": "0" },
+		"00000000000000000000000000000000000000ef": { "balance": "0" },
+		"00000000000000000000000000000000000000f0": { "balance": "0" },
+		"00000000000000000000000000000000000000f1": { "balance": "0" },
+		"00000000000000000000000000000000000000f2": { "balance": "0" },
+		"00000000000000000000000000000000000000f3": { "balance": "0" },
+		"00000000000000000000000000000000000000f4": { "balance": "0" },
+		"00000000000000000000000000000000000000f5": { "balance": "0" },
+		"00000000000000000000000000000000000000f6": { "balance": "0" },
+		"00000000000000000000000000000000000000f7": { "balance": "0" },
+		"00000000000000000000000000000000000000f8": { "balance": "0" },
+		"00000000000000000000000000000000000000f9": { "balance": "0" },
+		"00000000000000000000000000000000000000fa": { "balance": "0" },
+		"00000000000000000000000000000000000000fb": { "balance": "0" },
+		"00000000000000000000000000000000000000fc": { "balance": "0" },
+		"00000000000000000000000000000000000000fd": { "balance": "0" },
+		"00000000000000000000000000000000000000fe": { "balance": "0" },
+		"00000000000000000000000000000000000000ff": { "balance": "0" },
+		"874b54a8bd152966d63f706bae1ffeb0411921e5": { "balance": "1000000000000000000000000000000" }
+	}
+}
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@ -1 +1 @@
-Subproject commit 9028c4801fd39fbb71a9796979182549a24e81c8
+Subproject commit d509c75936ec6cbba683ee1916aa0bca436bc376
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@ -63,6 +63,9 @@ pub fn new_transition_test() -> Spec { load(include_bytes!("../../res/ethereum/t
 /// Create a new Frontier main net chain spec without genesis accounts.
 pub fn new_mainnet_like() -> Spec { load(include_bytes!("../../res/ethereum/frontier_like_test.json")) }

+/// Create a new Ropsten chain spec.
+pub fn new_ropsten() -> Spec { load(include_bytes!("../../res/ethereum/ropsten.json")) }
+
 /// Create a new Morden chain spec.
 pub fn new_morden() -> Spec { load(include_bytes!("../../res/ethereum/morden.json")) }

--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@ -34,7 +34,7 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			Some(x) if x < 1_150_000 => &old_schedule,
 			Some(_) => &new_schedule
 		};
-		let allow_network_id_of_one = number.map_or(false, |n| n >= 3_500_000); 
+		let allow_network_id_of_one = number.map_or(false, |n| n >= 2_675_000); 

 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@ -567,20 +567,22 @@ impl Miner {
 		let gas_required = |tx: &SignedTransaction| tx.gas_required(&schedule).into();
 		let best_block_header: Header = ::rlp::decode(&chain.best_block_header());
 		transactions.into_iter()
-			.filter(|tx| match self.engine.verify_transaction_basic(tx, &best_block_header) {
-					Ok(()) => true,
+			.map(|tx| {
+				match self.engine.verify_transaction_basic(&tx, &best_block_header) {
 					Err(e) => {
 						debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", tx.hash(), e);
-						false
-					}
-				}
-			)
-			.map(|tx| match origin {
-				TransactionOrigin::Local | TransactionOrigin::RetractedBlock => {
-					transaction_queue.add(tx, origin, &fetch_account, &gas_required)
-				},
-				TransactionOrigin::External => {
-					transaction_queue.add_with_banlist(tx, &fetch_account, &gas_required)
+						Err(e)
+					},
+					Ok(()) => {
+						match origin {
+							TransactionOrigin::Local | TransactionOrigin::RetractedBlock => {
+								transaction_queue.add(tx, origin, &fetch_account, &gas_required)
+							},
+							TransactionOrigin::External => {
+								transaction_queue.add_with_banlist(tx, &fetch_account, &gas_required)
+							}
+						}
+					},
 				}
 			})
 			.collect()
--- a/ethstore/src/random.rs
+++ b/ethstore/src/random.rs
@ -47,7 +47,7 @@ impl Random for [u8; 32] {
 pub fn random_phrase(words: usize) -> String {
 	lazy_static! {
 		static ref WORDS: Vec<String> = String::from_utf8_lossy(include_bytes!("../res/wordlist.txt"))
-			.split("\n")
+			.lines()
 			.map(|s| s.to_owned())
 			.collect();
 	}
@ -55,8 +55,19 @@ pub fn random_phrase(words: usize) -> String {
 	(0..words).map(|_| rng.choose(&WORDS).unwrap()).join(" ")
 }

-#[test]
-fn should_produce_right_number_of_words() {
-	let p = random_phrase(10);
-	assert_eq!(p.split(" ").count(), 10);
-}
+#[cfg(test)]
+mod tests {
+	use super::random_phrase;
+
+	#[test]
+	fn should_produce_right_number_of_words() {
+		let p = random_phrase(10);
+		assert_eq!(p.split(" ").count(), 10);
+	}
+
+	#[test]
+	fn should_not_include_carriage_return() {
+		let p = random_phrase(10);
+		assert!(!p.contains('\r'), "Carriage return should be trimmed.");
+	}
+}
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 import React, { Component, PropTypes } from 'react';
+import { Checkbox } from 'material-ui';

 import { Form, Input } from '../../../ui';

@ -37,6 +38,7 @@ export default class RecoveryPhrase extends Component {
    password1Error: ERRORS.invalidPassword,
    password2: '',
    password2Error: ERRORS.noMatchPassword,
+    windowsPhrase: false,
    isValidPass: false,
    isValidName: false,
    isValidPhrase: false
@ -47,15 +49,13 @@ export default class RecoveryPhrase extends Component {
  }

  render () {
-    const { accountName, accountNameError, passwordHint, password1, password1Error, password2, password2Error, recoveryPhrase } = this.state;
+    const { accountName, accountNameError, passwordHint, password1, password1Error, password2, password2Error, recoveryPhrase, windowsPhrase } = this.state;

    return (
      <Form>
        <Input
          hint='the account recovery phrase'
          label='account recovery phrase'
-          multiLine
-          rows={ 1 }
          value={ recoveryPhrase }
          onChange={ this.onEditPhrase } />
        <Input
@ -88,20 +88,26 @@ export default class RecoveryPhrase extends Component {
              value={ password2 }
              onChange={ this.onEditPassword2 } />
          </div>
+          <Checkbox
+            className={ styles.checkbox }
+            label='Key was created with Parity <1.4.5 on Windows'
+            checked={ windowsPhrase }
+            onCheck={ this.onToggleWindowsPhrase } />
        </div>
      </Form>
    );
  }

  updateParent = () => {
-    const { isValidName, isValidPass, isValidPhrase, accountName, passwordHint, password1, recoveryPhrase } = this.state;
+    const { isValidName, isValidPass, isValidPhrase, accountName, passwordHint, password1, recoveryPhrase, windowsPhrase } = this.state;
    const isValid = isValidName && isValidPass && isValidPhrase;

    this.props.onChange(isValid, {
      name: accountName,
      passwordHint,
      password: password1,
-      phrase: recoveryPhrase
+      phrase: recoveryPhrase,
+      windowsPhrase
    });
  }

@ -111,18 +117,33 @@ export default class RecoveryPhrase extends Component {
    });
  }

-  onEditPhrase = (event) => {
-    const value = event.target.value;
-    let error = null;
+  onToggleWindowsPhrase = (event) => {
+    this.setState({
+      windowsPhrase: !this.state.windowsPhrase
+    }, this.updateParent);
+  }

-    if (!value || value.trim().length < 25) {
-      error = ERRORS.noPhrase;
+  onEditPhrase = (event) => {
+    const recoveryPhrase = event.target.value
+      .toLowerCase() // wordlists are lowercase
+      .trim() // remove whitespace at both ends
+      .replace(/\s/g, ' ') // replace any whitespace with single space
+      .replace(/ +/g, ' '); // replace multiple spaces with a single space
+
+    const phraseParts = recoveryPhrase
+      .split(' ')
+      .map((part) => part.trim())
+      .filter((part) => part.length);
+    let recoveryPhraseError = null;
+
+    if (!recoveryPhrase || recoveryPhrase.length < 25 || phraseParts.length < 8) {
+      recoveryPhraseError = ERRORS.noPhrase;
    }

    this.setState({
-      recoveryPhrase: value,
-      recoveryPhraseError: error,
-      isValidPhrase: !error
+      recoveryPhrase: phraseParts.join(' '),
+      recoveryPhraseError,
+      isValidPhrase: !recoveryPhraseError
    }, this.updateParent);
  }

--- a/js/src/modals/CreateAccount/createAccount.css
+++ b/js/src/modals/CreateAccount/createAccount.css
@ -14,6 +14,7 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 .spaced {
  line-height: 1.618em;
 }
@ -67,3 +68,7 @@
 .upload>div {
  margin-right: 0.5em;
 }
+
+.checkbox {
+  margin-top: 2em;
+}
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@ -59,6 +59,7 @@ export default class CreateAccount extends Component {
    passwordHint: null,
    password: null,
    phrase: null,
+    windowsPhrase: false,
    rawKey: null,
    json: null,
    canCreate: false,
@ -200,7 +201,7 @@ export default class CreateAccount extends Component {
  }

  onCreate = () => {
-    const { createType } = this.state;
+    const { createType, windowsPhrase } = this.state;
    const { api } = this.context;

    this.setState({
@ -208,8 +209,16 @@ export default class CreateAccount extends Component {
    });

    if (createType === 'fromNew' || createType === 'fromPhrase') {
+      let phrase = this.state.phrase;
+      if (createType === 'fromPhrase' && windowsPhrase) {
+        phrase = phrase
+          .split(' ') // get the words
+          .map((word) => word === 'misjudged' ? word : `${word}\r`) // add \r after each (except last in dict)
+          .join(' '); // re-create string
+      }
+
      return api.parity
-        .newAccountFromPhrase(this.state.phrase, this.state.password)
+        .newAccountFromPhrase(phrase, this.state.password)
        .then((address) => {
          this.setState({ address });
          return api.parity
@ -326,7 +335,7 @@ export default class CreateAccount extends Component {
    });
  }

-  onChangeDetails = (canCreate, { name, passwordHint, address, password, phrase, rawKey }) => {
+  onChangeDetails = (canCreate, { name, passwordHint, address, password, phrase, rawKey, windowsPhrase }) => {
    this.setState({
      canCreate,
      name,
@ -334,6 +343,7 @@ export default class CreateAccount extends Component {
      address,
      password,
      phrase,
+      windowsPhrase: windowsPhrase || false,
      rawKey
    });
  }
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@ -26,9 +26,8 @@ extern crate time;
 #[macro_use]
 extern crate lazy_static;

-use std::{env, thread};
+use std::{env, thread, fs};
 use std::sync::Arc;
-use std::fs::File;
 use std::io::Write;
 use isatty::{stderr_isatty, stdout_isatty};
 use env_logger::LogBuilder;
@ -80,9 +79,13 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
 	let enable_color = config.color && isatty;
 	let logs = Arc::new(RotatingLogger::new(levels));
 	let logger = logs.clone();
+	let mut open_options = fs::OpenOptions::new();

 	let maybe_file = match config.file.as_ref() {
-		Some(f) => Some(try!(File::create(f).map_err(|_| format!("Cannot write to log file given: {}", f)))),
+		Some(f) => Some(try!(open_options
+			.append(true).create(true).open(f)
+			.map_err(|_| format!("Cannot write to log file given: {}", f))
+		)),
 		None => None,
 	};

--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@ -578,7 +578,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.4.4</string>
+				<string>1.4.5</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 4
-!define VERSIONBUILD 4
+!define VERSIONBUILD 5
 !define ARGS "--warp"
 !define FIRST_START_ARGS "ui --warp --mode=passive"

--- a/parity/cli/config.full.toml
+++ b/parity/cli/config.full.toml
@ -66,7 +66,7 @@ reseal_on_txs = "all"
 reseal_min_period = 4000
 work_queue_size = 20
 relay_set = "cheap"
-usd_per_tx = "0"
+usd_per_tx = "0.0025"
 usd_per_eth = "auto"
 price_update_period = "hourly"
 gas_floor_target = "4700000"
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@ -189,7 +189,7 @@ usage! {
 			or |c: &Config| otry!(c.mining).tx_time_limit.clone().map(Some),
 		flag_relay_set: String = "cheap",
 			or |c: &Config| otry!(c.mining).relay_set.clone(),
-		flag_usd_per_tx: String = "0",
+		flag_usd_per_tx: String = "0.0025",
 			or |c: &Config| otry!(c.mining).usd_per_tx.clone(),
 		flag_usd_per_eth: String = "auto",
 			or |c: &Config| otry!(c.mining).usd_per_eth.clone(),
@ -566,7 +566,7 @@ mod tests {
 			flag_tx_gas_limit: Some("6283184".into()),
 			flag_tx_time_limit: Some(100u64),
 			flag_relay_set: "cheap".into(),
-			flag_usd_per_tx: "0".into(),
+			flag_usd_per_tx: "0.0025".into(),
 			flag_usd_per_eth: "auto".into(),
 			flag_price_update_period: "hourly".into(),
 			flag_gas_floor_target: "4700000".into(),
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@ -32,7 +32,7 @@ Operating Options:
                           (default: {flag_mode_alarm}).
  --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                           JSON chain specification file or olympic, frontier,
-                           homestead, mainnet, morden, classic, expanse or
+                           homestead, mainnet, ropsten, morden, classic, expanse or
                           testnet (default: {flag_chain}).
  -d --db-path PATH        Specify the database & configuration directory path
                           (default: {flag_db_path}).
@ -321,7 +321,7 @@ Miscellaneous Options:
  -l --logging LOGGING     Specify the logging level. Must conform to the same
                           format as RUST_LOG. (default: {flag_logging:?})
  --log-file FILENAME      Specify a filename into which logging should be
-                           directed. (default: {flag_log_file:?})
+                           appended. (default: {flag_log_file:?})
  --no-config              Don't load a configuration file.
  --no-color               Don't use terminal color codes in output. (default: {flag_no_color})
  -v --version             Show information about version.
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@ -315,7 +315,7 @@ impl Configuration {

 	fn chain(&self) -> String {
 		if self.args.flag_testnet {
-			"morden".to_owned()
+			"ropsten".to_owned()
 		} else {
 			self.args.flag_chain.clone()
 		}
@ -903,7 +903,7 @@ mod tests {
 		// then
 		assert_eq!(conf.network_settings(), NetworkSettings {
 			name: "testname".to_owned(),
-			chain: "morden".to_owned(),
+			chain: "ropsten".to_owned(),
 			network_port: 30303,
 			rpc_enabled: true,
 			rpc_interface: "local".to_owned(),
--- a/parity/params.rs
+++ b/parity/params.rs
@ -28,6 +28,7 @@ use user_defaults::UserDefaults;
 pub enum SpecType {
 	Mainnet,
 	Testnet,
+	Ropsten,
 	Olympic,
 	Classic,
 	Expanse,
@ -48,6 +49,7 @@ impl str::FromStr for SpecType {
 			"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
 			"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
 			"morden" | "testnet" => SpecType::Testnet,
+			"ropsten" => SpecType::Ropsten,
 			"olympic" => SpecType::Olympic,
 			"expanse" => SpecType::Expanse,
 			other => SpecType::Custom(other.into()),
@ -61,6 +63,7 @@ impl SpecType {
 		match *self {
 			SpecType::Mainnet => Ok(ethereum::new_frontier()),
 			SpecType::Testnet => Ok(ethereum::new_morden()),
+			SpecType::Ropsten => Ok(ethereum::new_ropsten()),
 			SpecType::Olympic => Ok(ethereum::new_olympic()),
 			SpecType::Classic => Ok(ethereum::new_classic()),
 			SpecType::Expanse => Ok(ethereum::new_expanse()),
@ -171,7 +174,7 @@ pub enum GasPricerConfig {
 impl Default for GasPricerConfig {
 	fn default() -> Self {
 		GasPricerConfig::Calibrated {
-			usd_per_tx: 0f32,
+			usd_per_tx: 0.0025f32,
 			recalibration_period: Duration::from_secs(3600),
 		}
 	}
@ -282,6 +285,7 @@ mod tests {
 		assert_eq!(SpecType::Mainnet, "mainnet".parse().unwrap());
 		assert_eq!(SpecType::Testnet, "testnet".parse().unwrap());
 		assert_eq!(SpecType::Testnet, "morden".parse().unwrap());
+		assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
 		assert_eq!(SpecType::Olympic, "olympic".parse().unwrap());
 	}

--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.4.4"
+version = "1.4.5"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"

--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@ -7,7 +7,7 @@ version = "1.4.0"
 authors = ["Ethcore <admin@ethcore.io>"]

 [dependencies]
-mio = { git = "https://github.com/carllerche/mio" }
+mio = { git = "https://github.com/ethcore/mio" }
 crossbeam = "0.2"
 parking_lot = "0.3"
 log = "0.3"
--- a/util/network/Cargo.toml
+++ b/util/network/Cargo.toml
@ -8,7 +8,7 @@ authors = ["Ethcore <admin@ethcore.io>"]

 [dependencies]
 log = "0.3"
-mio = { git = "https://github.com/carllerche/mio" }
+mio = { git = "https://github.com/ethcore/mio" }
 bytes = "0.3.0"
 rand = "0.3.12"
 time = "0.1.34"