openethereum/ethcore/res
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
..
ethereum Beta backports (#4067) 2017-01-06 16:05:35 +01:00
instant_seal.json Instant sealing engine (#1767) 2016-07-30 14:42:31 -07:00
null_morden.json Fix state not using "account_starting_nonce" (#1830) 2016-08-04 18:17:39 +02:00
null.json Gas price statistics. (#1291) 2016-06-18 10:52:50 +02:00
test_authority.json Basic Authority (#991) 2016-05-03 17:23:53 +02:00