Gav Wood
|
9067e14819
|
Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into develop
Conflicts:
libjsqrc/ethereumjs/.travis.yml
libjsqrc/ethereumjs/README.md
libjsqrc/ethereumjs/dist/ethereum.js
libjsqrc/ethereumjs/dist/ethereum.js.map
libjsqrc/ethereumjs/lib/abi.js
libjsqrc/ethereumjs/package.json
|
2015-01-11 17:54:36 +01:00 |
|
Marek Kotewicz
|
b83542c7ee
|
spec reporter instead of nyan
|
2015-01-11 17:04:30 +01:00 |
|
Gav Wood
|
94cff9684f
|
Merge pull request #768 from chriseth/sol_contractsAreAddresses
Contracts inherit all address members
|
2015-01-11 11:07:36 +01:00 |
|
Gav Wood
|
04a57f8c53
|
Merge pull request #768 from chriseth/sol_contractsAreAddresses
Contracts inherit all address members
|
2015-01-11 11:07:36 +01:00 |
|
Gav Wood
|
3302425aa9
|
Merge pull request #767 from chriseth/sol_abi_padding
Padding for ABI types.
|
2015-01-11 11:04:54 +01:00 |
|
subtly
|
feb4288b27
|
Merge branch 'develop' into p2p
|
2015-01-10 19:46:05 +01:00 |
|
subtly
|
a1c972075e
|
Merging in new data structure for nodes from node-table. End result will be consolidation into NodeId, Node (id and endpoints), NodeEntry (as in table), and Peer (connected node as in host). Rename PeerInfo to PeerSessionInfo. Rename NodeInfo to PeerInfo. PeerSessionInfo which is information about the Peer connection and will be split/merged into Node and PeerInfo. Add node-table callbacks for Host to perform connect node if there are not enough nodes.
|
2015-01-10 19:45:20 +01:00 |
|
Christian
|
26f9cd7f68
|
Coding style: Prefix for const variables.
|
2015-01-09 21:36:25 +01:00 |
|
Christian
|
5489ad8214
|
Coding style: Prefix for const variables.
|
2015-01-09 21:36:25 +01:00 |
|
Christian
|
c5c8933192
|
Contracts are Addresses.
|
2015-01-09 18:31:36 +01:00 |
|
Christian
|
4b11eea653
|
Contracts are Addresses.
|
2015-01-09 18:31:36 +01:00 |
|
Christian
|
501ad14ed1
|
Correct type conversions.
|
2015-01-09 18:23:10 +01:00 |
|
Christian
|
3d896c74e6
|
Correct type conversions.
|
2015-01-09 18:23:10 +01:00 |
|
Christian
|
fe16922087
|
Padding for ABI types.
|
2015-01-09 18:20:51 +01:00 |
|
Christian
|
22ddeea102
|
Padding for ABI types.
|
2015-01-09 18:20:51 +01:00 |
|
Gav Wood
|
8bc90cb7f8
|
Merge pull request #766 from debris/web3sha3test
web3.sha3 test
|
2015-01-09 17:45:09 +01:00 |
|
Marek Kotewicz
|
dfeef25fc2
|
disabled jsonrpc tests again
|
2015-01-09 17:33:16 +01:00 |
|
Marek Kotewicz
|
75660470d2
|
removed resize
|
2015-01-09 16:38:56 +01:00 |
|
Gav Wood
|
396f638ce1
|
Merge pull request #765 from chriseth/sol_someLogFixes
Some changes to the log functions.
|
2015-01-09 16:28:01 +01:00 |
|
Gav Wood
|
8cc70a12c6
|
Merge pull request #765 from chriseth/sol_someLogFixes
Some changes to the log functions.
|
2015-01-09 16:28:01 +01:00 |
|
Marek Kotewicz
|
2dfe5b1517
|
web3.sha3 test
|
2015-01-09 16:12:56 +01:00 |
|
Gav Wood
|
43d79cc730
|
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
test/SolidityOptimizer.cpp
|
2015-01-09 15:19:01 +01:00 |
|
Gav Wood
|
b240574cb6
|
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
test/SolidityOptimizer.cpp
|
2015-01-09 15:19:01 +01:00 |
|
Gav Wood
|
53e7bf5d1f
|
Merge pull request #745 from chriseth/sol_integerConstants
Arbitrary precision integer literals
|
2015-01-09 15:17:38 +01:00 |
|
Christian
|
a60d82d12c
|
Remove const from make_shared to allow enable_shared_from_this to work on MacOS.
|
2015-01-09 15:16:09 +01:00 |
|
Christian
|
65df7459db
|
Arbitrary precision integer constants.
|
2015-01-09 15:16:09 +01:00 |
|
Christian
|
be623273f3
|
Arbitrary precision integer constants.
|
2015-01-09 15:16:09 +01:00 |
|
Gav Wood
|
577220185f
|
Merge pull request #760 from CJentzsch/blockhash
add blockhash test as vm tests
|
2015-01-09 15:12:30 +01:00 |
|
Christian
|
be1e89da42
|
Possibility for unary operators to change type.
|
2015-01-09 15:09:10 +01:00 |
|
Christian
|
dcda38cf38
|
Use shared_from_this instead of manually supplying a shared_ptr to this.
|
2015-01-09 15:09:10 +01:00 |
|
Christian
|
c9102010bf
|
Some changes to the log functions.
|
2015-01-09 15:00:47 +01:00 |
|
Christian
|
0652c29bb6
|
Some changes to the log functions.
|
2015-01-09 15:00:47 +01:00 |
|
Gav Wood
|
875ec9d471
|
Merge branch 'sol_integerConstants' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_integerConstants
|
2015-01-09 14:57:59 +01:00 |
|
Gav Wood
|
45419cdb3c
|
Merge branch 'sol_integerConstants' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_integerConstants
|
2015-01-09 14:57:59 +01:00 |
|
Gav Wood
|
4f7bb09821
|
Merge pull request #746 from CJentzsch/jumpdest
more dynamic jump tests
|
2015-01-09 14:50:42 +01:00 |
|
Christian
|
ffeb7daf11
|
Buildfix after semantical merge conflict.
|
2015-01-09 11:51:52 +01:00 |
|
Christian
|
2e93e7e676
|
Buildfix after semantical merge conflict.
|
2015-01-09 11:51:52 +01:00 |
|
chriseth
|
42d186fdfc
|
Merge pull request #754 from LefterisJP/sol_abiFunctionHash
Calculation of ABI Function Identifier Hash
|
2015-01-09 11:22:59 +01:00 |
|
chriseth
|
0504dc21e1
|
Merge pull request #754 from LefterisJP/sol_abiFunctionHash
Calculation of ABI Function Identifier Hash
|
2015-01-09 11:22:59 +01:00 |
|
CJentzsch
|
203005e2b7
|
add blockhash test fo vm tests
|
2015-01-09 10:58:32 +01:00 |
|
Lefteris Karapetsas
|
765bd95a07
|
Fixing SolidityABIJSON test
|
2015-01-09 09:29:19 +01:00 |
|
Gav Wood
|
245fba5055
|
abi -> json-abi
|
2015-01-09 08:16:35 +01:00 |
|
Gav Wood
|
23eff4d24a
|
CLI tweaks.
|
2015-01-09 08:09:30 +01:00 |
|
Gav Wood
|
8233c071f2
|
CLI tweaks.
|
2015-01-09 08:09:30 +01:00 |
|
Gav Wood
|
90cdc52ae7
|
Rename "JSON Documentation" -> Metadata.
solc integration for Solidity-format ABI.
|
2015-01-09 08:05:52 +01:00 |
|
Gav Wood
|
6de29142ef
|
Rename "JSON Documentation" -> Metadata.
solc integration for Solidity-format ABI.
|
2015-01-09 08:05:52 +01:00 |
|
Gav Wood
|
29591d6ecf
|
Documentation update.
|
2015-01-09 07:39:30 +01:00 |
|
Gav Wood
|
9740a1b5df
|
Documentation update.
|
2015-01-09 07:39:30 +01:00 |
|
Gav Wood
|
541156241f
|
Unit testing for log in Solidity.
|
2015-01-09 07:32:28 +01:00 |
|
Lefteris Karapetsas
|
4f97c89d4f
|
Adjusting Solidity Optimizer Tests
|
2015-01-09 01:25:14 +01:00 |
|