Commit Graph

2448 Commits

Author SHA1 Message Date
yann300
91dbf63978 Merge remote-tracking branch 'up/develop' into bugFix
Conflicts:
	mix/CodeModel.cpp
2015-05-20 12:17:04 +02:00
Gav Wood
b0d5cbf698 Pregenerate DAG when mining on AZ/eth/ethminer.
Use regeneratable key for decrets by default.
2015-05-20 09:31:38 +02:00
chriseth
79f11974ea Gas estimation taking known state into account. 2015-05-20 00:28:15 +02:00
Gav Wood
2a23521564 Move OverlayDB (leveldb dependent) back into libdevcrypto. 2015-05-19 20:04:48 +02:00
Gav Wood
8c5f139983 Merge branch 'bc' of https://github.com/arkpar/cpp-ethereum into arkpar-bc 2015-05-19 19:52:38 +02:00
Gav Wood
a5005aefff Move non-cryptopp dependent stuff into devcore. 2015-05-19 19:51:38 +02:00
Gav Wood
bae5779ab2 SHA3, RIPEMD160 and SHA256 are now not cryptopp impls. 2015-05-19 19:38:17 +02:00
CJentzsch
aefd0e9ca5 handle output larger than 4069 bytes in test 2015-05-19 16:46:00 +02:00
arkpar
a052b53051 orderedTrieRoot testing 2015-05-19 11:39:46 +02:00
arkpar
148fd2638b use TrieHash for transactions and receipts roots 2015-05-19 11:39:45 +02:00
yann300
51d94ae1b9 merge with develop 2015-05-19 10:31:32 +02:00
Gav Wood
8512e30f0a Merge pull request #1966 from CJentzsch/addTests
Add tests
2015-05-18 20:27:41 +02:00
yann300
38691f743c add list of second errorannotation instead of single item. 2015-05-18 19:28:31 +02:00
CJentzsch
bc62f3be4b add create retrun value tests 2015-05-18 16:29:26 +02:00
Gav Wood
06654ab8fb Merge pull request #1899 from debris/web.js4.2
web.js 4.2
2015-05-18 13:32:28 +02:00
winsvega
e12588ada4 Blocktests: SimpleTx3 2015-05-18 13:32:43 +03:00
winsvega
1e71518871 New Tests
validBlockTestFix
Solidity Contract Inheritance
singletest for blockchain
2015-05-18 13:32:43 +03:00
chriseth
accf43ae4b Merge pull request #1931 from chriseth/sol_callcode
Bare callcode for addresses and contracts.
2015-05-18 12:29:00 +02:00
Martin Holst Swende
8dd1cd593b Fixed error introduced in 953be7886b5681f0fa8ecde94b1fdb8c25afbfd4 2015-05-18 07:35:02 +00:00
Paweł Bylica
c7facd6d37 Little improved base64 implementation.
Global variable type changed from dynamic constructed std::string to constant char array.
Truncating conversion eliminated (no MSVC warning).
Unit tests added.
2015-05-17 23:03:39 +02:00
Gav Wood
5cc910e9fd Merge pull request #1908 from arkpar/trie_perf
Trie performance optimizations
2015-05-17 21:25:20 +02:00
Gav Wood
384226ba25 Parallelised BlockQueue.
Setup for using TrieRoot.
2015-05-17 19:21:33 +02:00
Gav Wood
f7aa46ca6f Merge pull request #1890 from LefterisJP/ethash_aux_use_seedhash
Use seedhash everywhere in EthashAux
2015-05-15 19:10:36 +02:00
chriseth
563f9098b2 Bare callcode for addresses and contracts. 2015-05-15 18:02:09 +02:00
Gav Wood
d9be6b64c1 Merge pull request #1912 from CJentzsch/fixGasPricerTests
update gas Pricer tests
2015-05-15 17:37:34 +02:00
Gav Wood
550144362b Merge pull request #1911 from CJentzsch/ficInChainUncleTests
fix in chain uncle tests
2015-05-15 17:36:22 +02:00
chriseth
5f8a5f672d Store copied assembly items in test. Fixes OSX issues. 2015-05-15 13:25:44 +02:00
chriseth
7d5bebd464 Disable test. 2015-05-15 11:46:32 +02:00
chriseth
779ce0131a Merge pull request #1889 from chriseth/sol_multipleTagsOnStack
Known state: store tags on stack as unions.
2015-05-15 11:12:13 +02:00
CJentzsch
5241e941aa update gas Pricer tests 2015-05-14 22:56:19 +02:00
CJentzsch
bb9c2e3cb9 fix in chain uncle tests 2015-05-14 21:59:36 +02:00
Lefteris Karapetsas
f1f1ab847f Stricter interface for EthashAux::light() 2015-05-14 21:53:59 +02:00
Gav Wood
b53e7cc76e Merge pull request #1891 from imapp-pl/pr/tests
More arithmetic VM tests
2015-05-14 20:05:26 +02:00
arkpar
e61d7e07f7 style 2015-05-14 19:50:30 +02:00
arkpar
ee318eecd9 Trie optimizations 2015-05-14 19:48:01 +02:00
Paweł Bylica
6a8bb26cf8 Tests: SMOD edge case test. 2015-05-14 16:41:02 +02:00
CJentzsch
130b397550 correct expext value for in chain uncle tests 2015-05-14 16:20:42 +02:00
CJentzsch
145e56d69e add in chain uncle test for every generation 2015-05-14 16:17:32 +02:00
Marek Kotewicz
710a1463c1 Squashed 'libjsqrc/ethereumjs/' changes from e908439..16861fc
16861fc version 0.4.2
e4f7dde fixed failing lint
69e7d9d fixed #133
55553d7 add async error test
d02a375 Merge branch 'develop' of github.com:ethereum/web3.js into develop
ff48da1 fixed callback error issue
471bce1 #133 in progress
dc69085 version 0.4.1
2ae0afa critical bugfix
09f2a92 updated examples
a0a36e5 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
2b179a8 updated node install test
8f63640 Merge pull request #203 from frozeman/develop
22ef4a1 added estimateGas method
cd2e462 version 0.4.0
ae7762a Merge pull request #198 from ethereum/minerMethods
d1e1206 removed byte formatter methods
6fd17d9 merged develop
373fd1b Merge pull request #201 from debris/batch
274fc29 Merge pull request #200 from debris/contract_overhaul
b2ff2ff Merge branch 'contract_overhaul' into batch
99a3bda removed redundant lines
7cafac9 Merge branch 'develop' into contract_overhaul
fa8db32 Merge pull request #202 from debris/async_properties
5f9272c asyncGet -> getAsync
cd0df61 gulp
80c0792 async getting properties, remove property setters
744bb9e batch for requests with calls/transacts
8636077 initial support for batch requests
a0b9cfb contract async call && transact
1272780 sendTransaction && call async
6afb1f9 Merge branch 'async-contract-calls' of https://github.com/niran/web3.js into contract_overhaul
611f640 asynchronous contract creation, breaking changes
e3796bf merged develop
edf808a add getWork and submitWork functions and toXBytes utils
9812b01 Merge branch 'blockFilterProposal' of https://github.com/ethereum/ethereum.js into develop
6f466f6 add miner functions
3af8e27 add newblockfilter Proposal
e86552f Use async contract calls when a callback is passed

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 16861fc1944cca721672bb8faa81909d69be2b99
2015-05-14 14:05:30 +02:00
Marek Kotewicz
608a9565db merge commit '89dbcca30b752ecf2b8b56b5f396a6a86c29fc0a' into web.js4.2 2015-05-14 14:05:30 +02:00
Paweł Bylica
e73e07e32f Add support for --singletest filter in VM tests.
Add & correct arithmetic VM tests.
2015-05-13 19:35:19 +02:00
Gav Wood
070adc33bc Merge pull request #1870 from subtly/discovery
Guard m_node.endpoint access and updates.
2015-05-13 18:41:10 +03:00
Gav Wood
c1040ce184 Merge pull request #1861 from CJentzsch/addTests
add identity contract tests
2015-05-13 18:38:10 +03:00
Gav Wood
021f20a640 Merge pull request #1854 from CJentzsch/optionalWalletTests
optional wallet blockChain tests, because it takes a while
2015-05-13 18:37:45 +03:00
chriseth
b50362042e Known state: store tags on stack as unions. 2015-05-13 17:15:32 +02:00
subtly
616c953f92 Merge branch 'develop' into discovery 2015-05-13 11:01:28 +02:00
Gav Wood
b0b3223fed Revert "CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin"" 2015-05-13 11:45:18 +03:00
CJentzsch
80c328863c style 2015-05-13 10:38:23 +02:00
CJentzsch
1230062ff0 Merge remote-tracking branch 'upstream/develop' into addTests 2015-05-13 10:35:51 +02:00
Gav Wood
e3aca3dca9 Merge pull request #1875 from chriseth/sol_invertIf
Reverse if and else body.
2015-05-13 00:59:56 +03:00