 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 |
|
|
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
|
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 |
|
|
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 |
|