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

440 Commits

Author SHA1 Message Date
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
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 fd39975cf0 Merge pull request #587 from ethcore/rpc-signing-extend 
Rpc transaction signing
 2016-03-11 11:14:17 +01:00
debris bfac5f9238 Merge branch 'master' of github.com:ethcore/parity into client_submodules 2016-03-11 11:03:52 +01:00
debris a6d268db16 fixed missing reexport 2016-03-11 10:30:13 +01:00
debris 87dd42f7bc Merge branch 'master' of github.com:ethcore/parity into client_submodules 2016-03-10 21:17:58 +01:00
arkpar 5f37f6edb4 Correct cache update order 2016-03-10 21:01:17 +01:00
debris c5c8851b50 moved TestBlockChainClient to ethcore 2016-03-10 20:27:50 +01:00
Nikolay Volf 47aacbb819 work is in progress 2016-03-10 21:56:02 +04:00
arkpar a6b5aad8c9 Merge branch 'master' of github.com:ethcore/parity into thread 2016-03-10 18:40:17 +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 f708d36fad Merge pull request #651 from ethcore/tx_queue_integration 
Tx_queue_docs -> To master
 2016-03-10 13:19:40 +01:00
Gav Wood 16e12b1ae5 Merge pull request #645 from ethcore/import_route 
blockchain import_route
 2016-03-10 13:14:56 +01:00
debris 6681aaf76a split client into few submodules 2016-03-10 11:32:10 +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 6d0578e19c Additional explanation for ordering of commit/insert_block 2016-03-10 11:16:54 +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
debris 190a2c3b35 Merge branch 'master' of github.com:ethcore/parity into import_route 2016-03-10 10:17:44 +01:00
debris 0a7cda09ff changed route name to enacted and retracted 2016-03-10 10:17:17 +01:00
Tomasz Drwięga c3803807a9 Merge pull request #648 from ethcore/bq-fix 
Don't call mark_as_bad needlessly
 2016-03-10 09:28:26 +01:00
debris 4750d2f667 Merge branch 'master' into import_route 2016-03-10 01:04:05 +01:00
Gav Wood 50c8d7f633 Merge pull request #607 from ethcore/tx_queue_integration 
Transaction Queue Integration
 2016-03-10 00:45:07 +01:00
arkpar 84a741d0f9 Don't call mark_as_bad needlessly 2016-03-10 00:21:07 +01:00
debris f397fb210f fixed typo 2016-03-10 00:11:35 +01:00
Nikolay Volf 0f056f3abb Merge branch 'master' into clippy-dev 
Conflicts:
	Cargo.toml
 2016-03-10 02:45:53 +04:00
debris 8b042ac875 blockchain import_route 2016-03-09 21:55:23 +01:00
Nikolay Volf 8a83e27d6a cfg-test for noop verifier 2016-03-09 22:55:41 +04:00
debris 082a4d9078 jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests 2016-03-09 17:31:43 +01:00
debris 3655354980 Merge branch 'master' into jsonrpc_panic_handle 2016-03-09 13:46:08 +01:00
debris a1640dcf72 jsonrpc panic handle 2016-03-09 11:38:53 +01:00
Tomasz Drwięga f973610b38 Merge branch 'master' into tx_queue_integration 2016-03-08 10:15:11 +01:00
arkpar 57485a73ec Merge branch 'master' into thread 2016-03-07 15:10:15 +01:00
Tomasz Drwięga ab42ec8c81 Removing unneeded lifetime 2016-03-07 14:40:39 +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
Gav Wood ec3698066b Normal CLI options with geth. 
Support node identity.
Support fine-grained JSONRPC API enabling.
 2016-03-07 12:21:11 +01:00
Tomasz Drwięga b0ac103900 Merge branch 'master' into tx_queue_integration 2016-03-07 09:54:07 +01:00
Gav Wood bc2fb14b5d Add memory usage reports. 
Update to be similar to master.
 2016-03-06 22:39:04 +01:00
Tomasz Drwięga e91de78528 Renaming back bad as retracted 2016-03-06 11:12:02 +01:00
Tomasz Drwięga cc3839ae57 Revert "Revert "Transaction Queue integration"" 
This reverts commit d330f0b7b7.

Conflicts:
	sync/src/transaction_queue.rs
 2016-03-05 16:46:04 +01:00
Gav Wood d330f0b7b7 Revert "Transaction Queue integration" 2016-03-05 12:53:54 +01:00
Nikolay Volf c4fe307b06 Merge pull request #595 from ethcore/tx_queue_integration 
Transaction Queue integration
 2016-03-05 14:21:54 +03:00
Tomasz Drwięga b9a6a70ced Renaming bad blocks as retracted 2016-03-05 11:37:19 +01:00
debris 5ad5773014 verifier improvements 2016-03-05 10:45:05 +01:00
Gav Wood 504e74a9ad Merge pull request #578 from ethcore/finduncles 
Uncle inclusion in block authoring.
 2016-03-05 09:47:51 +01:00
Tomasz Drwięga 77d526fd0b Merge branch 'master' into tx_queue_integration 
Conflicts:
	ethcore/src/client.rs
	sync/src/tests/helpers.rs
 2016-03-05 00:57:45 +01:00
Gav Wood e11b74e8d2 Merge pull request #589 from ethcore/disablejournaldb 
JournalDB can now operate in "archive" mode
 2016-03-04 23:51:21 +01:00
Gav Wood 8f00056171 Avoid sealing unnecessarily. 2016-03-04 23:43:59 +01:00
Gav Wood 86c34c7d10 Remove "fix". 2016-03-04 23:29:56 +01:00
Gav Wood 098a6ad2cc Reset `HISTORY`. 2016-03-04 23:09:05 +01:00