grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into check-updates

Browse Source
This commit is contained in:
Gav Wood 2016-11-21 18:17:31 +01:00
commit 10e64847a4
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
17 changed files with 376 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

504
ethcore/res/ethereum/ropsten.json
View File

@ -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" }
} }
} }

2
js/src/dapps/basiccoin/services.js
View File

@ -105,7 +105,7 @@ export function attachInstances () {
]) ])
.then(([registryAddress, netChain]) => { .then(([registryAddress, netChain]) => {
const registry = api.newContract(abis.registry, registryAddress).instance; const registry = api.newContract(abis.registry, registryAddress).instance;
isTest = netChain === 'morden' || netChain === 'testnet'; isTest = ['morden', 'ropsten', 'testnet'].includes(netChain);
console.log(`contract was found at registry=${registryAddress}`); console.log(`contract was found at registry=${registryAddress}`);
console.log(`running on ${netChain}, isTest=${isTest}`); console.log(`running on ${netChain}, isTest=${isTest}`);

6
js/src/dapps/registry/Names/actions.js
View File

@ -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, toWei } from '../parity.js'; import { sha3 } 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);
@ -29,6 +29,8 @@ export const reserve = (name) => (dispatch, getState) => {
const state = getState(); const state = getState();
const account = state.accounts.selected; const account = state.accounts.selected;
const contract = state.contract; const contract = state.contract;
const fee = state.fee;
if (!contract || !account) return; if (!contract || !account) return;
if (alreadyQueued(state.names.queue, 'reserve', name)) return; if (alreadyQueued(state.names.queue, 'reserve', name)) return;
const reserve = contract.functions.find((f) => f.name === 'reserve'); const reserve = contract.functions.find((f) => f.name === 'reserve');
@ -36,7 +38,7 @@ export const reserve = (name) => (dispatch, getState) => {
name = name.toLowerCase(); name = name.toLowerCase();
const options = { const options = {
from: account.address, from: account.address,
value: toWei(1).toString() value: fee
}; };
const values = [ sha3(name) ]; const values = [ sha3(name) ];

2
js/src/redux/providers/status.js
View File

@ -251,7 +251,7 @@ export default class Status {
.then(([ .then(([
clientVersion, defaultExtraData, netChain, netPort, rpcSettings, enode clientVersion, defaultExtraData, netChain, netPort, rpcSettings, enode
]) => { ]) => {
const isTest = netChain === 'morden' || netChain === 'testnet'; const isTest = netChain === 'morden' || netChain === 'ropsten' || netChain === 'testnet';
const longStatus = { const longStatus = {
clientVersion, clientVersion,

2
js/src/redux/providers/statusReducer.js
View File

@ -31,7 +31,7 @@ const initialState = {
gasLimit: new BigNumber(0), gasLimit: new BigNumber(0),
hashrate: new BigNumber(0), hashrate: new BigNumber(0),
minGasPrice: new BigNumber(0), minGasPrice: new BigNumber(0),
netChain: 'morden', netChain: 'ropsten',
netPeers: { netPeers: {
active: new BigNumber(0), active: new BigNumber(0),
connected: new BigNumber(0), connected: new BigNumber(0),

18
js/src/views/Signer/components/Account/Account.js
View File

@ -25,7 +25,7 @@ export default class Account extends Component {
static propTypes = { static propTypes = {
className: PropTypes.string, className: PropTypes.string,
address: PropTypes.string.isRequired, address: PropTypes.string.isRequired,
chain: PropTypes.string.isRequired, isTest: PropTypes.bool.isRequired,
balance: PropTypes.object // eth BigNumber, not required since it mght take time to fetch balance: PropTypes.object // eth BigNumber, not required since it mght take time to fetch
}; };
@ -51,11 +51,13 @@ export default class Account extends Component {
} }
render () { render () {
const { address, chain, className } = this.props; const { address, isTest, className } = this.props;
return ( return (
<div className={ `${styles.acc} ${className}` }> <div className={ `${styles.acc} ${className}` }>
<AccountLink address={ address } chain={ chain }> <AccountLink
address={ address }
isTest={ isTest }>
<IdentityIcon <IdentityIcon
center center
address={ address } /> address={ address } />
@ -74,19 +76,23 @@ export default class Account extends Component {
} }
renderName () { renderName () {
const { address } = this.props; const { address, isTest } = this.props;
const name = <IdentityName address={ address } empty />; const name = <IdentityName address={ address } empty />;
if (!name) { if (!name) {
return ( return (
<AccountLink address={ address } chain={ this.props.chain }> <AccountLink
address={ address }
isTest={ isTest }>
[{ this.shortAddress(address) }] [{ this.shortAddress(address) }]
</AccountLink> </AccountLink>
); );
} }
return ( return (
<AccountLink address={ address } chain={ this.props.chain } > <AccountLink
address={ address }
isTest={ isTest } >
<span> <span>
<span className={ styles.name }>{ name }</span> <span className={ styles.name }>{ name }</span>
<span className={ styles.address }>[{ this.tinyAddress(address) }]</span> <span className={ styles.address }>[{ this.tinyAddress(address) }]</span>

14
js/src/views/Signer/components/Account/AccountLink/AccountLink.js
View File

@ -21,7 +21,7 @@ import styles from './AccountLink.css';
export default class AccountLink extends Component { export default class AccountLink extends Component {
static propTypes = { static propTypes = {
chain: PropTypes.string.isRequired, isTest: PropTypes.bool.isRequired,
address: PropTypes.string.isRequired, address: PropTypes.string.isRequired,
className: PropTypes.string, className: PropTypes.string,
children: PropTypes.node children: PropTypes.node
@ -32,15 +32,15 @@ export default class AccountLink extends Component {
}; };
componentWillMount () { componentWillMount () {
const { address, chain } = this.props; const { address, isTest } = this.props;
this.updateLink(address, chain); this.updateLink(address, isTest);
} }
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {
const { address, chain } = nextProps; const { address, isTest } = nextProps;
this.updateLink(address, chain); this.updateLink(address, isTest);
} }
render () { render () {
@ -56,8 +56,8 @@ export default class AccountLink extends Component {
); );
} }
updateLink (address, chain) { updateLink (address, isTest) {
const link = addressLink(address, chain === 'morden' || chain === 'testnet'); const link = addressLink(address, isTest);
this.setState({ this.setState({
link link

9
js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js
View File

@ -31,14 +31,16 @@ export default class RequestFinishedWeb3 extends Component {
msg: PropTypes.string, msg: PropTypes.string,
status: PropTypes.string, status: PropTypes.string,
error: PropTypes.string, error: PropTypes.string,
className: PropTypes.string className: PropTypes.string,
isTest: PropTypes.bool.isRequired
} }
render () { render () {
const { payload, id, result, msg, status, error, date, className } = this.props; const { payload, id, result, msg, status, error, date, className, isTest } = this.props;
if (payload.sign) { if (payload.sign) {
const { sign } = payload; const { sign } = payload;
return ( return (
<SignRequest <SignRequest
className={ className } className={ className }
@ -49,12 +51,14 @@ export default class RequestFinishedWeb3 extends Component {
msg={ msg } msg={ msg }
status={ status } status={ status }
error={ error } error={ error }
isTest={ isTest }
/> />
); );
} }
if (payload.transaction) { if (payload.transaction) {
const { transaction } = payload; const { transaction } = payload;
return ( return (
<TransactionFinished <TransactionFinished
className={ className } className={ className }
@ -69,6 +73,7 @@ export default class RequestFinishedWeb3 extends Component {
date={ date } date={ date }
status={ status } status={ status }
error={ error } error={ error }
isTest={ isTest }
/> />
); );
} }

9
js/src/views/Signer/components/RequestPendingWeb3/RequestPendingWeb3.js
View File

@ -30,7 +30,8 @@ export default class RequestPendingWeb3 extends Component {
PropTypes.shape({ transaction: PropTypes.object.isRequired }), PropTypes.shape({ transaction: PropTypes.object.isRequired }),
PropTypes.shape({ sign: PropTypes.object.isRequired }) PropTypes.shape({ sign: PropTypes.object.isRequired })
]).isRequired, ]).isRequired,
className: PropTypes.string className: PropTypes.string,
isTest: PropTypes.bool.isRequired
}; };
onConfirm = data => { onConfirm = data => {
@ -41,10 +42,11 @@ export default class RequestPendingWeb3 extends Component {
}; };
render () { render () {
const { payload, id, className, isSending, date, onReject } = this.props; const { payload, id, className, isSending, date, onReject, isTest } = this.props;
if (payload.sign) { if (payload.sign) {
const { sign } = payload; const { sign } = payload;
return ( return (
<SignRequest <SignRequest
className={ className } className={ className }
@ -55,12 +57,14 @@ export default class RequestPendingWeb3 extends Component {
id={ id } id={ id }
address={ sign.address } address={ sign.address }
hash={ sign.hash } hash={ sign.hash }
isTest={ isTest }
/> />
); );
} }
if (payload.transaction) { if (payload.transaction) {
const { transaction } = payload; const { transaction } = payload;
return ( return (
<TransactionPending <TransactionPending
className={ className } className={ className }
@ -75,6 +79,7 @@ export default class RequestPendingWeb3 extends Component {
to={ transaction.to } to={ transaction.to }
value={ transaction.value } value={ transaction.value }
date={ date } date={ date }
isTest={ isTest }
/> />
); );
} }

33
js/src/views/Signer/components/SignRequest/SignRequest.js
View File

@ -39,24 +39,15 @@ export default class SignRequest extends Component {
onReject: PropTypes.func, onReject: PropTypes.func,
status: PropTypes.string, status: PropTypes.string,
className: PropTypes.string, className: PropTypes.string,
chain: nullable(PropTypes.object), isTest: PropTypes.bool.isRequired,
balance: nullable(PropTypes.object) balance: nullable(PropTypes.object)
}; };
state = { state = {
chain: null,
balance: null balance: null
} }
componentWillMount () { componentWillMount () {
this.context.api.parity.netChain()
.then((chain) => {
this.setState({ chain });
})
.catch((err) => {
console.error('could not fetch chain', err);
});
this.context.api.eth.getBalance(this.props.address) this.context.api.eth.getBalance(this.props.address)
.then((balance) => { .then((balance) => {
this.setState({ balance }); this.setState({ balance });
@ -68,6 +59,7 @@ export default class SignRequest extends Component {
render () { render () {
const { className } = this.props; const { className } = this.props;
return ( return (
<div className={ `${styles.container} ${className || ''}` }> <div className={ `${styles.container} ${className || ''}` }>
{ this.renderDetails() } { this.renderDetails() }
@ -77,15 +69,20 @@ export default class SignRequest extends Component {
} }
renderDetails () { renderDetails () {
const { address, hash } = this.props; const { address, hash, isTest } = this.props;
const { balance, chain } = this.state; const { balance } = this.state;
if (!balance || !chain) return (<div />); if (!balance) {
return <div />;
}
return ( return (
<div className={ styles.signDetails }> <div className={ styles.signDetails }>
<div className={ styles.address }> <div className={ styles.address }>
<Account address={ address } balance={ balance } chain={ chain } /> <Account
address={ address }
balance={ balance }
isTest={ isTest } />
</div> </div>
<div className={ styles.info } title={ hash }> <div className={ styles.info } title={ hash }>
<p>Dapp is requesting to sign arbitrary transaction using this account.</p> <p>Dapp is requesting to sign arbitrary transaction using this account.</p>
@ -100,15 +97,17 @@ export default class SignRequest extends Component {
if (isFinished) { if (isFinished) {
if (status === 'confirmed') { if (status === 'confirmed') {
const { hash } = this.props; const { hash, isTest } = this.props;
const { chain } = this.state;
return ( return (
<div className={ styles.actions }> <div className={ styles.actions }>
<span className={ styles.isConfirmed }>Confirmed</span> <span className={ styles.isConfirmed }>Confirmed</span>
<div> <div>
Transaction hash: Transaction hash:
<TxHashLink chain={ chain } txHash={ hash } className={ styles.txHash } /> <TxHashLink
isTest={ isTest }
txHash={ hash }
className={ styles.txHash } />
</div> </div>
</div> </div>
); );

27
js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
View File

@ -47,13 +47,12 @@ export default class TransactionFinished extends Component {
txHash: PropTypes.string, // undefined if transacation is rejected txHash: PropTypes.string, // undefined if transacation is rejected
className: PropTypes.string, className: PropTypes.string,
data: PropTypes.string, data: PropTypes.string,
chain: nullable(PropTypes.object), isTest: PropTypes.bool.isRequired,
fromBalance: nullable(PropTypes.object), fromBalance: nullable(PropTypes.object),
toBalance: nullable(PropTypes.object) toBalance: nullable(PropTypes.object)
}; };
state = { state = {
chain: null,
fromBalance: null, fromBalance: null,
toBalance: null toBalance: null
}; };
@ -64,14 +63,6 @@ export default class TransactionFinished extends Component {
const totalValue = tUtil.getTotalValue(fee, value); const totalValue = tUtil.getTotalValue(fee, value);
this.setState({ totalValue }); this.setState({ totalValue });
this.context.api.parity.netChain()
.then((chain) => {
this.setState({ chain });
})
.catch((err) => {
console.error('could not fetch chain', err);
});
this.fetchBalance(from, 'fromBalance'); this.fetchBalance(from, 'fromBalance');
if (to) { if (to) {
this.fetchBalance(to, 'toBalance'); this.fetchBalance(to, 'toBalance');
@ -79,8 +70,9 @@ export default class TransactionFinished extends Component {
} }
render () { render () {
const { chain, fromBalance, toBalance } = this.state; const { fromBalance, toBalance } = this.state;
if (!chain || !fromBalance || !toBalance) {
if (!fromBalance || !toBalance) {
return ( return (
<div className={ `${styles.container} ${className}` }> <div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 60 } /> <CircularProgress size={ 60 } />
@ -130,16 +122,19 @@ export default class TransactionFinished extends Component {
} }
renderTxHash () { renderTxHash () {
const { txHash } = this.props; const { txHash, isTest } = this.props;
const { chain } = this.state;
if (!txHash || !chain) { if (!txHash) {
return; return;
} }
return ( return (
<div> <div>
Transaction hash: Transaction hash:
<TxHashLink chain={ chain } txHash={ txHash } className={ styles.txHash } /> <TxHashLink
isTest={ isTest }
txHash={ txHash }
className={ styles.txHash } />
</div> </div>
); );
} }

30
js/src/views/Signer/components/TransactionMainDetails/TransactionMainDetails.js
View File

@ -30,7 +30,7 @@ export default class TransactionMainDetails extends Component {
fromBalance: PropTypes.object, // eth BigNumber, not required since it might take time to fetch fromBalance: PropTypes.object, // eth BigNumber, not required since it might take time to fetch
value: PropTypes.object.isRequired, // wei hex value: PropTypes.object.isRequired, // wei hex
totalValue: PropTypes.object.isRequired, // wei BigNumber totalValue: PropTypes.object.isRequired, // wei BigNumber
chain: PropTypes.string.isRequired, isTest: PropTypes.bool.isRequired,
to: PropTypes.string, // undefined if it's a contract to: PropTypes.string, // undefined if it's a contract
toBalance: PropTypes.object, // eth BigNumber - undefined if it's a contract or until it's fetched toBalance: PropTypes.object, // eth BigNumber - undefined if it's a contract or until it's fetched
className: PropTypes.string, className: PropTypes.string,
@ -39,11 +39,13 @@ export default class TransactionMainDetails extends Component {
componentWillMount () { componentWillMount () {
const { value, totalValue } = this.props; const { value, totalValue } = this.props;
this.updateDisplayValues(value, totalValue); this.updateDisplayValues(value, totalValue);
} }
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {
const { value, totalValue } = nextProps; const { value, totalValue } = nextProps;
this.updateDisplayValues(value, totalValue); this.updateDisplayValues(value, totalValue);
} }
@ -59,6 +61,7 @@ export default class TransactionMainDetails extends Component {
render () { render () {
const { className, children } = this.props; const { className, children } = this.props;
return ( return (
<div className={ className }> <div className={ className }>
{ this.renderTransfer() } { this.renderTransfer() }
@ -69,7 +72,8 @@ export default class TransactionMainDetails extends Component {
} }
renderTransfer () { renderTransfer () {
const { from, fromBalance, to, toBalance, chain } = this.props; const { from, fromBalance, to, toBalance, isTest } = this.props;
if (!to) { if (!to) {
return; return;
} }
@ -78,7 +82,10 @@ export default class TransactionMainDetails extends Component {
<div className={ styles.transaction }> <div className={ styles.transaction }>
<div className={ styles.from }> <div className={ styles.from }>
<div className={ styles.account }> <div className={ styles.account }>
<Account address={ from } balance={ fromBalance } chain={ chain } /> <Account
address={ from }
balance={ fromBalance }
isTest={ isTest } />
</div> </div>
</div> </div>
<div className={ styles.tx }> <div className={ styles.tx }>
@ -88,7 +95,10 @@ export default class TransactionMainDetails extends Component {
</div> </div>
<div className={ styles.to }> <div className={ styles.to }>
<div className={ styles.account }> <div className={ styles.account }>
<Account address={ to } balance={ toBalance } chain={ chain } /> <Account
address={ to }
balance={ toBalance }
isTest={ isTest } />
</div> </div>
</div> </div>
</div> </div>
@ -96,15 +106,20 @@ export default class TransactionMainDetails extends Component {
} }
renderContract () { renderContract () {
const { from, fromBalance, to, chain } = this.props; const { from, fromBalance, to, isTest } = this.props;
if (to) { if (to) {
return; return;
} }
return ( return (
<div className={ styles.transaction }> <div className={ styles.transaction }>
<div className={ styles.from }> <div className={ styles.from }>
<div className={ styles.account }> <div className={ styles.account }>
<Account address={ from } balance={ fromBalance } chain={ chain } /> <Account
address={ from }
balance={ fromBalance }
isTest={ isTest } />
</div> </div>
</div> </div>
<div className={ styles.tx }> <div className={ styles.tx }>
@ -126,6 +141,7 @@ export default class TransactionMainDetails extends Component {
renderValue () { renderValue () {
const { id } = this.props; const { id } = this.props;
const { valueDisplay, valueDisplayWei } = this.state; const { valueDisplay, valueDisplayWei } = this.state;
return ( return (
<div> <div>
<div <div
@ -147,6 +163,7 @@ export default class TransactionMainDetails extends Component {
renderTotalValue () { renderTotalValue () {
const { id } = this.props; const { id } = this.props;
const { totalValueDisplay, totalValueDisplayWei, feeEth } = this.state; const { totalValueDisplay, totalValueDisplayWei, feeEth } = this.state;
return ( return (
<div> <div>
<div <div
@ -164,5 +181,4 @@ export default class TransactionMainDetails extends Component {
</div> </div>
); );
} }
} }

21
js/src/views/Signer/components/TransactionPending/TransactionPending.js
View File

@ -16,7 +16,6 @@
import React, { Component, PropTypes } from 'react'; import React, { Component, PropTypes } from 'react';
import CircularProgress from 'material-ui/CircularProgress';
import TransactionMainDetails from '../TransactionMainDetails'; import TransactionMainDetails from '../TransactionMainDetails';
import TransactionPendingForm from '../TransactionPendingForm'; import TransactionPendingForm from '../TransactionPendingForm';
import TransactionSecondaryDetails from '../TransactionSecondaryDetails'; import TransactionSecondaryDetails from '../TransactionSecondaryDetails';
@ -43,7 +42,8 @@ export default class TransactionPending extends Component {
onConfirm: PropTypes.func.isRequired, onConfirm: PropTypes.func.isRequired,
onReject: PropTypes.func.isRequired, onReject: PropTypes.func.isRequired,
isSending: PropTypes.bool.isRequired, isSending: PropTypes.bool.isRequired,
className: PropTypes.string className: PropTypes.string,
isTest: PropTypes.bool.isRequired
}; };
static defaultProps = { static defaultProps = {
@ -51,7 +51,6 @@ export default class TransactionPending extends Component {
}; };
state = { state = {
chain: null,
fromBalance: null, fromBalance: null,
toBalance: null toBalance: null
}; };
@ -64,28 +63,12 @@ export default class TransactionPending extends Component {
const gasToDisplay = tUtil.getGasDisplay(gas); const gasToDisplay = tUtil.getGasDisplay(gas);
this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay }); this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay });
this.context.api.parity.netChain()
.then((chain) => {
this.setState({ chain });
})
.catch((err) => {
console.error('could not fetch chain', err);
});
const { from, to } = this.props; const { from, to } = this.props;
this.fetchBalance(from, 'fromBalance'); this.fetchBalance(from, 'fromBalance');
if (to) this.fetchBalance(to, 'toBalance'); if (to) this.fetchBalance(to, 'toBalance');
} }
render () { render () {
if (!this.state.chain) {
return (
<div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 60 } />
</div>
);
}
const { totalValue, gasPriceEthmDisplay, gasToDisplay } = this.state; const { totalValue, gasPriceEthmDisplay, gasToDisplay } = this.state;
const { className, id, date, data, from } = this.props; const { className, id, date, data, from } = this.props;

10
js/src/views/Signer/components/TransactionSecondaryDetails/TransactionSecondaryDetails.js
View File

@ -59,10 +59,13 @@ export default class TransactionSecondaryDetails extends Component {
} }
renderGasPrice () { renderGasPrice () {
if (!this.props.gasPriceEthmDisplay && !this.props.gasToDisplay) return null; if (!this.props.gasPriceEthmDisplay && !this.props.gasToDisplay) {
return null;
}
const { id } = this.props; const { id } = this.props;
const { gasPriceEthmDisplay, gasToDisplay } = this.props; const { gasPriceEthmDisplay, gasToDisplay } = this.props;
return ( return (
<div <div
data-tip data-tip
@ -83,11 +86,14 @@ export default class TransactionSecondaryDetails extends Component {
} }
renderData () { renderData () {
if (!this.props.data) return null; if (!this.props.data) {
return null;
}
const { data, id } = this.props; const { data, id } = this.props;
let dataToDisplay = this.noData() ? 'no data' : tUtil.getShortData(data); let dataToDisplay = this.noData() ? 'no data' : tUtil.getShortData(data);
const noDataClass = this.noData() ? styles.noData : ''; const noDataClass = this.noData() ? styles.noData : '';
return ( return (
<div <div
className={ `${styles.data} ${noDataClass}` } className={ `${styles.data} ${noDataClass}` }

6
js/src/views/Signer/components/TxHashLink/TxHashLink.js
View File

@ -22,17 +22,17 @@ export default class TxHashLink extends Component {
static propTypes = { static propTypes = {
txHash: PropTypes.string.isRequired, txHash: PropTypes.string.isRequired,
chain: PropTypes.string.isRequired, isTest: PropTypes.bool.isRequired,
children: PropTypes.node, children: PropTypes.node,
className: PropTypes.string className: PropTypes.string
} }
render () { render () {
const { children, txHash, className, chain } = this.props; const { children, txHash, className, isTest } = this.props;
return ( return (
<a <a
href={ txLink(txHash, chain === 'morden' || chain === 'testnet') } href={ txLink(txHash, isTest) }
target='_blank' target='_blank'
className={ className }> className={ className }>
{ children || txHash } { children || txHash }

10
js/src/views/Signer/containers/Embedded/embedded.js
View File

@ -35,7 +35,8 @@ class Embedded extends Component {
actions: PropTypes.shape({ actions: PropTypes.shape({
startConfirmRequest: PropTypes.func.isRequired, startConfirmRequest: PropTypes.func.isRequired,
startRejectRequest: PropTypes.func.isRequired startRejectRequest: PropTypes.func.isRequired
}).isRequired }).isRequired,
isTest: PropTypes.bool.isRequired
}; };
render () { render () {
@ -70,7 +71,7 @@ class Embedded extends Component {
} }
renderPending = (data) => { renderPending = (data) => {
const { actions } = this.props; const { actions, isTest } = this.props;
const { payload, id, isSending, date } = data; const { payload, id, isSending, date } = data;
return ( return (
@ -83,6 +84,7 @@ class Embedded extends Component {
id={ id } id={ id }
payload={ payload } payload={ payload }
date={ date } date={ date }
isTest={ isTest }
/> />
); );
} }
@ -93,11 +95,13 @@ class Embedded extends Component {
} }
function mapStateToProps (state) { function mapStateToProps (state) {
const { isTest } = state.nodeStatus;
const { actions, signer } = state; const { actions, signer } = state;
return { return {
actions, actions,
signer signer,
isTest
}; };
} }

17
js/src/views/Signer/containers/RequestsPage/RequestsPage.js
View File

@ -35,7 +35,8 @@ class RequestsPage extends Component {
actions: PropTypes.shape({ actions: PropTypes.shape({
startConfirmRequest: PropTypes.func.isRequired, startConfirmRequest: PropTypes.func.isRequired,
startRejectRequest: PropTypes.func.isRequired startRejectRequest: PropTypes.func.isRequired
}).isRequired }).isRequired,
isTest: PropTypes.bool.isRequired
}; };
render () { render () {
@ -96,7 +97,7 @@ class RequestsPage extends Component {
} }
renderPending = (data) => { renderPending = (data) => {
const { actions } = this.props; const { actions, isTest } = this.props;
const { payload, id, isSending, date } = data; const { payload, id, isSending, date } = data;
return ( return (
@ -109,11 +110,13 @@ class RequestsPage extends Component {
id={ id } id={ id }
payload={ payload } payload={ payload }
date={ date } date={ date }
isTest={ isTest }
/> />
); );
} }
renderFinished = (data) => { renderFinished = (data) => {
const { isTest } = this.props;
const { payload, id, result, msg, status, error, date } = data; const { payload, id, result, msg, status, error, date } = data;
return ( return (
@ -127,6 +130,7 @@ class RequestsPage extends Component {
error={ error } error={ error }
payload={ payload } payload={ payload }
date={ date } date={ date }
isTest={ isTest }
/> />
); );
} }
@ -143,7 +147,14 @@ class RequestsPage extends Component {
} }
function mapStateToProps (state) { function mapStateToProps (state) {
return state; const { isTest } = state.nodeStatus;
const { actions, signer } = state;
return {
actions,
signer,
isTest
};
} }
function mapDispatchToProps (dispatch) { function mapDispatchToProps (dispatch) {