Close #444: Add evm debugger #452

nevgeny · 2019-01-22T21:49:54Z

No description provided.

…ad#409

…rations

…lu-evm

Close expload#418: cli evm

Vovapolu evm

pr

vovapolu · 2019-01-28T10:50:38Z

build.sbt

@@ -152,7 +152,7 @@ lazy val `vm-asm` = (project in file("vm-asm"))

 lazy val evm = (project in file("evm")).
  dependsOn(`vm-asm`).
-  dependsOn(vm % "test->test").
+  dependsOn(vm  % "compile->compile;test->test").


Suggested change

dependsOn(vm % "compile->compile;test->test").

dependsOn(vm % "compile->compile;test->test").

vovapolu · 2019-01-28T10:58:50Z

evm/src/main/scala/pravda/evm/debug/DebugVm.scala

+                   memory: Memory,
+                   wattCounter: WattCounter,
+                   pcallAllowed: Boolean): Unit =
+    throw new Exception("It's debug vm. You can't use pcall, lcall opcodes")


That's bad, it's necessary feature

vovapolu · 2019-01-28T11:19:35Z

evm/src/main/scala/pravda/evm/debug/Debugger.scala

+import pravda.vm.impl.MemoryImpl
+import pravda.vm.sandbox.VmSandbox.StorageSandbox
+
+trait Debugger[State] {


Suggested change

trait Debugger[State] {

trait Debugger[S] {

vovapolu · 2019-01-28T11:21:14Z

evm/src/main/scala/pravda/evm/debug/DebugVm.scala

+import pravda.vm.sandbox.VmSandbox.StorageSandbox
+
+//'extends Vm' is required for using 'this' in SystemOperation constructor
+trait DebugVm extends Vm {


use aggregation, not inheritance here

vovapolu · 2019-01-28T11:24:53Z

evm/src/main/scala/pravda/evm/debug/VmImplDebug.scala

+      new SystemOperations(program, mem, maybeStorage, counter, env, maybePA, StandardLibrary.Index, this)
+    val dataOperations = new DataOperations(mem, counter)
+
+    val Some(storage) = maybeStorage


vovapolu · 2019-01-28T12:00:05Z

evm/src/main/scala/pravda/evm/debug/evm/EvmDebugger.scala

+  }
+
+  def showDebugLogContainer(implicit showDebugLog: Show[DebugLog]): cats.Show[List[DebugLog]] =
+    l =>


.map(...).mkString?

It isn't flexible. Better to use type class and configure output in it

I mean you can rewrite your code to more readable version

vovapolu · 2019-01-28T12:04:06Z

evm/src/test/scala/pravda/evm/translate/opcode/DebuggerDemo.scala

+        `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")),


Suggested change

//stack = Seq(Data.Primitive.Int64(10), Data.Primitive.Utf8("set")),

vovapolu · 2019-01-28T12:04:18Z

evm/src/test/scala/pravda/evm/translate/opcode/DebuggerDemo.scala

+
+      val Right(output) = EvmSandboxDebug.debugAddressedCode(preconditions, ops, abi)
+
+      println(output)


vovapolu · 2019-01-28T12:04:42Z

evm/src/test/scala/pravda/evm/translate/opcode/TranslateTests.scala

-import pravda.evm.parse.Parser
-import pravda.evm.{readSolidityABI, readSolidityBinFile}
-import pravda.evm.translate.Translator
+//import pravda.evm.abi.parse.AbiParser


vovapolu · 2019-01-28T12:04:55Z

evm/src/test/scala/pravda/evm/translate/opcode/TranslateTests.scala

@@ -33,13 +34,15 @@ object TranslateTests extends TestSuite {
      }
    }

-    'Contracts - {
+    /*  'Contracts - {


We often change our translator. Change these test very exhausting.

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

vovapolu · 2019-01-28T12:05:58Z

Rebase on the current version of the master

vovapolu · 2019-01-28T13:54:05Z

doc/standard-library/read-evm-word.md

@@ -0,0 +1,15 @@
+<!--


Remove these files, they are outdated

vovapolu · 2019-01-28T13:54:17Z

evm/src/main/scala/pravda/evm/debug/DebugVm.scala

+import pravda.vm.impl.MemoryImpl
+import pravda.vm.sandbox.VmSandbox.StorageSandbox
+
+//'extends Vm' is required for using 'this' in SystemOperation constructor


Suggested change

//'extends Vm' is required for using 'this' in SystemOperation constructor

vovapolu · 2019-01-28T13:55:15Z

evm/src/main/scala/pravda/evm/debug/VmSandboxDebug.scala

+import pravda.vm
+import pravda.vm._
+import pravda.vm.impl.{MemoryImpl, WattCounterImpl}
+import pravda.vm.sandbox.VmSandbox


Suggested change

import pravda.vm.sandbox.VmSandbox

vovapolu · 2019-01-28T13:55:29Z

evm/src/main/scala/pravda/evm/debug/VmSandboxDebug.scala

+
+    val effects = mutable.Buffer[vm.Effect]()
+    val environmentS: Environment = environment(input, effects, pExecutor)
+    val storage = new VmSandbox.StorageSandbox(Address.Void, effects, input.storage.toSeq)


Suggested change

val storage = new VmSandbox.StorageSandbox(Address.Void, effects, input.storage.toSeq)

val storage = new StorageSandbox(Address.Void, effects, input.storage.toSeq)

vovapolu · 2019-01-28T13:56:14Z

evm/src/main/scala/pravda/evm/debug/evm/EvmDebugger.scala

+    }
+  }
+
+  private def t(count: Int)(s: String) = "\t" * count + s


move it inside debugLogShow

vovapolu · 2019-01-28T13:58:03Z

evm/src/test/scala/pravda/evm/translate/opcode/TranslateTests.scala

@@ -33,13 +34,15 @@ object TranslateTests extends TestSuite {
      }
    }

-    'Contracts - {
+    /*  'Contracts - {


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

vovapolu · 2019-01-28T13:58:21Z

evm/src/test/scala/pravda/evm/translate/opcode/TranslateTests.scala


      'SimpleStorage - {
        val Right(ops) = Parser.parseWithIndices(readSolidityBinFile("SimpleStorage/SimpleStorage.bin"))
        val Right(abi) = AbiParser.parseAbi(readSolidityABI("SimpleStorage/SimpleStorage.abi"))
        val Right(asm) = Translator.translateActualContract(ops, abi)

+        println()


nevgeny and others added 30 commits December 11, 2018 15:09

Fix tests expload#387

bfe5c71

Fix tests №387

0c25cfa

Add test expload#387

bd8a9e2

Bump dotnet version and publish symbols expload#410

50a511c

Include Pravda.pdb to nuget package expload#410

d189efc

Fix dotnet translator, analyse typedefs in each file separately explo…

ba31acb

…ad#409

[WIP] Add translation test, convert everything to bytes in simple ope…

c904358

…rations

[WIP] Make opcodes to handle only Bytes

76db327

Add memory emulation. Fix tests. Format sources expload#387

89cbbee

[WIP] Continue to translate SimpleStorage

dbc538e

[WIP] Playing with calldata

fde9062

Remove unused imports expload#387

953cfc1

[WIP] Working prototype, tests don't work

f7f3ab6

Fix tests

4bdc66f

Fix all evm tests

a6f97b4

Fix all tests

0fb8697

Merge remote-tracking branch 'origin/i245-evm-translator' into vovapo…

2e853e2

…lu-evm

Add new type in abi parser. Add Sha3 translation expload#417

faabeb1

Add SimpleToken.sl

f96639f

Add evm parser and abi parser tests, add sha3 stdlib func

0d883ed

[WIP] Add SimpleToken test

1d3d01e

[WIP] Add evm cli command expload#418

5c48939

Add tests for balanceOf, transfer in SimpleToken

79cad98

Convert result bytes to appropriate Pravda VM type, fix tests

3acb30c

Fix evm cli command expload#418

fc64733

Merge remote-tracking branch 'origin/i418-cli-evm' into vovapolu-evm

447dd9e

Refactor tests, move source files, recompile SimpleStorage

3f18b2a

Add documentation expload#418

2249da6

Remove unneccesary stdlib func, rename stdlib funcs, fix evm tests

95cca81

Add file name checks expload#418

cbdc78f

nevgeny and others added 17 commits December 27, 2018 12:31

Merge branch 'vovapolu-evm' into i418-cli-evm

13a66f2

Format sources. Fix documentation expload#418

ecd4160

Add headers expload#418

676d08f

Format sources expload#418

21002b4

Merge pull request expload#428 from expload/i418-cli-evm

b7f6e42

Close expload#418: cli evm

Merge pull request #7 from expload/vovapolu-evm

bd510bd

Vovapolu evm

Add evm debugger expload#444

7ec9f56

Format sources. Move VmSandbox to compile. Fix bugs expload#444

88f0800

Merge remote-tracking branch 'origin/i444-evm-debugger'

94db51e

Merge branch 'master' into i444-evm-debugger

3084b33

Merge pull request #8 from expload/master

b084bb9

pr

Merge remote-tracking branch 'origin/master'

6592554

Merge branch 'i444-evm-debugger'

f69a89f

Merge branch 'master' into i444-evm-debugger

ac1065b

Format sources expload#444

f283e51

Format sources expload#444

b7838fa

Try to Either expload#444

3ecd693

vovapolu suggested changes Jan 28, 2019

View reviewed changes

nevgeny added 2 commits January 28, 2019 18:24

Format sources. List to ListBuffer expload#444

ec9c9df

Format sources expload#444

40381ad

vovapolu suggested changes Jan 28, 2019

View reviewed changes

nevgeny added 4 commits January 28, 2019 19:33

Remove old docs expload#444

e71c635

def to val expload#444

ed5bd36

Re-generate some docs expload#444

44dd91a

Add cli command expload#444

2a48a6f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Close #444: Add evm debugger #452

Close #444: Add evm debugger #452

nevgeny commented Jan 22, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

nevgeny Jan 28, 2019

vovapolu Jan 28, 2019 •

edited

Loading

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

nevgeny Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu commented Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

vovapolu Jan 28, 2019

	dependsOn(vm % "compile->compile;test->test").
	dependsOn(vm % "compile->compile;test->test").


		val Right(output) = EvmSandboxDebug.debugAddressedCode(preconditions, ops, abi)

		println(output)

	val storage = new VmSandbox.StorageSandbox(Address.Void, effects, input.storage.toSeq)
	val storage = new StorageSandbox(Address.Void, effects, input.storage.toSeq)

Close #444: Add evm debugger #452

Are you sure you want to change the base?

Close #444: Add evm debugger #452

Conversation

nevgeny commented Jan 22, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vovapolu Jan 28, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vovapolu commented Jan 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vovapolu Jan 28, 2019 •

edited

Loading