Commit Graph

1594 Commits

Author SHA1 Message Date
Marek Kotewicz
57e6fb303d Merge commit '3cf8dcb19983b41a387065746e6d3ce08ef7ef4c' into new_jsonrpc
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.js
	libjsqrc/ethereumjs/dist/ethereum.js.map
	libjsqrc/ethereumjs/dist/ethereum.min.js
2015-03-10 17:46:30 +01:00
Marek Kotewicz
792c3e7094 Squashed 'libjsqrc/ethereumjs/' changes from 7d6b35a..9926e27
9926e27 upgraded version to 0.1.0
7a44f76 add shh post formatting
27d5421 merged from ethereum again
3848d3a fixed logs
18e1367 gulp
f831dde Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul
27fca17 common fixes
1c9f50f changed topic to topics
8d7d00d fixed input parser test
1269731 Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul
2c740b0 add filter value conversion
38f6567 fixed examples
fa5d4b5 Merge branch 'apiOverhaul' of https://github.com/frozeman/ethereum.js into apiOverhaul
8a2444b add default paramter for getBlock
2850bee fixed eth_getFilterChanges
b454587 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into apiOverhaul
ede88f8 Merge pull request #105 from jorisbontje/balance-example
51a075c add in-output until eth_getBlockByHash
9c0d3e3 fixed to/fromWei
a0b5353 changed outputs up to storageAt
c2ed233 update balance example for new api
1f6c195 fixed toBigNumber
e5cc501 updated readme
4eb857e increased meteor package version
c7f8373 separated formatters files
068bdd7 changed project structure
ddb90c2 refactoring formatters
a6110a5 common changes
d3569e4 more coverage tests
e2352b4 utils.js docs
344428b tests...
9fe105e fixed from decimal;
50fc611 test for utils.toBigNumber
60ae274 code comments
b8505d1 common changes
ccb3775 new api method names
2b17ad6 refactoring
0a995e1 common changes in utils, fixing code complexity
3f63109 fix all failing karma tests
1fd1a31 Merge branch 'develop' into apiOverhaul
0b9d450 fixed karma test
75e92c8 Merge branch 'master' into develop
a869780 Merge branch 'master' into apiOverhaul
2cdf08b Merge pull request #101 from chevdor/master
437e273 Helping travis a bit... old boy!
d88effa Add node 0.12 + virtual screen for browsers/karma.
743eb30 Including Karma to Travis
f0da6ef Merge remote-tracking branch 'upstream/master'
cbb1efe test(eth): Disable few tests
b819391 fixed tests
c1136a0 Merge branch 'master' into develop
1b475aa downgrade to unreachable-branch-transform 0.1.0
636fb4b updated outdated deps
cf3fa10 Merge branch 'ch'
96f3076 karma
9c72d43 Merge pull request #100 from chevdor/master
96fede8 Merge pull request #98 from kumavis/develop
833b810 doc(readme): Information about Karma in the readme
e46f6f1 test(utils): Add test for the toEth() function
1e0d76e Remove phantomjs
af5fef0 test(karma): Add Karma support
20c4e28 Move envify and unreachable-branch-transform to normal dependencies for external browserify support.
333c3ff merged develop
b07ddb4 add defualt block
024433f Merge branch 'master' into develop
601c8ab ignore for maxcomplexity warning
d9d190e Merge branch 'master' into develop
a05742f Add internal defaultBlock
6cd96c9 add net object
48c107e update meteor package
9c4080b made filter polling async
869bb66 add optional callback
4096fb8 merged develop
5c4a36b working on adding callbacks
30111f7 Merge pull request #87 from kumavis/develop
f2029b4 Merge pull request #85 from ethers/abiString
ee686b0 Move browserify transforms to package.json
4b9bc17 constants should be before (dynamic) string contents
1c136e3 merged develop
aef0171 add shh topic auto transformation for filter options
37e6d11 add shh output formatters and test
c03a949 add package-init.js
a69c04d add version file
487e0ac mdae it a meteor package
8cf8b9e gulp
fd85749 Merge pull request #81 from ethers/arraySupport
fcab219 vary the length of the arrays
f8db634 need to save/concat per iteration
ce664d6 fix test descriptions
66196ee constants should be before array contents, fixes #30
2cd4f02 add build files
47412c3 add more tests for blocks
545de25 add more tests
2e9a411 Merge pull request #71 from frozeman/apiOverhaul
30518ae fixed complexities
84900e6 merged with solved conflicts
eaef1a2 merged develop
9981b97 fixed )
8128342 fixed small change request
5ea5be2 add deprecated transact
181f109 changed getCode to getData
1fa7fa6 toFromWei fix
ee65b2c add input formatter for transactions
fec54d8 add depreaction warnring to contractFromAbi
684c495 changed contract API
36ca47f Changed watch to filter for eth and shh
7fde77d add formatter
b41d7b3 Merge branch 'master' into develop
5424406 Merge pull request #69 from frozeman/apiOverhaul
1e3edbb Merge branch 'develop' of https://github.com/ethereum/ethereum.js into apiOverhaul
60cda4e fixed tests
91c015e Made to/fromWei return strings instead of numbers
85c843e Merge pull request #67 from frozeman/apiOverhaul
ed7d473 Removed enumerable from methods, fixed number property
ce141d8 Removed circular dependencies
188e9e5 Add toWei/fromWei and isAddress
5c994ff changed most of the function names
REVERT: 7d6b35a Merge branch 'master' into cpp
REVERT: ea250e6 Merge commit 'be3bfb76bef1d1f113033cd9093e03a00066d5d1' into ethereumjs_timeout
REVERT: c08cea1 Improvement to AZ - confirmation disabler. Fix network crash.

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 9926e27a84fe21f3e7250e7e245977a7125ddf63
2015-03-10 17:41:32 +01:00
Marek Kotewicz
7e0c3f1342 Merge branch 'develop' into new_jsonrpc 2015-03-10 17:41:07 +01:00
Gav Wood
2026871882 Merge pull request #1236 from CJentzsch/suicideRefundTests
add suicide refund tests
2015-03-10 16:02:41 +00:00
Marek Kotewicz
223a102aff eth_call on block with number 2015-03-10 11:40:30 +01:00
chriseth
0fcd2212d4 Global variable "now" (alias for block.timestamp). 2015-03-09 19:22:43 +01:00
Marek Kotewicz
ac96c5bf59 Merge branch 'develop' into new_jsonrpc 2015-03-09 13:33:10 +01:00
Lefteris Karapetsas
d586a88f3c style fixes in TestHelper.h 2015-03-09 13:06:16 +01:00
Lefteris Karapetsas
3efbe46a49 Improving ETH_TEST() exceptions
- Properly printing fail check/require message same way as BOOST
  implementation does

- Also add a Test Pass Checkpoint call to be sure the last checkpoint is
  reported properly

- Catch any sort of exception in the no throw
2015-03-09 12:27:30 +01:00
CJentzsch
b5c78387c0 Merge remote-tracking branch 'upstream/develop' into suicideRefundTests
Conflicts:
	test/stTransactionTestFiller.json
	test/vmArithmeticTestFiller.json
2015-03-09 10:43:08 +01:00
Gav Wood
52e9a85d62 Merge pull request #1235 from winsvega/poc9trie
vmTests
2015-03-08 14:51:03 +01:00
CJentzsch
2dfb5eb3f2 adjust gas prices for arithmetic tests 2015-03-07 23:52:26 +01:00
CJentzsch
8172e11f1a Merge remote-tracking branch 'upstream/develop' into suicideRefundTests 2015-03-07 22:33:03 +01:00
Gav Wood
a2ca8cefb7 Gas pricing infrastructure and a couple of pricing mechanisms. 2015-03-07 16:43:05 +01:00
CJentzsch
db9e0e7b31 add suiciderefund tests 2015-03-07 14:18:22 +01:00
Marek Kotewicz
dab392876a Merge branch 'develop' into new_jsonrpc
Conflicts:
	libweb3jsonrpc/WebThreeStubServerBase.cpp
2015-03-07 11:10:21 +01:00
Gav Wood
986fdb9d5f Avoid checking for difficulty when doing PoW test. 2015-03-06 22:53:49 +01:00
winsvega
65c82ecde2 vmTests
Arithmetic gas increased
2015-03-06 22:51:56 +03:00
Marek Kotewicz
2f699b222b Merge branch 'develop' into new_jsonrpc 2015-03-06 19:35:46 +01:00
chriseth
0f6224a70f Merge pull request #1228 from LefterisJP/eth_TestNoThrowInfo
Test macros for printing Exception information
2015-03-06 16:25:58 +01:00
Marek Kotewicz
3726e267a8 Merge branch 'mac_fixes' into new_jsonrpc
Conflicts:
	libethcore/CommonJS.h
	libweb3jsonrpc/WebThreeStubServerBase.cpp
	libweb3jsonrpc/WebThreeStubServerBase.h
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
2015-03-06 15:51:12 +01:00
chriseth
ce29adc29f Merge pull request #1222 from chriseth/sol_copyFromCalldata
Copying between calldata and storage.
2015-03-06 15:42:49 +01:00
chriseth
2650703ece Typo 2015-03-06 15:40:02 +01:00
Lefteris Karapetsas
e2c01948f4 Style fixes and better exception message format 2015-03-06 14:40:46 +01:00
Lefteris Karapetsas
4534ff8792 Adding ETH_TEST macros to ABI and EndToEndTests 2015-03-06 14:37:20 +01:00
Lefteris Karapetsas
4cd659c51d NameAndtypeResolution tests use ETH_TEST macros 2015-03-06 14:37:20 +01:00
Lefteris Karapetsas
79bbe1e5d8 Move ETH_TEST() Macros to TestHelper.h
- Also use them in Solidity Parser
2015-03-06 14:37:20 +01:00
Lefteris Karapetsas
10c666fb52 Extracting ETH_TEST_REQUIRE_NO_THROW() from my other PR 2015-03-06 14:37:20 +01:00
chriseth
1234526c93 Fix type checks for storage variable initializer. 2015-03-06 13:47:32 +01:00
Gav Wood
1308d62308 Merge branch 'poc9trie' of github.com:ethereum/cpp-ethereum into poc9trie
Conflicts:
	libethcore/BlockInfo.cpp
	libethcore/Exceptions.cpp
	libethcore/Exceptions.h
2015-03-06 13:28:37 +01:00
chriseth
e6c778e740 Fix for arrays containing mappings. 2015-03-06 13:17:52 +01:00
chriseth
7639bfe7e5 Copying between calldata and storage. 2015-03-06 13:17:52 +01:00
CJentzsch
08669316d8 fix 2015-03-06 12:49:39 +01:00
CJentzsch
3112948e53 try to have a uncle with block number = 1 2015-03-06 12:49:39 +01:00
CJentzsch
f0e015843d merge 2015-03-06 12:49:39 +01:00
CJentzsch
873d365ce5 add secure trie tests 2015-03-06 12:49:39 +01:00
CJentzsch
c10f41d0c9 add uncle tests 2015-03-06 12:49:39 +01:00
CJentzsch
96da2e9789 style + add test cases 2015-03-06 12:49:39 +01:00
CJentzsch
072a4fb4ba style 2015-03-06 12:49:39 +01:00
CJentzsch
58f1414e36 add first uncle test 2015-03-06 12:49:38 +01:00
CJentzsch
4606b7a311 update blockchain test filler to new min diff and min gasLimit 2015-03-06 12:49:38 +01:00
CJentzsch
3fa4f14859 add uncle header feature for fillers 2015-03-06 12:49:38 +01:00
CJentzsch
d449b1704f add quadratic complexity tests 2015-03-06 12:49:38 +01:00
Gav Wood
937c8a35c1 For Marek :)
BlockChain::transaction(h256 _transactionHash)
BlockChain::transactionHashes(h256 _blockHash)
2015-03-06 12:49:38 +01:00
CJentzsch
63be15a83d merge 2015-03-06 12:49:34 +01:00
Gav Wood
aa2bc0eb65 Add date/time language to solidity. 2015-03-06 12:49:13 +01:00
CJentzsch
44c991107d update block tests to latest changes PoW changes 2015-03-06 12:49:13 +01:00
CJentzsch
fefeb706ef more block tests + bugfix for longer chains 2015-03-06 12:49:13 +01:00
CJentzsch
4a48392a90 blockchain tests
Conflicts:
	test/block.cpp
2015-03-06 12:47:26 +01:00
Gav Wood
5fa066869d New Proof-of-Work. 2015-03-06 12:47:26 +01:00