cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,160 Commits 348 Branches 121 Tags 100 MiB
fba1cc6e98
Commit Graph

2160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gav Wood
fba1cc6e98 Merge pull request #1816 from LefterisJP/ethash_reloaded 
Ethash reloaded
 2015-05-12 12:20:49 +03:00
Gav Wood
ae14cb9647 Merge pull request #1808 from imapp-pl/pr/evmjit 
Smart VM
 2015-05-12 12:10:39 +03:00
Lefteris Karapetsas
617dbcb9dd Merge branch 'develop' into ethash_reloaded 2015-05-12 10:58:19 +02:00
Gav Wood
cf23eea716 Integrate KeyManager. 2015-05-11 21:21:00 +03:00
Gav Wood
df32882669 Merge pull request #1848 from debris/web3js 
web3.js 0.3.6 - new ABI encoding implementation
 2015-05-11 19:58:46 +03:00
Gav Wood
ce8a0d7c87 Merge pull request #1858 from CJentzsch/adjustInputLimitsTests 
reorganize input Limittests
 2015-05-11 19:57:31 +03:00
Liana Husikyan
14b30c87ab Update SolidityABIJSON.cpp 2015-05-11 17:17:50 +02:00
Liana Husikyan
23925040a1 updated unit test 2015-05-11 17:16:52 +02:00
Liana Husikyan
ccc3d56542 bug in abi. fixed external type for return parameters 2015-05-11 16:46:17 +02:00
CJentzsch
af9dbf9520 reorganize inout Limits tests 2015-05-11 14:26:27 +02:00
chriseth
2cc62fbbfb Merge pull request #1831 from chriseth/sol_newABIEncoding 
New ABI encoding for dynamic types.
 2015-05-11 12:27:24 +02:00
Lefteris Karapetsas
b3a3b2f260 Merge branch 'develop' into ethash_reloaded 2015-05-11 11:06:00 +02:00
Marek Kotewicz
5a516b27ed Merge commit '13a744559744831e4cb0c13592df070148077359' into web3js 2015-05-10 15:52:26 +02:00
Marek Kotewicz
2958ad88f3 Squashed 'libjsqrc/ethereumjs/' changes from 3b799d1..e908439 
e908439 version 0.3.6
091c8e5 Merge branch 'develop' into tcoulter
272837e cleaned up param.js
38a13bc removed unused functions from coder.js
8e3158f Merge pull request #196 from debris/new_abi
c6a57b3 cleanup and documentation
6e60e1f new solidity abi decoding
3f0d1c8 new abi proposal implementation of encoding
39d70e8 Merge pull request #195 from debris/fixed_abi
f963855 removed unused functions from abi.js
c59419e added new "dave" example
860ad2c fixed #194
22ca9b0 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
6739a1b "dave" example
08f3aae add optional nonce property to sendTransaction
2ca4240 Add error handling to synchronous methods (obligatory warning against using synchronous calls at all).
4690130 version 0.3.5
7949f6a Merge pull request #187 from debris/encoding
944c5cc removed unused test files
8a9c9c5 Merge branch 'develop' into encoding
330b0da more tests for encoding and decoding solidity params
b064eab Handle this error properly. For instance, without this, if we cannot connect to the RPC client, JSON won't be able to parse the result (there is none), in which case would cause a RuntimeException.
7989607 version 0.3.4
afb61d5 Merge branch 'master' into develop
97f6e7d build files again
539ef7b Merge pull request #186 from ethereum/eventFilterFix
ec0dc44 Merge pull request #188 from ethereum/develop
bd73ccc added eth_hashrate
baed4c8 fixed old encoding
e9ec708 fixed event from and toBlock

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: e90843973f3ae554069347b61cb5b393091c34d1
 2015-05-10 15:52:25 +02:00
Gav Wood
c07ab5aa36 Merge pull request #1771 from debris/v8console 
v8 javascript console
 2015-05-10 13:21:44 +03:00
Gav Wood
497392c64c Merge pull request #1753 from winsvega/blockweight2 
Total Difficulty
 2015-05-09 18:42:14 +03:00
arkpar
1a673bfb6d Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into core_perf 2015-05-08 23:05:31 +02:00
chriseth
202ea5c3a1 Merge pull request #1813 from chriseth/sol_knowledgeEngine 
Static Analysis Engine.
 2015-05-08 18:58:42 +02:00
chriseth
2f85a0aeb2 Merge pull request #1802 from LianaHus/sol_Deny_overwriting_attribute_by_function_via_inheritance 
Proper overwriting of attribute and functions.
 2015-05-08 18:29:26 +02:00
Liana Husikyan
37fbf06c98 added one more test 2015-05-08 17:52:09 +02:00
Liana Husikyan
960033de6b fixed the test 2015-05-08 17:51:53 +02:00
Liana Husikyan
757972b4e3 added test 2015-05-08 17:51:52 +02:00
Lefteris Karapetsas
34dde6118c Merge branch 'develop' into ethash_reloaded 2015-05-08 17:34:55 +02:00
chriseth
135a67ad52 New ABI encoding for dynamic types. 2015-05-08 16:54:39 +02:00
Lefteris Karapetsas
b11fa5996a Further fixes in Ethash integration and testing 2015-05-08 15:55:27 +02:00
arkpar
c35bc33cc4 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into 
core_perf

Conflicts:
	libp2p/NodeTable.cpp
	libp2p/NodeTable.h
 2015-05-08 15:13:16 +02:00
Gav Wood
ccf48882c9 Basic key manager. 2015-05-08 11:13:36 +02:00
winsvega
917ce1ad55 Total Difficulty: last block hash fix 2015-05-07 20:00:07 +03:00
winsvega
81c1e3b4fe Total Difficulty: bug fix 2015-05-07 20:00:07 +03:00
winsvega
eaf95687fe Total Difficulty: lastblockhash check 2015-05-07 20:00:07 +03:00
winsvega
c8092b4da3 Total Difficulty: style + rebase 2015-05-07 20:00:07 +03:00
winsvega
cd3a388f13 Total Difficulty: new tests 2015-05-07 20:00:07 +03:00
winsvega
2233d4e315 Total Difficulty: test filler 2015-05-07 20:00:07 +03:00
winsvega
715643c3f2 Total Difficulty: blockweight test filler 2015-05-07 20:00:07 +03:00
winsvega
cfff783c28 Total Difficulty: merge revert 2015-05-07 20:00:07 +03:00
winsvega
21f2af4793 Total Difficulty 
test
 2015-05-07 20:00:06 +03:00
Lefteris Karapetsas
1e2bd8afe4 New ethash API integration part 1 
- cpp-ethereum now compiles with the new API

- Proper integration with testing will come with the next commits
 2015-05-07 17:10:44 +02:00
Gav Wood
6cce9710e5 Merge pull request #1706 from subtly/discovery 
Discovery protocol updates
 2015-05-07 16:43:45 +02:00
arkpar
de01400fb4 set and map to hash tables 2015-05-07 16:22:47 +02:00
Gav Wood
f81b304555 Merge pull request #1822 from CJentzsch/addTests 
Add tests
 2015-05-07 13:11:32 +02:00
Gav Wood
09bf843fd1 Merge pull request #1805 from CJentzsch/walletTests 
Wallet tests
 2015-05-07 13:11:20 +02:00
chriseth
b12bba7be2 Merge pull request #1810 from chriseth/sol_gasEstimator 
Structural gas estimator.
 2015-05-07 12:39:35 +02:00
CJentzsch
612ee398b7 Merge remote-tracking branch 'upstream/develop' into walletTests 2015-05-07 11:44:23 +02:00
CJentzsch
d4cf0a5438 gasPrice 0 test 2015-05-07 11:01:56 +02:00
CJentzsch
6c75c0bee0 xMerge remote-tracking branch 'upstream/develop' into addTests 2015-05-07 10:45:18 +02:00
subtly
bded6fa26d Merge branch 'develop' into discovery 
Conflicts:
	libp2p/Host.cpp
	libp2p/NodeTable.cpp
	libp2p/NodeTable.h
 2015-05-06 23:33:44 +02:00
subtly
242547d2e9 Merge branch 'develop' into discovery 2015-05-06 22:42:25 +02:00
Marek Kotewicz
f6d58a2d25 Merge branch 'develop' into v8console 2015-05-06 22:27:24 +02:00
Gav Wood
e66e225827 Merge pull request #1806 from winsvega/newtests 
Specifing concrete test when filling testsuite
 2015-05-06 18:25:08 +02:00
Gav Wood
ef50b08910 Initial stab at KeyManager. 2015-05-06 15:54:47 +02:00