Gav Wood
e375612a7e
Version bump and client rename.
2015-04-21 01:14:45 +02:00
Gav Wood
dc9a49cc39
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
2015-04-21 01:10:48 +02:00
Gav Wood
fdc524377f
More colourful logging.
2015-04-20 23:32:42 +02:00
CJentzsch
d3611017b8
properly mv webthreestubclient.h
2015-04-20 23:21:50 +02:00
CJentzsch
8f8eb35974
fixes
2015-04-20 23:17:19 +02:00
CJentzsch
6a3bb95473
Merge remote-tracking branch 'upstream/develop' into RestructureTestFolders
...
Conflicts:
test/libethereum/BlockTestsFiller/bcJS_API_TestFiller.json
test/libethereum/blockchain.cpp
2015-04-20 22:53:04 +02:00
CJentzsch
b2adcf3bf3
Restructure test folders
2015-04-20 22:48:53 +02:00
chriseth
8cd5eed17d
Styling.
2015-04-20 15:29:04 +02:00
chriseth
8caf1f723f
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
...
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
2015-04-20 14:55:58 +02:00
chriseth
7a467bbf07
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
...
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
2015-04-20 14:55:58 +02:00
CJentzsch
0919cacb3c
fix hex encoding blockheader and use tmp directories for stateDB
2015-04-20 11:37:21 +02:00
CJentzsch
4d103ccef1
xMerge remote-tracking branch 'upstream/develop' into JSON_testContract
2015-04-20 09:33:02 +02:00
Gav Wood
71012a83e8
Remote miner fixes.
2015-04-19 22:59:57 +02:00
Gav Wood
b6ff445114
Minor fix for integration tests.
2015-04-19 17:31:56 +02:00
Gav Wood
2eb7c95d88
Merge pull request #1665 from chriseth/sol_jsoncppDocker
...
Add jsoncpp dependency for solidity-js.
2015-04-19 15:49:22 +02:00
Gav Wood
8ef8f2e805
Merge pull request #1666 from CJentzsch/allhexfix
...
0x -> 0x0 for numbers
2015-04-19 15:48:05 +02:00
CJentzsch
d399f077ef
simplification
2015-04-17 22:44:26 +02:00
CJentzsch
22d16c048b
0x -> 0x0 for numbers
2015-04-17 18:41:27 +02:00
chriseth
41c2990ed7
Add jsoncpp dependency for solidity-js.
2015-04-17 18:33:55 +02:00
Liana Husikyan
e4808305a1
removed unused parameter from streamAsmJson
2015-04-17 17:45:25 +02:00
Liana Husikyan
d99247cb5d
reordered output
...
Conflicts:
libevmcore/Assembly.cpp
2015-04-17 17:41:50 +02:00
Liana Husikyan
8e04b27252
fixed extension of file json format
...
changed value for PUSH to hex
2015-04-17 17:41:50 +02:00
Liana Husikyan
1cfa964990
style fixes
2015-04-17 17:41:50 +02:00
Liana Husikyan
104c5bca07
initial output for asm-json flag.
...
Conflicts:
libevmcore/Assembly.cpp
2015-04-17 17:41:50 +02:00
Liana Husikyan
f829dad7e3
added asm-json flag to cl compiler
...
Conflicts:
libsolidity/CompilerStack.cpp
2015-04-17 17:41:41 +02:00
Liana Husikyan
3dcc0f0893
added asm-json flag to cl compiler
...
Conflicts:
libsolidity/CompilerStack.cpp
2015-04-17 17:41:41 +02:00
chriseth
4a44493a13
Merge pull request #1501 from LefterisJP/abstract_contract_contructors
...
Abstract contract contructors
2015-04-17 17:31:47 +02:00
chriseth
c9812f7269
Merge pull request #1501 from LefterisJP/abstract_contract_contructors
...
Abstract contract contructors
2015-04-17 17:31:47 +02:00
CJentzsch
4a6a667a58
update test after solidity fix
2015-04-17 16:39:51 +02:00
chriseth
6b08b99b5e
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
2015-04-17 16:24:23 +02:00
chriseth
2d69b269e9
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
2015-04-17 16:24:23 +02:00
Lefteris Karapetsas
c558aa0656
Fixing detection of abstract contract
2015-04-17 16:17:21 +02:00
CJentzsch
e847b4cba0
Merge remote-tracking branch 'upstream/develop' into JSON_testContract
2015-04-17 15:28:06 +02:00
Lefteris Karapetsas
a063e1c5a1
Check all constructors in inheritance chain get args
...
- Also add a missing override in a function of EnumValue
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
1a19d436db
Adding forgotten virtual specifier to EnumValue getType()
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
f2f0aec91c
Allowing abstract contracts constructor to have no args
...
- If a constructor is part of an abstract contract we can omit its
arguments
- IF a contract is abstract make sure to not create and/or request
Assembly code about it since it's not compiled
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
eb84c3171a
Add "this" contract's ctor to provided ctors set
...
- Also properly naming the 2 sets in checkAbstractConstructors() function
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
0c296cd809
Fixing new abstract contract error location reporting
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
52a442a100
size()!=0 -> !empty()
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
beba2705ba
Check all constructors in inheritance chain get args
...
- Also add a missing override in a function of EnumValue
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
d997dc55d1
Allowing abstract contracts constructor to have no args
...
- If a constructor is part of an abstract contract we can omit its
arguments
- IF a contract is abstract make sure to not create and/or request
Assembly code about it since it's not compiled
2015-04-17 15:27:31 +02:00
chriseth
7571971ca0
Merge pull request #1654 from chriseth/sol_fix_smallNegativeStorageValues
...
Fix for small negative storage values.
2015-04-17 15:26:16 +02:00
CJentzsch
6a146f727b
use this_thread::sleep_for instead of sleep
2015-04-17 15:08:42 +02:00
CJentzsch
182b2a6219
retrigger build
2015-04-17 14:51:01 +02:00
subtly
fbf48b6501
network save/restore: merge fixes, simpler code, limit parse of require flag to peers (reflecting save code).
2015-04-17 07:54:22 -04:00
chriseth
5622364a98
Fix for signed integers in storage.
2015-04-17 13:27:31 +02:00
chriseth
d0470999b2
Tests for signed integers in storage.
2015-04-17 13:25:28 +02:00
subtly
7219642569
Merge branch 'develop' into discoveryEndpoints
2015-04-17 06:50:33 -04:00
subtly
6803c4f2db
style
2015-04-17 06:41:45 -04:00
CJentzsch
66d8f1067a
style
2015-04-17 12:19:20 +02:00
