mirror of https://github.com/poanetwork/quorum.git
Squashed commit of the following:
commit779f25d36cAuthor: CJentzsch <jentzsch.software@gmail.com> Date: Thu Dec 11 22:59:56 2014 +0100 first random test commit68175386c0Author: CJentzsch <jentzsch.software@gmail.com> Date: Thu Dec 11 21:34:50 2014 +0100 update gas prices commitad322fbb58Author: CJentzsch <jentzsch.software@gmail.com> Date: Mon Dec 8 06:01:17 2014 +0100 Log as array commitf989f42618Author: CJentzsch <jentzsch.software@gmail.com> Date: Fri Dec 5 15:12:12 2014 +0100 state log tests commit4bc65d1129Author: CJentzsch <jentzsch.software@gmail.com> Date: Thu Dec 4 18:18:49 2014 +0100 add calldataload, codecopy, extcodecopy tests commit12cfae18e3Author: CJentzsch <jentzsch.software@gmail.com> Date: Thu Dec 4 15:57:56 2014 +0100 add calldataload test commit086caf3701Author: CJentzsch <jentzsch.software@gmail.com> Date: Wed Dec 3 08:31:03 2014 +0100 protocol update (CALLCODE <-> RETURN), topics in log are arrays not sets commite6c92673b9Author: CJentzsch <jentzsch.software@gmail.com> Date: Mon Dec 1 21:14:08 2014 +0100 update state tests with logs commit4089b809fbAuthor: CJentzsch <jentzsch.software@gmail.com> Date: Mon Dec 1 18:19:40 2014 +0100 update gas costs commitcfdca62277Merge:2e5175ef59f89dAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Dec 1 18:04:51 2014 +0100 Merge pull request #42 from negedzuregal/fix vmTest fix commitf59f89d876Author: alon muroch <alonmuroch@gmail.com> Date: Mon Dec 1 16:18:12 2014 +0100 vmEnvironmentalInfoTest CALLDATACOPY, CODECOPY, EXTCODECOPY fix commit68da13fe3eAuthor: alon muroch <alonmuroch@gmail.com> Date: Mon Dec 1 11:10:57 2014 +0100 vmArithmeticTest exp fix commit2e5175e818Author: ethers <ethereum@outlook.com> Date: Sun Nov 30 19:55:51 2014 +0100 add vmLogTest commitb5b9408e64Author: Heiko Heiko <heiko@heiko.org> Date: Sun Nov 30 16:27:27 2014 +0100 updated genesis to new header w/o min_gas_price commit8e69fbfa98Author: ethers <ethereum@outlook.com> Date: Fri Nov 21 17:42:05 2014 -0800 add special tests commit90f4f942e6Author: ethers <ethereum@outlook.com> Date: Thu Nov 20 19:01:09 2014 -0800 typo commitc5e5228e0dAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 20 17:04:06 2014 +0100 Removed log,post,out,gas,callcreates if exception occured commit9c0232a2b9Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 19 18:19:05 2014 +0100 MakeMoney test commit3ba0007e86Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 19 16:23:04 2014 +0100 Added log sections in all vmtests + log tests commitd84be4fe07Merge:c8497ab76d2542Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 19 10:00:24 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commitc8497ab257Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 19 10:00:02 2014 +0100 new push32 test and renaming commit76d25420e1Author: ethers <ethereum@outlook.com> Date: Mon Nov 17 18:59:30 2014 -0800 adding test commit0be275e757Merge:1d42d1dd90868cAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 17 22:47:34 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit1d42d1d7c6Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 17 22:46:51 2014 +0100 fix ecrecover2 commitd90868c307Merge:1f38c8c6dbcf6bAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 17 20:26:59 2014 +0100 Merge pull request #39 from wanderer/develop added test for max call depth on creation commit6dbcf6b0d6Author: wanderer <mjbecze@gmail.com> Date: Mon Nov 17 14:06:43 2014 -0500 spelling fix commit6fc07a7f81Author: wanderer <mjbecze@gmail.com> Date: Sat Nov 15 21:39:16 2014 -0500 added test for max call depth on creation commit1f38c8c0a2Merge:279b284cd85ca1Author: martin becze <wanderer@users.noreply.github.com> Date: Fri Nov 14 20:10:21 2014 -0500 Merge pull request #38 from wanderer/develop updated test 'jeff' in trietest.json commitcd85ca17edAuthor: martin becze <wanderer@users.noreply.github.com> Date: Fri Nov 14 19:59:34 2014 -0500 Update trietest.json commit279b284c0dMerge:89675a76cae937Author: martin becze <wanderer@users.noreply.github.com> Date: Fri Nov 14 17:43:49 2014 -0500 Merge pull request #37 from wanderer/develop Update trietest.json commit6cae937e5eAuthor: martin becze <wanderer@users.noreply.github.com> Date: Fri Nov 14 17:20:03 2014 -0500 Update trietest.json 'emptyValues' should have the same root as 'puppy' commit89675a7153Merge:f1de1cc32f0c47Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 13 23:17:49 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commitf1de1cc97aAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 13 23:17:13 2014 +0100 Fix CallRecursiveBomb2 commit32f0c47c68Merge:ab50e763da90d0Author: martin becze <wanderer@users.noreply.github.com> Date: Thu Nov 13 15:26:49 2014 -0500 Merge pull request #36 from wanderer/develop converted back to arrary format commitab50e76652Merge:d06b79278f1e4aAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> 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 commit3da90d01f6Author: wanderer <mjbecze@gmail.com> Date: Wed Nov 12 22:22:47 2014 -0500 converted back to arrary format commit78f1e4a945Author: ethers <ethereum@outlook.com> Date: Wed Nov 12 19:11:06 2014 -0800 rename tests since they are valid opcodes that exist commitd06b792cd0Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 12 07:00:17 2014 +0100 minor change in CallSha256_1_nonzeroValue test commitd434ecdcc3Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 12 06:56:31 2014 +0100 Added CallSha256_1_nonzeroValue test commit2c06f34cc0Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 11 18:10:26 2014 +0100 Store return value of call to precompiled contracts commit4b0c3b29aeAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 11 17:51:14 2014 +0100 Fix gas cost for OOG calls commit63bcca7604Author: Heiko Heiko <heiko@heiko.org> Date: Tue Nov 11 08:59:19 2014 +0100 fix: genesis test commit6e0310c1eaMerge:30c266c2927763Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 11 08:34:36 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit30c266caffAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 11 08:33:59 2014 +0100 jump to position outside code stops execution commit2927763d68Author: ethers <ethereum@outlook.com> Date: Mon Nov 10 14:10:22 2014 -0800 RandomTests were removed commita0fa91b2b8Merge:6092484fcba866Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 10 22:22:05 2014 +0100 Merge branch 'develop' of https://github.com/ethereum/tests into develop commit60924843f0Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 10 22:21:37 2014 +0100 Unintended Exceptions work like OOG commitfcba866721Author: ethers <TODO> Date: Thu Nov 6 14:19:59 2014 -0800 add StateTests commita441074ba4Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 6 17:54:36 2014 +0100 Updated precompiled contracts test commit0afa72c82bAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 6 15:27:45 2014 +0100 Added precompiledContracts tests commit6be83dd5a1Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 6 13:31:34 2014 +0100 Update gas cost for PoC7 commitc18b8ab2d3Merge:66c2e1f9a93258Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 6 09:19:53 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit66c2e1f642Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Nov 6 09:19:22 2014 +0100 Updated SIGNEXTEND tests commit9a9325822eAuthor: ethers <TODO> Date: Wed Nov 5 16:20:26 2014 -0800 part of9b4e768- Delete vmNamecoin.json commite229374f46Merge:189527e9b4e768Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 5 20:59:49 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit189527e563Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 5 20:59:20 2014 +0100 added dynamic jump out of code commit9b4e768995Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 5 20:41:54 2014 +0100 Delete vmNamecoin.json commit4669b5694bMerge:a567fedaaba185Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 5 15:00:12 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commita567fedaa7Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Nov 5 14:59:08 2014 +0100 added state systemOperationsTest commitaaba185cebMerge:79d7cbffa782aeAuthor: ethers <ethereum@outlook.com> Date: Tue Nov 4 12:15:40 2014 -0800 Merge pull request #32 from ethers/indexjs updates needed per restructure commitfa782aed93Author: ethers <TODO> Date: Tue Nov 4 11:28:56 2014 -0800 updates needed per restructure commit79d7cbfc4aMerge:91202741c1ba8dAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 4 13:32:11 2014 +0100 Merge remote-tracking branch 'origin/develop' into develop commit9120274a46Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Nov 4 13:31:27 2014 +0100 Update tests to latest protocol changes (PoC7) commit1c1ba8d161Merge:014d3703aebe53Author: Christoph Jentzsch <jentzsch.software@gmail.com> 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 commit3aebe532e5Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 3 13:58:21 2014 +0100 Updated vmNamecoin.json to new sstore prices commit8a0be21839Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 3 13:53:00 2014 +0100 Added example state test commit83643addbcAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 3 13:36:25 2014 +0100 removed systemoperationstests commit3930ca3a9aAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Nov 3 13:22:15 2014 +0100 Restructered tests in folders in accordance to test suites commit014d370b5dAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 29 21:23:56 2014 +0100 New SIGNEXTEND tets commit155d449be2Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 29 20:59:05 2014 +0100 New tests for BNOT and SIGNEXTEND commitc9eae764b8Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 28 12:58:27 2014 +0100 Update SSTORE gas cost and BNOT instead of NEG commitad2a75ac58Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Oct 23 16:05:49 2014 +0200 Added new recursive bombs commit834c52af64Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Thu Oct 23 12:01:05 2014 +0200 Changing gas cost to zero at stackunderflow commitc73a8a89d2Author: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Wed Oct 22 13:04:45 2014 +0200 Reverted back to original value. commitb9a8c92422Author: martin becze <wanderer@users.noreply.github.com> Date: Tue Oct 21 17:02:52 2014 -0400 fix spelling error commitb48ae74af4Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 21 17:26:26 2014 +0200 Added failing random tests commitbee0a4100cMerge:5050d20b315da6Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 21 17:15:05 2014 +0200 Merge remote-tracking branch 'origin/master' into develop commit5050d20b4dMerge:7516685ba35362Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Oct 20 20:18:20 2014 +0200 Merge pull request #26 from wanderer/develop Add a package.json for node.js commitba35362876Author: wanderer <mjbecze@gmail.com> Date: Sun Oct 19 23:59:47 2014 -0400 turned tests into a node module commit751668571eAuthor: ethers <ethereum@outlook.com> Date: Thu Oct 16 17:08:20 2014 -0700 json was invalid and missing quotes commit0e687cee47Author: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Thu Oct 16 17:13:24 2014 +0200 Update vmEnvironmentalInfoTest.json commit78a78e2e6cAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 15 14:19:11 2014 +0200 updated genesis_hash commitb315da618bMerge:7a7e1980a76a3aAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 14 10:33:26 2014 +0200 Merge pull request #23 from ethers/fix22 numbers should be strings #22 commit0a76a3a312Author: ethers <ethereum@outlook.com> Date: Mon Oct 13 14:45:30 2014 -0700 numbers should be strings #22 commit1f67385f13Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Sat Oct 11 13:18:00 2014 +0200 Added some MUL tests commit7a7e198395Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Sat Oct 11 13:11:59 2014 +0200 Added some MUL tests commit46eb6283aeAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Sat Oct 11 12:18:13 2014 +0200 tested new opcodes (JUMPDEST,CALLCODE) and created test for CALL/CREATE depth commit8d38d62d10Author: Nick Savers <nicksavers@gmail.com> Date: Fri Oct 10 18:09:41 2014 +0200 INVALID stops the operation and doesn't cost gas commited6eba7c8eAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 8 19:08:48 2014 +0200 Update + ABA recursive bomb which needs maximum recursion limit of 1024 commit2d72050db1Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 8 14:37:18 2014 +0200 Applied recent protocol changes (PoC7) to existin tests commitdfe66cab3fMerge:45136231a67a96Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 8 11:05:51 2014 +0200 Merge remote-tracking branch 'origin/develop' Conflicts: genesishashestest.json commit1a67a96cffMerge:a4f5f45ffd6bc9Author: vbuterin <v@buterin.com> Date: Tue Oct 7 15:10:23 2014 +0100 Merge pull request #18 from CJentzsch/develop CallToNameRegistratorOutOfGas balance correction commitffd6bc97adMerge:a4f5f459779d67Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 15:47:34 2014 +0200 Merge remote-tracking branch 'origin/develop' into develop commit9779d67b8cAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 15:45:53 2014 +0200 CallToNameRegistratorOutOfGas balance correction Even if execution fails, the value gets transferred. commita4f5f45228Merge:49a9f47b6d7cbaAuthor: vbuterin <v@buterin.com> Date: Tue Oct 7 14:13:12 2014 +0100 Merge pull request #17 from CJentzsch/develop Added A calls B calls A contracts commitb6d7cba499Merge:865cb4049a9f47Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 15:02:51 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit865cb4083dAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 15:02:36 2014 +0200 Added A calls B calls A contracts commit49a9f47aecMerge:3b0ec4394a493bAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Tue Oct 7 10:56:17 2014 +0200 Merge pull request #16 from CJentzsch/develop corrected amount of used gas for CallToNameRegistratorOutOfGas commit94a493b0d9Merge:72853c43b0ec43Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 10:51:32 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit72853c4382Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Oct 7 10:51:07 2014 +0200 corrected amount of used gas for CallToNameRegistratorOutOfGas commit3b0ec436e4Merge:aec3252222068bAuthor: vbuterin <v@buterin.com> Date: Tue Oct 7 05:52:43 2014 +0100 Merge pull request #15 from CJentzsch/develop corrected tests and different style for storage commit222068b9baMerge:c169653aec3252Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Oct 6 21:17:28 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commitc1696531a6Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Oct 6 21:17:09 2014 +0200 corrected tests and different style for storage commitaec3252b8eMerge:25f9fd5e17a909Author: vbuterin <v@buterin.com> Date: Mon Oct 6 09:39:46 2014 +0100 Merge pull request #14 from CJentzsch/develop corrected gas limit in vmSystemOperationsTest commite17a909f70Merge:33fcab525f9fd5Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Oct 6 10:31:51 2014 +0200 Merge remote-tracking branch 'upstream/develop' into develop commit33fcab5727Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Oct 6 10:30:04 2014 +0200 Bug fix, corrected gasLimit in vmSystemOperationsTest commit25f9fd542aAuthor: Vitalik Buterin <v@buterin.com> Date: Sat Oct 4 15:47:00 2014 -0400 one more vm test commit2d561a5373Author: Vitalik Buterin <v@buterin.com> Date: Sat Oct 4 15:15:37 2014 -0400 separated out vmtests commitb0c48fa8d6Merge:cb8261a6cae166Author: vbuterin <v@buterin.com> 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. commit6cae166f6fAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 1 15:34:23 2014 +0200 Delete tmp.json commit4ff906fbc2Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Wed Oct 1 14:06:32 2014 +0200 corrected CALLSTATELESS tests commit5b3fee6806Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Sep 29 13:08:44 2014 +0200 Completed vm tests. Added ADDMOD, MULMOD, POST, CALLSTATELESS commit9cdd218083Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Sat Sep 27 21:48:09 2014 +0200 Added IOandFlowOperation-, PushDupSwap- and SystemOperations- tests. Removed empty storage from adresses. commit28ed968b46Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Sep 23 15:49:22 2014 +0200 Added blockInfoTest commitffbd5a35b5Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Tue Sep 23 15:37:52 2014 +0200 Added environmentalInfo- and sha3- test commit54c14f1ff3Author: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Mon Sep 22 13:06:57 2014 +0200 Added bitwise logic operation test commitd0af113aabAuthor: Christoph Jentzsch <jentzsch.software@gmail.com> Date: Sat Sep 20 01:42:51 2014 +0200 Added vm arithmetic test commitcb8261a78bAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Fri Sep 19 13:15:44 2014 +0200 Update genesishashestest.json commit4513623da1Author: Maran <maran.hidskes@gmail.com> Date: Tue Jul 22 12:24:46 2014 +0200 Update keyaddrtest to be valid JSON commite8cb5c221dAuthor: Vitalik Buterin <v@buterin.com> Date: Mon Jul 21 23:30:33 2014 -0400 Added next/prev trie test commit98823c04b3Author: Vitalik Buterin <v@buterin.com> Date: Mon Jul 14 02:51:31 2014 -0400 Replaced with deterministic test commit357eb21e4dAuthor: Vitalik Buterin <v@buterin.com> Date: Sun Jul 13 16:12:56 2014 -0400 Added my own random and namecoin tests (pyethereum) commit00cd0cce8fAuthor: Gav Wood <i@gavwood.com> Date: Sat Jul 12 21:20:04 2014 +0200 Output hex strings. commitddfa3af45dAuthor: Gav Wood <i@gavwood.com> Date: Thu Jul 10 11:28:35 2014 +0100 Everything a string. commitd659f469a9Author: Gav Wood <i@gavwood.com> Date: Thu Jul 10 10:16:25 2014 +0100 Code fixes. commit5e83ea8228Author: Gav Wood <i@gavwood.com> Date: Sun Jul 6 16:17:12 2014 +0200 Prettier VM tests. commita09aae0efeAuthor: Gav Wood <i@gavwood.com> Date: Sun Jul 6 15:46:01 2014 +0200 Fix VM tests. commitec9a044a17Merge:4bb64615e0123fAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Fri Jul 4 15:56:52 2014 +0200 Merge pull request #10 from romanman/patch-1 Update vmtests.json commit5e0123fbe1Author: romanman <roman.mandeleil@gmail.com> Date: Fri Jul 4 10:23:04 2014 +0100 Update vmtests.json commit2b6da2f5f2Author: romanman <roman.mandeleil@gmail.com> Date: Thu Jul 3 17:45:04 2014 +0100 Update vmtests.json arith testcase updated commit4bb646117dMerge:bba3898a33b309Author: Gav Wood <i@gavwood.com> Date: Wed Jul 2 19:43:22 2014 +0200 Merge branch 'develop' of github.com:/ethereum/tests into develop commitbba38980bdAuthor: Gav Wood <i@gavwood.com> Date: Wed Jul 2 19:43:06 2014 +0200 New tests. commita33b309d99Author: Vitalik Buterin <v@buterin.com> Date: Wed Jul 2 10:14:05 2014 -0400 Testing submodules commit50318217caAuthor: Vitalik Buterin <v@buterin.com> Date: Wed Jul 2 10:10:46 2014 -0400 Testing submodules commit57fa655522Author: Vitalik Buterin <v@buterin.com> Date: Wed Jul 2 10:09:08 2014 -0400 Testing submodules commitea0eb0a8c8Author: Gav Wood <i@gavwood.com> Date: Tue Jul 1 15:19:34 2014 +0200 Latest genesis block. commit25bb76b69cAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Mon Jun 30 13:25:04 2014 +0200 Reset commit74c6d8424eAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Mon Jun 30 12:10:06 2014 +0200 Updated wrong test commit9ea3a60291Author: Jeffrey Wilcke <obscuren@users.noreply.github.com> Date: Sat Jun 28 18:48:28 2014 +0200 Fixed roots commit5fc3ac0e92Author: Gav Wood <i@gavwood.com> Date: Sat Jun 28 18:40:06 2014 +0200 Simple hex test. commitedd3a00c2aAuthor: Gav Wood <i@gavwood.com> Date: Sat Jun 28 18:22:18 2014 +0200 Additional test for jeff. Now use the 0x... notation. commit5021e0dd83Author: Gav Wood <i@gavwood.com> Date: Fri Jun 27 21:35:26 2014 +0200 VM test framework updated. commitc818d13202Author: Gav Wood <i@gavwood.com> 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. commit714770ffb3Author: Gav Wood <i@gavwood.com> Date: Wed Jun 11 11:32:42 2014 +0100 Added Gav's new address. commit9345bc13d4Merge:a2257f378576ddAuthor: Gav Wood <i@gavwood.com> Date: Fri May 30 17:50:38 2014 +0200 Merge branch 'master' of github.com:ethereum/tests into develop commita2257f3471Author: Gav Wood <i@gavwood.com> Date: Fri May 30 17:50:18 2014 +0200 VM tests. commit78576dd3d3Author: Heiko Heiko <heiko@heiko.org> Date: Fri May 30 17:19:09 2014 +0200 changes based on new account structure nonce, balance, storage, code commit125839e848Merge:42e14ec356a329Author: Jeffrey Wilcke <obscuren@users.noreply.github.com> 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 commit356a3296bcAuthor: Ben Kirwin <ben@kirw.in> 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. commit42e14ec54fAuthor: Chen Houwu <chenhouwu@gmail.com> Date: Wed May 21 23:27:40 2014 +0800 revert to correct data commit4300197a74Author: Chen Houwu <chenhouwu@gmail.com> Date: Wed May 21 22:42:23 2014 +0800 fix: wrong sha3 hash because of the wrong rlp hex commita0d01b1a0bAuthor: Chen Houwu <chenhouwu@gmail.com> Date: Wed May 21 22:29:53 2014 +0800 fix: wrong rlp hex commit6bc2fc7405Merge:66bc366c31a93cAuthor: Jeffrey Wilcke <obscuren@users.noreply.github.com> 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 commitc31a93c27aAuthor: ethers <ethereum@outlook.com> Date: Tue May 20 15:42:39 2014 -0700 fix file name that seems to have been a typo commit66bc3665c1Author: Heiko Heiko <heiko@heiko.org> Date: Tue May 20 17:36:35 2014 +0200 fix: represent integers as strings commitede5499da6Author: Heiko Heiko <heiko@heiko.org> Date: Tue May 20 17:21:09 2014 +0200 add: current initial alloc and genesis hashes commit5131429abbAuthor: Ben Kirwin <ben@kirw.in> Date: Mon May 19 11:18:31 2014 -0400 Delete a comma This should now be parseable as JSON. commitf44a859331Author: Chen Houwu <chenhouwu@gmail.com> Date: Sun May 18 15:04:42 2014 +0800 add: case when value is long, ensure it's not get rlp encoded as node commite1ae4ad449Author: Gav Wood <i@gavwood.com> Date: Mon May 12 14:40:47 2014 +0100 PoC-5 VM tests. commit2b6c136ddaAuthor: Vitalik Buterin <v@buterin.com> Date: Sun May 11 21:42:41 2014 -0400 Moved txt to json commitcbccbf977cMerge:edbb8d445a0974Author: Vitalik Buterin <v@buterin.com> Date: Thu May 8 21:54:48 2014 -0400 New commit commitedbb8d407eAuthor: Vitalik Buterin <v@buterin.com> Date: Tue May 6 16:53:43 2014 -0400 Removed unneeded test, added new tests commit45a0974f6fMerge:15dd8fd5fd2a98Author: Gav Wood <i@gavwood.com> Date: Sun Apr 27 12:53:47 2014 +0100 Merge pull request #3 from autolycus/develop Fixed formatting and added test cases commit5fd2a98fcbAuthor: Carl Allendorph <callendorph@gmail.com> Date: Sat Apr 19 13:26:14 2014 -0700 Added some new test cases for the rlp encoding. commit4ba150954eAuthor: Carl Allendorph <callendorph@gmail.com> Date: Sat Apr 19 12:48:42 2014 -0700 Converted spaces to tabs to be compliant with the coding standards defined in cpp-ethereum commit15dd8fd794Author: Gav Wood <i@gavwood.com> Date: Fri Feb 28 12:54:47 2014 +0000 RLP tests and Trie updates. commit33f80fef21Author: Gav Wood <i@gavwood.com> Date: Fri Feb 28 11:39:35 2014 +0000 Hex encode tests done. commite1f5e12abbAuthor: Gav Wood <i@gavwood.com> Date: Fri Feb 28 11:22:49 2014 +0000 Fix RLP tests. commitf87ce15ad2Author: Gav Wood <i@gavwood.com> Date: Thu Feb 27 13:28:11 2014 +0000 Fix empty string. commitc006ed4ffdAuthor: Gav Wood <i@gavwood.com> Date: Mon Feb 24 10:24:39 2014 +0000 Tests fix. commit510ff56363Author: Gav Wood <i@gavwood.com> Date: Fri Feb 21 18:54:08 2014 +0000 Updated the tests. commita0ec843832Author: Gav Wood <i@gavwood.com> Date: Fri Feb 21 18:49:24 2014 +0000 Moved over to new format, but RLP tests still need updating. commit660cd26f31Author: Gav Wood <i@gavwood.com> Date: Fri Feb 21 18:35:51 2014 +0000 More docs. commit6ad14c1a15Author: Gav Wood <i@gavwood.com> Date: Fri Feb 21 18:33:39 2014 +0000 Added VM test suite. Added TODO. Renamed old files. commitf91ad7b385Author: Vitalik Buterin <v@buterin.com> Date: Wed Jan 8 11:26:58 2014 -0500 update trie algorithm commit6da2954462Merge:cc42246131c610Author: Vitalik Buterin <v@buterin.com> Date: Wed Jan 8 08:15:38 2014 -0500 merge commitcc4224675fAuthor: Vitalik Buterin <v@buterin.com> Date: Tue Jan 7 14:35:26 2014 -0500 Updated trie test commit131c610da6Merge:121632b7613302Author: vbuterin <v@buterin.com> Date: Wed Jan 1 06:40:54 2014 -0800 Merge pull request #1 from obscuren/master Update trietest.txt commit7613302b49Author: obscuren <obscuren@users.noreply.github.com> Date: Wed Jan 1 15:25:21 2014 +0100 Update trietest.txt New proposed explanatory format commit121632beddAuthor: Vitalik Buterin <v@buterin.com> Date: Wed Jan 1 08:26:18 2014 -0500 Added obscure's tests commitef6c5506c3Author: Vitalik Buterin <v@buterin.com> Date: Tue Dec 31 19:04:48 2013 -0500 Fixed tests a bit commit345e4bcfefMerge:2c81698e4bbea4Author: Vitalik Buterin <v@buterin.com> Date: Tue Dec 31 15:52:46 2013 -0500 Merge branch 'master' of github.com:ethereum/tests commit2c81698f31Author: Vitalik Buterin <v@buterin.com> Date: Mon Dec 30 21:09:40 2013 -0500 Added first three tests commite4bbea400fAuthor: vbuterin <v@buterin.com> Date: Mon Dec 30 18:09:03 2013 -0800 Initial commit
This commit is contained in:
obscuren
parent
2b5fcb4642
commit
0d57ca486a
|
|
@ -32,7 +32,7 @@ func (self *Execution) Call(codeAddr []byte, caller vm.ClosureRef) ([]byte, erro
|
|||
return self.exec(code, codeAddr, caller)
|
||||
}
|
||||
|
||||
func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
|
||||
func (self *Execution) exec(code, contextAddr []byte, caller vm.ClosureRef) (ret []byte, err error) {
|
||||
env := self.vm.Env()
|
||||
chainlogger.Debugf("pre state %x\n", env.State().Root())
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ func (self *Execution) exec(code, caddr []byte, caller vm.ClosureRef) (ret []byt
|
|||
} else {
|
||||
self.object = to
|
||||
// Pre-compiled contracts (address.go) 1, 2 & 3.
|
||||
naddr := ethutil.BigD(caddr).Uint64()
|
||||
naddr := ethutil.BigD(contextAddr).Uint64()
|
||||
if p := vm.Precompiled[naddr]; p != nil {
|
||||
if self.Gas.Cmp(p.Gas(len(self.input))) >= 0 {
|
||||
ret = p.Call(self.input)
|
||||
|
|
|
|||
|
|
@ -726,14 +726,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1232",
|
||||
"balance" : "1182",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898768",
|
||||
"balance" : "999999999999898818",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -796,14 +796,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1236",
|
||||
"balance" : "1286",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898764",
|
||||
"balance" : "999999999999898714",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -866,14 +866,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1236",
|
||||
"balance" : "1286",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898764",
|
||||
"balance" : "999999999999898714",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1070,19 +1070,18 @@
|
|||
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060036101f4f1600255600051600055",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x953450193f7389363135b31dc0f371f22f3947db",
|
||||
"0x02" : "0x01"
|
||||
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
|
||||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "32484",
|
||||
"balance" : "32684",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999867516",
|
||||
"balance" : "999999999999867316",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1214,14 +1213,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1232",
|
||||
"balance" : "1182",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898768",
|
||||
"balance" : "999999999999898818",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1284,14 +1283,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1232",
|
||||
"balance" : "1182",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898768",
|
||||
"balance" : "999999999999898818",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1354,14 +1353,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1236",
|
||||
"balance" : "1286",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898764",
|
||||
"balance" : "999999999999898714",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1424,14 +1423,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "1236",
|
||||
"balance" : "1286",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999898764",
|
||||
"balance" : "999999999999898714",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -1628,19 +1627,18 @@
|
|||
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f42406000600060026101f4f1600255600051600055",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
"0x" : "0x739d5000bbe364e92a2fe28d62c17a6dfd4f32105420c30b97ec0180300a2dae",
|
||||
"0x02" : "0x01"
|
||||
"0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
|
||||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "32484",
|
||||
"balance" : "32684",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999867516",
|
||||
"balance" : "999999999999867316",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
|
|||
|
|
@ -5144,14 +5144,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "917",
|
||||
"balance" : "997",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999899083",
|
||||
"balance" : "999999999999899003",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -5388,14 +5388,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "507",
|
||||
"balance" : "512",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999899493",
|
||||
"balance" : "999999999999899488",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -5449,14 +5449,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "507",
|
||||
"balance" : "517",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999899493",
|
||||
"balance" : "999999999999899483",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
@ -5510,14 +5510,14 @@
|
|||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "508",
|
||||
"balance" : "673",
|
||||
"code" : "0x",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "999999999999899492",
|
||||
"balance" : "999999999999899327",
|
||||
"code" : "0x",
|
||||
"nonce" : "1",
|
||||
"storage" : {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
{
|
||||
"randomVMtest" : {
|
||||
"callcreates" : [
|
||||
],
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "256",
|
||||
"currentGasLimit" : "1000000",
|
||||
"currentNumber" : "0",
|
||||
"currentTimestamp" : "1",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"exec" : {
|
||||
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
|
||||
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"code" : "0x675545",
|
||||
"data" : "0x",
|
||||
"gas" : "10000",
|
||||
"gasPrice" : "100000000000000",
|
||||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "9999",
|
||||
"logs" : [
|
||||
],
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x675545",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"pre" : {
|
||||
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
|
||||
"balance" : "1000000000000000000",
|
||||
"code" : "0x675545",
|
||||
"nonce" : "0",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
|
||||
"value" : "1000000000000000000"
|
||||
},
|
||||
"gas" : "99999999677",
|
||||
"gas" : "99999999687",
|
||||
"logs" : [
|
||||
],
|
||||
"out" : "0x",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ const (
|
|||
|
||||
var (
|
||||
GasStep = big.NewInt(1)
|
||||
GasSha = big.NewInt(20)
|
||||
GasSha = big.NewInt(10)
|
||||
GasSLoad = big.NewInt(20)
|
||||
GasSStore = big.NewInt(100)
|
||||
GasSStoreRefund = big.NewInt(100)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import "math/big"
|
|||
type VirtualMachine interface {
|
||||
Env() Environment
|
||||
Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
|
||||
Depth() int
|
||||
Printf(string, ...interface{}) VirtualMachine
|
||||
Endl() VirtualMachine
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,8 +25,6 @@ type DebugVm struct {
|
|||
Fn string
|
||||
|
||||
Recoverable bool
|
||||
|
||||
depth int
|
||||
}
|
||||
|
||||
func NewDebugVm(env Environment) *DebugVm {
|
||||
|
|
@ -116,7 +114,7 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
|
|||
return closure.Return(nil), nil
|
||||
}
|
||||
|
||||
vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.depth, closure.Address(), closure.Gas, callData)
|
||||
vmlogger.Debugf("(%d) %x gas: %v (d) %x\n", self.env.Depth(), closure.Address(), closure.Gas, callData)
|
||||
|
||||
for {
|
||||
prevStep = step
|
||||
|
|
@ -867,14 +865,16 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
|
|||
// Get the arguments from the memory
|
||||
args := mem.Get(inOffset.Int64(), inSize.Int64())
|
||||
|
||||
var executeAddr []byte
|
||||
var (
|
||||
ret []byte
|
||||
err error
|
||||
)
|
||||
if op == CALLCODE {
|
||||
executeAddr = closure.Address()
|
||||
ret, err = self.env.CallCode(closure, addr.Bytes(), args, gas, price, value)
|
||||
} else {
|
||||
executeAddr = addr.Bytes()
|
||||
ret, err = self.env.Call(closure, addr.Bytes(), args, gas, price, value)
|
||||
}
|
||||
|
||||
ret, err := self.env.Call(closure, executeAddr, args, gas, price, value)
|
||||
if err != nil {
|
||||
stack.Push(ethutil.BigFalse)
|
||||
|
||||
|
|
@ -914,7 +914,6 @@ func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *
|
|||
default:
|
||||
vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
|
||||
|
||||
//panic(fmt.Sprintf("Invalid opcode %x", op))
|
||||
closure.ReturnGas(big.NewInt(1), nil)
|
||||
|
||||
return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
|
||||
|
|
@ -963,7 +962,3 @@ func (self *DebugVm) Endl() VirtualMachine {
|
|||
func (self *DebugVm) Env() Environment {
|
||||
return self.env
|
||||
}
|
||||
|
||||
func (self *DebugVm) Depth() int {
|
||||
return self.depth
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue