Commit Graph

1019 Commits

Author SHA1 Message Date
chriseth
2f0e5af012 Merge pull request #857 from LianaHus/StringToHash
conversion for string to/from hash
2015-01-27 13:53:13 +01:00
liana
b06de7e8de -added test case for hash8 to string1 conversion 2015-01-27 10:48:10 +01:00
Gav Wood
219f5d7e52 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-01-26 15:02:06 -08:00
Gav Wood
dd87fbccd5 Merge pull request #856 from chriseth/sol_modifiers
Function modifiers.
2015-01-26 15:01:25 -08:00
Gav Wood
0cdc793257 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-01-26 15:00:48 -08:00
Gav Wood
b93f8a1808 Fix jsTo... 2015-01-26 15:00:07 -08:00
Gav Wood
f4a92d4caf Merge pull request #871 from debris/commonjs_tests
new tests for libdevcore/CommonJS (failing)
2015-01-26 07:21:16 -08:00
Marek Kotewicz
e779df09d4 failing commonjs tests 2015-01-26 16:05:19 +01:00
liana
f5b739da9a - modifications according to PR review 2015-01-26 13:24:16 +01:00
Christian
2b2da431bc Call modifiers on constructor. 2015-01-26 10:23:39 +01:00
Christian
c657fe9611 Modifier overrides and callgraph analysis. 2015-01-26 10:23:39 +01:00
Christian
67073948af Compilation of function modifiers. 2015-01-26 10:23:39 +01:00
Christian
c86a46b84d Type resolution for function modifiers. 2015-01-26 10:23:39 +01:00
Christian
dabf947679 Function modifier parsing. 2015-01-26 10:23:39 +01:00
Christian
682a45290c Reverse order of inheritance in base list. 2015-01-26 10:20:46 +01:00
Gav Wood
99b31eab89 Merge pull request #839 from debris/natspec
synchronous ethereum.js && natspec
2015-01-23 17:04:57 -08:00
liana
5076f532d8 - added conversion for string/hash of equal sizes
- added tests
2015-01-23 17:45:37 +01:00
CJentzsch
42e6f9e8a8 correct test 2015-01-23 15:27:32 +01:00
CJentzsch
fe3c1ebe1f fix gasPrice*gasLimit + value overflow 2015-01-23 15:17:34 +01:00
Marek Kotewicz
a3bf025f3d Merge branch 'develop' into natspec 2015-01-22 20:14:07 +01:00
Marek Kotewicz
5239db2243 Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspec 2015-01-21 21:54:51 +01:00
Marek Kotewicz
f4bb060d50 Squashed 'libjsqrc/ethereumjs/' changes from e1fcffc..edfb874
edfb874 changes in filter.js (not yet working)
c2d9c1a toDecimal/fromDecimal is using bignumber.js now
81a5813 removed unused pieces of code
08e2696 removed send queues from providermanager
c9693b4 contract.html example is working with sync api
ceb4357 sync api tests running, removed unused pieces of code
fc986a3 removed unused providers
0d2cccc http sync api

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: edfb874527160cee14cca931377e55187b874cbe
2015-01-21 21:54:51 +01:00
Gav Wood
fd773be884 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-01-20 11:33:41 -08:00
Gav Wood
5f54782ed0 Cleanups and addition AZ info. 2015-01-20 11:33:33 -08:00
Gav Wood
d3a3885aba Merge pull request #830 from chriseth/sol_overridesInConstructorContext
Include virtual function overrides in constructor context.
2015-01-20 10:02:18 -08:00
Marek Kotewicz
d6e82477ca Merge commit '53b4fda16d0b191be8ab986379a328aa38aaf916' into natspec 2015-01-20 17:48:08 +01:00
Marek Kotewicz
ca8aa01b34 Squashed 'libjsqrc/ethereumjs/' changes from 6a58db6..848c54d
848c54d _currentAbi object
380c152 solidity methods "overloading"

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 848c54dc4713d5c29993f1c41d16cd334e18081d
2015-01-20 17:48:08 +01:00
Christian
3ff1c3ec30 Include virtual function overrides in constructor context. 2015-01-20 15:58:04 +01:00
Lefteris Karapetsas
8b29bdaf10 Absence of tag in Natspec is now considered @notice 2015-01-20 13:15:43 +01:00
Gav Wood
1fc3c7b498 Merge pull request #810 from debris/ethereumjs
Ethereumjs
2015-01-19 20:59:58 -08:00
Christian
609268ee62 Implicit conversion from derived to base. 2015-01-19 23:35:04 +01:00
Christian
961cb5b90c Call constructors of base classes. 2015-01-19 23:35:04 +01:00
Christian
fe770957c6 Constructor arguments for base classes. 2015-01-19 23:35:04 +01:00
Christian
2e846c495b Explicit calls to base class function. 2015-01-19 23:35:04 +01:00
Christian
f84d8f2b50 Inheritance in compiler. 2015-01-19 23:35:04 +01:00
Christian
70cda182f2 Magic variables are only needed durinng name and type resolution, not during compilation. 2015-01-19 23:35:04 +01:00
Christian
580d712a67 Check overrides and provide inherited public interface. 2015-01-19 23:35:04 +01:00
Christian
fb41b96bb8 Import inherited members into the contract's scope. 2015-01-19 23:35:04 +01:00
Christian
ffed2f37cb Inheritance parser. 2015-01-19 23:35:04 +01:00
Lefteris Karapetsas
02521a164c Improved handling of exceptions in some Solidity Tests 2015-01-19 20:12:48 +01:00
Lefteris Karapetsas
ab4178941b Adding blockhash test in Solidity ExpressionCompiler 2015-01-19 17:13:18 +01:00
Lefteris Karapetsas
933d65e986 Some addition to Solidity Execution Framework 2015-01-19 15:34:15 +01:00
Marek Kotewicz
21e037c74f Squashed 'libjsqrc/ethereumjs/' changes from 823fb29..6a58db6
6a58db6 parsing real, ureal values on output
af54832 encoding real on input
86b417e fixes for autoprovider

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 6a58db66f7f42a49667bcc751418256441752279
2015-01-19 13:53:44 +01:00
Marek Kotewicz
72b9632c35 Merge commit '2b4d38b9bf059014596e1ab00c99dc2ad4ab3761' into ethereumjs 2015-01-19 13:53:44 +01:00
chriseth
ae9ec885d7 Merge pull request #805 from LianaHus/deleteStruct
delete for structs

-added functionality to set values to 0 when deleting structure(not for ...
2015-01-19 11:32:11 +01:00
Marek Kotewicz
819226c503 Squashed 'libjsqrc/ethereumjs/' changes from e94da80..823fb29
823fb29 tests for parsing output array
1e2c1ae output parser string support
b457e88 support for int array types[]
2d8383d removed unused functions

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 823fb2995b0ff6ebaf257206ad1ecf827b8567b8
2015-01-17 15:45:11 +01:00
Marek Kotewicz
7d4745d246 Merge commit '6a383d6ed3fb37cf6739f6ac441652adfdb70463' into ethereumjs 2015-01-17 15:45:11 +01:00
Marek Kotewicz
adfd7d621d Squashed 'libjsqrc/ethereumjs/' changes from 2c36d5f..e94da80
e94da80 default padding set to 32, separated to one variable
a1c0bb6 fixed checking first bit for parsing int output
774e9d2 abi.js rounds down floating point input
9a264a4 updated bower.json && package.json version, added bignumber.js to bower dependencies
0172939 fixed #28 and other small node.js issues

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: e94da808cb2a9f0493b42e5e572f6aed78de5ee3
2015-01-16 16:49:50 +01:00
Marek Kotewicz
c46ceb1ad8 Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjs 2015-01-16 16:49:50 +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