Close #444: Add evm debugger - #452
Open
nevgeny wants to merge 53 commits into
Open
Conversation
Close expload#418: cli evm
Vovapolu evm
vovapolu
suggested changes
Jan 28, 2019
| lazy val evm = (project in file("evm")). | ||
| dependsOn(`vm-asm`). | ||
| dependsOn(vm % "test->test"). | ||
| dependsOn(vm % "compile->compile;test->test"). |
Contributor
There was a problem hiding this comment.
Suggested change
| dependsOn(vm % "compile->compile;test->test"). | |
| dependsOn(vm % "compile->compile;test->test"). |
| memory: Memory, | ||
| wattCounter: WattCounter, | ||
| pcallAllowed: Boolean): Unit = | ||
| throw new Exception("It's debug vm. You can't use pcall, lcall opcodes") |
Contributor
There was a problem hiding this comment.
That's bad, it's necessary feature
| import pravda.vm.impl.MemoryImpl | ||
| import pravda.vm.sandbox.VmSandbox.StorageSandbox | ||
|
|
||
| trait Debugger[State] { |
Contributor
There was a problem hiding this comment.
Suggested change
| trait Debugger[State] { | |
| trait Debugger[S] { |
| import pravda.vm.sandbox.VmSandbox.StorageSandbox | ||
|
|
||
| //'extends Vm' is required for using 'this' in SystemOperation constructor | ||
| trait DebugVm extends Vm { |
Contributor
There was a problem hiding this comment.
use aggregation, not inheritance here
| new SystemOperations(program, mem, maybeStorage, counter, env, maybePA, StandardLibrary.Index, this) | ||
| val dataOperations = new DataOperations(mem, counter) | ||
|
|
||
| val Some(storage) = maybeStorage |
| } | ||
|
|
||
| def showDebugLogContainer(implicit showDebugLog: Show[DebugLog]): cats.Show[List[DebugLog]] = | ||
| l => |
Contributor
Author
There was a problem hiding this comment.
It isn't flexible. Better to use type class and configure output in it
Contributor
There was a problem hiding this comment.
I mean you can rewrite your code to more readable version
| `watts-limit` = 100000L, | ||
| stack = Seq(Data.Primitive.Utf8("get")), | ||
| storage = Map(evmWord(Array(0)) -> evmWord(Array(1))) | ||
| //stack = Seq(Data.Primitive.Int64(10), Data.Primitive.Utf8("set")), |
Contributor
There was a problem hiding this comment.
Suggested change
| //stack = Seq(Data.Primitive.Int64(10), Data.Primitive.Utf8("set")), |
|
|
||
| val Right(output) = EvmSandboxDebug.debugAddressedCode(preconditions, ops, abi) | ||
|
|
||
| println(output) |
| import pravda.evm.parse.Parser | ||
| import pravda.evm.{readSolidityABI, readSolidityBinFile} | ||
| import pravda.evm.translate.Translator | ||
| //import pravda.evm.abi.parse.AbiParser |
| } | ||
|
|
||
| 'Contracts - { | ||
| /* 'Contracts - { |
Contributor
Author
There was a problem hiding this comment.
We often change our translator. Change these test very exhausting.
Contributor
There was a problem hiding this comment.
that's why we should rewrite them to plaintest, leave it for now, but it's an important thing we should implement before expanding our tests
Contributor
|
Rebase on the current version of the master |
vovapolu
suggested changes
Jan 28, 2019
| @@ -0,0 +1,15 @@ | |||
| <!-- | |||
Contributor
There was a problem hiding this comment.
Remove these files, they are outdated
| import pravda.vm.impl.MemoryImpl | ||
| import pravda.vm.sandbox.VmSandbox.StorageSandbox | ||
|
|
||
| //'extends Vm' is required for using 'this' in SystemOperation constructor |
Contributor
There was a problem hiding this comment.
Suggested change
| //'extends Vm' is required for using 'this' in SystemOperation constructor |
| import pravda.vm | ||
| import pravda.vm._ | ||
| import pravda.vm.impl.{MemoryImpl, WattCounterImpl} | ||
| import pravda.vm.sandbox.VmSandbox |
Contributor
There was a problem hiding this comment.
Suggested change
| import pravda.vm.sandbox.VmSandbox |
|
|
||
| val effects = mutable.Buffer[vm.Effect]() | ||
| val environmentS: Environment = environment(input, effects, pExecutor) | ||
| val storage = new VmSandbox.StorageSandbox(Address.Void, effects, input.storage.toSeq) |
Contributor
There was a problem hiding this comment.
Suggested change
| val storage = new VmSandbox.StorageSandbox(Address.Void, effects, input.storage.toSeq) | |
| val storage = new StorageSandbox(Address.Void, effects, input.storage.toSeq) |
| } | ||
| } | ||
|
|
||
| private def t(count: Int)(s: String) = "\t" * count + s |
Contributor
There was a problem hiding this comment.
move it inside debugLogShow
| } | ||
|
|
||
| 'Contracts - { | ||
| /* 'Contracts - { |
Contributor
There was a problem hiding this comment.
that's why we should rewrite them to plaintest, leave it for now, but it's an important thing we should implement before expanding our tests
| val Right(abi) = AbiParser.parseAbi(readSolidityABI("SimpleStorage/SimpleStorage.abi")) | ||
| val Right(asm) = Translator.translateActualContract(ops, abi) | ||
|
|
||
| println() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.