aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix stackoverflow in calldataload, codecopy, extcodecopy + some testsCJentzsch2014-12-053-0/+195
|
* Merge pull request #555 from CJentzsch/newTestsGav Wood2014-12-031-6/+6
|\ | | | | test update due to CALLCODE <-> RETURN
| * test update due to CALLCODA <-> RETURNCJentzsch2014-12-031-6/+6
| |
* | Merge pull request #549 from chriseth/sol_saveScopeGav Wood2014-12-031-0/+30
|\ \ | |/ |/| Disallow assignments to structs and mappings
| * Disallow assignments to structs and mappings.Christian2014-12-021-0/+30
| |
* | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-12-038-14/+264
|\ \ | | | | | | | | | | | | Conflicts: test/vm.cpp
| * | styleCJentzsch2014-12-023-38/+37
| | | | | | | | | | | | | | | Conflicts: libevm/VM.h
| * | updated createRandomTest to correct exception behaviorCJentzsch2014-12-021-9/+16
| | |
| * | added logs to state testsCJentzsch2014-12-026-39/+87
| |/
| * Adding natspec comment test being between keyword and signatureLefteris Karapetsas2014-12-011-2/+24
| |
| * Solidity natspec docstring test improvementsLefteris Karapetsas2014-11-281-23/+47
| | | | | | | | | | | | | | | | | | - Adding a test for docstring being between function signature and function body - Properly checking for exceptions in parsing - Small parser fix
| * Solidity FunctionDefinition used ASTString shared ptr for docstringsLefteris Karapetsas2014-11-281-9/+11
| |
| * Adding solidity natspec comment inside function bodyLefteris Karapetsas2014-11-281-0/+30
| |
| * Fixing multiline comment parsing in solidityLefteris Karapetsas2014-11-281-2/+0
| |
| * Solidity work for documentation stringsLefteris Karapetsas2014-11-281-0/+52
| | | | | | | | | | | | | | | | | | | | - Still a work in progress - Parser now properly gets each function's doc comment - Small changes in the scanner - Multiline comments are considered
| * Solidity function AST nodes get documentation attributeLefteris Karapetsas2014-11-271-1/+32
| |
* | PV46. Minor protocol alterations.Gav Wood2014-12-031-1/+1
|/
* Global functions.Christian2014-11-261-1/+90
|
* Sending ether.Christian2014-11-261-0/+15
|
* More general function types and references.Christian2014-11-261-0/+20
|
* Merge pull request #540 from chriseth/sol_actualBlockchainAccessGav Wood2014-11-251-0/+13
|\ | | | | Access to blockchain data.
| * Access to blockchain data.Christian2014-11-241-0/+13
| |
* | Merge pull request #533 from CJentzsch/stateTestsGav Wood2014-11-251-3/+16
|\ \ | | | | | | Specify user defined test
| * | styleChristoph Jentzsch2014-11-211-1/+1
| | |
| * | Specify user defined testChristoph Jentzsch2014-11-211-3/+16
| | |
* | | Merge pull request #529 from CJentzsch/newTestsGav Wood2014-11-2510-4/+1474
|\ \ \ | |_|/ |/| | more tests + log tests
| * | styleChristoph Jentzsch2014-11-212-4/+2
| | |
| * | Merge remote-tracking branch 'upstream/develop' into newTestsChristoph Jentzsch2014-11-204-37/+106
| |\| | | | | | | | | | | | | Conflicts: test/vm.cpp
| * | add make money testChristoph Jentzsch2014-11-202-0/+46
| | |
| * | more log testsChristoph Jentzsch2014-11-191-7/+1160
| | |
| * | Add Log testsChristoph Jentzsch2014-11-195-1/+177
| | |
| * | new push32 test and renamingChristoph Jentzsch2014-11-191-1/+30
| | |
| * | Changed name of some testsChristoph Jentzsch2014-11-191-2/+2
| | |
| * | more precompiled contract testsChristoph Jentzsch2014-11-191-0/+68
| | | | | | | | | | | | | | | Conflicts: libevm/VM.h
* | | Another test for struct references.Christian2014-11-241-0/+28
| | |
* | | Magic variables.Christian2014-11-244-22/+22
| | |
* | | Contracts as types and framework for special global variables.Christian2014-11-245-12/+43
| | |
* | | Merge pull request #524 from LefterisJP/sol_parse_commentschriseth2014-11-211-0/+40
|\ \ \ | |_|/ |/| | Solidity scanner taking documentation comments into account
| * | extra comments scanning testLefteris Karapetsas2014-11-211-0/+11
| | |
| * | documentation comments are now always skipped but saved as special tokens at ↵Lefteris Karapetsas2014-11-191-20/+5
| | | | | | | | | | | | the Scanner
| * | solidity scanner takes triple slash doc comments into accountLefteris Karapetsas2014-11-191-0/+44
| | | | | | | | | | | | | | | | | | | | | - Conditionally scanning for the documentation comments and gettings their contents. - Adding tests for this functionality of the scanner
* | | Merge pull request #528 from chriseth/sol_constructorGav Wood2014-11-201-0/+22
|\ \ \ | | | | | | | | Special handling for constructor.
| * | | Special handling for constructor.Christian2014-11-191-0/+22
| | |/ | |/|
* | | Merge pull request #527 from imapp-pl/pr-changesGav Wood2014-11-202-33/+45
|\ \ \ | | | | | | | | Check only if an exception occurred if an exception expected
| * | | In VM tests, check only if an exception occurred if an exception expected ↵Paweł Bylica2014-11-192-33/+45
| |/ / | | | | | | | | | (no post state and output checking)
* | | Merge pull request #520 from wanderer/developGav Wood2014-11-201-0/+35
|\ \ \ | |/ / |/| | added filler
| * | added filler.jsonwanderer2014-11-181-0/+35
| | |
* | | Merge branch 'filter_logs' into developGav Wood2014-11-182-17/+134
|\ \ \ | |_|/ |/| |
| * | common changesMarek Kotewicz2014-11-181-11/+24
| | |
| * | Merge branch 'filter_logs' of https://github.com/ethereum/cpp-ethereum into logsMarek Kotewicz2014-11-181-24/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/webthreestubclient.h
| | * | Renaming and fixes.Gav Wood2014-11-181-2/+2
| | | |
| * | | logs in specMarek Kotewicz2014-11-181-11/+24
| |/ /
| * | ethereum.js not minified, serpent compiler, jsonrpc handles compilers exceptionsMarek Kotewicz2014-11-171-0/+13
| | |
| * | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-172-199/+129
| |\| | | | | | | | | | | | | Conflicts: libweb3jsonrpc/WebThreeStubServer.cpp
| * | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-146-112/+404
| |\ \
| * | | storage dump testMarek Kotewicz2014-11-141-0/+38
| | | |
| * | | added storageAt which dumps contract storageMarek Kotewicz2014-11-141-0/+13
| | | |
| * | | removed unnecessary methods from jsonrpc and added contract call testsMarek Kotewicz2014-11-132-27/+28
| | | |
| * | | contract calls working from jsMarek Kotewicz2014-11-131-2/+1
| | | |
| * | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-123-5/+104
| |\ \ \
| * | | | contract create and contract call workingMarek Kotewicz2014-11-111-3/+2
| | | | |
| * | | | Merge branch 'develop' into js_abiMarek Kotewicz2014-11-110-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libjsqrc/main.js libweb3jsonrpc/WebThreeStubServer.cpp libweb3jsonrpc/WebThreeStubServer.h libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/webthreestubclient.h
| * | | | | mergeMarek Kotewicz2014-11-119-222/+2335
| | | | | |
| * | | | | js abi connectionMarek Kotewicz2014-11-111-14/+56
| | | | | |
* | | | | | Build fix.Gav Wood2014-11-181-1/+1
| | | | | |
* | | | | | Remove overly verbose log.Gav Wood2014-11-181-1/+1
| | | | | |
* | | | | | Merge pull request #515 from chriseth/sol_structschriseth2014-11-183-2/+242
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Mappings and structs for Solidity
| * | | | | Struct types.Christian2014-11-142-0/+75
| | | | | |
| * | | | | Mapping types.Christian2014-11-142-2/+167
| | |_|_|/ | |/| | |
* | | | | Windows build fix.Gav Wood2014-11-171-1/+1
| | | | |
* | | | | pr fixsubtly2014-11-141-2/+1
| | | | |
* | | | | Merge branch 'develop' into cryptosubtly2014-11-146-112/+404
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libdevcrypto/EC.cpp
| * | | | Compile fixes.Gav Wood2014-11-141-6/+6
| | | | | | | | | | | | | | | | | | | | Version bump.
| * | | | Merge pull request #512 from ethereum/sol_jsonInterfaceTestsGav Wood2014-11-141-0/+214
| |\ \ \ \ | | | | | | | | | | | | Solidity json interface tests
| | * | | | solidity json interface tests fixesMarek Kotewicz2014-11-121-3/+4
| | | | | |
| | * | | | solidity JSON interface testsMarek Kotewicz2014-11-121-0/+213
| | | | | |
| * | | | | Merge pull request #510 from CJentzsch/NewStateTestsGav Wood2014-11-143-41/+78
| |\ \ \ \ \ | | | | | | | | | | | | | | create new tests with command line options
| | * | | | | changed name of command line option to filltestsChristoph Jentzsch2014-11-121-1/+1
| | | | | | |
| | * | | | | Create state test with commandline flagChristoph Jentzsch2014-11-122-22/+59
| | | | | | |
| | * | | | | Store return value of call to precompiled contract in testChristoph Jentzsch2014-11-121-19/+19
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #509 from chriseth/sol_jsonInterfaceGav Wood2014-11-141-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | Provide interface for calls in JSON and some other formatting changes.
| | * | | | Provide interface for calls in JSON and some other formatting changes.Christian2014-11-121-1/+1
| | |/ / /
| * | | | Merge pull request #501 from chriseth/sol_testFrameworkGav Wood2014-11-141-63/+88
| |\ \ \ \ | | | | | | | | | | | | Tests on ranges of input data.
| | * | | | Working template magic for void function.Christian2014-11-111-19/+22
| | | | | |
| | * | | | Allow void return type.Christian2014-11-111-23/+35
| | | | | |
| | * | | | Tests on ranges of input data.Christian2014-11-101-52/+62
| | | |/ / | | |/| |
| * | | | Merge pull request #500 from chriseth/sol_jumptableGav Wood2014-11-142-7/+23
| |\ \ \ \ | | |_|/ / | |/| | | Replace function selector jump table by more resilient linear time check.
| | * | | Merge remote-tracking branch 'ethereum/develop' into sol_jumptableChristian2014-11-119-210/+2324
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: libsolidity/Compiler.cpp
| | * | | Replace function selector jump table by more resilient linear time check.Christian2014-11-102-7/+23
| | | |/ | | |/|
* | | | changes for code reviewsubtly2014-11-141-1/+1
| | | |
* | | | Merge branch 'develop' into cryptosubtly2014-11-133-5/+104
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libdevcrypto/Common.cpp libdevcrypto/EC.cpp
| * | | Merge pull request #504 from CJentzsch/NewStateTestsGav Wood2014-11-112-5/+20
| |\ \ \ | | | | | | | | | | All unintended VM exceptions work like OOG in tests
| | * \ \ Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-113-222/+355
| | |\ \ \ | | | | |/ | | | |/|
| | * | | All unintended VM exceptions work like OOG in testsChristoph Jentzsch2014-11-112-5/+20
| | | | |
| * | | | Make OOG on precompileds consistent.Gav Wood2014-11-111-0/+84
| | |/ / | |/| | | | | | | | | | | | | | | | | | Warning fix. Use high-res clock for randoms. Whisper test.
* | | | refactor and thread-safe cryptopp. for now, remove secp256klib calls. ecdh ↵subtly2014-11-131-98/+45
| | | | | | | | | | | | | | | | and tests. move sha3mac into sha3.
* | | | cryptopp recover public keysubtly2014-11-121-4/+4
| | | |
* | | | ecdh, ecdhe, initial aes classessubtly2014-11-122-105/+89
|/ / /
* | | Merge pull request #499 from CJentzsch/NewStateTestsGav Wood2014-11-117-21/+2134
|\| | | | | | | | New state tests, precompiled contracts tests and user defined tests
| * | build fixChristoph Jentzsch2014-11-114-4/+6
| | |
| * | added generic userDefinedTest functionChristoph Jentzsch2014-11-114-74/+44
| | |
| * | undefine FILL_TESTSChristoph Jentzsch2014-11-101-1/+1
| | |
| * | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-107-85/+38
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: test/state.cpp test/tmpFiller.json
| * | | specified user defined testChristoph Jentzsch2014-11-102-21/+71
| | | |
| * | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-077-74/+203
| |\ \ \
| * | | | Added random test executionChristoph Jentzsch2014-11-072-8/+36
| | | | |
| * | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-071-0/+49
| |\ \ \ \
| * | | | | Added precompiledContracts testsChristoph Jentzsch2014-11-073-27/+741
| | | | | |
| * | | | | Merge branch 'stateTests' into NewStateTestsChristoph Jentzsch2014-11-0611-352/+1059
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/TestHelper.cpp test/vm.cpp
| | * | | | | update SIGNEXTEND testsChristoph Jentzsch2014-11-062-8/+8
| | | | | | |
| * | | | | | added state system operations testChristoph Jentzsch2014-11-053-13/+81
| | | | | | |
| * | | | | | Merge branch 'StateBug' into NewStateTestsChristoph Jentzsch2014-11-053-10/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-051-51/+45
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'newTests' into NewStateTestsChristoph Jentzsch2014-11-056-971/+1023
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/vm.cpp test/vmArithmeticTestFiller.json test/vmSha3TestFiller.json
| * | | | | | | | | Added stSystemOperationsTestChristoph Jentzsch2014-11-054-19/+1283
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into NewStateTestsChristoph Jentzsch2014-11-041-0/+2
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #486 from chriseth/sol_optimizerGav Wood2014-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix and activate optimizer for Solidity, add some new rules.
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-108-139/+207
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevmcore/Instruction.cpp
| * | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-075-72/+201
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_optimizerChristian2014-11-061-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge pull request #482 from ethereum/jsonrpc_interfaceGav Wood2014-11-112-189/+190
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | renaming calls to include a subprotocol prefix
| * | | | | | | | | | | Merge branch 'develop' into jsonrpc_interfaceMarek Kotewicz2014-11-096-105/+41
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into jsonrpc_interfaceMarek Kotewicz2014-11-087-71/+249
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | added eth_lllMarek Kotewicz2014-11-061-0/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | renaming calls to include a subprotocol prefixMarek Kotewicz2014-11-062-195/+183
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #494 from chriseth/sol_stateVariablesGav Wood2014-11-101-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | State variables for Solidity
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_stateVariablesChristian2014-11-106-105/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/ExpressionCompiler.cpp
| * | | | | | | | | | | | State variables.Christian2014-11-081-0/+25
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #488 from LefterisJP/developGav Wood2014-11-101-33/+140
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | solidity endToEnd testing gets equivalent CPP contracts
| * | | | | | | | | | | style fixesLefteris Karapetsas2014-11-091-10/+20
| | | | | | | | | | | |
| * | | | | | | | | | | solidity endToEnd testing gets equivalent CPP contractsLefteris Karapetsas2014-11-091-33/+130
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Just testing the waters of our codebase by introducing C++ version of the contract functions in the end to end solidity tests - This way there is no need to check for some specific output but instead strive for consistency between the C++ and solidity code.
* | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-11-096-105/+41
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #490 from CJentzsch/StateBugGav Wood2014-11-095-66/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Quick fix for OOG in deep calls
| | * | | | | | | | | | | styleChristoph Jentzsch2014-11-072-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Clean up state testsChristoph Jentzsch2014-11-073-59/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-0719-1326/+2263
| | |\| | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-051-51/+45
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into StateBugChristoph Jentzsch2014-11-041-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix ABAcalls OOG bugChristoph Jentzsch2014-11-043-10/+8
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrderGav Wood2014-11-091-39/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | Evaluate expressions in convenient order.
| | * | | | | | | | | | Evaluate expressions in convenient order.Christian2014-11-071-39/+34
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * / | | | | | | | | small fix in solidityCompilerMarek Kotewicz2014-11-071-1/+1
| |/ / / / / / / / /
* / / / / / / / / / Fixes for warnings. Take note.Gav Wood2014-11-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #478 from chriseth/sol_typePromotionGav Wood2014-11-075-72/+201
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Type promotion
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ethereum/develop' into sol_typePromotionChristian2014-11-071-0/+49
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Support for negative literals.Christian2014-11-062-5/+62
| | | | | | | | | |
| * | | | | | | | | Fixes for test framework (sign the transaction).Christian2014-11-061-62/+49
| | | | | | | | | |
| * | | | | | | | | Type promotion fixes and tests.Christian2014-11-063-20/+63
| | | | | | | | | |
| * | | | | | | | | Proper type promotion and conversion.Christian2014-11-061-1/+27
| | | | | | | | | |
| * | | | | | | | | Tests for type conversion at comparison.Christian2014-11-061-0/+16
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #483 from chriseth/libevmcoreGav Wood2014-11-072-2/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | Moved instructions and assembly to new libevmcore.
| * | | | | | | Moved instructions and assembly to new libevmcore.Christian2014-11-062-2/+2
| |/ / / / / /
* | | | | | | Ignore break and continue outside of loops.Christian2014-11-061-0/+13
| | | | | | |
* | | | | | | Tests for break and continue in nested loops.Christian2014-11-061-0/+36
|/ / / / / /
* | | | | | Compile warnings fixed.Gav Wood2014-11-061-12/+12
| | | | | |
* | | | | | Merge pull request #460 from CJentzsch/stateTestsGav Wood2014-11-0614-482/+674
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean up and organize tests + state class tests
| * | | | | | styleChristoph Jentzsch2014-11-062-4/+4
| | | | | | |
| * | | | | | undefine FILL_TESTSChristoph Jentzsch2014-11-062-3/+1
| | | | | | |
| * | | | | | Added dynamic jump out of code testChristoph Jentzsch2014-11-062-1/+29
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-066-1042/+1233
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/vm.cpp test/vmArithmeticTestFiller.json test/vmSha3TestFiller.json
| * | | | | | | Moved code export to export function in ImportHelperChristoph Jentzsch2014-11-061-2/+24
| | | | | | | |
| * | | | | | | Update transactions, style fixChristoph Jentzsch2014-11-065-85/+35
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-053-36/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/state.cpp test/vm.cpp
| * | | | | | | | uncomment vmIOandFlowOPerations testChristoph Jentzsch2014-11-051-4/+4
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-052-51/+47
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | styleChristoph Jentzsch2014-11-043-25/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-11-036-4/+1072
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/vmBitwiseLogicOperationTestFiller.json
| * | | | | | | | Clean up and organize tests + state class testsChristoph Jentzsch2014-11-0312-501/+326
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-311-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libethereum/AddressState.h test/vm.cpp
| * | | | | | | | | Clean up FakeExtVM - move to state testsChristoph Jentzsch2014-10-316-284/+197
| | | | | | | | | |
| * | | | | | | | | New BNOT and SIGNEXTEND tetsChristoph Jentzsch2014-10-303-39/+375
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-301-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into stateTestsChristoph Jentzsch2014-10-301-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Restructure state tests. Remove FakeStateClassChristoph Jentzsch2014-10-307-255/+780
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #461 from chriseth/sol_contractCompilerGav Wood2014-11-063-152/+736
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Solidity contract compiler
| * | | | | | | | | | | Further framework fix.Christian2014-11-061-10/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Fix test framework after change to Transaction.Christian2014-11-061-15/+32
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into HEADChristian2014-11-065-95/+70
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/Compiler.cpp test/solidityCompiler.cpp
| * | | | | | | | | | | Test adjustments.Christian2014-11-032-7/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-11-033-2/+841
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: alethzero/CMakeLists.txt
| * | | | | | | | | | | Some tests and bugfixes for the compiler.Christian2014-11-032-1/+212
| | | | | | | | | | | |
| * | | | | | | | | | | Bugfix: Swap before mod and div.Christian2014-11-031-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-11-017-17/+353
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/AST.cpp libsolidity/AST.h libsolidity/Compiler.cpp libsolidity/Compiler.h libsolidity/NameAndTypeResolver.h libsolidity/Types.cpp solc/main.cpp test/solidityCompiler.cpp
| * | | | | | | | | | | | Actual contract creator and add solidity to AlethZero interface.Christian2014-10-311-16/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Function selector and variable (un)packing.Christian2014-10-311-21/+37
| | | | | | | | | | | | |
| * | | | | | | | | | | | Renamed file.Christian2014-10-311-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-10-302-31/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Contract compiler and also add ExpressionStatement to AST.Christian2014-10-303-194/+479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExpressionStatement functions as glue between Statements and Expressions. This way it is possible to detect when the border between statements and expressions is crossed while walking the AST. Note that ExpressionStatement is not the only border, almost every statement can contains expressions.
| * | | | | | | | | | | | Compiler for assignments.Christian2014-10-291-5/+57
| | | | | | | | | | | | |
| * | | | | | | | | | | | NEG->BNOT changeChristian2014-10-291-3/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_contractCompilerChristian2014-10-2911-31/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/Types.cpp
* | | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-067-955/+1083
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/crypto.cpp
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #473 from CJentzsch/newTestsGav Wood2014-11-066-943/+1071
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new tests + reorganization
| | * | | | | | | | | | | | | remove vmSystemOperationsTest completelyChristoph Jentzsch2014-11-051-5/+0
| | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into newTestsChristoph Jentzsch2014-11-051-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Update tests to latest protocol changes (PoC7)Christoph Jentzsch2014-11-046-942/+1075
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Transaction documentation and build fixes.Gav Wood2014-11-051-8/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Documentation for Transaction.Gav Wood2014-11-052-3/+3
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-053-43/+16
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/cpp-ethereum into developGav Wood2014-11-052-52/+54
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Classify Transaction.Gav Wood2014-11-053-43/+16
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-051-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Bugfix: Special case of statements starting with type conversion.Christian2014-11-051-1/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | coding standards, documentation, new exception syntaxsubtly2014-11-051-1/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-052-51/+47
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #465 from ethereum/bugfixGav Wood2014-11-051-51/+45
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | jsonrpc to run once, and only when jsonrpc test suite is invoked
| | * | | | | | | | | coding standards. suite setup struct.subtly2014-11-041-46/+45
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'develop' into bugfixsubtly2014-11-041-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | json rpc only runs once, and only when json rpc test suite is invokedsubtly2014-11-041-6/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #468 from CJentzsch/bugfixGav Wood2014-11-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | bugfix jumps after push
| | * | | | | | | | Merge pull request #454 from jorisbontje/423-dockerfileChristoph Jentzsch2014-11-041-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423 Cleaned up jsonrpc test Forgot the #if Undo jsonrpc test changes
| | * | | | | | | | # This is a combination of 2 commits.Christoph Jentzsch2014-11-041-30/+24
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # The first commit's message is: Merge pull request #454 from jorisbontje/423-dockerfile update Dockerfile with cryptopp and jsonrpc dependencies, fixes #423 Cleaned up jsonrpc test # This is the 2nd commit message: Forgot the #if
| * / / / / / / / Bugfix: Swap before mod and div.Christian2014-11-031-0/+2
| |/ / / / / / /
* | | | | | | | codereview fixessubtly2014-11-041-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'crypto' into cryptablesubtly2014-11-040-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'develop' into cryptosubtly2014-11-039-11/+1415
| |\| | | | | | |
* | | | | | | | | Merge branch 'develop' into cryptablesubtly2014-11-049-11/+1415
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | boost_auto_test_suite for jsonrpc && @brief description for WebThreeStubServerMarek Kotewicz2014-11-011-1/+5
| | | | | | | |
| * | | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-11-015-8/+573
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Big fixes.Gav Wood2014-10-311-2/+2
| | | | | | | |
| | * | | | | | Merge pull request #415 from chriseth/sol_expressionCompilerchriseth2014-10-313-2/+231
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Solidity expression compiler
| | | * | | | | | Further const placement changes.Christian2014-10-303-3/+3
| | | | | | | | |
| | | * | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompilerChristian2014-10-303-34/+38
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | * | | | | | Adjustments for the NEG->BNOT change.Christian2014-10-291-3/+1
| | | | | | | | |
| | | * | | | | | Merge remote-tracking branch 'ethereum/develop' into sol_expressionCompilerChristian2014-10-2911-29/+142
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libsolidity/Types.cpp
| | | * | | | | | | Forgot some asterisks.Christian2014-10-281-1/+3
| | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Expression compiler.Christian2014-10-251-0/+229
| | | | | | | | |
| | * | | | | | | Merge pull request #432 from CJentzsch/newTestsGav Wood2014-10-312-6/+342
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | Added tests for SIGNEXTEND and BNOT
| | | * | | | | | Clean upChristoph Jentzsch2014-10-302-31/+35
| | | | | | | | |
| | | * | | | | | Update tests to new definitionChristoph Jentzsch2014-10-301-6/+6
| | | | | | | | |
| | | * | | | | | clean up PRChristoph Jentzsch2014-10-302-35/+31
| | | | | | | | |
| | | * | | | | | Update SIGNEXTEND definition and testsChristoph Jentzsch2014-10-301-0/+336
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h test/vmBitwiseLogicOperationTestFiller.json
| * | | | | | | fixed style issueMarek Kotewicz2014-11-011-1/+2
| | | | | | | |
| * | | | | | | applied changes from ethereum.js 5538ff725235f30a9afbbedc098fd18dfd9f1293Marek Kotewicz2014-10-311-0/+12
| | | | | | | |
| * | | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-311-1/+1
| |\| | | | | |
| | * | | | | | Fix for Trie roots.Gav Wood2014-10-301-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | AddressState -> Account.
| * | | | | | common changesMarek Kotewicz2014-10-301-0/+1
| | | | | | |
| * | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-303-32/+36
| |\| | | | |
| * | | | | | whisper polling, not finishedMarek Kotewicz2014-10-291-0/+39
| | | | | | |
| * | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-291-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-287-21/+129
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libevm/VM.h libqethereum/QEthereum.h
| * | | | | | whisper in web3jsonrpcMarek Kotewicz2014-10-281-0/+66
| | | | | | |
| * | | | | | ldb access from apiMarek Kotewicz2014-10-281-0/+58
| | | | | | |
| * | | | | | missing setDefaultBlock methodMarek Kotewicz2014-10-281-0/+13
| | | | | | |
| * | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-285-8/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: alethzero/MainWin.cpp alethzero/MainWin.h libqethereum/QEthereum.cpp libqethereum/QEthereum.h third/MainWin.cpp third/MainWin.h
| * | | | | | | common changes in testsMarek Kotewicz2014-10-272-47/+37
| | | | | | | |
| * | | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-245-114/+449
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | checked headless builds with and without jsonrpcMarek Kotewicz2014-10-242-3/+1
| | | | | | | |
| * | | | | | | ethrpc -> web3jsonrpc, other issues fixedMarek Kotewicz2014-10-242-3/+5
| | | | | | | |
| * | | | | | | Merge branch 'develop' into mk_jsonrpcMarek Kotewicz2014-10-241-2/+1
| |\ \ \ \ \ \ \