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

156 Commits

Author SHA1 Message Date
arkpar e8a21116f7 missing mut 2016-03-14 15:50:45 +01:00
Gav Wood 9f81b07224 Lock reports to avoid out of order badness. 2016-03-14 15:50:32 +01:00
Gav Wood 7320ad077f Merge remote-tracking branch 'origin/master' into targetgaslimit 2016-03-14 10:54:38 +01:00
Arkadiy Paronyan d5fa49376e Merge pull request #713 from ethcore/docoptclean 
docopts cleanups
 2016-03-14 10:26:38 +01:00
Gav Wood f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
Gav Wood 2d1a837a8b docopts cleanups. 
one for @LefterisJP: 80-character line for docopts.
 2016-03-14 00:52:31 +01:00
Gav Wood 97fe4fcab4 Merge pull request #701 from ethcore/sstore-key-exp 
management of account expiration & memory
 2016-03-13 23:19:49 +01:00
Gav Wood 8fd8f687ee Remove EarlyMerge from user docs. 2016-03-13 23:12:47 +01:00
Gav Wood 0ccb9df4f1 Merge remote-tracking branch 'origin/master' into rcdb 2016-03-13 21:43:41 +01:00
Tomasz Drwięga 54ff64c0e0 Merge branch 'master' into merge_ethminer 
Conflicts:
	parity/main.rs
 2016-03-13 20:42:33 +01:00
Gav Wood 81291622eb Avoid batches for now. 2016-03-13 19:22:42 +01:00
Gav Wood 5107fc5897 Update options. 2016-03-13 18:09:44 +01:00
Gav Wood 08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Nikolay Volf a4f03100e9 registering timer 2016-03-13 15:11:16 +01:00
Gav Wood 02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Nikolay Volf 89dc6fa9cc io handlers 2016-03-13 14:46:45 +01:00
Gav Wood e85a2f3804 Update main.rs 
[noci]
 2016-03-12 19:22:38 +01:00
Gav Wood 89986ec0e0 Update main.rs 
[noci]
 2016-03-12 19:19:16 +01:00
Tomasz Drwięga 19b6c74675 Two more warnings 2016-03-12 13:39:17 +01:00
Gav Wood e1c0177932 Update main.rs 2016-03-12 10:44:48 +01:00
Tomasz Drwięga d0f7555348 Merge branch 'master' into updating_clippy 
Conflicts:
	util/src/journaldb/archivedb.rs
 2016-03-12 10:40:22 +01:00
Tomasz Drwięga 4b6e1dd4d2 Fixing warnings 2016-03-12 10:25:51 +01:00
Tomasz Drwięga 3ea52c2324 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-12 10:22:43 +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
arkpar 896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Marek Kotewicz cd835e88fc Merge pull request #661 from ethcore/rpc_pending_filter 
RPC Pending Transactions Filter
 2016-03-11 19:40:35 +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 c3a79c1478 Merge branch 'master' into ethminer_crate 
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
 2016-03-11 19:22:40 +01:00
Nikolay Volf 08b4488ef3 Merge branch 'master' into personal-rpc-cli 
Conflicts:
	parity/main.rs
 2016-03-11 20:54:18 +04:00
Tomasz Drwięga 36ff65d050 Fixing warnings 2016-03-11 14:53:03 +01:00
Tomasz Drwięga 197ea7f7d6 Using miner in rpc instead of sync 2016-03-11 14:51:07 +01:00
Nikolay Volf 8d67316ece Merge branch 'master' into reorgjdb 
Conflicts:
	parity/main.rs
 2016-03-11 17:41:04 +04:00
Gav Wood 38d470f3bc Reorganise command line options into more general engine. 2016-03-11 14:45:19 +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
Nikolay Volf 22d1def894 Merge pull request #666 from ethcore/moregethcli 
More geth compatibility.
 2016-03-11 16:05:27 +03: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 d3f83ad7be Merge branch 'master' into personal-rpc-cli 2016-03-11 16:05:22 +04:00
Nikolay Volf ed0047725c adding cli extension 2016-03-11 15:49:49 +04: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 d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +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
Gav Wood d9c462a3d3 Use proper listen address. Tidyups. 2016-03-11 10:05:27 +01:00
Gav Wood 4c757997f6 Merge remote-tracking branch 'origin/master' into moregethcli 2016-03-10 21:41:29 +01:00
Gav Wood 29916edb91 More geth compatibility. 2016-03-10 21:36:45 +01:00
Nikolay Volf a2dea3885b refactoring to AccountService 2016-03-10 23:09:45 +04:00
Gav Wood 84a48142de Add more geth options. 2016-03-10 19:50:04 +01:00
Nikolay Volf a207b6a17e Merge pull request #664 from ethcore/sync-provider 
extend sync status interface to sync provider
 2016-03-10 21:18:41 +03:00
Nikolay Volf 47aacbb819 work is in progress 2016-03-10 21:56:02 +04:00
Nikolay Volf 2a24bb7cc6 Merge pull request #663 from ethcore/archive_default 
--archive is default. --pruning is option.
 2016-03-10 20:48:04 +03:00
Nikolay Volf 25a63611f8 extend sync status interface to sync provider 2016-03-10 20:32:17 +04:00