Commit Graph

1021 Commits

Author SHA1 Message Date
subtly
e623e8b020 Merge branch 'develop' into p2p 2015-01-25 19:54:59 -08:00
subtly
57e1acfbd6 fix ping-timeouts 2015-01-25 19:54:15 -08:00
subtly
2ed2a8ec8e updates and fixes for code review 2015-01-25 14:08:34 -08:00
Gav Wood
99b31eab89 Merge pull request #839 from debris/natspec
synchronous ethereum.js && natspec
2015-01-23 17:04:57 -08: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
subtly
cc9a7cbb71 update whisper test. move ports out of private ranges and specify ip address. 2015-01-22 19:50:33 -05:00
subtly
64ea4a1959 Merge branch 'develop' into p2p 2015-01-22 18:33:21 -05: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
subtly
29f17ba636 coding standards 2015-01-17 01:30:52 -05:00
subtly
0e4c693518 cleanup 2015-01-17 00:56:36 -05:00
subtly
d910272e4a Merge branch 'develop' into p2p 2015-01-17 00:52:22 -05: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
liana
dc30fb6385 removed spaces 2015-01-16 13:07:16 +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
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
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
Gav Wood
60379cabbc Merge pull request #807 from CJentzsch/addTests
included vmInputLimitTests, updated vmSystemOperationTests
2015-01-15 10:35:38 -05: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