Commit Graph

33 Commits

Author SHA1 Message Date
arkpar b9fc5bdda0 Merge remote-tracking branch 'origin/transaction_queue_race' into beta 2016-03-15 12:56:30 +01:00
Tomasz Drwięga 40ac01b730 Fixing possible race in transaction queue 2016-03-15 10:54:19 +01:00
Arkadiy Paronyan 0087568c16 Merge pull request #712 from ethcore/beta-version
Version 1.0 in beta
2016-03-14 14:56:44 +01:00
Arkadiy Paronyan 38de95cc3b Merge pull request #719 from ethcore/targetgaslimit
Allow configuration of target gas limit.
2016-03-14 14:04:09 +01:00
Gav Wood 7af0a1dc2c Missing comma. 2016-03-14 02:02:32 +01:00
Gav Wood f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
arkpar f77b4119da Version 1.0 2016-03-14 01:01:15 +01:00
arkpar 9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Tomasz Drwięga e2e067cdd0 Bumping clippy 2016-03-13 20:44:25 +01:00
Gav Wood 76696e3b49 Minor build fixes. 2016-03-13 15:36:03 +01:00
Gav Wood 08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Gav Wood 9424d53062 Update lib.rs 2016-03-12 10:37:27 +01:00
Tomasz Drwięga aebc91d96f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
2016-03-12 09:50:18 +01:00
Tomasz Drwięga fadbc61dff Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
	miner/src/miner.rs
	parity/main.rs
2016-03-11 19:27:09 +01:00
Tomasz Drwięga 197ea7f7d6 Using miner in rpc instead of sync 2016-03-11 14:51:07 +01:00
Tomasz Drwięga 03da6c991f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
2016-03-11 14:37:07 +01:00
Tomasz Drwięga 2fd036b073 Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
	rpc/src/v1/helpers/poll_manager.rs
	rpc/src/v1/impls/eth.rs
2016-03-11 11:44:44 +01:00
Tomasz Drwięga 55a14b3aaf Fixing transaction queue test 2016-03-11 11:40:12 +01:00
Tomasz Drwięga 92022ac14d Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs
2016-03-10 16:38:58 +01:00
Tomasz Drwięga c37370a8a7 PendingTransaction filter. 2016-03-10 16:04:59 +01:00
Tomasz Drwięga 9ea3c0eba0 Fixing compilation on beta & stable 2016-03-10 15:20:54 +01:00
Tomasz Drwięga 9db4720162 Fixing clippy warnings. 2016-03-10 14:15:47 +01:00
Tomasz Drwięga 0535fb30c6 Merge branch 'master' into ethminer_crate
Conflicts:
	sync/src/lib.rs
2016-03-10 14:03:09 +01:00
Tomasz Drwięga eb1fab9202 Adding clippy support to ethminer. 2016-03-10 12:33:29 +01:00
Tomasz Drwięga 2e72173620 Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
2016-03-10 12:25:36 +01:00
Tomasz Drwięga 3c0587b375 Merge branch 'ethminer_crate' into tx_queue_min_gas 2016-03-09 15:27:27 +01:00
Tomasz Drwięga 3d74e5bd47 Fixing doctest 2016-03-09 15:27:07 +01:00
Tomasz Drwięga 493c61f09d Minimal gas price threshold. Closes: #636 2016-03-09 15:22:11 +01:00
Tomasz Drwięga 363de973c9 Adding documentation and ditching EthMiner 2016-03-09 14:26:28 +01:00
Tomasz Drwięga 9d664336b5 Tratifying Miner 2016-03-09 13:30:59 +01:00
Tomasz Drwięga 5db84c3233 Adding transactions to block 2016-03-09 13:09:34 +01:00
Tomasz Drwięga 9acb36af87 Fixing tests compilation. Removing ethminer dependency on client 2016-03-08 16:23:32 +01:00
Tomasz Drwięga 99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +01:00