Commit Graph

2103 Commits

Author SHA1 Message Date
keorn b9909da8b1 move Sealing methods to MiningBlockChainClient 2016-12-10 17:40:20 +01:00
Tomasz Drwięga c408861c29 Updating submodules 2016-12-10 17:36:29 +01:00
Tomasz Drwięga 42c2d2291a Merge branch 'master' into rotating-key 2016-12-10 17:00:59 +01:00
Tomasz Drwięga 1f9adc8622 Merge branch 'master' into txqueue-gc
Conflicts:
	ethcore/src/miner/miner.rs
2016-12-10 17:00:29 +01:00
Tomasz Drwięga aaf6da4c00 Returning persistent node id 2016-12-10 16:55:29 +01:00
Robert Habermeier a6fcd8a0d9 Merge pull request #3794 from ethcore/net-fix
Network connectivity fixes
2016-12-10 16:55:17 +01:00
keorn 239ba61a99 move transition message to to_step 2016-12-10 16:50:23 +01:00
Tomasz Drwięga 704054ef40 Merge branch 'master' into tx-broadcast
Conflicts:
	ethcore/src/client/traits.rs
2016-12-10 15:23:53 +01:00
Tomasz Drwięga e1ade5b375 Maintaining a list of transactions propagated from other peers 2016-12-10 15:18:44 +01:00
Tomasz Drwięga 27503e8e8c Merge branch 'master' into rotating-key
Conflicts:
	ethstore/src/ethstore.rs
	ethstore/src/secret_store.rs
2016-12-10 15:13:58 +01:00
arkpar 02c788a403 Network connectivity fixes 2016-12-10 14:20:34 +01:00
Gav Wood 316c25d9f8
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-10 14:08:41 +01:00
Gav Wood 0977b82eeb
More fixes. 2016-12-10 13:54:17 +01:00
Gav Wood 7eb30b1249
Fix build. 2016-12-10 13:52:43 +01:00
Gav Wood 82efa2675e
Merge remote-tracking branch 'origin/master' into consistent-id 2016-12-10 13:36:30 +01:00
Tomasz Drwięga 4696d7f606 Additional RPCs for dapps accounts management 2016-12-10 12:36:04 +01:00
keorn e5f8044cad Merge branch 'master' into auth-bft 2016-12-10 11:01:23 +01:00
keorn 5f09eb9d04 update tests to new spec (#3790) 2016-12-10 10:38:10 +01:00
Gav Wood edd5e76050
Merge branch 'consistent-id' into check-updates 2016-12-09 23:12:36 +01:00
Gav Wood 5f1fcf95e0
Make *ID names consistent with std Rust (Id) 2016-12-09 23:01:43 +01:00
Robert Habermeier 503b126c93 Merge branch 'master' into lightserv 2016-12-09 21:37:55 +01:00
Gav Wood 2226324495 Merge pull request #3778 from ethcore/auth-round-test
AuthorityRound network simulation test
2016-12-09 20:58:05 +01:00
keorn b15edd095e Merge branch 'auth-bft' of https://github.com/ethcore/parity into auth-bft 2016-12-09 20:51:42 +01:00
Gav Wood c82754874c
Fix typo. 2016-12-09 20:48:52 +01:00
keorn 08e7e79bfd more test 2016-12-09 20:48:05 +01:00
Gav Wood 46af3d18da
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-09 20:45:15 +01:00
Gav Wood e5e6b77984
Cleanups and avoid redownloading. 2016-12-09 20:40:24 +01:00
arkpar 97f358ced9 AuthorityRound network simulation test 2016-12-09 20:38:06 +01:00
Tomasz Drwięga c91a614c3d Fixing tests 2016-12-09 20:24:33 +01:00
arkpar ca7406773f AuthorityRound network simulation test 2016-12-09 19:27:16 +01:00
Gav Wood c2b6be95c8
Fetch and place in updates path. 2016-12-09 19:02:42 +01:00
Tomasz Drwięga cee07fef74 Trigger remove_old on new block 2016-12-09 15:54:13 +01:00
Robert Habermeier 415fccfffb add ethcore-light cov target 2016-12-09 15:20:45 +01:00
Tomasz Drwięga 5d054f08c3 Clearing old transactions 2016-12-09 15:05:03 +01:00
Robert Habermeier 5f37c93659 les: use negotiated protocol version 2016-12-09 15:04:54 +01:00
keorn 56e9dab9de add Engine stop method 2016-12-09 14:52:08 +01:00
arkpar cc8c2ea58d Reject existing tx 2016-12-09 14:37:11 +01:00
Tomasz Drwięga 3ccdb7c143 Fixing unused imports 2016-12-09 10:52:42 +00:00
Tomasz Drwięga c76b7cf8f8 Fixing tests submodule 2016-12-09 10:48:46 +00:00
keorn 42c34b5c1b ignore flaky test 2016-12-09 10:53:38 +01:00
Tomasz Drwięga 930183831b Adding tests for ethstore 2016-12-09 09:45:34 +00:00
Tomasz Drwięga 8596134c0f Clearer updates handling 2016-12-09 08:31:58 +00:00
Tomasz Drwięga 93230dd4c2 Merge branch 'master' into rotating-key
Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in
2016-12-09 07:37:34 +00:00
Robert Habermeier eec1929658 Merge branch 'master' into lightserv 2016-12-09 01:29:46 +01:00
Robert Habermeier 07d7a37319 les: make peer buffer flow params optional 2016-12-09 01:06:51 +01:00
Robert Habermeier d53c47aa69 more tracing 2016-12-09 00:35:34 +01:00
Robert Habermeier e7ce8c9558 light: broadcast status updates to peers 2016-12-08 23:57:09 +01:00
Robert Habermeier 6f5f1f5e26 light: integrate with sync + serve_light CLI 2016-12-08 23:21:47 +01:00
keorn 7c42241466 remove merge code 2016-12-08 22:00:26 +01:00
keorn 74770e4773 better docstrings 2016-12-08 21:49:55 +01:00
keorn cc284dd86f Merge branch 'master' into auth-bft 2016-12-08 21:35:08 +01:00
keorn 79ef64349c remove assert 2016-12-08 21:27:49 +01:00
keorn 9ecb07434f fix informant 2016-12-08 21:13:32 +01:00
Gav Wood 2d6656fc43 Merge pull request #3725 from ethcore/engine-password
Make engine hold AccountProvider
2016-12-08 20:52:12 +01:00
keorn dca752e9bb docs, tweaks 2016-12-08 20:09:30 +01:00
Robert Habermeier efd66f566d ethsync: optional ipc codegen 2016-12-08 19:52:48 +01:00
Robert Habermeier 2e87e31157 light: no default features 2016-12-08 16:46:58 +01:00
Robert Habermeier 64ebcd0f24 fix contract code response encoding; add test 2016-12-08 16:12:00 +01:00
Robert Habermeier 3e8ee9d423 light IPC feature and mock state proofs 2016-12-08 13:44:17 +01:00
Robert Habermeier 8d16f73795 first few LES tests, fix get_header logic bug 2016-12-08 12:20:18 +01:00
keorn 3ebfa1481d better proposal block handling 2016-12-08 12:03:34 +01:00
Gav Wood 8903384840
Merge branch 'master' into check-updates 2016-12-07 19:19:44 +01:00
Robert Habermeier 2d1a3ff091 les: generalize network and event contexts with traits 2016-12-07 17:52:10 +01:00
Jaco Greeff 7c054d2da0 Remove unneeded block scope 2016-12-07 17:07:28 +01:00
Jaco Greeff 46840d36c9 Add parity_removeAddress RPC 2016-12-07 16:53:46 +01:00
keorn 347634ac6c dont rebroadcast propose 2016-12-07 16:42:58 +01:00
Robert Habermeier 10d75b6de0 light: implement all response handlers 2016-12-07 15:27:04 +01:00
keorn b73689f041 Merge branch 'engine-password' into auth-bft 2016-12-07 15:17:49 +01:00
keorn 727ace0561 add test 2016-12-07 15:14:21 +01:00
keorn e9743a3a75 Merge branch 'master' into auth-bft 2016-12-07 14:50:17 +01:00
keorn 4361cb53e7 Merge branch 'engine-password' into auth-bft 2016-12-07 14:49:42 +01:00
keorn 5faa4a85cb remove dummy type 2016-12-07 14:49:07 +01:00
keorn 6440ca2f68 move stuff around 2016-12-07 14:39:37 +01:00
Gav Wood 1f0a02b638 Merge pull request #3633 from ethcore/fix-tx-rpc
Fix up the transaction JSON serialisation for RPC.
2016-12-07 14:34:51 +01:00
Robert Habermeier cdc758368a les: flesh out event handler 2016-12-07 13:52:45 +01:00
Robert Habermeier 89726356a3 Merge pull request #3709 from ethcore/opt-in-verifier-scaling
queue: CLI for auto-scaling and num verifiers
2016-12-07 13:40:42 +01:00
keorn c582540746 Merge branch 'engine-password' into auth-bft 2016-12-07 11:41:38 +01:00
keorn 3ae09de019 restore is_new_best 2016-12-07 11:40:46 +01:00
keorn a296c5e226 test client message handling 2016-12-07 11:38:09 +01:00
Robert Habermeier b38d95328d light: conditional compilation 2016-12-07 10:50:24 +01:00
keorn da030fed51 Merge branch 'master' into auth-bft 2016-12-07 10:41:07 +01:00
keorn 5c333fce31 Merge branch 'engine-password' into auth-bft 2016-12-07 10:35:52 +01:00
keorn 71a96588b0 add the methods to engines 2016-12-07 10:34:06 +01:00
keorn d9eb5e7f1d remove uncles 2016-12-07 09:32:36 +01:00
Robert Habermeier 085b8ad553 Merge pull request #3527 from ethcore/client-provider
LES Part 2
2016-12-07 09:31:50 +01:00
Robert Habermeier 398b94e6e2 Merge branch 'master' into opt-in-verifier-scaling 2016-12-06 15:37:10 +01:00
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 5db93cd433 light: fix compile errors 2016-12-05 17:09:05 +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
Gav Wood afe4cc6a05
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-05 07:09:42 -08:00
Gav Wood 459babb1a8
Logging. 2016-12-05 06:39:56 -08:00
keorn db59bd8731 update genesis seal 2016-12-05 14:28:50 +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
Gav Wood 9d79cac36b
Cleanups. 2016-12-04 11:56:12 -08: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 356aca2db5
Fix build. 2016-12-04 09:13:23 -08:00
Gav Wood 90a20a217f
Merge branch 'master' into check-updates 2016-12-04 09:01:50 -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 f1542b5612 better genesis seal rlp 2016-12-03 16:19:51 +00: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
Tomasz Drwięga 8e2aca719f Shared hash-fetch 2016-11-30 10:16:18 +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
Tomasz Drwięga e1e7886918 Bumping clippy 2016-11-28 12:23:06 +01: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 ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates 2016-11-27 15:01:17 +01:00
Gav Wood 0cf8db58b8
Fix tests. 2016-11-27 14:49:30 +01:00
Gav Wood 3b6d886860
Fix up the transaction JSON serialisation for RPC. 2016-11-27 14:11:37 +01:00
Tomasz Drwięga 3b595a01ad Merge branch 'master' into rpc-middleware 2016-11-25 21:46:35 +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
Gav Wood de8dd47ff9
Fetch binaries. 2016-11-25 19:29:13 +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 8cddf9976a
Better information. 2016-11-25 15:43:49 +01:00
arkpar ffa123c949 Set default tx price to 0.0025 USD 2016-11-25 15:13:51 +01:00
Gav Wood d0312b89ad Update test, fix number. (#3612) 2016-11-25 13:03:15 +01:00
Gav Wood befb0bf2bd
Merge branch 'fix-number' into check-updates 2016-11-25 12:17:58 +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 45017c599a
Update test, fix number. 2016-11-24 19:11:29 +01:00