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
Tomasz Drwięga
6e51b23e30
Adding traces tests
2016-12-14 20:07:33 +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
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
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
keorn
c96826beaa
expect instead of index
2016-12-13 18:22:56 +01:00
arkpar
5fd2e15313
Style and docs
2016-12-12 23:21:44 +01:00
keorn
fa504e510f
Merge branch 'master' into auth-bft
2016-12-12 21:28:46 +01: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
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
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
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
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
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
1f9adc8622
Merge branch 'master' into txqueue-gc
...
Conflicts:
ethcore/src/miner/miner.rs
2016-12-10 17:00:29 +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
Gav Wood
316c25d9f8
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-10 14:08:41 +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
Tomasz Drwięga
5d054f08c3
Clearing old transactions
2016-12-09 15:05:03 +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
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
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
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
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
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
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
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
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
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
