Commit Graph

2013 Commits

Author SHA1 Message Date
Marek Kotewicz
d4438b3386 Merge branch 'develop' into web3.js-v3.1 2015-04-24 11:02:09 +02:00
Gav Wood
658ee79da2 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-04-23 17:55:52 +02:00
Gav Wood
25450daf2c More logging stuff.
Fixes #1680
2015-04-23 17:55:40 +02:00
Marek Kotewicz
e10436c667 Merge commit '99f713fa869f41401e9383f2626ed46d3821cc29' into develop 2015-04-23 12:32:05 +02:00
Marek Kotewicz
7471709ee0 Squashed 'libjsqrc/ethereumjs/' changes from 4def095..f8a43ed
f8a43ed Merge pull request #180 from ethereum/develop
4dc6e23 realease version 0.3.1
ee0ec4b Merge branch 'master' of github.com:ethereum/web3.js into develop
08dc2b2 add missing inputBlockNumberFormatter
99e89a1 Merge pull request #179 from ethereum/latest_pending
dfbad66 add pending and latest to getBlockTransactionCount and getUncle
dbf3ff0 latest and pending as possible blockNumber arg everywhere
3897bc2 version 0.3.0
d2068eb improved solidity event decoding
11f23ce Merge pull request #178 from ethereum/stringTopics
50f4a2b add new test filter
40c5c9e merged develop
c9cd31b add test for the new toTopic filter
e21ee7a Merge pull request #174 from ethereum/events_refactor
960e9c9 test for explicit sendTransaction && call
a6ac6ed add new toTopic formatter in filters
3d3db61 tests for decoding event logs
7c16dbf one additional test for event encode
9f7d6a9 anonymous events implementation && tests
b5eabd8 proper formatting event options
93b323f removed unused function findIndex from utils
9158ac7 removed unused function
1ac1ef9 cleaned event.encode test
5f2eb33 fixed filters encoding null
4482d5b Merge branch 'develop' into events_refactor
76ced9a basic tests for event encoding
f767a9a removed unused formatOutputHash, renamed formatXXXString to formatXXXBytes
888a970 coder.encodeParam, coder.decodeParam tests template
983e4b1 removed signature.js
f37057e Merge branch 'develop' of github.com:ethereum/web3.js into develop
c8f4226 add possible 2d topic arrays fixes #175
e910736 eth_filter complex topics, #175
836529a Merge branch 'develop' into events_refactor
42e759e 0.10 on travis is painfully slow, lets remove it
d411492 call && sendTransaction
f84a68c changed the way functions are being called
c8e5768 fixed log fields
d38f5a2 Merge branch 'develop' into events_refactor
a5c1bcc changed default providor port to 8545 closes #160
9e8cb8d removed non existing eth.flush method
eeb0bc0 Merge branch 'develop' into events_refactor
cdf02ec Merge pull request #173 from ethereum/failing_develop
501e3bc utils cleanup
a88be00 docs
9d8a51d event.js refactored
ea6bda4 event refactor in progress
a827076 fixed tx/block return value tests
99a3696 events refactor, function.js
04cdb6c format also tx nonce to number
385cc2c removed minGasPrice from blocks
c06d75b Merge pull request #170 from ethereum/abi_refactor
e80ff10 Merge branch 'master' into abi_refactor
38641df fixed #154
1c8cd7d web3.eth.defaultAccount property, updated event_inc example, fixed #96
4aeba40 fixed event_inc example
5362e2a Merge branch 'develop' into abi_refactor
2a11852 Merge branch 'master' into develop
ea413a8 updated gitter badge
a46b9ea Merge branch 'develop' into abi_refactor
779a608 documentation
941535f SolidityParam moved to its own file && documented
18cef7c removed *collapse in contrat, gulp
677bb68 add bundle version
135b044 Merge pull request #164 from karalabe/empty-topics-fix
b326202 formatters/whisper: polish corner case handling code
0567ba1 outputParser do not require 0x prefix before hash
b5c6aa6 little cleanup && renaming
dccfca1 solidity abi refactor in progress
6a058b6 Allow unset topics in posts too.
af443f2 Fix #162: allow empty topic list in messages
d643d06 solidity abi refactor in progress
271b00f bumped version
f4cf699 rebuild
4eeaf19 rebuild
20fb2e3 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
ac69640 Merge pull request #158 from ethereum/watchImprovement2
96b4468 fixed #161, web3.ssh.post
a320ef8 fixed coverage, unified creating errors
364eab7 add callback for async error
c62f817 picked watch change3
56d13f7 picked watch change2
2215e7c picked watch change
dc0f231 merged meteor package fixes
c89ad86 renamed meteor package
a0709f3 fixed meteor package
1a8032c version 0.2.7
dfb8dea gulp
b1ada8d gulp
a25a9e1 Merge branch 'master' of https://github.com/ethereum/ethereum.js
05343ea use version of bignumber.js without lookaheads
2651fd8 Update README.md

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: f8a43eddfb450d0e0ba1669a6916babe0ea43642
2015-04-23 12:32:05 +02:00
chriseth
fcb772293b Fix regarding memory overwrite during sha3 computation. 2015-04-22 11:43:50 +02:00
chriseth
99a0cb3545 bytes parameters for events and sha3. 2015-04-22 11:43:49 +02:00
Marek Kotewicz
be689e8a08 Merge pull request #1593 from debris/cmake3.2.1
fixed #1590, msvc build with cmake 3.2.1
2015-04-22 07:59:04 +02:00
Gav Wood
817f3d53e9 Merge pull request #1685 from chriseth/sol_fix_ripemd_alignment
Fixed byte alignment for return type of ripemd160 built-in contract.
2015-04-21 17:33:02 +02:00
Gav Wood
60d364540e Merge pull request #1699 from chriseth/sol_fix_contractTypesAsArguments
Fix for Contract and Enum types as external function arguments.
2015-04-21 17:32:01 +02:00
Gav Wood
6122aedb90 Merge pull request #1695 from imapp-pl/pr/testeth
testeth: Handle command line options for user defined tests
2015-04-21 17:29:15 +02:00
chriseth
e65b9825d6 Merge pull request #1634 from chriseth/sol_overloadingFunctions
Function overloading.
2015-04-21 15:58:06 +02:00
chriseth
3190c9ec09 Fix for Contract and Enum types as external function arguments. 2015-04-21 15:50:37 +02:00
chriseth
c834ee5ce1 Fixed byte alignment for return type of ripemd160 built-in contract. 2015-04-21 13:03:26 +02:00
chriseth
ddbaa99056 Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions 2015-04-21 12:04:12 +02:00
chriseth
02121683f5 Removed (and added) some #ifs (but removed more than I added). 2015-04-21 11:46:11 +02:00
Paweł Bylica
332fcaebb9 testeth: Handle command line options for user defined tests 2015-04-21 10:37:47 +02:00
Marek Kotewicz
6bf24491b8 Merge branch 'develop' into cmake3.2.1
Conflicts:
	test/CMakeLists.txt
2015-04-21 08:16:12 +02:00
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
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
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
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
4a44493a13 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
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
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
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
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