grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,747 Commits 1 Branch 329 Tags
c6b3faca6494dea67a6cb520509feed0726b3883
Commit Graph
9747 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gav Wood 12e1abdfb7 Port fixes to new infrastrtcutre. 2016-03-12 09:51:17 +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 05ff8a0b94 Merge branch 'ethminer_crate' of github.com:ethcore/parity into ethminer_crate 2016-03-12 00:05:21 +01:00
Tomasz Drwięga 7cfe1d258b Adding more detailed logging 2016-03-11 23:49:32 +01:00
Nikolay Volf fb51ac0d95 blockchain receipts rlp generation 2016-03-11 23:33:01 +01:00
Arkadiy Paronyan 1031ce641d Merge pull request #682 from ethcore/additional_sstore_test 
additional (failing) SecretStore test
 2016-03-11 22:45:43 +01:00
arkpar 896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Nikolay Volf 0c9c97fcb9 Merge pull request #670 from ethcore/updating_clippy 
Updating clippy & fixing warnings.
 2016-03-11 23:57:06 +03:00
Marek Kotewicz e6aba74726 Merge pull request #681 from ethcore/jsonrpc_tests 
rpc web3 tests
 2016-03-11 20:53:13 +01:00
Marek Kotewicz 9e23a0c240 Merge pull request #677 from ethcore/personal-rpc-cli 
Making personal json-rpc configurable via cli
 2016-03-11 20:52:58 +01:00
Nikolay Volf 19f23f8445 increasing history to be useful for geth fast sync 2016-03-11 23:37:47 +04:00
Nikolay Volf 349584772b redundant lines 2016-03-11 23:34:18 +04:00
Nikolay Volf da6f6d57cd state data query to client 2016-03-11 23:24:44 +04:00
Nikolay Volf e970dd4530 client state data func 2016-03-11 23:09:14 +04:00
Nikolay Volf b1327a045f fixed new account generation 2016-03-11 22:47:12 +04:00
debris 90e20cbcad additional (failing) sstore test 2016-03-11 20:08:01 +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
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 1e40997ff7 state query for archive jdb 2016-03-11 22:15:56 +04:00
Arkadiy Paronyan c9f5a9bc9a Merge pull request #678 from ethcore/reorgjdb 
Rearrange journaldb infrastructure to make more extensible
 2016-03-11 18:47:19 +01:00
Nikolay Volf 03a4f9e268 Merge pull request #673 from ethcore/boxjdb 
JournalDB -> Box<JournalDB>, and it's a trait.
 2016-03-11 20:03:39 +03:00
Nikolay Volf 08b4488ef3 Merge branch 'master' into personal-rpc-cli 
Conflicts:
	parity/main.rs
 2016-03-11 20:54:18 +04: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
Nikolay Volf 87fb0b31eb Merge branch 'master' into reorgjdb 2016-03-11 20:05:41 +04:00
Tomasz Drwięga 9f19d2993c Merge branch 'master' into ethminer_crate 
Conflicts:
	util/bigint/src/uint.rs
 2016-03-11 16:24:52 +01:00
debris c6ba378b6b rpc web3 tests 2016-03-11 16:17:09 +01:00
Arkadiy Paronyan 5d3ead91e2 Merge pull request #680 from ethcore/uint_mem 
Adding std::mem back (only for asm)
 2016-03-11 16:16:21 +01:00
Nikolay Volf 9b28e04b85 Merge pull request #679 from ethcore/master-readme-update 
update readme to exclude beta step (stable is ok)
 2016-03-11 18:11:25 +03:00
Nikolay Volf 89dbc2ac25 [ci skip] update readme to exclude beta spec (stable is ok) 2016-03-11 18:08:29 +03:00
Tomasz Drwięga 179569f9f8 Adding std::mem back 2016-03-11 16:01:18 +01:00
Tomasz Drwięga 0dbe6684ad adding std::mem 2016-03-11 15:58:12 +01:00
Tomasz Drwięga 9c92d601b1 Merge branch 'master' into ethminer_crate 
Conflicts:
	rpc/src/v1/impls/eth.rs
 2016-03-11 15:56:30 +01:00
Nikolay Volf 04af38bb0d fix test compilation 2016-03-11 18:54:28 +04:00
Nikolay Volf fcc0432856 Merge pull request #675 from ethcore/rpc_unit_tests 
fixed U256 and transaction request deserialization
 2016-03-11 17:25:13 +03:00
Gav Wood 5499f4530c Fix tests. 2016-03-11 15:01:15 +01:00
Tomasz Drwięga b458452f0e TestSyncProvider fixes 2016-03-11 14:57:17 +01: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 8ae103087d Fixups for new API. 2016-03-11 15:07:43 +01:00
Gav Wood cfe3b07130 Merge branch 'boxjdb' into reorgjdb 2016-03-11 15:03:43 +01: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
Gav Wood 7e8b6c3660 Merge branch 'boxjdb' into reorgjdb 2016-03-11 14:06:32 +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
Marek Kotewicz 176b9a992d Merge pull request #667 from ethcore/rpc_tests 
rpc net submodule tests
 2016-03-11 13:58:32 +01:00
Gav Wood 51cfd4b0ea Remove unneeded clone. 2016-03-11 13:58:11 +01:00