Skip to content

Commit 0d57ca4

Browse files
obscurenobscuren
committed
Squashed commit of the following:
commit 779f25d Author: CJentzsch <[email protected]> Date: Thu Dec 11 22:59:56 2014 +0100 first random test commit 6817538 Author: CJentzsch <[email protected]> Date: Thu Dec 11 21:34:50 2014 +0100 update gas prices commit ad322fb Author: CJentzsch <[email protected]> Date: Mon Dec 8 06:01:17 2014 +0100 Log as array commit f989f42 Author: CJentzsch <[email protected]> Date: Fri Dec 5 15:12:12 2014 +0100 state log tests commit 4bc65d1 Author: CJentzsch <[email protected]> Date: Thu Dec 4 18:18:49 2014 +0100 add calldataload, codecopy, extcodecopy tests commit 12cfae1 Author: CJentzsch <[email protected]> Date: Thu Dec 4 15:57:56 2014 +0100 add calldataload test commit 086caf3 Author: CJentzsch <[email protected]> Date: Wed Dec 3 08:31:03 2014 +0100 protocol update (CALLCODE <-> RETURN), topics in log are arrays not sets commit e6c9267 Author: CJentzsch <[email protected]> Date: Mon Dec 1 21:14:08 2014 +0100 update state tests with logs commit 4089b80 Author: CJentzsch <[email protected]> Date: Mon Dec 1 18:19:40 2014 +0100 update gas costs commit cfdca62 Merge: 2e5175e f59f89d Author: Christoph Jentzsch <[email protected]> Date: Mon Dec 1 18:04:51 2014 +0100 Merge pull request #42 from negedzuregal/fix vmTest fix commit f59f89d Author: alon muroch <[email protected]> Date: Mon Dec 1 16:18:12 2014 +0100 vmEnvironmentalInfoTest CALLDATACOPY, CODECOPY, EXTCODECOPY fix commit 68da13f Author: alon muroch <[email protected]> Date: Mon Dec 1 11:10:57 2014 +0100 vmArithmeticTest exp fix commit 2e5175e Author: ethers <[email protected]> Date: Sun Nov 30 19:55:51 2014 +0100 add vmLogTest commit b5b9408 Author: Heiko Heiko <[email protected]> Date: Sun Nov 30 16:27:27 2014 +0100 updated genesis to new header w/o min_gas_price commit 8e69fbf Author: ethers <[email protected]> Date: Fri Nov 21 17:42:05 2014 -0800 add special tests commit 90f4f94 Author: ethers <[email protected]> Date: Thu Nov 20 19:01:09 2014 -0800 typo commit c5e5228 Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 20 17:04:06 2014 +0100 Removed log,post,out,gas,callcreates if exception occured commit 9c0232a Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 19 18:19:05 2014 +0100 MakeMoney test commit 3ba0007 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 19 16:23:04 2014 +0100 Added log sections in all vmtests + log tests commit d84be4f Merge: c8497ab 76d2542 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 19 10:00:24 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit c8497ab Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 19 10:00:02 2014 +0100 new push32 test and renaming commit 76d2542 Author: ethers <[email protected]> Date: Mon Nov 17 18:59:30 2014 -0800 adding test commit 0be275e Merge: 1d42d1d d90868c Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 17 22:47:34 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit 1d42d1d Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 17 22:46:51 2014 +0100 fix ecrecover2 commit d90868c Merge: 1f38c8c 6dbcf6b Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 17 20:26:59 2014 +0100 Merge pull request #39 from wanderer/develop added test for max call depth on creation commit 6dbcf6b Author: wanderer <[email protected]> Date: Mon Nov 17 14:06:43 2014 -0500 spelling fix commit 6fc07a7 Author: wanderer <[email protected]> Date: Sat Nov 15 21:39:16 2014 -0500 added test for max call depth on creation commit 1f38c8c Merge: 279b284 cd85ca1 Author: martin becze <[email protected]> Date: Fri Nov 14 20:10:21 2014 -0500 Merge pull request #38 from wanderer/develop updated test 'jeff' in trietest.json commit cd85ca1 Author: martin becze <[email protected]> Date: Fri Nov 14 19:59:34 2014 -0500 Update trietest.json commit 279b284 Merge: 89675a7 6cae937 Author: martin becze <[email protected]> Date: Fri Nov 14 17:43:49 2014 -0500 Merge pull request #37 from wanderer/develop Update trietest.json commit 6cae937 Author: martin becze <[email protected]> Date: Fri Nov 14 17:20:03 2014 -0500 Update trietest.json 'emptyValues' should have the same root as 'puppy' commit 89675a7 Merge: f1de1cc 32f0c47 Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 13 23:17:49 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit f1de1cc Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 13 23:17:13 2014 +0100 Fix CallRecursiveBomb2 commit 32f0c47 Merge: ab50e76 3da90d0 Author: martin becze <[email protected]> Date: Thu Nov 13 15:26:49 2014 -0500 Merge pull request #36 from wanderer/develop converted back to arrary format commit ab50e76 Merge: d06b792 78f1e4a Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 13 07:52:35 2014 +0100 Merge pull request #35 from ethers/delOld rename tests since they are valid opcodes that exist commit 3da90d0 Author: wanderer <[email protected]> Date: Wed Nov 12 22:22:47 2014 -0500 converted back to arrary format commit 78f1e4a Author: ethers <[email protected]> Date: Wed Nov 12 19:11:06 2014 -0800 rename tests since they are valid opcodes that exist commit d06b792 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 12 07:00:17 2014 +0100 minor change in CallSha256_1_nonzeroValue test commit d434ecd Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 12 06:56:31 2014 +0100 Added CallSha256_1_nonzeroValue test commit 2c06f34 Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 11 18:10:26 2014 +0100 Store return value of call to precompiled contracts commit 4b0c3b2 Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 11 17:51:14 2014 +0100 Fix gas cost for OOG calls commit 63bcca7 Author: Heiko Heiko <[email protected]> Date: Tue Nov 11 08:59:19 2014 +0100 fix: genesis test commit 6e0310c Merge: 30c266c 2927763 Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 11 08:34:36 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit 30c266c Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 11 08:33:59 2014 +0100 jump to position outside code stops execution commit 2927763 Author: ethers <[email protected]> Date: Mon Nov 10 14:10:22 2014 -0800 RandomTests were removed commit a0fa91b Merge: 6092484 fcba866 Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 10 22:22:05 2014 +0100 Merge branch 'develop' of https://github.com/ethereum/tests into develop commit 6092484 Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 10 22:21:37 2014 +0100 Unintended Exceptions work like OOG commit fcba866 Author: ethers <TODO> Date: Thu Nov 6 14:19:59 2014 -0800 add StateTests commit a441074 Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 6 17:54:36 2014 +0100 Updated precompiled contracts test commit 0afa72c Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 6 15:27:45 2014 +0100 Added precompiledContracts tests commit 6be83dd Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 6 13:31:34 2014 +0100 Update gas cost for PoC7 commit c18b8ab Merge: 66c2e1f 9a93258 Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 6 09:19:53 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit 66c2e1f Author: Christoph Jentzsch <[email protected]> Date: Thu Nov 6 09:19:22 2014 +0100 Updated SIGNEXTEND tests commit 9a93258 Author: ethers <TODO> Date: Wed Nov 5 16:20:26 2014 -0800 part of 9b4e768 - Delete vmNamecoin.json commit e229374 Merge: 189527e 9b4e768 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 5 20:59:49 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit 189527e Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 5 20:59:20 2014 +0100 added dynamic jump out of code commit 9b4e768 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 5 20:41:54 2014 +0100 Delete vmNamecoin.json commit 4669b56 Merge: a567fed aaba185 Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 5 15:00:12 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit a567fed Author: Christoph Jentzsch <[email protected]> Date: Wed Nov 5 14:59:08 2014 +0100 added state systemOperationsTest commit aaba185 Merge: 79d7cbf fa782ae Author: ethers <[email protected]> Date: Tue Nov 4 12:15:40 2014 -0800 Merge pull request #32 from ethers/indexjs updates needed per restructure commit fa782ae Author: ethers <TODO> Date: Tue Nov 4 11:28:56 2014 -0800 updates needed per restructure commit 79d7cbf Merge: 9120274 1c1ba8d Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 4 13:32:11 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit 9120274 Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 4 13:31:27 2014 +0100 Update tests to latest protocol changes (PoC7) commit 1c1ba8d Merge: 014d370 3aebe53 Author: Christoph Jentzsch <[email protected]> Date: Tue Nov 4 13:30:52 2014 +0100 Merge pull request #31 from CJentzsch/develop Restructered tests in folders in accordance to test suites commit 3aebe53 Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 3 13:58:21 2014 +0100 Updated vmNamecoin.json to new sstore prices commit 8a0be21 Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 3 13:53:00 2014 +0100 Added example state test commit 83643ad Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 3 13:36:25 2014 +0100 removed systemoperationstests commit 3930ca3 Author: Christoph Jentzsch <[email protected]> Date: Mon Nov 3 13:22:15 2014 +0100 Restructered tests in folders in accordance to test suites commit 014d370 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 29 21:23:56 2014 +0100 New SIGNEXTEND tets commit 155d449 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 29 20:59:05 2014 +0100 New tests for BNOT and SIGNEXTEND commit c9eae76 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 28 12:58:27 2014 +0100 Update SSTORE gas cost and BNOT instead of NEG commit ad2a75a Author: Christoph Jentzsch <[email protected]> Date: Thu Oct 23 16:05:49 2014 +0200 Added new recursive bombs commit 834c52a Author: Christoph Jentzsch <[email protected]> Date: Thu Oct 23 12:01:05 2014 +0200 Changing gas cost to zero at stackunderflow commit c73a8a8 Author: Jeffrey Wilcke <[email protected]> Date: Wed Oct 22 13:04:45 2014 +0200 Reverted back to original value. commit b9a8c92 Author: martin becze <[email protected]> Date: Tue Oct 21 17:02:52 2014 -0400 fix spelling error commit b48ae74 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 21 17:26:26 2014 +0200 Added failing random tests commit bee0a41 Merge: 5050d20 b315da6 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 21 17:15:05 2014 +0200 Merge remote-tracking branch 'origin/master' into develop commit 5050d20 Merge: 7516685 ba35362 Author: Christoph Jentzsch <[email protected]> Date: Mon Oct 20 20:18:20 2014 +0200 Merge pull request #26 from wanderer/develop Add a package.json for node.js commit ba35362 Author: wanderer <[email protected]> Date: Sun Oct 19 23:59:47 2014 -0400 turned tests into a node module commit 7516685 Author: ethers <[email protected]> Date: Thu Oct 16 17:08:20 2014 -0700 json was invalid and missing quotes commit 0e687ce Author: Jeffrey Wilcke <[email protected]> Date: Thu Oct 16 17:13:24 2014 +0200 Update vmEnvironmentalInfoTest.json commit 78a78e2 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 15 14:19:11 2014 +0200 updated genesis_hash commit b315da6 Merge: 7a7e198 0a76a3a Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 14 10:33:26 2014 +0200 Merge pull request #23 from ethers/fix22 numbers should be strings #22 commit 0a76a3a Author: ethers <[email protected]> Date: Mon Oct 13 14:45:30 2014 -0700 numbers should be strings #22 commit 1f67385 Author: Christoph Jentzsch <[email protected]> Date: Sat Oct 11 13:18:00 2014 +0200 Added some MUL tests commit 7a7e198 Author: Christoph Jentzsch <[email protected]> Date: Sat Oct 11 13:11:59 2014 +0200 Added some MUL tests commit 46eb628 Author: Christoph Jentzsch <[email protected]> Date: Sat Oct 11 12:18:13 2014 +0200 tested new opcodes (JUMPDEST,CALLCODE) and created test for CALL/CREATE depth commit 8d38d62 Author: Nick Savers <[email protected]> Date: Fri Oct 10 18:09:41 2014 +0200 INVALID stops the operation and doesn't cost gas commit ed6eba7 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 8 19:08:48 2014 +0200 Update + ABA recursive bomb which needs maximum recursion limit of 1024 commit 2d72050 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 8 14:37:18 2014 +0200 Applied recent protocol changes (PoC7) to existin tests commit dfe66ca Merge: 4513623 1a67a96 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 8 11:05:51 2014 +0200 Merge remote-tracking branch 'origin/develop' Conflicts: genesishashestest.json commit 1a67a96 Merge: a4f5f45 ffd6bc9 Author: vbuterin <[email protected]> Date: Tue Oct 7 15:10:23 2014 +0100 Merge pull request #18 from CJentzsch/develop CallToNameRegistratorOutOfGas balance correction commit ffd6bc9 Merge: a4f5f45 9779d67 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 15:47:34 2014 +0200 Merge remote-tracking branch 'origin/develop' into develop commit 9779d67 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 15:45:53 2014 +0200 ��CallToNameRegistratorOutOfGas balance correction Even if execution fails, the value gets transferred. commit a4f5f45 Merge: 49a9f47 b6d7cba Author: vbuterin <[email protected]> Date: Tue Oct 7 14:13:12 2014 +0100 Merge pull request #17 from CJentzsch/develop Added A calls B calls A contracts commit b6d7cba Merge: 865cb40 49a9f47 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 15:02:51 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit 865cb40 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 15:02:36 2014 +0200 Added A calls B calls A contracts commit 49a9f47 Merge: 3b0ec43 94a493b Author: Jeffrey Wilcke <[email protected]> Date: Tue Oct 7 10:56:17 2014 +0200 Merge pull request #16 from CJentzsch/develop corrected amount of used gas for CallToNameRegistratorOutOfGas commit 94a493b Merge: 72853c4 3b0ec43 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 10:51:32 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit 72853c4 Author: Christoph Jentzsch <[email protected]> Date: Tue Oct 7 10:51:07 2014 +0200 corrected amount of used gas for CallToNameRegistratorOutOfGas commit 3b0ec43 Merge: aec3252 222068b Author: vbuterin <[email protected]> Date: Tue Oct 7 05:52:43 2014 +0100 Merge pull request #15 from CJentzsch/develop corrected tests and different style for storage commit 222068b Merge: c169653 aec3252 Author: Christoph Jentzsch <[email protected]> Date: Mon Oct 6 21:17:28 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit c169653 Author: Christoph Jentzsch <[email protected]> Date: Mon Oct 6 21:17:09 2014 +0200 corrected tests and different style for storage commit aec3252 Merge: 25f9fd5 e17a909 Author: vbuterin <[email protected]> Date: Mon Oct 6 09:39:46 2014 +0100 Merge pull request #14 from CJentzsch/develop corrected gas limit in vmSystemOperationsTest commit e17a909 Merge: 33fcab5 25f9fd5 Author: Christoph Jentzsch <[email protected]> Date: Mon Oct 6 10:31:51 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit 33fcab5 Author: Christoph Jentzsch <[email protected]> Date: Mon Oct 6 10:30:04 2014 +0200 Bug fix, corrected gasLimit in vmSystemOperationsTest commit 25f9fd5 Author: Vitalik Buterin <[email protected]> Date: Sat Oct 4 15:47:00 2014 -0400 one more vm test commit 2d561a5 Author: Vitalik Buterin <[email protected]> Date: Sat Oct 4 15:15:37 2014 -0400 separated out vmtests commit b0c48fa Merge: cb8261a 6cae166 Author: vbuterin <[email protected]> Date: Sat Oct 4 17:18:02 2014 +0100 Merge pull request #13 from CJentzsch/develop Added comprehensive EVM test suite. All commands are tested. commit 6cae166 Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 1 15:34:23 2014 +0200 Delete tmp.json commit 4ff906f Author: Christoph Jentzsch <[email protected]> Date: Wed Oct 1 14:06:32 2014 +0200 corrected CALLSTATELESS tests commit 5b3fee6 Author: Christoph Jentzsch <[email protected]> Date: Mon Sep 29 13:08:44 2014 +0200 Completed vm tests. Added ADDMOD, MULMOD, POST, CALLSTATELESS commit 9cdd218 Author: Christoph Jentzsch <[email protected]> Date: Sat Sep 27 21:48:09 2014 +0200 Added IOandFlowOperation-, PushDupSwap- and SystemOperations- tests. Removed empty storage from adresses. commit 28ed968 Author: Christoph Jentzsch <[email protected]> Date: Tue Sep 23 15:49:22 2014 +0200 Added blockInfoTest commit ffbd5a3 Author: Christoph Jentzsch <[email protected]> Date: Tue Sep 23 15:37:52 2014 +0200 Added environmentalInfo- and sha3- test commit 54c14f1 Author: Christoph Jentzsch <[email protected]> Date: Mon Sep 22 13:06:57 2014 +0200 Added bitwise logic operation test commit d0af113 Author: Christoph Jentzsch <[email protected]> Date: Sat Sep 20 01:42:51 2014 +0200 Added vm arithmetic test commit cb8261a Author: Jeffrey Wilcke <[email protected]> Date: Fri Sep 19 13:15:44 2014 +0200 Update genesishashestest.json commit 4513623 Author: Maran <[email protected]> Date: Tue Jul 22 12:24:46 2014 +0200 Update keyaddrtest to be valid JSON commit e8cb5c2 Author: Vitalik Buterin <[email protected]> Date: Mon Jul 21 23:30:33 2014 -0400 Added next/prev trie test commit 98823c0 Author: Vitalik Buterin <[email protected]> Date: Mon Jul 14 02:51:31 2014 -0400 Replaced with deterministic test commit 357eb21 Author: Vitalik Buterin <[email protected]> Date: Sun Jul 13 16:12:56 2014 -0400 Added my own random and namecoin tests (pyethereum) commit 00cd0cc Author: Gav Wood <[email protected]> Date: Sat Jul 12 21:20:04 2014 +0200 Output hex strings. commit ddfa3af Author: Gav Wood <[email protected]> Date: Thu Jul 10 11:28:35 2014 +0100 Everything a string. commit d659f46 Author: Gav Wood <[email protected]> Date: Thu Jul 10 10:16:25 2014 +0100 Code fixes. commit 5e83ea8 Author: Gav Wood <[email protected]> Date: Sun Jul 6 16:17:12 2014 +0200 Prettier VM tests. commit a09aae0 Author: Gav Wood <[email protected]> Date: Sun Jul 6 15:46:01 2014 +0200 Fix VM tests. commit ec9a044 Merge: 4bb6461 5e0123f Author: Jeffrey Wilcke <[email protected]> Date: Fri Jul 4 15:56:52 2014 +0200 Merge pull request #10 from romanman/patch-1 Update vmtests.json commit 5e0123f Author: romanman <[email protected]> Date: Fri Jul 4 10:23:04 2014 +0100 Update vmtests.json commit 2b6da2f Author: romanman <[email protected]> Date: Thu Jul 3 17:45:04 2014 +0100 Update vmtests.json arith testcase updated commit 4bb6461 Merge: bba3898 a33b309 Author: Gav Wood <[email protected]> Date: Wed Jul 2 19:43:22 2014 +0200 Merge branch 'develop' of github.com:/ethereum/tests into develop commit bba3898 Author: Gav Wood <[email protected]> Date: Wed Jul 2 19:43:06 2014 +0200 New tests. commit a33b309 Author: Vitalik Buterin <[email protected]> Date: Wed Jul 2 10:14:05 2014 -0400 Testing submodules commit 5031821 Author: Vitalik Buterin <[email protected]> Date: Wed Jul 2 10:10:46 2014 -0400 Testing submodules commit 57fa655 Author: Vitalik Buterin <[email protected]> Date: Wed Jul 2 10:09:08 2014 -0400 Testing submodules commit ea0eb0a Author: Gav Wood <[email protected]> Date: Tue Jul 1 15:19:34 2014 +0200 Latest genesis block. commit 25bb76b Author: Jeffrey Wilcke <[email protected]> Date: Mon Jun 30 13:25:04 2014 +0200 Reset commit 74c6d84 Author: Jeffrey Wilcke <[email protected]> Date: Mon Jun 30 12:10:06 2014 +0200 Updated wrong test commit 9ea3a60 Author: Jeffrey Wilcke <[email protected]> Date: Sat Jun 28 18:48:28 2014 +0200 Fixed roots commit 5fc3ac0 Author: Gav Wood <[email protected]> Date: Sat Jun 28 18:40:06 2014 +0200 Simple hex test. commit edd3a00 Author: Gav Wood <[email protected]> Date: Sat Jun 28 18:22:18 2014 +0200 Additional test for jeff. Now use the 0x... notation. commit 5021e0d Author: Gav Wood <[email protected]> Date: Fri Jun 27 21:35:26 2014 +0200 VM test framework updated. commit c818d13 Author: Gav Wood <[email protected]> Date: Fri Jun 27 18:18:24 2014 +0200 Removed arrays from Trie tests JSON as per conformance guide and changed vocabulary to match other tests. VM test updates. commit 714770f Author: Gav Wood <[email protected]> Date: Wed Jun 11 11:32:42 2014 +0100 Added Gav's new address. commit 9345bc1 Merge: a2257f3 78576dd Author: Gav Wood <[email protected]> Date: Fri May 30 17:50:38 2014 +0200 Merge branch 'master' of github.com:ethereum/tests into develop commit a2257f3 Author: Gav Wood <[email protected]> Date: Fri May 30 17:50:18 2014 +0200 VM tests. commit 78576dd Author: Heiko Heiko <[email protected]> Date: Fri May 30 17:19:09 2014 +0200 changes based on new account structure nonce, balance, storage, code commit 125839e Merge: 42e14ec 356a329 Author: Jeffrey Wilcke <[email protected]> Date: Thu May 22 09:58:45 2014 +0200 Merge pull request #5 from bkirwi/master Fix invalid JSON (removed trailing comma) and add test names commit 356a329 Author: Ben Kirwin <[email protected]> Date: Thu May 22 00:20:48 2014 -0400 Add some arbitrary test names This should now conform to the format specified in the README. commit 42e14ec Author: Chen Houwu <[email protected]> Date: Wed May 21 23:27:40 2014 +0800 revert to correct data commit 4300197 Author: Chen Houwu <[email protected]> Date: Wed May 21 22:42:23 2014 +0800 fix: wrong sha3 hash because of the wrong rlp hex commit a0d01b1 Author: Chen Houwu <[email protected]> Date: Wed May 21 22:29:53 2014 +0800 fix: wrong rlp hex commit 6bc2fc7 Merge: 66bc366 c31a93c Author: Jeffrey Wilcke <[email protected]> Date: Wed May 21 14:11:37 2014 +0200 Merge pull request #4 from ethers/master fix file name that seems to have been a typo commit c31a93c Author: ethers <[email protected]> Date: Tue May 20 15:42:39 2014 -0700 fix file name that seems to have been a typo commit 66bc366 Author: Heiko Heiko <[email protected]> Date: Tue May 20 17:36:35 2014 +0200 fix: represent integers as strings commit ede5499 Author: Heiko Heiko <[email protected]> Date: Tue May 20 17:21:09 2014 +0200 add: current initial alloc and genesis hashes commit 5131429 Author: Ben Kirwin <[email protected]> Date: Mon May 19 11:18:31 2014 -0400 Delete a comma This should now be parseable as JSON. commit f44a859 Author: Chen Houwu <[email protected]> Date: Sun May 18 15:04:42 2014 +0800 add: case when value is long, ensure it's not get rlp encoded as node commit e1ae4ad Author: Gav Wood <[email protected]> Date: Mon May 12 14:40:47 2014 +0100 PoC-5 VM tests. commit 2b6c136 Author: Vitalik Buterin <[email protected]> Date: Sun May 11 21:42:41 2014 -0400 Moved txt to json commit cbccbf9 Merge: edbb8d4 45a0974 Author: Vitalik Buterin <[email protected]> Date: Thu May 8 21:54:48 2014 -0400 New commit commit edbb8d4 Author: Vitalik Buterin <[email protected]> Date: Tue May 6 16:53:43 2014 -0400 Removed unneeded test, added new tests commit 45a0974 Merge: 15dd8fd 5fd2a98 Author: Gav Wood <[email protected]> Date: Sun Apr 27 12:53:47 2014 +0100 Merge pull request #3 from autolycus/develop Fixed formatting and added test cases commit 5fd2a98 Author: Carl Allendorph <[email protected]> Date: Sat Apr 19 13:26:14 2014 -0700 Added some new test cases for the rlp encoding. commit 4ba1509 Author: Carl Allendorph <[email protected]> Date: Sat Apr 19 12:48:42 2014 -0700 Converted spaces to tabs to be compliant with the coding standards defined in cpp-ethereum commit 15dd8fd Author: Gav Wood <[email protected]> Date: Fri Feb 28 12:54:47 2014 +0000 RLP tests and Trie updates. commit 33f80fe Author: Gav Wood <[email protected]> Date: Fri Feb 28 11:39:35 2014 +0000 Hex encode tests done. commit e1f5e12 Author: Gav Wood <[email protected]> Date: Fri Feb 28 11:22:49 2014 +0000 Fix RLP tests. commit f87ce15 Author: Gav Wood <[email protected]> Date: Thu Feb 27 13:28:11 2014 +0000 Fix empty string. commit c006ed4 Author: Gav Wood <[email protected]> Date: Mon Feb 24 10:24:39 2014 +0000 Tests fix. commit 510ff56 Author: Gav Wood <[email protected]> Date: Fri Feb 21 18:54:08 2014 +0000 Updated the tests. commit a0ec843 Author: Gav Wood <[email protected]> Date: Fri Feb 21 18:49:24 2014 +0000 Moved over to new format, but RLP tests still need updating. commit 660cd26 Author: Gav Wood <[email protected]> Date: Fri Feb 21 18:35:51 2014 +0000 More docs. commit 6ad14c1 Author: Gav Wood <[email protected]> Date: Fri Feb 21 18:33:39 2014 +0000 Added VM test suite. Added TODO. Renamed old files. commit f91ad7b Author: Vitalik Buterin <[email protected]> Date: Wed Jan 8 11:26:58 2014 -0500 update trie algorithm commit 6da2954 Merge: cc42246 131c610 Author: Vitalik Buterin <[email protected]> Date: Wed Jan 8 08:15:38 2014 -0500 merge commit cc42246 Author: Vitalik Buterin <[email protected]> Date: Tue Jan 7 14:35:26 2014 -0500 Updated trie test commit 131c610 Merge: 121632b 7613302 Author: vbuterin <[email protected]> Date: Wed Jan 1 06:40:54 2014 -0800 Merge pull request #1 from obscuren/master Update trietest.txt commit 7613302 Author: obscuren <[email protected]> Date: Wed Jan 1 15:25:21 2014 +0100 Update trietest.txt New proposed explanatory format commit 121632b Author: Vitalik Buterin <[email protected]> Date: Wed Jan 1 08:26:18 2014 -0500 Added obscure's tests commit ef6c550 Author: Vitalik Buterin <[email protected]> Date: Tue Dec 31 19:04:48 2013 -0500 Fixed tests a bit commit 345e4bc Merge: 2c81698 e4bbea4 Author: Vitalik Buterin <[email protected]> Date: Tue Dec 31 15:52:46 2013 -0500 Merge branch 'master' of github.com:ethereum/tests commit 2c81698 Author: Vitalik Buterin <[email protected]> Date: Mon Dec 30 21:09:40 2013 -0500 Added first three tests commit e4bbea4 Author: vbuterin <[email protected]> Date: Mon Dec 30 18:09:03 2013 -0800 Initial commit
1 parent 2b5fcb4 commit 0d57ca4

File tree

8 files changed

+85
-47
lines changed

8 files changed

+85
-47
lines changed

‎core/execution.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (self *Execution) Call(codeAddr []byte, caller vm.ClosureRef) ([]byte, erro
3232
return self.exec(code, codeAddr, caller)
3333
}
3434

35-
func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
35+
func (self *Execution) exec(code, contextAddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
3636
env := self.vm.Env()
3737
chainlogger.Debugf("pre state %x\n", env.State().Root())
3838

@@ -57,7 +57,7 @@ func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byt
5757
} else {
5858
self.object = to
5959
// Pre-compiled contracts (address.go) 1, 2 & 3.
60-
naddr := ethutil.BigD(caddr).Uint64()
60+
naddr := ethutil.BigD(contextAddr).Uint64()
6161
if p := vm.Precompiled[naddr]; p != nil {
6262
if self.Gas.Cmp(p.Gas(len(self.input))) >= 0 {
6363
ret = p.Call(self.input)

‎tests/files/StateTests/stPreCompiledContracts.json

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,14 @@
726726
}
727727
},
728728
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
729-
"balance" : "1232",
729+
"balance" : "1182",
730730
"code" : "0x",
731731
"nonce" : "0",
732732
"storage" : {
733733
}
734734
},
735735
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
736-
"balance" : "999999999999898768",
736+
"balance" : "999999999999898818",
737737
"code" : "0x",
738738
"nonce" : "1",
739739
"storage" : {
@@ -796,14 +796,14 @@
796796
}
797797
},
798798
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
799-
"balance" : "1236",
799+
"balance" : "1286",
800800
"code" : "0x",
801801
"nonce" : "0",
802802
"storage" : {
803803
}
804804
},
805805
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
806-
"balance" : "999999999999898764",
806+
"balance" : "999999999999898714",
807807
"code" : "0x",
808808
"nonce" : "1",
809809
"storage" : {
@@ -866,14 +866,14 @@
866866
}
867867
},
868868
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
869-
"balance" : "1236",
869+
"balance" : "1286",
870870
"code" : "0x",
871871
"nonce" : "0",
872872
"storage" : {
873873
}
874874
},
875875
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
876-
"balance" : "999999999999898764",
876+
"balance" : "999999999999898714",
877877
"code" : "0x",
878878
"nonce" : "1",
879879
"storage" : {
@@ -1070,19 +1070,18 @@
10701070
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060036101f4f1600255600051600055",
10711071
"nonce" : "0",
10721072
"storage" : {
1073-
"0x" : "0x953450193f7389363135b31dc0f371f22f3947db",
1074-
"0x02" : "0x01"
1073+
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
10751074
}
10761075
},
10771076
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1078-
"balance" : "32484",
1077+
"balance" : "32684",
10791078
"code" : "0x",
10801079
"nonce" : "0",
10811080
"storage" : {
10821081
}
10831082
},
10841083
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1085-
"balance" : "999999999999867516",
1084+
"balance" : "999999999999867316",
10861085
"code" : "0x",
10871086
"nonce" : "1",
10881087
"storage" : {
@@ -1214,14 +1213,14 @@
12141213
}
12151214
},
12161215
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1217-
"balance" : "1232",
1216+
"balance" : "1182",
12181217
"code" : "0x",
12191218
"nonce" : "0",
12201219
"storage" : {
12211220
}
12221221
},
12231222
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1224-
"balance" : "999999999999898768",
1223+
"balance" : "999999999999898818",
12251224
"code" : "0x",
12261225
"nonce" : "1",
12271226
"storage" : {
@@ -1284,14 +1283,14 @@
12841283
}
12851284
},
12861285
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1287-
"balance" : "1232",
1286+
"balance" : "1182",
12881287
"code" : "0x",
12891288
"nonce" : "0",
12901289
"storage" : {
12911290
}
12921291
},
12931292
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1294-
"balance" : "999999999999898768",
1293+
"balance" : "999999999999898818",
12951294
"code" : "0x",
12961295
"nonce" : "1",
12971296
"storage" : {
@@ -1354,14 +1353,14 @@
13541353
}
13551354
},
13561355
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1357-
"balance" : "1236",
1356+
"balance" : "1286",
13581357
"code" : "0x",
13591358
"nonce" : "0",
13601359
"storage" : {
13611360
}
13621361
},
13631362
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1364-
"balance" : "999999999999898764",
1363+
"balance" : "999999999999898714",
13651364
"code" : "0x",
13661365
"nonce" : "1",
13671366
"storage" : {
@@ -1424,14 +1423,14 @@
14241423
}
14251424
},
14261425
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1427-
"balance" : "1236",
1426+
"balance" : "1286",
14281427
"code" : "0x",
14291428
"nonce" : "0",
14301429
"storage" : {
14311430
}
14321431
},
14331432
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1434-
"balance" : "999999999999898764",
1433+
"balance" : "999999999999898714",
14351434
"code" : "0x",
14361435
"nonce" : "1",
14371436
"storage" : {
@@ -1628,19 +1627,18 @@
16281627
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060026101f4f1600255600051600055",
16291628
"nonce" : "0",
16301629
"storage" : {
1631-
"0x" : "0x739d5000bbe364e92a2fe28d62c17a6dfd4f32105420c30b97ec0180300a2dae",
1632-
"0x02" : "0x01"
1630+
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
16331631
}
16341632
},
16351633
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
1636-
"balance" : "32484",
1634+
"balance" : "32684",
16371635
"code" : "0x",
16381636
"nonce" : "0",
16391637
"storage" : {
16401638
}
16411639
},
16421640
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
1643-
"balance" : "999999999999867516",
1641+
"balance" : "999999999999867316",
16441642
"code" : "0x",
16451643
"nonce" : "1",
16461644
"storage" : {

‎tests/files/StateTests/stSystemOperationsTest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5144,14 +5144,14 @@
51445144
}
51455145
},
51465146
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
5147-
"balance" : "917",
5147+
"balance" : "997",
51485148
"code" : "0x",
51495149
"nonce" : "0",
51505150
"storage" : {
51515151
}
51525152
},
51535153
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
5154-
"balance" : "999999999999899083",
5154+
"balance" : "999999999999899003",
51555155
"code" : "0x",
51565156
"nonce" : "1",
51575157
"storage" : {
@@ -5388,14 +5388,14 @@
53885388
}
53895389
},
53905390
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
5391-
"balance" : "507",
5391+
"balance" : "512",
53925392
"code" : "0x",
53935393
"nonce" : "0",
53945394
"storage" : {
53955395
}
53965396
},
53975397
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
5398-
"balance" : "999999999999899493",
5398+
"balance" : "999999999999899488",
53995399
"code" : "0x",
54005400
"nonce" : "1",
54015401
"storage" : {
@@ -5449,14 +5449,14 @@
54495449
}
54505450
},
54515451
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
5452-
"balance" : "507",
5452+
"balance" : "517",
54535453
"code" : "0x",
54545454
"nonce" : "0",
54555455
"storage" : {
54565456
}
54575457
},
54585458
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
5459-
"balance" : "999999999999899493",
5459+
"balance" : "999999999999899483",
54605460
"code" : "0x",
54615461
"nonce" : "1",
54625462
"storage" : {
@@ -5510,14 +5510,14 @@
55105510
}
55115511
},
55125512
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
5513-
"balance" : "508",
5513+
"balance" : "673",
55145514
"code" : "0x",
55155515
"nonce" : "0",
55165516
"storage" : {
55175517
}
55185518
},
55195519
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
5520-
"balance" : "999999999999899492",
5520+
"balance" : "999999999999899327",
55215521
"code" : "0x",
55225522
"nonce" : "1",
55235523
"storage" : {

‎tests/files/VMTests/RandomTests/randomTest.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"randomVMtest" : {
3+
"callcreates" : [
4+
],
5+
"env" : {
6+
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
7+
"currentDifficulty" : "256",
8+
"currentGasLimit" : "1000000",
9+
"currentNumber" : "0",
10+
"currentTimestamp" : "1",
11+
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
12+
},
13+
"exec" : {
14+
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
15+
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
16+
"code" : "0x675545",
17+
"data" : "0x",
18+
"gas" : "10000",
19+
"gasPrice" : "100000000000000",
20+
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
21+
"value" : "1000000000000000000"
22+
},
23+
"gas" : "9999",
24+
"logs" : [
25+
],
26+
"out" : "0x",
27+
"post" : {
28+
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
29+
"balance" : "1000000000000000000",
30+
"code" : "0x675545",
31+
"nonce" : "0",
32+
"storage" : {
33+
}
34+
}
35+
},
36+
"pre" : {
37+
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
38+
"balance" : "1000000000000000000",
39+
"code" : "0x675545",
40+
"nonce" : "0",
41+
"storage" : {
42+
}
43+
}
44+
}
45+
}
46+
}

‎tests/files/VMTests/vmSha3Test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
2121
"value" : "1000000000000000000"
2222
},
23-
"gas" : "99999999677",
23+
"gas" : "99999999687",
2424
"logs" : [
2525
],
2626
"out" : "0x",

‎vm/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020

2121
var (
2222
GasStep = big.NewInt(1)
23-
GasSha = big.NewInt(20)
23+
GasSha = big.NewInt(10)
2424
GasSLoad = big.NewInt(20)
2525
GasSStore = big.NewInt(100)
2626
GasSStoreRefund = big.NewInt(100)

‎vm/virtual_machine.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import "math/big"
55
type VirtualMachine interface {
66
Env() Environment
77
Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
8-
Depth() int
98
Printf(string, ...interface{}) VirtualMachine
109
Endl() VirtualMachine
1110
}

‎vm/vm_debug.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ type DebugVm struct {
2525
Fn string
2626

2727
Recoverable bool
28-
29-
depth int
3028
}
3129

3230
func NewDebugVm(env Environment) *DebugVm {
@@ -116,7 +114,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
116114
return closure.Return(nil), nil
117115
}
118116

119-
vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, callData)
117+
vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.env.Depth(), closure.Address(), closure.Gas, callData)
120118

121119
for {
122120
prevStep = step
@@ -867,14 +865,16 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
867865
// Get the arguments from the memory
868866
args := mem.Get(inOffset.Int64(), inSize.Int64())
869867

870-
var executeAddr []byte
868+
var (
869+
ret []byte
870+
err error
871+
)
871872
if op == CALLCODE {
872-
executeAddr = closure.Address()
873+
ret, err = self.env.CallCode(closure, addr.Bytes(), args, gas, price, value)
873874
} else {
874-
executeAddr = addr.Bytes()
875+
ret, err = self.env.Call(closure, addr.Bytes(), args, gas, price, value)
875876
}
876877

877-
ret, err := self.env.Call(closure, executeAddr, args, gas, price, value)
878878
if err != nil {
879879
stack.Push(ethutil.BigFalse)
880880

@@ -914,7 +914,6 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
914914
default:
915915
vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
916916

917-
//panic(fmt.Sprintf("Invalid opcode %x", op))
918917
closure.ReturnGas(big.NewInt(1), nil)
919918

920919
return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
@@ -963,7 +962,3 @@ func (self *DebugVm) Endl() VirtualMachine {
963962
func (self *DebugVm) Env() Environment {
964963
return self.env
965964
}
966-
967-
func (self *DebugVm) Depth() int {
968-
return self.depth
969-
}

0 commit comments

Comments
 (0)