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