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

2873 Commits

Author SHA1 Message Date
Gav Wood
d7c377dea6 Fix build. 2016-03-28 10:12:15 +02:00
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
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
Tomasz Drwięga
5db84c3233 Adding transactions to block 2016-03-09 13:09:34 +01:00
debris
a1640dcf72 jsonrpc panic handle 2016-03-09 11:38:53 +01:00
arkpar
ca7d3b91d0 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-08 18:35:25 +01:00
Tomasz Drwięga
9acb36af87 Fixing tests compilation. Removing ethminer dependency on client 2016-03-08 16:23:32 +01:00
Tomasz Drwięga
99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +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
arkpar
d77d9ad9d8 JournalDB with history overlay 2016-03-06 19:57:00 +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
Gav Wood
d63e535b3c Merge branch 'master' into finduncles 2016-03-04 23:08:48 +01:00
Gav Wood
96617533c8 Remove unneeded field. 2016-03-04 22:57:44 +01:00
Gav Wood
559e01ea84 Review remarks resolved. 2016-03-04 22:54:59 +01:00
Gav Wood
bc018faedc Avoid forcing a resync for the pre-existing journaldbs. 2016-03-04 21:17:42 +01:00
Gav Wood
bbbaffbc53 "--archive" option for disabling the journal DB 
Fixes #579
 2016-03-04 21:06:28 +01:00
Nikolay Volf
c72c27b47e client integration 2016-03-04 20:09:21 +03:00
Tomasz Drwięga
bcaed67eaa Swapping order of inserting block to chain and commiting to DB to avoid race conditions 2016-03-04 16:48:10 +01:00
debris
706ce5dfb6 verifier trait 2016-03-04 11:56:04 +01:00
Gav Wood
52dceff3ea Merge branch 'master' into finduncles 2016-03-03 15:16:56 +01:00
Gav Wood
00b5fcebe3 Merge pull request #580 from ethcore/fixblockchainmem 
shrink_to_fit after removing hashes.
 2016-03-03 15:08:47 +01:00
Gav Wood
f8dc1f2e3a Avoid leaking block_details. 
Fixes #576
 2016-03-03 12:56:34 +01:00
Gav Wood
09e01fa0f8 Merge pull request #504 from ethcore/rpc_poll_ids 
support for rpc polling
 2016-03-03 12:44:27 +01:00
Gav Wood
806f962b7d Merge pull request #573 from ethcore/issue-test/568 
fork test for Issue test/568
 2016-03-03 12:41:32 +01:00
Gav Wood
dadc2a96ea shrink_to_fit after removing hashes. 2016-03-03 12:39:19 +01:00
Gav Wood
df77f51bcc History to 30 to pass tests. 2016-03-03 11:47:24 +01:00
Gav Wood
3daa4c6497 Fix max uncles. 2016-03-03 11:39:00 +01:00
Gav Wood
6933bb971b Test. 2016-03-02 23:41:15 +01:00
Tomasz Drwięga
f4a71dc03c Merge branch 'tx_queue' into tx_queue_integration 2016-03-02 21:27:08 +01:00
Gav Wood
039c0056bc Uncle inclusion in block authoring. Still need tests. 2016-03-02 19:38:00 +01:00
Gav Wood
877270c35f Fixes. 2016-03-02 18:32:54 +01:00
Gav Wood
42df98450c Include uncles in exclused. 2016-03-02 18:05:47 +01:00
Gav Wood
671965d44f Test for ancestry. 2016-03-02 17:31:42 +01:00
Gav Wood
c75737bcf0 Add ancestry iterator. 2016-03-02 17:04:44 +01:00
Gav Wood
3c7814c8ac Remove debug line. 2016-03-02 15:43:48 +01:00
Nikolay Volf
028434f93d Merge branch 'master' into issue-test/568 
Conflicts:
	ethcore/src/tests/client.rs
 2016-03-02 17:15:09 +03:00
Nikolay Volf
02aad03f92 helpers 2016-03-02 17:06:53 +03:00
debris
03ffcd0e64 Merge branch 'master' into rpc_poll_ids 2016-03-02 13:59:03 +01:00
Gav Wood
47b4729332 Fix check. 2016-03-02 13:28:51 +01:00
Gav Wood
4fd926bfd6 Merge branch 'master' of github.com:ethcore/parity 2016-03-02 13:27:45 +01:00
Gav Wood
3b3399ccc3 Merge pull request #564 from ethcore/inclusive_bloom_ranges 
chainfilter shouldnt exclude to_block from results
 2016-03-02 13:05:45 +01:00
Gav Wood
13deb4f048 Merge branch 'master' of github.com:ethcore/parity 2016-03-02 13:01:48 +01:00
Gav Wood
162300a4a6 Merge pull request #547 from ethcore/mining 
Mining
 2016-03-02 13:00:22 +01:00
Gav Wood
3309959139 Additional check to ancient enactments. 2016-03-02 12:57:34 +01:00
debris
5a7dfa4df2 Merge branch 'master' into rpc_poll_ids 2016-03-02 12:27:38 +01:00
Nikolay Volf
6b9fde5790 Merge branch 'master' into mining 2016-03-02 08:54:21 +03:00
debris
a0acfd5113 Merge branch 'master' into rpc_poll_ids 2016-03-02 06:12:06 +01:00
debris
feff1f9e6e chainfilter shouldnt exclude to_block from results 2016-03-02 06:09:27 +01:00
debris
67a1f2065e fixed broken master 2016-03-02 06:01:31 +01:00
debris
32074cc420 fixed compilation issue caused by incorrect merge 2016-03-02 05:55:42 +01:00
debris
3b4d4a9b63 Merge branch 'master' into rpc_poll_ids 2016-03-02 05:15:21 +01:00
debris
4571df9fc6 Merge branch 'master' of github.com:ethcore/parity into chain_generator 2016-03-02 04:54:55 +01:00
debris
010659cf12 added missing , in comment 2016-03-02 04:54:47 +01:00
debris
68ba016279 improved blockchain generator 2016-03-02 04:25:03 +01:00
arkpar
324e070581 Reverted some changes 2016-03-02 01:24:06 +01:00
arkpar
15ecba57ec Merge branch 'master' of github.com:ethcore/parity into thread 2016-03-02 01:20:41 +01:00
Gav Wood
d55aa54412 Merge branch 'master' into mining 2016-03-02 00:59:39 +01:00
Gav Wood
0082d12ea9 Merge pull request #544 from ethcore/uint-refact 
uint to separate crate
 2016-03-02 00:59:03 +01:00
Gav Wood
3ac14a6d89 Merge pull request #554 from ethcore/chain_generator 
improved test chain generator
 2016-03-02 00:58:52 +01:00
Gav Wood
30c6820437 Refactor and cleanup. 2016-03-02 00:52:18 +01:00
Gav Wood
929f44fe4f Tests for Client sealing. 2016-03-02 00:34:38 +01:00
Tomasz Drwięga
7565625ce0 Integrating TransactionQueue with client 2016-03-01 22:30:23 +01:00
Tomusdrw
aab274d3ef Changing RefCell to Cell in transaction. Implementing Copy on Uints. 2016-03-01 21:29:22 +01:00
Gav Wood
a21fda23a6 Enable transition test. 2016-03-01 20:14:28 +01:00
Gav Wood
628a53ccec Update tests. Fix our tests. 2016-03-01 20:02:59 +01:00
Gav Wood
140711dd8a Fixups from review. 
Reduce size of default extra-data.
Introduce find_uncle_headers.
 2016-03-01 19:59:12 +01:00
Gav Wood
f2eae8bc50 Merge branch 'master' into mining 2016-03-01 18:46:02 +01:00
Gav Wood
61420d3c9c Fix for morden consensus. 2016-03-01 18:17:59 +01:00
Gav Wood
afc0605080 Refactor engine to make it clear that we're actually checking the seal. 2016-03-01 17:23:44 +01:00
Gav Wood
f705f6957a Merge branch 'master' into mining 2016-03-01 16:59:39 +01:00
Gav Wood
a5c65b2a3d Reduce spam. 2016-03-01 16:59:01 +01:00
Gav Wood
48df869202 --author and --extra-data options. Fixed null parent-hash. 2016-03-01 16:58:14 +01:00
debris
38d74bf78c Merge branch 'master' of github.com:ethcore/parity into chain_generator 2016-03-01 16:22:51 +01:00
debris
3e2366b38b improved chain generator 2016-03-01 16:22:06 +01:00
Marek Kotewicz
bbe2e8076b Merge pull request #550 from ethcore/chain_generator 
blockchain generator
 2016-03-01 16:21:27 +01:00
debris
47688e49cd removed redundant whitespaces 2016-03-01 13:54:14 +01:00
debris
063020f507 added license headers 2016-03-01 13:46:33 +01:00
debris
ab9fddf6b2 blockchain generator 2016-03-01 13:44:09 +01:00
Gav Wood
5ccb172e73 Hashrate now reported correctly. 2016-03-01 01:52:22 +01:00
Gav Wood
2266d74c2a Fix JSONRPC I/O. 2016-03-01 01:15:00 +01:00
Gav Wood
394e9c679b Reorganised ImportError to be a type of Errpr (rather than vice-versa). 
Added support for eth_submitWork.
 2016-03-01 00:02:48 +01:00
Nikolay Volf
f528d8c50a common -> numbers (as most narrow) 2016-03-01 00:44:45 +03:00
Nikolay Volf
d0125f3ff5 uint to separated crate 2016-03-01 00:21:15 +03:00
arkpar
d0129ff67b Fixed cache memory leak 2016-02-29 21:15:39 +01:00
arkpar
cb4d17825b Fixed lock order 2016-02-29 19:49:29 +01:00
Gav Wood
ffc5c2ea7b eth_getwork implemented. 2016-02-29 19:30:13 +01:00
arkpar
dff7f2e8e5 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-29 18:25:06 +01:00
arkpar
0ccbba9073 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-29 18:11:59 +01:00
Gav Wood
2c32b0fc1c Merge branch 'master' into mining 2016-02-29 16:40:57 +01:00
Gav Wood
a1e1f4f87c Disable stTransitionTest until Dimitri updates to correct number. 2016-02-29 15:33:33 +01:00
Gav Wood
71da65eb7b Merge branch 'master' of github.com:ethcore/parity 2016-02-29 15:33:02 +01:00
Gav Wood
e20858a5dc Compile fixes. 2016-02-29 15:30:08 +01:00
Gav Wood
83b8e7df5a Initial refactor and block closing. 2016-02-29 14:57:41 +01:00
Gav Wood
6197b3ee60 New provisional Homestead block. 2016-02-29 12:47:34 +01:00
debris
5357f58131 uncomment state transition tests 2016-02-29 12:04:58 +01:00
Arkadiy Paronyan
90b41a81f5 Merge pull request #531 from ethcore/mordenswitch 
Morden switch to Homestead rules at #494,000.
 2016-02-29 11:15:01 +01:00
Gav Wood
be4b0472c8 Morden switch to Homestead rules at #494,000. 2016-02-29 10:33:57 +01:00
debris
1481f3f477 replaced match with if to shorten the code 2016-02-27 19:27:34 +01:00
debris
1cc719d413 description for prepare_block_blooms_update function 2016-02-27 19:17:29 +01:00
debris
53b19e9f2d Merge branch 'master' of https://github.com/ethcore/parity into blockchain_cleanup 2016-02-27 16:06:02 +01:00
Gav Wood
b3f09596b1 Merge pull request #516 from ethcore/sync 
Better memory management
 2016-02-27 15:54:19 +01:00
debris
f1538ebc76 Merge branch 'master' into rpc_poll_ids 2016-02-27 15:34:02 +01:00
debris
7b3613e1f0 updated ExtrasUpdate function 2016-02-27 10:21:44 +01:00
debris
01f69ca80c moved creation of blockchains db transaction to apply_update function 2016-02-27 10:19:33 +01:00
debris
d57518d90c Merge branch 'master' into blockchain_cleanup 2016-02-27 02:18:07 +01:00
debris
cd43e32e25 added docs and license headers 2016-02-27 02:16:39 +01:00
debris
53e8d99075 blockchain split into few separate submodules, cleanup insert_block process 2016-02-27 01:37:12 +01:00
Gav Wood
92625a5095 Merge branch 'master' of github.com:ethcore/parity 2016-02-26 22:39:23 +01:00
Tomasz Drwięga
f118e30b20 Renaming variables to more descriptive 2016-02-26 19:56:32 +01:00
Tomasz Drwięga
f55d111469 Merge branch 'master' into client_bugs 
Conflicts:
	ethcore/src/client.rs
 2016-02-26 19:43:06 +01:00
Gav Wood
fd63fa6836 Update block.rs 2016-02-26 17:27:56 +01:00
debris
2947a1415b Merge branch 'master' into rpc_poll_ids 2016-02-26 15:57:23 +01:00
arkpar
10ef7123c4 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:55:42 +01:00
arkpar
2e66ba7b64 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:53:01 +01:00
arkpar
08d54f9b49 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-26 13:38:06 +01:00
arkpar
80d60cedf6 Removed rocksdb from build scripts and instructions 2016-02-26 13:27:05 +01:00
arkpar
9920dcea17 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-26 13:16:22 +01:00
arkpar
c139b6bcbb Fixed json tests build 2016-02-25 17:48:23 +01:00
arkpar
0344f2b4c9 Block queue mem limit test 2016-02-25 17:14:45 +01:00
arkpar
781f763f1f Memory management 2016-02-25 14:09:39 +01:00
arkpar
5a9bba3fa5 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-24 21:32:21 +01:00
arkpar
cb3608c6d3 Limit download ahead 2016-02-24 21:23:58 +01:00
Tomasz Drwięga
08647282df Fixing mark_as_bad implementation 2016-02-24 17:01:29 +01:00
debris
0318907fb3 rpc eth_getFilterChanges returns new blocks, implemented eth_uninstallFilter 2016-02-24 14:16:05 +01:00
Tomasz Drwięga
d914a27bdf Removing lifetimes from Blocks 2016-02-24 11:17:25 +01:00
Tomasz Drwięga
d3fe3f2691 Client refactoring [WIP] 2016-02-24 10:55:39 +01:00
debris
932b31227f Merge branch 'jsonrpc2' into rpc_poll_ids 2016-02-24 10:45:26 +01:00
debris
da936d2e94 removed unused umports 2016-02-24 10:45:17 +01:00
debris
4ce9aad749 Merge branch 'jsonrpc2' into rpc_poll_ids 2016-02-24 10:35:15 +01:00
debris
ca251215cf simplified filter iterators 2016-02-24 10:35:05 +01:00
debris
394e57d3ce removed unnecessary maps 2016-02-24 10:23:25 +01:00
debris
35cabecad8 support for polling 2016-02-23 18:51:29 +01:00
Tomasz Drwięga
4084acd869 Removing dangling comment 2016-02-23 18:51:18 +01:00
Tomasz Drwięga
990c5c8faa Refactoring client and fixing mark_as_bad & SyncMessage bugs 2016-02-23 18:44:13 +01:00
debris
52ed69b619 Merge branch 'master' into jsonrpc2 2016-02-23 14:53:09 +01:00
Tomusdrw
07e704c968 Fixing clippy warnings. Implementing PartialEq for Uints 2016-02-23 11:40:23 +01:00
Tomusdrw
c2952b49b4 Bumping clippy version Fixes #496 2016-02-23 10:47:57 +01:00
arkpar
778fa92ebe Remove locks from the block chain 2016-02-22 23:52:39 +01:00
arkpar
c8076b2f9d Threading performance optimizations 2016-02-22 23:41:59 +01:00
debris
4b69b96f9b added assert checking bloom index size 2016-02-22 15:14:35 +01:00
arkpar
61949d0ed4 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-22 13:44:25 +01:00
debris
2be4f2f737 added trailin , 2016-02-22 10:14:31 +01:00
debris
8f4c2d98ba added trailin , 2016-02-22 10:11:07 +01:00
debris
61e1720d07 fork back tests 2016-02-22 09:54:56 +01:00
debris
4adb7ee969 tests for blockchain reseting chain head and rebuilding blooms 2016-02-22 09:12:15 +01:00
debris
155404bf92 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 08:50:03 +01:00
debris
8db8e5b5f8 unit tests for reset chain head 2016-02-22 08:46:47 +01:00
Gav Wood
6448d073a7 Merge pull request #481 from ethcore/warnings 
Squash more warnings
 2016-02-20 22:00:08 +01:00
arkpar
8bd052b986 Fixed warnings 2016-02-20 11:54:12 +01:00
arkpar
00f2c6e3e4 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-20 00:48:36 +01:00
Nikolay Volf
84e7ce2758 Merge branch 'master' into temp-path 
Conflicts:
	util/Cargo.toml
	util/src/lib.rs
 2016-02-19 19:11:24 +03:00
Nikolay Volf
ab0fe65f3f unlisting as dev-dependencies 2016-02-19 18:09:31 +03:00
Nikolay Volf
fed90c126e dev/test tools to separate crate 2016-02-19 17:18:20 +03:00
debris
ec428c070b added trailing , 2016-02-19 14:17:04 +01:00
debris
a760f5263f Merge branch 'jsonrpc2' of github.com:ethcore/parity into jsonrpc2 2016-02-19 14:08:33 +01:00
debris
8113c689fc Merge branch 'master' into jsonrpc2 2016-02-19 14:07:11 +01:00
arkpar
f15275bb5b Merge branch 'master' of github.com:ethcore/parity into db 2016-02-19 13:52:07 +01:00
arkpar
85c842b7fd Restored service test 2016-02-19 13:47:13 +01:00
arkpar
1d60d82698 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:44:57 +01:00
arkpar
d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
debris
ef8055f900 Merge branch 'master' into jsonrpc2 2016-02-19 12:52:16 +01:00
debris
ecde760b42 Merge branch 'master' of github.com:ethcore/parity into rustbeta 2016-02-19 12:40:30 +01:00
debris
b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
Gav Wood
4f6bff1c47 Kill bad test. 2016-02-19 11:39:36 +01:00
Gav Wood
0e10efc727 Update blockchain.rs 2016-02-19 11:33:46 +01:00
arkpar
8fa62130e3 Added TODOs 2016-02-19 00:23:05 +01:00
debris
df3d17789a compiling ethcore on beta 2016-02-19 00:06:06 +01:00
arkpar
af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
Gav Wood
8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Nikolay Volf
beb0da4ff4 and adding actual dependency 2016-02-18 22:56:21 +03:00
Nikolay Volf
8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
debris
80f4f422fc updated heapsizeof 2016-02-18 15:17:26 +01:00
debris
ebe8e19cc0 fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16) 2016-02-18 14:36:59 +01:00
arkpar
68d606b5f0 rocksdb abstraction layer 2016-02-18 03:46:24 +01:00
debris
ed880b3b58 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-17 15:59:36 +01:00
debris
046984f7e8 fixed log transaction hashes 2016-02-17 14:57:54 +01:00
debris
49027c529a increase db version 2016-02-17 14:46:23 +01:00
debris
c74c016ce2 moved filter logic from rpc module to ethcore 2016-02-17 14:13:51 +01:00
debris
5826a34ebb storing block receitps in db, client logs method implementation 2016-02-17 12:35:37 +01:00
Nikolay Volf
0b916e0a51 Merge branch 'master' into discovery 2016-02-17 03:21:41 +03:00
Manish Goregaokar
8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
debris
b01652f3e7 LocalizedLogEntry and Filter in ethcore module 2016-02-16 18:21:45 +01:00
arkpar
d95e971030 Prevent deadlocks 2016-02-16 17:53:31 +01:00
debris
7e5e56de40 bloom_filters finally working 2016-02-16 16:54:58 +01:00
debris
d000ad2441 more tests and fixes for blockchains bloom filters 2016-02-16 14:46:21 +01:00
Nikolay Volf
50b6c6d4ad Merge pull request #448 from ethcore/master-upgrade 
Master upgrade
 2016-02-16 15:06:43 +03:00
debris
0699cdd5d0 tests for blockchain bloomfilters 2016-02-16 11:41:34 +01:00
Nikolay Volf
feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
Marek Kotewicz
cdce3697e0 Merge pull request #446 from ethcore/mordenboot 
Add Morden bootnode.
 2016-02-16 11:06:16 +01:00
Tomusdrw
22e2458ce5 Adding rustfmt_skip and fixing couple of places that have troubles after formatting. 2016-02-16 11:01:04 +01:00
Gav Wood
425350aa65 Add Morden bootnode. 2016-02-16 10:53:28 +01:00
arkpar
fa316c21ae Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 02:31:53 +01:00
arkpar
681350b03d Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 01:36:23 +01:00
arkpar
dbf3691c22 Return nothing on state requests instead of panicing 2016-02-16 01:13:13 +01:00
debris
0a3e8a0fdb more tests for bloomfilter 2016-02-15 21:56:33 +01:00
debris
9e760e9fb8 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 21:39:38 +01:00
debris
6d91852c55 test chainfilter on realdata 2016-02-15 21:32:09 +01:00
Arkadiy Paronyan
482292551b Merge pull request #423 from ethcore/secret-store 
Secret store (part1 - key management)
 2016-02-15 20:29:54 +01:00
Nikolay Volf
017a1adb24 fixing issues and moving 2016-02-15 18:01:52 +03:00
debris
552fe1fb4b removed unused functions and warnings 2016-02-15 15:42:43 +01:00
debris
fb4901cbcf Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 15:22:43 +01:00
debris
0fab166fba refactored chainfilter.rs, split out indexer 2016-02-15 15:22:13 +01:00
Nikolay Volf
31762095b7 Merge branch 'master' into secret-store 2016-02-15 17:19:04 +03:00
Gav Wood
75197f4586 Update keys_directory.rs 2016-02-15 14:21:45 +01:00
Gav Wood
38a568e426 Use 1100000 as the homestead transition, fix build instructions. 2016-02-15 13:49:44 +01:00
debris
4c474d8d91 Merge branch 'master' into jsonrpc2 2016-02-15 10:53:01 +01:00
Tomusdrw
2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
Nikolay Volf
3389606c7b crypto section fails checks 2016-02-14 19:09:36 +03:00
Nikolay Volf
75383199d6 kdf params error checking 2016-02-14 18:22:42 +03:00
Nikolay Volf
ae5ec6bad9 Merge branch 'master' into secret-store 2016-02-14 16:01:29 +03:00
debris
9e0cfa1fad ignore transition tests for now, make travis build green again 2016-02-14 13:31:51 +01:00
Gav Wood
ef059911dc Merge pull request #431 from ethcore/nightly-fix 
nightly fixes
 2016-02-14 13:12:40 +01:00
debris
f1b39ee1e5 nightly fixes 2016-02-14 12:54:27 +01:00
Gav Wood
b821412f72 Delay in test frontier file. 2016-02-14 12:02:44 +01:00
Gav Wood
48f657c031 Delay Homestead transition from 1,000,000. 2016-02-14 12:01:18 +01:00
debris
2748e770e4 Merge branch 'master' into jsonrpc2 2016-02-14 11:13:22 +01:00
arkpar
9768fddb19 Homestead block set to 1100000 2016-02-14 01:05:54 +01:00
Nikolay Volf
9ff3155a64 clippy, returing docopt 2016-02-14 00:58:41 +03:00
debris
3a09b2f226 fixed build 2016-02-13 13:15:46 +01:00
debris
3fcade9f6d bloom possibilities in progress 2016-02-13 13:05:28 +01:00
Nikolay Volf
84c752583a clippy version update, docopt-macro moving to fork 2016-02-13 13:17:16 +03:00
Nikolay Volf
91c6b6e2c1 coverage fix 2016-02-13 01:29:28 +03:00
Nikolay Volf
7fa0fd2440 garbage collection 2016-02-13 01:12:32 +03:00
Nikolay Volf
19e1f63909 issues with loading and more tests 2016-02-12 23:27:09 +03:00
Nikolay Volf
89c5d9f6f6 tests and serialization fixes 2016-02-12 20:09:24 +03:00
Nikolay Volf
f198e53891 documentation effort 2016-02-12 18:39:47 +03:00
debris
c9e0071fde blockchain bloomfilter should be ok by now... 2016-02-12 14:03:23 +01:00
Nikolay Volf
1c57214786 constructor rename 2016-02-12 12:52:42 +03:00
debris
b73d528365 bloomfilter reset_chain_head 2016-02-12 02:03:04 +01:00
debris
160c52a14b bloomfilters connected to blockchain (but without reversion) 2016-02-12 00:40:45 +01:00
Nikolay Volf
6cdc220406 key directory 2016-02-12 01:43:37 +03:00
arkpar
01d9ffcd9b Minor fixes 2016-02-11 22:14:06 +01:00
arkpar
62ac80d53f Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 21:10:47 +01:00
arkpar
84732d4b94 Sync fixes 2016-02-11 21:10:41 +01:00
Gav Wood
0a41dedc05 Merge pull request #414 from ethcore/state 
Use latest era instead of end era as journal marker
 2016-02-11 18:44:52 +01:00
Nikolay Volf
d9b6ab1128 flush 2016-02-11 19:48:47 +03:00
Nikolay Volf
02990290c6 json generation 2016-02-11 18:25:00 +03:00
debris
2cf0f1b5f3 moved chainfilter from util to ethcore, blockchain stores block blooms 2016-02-11 14:35:03 +01:00
Nikolay Volf
e61376565e parsing tests 2016-02-11 16:17:38 +03:00
arkpar
0d0441a186 Use latest era instead of end era as journal marker 2016-02-11 13:32:27 +01:00
debris
b0f2ae147b Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-11 10:20:15 +01:00
Nikolay Volf
50a6e90e3d Merge pull request #406 from ethcore/net 
Fixed block_bodies not returning a list
 2016-02-11 04:32:19 +03:00
Nikolay Volf
f0431218d6 basic parsing 2016-02-11 04:22:59 +03:00
arkpar
7bb661e21c Fixed block_bodies not returning a list 2016-02-11 02:07:46 +01:00
Nikolay Volf
ebe3990d0d fixing tests and build 2016-02-11 03:40:22 +03:00
Nikolay Volf
e19b89be2c flush 2016-02-11 03:32:44 +03:00
Gav Wood
5f742c9142 Fix test. 2016-02-11 00:38:19 +01:00
Nikolay Volf
7bfb832312 type metadata for key files 2016-02-11 01:06:35 +03:00
debris
4fe86a4419 eth_getBlockByNumber 2016-02-10 22:54:12 +01:00
debris
93975be5e3 transaction by block number and index 2016-02-10 22:36:59 +01:00
debris
df0fa06e8a applied client interface changes to sync tests 2016-02-10 22:16:25 +01:00
debris
484a4d8bdd Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 21:52:52 +01:00
Gav Wood
9ac4f51601 Allow path to be configured. 2016-02-10 21:17:47 +01:00
debris
db35e21bcd few client methods use BlockId instead of hash and BlockNumber 2016-02-10 19:29:27 +01:00
Nikolay Volf
66a370af9b Merge pull request #396 from ethcore/close_gently 
Catching panics.
 2016-02-10 18:55:53 +03:00
Tomusdrw
96dda7b73a Forwarding panics from threads 2016-02-10 16:35:52 +01:00
Tomusdrw
7925642b1b Removing overengineered stuff 2016-02-10 15:28:43 +01:00
debris
5347d4fe43 changed BlockPosition -> Location 2016-02-10 15:15:28 +01:00
debris
dc8fa4ebfd moved BlockId and TransactionId to blockchain.rs 2016-02-10 15:09:38 +01:00
Tomusdrw
0d121dd51a Removing unecessary locks causing dead-locks 2016-02-10 14:49:31 +01:00
Tomusdrw
6b0cc0c8fa Merge branch 'master' into close_gently 
Conflicts:
	parity/main.rs
 2016-02-10 13:13:04 +01:00
Tomusdrw
2a498fc3eb Implementing PanicHandlers for all places when new thread is spawned. Handling Client panics 2016-02-10 12:50:27 +01:00
debris
75b54cc277 updated BlockId and TransactionId description 2016-02-10 12:43:26 +01:00
debris
8c43c989af fixed Uniquely typo 2016-02-10 12:41:36 +01:00
debris
626277ef9a block and transaction ids, jsonrpcs eth_getTransactionByHash 2016-02-10 11:28:40 +01:00
debris
b86ddbb923 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 10:13:07 +01:00
Nikolay Volf
4ab99a6bb3 fixed conflicting namespaces 2016-02-10 02:20:36 +03:00
debris
4df096fed3 optimize blockchains transaction_at 2016-02-10 00:12:09 +01:00
Nikolay Volf
dabce9ab45 cleanup, warnings 2016-02-10 01:11:22 +03:00
Nikolay Volf
2982c7973e externalities suicide test 2016-02-10 01:02:31 +03:00
Nikolay Volf
2b6eb97f66 log test 2016-02-10 00:41:45 +03:00
Nikolay Volf
71786dd172 should_panic test 2016-02-10 00:32:47 +03:00
Nikolay Volf
3b01ca93cd call fail test 2016-02-09 22:30:35 +03:00
debris
75ccb22d26 add Debug, PartialEq and Eq to LocalizedTransaction 2016-02-09 18:14:04 +01:00
Nikolay Volf
1603b2bf64 flush 2016-02-09 19:47:14 +03:00
debris
3abe5e941f Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-09 17:45:51 +01:00
Nikolay Volf
5767931df6 dried out tests 2016-02-09 19:29:52 +03:00
Nikolay Volf
b42f5145a6 check env_info 2016-02-09 07:54:58 -08:00
Nikolay Volf
7f607905ed moving around setups 2016-02-09 07:31:57 -08:00
Nikolay Volf
cc4206f690 initial test setup 2016-02-09 06:28:27 -08:00
debris
5d05c36791 LocalizedTransaction 2016-02-09 15:17:01 +01:00
Gav Wood
1ae4da46b3 Merge pull request #387 from ethcore/coverage-effort 
Ethash unit tests final
 2016-02-09 13:59:48 +01:00
Nikolay Volf
97789cbab7 Merge pull request #374 from ethcore/jsonrpc 
jsonrpc
 2016-02-09 15:51:28 +03:00
debris
ac2ee42804 Merge branch 'jsonrpc' into jsonrpc2 2016-02-09 13:25:47 +01:00
debris
fd18be4317 change CLIENT_DB_VER_STR instead of DB_VERSION 2016-02-09 13:21:32 +01:00
Nikolay Volf
095c60d440 possible panic resolution, block family tests 2016-02-09 04:20:18 -08:00
debris
c50eb78ca1 jsonrpc optionals 2016-02-09 13:17:55 +01:00
Arkadiy Paronyan
46d3fe3070 Merge pull request #382 from ethcore/coverage-effort 
Coverage effort [in progress]
 2016-02-09 13:14:55 +01:00
Nikolay Volf
9358e9444c unordered h256-pass fix 2016-02-09 03:58:32 -08:00
Nikolay Volf
55a29bfa86 unordered verification 2016-02-09 03:23:35 -08:00
Gav Wood
a33fbbd991 Merge branch 'master' of github.com:ethcore/parity 2016-02-09 12:10:14 +01:00
debris
bb3ffe5764 Merge branch 'master' of github.com:ethcore/parity into jsonrpc 2016-02-09 10:13:35 +01:00
Nikolay Volf
fc0153a5a4 returning client to the place it should be, cleanup 2016-02-09 00:54:33 +03:00
Nikolay Volf
22dd075692 proper fail conditions 2016-02-08 23:43:53 +03:00
Nikolay Volf
1ae7db2e03 coverage & panics avoidance 2016-02-08 23:07:14 +03:00
Gav Wood
7bc340956f Correct node id for bootnode. 2016-02-08 16:57:57 +01:00
debris
483ee1fbce blockchain transaction api 2016-02-08 15:53:22 +01:00
Gav Wood
666a1c3a57 Merge pull request #364 from ethcore/block-propagation 
Blocks propagation
 2016-02-08 15:41:17 +01:00
Gav Wood
a531229076 Back to 30303. 2016-02-08 14:06:49 +01:00
Gav Wood
b27a7e0387 30304 for bootnode. 2016-02-08 13:55:49 +01:00
Gav Wood
047731b11d Add parity-node-zero.ethcore.io to boot nodes. 2016-02-08 13:39:06 +01:00
Nikolay Volf
11103b083a fixed test 2016-02-08 03:35:51 -08:00
Nikolay Volf
3dd220b62f refactoring of report functions, some comments 2016-02-08 03:14:48 -08:00
debris
90f965cf53 Merge branch 'master' of github.com:ethcore/parity into jsonrpc 2016-02-08 11:59:03 +01:00
debris
3adfebdc20 jsonrpc eth_getCode method 2016-02-08 10:58:08 +01:00
Nikolay Volf
1b272051b9 Merge pull request #368 from ethcore/state 
Panic on missing counters; Client cleanup
 2016-02-08 03:04:21 +03:00
arkpar
06f943ee25 Minor change 2016-02-08 00:36:08 +01:00
arkpar
0772cb6d42 Panic on missing counters; Client cleanup 2016-02-07 23:07:36 +01:00
Nikolay Volf
c3f23839e8 Merge branch 'ark' into nvolf 2016-02-07 13:40:00 +03:00
Nikolay Volf
0e0f1fea69 tests 2016-02-07 01:15:53 +03:00
debris
4116bdd8fd Merge branch 'master' into jsonrpc 2016-02-06 21:31:46 +01:00
arkpar
2163d8d597 Block queue clear now clears everything 2016-02-06 00:03:16 +01:00
arkpar
499637606d DB directory versioning 2016-02-05 15:08:18 +01:00
debris
9c3317620d Merge branch 'master' into jsonrpc 2016-02-05 14:16:39 +01:00
Marek Kotewicz
720c280fde Merge pull request #350 from ethcore/signed_transaction 
SignedTransaction structure
 2016-02-05 14:11:12 +01:00
Gav Wood
105f4262dd Merge pull request #354 from ethcore/license 
License
 2016-02-05 14:06:10 +01:00
Gav Wood
85e2ef1cac Merge pull request #353 from ethcore/state 
Performance optimizations
 2016-02-05 14:05:56 +01:00
debris
0ddd113429 changed SignedTransaction transaction property name to unsigned 2016-02-05 13:50:35 +01:00
debris
c90d64662a added license in every *.rs file 2016-02-05 13:40:41 +01:00
debris
7db500c38d rename transactions message_hash -> hash 2016-02-05 13:29:07 +01:00
debris
1d209d909e Merge branch 'master' into signed_transaction 2016-02-05 13:22:09 +01:00
debris
432c0d59c4 few additional rpc eth methods 2016-02-05 13:21:34 +01:00
arkpar
bfb7d378b3 Style 2016-02-05 13:06:40 +01:00
arkpar
31cf20ffa2 New account_db key scheme; snapshot tests 2016-02-05 12:59:21 +01:00
arkpar
97082ca807 Reduced allocations in interpreter 2016-02-05 02:15:26 +01:00
arkpar
a87edc2557 Style 2016-02-05 02:08:17 +01:00
arkpar
755ee95326 Cleanup 2016-02-05 01:49:17 +01:00
arkpar
75ebac36a3 Cleanup 2016-02-05 01:49:06 +01:00
Nikolay Volf
51b41a7080 forgot root changes 2016-02-05 01:58:58 +03:00
debris
eab8410402 finishe signed transactions 2016-02-04 23:48:29 +01:00
arkpar
048c27237a Counters in JournalDB 2016-02-04 21:33:30 +01:00
debris
e92c6ee719 Signed transaciton split in progress 2016-02-04 17:23:53 +01:00
arkpar
af07852080 Merge branch 'sync' of github.com:ethcore/parity into state 2016-02-04 16:02:03 +01:00
debris
87d4c0a775 jit passes all tests expect these, where gas exceed 2 ^ 63 2016-02-04 14:36:57 +01:00
debris
3030b18683 evmjit homestead merge, compiles but tests do not pass yet 2016-02-04 13:13:08 +01:00
arkpar
6b3390f034 Refactored JournalDB 2016-02-04 02:40:35 +01:00
Nikolay Volf
a20600c9d1 verified as well 2016-02-04 04:04:12 +03:00
Nikolay Volf
ce7b5b03ad sync test temp fix 2016-02-04 03:44:40 +03:00
arkpar
b9af3f9260 State copy optimization 2016-02-03 19:34:51 +01:00
Gav Wood
a0c2c6e71d dead_code, not test. 2016-02-03 17:08:33 +01:00
Gav Wood
9d3049bac0 Revert removal of new_code. 2016-02-03 17:07:12 +01:00
Arkadiy Paronyan
d467ac76b0 Merge pull request #323 from ethcore/warnings 
Look ma no `dead_code`
 2016-02-03 16:57:08 +01:00
Arkadiy Paronyan
b831d694b4 Merge pull request #326 from ethcore/jit 
Fixing JIT, Updating hook to run `ethcore` tests.
 2016-02-03 16:56:59 +01:00
arkpar
3bc3d24945 Missing inline 2016-02-03 16:55:23 +01:00
arkpar
42d5c09131 Final docs 2016-02-03 16:43:48 +01:00
Tomusdrw
62b7862206 Fixing evm tests for JIT 2016-02-03 16:21:52 +01:00
Tomusdrw
83bfd43a90 Fixing JIT compilation 2016-02-03 15:59:53 +01:00
Tomusdrw
8a2db83803 Removing 2016-02-03 15:57:17 +01:00
Tomusdrw
471f1f82be Fixing unused variable warning 2016-02-03 15:35:03 +01:00
Tomusdrw
a7b1b70fc1 Changing allow(dead_code) to more specific exclusions 2016-02-03 15:33:58 +01:00
Gav Wood
a1bfcf17e3 Merge branch 'master' of github.com:ethcore/parity 2016-02-03 14:58:30 +01:00
Gav Wood
fad2f3a23d More doc updates. All Gav Wood docs done. 2016-02-03 14:51:45 +01:00
Gav Wood
4a88adfde7 Merge pull request #317 from ethcore/evm-tests 
Additional evm tests (extops, call, jumps) and some docs
 2016-02-03 14:37:17 +01:00
Gav Wood
3f03ba40ee Suppress warnings along with explanation. 2016-02-03 13:32:57 +01:00
Gav Wood
c531150f44 More documentation. 2016-02-03 13:20:32 +01:00
Tomusdrw
a8bd37d5d2 Merge branch 'master' into evm-tests 2016-02-03 13:06:21 +01:00
Tomusdrw
60d7fdf81f CALL/CALLCODE tests 2016-02-03 13:04:52 +01:00
Marek Kotewicz
5a33602d34 Merge pull request #315 from ethcore/gavdocs 
Additional documentation.
 2016-02-03 12:50:06 +01:00
Gav Wood
cef157e83a Merge branch 'master' of github.com:ethcore/parity 2016-02-03 12:26:23 +01:00
Gav Wood
b7edc95bc4 Merge pull request #310 from ethcore/json_tests_split 
unused functions cleanup
 2016-02-03 12:19:36 +01:00
Gav Wood
61f95e0415 Additional documentation. 2016-02-03 12:18:12 +01:00
Tomusdrw
82496ffb13 Jump tests 2016-02-03 11:59:48 +01:00
Tomusdrw
da22bbf21c Tests for some external operations 2016-02-03 11:26:24 +01:00
debris
bc3c983c37 make few functions compile only for test target 2016-02-02 23:45:50 +01:00
Gav Wood
eda65b0e36 Merge branch 'master' of github.com:ethcore/parity 2016-02-02 23:44:36 +01:00
Gav Wood
78adec5e53 Document some stuff. 2016-02-02 23:43:29 +01:00
debris
808e517ff0 removing unused functions in progress 2016-02-02 23:06:34 +01:00
debris
7aba3032c8 Merge branch 'master' into json_tests_split 2016-02-02 22:50:53 +01:00
debris
1b6fe392f8 split tests and json_tests 2016-02-02 22:50:41 +01:00
Gav Wood
5155ff1fac Merge pull request #303 from ethcore/ark 
Check block parent on import; Peer timeouts
 2016-02-02 22:40:06 +01:00
arkpar
6e717c017f Fixed queue test 2016-02-02 21:06:21 +01:00
Tomusdrw
285621cfa9 Merge branch 'master' into evm-cov-test 
Conflicts:
	ethcore/src/evm/factory.rs
 2016-02-02 18:21:55 +01:00
debris
bb2104d312 header docs and fixed header default 2016-02-02 18:21:31 +01:00
Tomusdrw
270c6c1897 Adding pop & badinstruction tests 2016-02-02 18:16:24 +01:00
Tomusdrw
366f9fe8f2 Couple of tests for EVM 2016-02-02 18:02:58 +01:00
arkpar
81e339a77a Merge 2016-02-02 17:00:32 +01:00
debris
38dfa18e8c gzip64res_to_json is no longer public 2016-02-02 16:35:11 +01:00
debris
e9a516e4dc make ethcore block_queue module public 2016-02-02 16:27:37 +01:00
debris
a1cedaa994 ethcore block and blockchain module fixes 2016-02-02 16:24:37 +01:00
debris
cb98cbcd4b ethcore public interface cleanup 2016-02-02 15:55:44 +01:00
debris
30dc9d857d cleanup ethcore public interfaces 2016-02-02 15:29:53 +01:00
arkpar
bd684e3732 Check for parent on queue import 2016-02-02 12:12:32 +01:00
Marek Kotewicz
d688fa0622 Merge pull request #296 from ethcore/jsonrpcclioptions 
Include JSONRPC CLI options.
 2016-02-02 02:37:09 +01:00
Gav Wood
54924d14b3 Include JSONRPC CLI options. 
Bump version numbers.
Update Trie benchmarks.
Disable RLP benchmark (@debrid please fix).
 2016-02-02 01:59:14 +01:00
debris
ba62e757e0 Merge branch 'master' into travis_fixes 2016-02-02 01:13:21 +01:00
arkpar
5db17514fd Fixed block queue test 2016-02-01 16:18:32 +01:00
debris
09ebc924a6 json tests are not run in default configuration, faster travis build, fixed coverage for ethcore-rpc and ethash 2016-02-01 16:03:43 +01:00
Nikolay Volf
77fdef4fb0 Merge branch 'master' into coverage-effort 
Conflicts:
	ethcore/src/receipt.rs
 2016-02-01 16:37:08 +04:00
Nikolay Volf
e0e8ba01ed accrue expanded 2016-02-01 16:29:12 +04:00
Nikolay Volf
cf963b1957 more of env_info 2016-02-01 15:35:13 +04:00
Gav Wood
78e514b527 Fix test. 2016-02-01 11:00:18 +01:00
Gav Wood
401005fde5 Test for Receipt RLP. 2016-02-01 01:03:57 +01:00
Gav Wood
5ef9e9d55f Remove invalid comments. 
Reorder Stage 4 verification to check easier things first.
 2016-01-31 23:48:13 +01:00
Gav Wood
b63ee99219 Merge branch 'master' of github.com:ethcore/parity 2016-01-31 22:52:41 +01:00
Gav Wood
0254b36dc1 Fix CALLDATACOPY (and bonus CODECOPY, too!). 
Fixes #269
Fixes #270
Also fix evm debug feature.
 2016-01-31 22:47:24 +01:00
debris
1a69b3861d make json tests optional 2016-01-31 20:14:27 +01:00
Nikolay Volf
f2a109684e remove directory 2016-01-31 19:35:17 +04:00
Nikolay Volf
5837b6e131 Merge branch 'master' into coverage-effort 
Conflicts:
	ethcore/res/ethereum/tests
 2016-01-31 18:40:59 +04:00
debris
00db35457c comment out failing tests 2016-01-31 12:54:31 +01:00
debris
e379592a1a Merge branch 'move' into travis_move 2016-01-31 12:45:17 +01:00
debris
02f5004161 moving around dirs 2016-01-31 11:08:04 +01:00
debris
8fe0d74b64 moved src to ethcore 2016-01-31 10:36:48 +01:00