Commit Graph

17048 Commits

Author SHA1 Message Date
chriseth
820239a73c Line break. 2015-04-15 18:06:41 +02:00
chriseth
5216a9bc67 Some cleanup concerning byte arrays. 2015-04-15 18:06:41 +02:00
chriseth
6753e0a8e6 Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
	libsolidity/Types.cpp
2015-04-15 17:43:23 +02:00
chriseth
c7b428fdb1 Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
	libsolidity/Types.cpp
2015-04-15 17:43:23 +02:00
chriseth
c19d10321a Fixed function overloads.
Added tests, disallowed non-calling usage of non-unique function
references.
2015-04-15 17:40:50 +02:00
chriseth
0c69d5fdcd Fixed function overloads.
Added tests, disallowed non-calling usage of non-unique function
references.
2015-04-15 17:40:50 +02:00
Lefteris Karapetsas
5469743891 Attempt a fix of dagger tests to fix the build 2015-04-15 17:24:57 +02:00
Marek Kotewicz
6c146899e0 Merge branch 'develop' into cmake3.2.1 2015-04-15 12:57:48 +02:00
Gav Wood
c5f08fe6df Merge pull request #1575 from debris/web3js
web3.js v0.2.6
2015-04-15 10:27:34 +02:00
subtly
45019f74db Merge branch 'develop' into netFix 2015-04-14 16:49:03 -04:00
Gav Wood
2d1a50ce28 Merge branch 'minerefactor' of github.com:ethereum/cpp-ethereum into minerefactor
Conflicts:
	libethereum/Client.cpp
2015-04-14 13:08:55 +02:00
Gav Wood
efdd3790a0 Various fixes for mining. 2015-04-14 12:56:58 +02:00
Gav Wood
d0efe9333f Some early refactoring to support async miners better. 2015-04-14 12:55:16 +02:00
subtly
4f68bb8d45 Merge branch 'p2p' into discoveryEndpoints 2015-04-14 03:24:56 -04:00
subtly
c4eea88b3f Merge branch 'p2p' into netFix 2015-04-14 03:23:12 -04:00
Gav Wood
4615f8cd1a Merge pull request #1587 from subtly/neighbours
Drop unsolicited neighbours packets.
2015-04-14 09:17:06 +02:00
subtly
b6ee801879 proper neighbours packet size w/test 2015-04-14 02:44:01 -04:00
subtly
2560af3a1d cleanup/prep endpoint semantics for #1558 and #1557 2015-04-14 02:22:39 -04:00
subtly
0a4e2329f0 Merge branch 'develop' into neighbours 2015-04-13 15:24:01 -04:00
Gav Wood
8f659f3981 Various fixes for mining. 2015-04-13 18:12:05 +02:00
winsvega
675975fad2 Check State: Style 2015-04-13 13:02:51 +03:00
winsvega
deff3f2b50 Check State: Block Tests 2015-04-13 12:20:12 +03:00
winsvega
4ba8687562 Check State: expect in blocks
transactions test fetched to POC changes
2015-04-13 12:20:12 +03:00
winsvega
47849db473 Check State: Block Test + Transaction 2015-04-13 12:20:12 +03:00
winsvega
e54952c8cf BlockTests: add expect section 2015-04-13 12:20:12 +03:00
subtly
e51bdd0122 test use of steady_clock for timeout 2015-04-11 16:03:56 -04:00
debris
c4b4d7cdc1 fixed #1590, msvc build with cmake 3.2.1 2015-04-11 19:53:45 +02:00
Gav Wood
fbb5adc9f9 Some early refactoring to support async miners better. 2015-04-11 15:52:36 +02:00
Gav Wood
b848fa9af1 Ability to switch GPU/CPU mining on the fly. 2015-04-11 00:45:21 +02:00
subtly
9965121d63 Merge branch 'p2p' into whisper 2015-04-10 12:14:57 -04:00
Gav Wood
c111dbff3f Merge pull request #1577 from imapp-pl/pr/scheduler_change
EVMJIT: Change instruction scheduler
2015-04-10 17:17:19 +02:00
Gav Wood
35affd39f1 OpenCL stuff, Fix for eth_call. 2015-04-10 16:41:58 +02:00
Paweł Bylica
530b19f6c6 Change instruction scheduler
Try different instruction scheduler in LLVM, other crashes sometimes.
Also parse command line options properly for random tests.
2015-04-10 14:47:43 +02:00
Marek Kotewicz
1e40ca7981 Merge commit '60313959de74d8f4786858ee6e5425b7964478e9' into develop
Conflicts:
	libjsqrc/ethereumjs/dist/web3-light.js
	libjsqrc/ethereumjs/dist/web3-light.js.map
	libjsqrc/ethereumjs/dist/web3-light.min.js
	libjsqrc/ethereumjs/dist/web3.js
	libjsqrc/ethereumjs/dist/web3.js.map
	libjsqrc/ethereumjs/dist/web3.min.js
	libjsqrc/ethereumjs/lib/web3/eth.js
2015-04-10 08:52:51 +02:00
Marek Kotewicz
1efd3c2687 Squashed 'libjsqrc/ethereumjs/' changes from 73b9ed2..4def095
4def095 updated README.md
15b4dbd updated bower && package.json files
0ccc05a web3 in global namespace
ccc59d1 version 0.2.6
9c2c946 Merge branch 'web3' into develop
6763f34 tests for creating new contract with nondefault constructor, added missing files
2ef5efc fixed #70, creating contract with nondefault constructor
dbe4015 Merge branch 'master' into develop
48b351a add gasPrice test and fixed failing uncle tests
7f75f3e fixed gasPrice output
ddec629 fixed getUncle parameter count
1e89ef0 changed to eth_protocolVersion
6add9bd Merge pull request #151 from ethereum/develop

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 4def0958d35cb5b8d92d277423af4d435dd89f16
2015-04-10 08:50:24 +02:00
Gav Wood
ec8d4cd081 Fix solidity tests. 2015-04-08 23:09:06 +02:00
Gav Wood
84ff8c8ac1 Merge pull request #1538 from debris/js
web3 0.2.5
2015-04-08 22:49:22 +02:00
Gav Wood
e1b20fb3a1 Merge pull request #1546 from chriseth/sol_assumeContractNotCreated
Retain more gas for the case that the called contract is not yet created
2015-04-08 22:45:13 +02:00
Gav Wood
8665d76f52 Merge pull request #1546 from chriseth/sol_assumeContractNotCreated
Retain more gas for the case that the called contract is not yet created
2015-04-08 22:45:13 +02:00
Gav Wood
07940a644d Merge pull request #1401 from winsvega/expectedState
Expected state
2015-04-08 22:42:36 +02:00
Liana Husikyan
6f38bfeb6c fixes
added more tests
2015-04-08 15:56:36 +02:00
Liana Husikyan
377e543558 fixes
added more tests
2015-04-08 15:56:36 +02:00
Liana Husikyan
5c0fe54f3f added < uint256 uinttype to test 2015-04-08 15:56:36 +02:00
Liana Husikyan
fb1cf35f3b added implementation to append code for State variable accessor
fixed tests
2015-04-08 15:56:35 +02:00
Liana Husikyan
4d4a999db2 added implementation to append code for State variable accessor
fixed tests
2015-04-08 15:56:35 +02:00
Liana Husikyan
df3ce3ad8f some more tests 2015-04-08 15:56:35 +02:00
Liana Husikyan
a33564fbcc some more tests 2015-04-08 15:56:35 +02:00
Liana Husikyan
7eec25b6eb added createing FunctionType from ArrayType VariableDeclaration
added test
2015-04-08 15:56:35 +02:00
Liana Husikyan
32ae2ea75c added createing FunctionType from ArrayType VariableDeclaration
added test
2015-04-08 15:56:35 +02:00
Gav Wood
fff3784c01 Remove VMTRACE.
Better transaction logging.
Avoid bothering with obviously invalid transactions.
2015-04-08 02:42:51 +02:00