Merge branch 'master' into jg-signer-api-queries-2
This commit is contained in:
Jaco Greeff
commit
a475c2166c
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1263,7 +1263,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "parity-ui-precompiled"
|
name = "parity-ui-precompiled"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
source = "git+https://github.com/ethcore/js-precompiled.git#587684374a12bf715151dd987a552a3d61e42972"
|
source = "git+https://github.com/ethcore/js-precompiled.git#f46188126257e03c775e76a3cea82b5f70549400"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -21,8 +21,8 @@
|
|||||||
"genesis": {
|
"genesis": {
|
||||||
"seal": {
|
"seal": {
|
||||||
"generic": {
|
"generic": {
|
||||||
"fields": 1,
|
"fields": 2,
|
||||||
"rlp": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"
|
"rlp": "0x200"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"difficulty": "0x20000",
|
"difficulty": "0x20000",
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
"difficultyBoundDivisor": "0x0800",
|
"difficultyBoundDivisor": "0x0800",
|
||||||
"durationLimit": "0x0d",
|
"durationLimit": "0x0d",
|
||||||
"blockReward": "0x4563918244F40000",
|
"blockReward": "0x4563918244F40000",
|
||||||
"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
|
"registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2",
|
||||||
"homesteadTransition": 0,
|
"homesteadTransition": 0,
|
||||||
"eip150Transition": 0,
|
"eip150Transition": 0,
|
||||||
"eip155Transition": 10,
|
"eip155Transition": 10,
|
||||||
@ -47,258 +47,258 @@
|
|||||||
"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
|
"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 } } } },
|
"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 } } } },
|
"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
|
||||||
"0000000000000000000000000000000000000000": { "balance": "1" },
|
"0000000000000000000000000000000000000000": { "balance": "1" },
|
||||||
"0000000000000000000000000000000000000005": { "balance": "1" },
|
"0000000000000000000000000000000000000005": { "balance": "1" },
|
||||||
"0000000000000000000000000000000000000006": { "balance": "1" },
|
"0000000000000000000000000000000000000006": { "balance": "1" },
|
||||||
"0000000000000000000000000000000000000007": { "balance": "1" },
|
"0000000000000000000000000000000000000007": { "balance": "1" },
|
||||||
"0000000000000000000000000000000000000008": { "balance": "1" },
|
"0000000000000000000000000000000000000008": { "balance": "1" },
|
||||||
"0000000000000000000000000000000000000009": { "balance": "1" },
|
"0000000000000000000000000000000000000009": { "balance": "1" },
|
||||||
"000000000000000000000000000000000000000a": { "balance": "0" },
|
"000000000000000000000000000000000000000a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000000b": { "balance": "0" },
|
"000000000000000000000000000000000000000b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000000c": { "balance": "0" },
|
"000000000000000000000000000000000000000c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000000d": { "balance": "0" },
|
"000000000000000000000000000000000000000d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000000e": { "balance": "0" },
|
"000000000000000000000000000000000000000e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000000f": { "balance": "0" },
|
"000000000000000000000000000000000000000f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000010": { "balance": "0" },
|
"0000000000000000000000000000000000000010": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000011": { "balance": "0" },
|
"0000000000000000000000000000000000000011": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000012": { "balance": "0" },
|
"0000000000000000000000000000000000000012": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000013": { "balance": "0" },
|
"0000000000000000000000000000000000000013": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000014": { "balance": "0" },
|
"0000000000000000000000000000000000000014": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000015": { "balance": "0" },
|
"0000000000000000000000000000000000000015": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000016": { "balance": "0" },
|
"0000000000000000000000000000000000000016": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000017": { "balance": "0" },
|
"0000000000000000000000000000000000000017": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000018": { "balance": "0" },
|
"0000000000000000000000000000000000000018": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000019": { "balance": "0" },
|
"0000000000000000000000000000000000000019": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001a": { "balance": "0" },
|
"000000000000000000000000000000000000001a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001b": { "balance": "0" },
|
"000000000000000000000000000000000000001b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001c": { "balance": "0" },
|
"000000000000000000000000000000000000001c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001d": { "balance": "0" },
|
"000000000000000000000000000000000000001d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001e": { "balance": "0" },
|
"000000000000000000000000000000000000001e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000001f": { "balance": "0" },
|
"000000000000000000000000000000000000001f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000020": { "balance": "0" },
|
"0000000000000000000000000000000000000020": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000021": { "balance": "0" },
|
"0000000000000000000000000000000000000021": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000022": { "balance": "0" },
|
"0000000000000000000000000000000000000022": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000023": { "balance": "0" },
|
"0000000000000000000000000000000000000023": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000024": { "balance": "0" },
|
"0000000000000000000000000000000000000024": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000025": { "balance": "0" },
|
"0000000000000000000000000000000000000025": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000026": { "balance": "0" },
|
"0000000000000000000000000000000000000026": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000027": { "balance": "0" },
|
"0000000000000000000000000000000000000027": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000028": { "balance": "0" },
|
"0000000000000000000000000000000000000028": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000029": { "balance": "0" },
|
"0000000000000000000000000000000000000029": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002a": { "balance": "0" },
|
"000000000000000000000000000000000000002a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002b": { "balance": "0" },
|
"000000000000000000000000000000000000002b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002c": { "balance": "0" },
|
"000000000000000000000000000000000000002c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002d": { "balance": "0" },
|
"000000000000000000000000000000000000002d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002e": { "balance": "0" },
|
"000000000000000000000000000000000000002e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000002f": { "balance": "0" },
|
"000000000000000000000000000000000000002f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000030": { "balance": "0" },
|
"0000000000000000000000000000000000000030": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000031": { "balance": "0" },
|
"0000000000000000000000000000000000000031": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000032": { "balance": "0" },
|
"0000000000000000000000000000000000000032": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000033": { "balance": "0" },
|
"0000000000000000000000000000000000000033": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000034": { "balance": "0" },
|
"0000000000000000000000000000000000000034": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000035": { "balance": "0" },
|
"0000000000000000000000000000000000000035": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000036": { "balance": "0" },
|
"0000000000000000000000000000000000000036": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000037": { "balance": "0" },
|
"0000000000000000000000000000000000000037": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000038": { "balance": "0" },
|
"0000000000000000000000000000000000000038": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000039": { "balance": "0" },
|
"0000000000000000000000000000000000000039": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003a": { "balance": "0" },
|
"000000000000000000000000000000000000003a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003b": { "balance": "0" },
|
"000000000000000000000000000000000000003b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003c": { "balance": "0" },
|
"000000000000000000000000000000000000003c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003d": { "balance": "0" },
|
"000000000000000000000000000000000000003d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003e": { "balance": "0" },
|
"000000000000000000000000000000000000003e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000003f": { "balance": "0" },
|
"000000000000000000000000000000000000003f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000040": { "balance": "0" },
|
"0000000000000000000000000000000000000040": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000041": { "balance": "0" },
|
"0000000000000000000000000000000000000041": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000042": { "balance": "0" },
|
"0000000000000000000000000000000000000042": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000043": { "balance": "0" },
|
"0000000000000000000000000000000000000043": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000044": { "balance": "0" },
|
"0000000000000000000000000000000000000044": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000045": { "balance": "0" },
|
"0000000000000000000000000000000000000045": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000046": { "balance": "0" },
|
"0000000000000000000000000000000000000046": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000047": { "balance": "0" },
|
"0000000000000000000000000000000000000047": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000048": { "balance": "0" },
|
"0000000000000000000000000000000000000048": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000049": { "balance": "0" },
|
"0000000000000000000000000000000000000049": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004a": { "balance": "0" },
|
"000000000000000000000000000000000000004a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004b": { "balance": "0" },
|
"000000000000000000000000000000000000004b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004c": { "balance": "0" },
|
"000000000000000000000000000000000000004c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004d": { "balance": "0" },
|
"000000000000000000000000000000000000004d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004e": { "balance": "0" },
|
"000000000000000000000000000000000000004e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000004f": { "balance": "0" },
|
"000000000000000000000000000000000000004f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000050": { "balance": "0" },
|
"0000000000000000000000000000000000000050": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000051": { "balance": "0" },
|
"0000000000000000000000000000000000000051": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000052": { "balance": "0" },
|
"0000000000000000000000000000000000000052": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000053": { "balance": "0" },
|
"0000000000000000000000000000000000000053": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000054": { "balance": "0" },
|
"0000000000000000000000000000000000000054": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000055": { "balance": "0" },
|
"0000000000000000000000000000000000000055": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000056": { "balance": "0" },
|
"0000000000000000000000000000000000000056": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000057": { "balance": "0" },
|
"0000000000000000000000000000000000000057": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000058": { "balance": "0" },
|
"0000000000000000000000000000000000000058": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000059": { "balance": "0" },
|
"0000000000000000000000000000000000000059": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005a": { "balance": "0" },
|
"000000000000000000000000000000000000005a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005b": { "balance": "0" },
|
"000000000000000000000000000000000000005b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005c": { "balance": "0" },
|
"000000000000000000000000000000000000005c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005d": { "balance": "0" },
|
"000000000000000000000000000000000000005d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005e": { "balance": "0" },
|
"000000000000000000000000000000000000005e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000005f": { "balance": "0" },
|
"000000000000000000000000000000000000005f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000060": { "balance": "0" },
|
"0000000000000000000000000000000000000060": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000061": { "balance": "0" },
|
"0000000000000000000000000000000000000061": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000062": { "balance": "0" },
|
"0000000000000000000000000000000000000062": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000063": { "balance": "0" },
|
"0000000000000000000000000000000000000063": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000064": { "balance": "0" },
|
"0000000000000000000000000000000000000064": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000065": { "balance": "0" },
|
"0000000000000000000000000000000000000065": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000066": { "balance": "0" },
|
"0000000000000000000000000000000000000066": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000067": { "balance": "0" },
|
"0000000000000000000000000000000000000067": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000068": { "balance": "0" },
|
"0000000000000000000000000000000000000068": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000069": { "balance": "0" },
|
"0000000000000000000000000000000000000069": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006a": { "balance": "0" },
|
"000000000000000000000000000000000000006a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006b": { "balance": "0" },
|
"000000000000000000000000000000000000006b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006c": { "balance": "0" },
|
"000000000000000000000000000000000000006c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006d": { "balance": "0" },
|
"000000000000000000000000000000000000006d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006e": { "balance": "0" },
|
"000000000000000000000000000000000000006e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000006f": { "balance": "0" },
|
"000000000000000000000000000000000000006f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000070": { "balance": "0" },
|
"0000000000000000000000000000000000000070": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000071": { "balance": "0" },
|
"0000000000000000000000000000000000000071": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000072": { "balance": "0" },
|
"0000000000000000000000000000000000000072": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000073": { "balance": "0" },
|
"0000000000000000000000000000000000000073": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000074": { "balance": "0" },
|
"0000000000000000000000000000000000000074": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000075": { "balance": "0" },
|
"0000000000000000000000000000000000000075": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000076": { "balance": "0" },
|
"0000000000000000000000000000000000000076": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000077": { "balance": "0" },
|
"0000000000000000000000000000000000000077": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000078": { "balance": "0" },
|
"0000000000000000000000000000000000000078": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000079": { "balance": "0" },
|
"0000000000000000000000000000000000000079": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007a": { "balance": "0" },
|
"000000000000000000000000000000000000007a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007b": { "balance": "0" },
|
"000000000000000000000000000000000000007b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007c": { "balance": "0" },
|
"000000000000000000000000000000000000007c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007d": { "balance": "0" },
|
"000000000000000000000000000000000000007d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007e": { "balance": "0" },
|
"000000000000000000000000000000000000007e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000007f": { "balance": "0" },
|
"000000000000000000000000000000000000007f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000080": { "balance": "0" },
|
"0000000000000000000000000000000000000080": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000081": { "balance": "0" },
|
"0000000000000000000000000000000000000081": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000082": { "balance": "0" },
|
"0000000000000000000000000000000000000082": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000083": { "balance": "0" },
|
"0000000000000000000000000000000000000083": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000084": { "balance": "0" },
|
"0000000000000000000000000000000000000084": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000085": { "balance": "0" },
|
"0000000000000000000000000000000000000085": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000086": { "balance": "0" },
|
"0000000000000000000000000000000000000086": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000087": { "balance": "0" },
|
"0000000000000000000000000000000000000087": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000088": { "balance": "0" },
|
"0000000000000000000000000000000000000088": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000089": { "balance": "0" },
|
"0000000000000000000000000000000000000089": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008a": { "balance": "0" },
|
"000000000000000000000000000000000000008a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008b": { "balance": "0" },
|
"000000000000000000000000000000000000008b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008c": { "balance": "0" },
|
"000000000000000000000000000000000000008c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008d": { "balance": "0" },
|
"000000000000000000000000000000000000008d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008e": { "balance": "0" },
|
"000000000000000000000000000000000000008e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000008f": { "balance": "0" },
|
"000000000000000000000000000000000000008f": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000090": { "balance": "0" },
|
"0000000000000000000000000000000000000090": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000091": { "balance": "0" },
|
"0000000000000000000000000000000000000091": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000092": { "balance": "0" },
|
"0000000000000000000000000000000000000092": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000093": { "balance": "0" },
|
"0000000000000000000000000000000000000093": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000094": { "balance": "0" },
|
"0000000000000000000000000000000000000094": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000095": { "balance": "0" },
|
"0000000000000000000000000000000000000095": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000096": { "balance": "0" },
|
"0000000000000000000000000000000000000096": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000097": { "balance": "0" },
|
"0000000000000000000000000000000000000097": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000098": { "balance": "0" },
|
"0000000000000000000000000000000000000098": { "balance": "0" },
|
||||||
"0000000000000000000000000000000000000099": { "balance": "0" },
|
"0000000000000000000000000000000000000099": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009a": { "balance": "0" },
|
"000000000000000000000000000000000000009a": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009b": { "balance": "0" },
|
"000000000000000000000000000000000000009b": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009c": { "balance": "0" },
|
"000000000000000000000000000000000000009c": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009d": { "balance": "0" },
|
"000000000000000000000000000000000000009d": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009e": { "balance": "0" },
|
"000000000000000000000000000000000000009e": { "balance": "0" },
|
||||||
"000000000000000000000000000000000000009f": { "balance": "0" },
|
"000000000000000000000000000000000000009f": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a0": { "balance": "0" },
|
"00000000000000000000000000000000000000a0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a1": { "balance": "0" },
|
"00000000000000000000000000000000000000a1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a2": { "balance": "0" },
|
"00000000000000000000000000000000000000a2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a3": { "balance": "0" },
|
"00000000000000000000000000000000000000a3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a4": { "balance": "0" },
|
"00000000000000000000000000000000000000a4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a5": { "balance": "0" },
|
"00000000000000000000000000000000000000a5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a6": { "balance": "0" },
|
"00000000000000000000000000000000000000a6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a7": { "balance": "0" },
|
"00000000000000000000000000000000000000a7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a8": { "balance": "0" },
|
"00000000000000000000000000000000000000a8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000a9": { "balance": "0" },
|
"00000000000000000000000000000000000000a9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000aa": { "balance": "0" },
|
"00000000000000000000000000000000000000aa": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ab": { "balance": "0" },
|
"00000000000000000000000000000000000000ab": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ac": { "balance": "0" },
|
"00000000000000000000000000000000000000ac": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ad": { "balance": "0" },
|
"00000000000000000000000000000000000000ad": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ae": { "balance": "0" },
|
"00000000000000000000000000000000000000ae": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000af": { "balance": "0" },
|
"00000000000000000000000000000000000000af": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b0": { "balance": "0" },
|
"00000000000000000000000000000000000000b0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b1": { "balance": "0" },
|
"00000000000000000000000000000000000000b1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b2": { "balance": "0" },
|
"00000000000000000000000000000000000000b2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b3": { "balance": "0" },
|
"00000000000000000000000000000000000000b3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b4": { "balance": "0" },
|
"00000000000000000000000000000000000000b4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b5": { "balance": "0" },
|
"00000000000000000000000000000000000000b5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b6": { "balance": "0" },
|
"00000000000000000000000000000000000000b6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b7": { "balance": "0" },
|
"00000000000000000000000000000000000000b7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b8": { "balance": "0" },
|
"00000000000000000000000000000000000000b8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000b9": { "balance": "0" },
|
"00000000000000000000000000000000000000b9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ba": { "balance": "0" },
|
"00000000000000000000000000000000000000ba": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000bb": { "balance": "0" },
|
"00000000000000000000000000000000000000bb": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000bc": { "balance": "0" },
|
"00000000000000000000000000000000000000bc": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000bd": { "balance": "0" },
|
"00000000000000000000000000000000000000bd": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000be": { "balance": "0" },
|
"00000000000000000000000000000000000000be": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000bf": { "balance": "0" },
|
"00000000000000000000000000000000000000bf": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c0": { "balance": "0" },
|
"00000000000000000000000000000000000000c0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c1": { "balance": "0" },
|
"00000000000000000000000000000000000000c1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c2": { "balance": "0" },
|
"00000000000000000000000000000000000000c2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c3": { "balance": "0" },
|
"00000000000000000000000000000000000000c3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c4": { "balance": "0" },
|
"00000000000000000000000000000000000000c4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c5": { "balance": "0" },
|
"00000000000000000000000000000000000000c5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c6": { "balance": "0" },
|
"00000000000000000000000000000000000000c6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c7": { "balance": "0" },
|
"00000000000000000000000000000000000000c7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c8": { "balance": "0" },
|
"00000000000000000000000000000000000000c8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000c9": { "balance": "0" },
|
"00000000000000000000000000000000000000c9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ca": { "balance": "0" },
|
"00000000000000000000000000000000000000ca": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000cb": { "balance": "0" },
|
"00000000000000000000000000000000000000cb": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000cc": { "balance": "0" },
|
"00000000000000000000000000000000000000cc": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000cd": { "balance": "0" },
|
"00000000000000000000000000000000000000cd": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ce": { "balance": "0" },
|
"00000000000000000000000000000000000000ce": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000cf": { "balance": "0" },
|
"00000000000000000000000000000000000000cf": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d0": { "balance": "0" },
|
"00000000000000000000000000000000000000d0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d1": { "balance": "0" },
|
"00000000000000000000000000000000000000d1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d2": { "balance": "0" },
|
"00000000000000000000000000000000000000d2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d3": { "balance": "0" },
|
"00000000000000000000000000000000000000d3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d4": { "balance": "0" },
|
"00000000000000000000000000000000000000d4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d5": { "balance": "0" },
|
"00000000000000000000000000000000000000d5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d6": { "balance": "0" },
|
"00000000000000000000000000000000000000d6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d7": { "balance": "0" },
|
"00000000000000000000000000000000000000d7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d8": { "balance": "0" },
|
"00000000000000000000000000000000000000d8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000d9": { "balance": "0" },
|
"00000000000000000000000000000000000000d9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000da": { "balance": "0" },
|
"00000000000000000000000000000000000000da": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000db": { "balance": "0" },
|
"00000000000000000000000000000000000000db": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000dc": { "balance": "0" },
|
"00000000000000000000000000000000000000dc": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000dd": { "balance": "0" },
|
"00000000000000000000000000000000000000dd": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000de": { "balance": "0" },
|
"00000000000000000000000000000000000000de": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000df": { "balance": "0" },
|
"00000000000000000000000000000000000000df": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e0": { "balance": "0" },
|
"00000000000000000000000000000000000000e0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e1": { "balance": "0" },
|
"00000000000000000000000000000000000000e1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e2": { "balance": "0" },
|
"00000000000000000000000000000000000000e2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e3": { "balance": "0" },
|
"00000000000000000000000000000000000000e3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e4": { "balance": "0" },
|
"00000000000000000000000000000000000000e4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e5": { "balance": "0" },
|
"00000000000000000000000000000000000000e5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e6": { "balance": "0" },
|
"00000000000000000000000000000000000000e6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e7": { "balance": "0" },
|
"00000000000000000000000000000000000000e7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e8": { "balance": "0" },
|
"00000000000000000000000000000000000000e8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000e9": { "balance": "0" },
|
"00000000000000000000000000000000000000e9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ea": { "balance": "0" },
|
"00000000000000000000000000000000000000ea": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000eb": { "balance": "0" },
|
"00000000000000000000000000000000000000eb": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ec": { "balance": "0" },
|
"00000000000000000000000000000000000000ec": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ed": { "balance": "0" },
|
"00000000000000000000000000000000000000ed": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ee": { "balance": "0" },
|
"00000000000000000000000000000000000000ee": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ef": { "balance": "0" },
|
"00000000000000000000000000000000000000ef": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f0": { "balance": "0" },
|
"00000000000000000000000000000000000000f0": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f1": { "balance": "0" },
|
"00000000000000000000000000000000000000f1": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f2": { "balance": "0" },
|
"00000000000000000000000000000000000000f2": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f3": { "balance": "0" },
|
"00000000000000000000000000000000000000f3": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f4": { "balance": "0" },
|
"00000000000000000000000000000000000000f4": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f5": { "balance": "0" },
|
"00000000000000000000000000000000000000f5": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f6": { "balance": "0" },
|
"00000000000000000000000000000000000000f6": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f7": { "balance": "0" },
|
"00000000000000000000000000000000000000f7": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f8": { "balance": "0" },
|
"00000000000000000000000000000000000000f8": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000f9": { "balance": "0" },
|
"00000000000000000000000000000000000000f9": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000fa": { "balance": "0" },
|
"00000000000000000000000000000000000000fa": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000fb": { "balance": "0" },
|
"00000000000000000000000000000000000000fb": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000fc": { "balance": "0" },
|
"00000000000000000000000000000000000000fc": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000fd": { "balance": "0" },
|
"00000000000000000000000000000000000000fd": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000fe": { "balance": "0" },
|
"00000000000000000000000000000000000000fe": { "balance": "0" },
|
||||||
"00000000000000000000000000000000000000ff": { "balance": "0" },
|
"00000000000000000000000000000000000000ff": { "balance": "0" },
|
||||||
"874b54a8bd152966d63f706bae1ffeb0411921e5": { "balance": "1000000000000000000000000000000" }
|
"874b54a8bd152966d63f706bae1ffeb0411921e5": { "balance": "1000000000000000000000000000000" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,9 +11,9 @@
|
|||||||
},
|
},
|
||||||
"genesis": {
|
"genesis": {
|
||||||
"seal": {
|
"seal": {
|
||||||
"ethereum": {
|
"generic": {
|
||||||
"nonce": "0x00006d6f7264656e",
|
"fields": 0,
|
||||||
"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
|
"rlp": "0x0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"difficulty": "0x20000",
|
"difficulty": "0x20000",
|
||||||
|
|||||||
@ -254,8 +254,8 @@ impl Engine for AuthorityRound {
|
|||||||
|
|
||||||
/// Check if the signature belongs to the correct proposer.
|
/// Check if the signature belongs to the correct proposer.
|
||||||
fn verify_block_unordered(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
|
fn verify_block_unordered(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
|
||||||
let header_step = try!(header_step(header));
|
let header_step = try!(header_step(header));
|
||||||
// Give one step slack if step is lagging, double vote is still not possible.
|
// Give one step slack if step is lagging, double vote is still not possible.
|
||||||
if header_step <= self.step() + 1 {
|
if header_step <= self.step() + 1 {
|
||||||
let proposer_signature = try!(header_signature(header));
|
let proposer_signature = try!(header_signature(header));
|
||||||
let ok_sig = try!(verify_address(self.step_proposer(header_step), &proposer_signature, &header.bare_hash()));
|
let ok_sig = try!(verify_address(self.step_proposer(header_step), &proposer_signature, &header.bare_hash()));
|
||||||
@ -417,13 +417,13 @@ mod tests {
|
|||||||
let engine = Spec::new_test_round().engine;
|
let engine = Spec::new_test_round().engine;
|
||||||
|
|
||||||
let signature = tap.sign(addr, Some("0".into()), header.bare_hash()).unwrap();
|
let signature = tap.sign(addr, Some("0".into()), header.bare_hash()).unwrap();
|
||||||
let mut step = UNIX_EPOCH.elapsed().unwrap().as_secs();
|
let time = UNIX_EPOCH.elapsed().unwrap().as_secs();
|
||||||
|
// Two authorities.
|
||||||
|
let mut step = time - time % 2;
|
||||||
header.set_seal(vec![encode(&step).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
|
header.set_seal(vec![encode(&step).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
|
||||||
let first_ok = engine.verify_block_seal(&header).is_ok();
|
assert!(engine.verify_block_seal(&header).is_err());
|
||||||
step = step + 1;
|
step = step + 1;
|
||||||
header.set_seal(vec![encode(&step).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
|
header.set_seal(vec![encode(&step).to_vec(), encode(&(&*signature as &[u8])).to_vec()]);
|
||||||
let second_ok = engine.verify_block_seal(&header).is_ok();
|
assert!(engine.verify_block_seal(&header).is_ok());
|
||||||
|
|
||||||
assert!(first_ok ^ second_ok);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "parity.js",
|
"name": "parity.js",
|
||||||
"version": "0.2.58",
|
"version": "0.2.61",
|
||||||
"main": "release/index.js",
|
"main": "release/index.js",
|
||||||
"jsnext:main": "src/index.js",
|
"jsnext:main": "src/index.js",
|
||||||
"author": "Parity Team <admin@parity.io>",
|
"author": "Parity Team <admin@parity.io>",
|
||||||
|
|||||||
@ -14,9 +14,10 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import { stringify } from 'querystring';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
export default (
|
export const termsOfService = (
|
||||||
<ul>
|
<ul>
|
||||||
<li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
|
<li>This privacy notice relates to your use of the Parity SMS verification service. We take your privacy seriously and deal in an honest, direct and transparent way when it comes to your data.</li>
|
||||||
<li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
|
<li>We collect your phone number when you use this service. This is temporarily kept in memory, and then encrypted and stored in our EU servers. We only retain the cryptographic hash of the number to prevent duplicated accounts. You consent to this use.</li>
|
||||||
@ -25,3 +26,18 @@ export default (
|
|||||||
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
|
<li><i>Parity Technology Limited</i> is registered in England and Wales under company number <code>09760015</code> and complies with the Data Protection Act 1998 (UK). You may contact us via email at <a href={ 'mailto:admin@parity.io' }>admin@parity.io</a>. Our general privacy policy can be found here: <a href={ 'https://ethcore.io/legal.html' }>https://ethcore.io/legal.html</a>.</li>
|
||||||
</ul>
|
</ul>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
export const postToServer = (query) => {
|
||||||
|
query = stringify(query);
|
||||||
|
return fetch('https://sms-verification.parity.io/?' + query, {
|
||||||
|
method: 'POST', mode: 'cors', cache: 'no-store'
|
||||||
|
})
|
||||||
|
.then((res) => {
|
||||||
|
return res.json().then((data) => {
|
||||||
|
if (res.ok) {
|
||||||
|
return data.message;
|
||||||
|
}
|
||||||
|
throw new Error(data.message || 'unknown error');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
};
|
||||||
@ -14,8 +14,6 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import { stringify } from 'querystring';
|
|
||||||
|
|
||||||
export const checkIfVerified = (contract, account) => {
|
export const checkIfVerified = (contract, account) => {
|
||||||
return contract.instance.certified.call({}, [account]);
|
return contract.instance.certified.call({}, [account]);
|
||||||
};
|
};
|
||||||
@ -35,18 +33,3 @@ export const checkIfRequested = (contract, account) => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
export const postToServer = (query) => {
|
|
||||||
query = stringify(query);
|
|
||||||
return fetch('https://sms-verification.parity.io/?' + query, {
|
|
||||||
method: 'POST', mode: 'cors', cache: 'no-store'
|
|
||||||
})
|
|
||||||
.then((res) => {
|
|
||||||
return res.json().then((data) => {
|
|
||||||
if (res.ok) {
|
|
||||||
return data.message;
|
|
||||||
}
|
|
||||||
throw new Error(data.message || 'unknown error');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|||||||
@ -77,7 +77,7 @@ export default class Lookup extends Component {
|
|||||||
label='Lookup'
|
label='Lookup'
|
||||||
primary
|
primary
|
||||||
icon={ <SearchIcon /> }
|
icon={ <SearchIcon /> }
|
||||||
onClick={ this.onLookupClick }
|
onTouchTap={ this.onLookupClick }
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<CardText>{ output }</CardText>
|
<CardText>{ output }</CardText>
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// You should have received a copy of the GNU General Public License
|
||||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import { sha3 } from '../parity.js';
|
import { sha3, api } from '../parity.js';
|
||||||
|
|
||||||
const alreadyQueued = (queue, action, name) =>
|
const alreadyQueued = (queue, action, name) =>
|
||||||
!!queue.find((entry) => entry.action === action && entry.name === name);
|
!!queue.find((entry) => entry.action === action && entry.name === name);
|
||||||
@ -43,14 +43,23 @@ export const reserve = (name) => (dispatch, getState) => {
|
|||||||
const values = [ sha3(name) ];
|
const values = [ sha3(name) ];
|
||||||
|
|
||||||
dispatch(reserveStart(name));
|
dispatch(reserveStart(name));
|
||||||
|
|
||||||
reserve.estimateGas(options, values)
|
reserve.estimateGas(options, values)
|
||||||
.then((gas) => {
|
.then((gas) => {
|
||||||
options.gas = gas.mul(1.2).toFixed(0);
|
options.gas = gas.mul(1.2).toFixed(0);
|
||||||
return reserve.postTransaction(options, values);
|
return reserve.postTransaction(options, values);
|
||||||
})
|
})
|
||||||
.then((data) => {
|
.then((requestId) => {
|
||||||
|
return api.pollMethod('parity_checkRequest', requestId);
|
||||||
|
})
|
||||||
|
.then((txhash) => {
|
||||||
dispatch(reserveSuccess(name));
|
dispatch(reserveSuccess(name));
|
||||||
}).catch((err) => {
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
if (err && err.type === 'REQUEST_REJECTED') {
|
||||||
|
return dispatch(reserveFail(name));
|
||||||
|
}
|
||||||
|
|
||||||
console.error(`could not reserve ${name}`);
|
console.error(`could not reserve ${name}`);
|
||||||
if (err) console.error(err.stack);
|
if (err) console.error(err.stack);
|
||||||
dispatch(reserveFail(name));
|
dispatch(reserveFail(name));
|
||||||
@ -81,9 +90,17 @@ export const drop = (name) => (dispatch, getState) => {
|
|||||||
options.gas = gas.mul(1.2).toFixed(0);
|
options.gas = gas.mul(1.2).toFixed(0);
|
||||||
return drop.postTransaction(options, values);
|
return drop.postTransaction(options, values);
|
||||||
})
|
})
|
||||||
.then((data) => {
|
.then((requestId) => {
|
||||||
|
return api.pollMethod('parity_checkRequest', requestId);
|
||||||
|
})
|
||||||
|
.then((txhash) => {
|
||||||
dispatch(dropSuccess(name));
|
dispatch(dropSuccess(name));
|
||||||
}).catch((err) => {
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
if (err && err.type === 'REQUEST_REJECTED') {
|
||||||
|
dispatch(reserveFail(name));
|
||||||
|
}
|
||||||
|
|
||||||
console.error(`could not drop ${name}`);
|
console.error(`could not drop ${name}`);
|
||||||
if (err) console.error(err.stack);
|
if (err) console.error(err.stack);
|
||||||
dispatch(reserveFail(name));
|
dispatch(reserveFail(name));
|
||||||
|
|||||||
@ -86,6 +86,22 @@ export default class Names extends Component {
|
|||||||
name: ''
|
name: ''
|
||||||
};
|
};
|
||||||
|
|
||||||
|
componentWillReceiveProps (nextProps) {
|
||||||
|
const nextQueue = nextProps.queue;
|
||||||
|
const prevQueue = this.props.queue;
|
||||||
|
|
||||||
|
if (nextQueue.length > prevQueue.length) {
|
||||||
|
const newQueued = nextQueue[nextQueue.length - 1];
|
||||||
|
const newName = newQueued.name;
|
||||||
|
|
||||||
|
if (newName !== this.state.name) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState({ name: '' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { action, name } = this.state;
|
const { action, name } = this.state;
|
||||||
const { fee, pending, queue } = this.props;
|
const { fee, pending, queue } = this.props;
|
||||||
@ -120,7 +136,7 @@ export default class Names extends Component {
|
|||||||
label={ action === 'reserve' ? 'Reserve' : 'Drop' }
|
label={ action === 'reserve' ? 'Reserve' : 'Drop' }
|
||||||
primary
|
primary
|
||||||
icon={ <CheckIcon /> }
|
icon={ <CheckIcon /> }
|
||||||
onClick={ this.onSubmitClick }
|
onTouchTap={ this.onSubmitClick }
|
||||||
/>
|
/>
|
||||||
{ queue.length > 0
|
{ queue.length > 0
|
||||||
? (<div>{ useSignerText }{ renderQueue(queue) }</div>)
|
? (<div>{ useSignerText }{ renderQueue(queue) }</div>)
|
||||||
|
|||||||
@ -52,7 +52,7 @@ export default class Records extends Component {
|
|||||||
label='Save'
|
label='Save'
|
||||||
primary
|
primary
|
||||||
icon={ <SaveIcon /> }
|
icon={ <SaveIcon /> }
|
||||||
onClick={ this.onSaveClick }
|
onTouchTap={ this.onSaveClick }
|
||||||
/>
|
/>
|
||||||
</CardText>
|
</CardText>
|
||||||
</Card>
|
</Card>
|
||||||
|
|||||||
@ -174,7 +174,7 @@ export default class LoadContract extends Component {
|
|||||||
const secondaryText = description || `Saved ${moment(timestamp).fromNow()}`;
|
const secondaryText = description || `Saved ${moment(timestamp).fromNow()}`;
|
||||||
const remove = removable
|
const remove = removable
|
||||||
? (
|
? (
|
||||||
<IconButton onClick={ onDelete }>
|
<IconButton onTouchTap={ onDelete }>
|
||||||
<DeleteIcon />
|
<DeleteIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import ErrorIcon from 'material-ui/svg-icons/navigation/close';
|
|||||||
import { fromWei } from '../../../api/util/wei';
|
import { fromWei } from '../../../api/util/wei';
|
||||||
import { Form, Input } from '../../../ui';
|
import { Form, Input } from '../../../ui';
|
||||||
|
|
||||||
import terms from '../terms-of-service';
|
import { termsOfService } from '../../../3rdparty/sms-verification';
|
||||||
import styles from './gatherData.css';
|
import styles from './gatherData.css';
|
||||||
|
|
||||||
export default class GatherData extends Component {
|
export default class GatherData extends Component {
|
||||||
@ -66,7 +66,7 @@ export default class GatherData extends Component {
|
|||||||
disabled={ isVerified }
|
disabled={ isVerified }
|
||||||
onCheck={ this.consentOnChange }
|
onCheck={ this.consentOnChange }
|
||||||
/>
|
/>
|
||||||
<div className={ styles.terms }>{ terms }</div>
|
<div className={ styles.terms }>{ termsOfService }</div>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -123,8 +123,7 @@ export default class GatherData extends Component {
|
|||||||
<p className={ styles.message }>You already requested verification.</p>
|
<p className={ styles.message }>You already requested verification.</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
} else if (hasRequested === false) {
|
||||||
if (hasRequested === false) {
|
|
||||||
return (
|
return (
|
||||||
<div className={ styles.container }>
|
<div className={ styles.container }>
|
||||||
<SuccessIcon />
|
<SuccessIcon />
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
|
|
||||||
import React, { Component, PropTypes } from 'react';
|
import React, { Component, PropTypes } from 'react';
|
||||||
import { observer } from 'mobx-react';
|
import { observer } from 'mobx-react';
|
||||||
import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
import DoneIcon from 'material-ui/svg-icons/action/done-all';
|
||||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
import CancelIcon from 'material-ui/svg-icons/content/clear';
|
||||||
|
|
||||||
import { Button, IdentityIcon, Modal } from '../../ui';
|
import { Button, IdentityIcon, Modal } from '../../ui';
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ export default class SMSVerification extends Component {
|
|||||||
const cancel = (
|
const cancel = (
|
||||||
<Button
|
<Button
|
||||||
key='cancel' label='Cancel'
|
key='cancel' label='Cancel'
|
||||||
icon={ <ContentClear /> }
|
icon={ <CancelIcon /> }
|
||||||
onClick={ onClose }
|
onClick={ onClose }
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@ -92,7 +92,7 @@ export default class SMSVerification extends Component {
|
|||||||
<Button
|
<Button
|
||||||
key='done' label='Done'
|
key='done' label='Done'
|
||||||
disabled={ !isStepValid }
|
disabled={ !isStepValid }
|
||||||
icon={ <ActionDoneAll /> }
|
icon={ <DoneIcon /> }
|
||||||
onClick={ onClose }
|
onClick={ onClose }
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@ -140,37 +140,47 @@ export default class SMSVerification extends Component {
|
|||||||
setNumber, setConsentGiven, setCode
|
setNumber, setConsentGiven, setCode
|
||||||
} = this.props.store;
|
} = this.props.store;
|
||||||
|
|
||||||
if (phase === 5) {
|
switch (phase) {
|
||||||
return (<Done />);
|
case 0:
|
||||||
}
|
return (
|
||||||
if (phase === 4) {
|
<p>Loading SMS Verification.</p>
|
||||||
return (<SendConfirmation step={ step } tx={ confirmationTx } />);
|
);
|
||||||
}
|
|
||||||
if (phase === 3) {
|
|
||||||
return (
|
|
||||||
<QueryCode
|
|
||||||
number={ number } fee={ fee } isCodeValid={ isCodeValid }
|
|
||||||
setCode={ setCode }
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (phase === 2) {
|
|
||||||
return (<SendRequest step={ step } tx={ requestTx } />);
|
|
||||||
}
|
|
||||||
if (phase === 1) {
|
|
||||||
const { setNumber, setConsentGiven } = this.props.store;
|
|
||||||
return (
|
|
||||||
<GatherData
|
|
||||||
fee={ fee } isNumberValid={ isNumberValid }
|
|
||||||
isVerified={ isVerified } hasRequested={ hasRequested }
|
|
||||||
setNumber={ setNumber } setConsentGiven={ setConsentGiven }
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (phase === 0) {
|
|
||||||
return (<p>Preparing awesomeness!</p>);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
case 1:
|
||||||
|
const { setNumber, setConsentGiven } = this.props.store;
|
||||||
|
return (
|
||||||
|
<GatherData
|
||||||
|
fee={ fee } isNumberValid={ isNumberValid }
|
||||||
|
isVerified={ isVerified } hasRequested={ hasRequested }
|
||||||
|
setNumber={ setNumber } setConsentGiven={ setConsentGiven }
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
case 2:
|
||||||
|
return (
|
||||||
|
<SendRequest step={ step } tx={ requestTx } />
|
||||||
|
);
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
return (
|
||||||
|
<QueryCode
|
||||||
|
number={ number } fee={ fee } isCodeValid={ isCodeValid }
|
||||||
|
setCode={ setCode }
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
|
||||||
|
case 4:
|
||||||
|
return (
|
||||||
|
<SendConfirmation step={ step } tx={ confirmationTx } />
|
||||||
|
);
|
||||||
|
|
||||||
|
case 5:
|
||||||
|
return (
|
||||||
|
<Done />
|
||||||
|
);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,8 @@ import { sha3 } from '../../api/util/sha3';
|
|||||||
|
|
||||||
import Contracts from '../../contracts';
|
import Contracts from '../../contracts';
|
||||||
|
|
||||||
import { checkIfVerified, checkIfRequested, postToServer } from '../../contracts/sms-verification';
|
import { checkIfVerified, checkIfRequested } from '../../contracts/sms-verification';
|
||||||
|
import { postToServer } from '../../3rdparty/sms-verification';
|
||||||
import checkIfTxFailed from '../../util/check-if-tx-failed';
|
import checkIfTxFailed from '../../util/check-if-tx-failed';
|
||||||
import waitForConfirmations from '../../util/wait-for-block-confirmations';
|
import waitForConfirmations from '../../util/wait-for-block-confirmations';
|
||||||
|
|
||||||
@ -87,7 +88,7 @@ export default class VerificationStore {
|
|||||||
this.account = account;
|
this.account = account;
|
||||||
|
|
||||||
this.step = LOADING;
|
this.step = LOADING;
|
||||||
Contracts.create(api).registry.getContract('smsVerification')
|
Contracts.create(api).registry.getContract('smsverification')
|
||||||
.then((contract) => {
|
.then((contract) => {
|
||||||
this.contract = contract;
|
this.contract = contract;
|
||||||
this.load();
|
this.load();
|
||||||
|
|||||||
@ -155,24 +155,20 @@ export default class Status {
|
|||||||
|
|
||||||
const { refreshStatus } = this._store.getState().nodeStatus;
|
const { refreshStatus } = this._store.getState().nodeStatus;
|
||||||
|
|
||||||
const statusPromises = [ this._api.eth.syncing() ];
|
const statusPromises = [ this._api.eth.syncing(), this._api.parity.netPeers() ];
|
||||||
|
|
||||||
if (refreshStatus) {
|
if (refreshStatus) {
|
||||||
statusPromises.push(this._api.eth.hashrate());
|
statusPromises.push(this._api.eth.hashrate());
|
||||||
statusPromises.push(this._api.parity.netPeers());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Promise
|
Promise
|
||||||
.all(statusPromises)
|
.all(statusPromises)
|
||||||
.then((statusResults) => {
|
.then(([ syncing, netPeers, ...statusResults ]) => {
|
||||||
const status = statusResults.length === 1
|
const status = statusResults.length === 0
|
||||||
? {
|
? { syncing, netPeers }
|
||||||
syncing: statusResults[0]
|
|
||||||
}
|
|
||||||
: {
|
: {
|
||||||
syncing: statusResults[0],
|
syncing, netPeers,
|
||||||
hashrate: statusResults[1],
|
hashrate: statusResults[0]
|
||||||
netPeers: statusResults[2]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!isEqual(status, this._status)) {
|
if (!isEqual(status, this._status)) {
|
||||||
|
|||||||
@ -96,7 +96,7 @@ export default class TypedInput extends Component {
|
|||||||
<IconButton
|
<IconButton
|
||||||
iconStyle={ iconStyle }
|
iconStyle={ iconStyle }
|
||||||
style={ style }
|
style={ style }
|
||||||
onClick={ this.onAddField }
|
onTouchTap={ this.onAddField }
|
||||||
>
|
>
|
||||||
<AddIcon />
|
<AddIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
@ -104,7 +104,7 @@ export default class TypedInput extends Component {
|
|||||||
<IconButton
|
<IconButton
|
||||||
iconStyle={ iconStyle }
|
iconStyle={ iconStyle }
|
||||||
style={ style }
|
style={ style }
|
||||||
onClick={ this.onRemoveField }
|
onTouchTap={ this.onRemoveField }
|
||||||
>
|
>
|
||||||
<RemoveIcon />
|
<RemoveIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
|
|||||||
@ -67,7 +67,7 @@ export default class Dapps extends Component {
|
|||||||
label='edit'
|
label='edit'
|
||||||
key='edit'
|
key='edit'
|
||||||
icon={ <EyeIcon /> }
|
icon={ <EyeIcon /> }
|
||||||
onClick={ this.store.openModal }
|
onTouchTap={ this.store.openModal }
|
||||||
/>
|
/>
|
||||||
] }
|
] }
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -74,7 +74,7 @@ class TransactionPendingFormConfirm extends Component {
|
|||||||
data-effect='solid'
|
data-effect='solid'
|
||||||
>
|
>
|
||||||
<RaisedButton
|
<RaisedButton
|
||||||
onClick={ this.onConfirm }
|
onTouchTap={ this.onConfirm }
|
||||||
className={ styles.confirmButton }
|
className={ styles.confirmButton }
|
||||||
fullWidth
|
fullWidth
|
||||||
primary
|
primary
|
||||||
|
|||||||
@ -37,7 +37,7 @@ export default class TransactionPendingFormReject extends Component {
|
|||||||
<strong>This cannot be undone</strong>
|
<strong>This cannot be undone</strong>
|
||||||
</div>
|
</div>
|
||||||
<RaisedButton
|
<RaisedButton
|
||||||
onClick={ onReject }
|
onTouchTap={ onReject }
|
||||||
className={ styles.rejectButton }
|
className={ styles.rejectButton }
|
||||||
fullWidth
|
fullWidth
|
||||||
label={ 'Reject Transaction' }
|
label={ 'Reject Transaction' }
|
||||||
|
|||||||
@ -57,7 +57,7 @@ export default class CallsToolbar extends Component {
|
|||||||
<div className={ styles.callActions } { ...this._test('button-container') }>
|
<div className={ styles.callActions } { ...this._test('button-container') }>
|
||||||
<IconButton
|
<IconButton
|
||||||
className={ styles.callAction }
|
className={ styles.callAction }
|
||||||
onClick={ this.setCall }
|
onTouchTap={ this.setCall }
|
||||||
tooltip='Set'
|
tooltip='Set'
|
||||||
tooltipPosition='top-left'
|
tooltipPosition='top-left'
|
||||||
{ ...this._test('button-setCall') }
|
{ ...this._test('button-setCall') }
|
||||||
@ -66,7 +66,7 @@ export default class CallsToolbar extends Component {
|
|||||||
</IconButton>
|
</IconButton>
|
||||||
<IconButton
|
<IconButton
|
||||||
className={ styles.callAction }
|
className={ styles.callAction }
|
||||||
onClick={ this.makeCall }
|
onTouchTap={ this.makeCall }
|
||||||
tooltip='Fire again'
|
tooltip='Fire again'
|
||||||
tooltipPosition='top-left'
|
tooltipPosition='top-left'
|
||||||
{ ...this._test('button-makeCall') }
|
{ ...this._test('button-makeCall') }
|
||||||
|
|||||||
@ -45,7 +45,7 @@ export default class ScrollTopButton extends Component {
|
|||||||
return (
|
return (
|
||||||
<IconButton
|
<IconButton
|
||||||
className={ `${styles.scrollButton} ${hiddenClass}` }
|
className={ `${styles.scrollButton} ${hiddenClass}` }
|
||||||
onClick={ this._scrollToTop }>
|
onTouchTap={ this._scrollToTop }>
|
||||||
<ArrowUpwardIcon />
|
<ArrowUpwardIcon />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -102,7 +102,7 @@ fn import(i: ImportAccounts) -> Result<String, String> {
|
|||||||
let from = DiskDirectory::at(path);
|
let from = DiskDirectory::at(path);
|
||||||
imported += try!(import_accounts(&from, &to).map_err(|_| "Importing accounts failed.")).len();
|
imported += try!(import_accounts(&from, &to).map_err(|_| "Importing accounts failed.")).len();
|
||||||
}
|
}
|
||||||
Ok(format!("{}", imported))
|
Ok(format!("{} account(s) imported", imported))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn import_geth(i: ImportFromGethAccounts) -> Result<String, String> {
|
fn import_geth(i: ImportFromGethAccounts) -> Result<String, String> {
|
||||||
|
|||||||
@ -32,7 +32,7 @@ Operating Options:
|
|||||||
(default: {flag_mode_alarm}).
|
(default: {flag_mode_alarm}).
|
||||||
--chain CHAIN Specify the blockchain type. CHAIN may be either a
|
--chain CHAIN Specify the blockchain type. CHAIN may be either a
|
||||||
JSON chain specification file or olympic, frontier,
|
JSON chain specification file or olympic, frontier,
|
||||||
homestead, mainnet, morden, classic, expanse,
|
homestead, mainnet, morden, ropsten, classic, expanse,
|
||||||
testnet or dev (default: {flag_chain}).
|
testnet or dev (default: {flag_chain}).
|
||||||
-d --db-path PATH Specify the database & configuration directory path
|
-d --db-path PATH Specify the database & configuration directory path
|
||||||
(default: {flag_db_path}).
|
(default: {flag_db_path}).
|
||||||
|
|||||||
@ -313,7 +313,7 @@ impl Configuration {
|
|||||||
|
|
||||||
fn chain(&self) -> String {
|
fn chain(&self) -> String {
|
||||||
if self.args.flag_testnet {
|
if self.args.flag_testnet {
|
||||||
"morden".to_owned()
|
"ropsten".to_owned()
|
||||||
} else {
|
} else {
|
||||||
self.args.flag_chain.clone()
|
self.args.flag_chain.clone()
|
||||||
}
|
}
|
||||||
@ -905,7 +905,7 @@ mod tests {
|
|||||||
// then
|
// then
|
||||||
assert_eq!(conf.network_settings(), NetworkSettings {
|
assert_eq!(conf.network_settings(), NetworkSettings {
|
||||||
name: "testname".to_owned(),
|
name: "testname".to_owned(),
|
||||||
chain: "morden".to_owned(),
|
chain: "ropsten".to_owned(),
|
||||||
network_port: 30303,
|
network_port: 30303,
|
||||||
rpc_enabled: true,
|
rpc_enabled: true,
|
||||||
rpc_interface: "local".to_owned(),
|
rpc_interface: "local".to_owned(),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user