Commit Graph

2122 Commits

Author SHA1 Message Date
Nikolay Volf af501e6467 Custom attribute for binary serialization (#3922)
* derive(Binary) -> binary

* ethcore types refact

* fixup ethcore

* make binary optional

* fix common types

* fix updater

* remove condition
2016-12-21 15:09:35 +01:00
Robert Habermeier 01b494ca2c Merge branch 'master' into lightsync 2016-12-21 13:42:07 +01:00
Gav Wood cd8af0a497 Merge pull request #3904 from ethcore/new-dirs
Fixed upgrading keys on the first run
2016-12-19 22:24:37 +01:00
Gav Wood 18965be047 Merge pull request #3903 from ethcore/test-mem-limit-deadlock
fix deadlock in queue drop
2016-12-19 22:23:56 +01:00
Gav Wood 5ba16e4867 Merge pull request #3897 from ethcore/single-provider-functions
require only simpler methods on Provider
2016-12-19 22:23:39 +01:00
Robert Habermeier 70d53dcfd6 Merge branch 'master' into lightsync 2016-12-19 18:53:52 +01:00
Robert Habermeier ae8f77bc7c fix deadlock in queue drop 2016-12-19 18:10:26 +01:00
arkpar ddb242c969 Fixed upgrading keys on the first run 2016-12-19 17:41:55 +01:00
Gav Wood 1f8a1cac22 Merge pull request #3896 from ethcore/timestamp-ignore
Allow retry for future blocks
2016-12-19 15:21:05 +01:00
Robert Habermeier 4c7dc9f2d8 require only simpler methods on Provider 2016-12-19 14:54:10 +01:00
arkpar d3486b45c5 Allow retry for future blocks 2016-12-19 14:47:48 +01:00
keorn 46662899da make spec naming consistent 2016-12-19 14:15:39 +01:00
Robert Habermeier a48435ca60 Merge branch 'master' into lightsync 2016-12-19 13:15:37 +01:00
Robert Habermeier ccdf5d5873 increase tick timer and limit peers to one req 2016-12-19 12:28:42 +01:00
Gav Wood e755c09446 Merge pull request #3884 from ethcore/fix-diff-adj
Fix difficulty adjustment.
2016-12-17 16:35:20 +01:00
Gav Wood 023d413610
Fix difficulty adjustment.
Closes #3861
2016-12-17 15:53:06 +01:00
arkpar b34d3ee5a2 Fixin racy test 2016-12-17 12:28:31 +01:00
Robert Habermeier 2c0f456e4d guard import order 2016-12-16 23:53:20 +01:00
Robert Habermeier a7505be627 fix deadlocks 2016-12-16 22:09:29 +01:00
Gav Wood 83e6e03dd6 Merge pull request #3865 from ethcore/tx-block
Delayed transactions
2016-12-16 20:28:18 +01:00
Robert Habermeier f85313fbff Merge branch 'master' into lightsync 2016-12-16 15:29:11 +01:00
Gav Wood b89d10239b
Update tests, gitlabci 2016-12-16 15:12:35 +01:00
arkpar 65f07e5aa7 Renamed some functions 2016-12-16 14:54:26 +01:00
arkpar 6c9de9e6f8 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-16 13:36:07 +01:00
arkpar f967713d08 Added a test 2016-12-16 13:27:14 +01:00
Gav Wood 72f278efed Merge pull request #3868 from ethcore/new-dirs
Base directory option
2016-12-16 13:04:31 +01:00
Gav Wood 6e5a583cb4 Merge pull request #3505 from ethcore/check-updates
Auto-updating
2016-12-16 13:01:49 +01:00
keorn d8470cc5ca revert slack 2016-12-16 00:07:07 +01:00
Robert Habermeier a1f32de2d9 Merge branch 'master' into lightsync 2016-12-15 23:55:04 +01:00
keorn 447196398a fix start_step 2016-12-15 23:36:06 +01:00
Gav Wood ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
arkpar e2371632c5 Base dir option 2016-12-15 21:56:45 +01:00
Robert Habermeier 9c7340307e handle events, minimal state machine 2016-12-15 21:51:08 +01:00
arkpar 060cc799a6 Minor tweaks 2016-12-15 21:44:31 +01:00
arkpar 27580586e0 Minor tweaks 2016-12-15 20:09:05 +01:00
keorn b7b531ca75 more slack in test 2016-12-15 19:54:28 +01:00
keorn b88d50dc9b fix naming collision 2016-12-15 19:27:06 +01:00
Robert Habermeier 72f7391551 add BasicContext trait for handler ticking 2016-12-15 19:25:52 +01:00
arkpar f8961484c1 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:10:33 +01:00
Robert Habermeier 5346539ef8 minimal header import and client service 2016-12-15 18:47:26 +01:00
Gav Wood c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
arkpar 2952ea1b85 Delayed transactions 2016-12-15 18:19:19 +01:00
Gav Wood d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 17:12:18 +01:00
Gav Wood db2e1dd01a
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 17:11:22 +01:00
Gav Wood 2e02db2d3e Merge pull request #3860 from ethcore/fix-channel
Fix flaky test
2016-12-15 17:10:41 +01:00
keorn ee653bc262 unused import 2016-12-15 16:53:28 +01:00
keorn 9bfa69c6bd fix channel 2016-12-15 16:52:39 +01:00
Gav Wood 817a58cf64 Merge pull request #3844 from ethcore/trace-macros
Converting traces API to AutoArgs
2016-12-15 15:21:35 +01:00
Gav Wood 590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood 20b2f84d48 Merge pull request #3828 from ethcore/new-dirs
New directory structure
2016-12-15 14:34:01 +01:00
Jaco Greeff 054a6a9daf Merge branch 'master' into check-updates
# Conflicts:
#	.gitlab-ci.yml
#	js/webpack/dev.server.js
2016-12-15 13:52:28 +01:00
Gav Wood 1ea521ea7d
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 13:51:22 +01:00
keorn 0b9ab0797f fix build 2016-12-15 13:45:22 +01:00
keorn 943efc21bb add tendermint seal 2016-12-15 13:41:04 +01:00
Gav Wood 69eec105a7
Change default back to permissive for now. 2016-12-15 13:40:44 +01:00
Gav Wood db73b0d66f
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 13:28:37 +01:00
Gav Wood a74bce2c06 Merge pull request #3759 from ethcore/auth-bft
Tendermint Engine
2016-12-15 13:18:15 +01:00
Gav Wood a660024eac Merge pull request #3843 from ethcore/auth-round-seal
AuthorityRound seal and simplify Generic seal Spec
2016-12-15 13:08:50 +01:00
Gav Wood c4406c9198 Merge pull request #3691 from ethcore/rotating-key
Signing transactions with rotating token
2016-12-15 13:08:19 +01:00
Robert Habermeier 0768a61944 light: add LightChainClient trait 2016-12-14 23:26:15 +01:00
Gav Wood bf7fb84937
Don't put sha3s. 2016-12-14 21:59:00 +01:00
Tomasz Drwięga 6e51b23e30 Adding traces tests 2016-12-14 20:07:33 +01:00
Jaco Greeff 2588aea6b2 Merge branch 'master' into check-updates 2016-12-14 14:37:38 +01:00
Tomasz Drwięga 7eb9112613 Merge branch 'master' into rotating-key
Conflicts:
	rpc/src/v1/traits/signer.rs
2016-12-14 14:10:44 +01:00
keorn f686fa3d6f update specs and generic conversion 2016-12-14 12:50:32 +01:00
keorn ae98a56e8b revert submodule 2016-12-14 11:42:47 +01:00
keorn e1d83d15b7 bump dev chain 2016-12-14 11:34:19 +01:00
arkpar be5fefe772 Merge branch 'master' of github.com:ethcore/parity into new-dirs 2016-12-14 00:04:11 +01:00
Gav Wood 597c3a4770
Ensure chain state is at threshold security level before looking for updates. 2016-12-13 21:21:07 +01:00
Robert Habermeier 6fb71527e4 light: search for common ancestor with peers 2016-12-13 21:09:57 +01:00
Gav Wood 805b8cab2c
Add missing file. 2016-12-13 20:50:33 +01:00
Gav Wood 4424155d39
Similar checks on file changes to other tests. 2016-12-13 20:49:26 +01:00
Robert Habermeier 484023b171 light: max requests as 0 on unknown peer 2016-12-13 20:13:55 +01:00
Robert Habermeier 2a01b43bd1 light: block status and CHT module 2016-12-13 20:13:16 +01:00
keorn c96826beaa expect instead of index 2016-12-13 18:22:56 +01:00
Gav Wood 80d6e49070 Merge pull request #3812 from ethereumproject/splix/classic-replay-protection
Network configuration for Ethereum Classic
2016-12-13 17:39:33 +01:00
Robert Habermeier 45ef986c04 light: finish basic header chain and add tests 2016-12-13 14:48:03 +01:00
arkpar 5fd2e15313 Style and docs 2016-12-12 23:21:44 +01:00
Robert Habermeier 4173ecf2a5 light: begin header chain 2016-12-12 22:59:05 +01:00
keorn fa504e510f Merge branch 'master' into auth-bft 2016-12-12 21:28:46 +01:00
Igor Artamonov e61d14d7f7 reuse Morden for Classic Testnet 2016-12-12 19:50:32 +00:00
keorn 19adb84527 TestNet flushing and cleanup 2016-12-12 19:44:24 +01:00
keorn f8ed5cf022 finalize unit tests 2016-12-12 17:20:20 +01:00
arkpar 6601fde328 New data paths with upgrade 2016-12-12 16:51:07 +01:00
Gav Wood 988ac8a22d
Add forks supported. 2016-12-12 16:47:57 +01:00
Gav Wood ab4d666681
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-12 16:35:11 +01:00
Gav Wood c0a2d5c8f5 Merge pull request #3796 from ethcore/tx-broadcast
Avoid broadcasting transactions to peers that send them
2016-12-12 04:13:56 +01:00
keorn 3c5d5856d2 nicer tracing 2016-12-11 22:54:48 +01:00
Tomasz Drwięga 83d9bc189b Fixing test 2016-12-11 21:08:15 +01:00
Gav Wood e528ac9217
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-11 20:20:09 +01:00
Gav Wood 94f5501c61
authors & homepage => Parity 2016-12-11 19:43:58 +01:00
Gav Wood 58b72c521d
Rename ethcore -> parity in licenses. 2016-12-11 19:31:31 +01:00
Gav Wood 17cc2be4b5
Rename ethcore -> parity in license. 2016-12-11 19:30:54 +01:00
Gav Wood 10b0898bdf
Crate tidyups.
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
2016-12-11 19:14:42 +01:00
keorn a4bf914683 Merge branch 'auth-bft' of https://github.com/ethcore/parity into auth-bft 2016-12-11 18:23:54 +01:00
Tomasz Drwięga 627b8a8414 Changing default policy 2016-12-11 17:56:12 +01:00
keorn d4c9493b00 verification cache retrieval 2016-12-11 17:50:12 +01:00
Tomasz Drwięga b56f12adc6 Merge branch 'master' into tx-broadcast
Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs
2016-12-11 17:31:56 +01:00
Gav Wood e09b1faf20
Fix semver version issues. 2016-12-11 17:13:26 +01:00
Gav Wood 22cb5753d0
Improve capability information and disable old clients. 2016-12-11 16:52:41 +01:00