Commit Graph

3090 Commits

Author SHA1 Message Date
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
Arkadiy Paronyan b64713e5ac Merge pull request #736 from ethcore/travis-stable-only
stable only until travis speedup
2016-03-15 11:56:11 +01:00
Gav Wood e98cfd84a9 Merge pull request #629 from ethcore/uint_opt
Optimizing uint operations (architecture independent)
2016-03-15 11:24:00 +01:00
Nikolay Volf ec4f7c4190 stable only until travis speedup 2016-03-15 11:12:54 +01:00
Gav Wood 59d0d2df9a Don't change best block until extras is committed. 2016-03-15 10:59:58 +01:00
Tomasz Drwięga d5ec1775ef Merge branch 'master' into uint_opt
Conflicts:
	test.sh
	util/bigint/src/uint.rs
2016-03-14 23:45:16 +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
Arkadiy Paronyan ffbc6f51cb Merge pull request #726 from ethcore/docker
dockerfiles update
2016-03-14 19:02:04 +01:00
debris dfef09161c update dockerfiles 2016-03-14 18:47:23 +01:00
debris c476e7da31 update docker 2016-03-14 18:25:05 +01:00
Gav Wood 97051cb949 Add RLP, not a data item. 2016-03-14 18:20:24 +01:00
debris 81beaf1094 update dockerfiles 2016-03-14 17:53:08 +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
Arkadiy Paronyan 683c13db37 Merge pull request #721 from ethcore/titi
Lock reports to avoid out of order badness.
2016-03-14 17:26:01 +01:00
debris 9b241faf01 uncle method mock 2016-03-14 17:01:29 +01:00
Arkadiy Paronyan d844de442a Merge pull request #722 from ethcore/network
Fixed handshake leak
2016-03-14 16:23:54 +01:00
debris 47ca84041b tests for eth_mining, eth_compileLLL, eth_compileSolidity, eth_compileSerpent 2016-03-14 14:59:09 +01:00
arkpar 4e5ebc9457 missing mut 2016-03-14 14:22:18 +01:00
arkpar f6e8c03ff6 Merge branch 'master' of github.com:ethcore/parity into titi 2016-03-14 14:18:59 +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
arkpar c8b65c769b Fixed handshake leak 2016-03-14 13:54:06 +01:00
Arkadiy Paronyan 42499addc8 Merge pull request #714 from ethcore/master-version
Version 1.1 in master
2016-03-14 13:40:52 +01:00
Gav Wood 5503cd4646 Lock reports to avoid out of order badness. 2016-03-14 12:41:11 +01:00
Gav Wood 44223f3658 Merge pull request #720 from ethcore/network
Silence UDP warnings
2016-03-14 11:10:12 +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
Gav Wood 7320ad077f Merge remote-tracking branch 'origin/master' into targetgaslimit 2016-03-14 10:54:38 +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
Arkadiy Paronyan acd39843d4 Merge pull request #715 from ethcore/rpc-personal-tests
Rpc personal tests
2016-03-14 10:31:01 +01:00
Arkadiy Paronyan a1fe1a6136 Merge pull request #704 from ethcore/fixing_warnings
Fixing warnings
2016-03-14 10:28:28 +01:00
Arkadiy Paronyan d5fa49376e Merge pull request #713 from ethcore/docoptclean
docopts cleanups
2016-03-14 10:26:38 +01:00
arkpar d3c1b5455b Silenced UDP warnings 2016-03-14 10:25:04 +01:00
Nikolay Volf 8532f2dc2e removed tests that used fixedhash 2016-03-14 09:44:02 +01:00
Nikolay Volf b4ba070619 Merge branch 'master' into master-version 2016-03-14 09:40:38 +01:00
Nikolay Volf 6827ff9319 [ci skip] fix tesh.sh 2016-03-14 09:38:44 +01:00
Gav Wood 7af0a1dc2c Missing comma. 2016-03-14 02:02:32 +01:00
Gav Wood f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
Arkadiy Paronyan c53974f125 Merge pull request #717 from ethcore/build
Removed rocksdb build dependency
2016-03-14 01:58:15 +01:00
Gav Wood 8ad66875e5 Merge pull request #710 from ethcore/fix-discovery
Fixed splitting Neighbours packet
2016-03-14 01:32:13 +01:00
arkpar 7bc3c0b026 Removed rocksdb build dependency 2016-03-14 01:27:27 +01:00
Nikolay Volf 2117d363e2 new account test & fix 2016-03-14 01:06:42 +01:00
arkpar 9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Gav Wood e792998d0a Merge remote-tracking branch 'origin/master' into fixing_warnings 2016-03-14 01:00:12 +01:00
Gav Wood fe722419e7 Merge branch 'master' into fixing_warnings 2016-03-14 00:57:49 +01:00
Gav Wood 2d1a837a8b docopts cleanups.
one for @LefterisJP: 80-character line for docopts.
2016-03-14 00:52:31 +01:00
Nikolay Volf 1957a14961 personal tests setup 2016-03-14 00:48:43 +01:00