Commit Graph

15140 Commits

Author SHA1 Message Date
Marek Kotewicz
c46ceb1ad8 Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjs 2015-01-16 16:49:50 +01:00
liana
c3d36d1fe1 - corrected delete in case we have more than one locals
- added a test
2015-01-16 16:26:57 +01:00
liana
037d9a7528 - corrected delete in case we have more than one locals
- added a test
2015-01-16 16:26:57 +01:00
liana
a0ec9c6680 removed spaces 2015-01-16 13:07:16 +01:00
liana
dc30fb6385 removed spaces 2015-01-16 13:07:16 +01:00
liana
1142b99a64 Corrected "delete" for local variables i.e. set them to 0
Added test case
2015-01-16 12:55:49 +01:00
liana
ac77d20ee3 Corrected "delete" for local variables i.e. set them to 0
Added test case
2015-01-16 12:55:49 +01:00
Lefteris Karapetsas
78d6e82f37 Style fixes and refactoring in ASTJsonConverter 2015-01-16 12:35:59 +01:00
Lefteris Karapetsas
839f7778b5 Style fixes and refactoring in ASTJsonConverter 2015-01-16 12:35:59 +01:00
Marek Kotewicz
46e67c9862 Squashed 'libjsqrc/ethereumjs/' changes from ec74fc0..2c36d5f
2c36d5f big integers on abi.js output, tests
f1295b5 tests for bigintegers on input
fbcc6d0 BigNumber support

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 2c36d5ff457952c557b467e580514b08126d7dd7
2015-01-16 12:07:48 +01:00
Marek Kotewicz
8ac890fc0e Merge commit 'd876522bc0614fea3180a54be57bcb61784b352e' into ethereumjs 2015-01-16 12:07:48 +01:00
Gav Wood
c77f1c4030 Missing comma. 2015-01-15 14:25:12 -05:00
Gav Wood
a9ed77c22a Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	libsolidity/Types.h
2015-01-15 14:03:35 -05:00
Gav Wood
911916beb7 Add blockhash to Solidity.
Autopadding fix.
2015-01-15 13:59:35 -05:00
Marek Kotewicz
9f3a848822 Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjs
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/dist/ethereum.min.js
	libjsqrc/ethereumjs/lib/abi.js
2015-01-15 17:27:07 +01:00
Marek Kotewicz
dda1788082 Squashed 'libjsqrc/ethereumjs/' changes from ab745d3..ec74fc0
ec74fc0 gulp
46b932c negative integers support
f85f77f fixed typos
6a4b4f3 fixed readme
d0473d6 gulp
70bf1a5 fixed typos
bacc5aa methodExists and propertyExists are now separated tests
472ad43 more comments
603c790 next part of abi.js parsers tests and fixes
b0a9bbf next part of abi.js docs
6b2ec23 formatting bool tests and fixes
ed1cb9e simplifid abi.js methods
17f2f12 gulp
12bdb5f providers documentation
8d1f96c few comments
422dc05 ProviderManager separated to providermanager.js file
9a8f45e Filter separated to filter.js file
8b7d4b0 beginning of comments in web3
ee167e5 test for parsing multiple methods description
4056c04 tests...
1428dce web3.contract -> web3.eth.contract
f3b71a7 removed unused line
380d986 tests in progress, fixed utf characters conversion in toAscii
9e0de57 mocha test reporter
f6ff1f1 mocha reporter name starts with lower case letter
7595a5d removed padding calculation from ethereum.js, padding is always 32
9a9987a Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into develop
5582901 Various fixes to ethereum.js and client web API stuff.
ded221f Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: ec74fc05d438806ece64fe34b0f28c8f45f5167e
2015-01-15 17:25:50 +01:00
Lefteris Karapetsas
d0f02c28c6 Preparing the ground for AST outputing to JSON 2015-01-15 16:56:40 +01:00
Lefteris Karapetsas
9c8ce49969 Solidity AST Json Exporter
- A first version of the exporter is ready with this commit
- Further refinement will follow once it gets used
2015-01-15 16:56:40 +01:00
Lefteris Karapetsas
2eaf9ff865 ASTJSonconverter stack takes objects and not pointers 2015-01-15 16:56:40 +01:00
Lefteris Karapetsas
bcf49095a2 More work on the AST export. Work in progress 2015-01-15 16:56:40 +01:00
Lefteris Karapetsas
d5b1b4d624 Preparing the ground for AST outputing to JSON 2015-01-15 16:56:40 +01:00
Gav Wood
c6a47a4dc2 Merge pull request #811 from LefterisJP/az_mainWinStyle
Style fixes in MainWin of AZ.
2015-01-15 10:36:40 -05:00
Gav Wood
60379cabbc Merge pull request #807 from CJentzsch/addTests
included vmInputLimitTests, updated vmSystemOperationTests
2015-01-15 10:35:38 -05:00
Lefteris Karapetsas
95fc27cba9 also add compiler error if include order could cause a problem in windows 2015-01-15 15:00:28 +01:00
Lefteris Karapetsas
93e3bca420 Update ExpressionCompiler.cpp 2015-01-15 13:33:58 +01:00
liana
00b0b0933d - added functionality to set values to 0 when deleting structure(not for mapping)
- added unit test

Made some changes after Christian`s review on pull request
- remove/edit comments
- BoolType and ContractType return VoidType after delete

- fixed constructor_arguments test

- fixed set to 0 when deleting variable from stack
- changed test case to test that
2015-01-15 11:59:58 +01:00
liana
3b7fff5389 - added functionality to set values to 0 when deleting structure(not for mapping)
- added unit test

Made some changes after Christian`s review on pull request
- remove/edit comments
- BoolType and ContractType return VoidType after delete

- fixed constructor_arguments test

- fixed set to 0 when deleting variable from stack
- changed test case to test that
2015-01-15 11:59:58 +01:00
Christian
28d103e054 Re-enable MSVC warning 4307. 2015-01-15 11:47:00 +01:00
Lefteris Karapetsas
224cd9be36 Fixing an unused parameter warning in ExpressionCompiler 2015-01-15 11:22:58 +01:00
Lefteris Karapetsas
1515f140b3 Merge pull request #798 from LefterisJP/natspec_OnContractCreation
Natspec Popup Authentication on transaction
2015-01-15 01:37:52 +01:00
Lefteris Karapetsas
dc79a79c06 Merge pull request #798 from LefterisJP/natspec_OnContractCreation
Natspec Popup Authentication on transaction
2015-01-15 01:37:52 +01:00
CJentzsch
0d46ed07ec Merge remote-tracking branch 'upstream/develop' into addTests 2015-01-14 22:35:41 +01:00
CJentzsch
4250af041d included vmInpulLimit Tests, updated vmSystemOperationTests 2015-01-14 22:35:33 +01:00
subtly
2a26852473 Merge branch 'develop' into p2p
Conflicts:
	libp2p/Host.cpp
	libwebthree/WebThree.h
2015-01-14 12:51:10 -05:00
chriseth
1a4280de35 Merge pull request #799 from chriseth/sol_gasAndValue
Specify gas and value for function calls and contract creation calls.
2015-01-14 18:22:16 +01:00
chriseth
25fc28422b Merge pull request #799 from chriseth/sol_gasAndValue
Specify gas and value for function calls and contract creation calls.
2015-01-14 18:22:16 +01:00
Lefteris Karapetsas
895a2852f4 Minor style fixes 2015-01-14 17:14:46 +01:00
Lefteris Karapetsas
a78794e872 Fixes and additional checks for Natspec Popup authentication 2015-01-14 16:49:09 +01:00
chriseth
f8f1ec30f4 Merge pull request #801 from chriseth/sol_parseErrorForHashCollision
Check for hash collisions already before compiling.
2015-01-14 12:19:39 +01:00
Christian
abe6055ab7 Style. 2015-01-14 12:00:28 +01:00
Christian
1ba38c9c02 More flexible access to stack during external function call. 2015-01-14 11:57:22 +01:00
Gav Wood
e2efcfb8a6 Merge pull request #796 from CJentzsch/randomTestEfficiency
Random test efficiency
2015-01-14 10:52:00 +00:00
Christian
d1e05ac416 Remove redundancy in FunctionType::getSizeOnStack. 2015-01-14 11:01:42 +01:00
Christian
22f0a4fde1 Use min gas for send(). 2015-01-14 10:46:44 +01:00
Christian
6e16107870 Check for hash collisions already before compiling. 2015-01-14 10:16:58 +01:00
Christian
212a0c5251 Check for hash collisions already before compiling. 2015-01-14 10:16:58 +01:00
CJentzsch
69bd72c667 less invalid opcode tests 2015-01-14 09:39:21 +01:00
Christian
e1559df82e Specify value for contract creation. 2015-01-13 18:12:30 +01:00
Christian
b440d7e321 Specify value for contract creation. 2015-01-13 18:12:30 +01:00
Christian
522a7709e8 Modify gas and value for external function call. 2015-01-13 18:12:30 +01:00