grassrootseconomics
/
openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,085 Commits 1 Branch 329 Tags 59 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
Nikolay Volf 8f4323f3bb Merge branch 'master' into pv63-receipts 
Conflicts:
	ethcore/src/client/test_client.rs
 2016-03-14 11:06:28 +01:00
Tomasz Drwięga 4cf18c728d Fixing sync invalid sync test 2016-03-13 20:53:47 +01:00
Nikolay Volf 809c239ff8 fix rev 2016-03-13 15:59:25 +01:00
Gav Wood 08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Gav Wood 02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
arkpar 0a6fea1b77 Silenced some non-important warnings 2016-03-13 10:33:55 +01:00
Nikolay Volf 0684abd345 fixed to return receipts grouped by requested block 2016-03-12 19:23:17 +01:00
arkpar 1e23a4c888 Don't redownload queued blocks on restart 2016-03-12 16:01:34 +01:00
arkpar 16618094f5 Cleanup header_ids 2016-03-12 16:01:34 +01:00
arkpar 1fe575bf7b Download bodies for validated hash chain only 2016-03-12 16:01:34 +01:00
arkpar 7ad7996144 Fixed common block detection 2016-03-12 16:01:34 +01:00
Nikolay Volf eaf22198e2 Merge pull request #676 from ethcore/fix-tx-warnings 
fix warning for transaction_queue.add usage
 2016-03-11 19:48:05 +03: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
Gav Wood b25551be7b Merge pull request #671 from ethcore/clippy_hook 
Removing running clippy by default on nightly.
 2016-03-11 14:03:16 +01:00
Nikolay Volf 99c5794929 fix warning for transaction_queue.add usage 2016-03-11 16:00:30 +04:00
debris 389d17974e Merge branch 'client_submodules' into rpc_tests 2016-03-11 11:17:28 +01:00
Tomasz Drwięga d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Marek Kotewicz eb2171e287 Merge pull request #652 from ethcore/tx_queue_rpc 
Transaction queue exposed via JSON rpc.
 2016-03-11 11:08:16 +01:00
debris 34a120e127 net tests 2016-03-11 10:17:20 +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
Gav Wood 5764ec5ddc Merge pull request #609 from ethcore/tx-rpc-expose 
Expose transaction insertion in sync lib
 2016-03-10 15:28:43 +01:00
Tomasz Drwięga 9db4720162 Fixing clippy warnings. 2016-03-10 14:15:47 +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
Gav Wood 99e577ad2f Merge pull request #650 from ethcore/tx_queue_validation 
Validate sender before importing to queue
 2016-03-10 11:14:22 +01:00
Gav Wood 249a89fc2d Merge pull request #627 from ethcore/clippy-dev 
`dev` feature enabled when compiling without `--release`
 2016-03-10 11:05:56 +01:00
Nikolay Volf a2046b429f exposing only one func 2016-03-10 13:27:33 +04:00
Tomasz Drwięga cc47c80243 Merge branch 'master' into tx_queue_rpc 2016-03-10 09:44:46 +01:00
Tomasz Drwięga 2f9b955210 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-10 09:39:26 +01:00
Tomasz Drwięga 6864a08000 Merge branch 'master' into tx_queue_validation 2016-03-10 09:26:57 +01:00
Gav Wood 2ecad23fab Merge pull request #647 from ethcore/sync 
Fixed sync handling large forks
 2016-03-10 00:53:20 +01:00
Nikolay Volf ddc3440712 Merge branch 'master' into tx-rpc-expose 
Conflicts:
	sync/src/chain.rs
 2016-03-10 03:22:32 +04:00
Nikolay Volf 663eec8a76 Merge branch 'master' into tx-rpc-expose 2016-03-10 03:03:27 +04:00
arkpar d7e729a4ea Fixed sync handling large forks 2016-03-09 23:55:56 +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 f84d40734d Validating sender before importing to queuue 2016-03-09 10:26:51 +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
Tomasz Drwięga 1184679d23 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-08 10:17:01 +01:00
Tomasz Drwięga f973610b38 Merge branch 'master' into tx_queue_integration 2016-03-08 10:15:11 +01:00
Tomasz Drwięga 69db469d39 Merge branch 'master' into clippy-dev 
Conflicts:
	util/src/journaldb.rs
 2016-03-07 14:35:42 +01:00
Tomasz Drwięga cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +01:00
Tomasz Drwięga e83f856104 Merging chain_blocks_verified to chain_new_blocks 2016-03-07 12:16:37 +01:00
arkpar 58721475ff Do not remove the peer immediatelly on send error 2016-03-07 11:34:07 +01:00
Tomasz Drwięga b0ac103900 Merge branch 'master' into tx_queue_integration 2016-03-07 09:54:07 +01:00
Tomasz Drwięga c49258e866 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-06 11:15:16 +01:00
Tomasz Drwięga e91de78528 Renaming back bad as retracted 2016-03-06 11:12:02 +01:00
Tomasz Drwięga aaf2e0c3fb Locking outside of loop 2016-03-06 11:04:24 +01:00
arkpar 003d1fd0cc Network tracing improvements 2016-03-05 23:32:38 +01:00