Commit Graph

16252 Commits

Author SHA1 Message Date
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
CJentzsch
35dafa7479 add sleep 1 second to avoid invalid blocks due to same timestamp during creation
Conflicts:
	test/blockchain.cpp
2015-04-17 12:19:12 +02:00
CJentzsch
f6cfe40010 update JSON_test.sol 2015-04-17 12:18:00 +02:00
CJentzsch
b18a4b5eae remove old contract 2015-04-17 12:18:00 +02:00
CJentzsch
2f2800d743 add JSON test
Conflicts:
	test/bcJS_API_TestFiller.json
2015-04-17 12:17:51 +02:00
Gav Wood
3c353e2d0e Merge pull request #1569 from winsvega/allfieldshex
All Test Fields As Hex
2015-04-17 11:45:26 +02:00
CJentzsch
aadffe3554 Merge remote-tracking branch 'upstream/develop' into addTests
Conflicts:
	test/bcUncleHeaderValiditiyFiller.json
2015-04-17 09:03:10 +02:00
subtly
c38641374a Fix for fix #1475, #1476. 2015-04-16 22:55:12 -04:00
subtly
106a7d10cc Merge branch 'develop' into discoveryEndpoints 2015-04-16 20:54:28 -04:00
subtly
14adc795ac test constants 2015-04-16 20:53:12 -04:00
chriseth
0f9b0f3bc4 Merge pull request #1503 from chriseth/sol_mergeBasicBlocks
Control flow analysis.
2015-04-16 17:26:35 +02:00
winsvega
e1e5f2f048 All Fields Hex: remove line 2015-04-16 16:46:41 +03:00
winsvega
3e68bc8900 All Fields Hex: ttTransaction Filler 2015-04-16 16:46:41 +03:00
winsvega
6e97308f27 All fields Hex: style 2015-04-16 16:46:40 +03:00
winsvega
7d44af8b88 AllFieldsHex: transaction test fix 2015-04-16 16:46:40 +03:00
winsvega
d175996b3a All Fields Hex
rebase + merge error fix
2015-04-16 16:46:40 +03:00
winsvega
721ee65195 All Fields As Hex: Secret Key 2015-04-16 16:46:40 +03:00
winsvega
b040e23463 All Fields Hex: block tests 2015-04-16 16:46:40 +03:00
winsvega
c867e185bf All Fields Hex: VMTests 2015-04-16 16:46:40 +03:00
winsvega
3e605abea4 AllFieldsHex: State Tests 2015-04-16 16:46:40 +03:00
winsvega
92269d4df7 All Fields Hex: block tests 2015-04-16 16:46:40 +03:00
winsvega
10245ce4b3 All Fields Hex: VMTests 2015-04-16 16:46:40 +03:00
winsvega
bfa1e9b7b9 AllFieldsHex: State Tests 2015-04-16 16:46:40 +03:00
subtly
5999c04eb5 Merge branch 'develop' into discoveryEndpoints 2015-04-15 22:51:43 -04:00
subtly
94aa125268 update test 2015-04-15 21:23:49 -04:00
subtly
339836d3fb Merge branch 'develop' into discoveryEndpoints 2015-04-15 18:38:17 -04:00