openethereum/ethcore/res/ethereum
Tomasz Drwięga 091a59ef0b Beta backports (#4067)
* Improving logs for transaction propagation

Conflicts:
	sync/src/chain.rs

* Propagate only on timer

Conflicts:
	sync/src/chain.rs

* Maintaining a list of transactions propagated from other peers

Conflicts:
	ethcore/src/client/client.rs
	ethcore/src/client/traits.rs
	js/src/dapps/localtx/Transaction/transaction.js
	js/src/dapps/localtx/Transaction/transaction.spec.js
	rpc/src/v1/tests/helpers/sync_provider.rs
	rpc/src/v1/types/sync.rs
	sync/src/api.rs
	sync/src/chain.rs
	sync/src/transactions_stats.rs

* fixing test

Conflicts:
	rpc/src/v1/tests/mocked/parity.rs

* Returning persistent node id

Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs
	sync/src/api.rs

* Prevent broadcasting transactions to peer that send them.

Conflicts:
	js/src/dapps/localtx/Transaction/transaction.js
	rpc/src/v1/tests/helpers/sync_provider.rs
	rpc/src/v1/tests/mocked/parity.rs
	rpc/src/v1/types/sync.rs
	sync/src/api.rs
	sync/src/chain.rs
	sync/src/transactions_stats.rs

* Bumping versions

* Fixing broken classic.json

Former-commit-id: 2cadea67a0a2f60dd11e0fb943bb0c79b42ab4eb
2017-01-06 16:05:35 +01:00
..
tests@9028c4801f Touched the file to trigger js build 2016-11-25 22:50:45 +01:00
classic.json Beta backports (#4067) 2017-01-06 16:05:35 +01:00
eip150_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
eip161_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
expanse.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
frontier_like_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
frontier_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
frontier.json Backporting to beta (#3525) 2016-11-18 20:50:20 +01:00
homestead_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
morden.json ETC Config change backport (#4056) 2017-01-05 21:16:33 +01:00
olympic.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00
ropsten.json Backporting to beta (#3623) 2016-11-25 20:57:34 +01:00
transition_test.json EIPs 155, 160, 161 (#2976) 2016-11-03 22:22:25 +01:00