Commit Graph

1823 Commits

Author SHA1 Message Date
keorn
8f641e67f3 Merge branch 'engine-password' into auth-bft 2016-12-06 13:13:02 +00:00
keorn
0a2ec319ac rename to engine_signer 2016-12-05 21:31:38 +00:00
keorn
92d566c900 Merge branch 'master' into engine-password 2016-12-05 19:30:08 +00:00
Gav Wood
ff7b918d82
Fix build. 2016-12-05 10:55:53 -08:00
Gav Wood
5e1fdc4b11
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-12-05 10:44:19 -08:00
Gav Wood
ad36743122 Merge pull request #3719 from ethcore/engine-block-ordering
Engine block ordering
2016-12-05 10:37:36 -08:00
keorn
01bf483b63 remove unnecessary impls 2016-12-05 17:29:47 +00:00
Robert Habermeier
1b6ebe1a6d possible fix for queue drop deadlock (#3702)
* possible fix for #3686

* queue: simplify conclusion, don't block on joining

* queue: park verifiers with timeout to prevent race

* more robust verification loop

* queue: re-introduce wait for verifier joining
2016-12-05 18:18:56 +01:00
keorn
81a756394a Merge branch 'master' into engine-password 2016-12-05 17:08:57 +00:00
keorn
529a7fc33c add password and AccountProvider 2016-12-05 17:08:16 +00:00
keorn
6fc943ca6d Merge branch 'master' into auth-bft 2016-12-05 16:37:35 +00:00
keorn
4f857642b5 rename set_sealer 2016-12-05 16:28:56 +00:00
Robert Habermeier
a726472023 Merge pull request #3713 from ethcore/fix-v-u64
Encode networkid as a u64.
2016-12-05 17:14:07 +01:00
Robert Habermeier
a6c2408562 IPC codegen in ethcore-light; remove network dependency 2016-12-05 16:56:21 +01:00
Robert Habermeier
61c3358447 move light to its own crate again 2016-12-05 16:55:33 +01:00
keorn
53b479fb7a pass engine to snapshot service 2016-12-05 15:43:46 +00:00
keorn
94302f3f61 throw out difficulty checks 2016-12-05 15:27:44 +00:00
keorn
c61a0e97b3 make engine determine block order 2016-12-05 15:20:32 +00:00
keorn
c39d504167 Merge branch 'spec-rlp-loading' into auth-bft 2016-12-05 14:11:06 +00:00
keorn
22632e6324 make generic seal take valid rlp 2016-12-05 14:07:31 +00:00
keorn
b30c1d5602 fix tests 2016-12-05 13:24:22 +00:00
keorn
c946ffebf3 Merge branch 'master' into auth-bft 2016-12-05 11:30:11 +00:00
keorn
f7a01b87b5 better gossip, better proposal collection 2016-12-04 19:43:24 +00:00
keorn
edef7a185f remove tracing 2016-12-04 19:42:53 +00:00
Gav Wood
2911c549e3
Encode networkid as a u64. 2016-12-04 10:48:26 -08:00
Gav Wood
0c7b7fc8bc Merge pull request #3627 from ethcore/rpc-middleware
Dapps-specific accounts
2016-12-04 08:46:05 -08:00
keorn
9084e6242d lock ordering 2016-12-02 20:04:12 +00:00
keorn
ff6240eff3 insert block into queue when sealing 2016-12-02 20:03:15 +00:00
Robert Habermeier
cd5b6fdf59 queue: CLI for auto-scaling and num verifiers 2016-12-02 18:21:54 +01:00
keorn
c8a3db4c52 new error proposal test 2016-12-02 13:59:54 +00:00
keorn
91099f62c9 add more gossip if step is stuck 2016-12-02 13:37:49 +00:00
keorn
e0f2fac441 new error type 2016-12-02 13:32:00 +00:00
keorn
0eb55cbd4d update message test 2016-12-02 13:31:28 +00:00
keorn
2c8c090598 stricter size verification 2016-12-02 13:30:43 +00:00
Robert Habermeier
6e1a1f9dec Merge branch 'master' into client-provider 2016-12-02 10:06:09 +01:00
Robert Habermeier
3837114eb2 Merge pull request #3431 from ethcore/state-tests-indentation
indent state tests
2016-12-02 09:09:35 +01:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
keorn
f0e9eae244 remove difficulty check 2016-12-01 22:07:18 +00:00
keorn
df1cce8e7f simplify seal verification 2016-12-01 21:56:38 +00:00
keorn
e76ead40d1 update tracing message 2016-12-01 21:55:43 +00:00
keorn
39ea703c69 vote on message generation 2016-12-01 20:50:24 +00:00
arkpar
f1ef4a4935 Import sealed block immedtiatelly 2016-12-01 19:11:36 +01:00
keorn
9290fdde85 fix tests 2016-12-01 17:21:51 +00:00
keorn
498b2fb0b1 show verification error 2016-12-01 17:20:16 +00:00
keorn
e40e398eaa clean up some tracing 2016-12-01 17:19:40 +00:00
keorn
344999aaf7 return signing failure error 2016-12-01 14:10:42 +00:00
keorn
66b4f1ac47 remove unnecessary option 2016-12-01 14:10:22 +00:00
Gav Wood
d3e684698a
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-11-30 17:15:05 -08:00
keorn
dbf82c2e98 fix tests 2016-11-30 16:40:16 +00:00
keorn
d128c20dc2 remove proposer_nonce 2016-11-30 16:02:05 +00:00
keorn
bb8347477a gossip when not enough votes 2016-11-30 16:01:20 +00:00
Tomasz Drwięga
022ccb5bce Fixing tests 2016-11-30 16:33:42 +01:00
Tomasz Drwięga
c028f106b1 RPC for confirming with token 2016-11-30 16:11:41 +01:00
keorn
73e7908325 test password registration 2016-11-30 14:30:21 +00:00
Tomasz Drwięga
6397556cbb Sign with token support 2016-11-30 15:08:38 +01:00
keorn
155da50fcd Merge branch 'master' into auth-bft 2016-11-30 13:06:21 +00:00
keorn
34d5017950 hold password in engine, add rpc 2016-11-30 12:59:33 +00:00
Tomasz Drwięga
ad440a12bd EthMultiStore 2016-11-30 13:47:14 +01:00
Gav Wood
d525a6d7f0 Merge pull request #3654 from ethcore/clippy-bump
Bumping clippy
2016-11-29 18:00:13 +01:00
arkpar
95f81b2a2f Moved consensus networking into Parity handler 2016-11-29 16:54:30 +01:00
Gav Wood
9115214cea Merge pull request #3636 from ethcore/fatdb
Return of the Fat DB
2016-11-29 16:47:09 +01:00
keorn
7929a145e7 fix deadlock 2016-11-29 14:55:54 +00:00
Tomasz Drwięga
762d8b89d6 Removing unused imports 2016-11-29 14:03:21 +01:00
keorn
294e89e5c0 use EngineError instead of BlockError 2016-11-29 12:51:27 +00:00
keorn
e784fa906e warn on double vote 2016-11-29 12:20:38 +00:00
keorn
49b953a9f4 order invariant seal equality 2016-11-29 11:18:40 +00:00
Igor Artamonov
8ec8bcd626 fix after code review, rel [748260b] 2016-11-29 17:18:33 +06:00
keorn
d0eab4a0d8 old message removal, avoid too many recoveries 2016-11-29 10:55:24 +00:00
keorn
61cf8b8b7e vote propose 2016-11-28 18:58:15 +00:00
keorn
0f1eefc00d disallow None seal sigs 2016-11-28 18:37:00 +00:00
Tomasz Drwięga
64b1b898f1 Fixing compilation on stable 2016-11-28 17:43:38 +01:00
keorn
e4ff614966 remove unused tracing 2016-11-28 15:50:55 +00:00
keorn
b454f7e307 use Io queue for messages 2016-11-28 15:42:36 +00:00
keorn
1326c6cf5a rebroadcast unseen messages 2016-11-28 15:24:22 +00:00
keorn
7d97ba5ee0 seal sigs test 2016-11-28 15:23:39 +00:00
Tomasz Drwięga
2b3d100de2 Fixing some clippy warnings 2016-11-28 15:54:22 +01:00
Igor Artamonov
748260bebe invalidate blocks from future 2016-11-28 20:14:43 +06:00
keorn
ef4ecce7bf nicer vote counting + test 2016-11-28 14:08:38 +00:00
keorn
09c28806d6 proper test IoHandler 2016-11-28 11:47:33 +00:00
keorn
5c0e89ae9a Merge branch 'master' into auth-bft 2016-11-28 09:50:22 +00:00
keorn
89f0bd714d test whole transitioning 2016-11-28 09:42:50 +00:00
arkpar
c7b359fcee Style 2016-11-28 01:37:25 +01:00
arkpar
d0c80a6903 Updated tests 2016-11-28 01:37:25 +01:00
arkpar
3aceac60de Use sha3 for fat key 2016-11-28 01:37:24 +01:00
arkpar
b0555fbe7c State export 2016-11-28 01:37:24 +01:00
Gav Wood
3b6d886860
Fix up the transaction JSON serialisation for RPC. 2016-11-27 14:11:37 +01:00
Tomasz Drwięga
a9028ca986 Merge branch 'master' into rpc-middleware
Conflicts:
	Cargo.lock
	rpc/src/v1/tests/mocked/parity_accounts.rs
2016-11-25 21:18:02 +01:00
keorn
a7afbf4d25 tracing and vote test 2016-11-25 16:45:32 +00:00
keorn
8f72017bcc add transition tracing 2016-11-25 16:44:57 +00:00
keorn
f59746b2da order messages by signature 2016-11-25 16:44:18 +00:00
keorn
d2099d9f13 derive Eq for tests 2016-11-25 16:43:26 +00:00
Gav Wood
d0312b89ad Update test, fix number. (#3612) 2016-11-25 13:03:15 +01:00
keorn
1692c07ba6 Merge branch 'master' into auth-bft 2016-11-25 10:51:06 +00:00
keorn
da499b0a4a self contained test proposal 2016-11-24 19:59:08 +00:00
keorn
f867372dfe increase default proposal time 2016-11-24 19:58:29 +00:00
keorn
04acdd6ca0 reuse rlp generation 2016-11-24 19:57:58 +00:00
Gav Wood
e9197f5862 Merge pull request #3603 from ethcore/trace-fix
Always insert traces for genesis.
2016-11-24 17:16:37 +01:00
Gav Wood
46e5a84bc5 Merge pull request #3540 from ethcore/delete-accounts
Real deleting accounts
2016-11-24 17:16:26 +01:00
Tomasz Drwięga
aa52c72bda Traces for genesis are always present. 2016-11-24 15:05:52 +01:00
keorn
8f37807d4b seal checks 2016-11-24 13:57:54 +00:00
keorn
38f25fc195 message tests and fixes 2016-11-24 13:57:04 +00:00
keorn
207364929c improve error types 2016-11-24 13:55:16 +00:00
Tomasz Drwięga
cd6f565f69 RPC Middleware & Get/Set dapp-specific accounts 2016-11-23 16:27:05 +01:00
Gav Wood
820e291ac8 Merge pull request #3573 from ethcore/no-bg-download
CLI option to disable ancient block downloading
2016-11-23 16:06:45 +01:00
Arkadiy Paronyan
a969c008d1 Fix panic on importing own invalid transaction (#3550) 2016-11-23 08:46:55 +01:00
arkpar
7da8f019d5 --no-ancient-blocks 2016-11-22 18:15:55 +01:00
keorn
8f6a464c51 new error types 2016-11-22 17:15:22 +00:00
Gav Wood
03d3e585af Merge pull request #2445 from ethcore/adaptive_queue_threads
Use an adaptive number of threads in the verification queue
2016-11-22 17:39:11 +01:00
keorn
340d377930 Revert "dont keep account provider in miner"
This reverts commit 11ccacd6d0.
2016-11-22 16:05:27 +00:00
Jaco Greeff
609e8912d8 Merge branch 'master' into delete-accounts 2016-11-22 16:19:40 +01:00
Gav Wood
818e54d44e Merge pull request #3547 from ethcore/fix-flaky-auth
Fix flaky test
2016-11-22 00:01:51 +01:00
keorn
32bcd08b94 test utilities 2016-11-21 18:54:16 +00:00
keorn
66526af5a8 pass engine in tests 2016-11-21 18:53:53 +00:00
keorn
84fdaf966a correct seal verification 2016-11-21 16:02:26 +00:00
keorn
841d0941e0 remove WithSome block hash 2016-11-21 16:01:52 +00:00
keorn
12dbdc1d6e dont pass ap 2016-11-21 16:01:34 +00:00
Robert Habermeier
53afb8d22d queue: park directly instead of through condvar 2016-11-21 14:48:25 +01:00
Robert Habermeier
133796b7ff queue: verifier scaling tests 2016-11-21 14:23:34 +01:00
keorn
42ef7767da delete unused message type 2016-11-21 12:23:27 +00:00
keorn
6e0bd4072b Merge branch 'master' into auth-bft 2016-11-21 12:17:00 +00:00
keorn
959ccc705a fix indent 2016-11-21 12:07:43 +00:00
keorn
c6db157554 fix flaky test, clean up specs 2016-11-21 12:06:14 +00:00
keorn
e69be670de message serialization 2016-11-21 11:36:07 +00:00
Robert Habermeier
06f5bf809f Merge branch 'master' into client-provider 2016-11-21 12:19:11 +01:00
Arkadiy Paronyan
efd1d9bd0e Ropsten network (#3539)
* Ropsten network

* Sorted premine

* Comas

* Removed trailing coma
2016-11-20 16:38:45 +01:00
Gav Wood
2b8bed434c
RPC for deleting accounts. 2016-11-20 16:17:57 +01:00
Gav Wood
0848a9ec3c
Merge branch 'master' into transactions-propagate 2016-11-20 13:24:08 +01:00
Robert Habermeier
58ca93c123 document lock order 2016-11-18 19:27:32 +01:00
Robert Habermeier
48df2e12fa exclusive access to each peer at a time 2016-11-18 19:26:05 +01:00
Robert Habermeier
4fd9670b33 support request sending 2016-11-18 19:12:20 +01:00
Arkadiy Paronyan
4a3bdf13df Check transaction signature when adding to the queue (#3508) 2016-11-18 17:45:19 +01:00
Robert Habermeier
f1c665081a Merge branch 'master' into client-provider 2016-11-18 16:07:50 +01:00
Robert Habermeier
63aa54cfc7 trigger event handlers, update capabilities 2016-11-18 15:30:06 +01:00
keorn
49cbd6ef98 unused imports, proposer_nonce 2016-11-18 13:38:04 +00:00
keorn
2f3b801296 rename transition 2016-11-18 13:37:47 +00:00
keorn
e90d814193 lock rounds 2016-11-18 12:27:00 +00:00
Robert Habermeier
3fabad5c0f event struct types 2016-11-18 12:36:31 +01:00
keorn
c62795d09b ap registration 2016-11-17 23:36:24 +00:00
keorn
9d61071dd7 Merge branch 'miner-no-ap' into auth-bft 2016-11-17 22:04:07 +00:00
keorn
9d8ac7a09b extra line [ci skip] 2016-11-17 19:08:00 +00:00
keorn
11b6578bc3 update tests 2016-11-17 18:46:50 +00:00
keorn
11ccacd6d0 dont keep account provider in miner 2016-11-17 18:32:12 +00:00
keorn
3bac68419a last_lock 2016-11-17 17:12:37 +00:00
Robert Habermeier
8c0e511ebe rewrite scaling logic 2016-11-17 18:10:09 +01:00
Robert Habermeier
546cd00659 allocate verifiers up front, hibernate when not needed 2016-11-17 16:00:23 +01:00
keorn
ce711e321a remove unused vote accumulators 2016-11-17 13:28:29 +00:00
keorn
51ac38318a save proposal hash 2016-11-17 13:26:57 +00:00
Tomasz Drwięga
5c62e38a7c Cleanup 2016-11-17 13:52:09 +01:00
Tomasz Drwięga
fc4b51fe68 Prioritizing local transactions regardless of nonce 2016-11-17 13:42:45 +01:00
Tomasz Drwięga
74bf2c75f0 Transaction queue improvements 2016-11-17 13:32:13 +01:00