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

772 Commits

Author SHA1 Message Date
Gav Wood
75b23aac02 Merge remote-tracking branch 'origin/master' into bettermining 2016-03-28 09:44:34 +02:00
Gav Wood
ad86feb667 Rename spawn -> boxed_clone 2016-03-28 09:42:50 +02:00
Arkadiy Paronyan
2178f09eec Merge pull request #841 from peterjoel/ethcompute 
Caching for computing seed hashes (#541)
 2016-03-28 01:43:45 +02:00
Gav Wood
d150529730 Merge remote-tracking branch 'origin/master' into bettermining 2016-03-27 22:16:24 +02:00
Peter
9655ce8dbf Caching for computing seed hashes (#541) 
Code review changes
 2016-03-27 20:42:24 +01:00
Gav Wood
7c5b171e3f Differentiate between ClosedBlock (can be reopened) and LockedBlock (cannot). 
`ClosedBlock`s still keep the pre-finalised state (i.e. state after the last transaction).
`LockedBlock`s do not. New mining algo needs to reopen these `ClosedBlock`s, however enactment
system does not (and `ClosedBlock`s are slower & more hungry), hence the distinction.
 2016-03-27 20:33:23 +02:00
Gav Wood
8bb49f05d0 Merge pull request #817 from ethcore/state_tests 
refactored loading of state tests
 2016-03-27 15:35:16 +02:00
Gav Wood
43e1d89067 Fix State cloning. 2016-03-27 14:35:27 +02:00
Gav Wood
fc211f0934 Merge remote-tracking branch 'origin/master' into bettermining 2016-03-26 23:35:51 +01:00
Gav Wood
64819981f2 Merge branch 'master' into bettermining 2016-03-26 13:45:38 +01:00
Gav Wood
845fa97da1 Fix eth_call so it doesn't need the secret of the sender. 2016-03-26 13:30:02 +01:00
debris
cdcbc56255 refactored state tests 2016-03-25 13:08:57 +01:00
Gav Wood
100e6fa88f Merge pull request #803 from ethcore/executive_tests 
refactored loading of execution tests
 2016-03-25 10:43:33 +00:00
debris
e1b841b526 Merge branch 'master' of github.com:ethcore/parity into executive_tests 2016-03-25 10:40:21 +01:00
Marek Kotewicz
2c2e8ef154 Merge pull request #805 from ethcore/rustfmt 
Rustfmt.toml
 2016-03-25 10:39:59 +01:00
Gav Wood
d50c9f9fac Merge remote-tracking branch 'origin/master' into bettermining 2016-03-24 23:10:54 +01:00
Gav Wood
830ef7ddfc New mining framework. 
Fixes #756.
 2016-03-24 23:03:22 +01:00
arkpar
416040f313 Fixed test 2016-03-24 17:09:41 +01:00
debris
a7ce6fca9e fixed checking if state is correct in executive tests 2016-03-24 16:40:52 +01:00
debris
1aa34e9dd4 fixed loading of executive tests, unrevealed failing consensus tests 2016-03-24 01:25:59 +01:00
Gav Wood
4e013ba2fc Refactor pending_block to always return invalid txs and sometimes a block. 
Docuemnt SealingWork properly.
 2016-03-23 16:28:02 +00:00
Tomasz Drwięga
a0db1d5416 Merge branch 'master' into rustfmt 
Conflicts:
	ethash/src/sizes.rs
	util/src/uint.rs
 2016-03-23 16:55:54 +01:00
Gav Wood
97449afbb9 Merge branch 'master' into bettermining 2016-03-23 14:18:16 +01:00
Gav Wood
d7fb464fa9 Merge pull request #798 from ethcore/eth_rpc 
another batch of rpc improvements
 2016-03-22 18:38:55 +01:00
debris
0cdac6de3c uncle 2016-03-22 16:07:42 +01:00
Gav Wood
a134f939e9 Non-functioning draft of code. 2016-03-22 13:05:18 +01:00
Gav Wood
2ab9d02158 Fix test. 2016-03-21 12:39:13 +01:00
Gav Wood
8906b78b07 Revert break. 2016-03-21 11:56:11 +01:00
Gav Wood
205f062433 Merge branch 'master' into tracing 2016-03-21 11:54:50 +01:00
Gav Wood
8ed8652296 Reuse should_Trace. 2016-03-21 11:53:52 +01:00
debris
068c0f3782 test for eth_getTransactionReceipt 2016-03-21 11:47:50 +01:00
Gav Wood
c4d45e0cf0 Trace basic calls! And tests. 2016-03-21 11:24:03 +01:00
Gav Wood
7051529880 Merge pull request #788 from ethcore/test-fix 
Auto detect available port (with fixed test)
 2016-03-20 19:43:57 +01:00
Gav Wood
74f7f3f016 Merge pull request #792 from ethcore/eth_getTransactionReceipt 
eth_getTransactionReceipt
 2016-03-20 19:43:49 +01:00
Gav Wood
72b604b8e8 Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. 2016-03-20 19:20:37 +01:00
debris
52e9801721 client implementation of transaction receipt 2016-03-20 18:44:57 +01:00
Gav Wood
c2933e005a Tests for not tracking builtin calls. 2016-03-20 17:51:22 +01:00
debris
2a3e695f8a LocalizedReceipt 2016-03-20 17:29:39 +01:00
Gav Wood
b4c2505eab Merge branch 'master' into tracing 2016-03-20 16:30:59 +01:00
Gav Wood
dcb23de65c Merge pull request #771 from ethcore/tx_queue_timeout 
Disable preparing work package if miners don't ask for it.
 2016-03-20 16:29:13 +01:00
Gav Wood
6ac350a996 Tests for lots more configurations. 2016-03-20 16:24:19 +01:00
arkpar
6e9ea76aab Auto detect available port 2016-03-20 16:21:49 +01:00
Marek Kotewicz
fbb166f3ce Merge pull request #787 from ethcore/eth_estimateGas 
eth_estimateGas
 2016-03-20 15:13:22 +01:00
Tomasz Drwięga
40fc3dc060 Merge branch 'master' into tx_queue_timeout 2016-03-20 12:16:57 +01:00
Arkadiy Paronyan
2ec40604d9 Revert "Auto detect available port" 2016-03-20 12:12:58 +01:00
Gav Wood
5afd32dd84 Minor tweaks. 2016-03-20 12:09:55 +01:00
Gav Wood
d2d5806e9b Test for failed create transactions, failed actions are logged as such. 2016-03-20 12:04:31 +01:00
debris
aa47d944e1 implemented rpc eth_estimateGas method, added tests for rpc eth_call and eth_estimateGas 2016-03-20 11:34:19 +01:00
Gav Wood
f75fb6a59f Create transaction tracing test. 2016-03-20 11:33:36 +01:00
debris
83d08ba399 Merge branch 'master' of github.com:ethcore/parity into eth_call 2016-03-20 10:29:43 +01:00
Marek Kotewicz
6feb503c67 Merge pull request #777 from ethcore/call 
added output to execution result
 2016-03-20 10:28:28 +01:00
Gav Wood
004cd00f13 Merge pull request #782 from ethcore/test-fix 
Auto detect available port
 2016-03-20 10:23:55 +01:00
debris
fef8237701 fixes after merge 2016-03-20 10:07:50 +01:00
debris
46bfed6750 Merge branch 'call' into eth_call 2016-03-20 10:05:22 +01:00
debris
9fb19e6dd0 Merge branch 'master' of github.com:ethcore/parity into call 2016-03-20 10:04:27 +01:00
Gav Wood
0cef2cfc46 Merge pull request #778 from ethcore/json_tests_refactor 
use ethjson module to load chain json tests
 2016-03-20 09:51:36 +01:00
Gav Wood
c729f9d9ca Merge pull request #772 from ethcore/tracing 
Tracing implemented.
 2016-03-19 23:52:23 +01:00
Gav Wood
2cb1937e1e Move code to right module. 2016-03-19 22:37:11 +01:00
Gav Wood
7bba745f8b Fix JSON test again. 2016-03-19 22:14:16 +01:00
Gav Wood
bc6a892f2b Test outer create. 2016-03-19 22:12:52 +01:00
debris
9a227dce46 Merge branch 'json_tests_refactor' into eth_call 2016-03-19 21:42:10 +01:00
debris
521f2a1433 implemented eth_call 2016-03-19 21:37:11 +01:00
Gav Wood
718feeccbc Fix for JSON tests. 2016-03-19 21:05:18 +01:00
Gav Wood
a2fc006ee5 First test. 2016-03-19 21:02:44 +01:00
arkpar
da027e93cf Auto detect available port 2016-03-19 21:00:05 +01:00
Gav Wood
2d55e08b41 Fix for jsontests, 2016-03-19 19:06:13 +01:00
Gav Wood
ab9b8c7bf3 Output data (code) for creates. 2016-03-19 18:46:41 +01:00
debris
24cb15ef2e fixed missing import 2016-03-19 18:38:02 +01:00
Gav Wood
7d93fa2533 Output stored for calls. 2016-03-19 18:37:55 +01:00
debris
2face3f938 use ethjson module to load chain json tests 2016-03-19 18:13:14 +01:00
Gav Wood
bd7cd68c32 Track depth. 2016-03-19 14:35:09 +01:00
debris
bc5df9c908 added output to execution result 2016-03-19 14:29:09 +01:00
Gav Wood
152f132b7b Fix JSONRPC test utils. 2016-03-19 14:10:32 +01:00
Gav Wood
66837452c2 Expose tracing all the way to BlockChain; now it's up to blockchain to integrate. 2016-03-19 13:37:47 +01:00
Gav Wood
203438fb42 Fix tests. 2016-03-19 13:07:49 +01:00
Gav Wood
1bfcbca8af Add doumentation, make tracing optional and expose at OpenBlock level. 2016-03-19 12:54:34 +01:00
debris
906e9b395e fixed parsing blockchain file, added default account to rpc tests 2016-03-19 11:02:44 +01:00
Tomasz Drwięga
48d8d1c628 Merge branch 'master' into tx_queue_timeout 
Conflicts:
	miner/src/miner.rs
 2016-03-19 09:26:05 +01:00
Gav Wood
1d822132f0 Merge pull request #757 from ethcore/ethrpc_test 
rpctest executable
 2016-03-19 08:45:13 +01:00
Gav Wood
d6f94c4ad7 Fix test and first part of optionality. 2016-03-19 08:31:19 +01:00
debris
a76aad2e12 fixed invalid json files 2016-03-18 23:56:51 +01:00
Gav Wood
bd338a5741 Tracing implemented. 
TODO:
- make it optional;
- track output;
- usher through to level higher than ExecutionResult.
 2016-03-18 23:49:12 +01:00
debris
79aa8570d0 pricing { linear: {} } 2016-03-18 22:54:36 +01:00
debris
e4ec80941c fixed failing builin test 2016-03-18 20:17:25 +01:00
Tomasz Drwięga
f8dd1a6354 Merge branch 'master' into tx_queue_timeout 
Conflicts:
	ethcore/src/client/test_client.rs
	miner/src/miner.rs
 2016-03-18 19:36:32 +01:00
debris
839cecd2da fixed od builting parsing 2016-03-18 19:31:31 +01:00
Tomasz Drwięga
62c32eb288 Merge branch 'master' into tx_queue_live 
Conflicts:
	miner/src/miner.rs
 2016-03-18 19:31:14 +01:00
debris
3b8c6a1ab2 linear -> pricing 2016-03-18 19:08:57 +01:00
debris
757f0c9bc4 Merge branch 'master' of github.com:ethcore/parity into ethrpc_test 2016-03-18 18:05:29 +01:00
Gav Wood
2309e19fd9 Merge pull request #760 from ethcore/tx_queue_gas_limit 
Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue
 2016-03-18 18:05:26 +01:00
Gav Wood
a1fb0619bb Merge pull request #752 from ethcore/tx_queue_invalid 
Removing transactions that failed to be pushed to block.
 2016-03-18 18:03:11 +01:00
Tomasz Drwięga
7d77324765 BlockGasLimit taken from push_transaction result 2016-03-18 14:22:50 +01:00
Tomasz Drwięga
0dc1ddef9a Flipping sealing_enabled flag after no requests for sealing_block for some time 2016-03-18 13:59:11 +01:00
Tomasz Drwięga
58bb5e967a Merge branch 'master' into tx_queue_gas_limit 
Conflicts:
	miner/src/transaction_queue.rs
 2016-03-18 12:25:36 +01:00
Tomasz Drwięga
7fb365634a Updating gas_limit in test_client generated blocks 2016-03-18 10:36:01 +01:00
Tomasz Drwięga
e58ec31e20 Fixing warnings 2016-03-18 10:14:19 +01:00
Tomasz Drwięga
338e5fadb9 Bumping clippy 2016-03-18 10:08:47 +01:00
Tomasz Drwięga
48c72a168c Merge branch 'master' into tx_queue_invalid 2016-03-18 09:44:31 +01:00
Tomasz Drwięga
7ae60056b2 Common error handling 2016-03-17 16:13:00 +01:00
debris
a3f6d36018 Merge branch 'master' of github.com:ethcore/parity into ethrpc_test 2016-03-17 15:52:09 +01:00
debris
c695b83e52 new way of loading PodState 2016-03-17 15:51:40 +01:00
Tomasz Drwięga
309af743e0 Ignoring transactions slightly above gas_limit 2016-03-17 15:23:25 +01:00
debris
1f03ae54d6 moved ethcores spec to its own module, added genesis 2016-03-17 15:15:10 +01:00
Tomasz Drwięga
c4021a77ca Stop adding transactions right after we know that no other will make it to block. 2016-03-17 14:40:40 +01:00
debris
0621da8535 ethjson spec submodule 2016-03-17 13:41:11 +01:00
Tomasz Drwięga
c382fa7eab Removing invalid transactions from queue 2016-03-17 12:29:55 +01:00
Tomasz Drwięga
b1557b547b Reverting check if block queue is empty 2016-03-17 11:47:41 +01:00
Tomasz Drwięga
fdba8de600 Validating senders balance before importing transaction to queue 2016-03-16 10:45:55 +01:00
Tomasz Drwięga
be32e79a7a Merge branch 'master' into tx_queue 2016-03-16 09:28:37 +01:00
Tomasz Drwięga
188e325b20 Importing transactions from hashset. Notifying about every block 2016-03-15 23:01:36 +01:00
arkpar
9dea31031c Enact block with uncles test 2016-03-15 14:35:45 +01:00
Arkadiy Paronyan
e5f54966af Merge pull request #734 from ethcore/fixblockchainrace 
Don't change best block until extras is committed.
 2016-03-15 11:56:49 +01:00
Gav Wood
59d0d2df9a Don't change best block until extras is committed. 2016-03-15 10:59:58 +01:00
Gav Wood
d6d0f8d4eb Merge pull request #725 from ethcore/unclesminingfix 
Add RLP, not a data item.
 2016-03-14 20:20:45 +01:00
Gav Wood
7ba396b8d3 Merge pull request #687 from ethcore/pv63-receipts 
PV63 receipts response
 2016-03-14 20:18:10 +01:00
Gav Wood
7628df6fe6 Merge pull request #723 from ethcore/rpc_tests 
another batch of rpc tests
 2016-03-14 19:18:08 +01:00
Gav Wood
97051cb949 Add RLP, not a data item. 2016-03-14 18:20:24 +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
debris
9b241faf01 uncle method mock 2016-03-14 17:01:29 +01:00
debris
0de73609d2 eth_hashrate && eth_submitHashrate tests 2016-03-14 14:18:29 +01:00
Arkadiy Paronyan
38de95cc3b Merge pull request #719 from ethcore/targetgaslimit 
Allow configuration of target gas limit.
 2016-03-14 14:04:09 +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
Nikolay Volf
3eb08b0d61 fix tests and deuncommented 2016-03-14 10:53:37 +01:00
Gav Wood
dc8b9c3205 Fix build. 2016-03-14 10:48:32 +01:00
Nikolay Volf
829ed4d0a6 commented empty slice/vec comparison 2016-03-14 10:47:22 +01:00
Gav Wood
f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
arkpar
9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Gav Wood
5c964694b4 Merge pull request #706 from ethcore/fix-accountdb 
Check for NULL_RLP in AccountDB
 2016-03-13 22:29:19 +01:00
arkpar
420f473f90 Check for NULL_RLP in AccountDB 2016-03-13 21:28:57 +01:00
Gav Wood
b4f7f220f1 Merge remote-tracking branch 'origin/master' into merge_ethminer 2016-03-13 16:35:52 +01:00
Nikolay Volf
809c239ff8 fix rev 2016-03-13 15:59:25 +01:00
Gav Wood
76696e3b49 Minor build fixes. 2016-03-13 15:36:03 +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
debris
00820c342a fixed eth_getCode and added tests for it 2016-03-13 14:45:39 +01:00
debris
487ba9b08a implemented eth_storageAt rpc method, added more tests for rpc 2016-03-13 12:09:30 +01:00
Marek Kotewicz
1f8e0f86ac Merge pull request #688 from ethcore/updating_clippy 
Updating clippy
 2016-03-13 10:07:44 +01:00
debris
e09de6ea3d added missing eth_getBalance rpc method and tests for it 2016-03-12 19:51:24 +01:00
Nikolay Volf
0684abd345 fixed to return receipts grouped by requested block 2016-03-12 19:23:17 +01:00
Nikolay Volf
bd9cfb4ee5 Merge branch 'pv63-state' into pv63-receipts 2016-03-12 18:52:37 +01:00
Nikolay Volf
ade8b8356b Merge branch 'master' into pv63-state 
Conflicts:
	ethcore/src/client/client.rs
 2016-03-12 18:09:45 +01:00
Tomasz Drwięga
19b6c74675 Two more warnings 2016-03-12 13:39:17 +01:00
Tomasz Drwięga
65dadcc2a2 Adding todos 2016-03-12 10:44:24 +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
e10457d235 Bumping clippy 2016-03-12 10:06:50 +01:00
Gav Wood
88e23fcb9a Merge pull request #634 from ethcore/jdb_option2 
JournalDB with in-memory overlay (option2)
 2016-03-12 10:01: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
Nikolay Volf
fb51ac0d95 blockchain receipts rlp generation 2016-03-11 23:33:01 +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
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
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
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
5499f4530c Fix tests. 2016-03-11 15:01:15 +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
b25551be7b Merge pull request #671 from ethcore/clippy_hook 
Removing running clippy by default on nightly.
 2016-03-11 14:03:16 +01:00
Gav Wood
4771fdf0fb Rearrange journaldb infrastructure. 2016-03-11 13:50:39 +01:00
Gav Wood
2a856a13f0 Obvious typo fix. 2016-03-11 13:21:53 +01:00
Gav Wood
d71c5d4c17 Place Sync/Send in trait. 2016-03-11 13:19:10 +01:00
Gav Wood
e461916f5a Merge remote-tracking branch 'origin/master' into boxjdb 2016-03-11 12:56:33 +01:00
Gav Wood
756f964130 JournalDB -> Box<JournalDB>, and it's a trait. 2016-03-11 12:54:48 +01:00
arkpar
8f54c24e47 Merged changes from jdb_option1, keep LATEST_ERA from decreasing 2016-03-11 11:52:11 +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
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
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
8785bd37e8 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-10 21:06:21 +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
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
Tomasz Drwięga
0535fb30c6 Merge branch 'master' into ethminer_crate 
Conflicts:
	sync/src/lib.rs
 2016-03-10 14:03:09 +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
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
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
2f9b955210 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-10 09:39:26 +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