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

246 Commits

Author SHA1 Message Date
arkpar 570d2c21d3 Merge branch 'sync' into beta 2016-03-15 19:44:15 +01:00
arkpar e538b417f0 Missing return 2016-03-15 18:35:07 +01:00
arkpar 1964ed7eb3 Merge remote-tracking branch 'origin/sync' into beta 2016-03-15 12:56:17 +01:00
arkpar 85833d228a Ignore new blocks while seeking 2016-03-15 01:22:58 +01:00
arkpar ebb7699da2 Merge remote-tracking branch 'origin/pv63-receipts' into beta 2016-03-14 18:58:23 +01:00
Nikolay Volf 8cdb013f9f Merge branch 'master' into pv63-receipts 
Conflicts:
	ethcore/src/client/client.rs
 2016-03-14 17:36:51 +01:00
Nikolay Volf 8f4323f3bb Merge branch 'master' into pv63-receipts 
Conflicts:
	ethcore/src/client/test_client.rs
 2016-03-14 11:06:28 +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 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 4a58e142bd Remove duplicate ciippys. 2016-03-13 15:02:08 +01:00
Gav Wood 02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Gav Wood 94932386e3 Merge pull request #685 from ethcore/sync 
More sync fixes
 2016-03-13 12:14:24 +01:00
arkpar 0a6fea1b77 Silenced some non-important warnings 2016-03-13 10:33:55 +01:00
Gav Wood e7574d4516 Update lib.rs 2016-03-12 19:29:18 +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
Tomasz Drwięga e10457d235 Bumping clippy 2016-03-12 10:06:50 +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 f724cab92d Merge branch 'master' into updating_clippy 
Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
 2016-03-11 19:17:09 +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
debris ebd2a92267 Merge branch 'master' of github.com:ethcore/parity into client_submodules 2016-03-11 11:17:08 +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
Tomasz Drwięga 8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +01:00
Tomasz Drwięga 3a4a7ac822 Bumping clippy version 2016-03-11 10:35:26 +01:00
Tomasz Drwięga 5b204a5ff5 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs
 2016-03-11 10:31:07 +01:00
Tomasz Drwięga 3bbdc03d0c Fixing doctest. 2016-03-11 10:17:51 +01:00
debris 34a120e127 net tests 2016-03-11 10:17:20 +01:00
debris 87dd42f7bc Merge branch 'master' of github.com:ethcore/parity into client_submodules 2016-03-10 21:17:58 +01:00
debris c5c8851b50 moved TestBlockChainClient to ethcore 2016-03-10 20:27:50 +01:00
Nikolay Volf 25a63611f8 extend sync status interface to sync provider 2016-03-10 20:32:17 +04: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 8dd41bfe0c Merge pull request #641 from ethcore/jsonrpc_interfaces 
jsonrpc uses client and sync interfaces
 2016-03-10 15:44:05 +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
Gav Wood 4cfcaf8521 Merge pull request #657 from ethcore/tx_queue_update_height_bug 
Tx queue update height bug
 2016-03-10 13:20:00 +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 d4e7eafede Merge branch 'master' into tx_queue_integration 
Conflicts:
	sync/src/transaction_queue.rs
 2016-03-10 11:23:39 +01:00
Tomasz Drwięga 0cf405527e Fixing update height bug 2016-03-10 11:14:25 +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