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
Gav Wood
74a6203f72
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 15:43:28 +01:00
Robert Habermeier
6724f574d6
Light server improvements and protocol adjustments ( #3801 )
...
* light: basic transaction pool
* light: network timeouts
* fix dead code warnings
* les: update to new message format
* fix indentation
* les: hash or number in headers req, not both
2016-12-11 15:40:31 +01:00
Igor Artamonov
6742b080f5
use decimals for block numbers in config
2016-12-11 20:38:37 +06:00
Igor Artamonov
4e3c49c809
revert ETC to correct Network ID
2016-12-11 20:34:46 +06:00
Gav Wood
b28537aa9a
Merge pull request #3809 from ethcore/mining-min-gas-limit
...
block: enforce gas limit falls within engine bounds
2016-12-11 15:08:30 +01:00
Igor Artamonov
aed633d7df
Testnet for Ethereum Classic
2016-12-11 19:25:02 +06:00
Igor Artamonov
7b5bc115e9
EIP-160 configuration for Ethereum Classic
2016-12-11 18:29:40 +06:00
Igor Artamonov
592ff53bab
EIP-155 configuration for Ethereum Classic
2016-12-11 18:28:37 +06:00
Robert Habermeier
9252ebf93d
block: enforce gas limit falls within engine bounds
2016-12-11 12:50:48 +01:00
arkpar
c777362d02
Sync channel for consensus test
2016-12-11 12:32:01 +01:00
Gav Wood
0a494962e4
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 02:13:52 +01:00
Gav Wood
120564ff29
Avoid pulling in hash_fetch.
2016-12-11 02:12:52 +01:00
Gav Wood
0302d582d2
Fix build.
2016-12-11 02:02:40 +01:00
Gav Wood
fa30dfd4b9
Refactor into system service, add exe redirect.
2016-12-10 23:58:39 +01:00
Tomasz Drwięga
1e8638608c
fixing tests
2016-12-10 22:59:35 +01:00
Tomasz Drwięga
b5020d3c8d
Fixing Light context API
2016-12-10 21:25:28 +01:00
Tomasz Drwięga
19ca9ad460
Prevent broadcasting transactions to peer that send them.
2016-12-10 21:22:19 +01:00
keorn
b6c7ed24b7
Client trait reorg
2016-12-10 18:35:29 +01:00
keorn
f3af0f46be
Merge branch 'master' into auth-bft
2016-12-10 18:14:35 +01:00
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
Gav Wood
735df6c30f
More work.
2016-11-24 17:19:48 +01: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
a3730b3042
change proposer address
2016-11-24 13:56:27 +00:00
keorn
207364929c
improve error types
2016-11-24 13:55:16 +00:00
Gav Wood
03ef95ba50
Compiles.
2016-11-23 20:35:21 +01:00
Gav Wood
5d62cfdf6f
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-23 18:15:21 +01:00
Gav Wood
9d3b2352cc
More work.
2016-11-23 16:29:15 +01: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
Gav Wood
4c9bb5aa25
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-23 14:45:55 +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
d5b15d4560
change authorities for testing
2016-11-22 17:15:42 +00: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
bf9ed2d444
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-22 10:25:34 +01:00
Gav Wood
45dead9d49
Naming consistency and make Updater improvements.
...
- ID -> Id (consistency with rust libs)
2016-11-22 10:24:22 +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
Gav Wood
10e64847a4
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-21 18:17:31 +01:00
Jaco Greeff
af0db9f80e
New registry contract address for ropsten ( #3549 )
...
* New registry for ropsten
* Registry address
* Registry with payable modifier
2016-11-21 18:14:23 +01: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
Gav Wood
601e0fb0fd
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-21 11:43:29 +01:00
Tomasz Drwięga
cc8a9d410b
Adding fetch API to the crate
2016-11-20 18:44:23 +01:00
Tomasz Drwięga
845bc52e36
Moving contract resolver to separate crate
2016-11-20 17:40:28 +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
Gav Wood
27a8608624
More information in the updater.
2016-11-20 13:18:56 +01:00
Gav Wood
44eda379ad
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-19 03:43:43 +01:00
Konstantin
d870b71636
updated the european warp bootnode addresses ( #3528 )
2016-11-18 19:41:39 +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
Gav Wood
4fd575b5ec
Add traces.
2016-11-18 19:52:11 +08:00
Robert Habermeier
3fabad5c0f
event struct types
2016-11-18 12:36:31 +01:00
Gav Wood
cd770490ff
Remove unneeded file.
2016-11-18 19:22:47 +08:00
Gav Wood
401a4a37c1
Initial structure for auto-updater.
...
- Add auto-gen'ed Operations and Registry ABIs.
- Add Updater for managing updates.
- Add fields in Client to enable update checking and registry.
2016-11-18 19:14:52 +08:00
Gav Wood
28aabcdb6c
Merge branch 'master' into check-updates
2016-11-18 11:45:04 +08: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
Tomasz Drwięga
3bfd6c5998
Merge branch 'master' into transactions-propagate
2016-11-17 14:37:29 +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
keorn
9563ccfbd2
message broadcasting methods
2016-11-17 12:18:20 +00:00
keorn
45027ea306
add new client messaging
2016-11-17 12:17:48 +00:00
Robert Habermeier
44dcd6bc3b
increase readjustment period
2016-11-17 13:10:33 +01:00
Robert Habermeier
ada9d2b760
Merge branch 'master' into adaptive_queue_threads
2016-11-17 13:00:24 +01:00
Tomasz Drwięga
e45fa62ed5
Fixing tests, fixing refreshing precompiled ( #3483 )
...
* Fixing tests, fixing refreshing precompiled
* Commit only js and Cargo.lock
* Moving commands to the right place
* Adding js content as well
2016-11-17 10:58:07 +01:00
keorn
802d5c669d
transition rules
2016-11-16 18:01:09 +00:00
Tomasz Drwięga
cd686b5d68
Merge branch 'master' into transactions-propagate
2016-11-16 18:07:44 +01:00
Tomasz Drwięga
2cd2b10327
Local transactions RPC
2016-11-16 17:54:54 +01:00
