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 |
|
Gav Wood
|
83e6e03dd6
|
Merge pull request #3865 from ethcore/tx-block
Delayed transactions
|
2016-12-16 20:28:18 +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 |
|
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 |
|
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 |
|
arkpar
|
f8961484c1
|
Merge branch 'master' of github.com:ethcore/parity into tx-block
|
2016-12-15 19:10:33 +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 |
|
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 |
|
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 |
|