implement Hofmann structure #169

TheReturnOfJan · 2020-01-05T14:12:47Z

resolves #118

troggy · 2020-01-05T14:18:10Z

why you are removing fixtures? 🤔

TheReturnOfJan · 2020-01-05T15:36:08Z

This is very much WIP. I made the PR so I have a nice diff to look at. I will announce when it's ready for review.

troggy · 2020-01-05T17:32:11Z

cool. go go go 🚀

johannbarbie · 2020-01-06T08:48:22Z

i have this one failing test:


  1) Runtime
       initAndExecute
         CALL transfer - successful transfer:

      AssertionError [ERR_ASSERTION]: tokenBag
      + expected - actual

seems easy to fix, need help?

TheReturnOfJan · 2020-01-06T12:31:13Z

Still WIP @johannbarbie. patience :)

TheReturnOfJan · 2020-01-06T13:55:03Z

Ok all tests now passing and it's cleaned up a bit. FIrst comments welcome!

johannbarbie · 2020-01-06T14:15:02Z

JS Stepper
      1) STATICCALL balanceOf - successful read
      2) STATICCALL balanceOf - missed color
      3) STATICCALL balanceOf - missed address
      4) STATICCALL readData - successfull read
      5) CALL transfer - successfull transfer

i still have these guys failing. errors look like this:

  1) JS Stepper
       fixtures
         STATICCALL balanceOf - successful read:

      AssertionError [ERR_ASSERTION]: stack
      + expected - actual

       [
      -  "0x0000000000000000000000000000000000000000000000000000000000000000"
      +  "0x0000000000000000000000000000000000000000000000000000000000000001"
       ]

TheReturnOfJan · 2020-01-06T14:46:54Z

Yeah I noticed this after, seems like I need to update the off-chain stepper to behave the same.

johannbarbie · 2020-01-06T17:03:16Z

Yeah I noticed this after, seems like I need to update the off-chain stepper to behave the same.

is that even possible? or are we at a dead end here?

TheReturnOfJan · 2020-01-06T19:17:32Z

Why not possible? I just didn't even know it existed in this repo. Will do it tomorrow.

johannbarbie · 2020-01-07T08:51:46Z

contracts/EVMRuntime.sol



 contract EVMRuntime is EVMConstants {
    using EVMMemory for EVMMemory.Memory;
    using EVMStack for EVMStack.Stack;
    using EVMCode for EVMCode.Code;
+    using EVMTokenBag for EVMTokenBag.TokenBag;
+
+    // bridge has to defreagment the tokens


minor detail, but it is not actually the Bridge, but the Enforcer that will have to do these things. see here: https://docs.google.com/drawings/d/1WXcAvTEpXDGeL68MfWOP20mERht8rzqfSzdiFtYZeSc
in that diagram the bridge takes the client contract role.
same in this diagram: https://docs.google.com/drawings/d/1vlRmrHJd-eozM9e34pgCEnm8Iuq9bhqVnopOva7Tfz4

Well the bridge should do that and enforcer just passes onwards i guess? Details of plasma should stay out of the EVM-enforcer as much as possible.

yeah, i think we need some intermediate contract here. the bridge only understand transactions, but not runtime.

johannbarbie · 2020-01-07T09:04:10Z

test/fixtures/runtimeGasUsed.js

how does this one get created?

This entire file is generated during tests.

should we exclude it from git then?

Maybe 🤔
I did not take the time to fully understand what it does 😆 , but I assume it is committed for a reason.

johannbarbie · 2020-01-13T07:44:41Z

contracts/EVMRuntime.sol

+      }
+      state.gas -= gasFee;
+
+      bytes memory cd = state.mem.toBytes(stack.inOffset, stack.inSize);


maybe use cData or callDataBytes here, to keep it readable

johannbarbie

awesome work 💯
few details and comments required

johannbarbie · 2020-01-13T07:49:04Z

contracts/EVMRuntime.sol

+      bool success;
+      bytes memory returnData;
+
+      if (funSig == 0x22334455) {


should be 0xa9059cbb for transfer(address,uint256)

Fixed and moved to constants.

johannbarbie · 2020-01-13T07:50:25Z

contracts/EVMRuntime.sol

+	      to: dest,
+	      value: amount
+	});
+      	success = state.tokenBag.transfer(params);


could the creation of params be done inline, to save a stack element?

This was actually not needed anymore. Removed in favour of normal function params.

johannbarbie · 2020-01-13T07:51:00Z

contracts/EVMRuntime.sol

+      	uint amount;
+
+      	assembly {
+          dest := mload(add(cd,24))


indentation

johannbarbie · 2020-01-13T07:52:25Z

contracts/EVMRuntime.sol

+      }
+
+      if (!success) {
+	state.stack.push(0);


indentation

johannbarbie · 2020-01-13T07:54:43Z

contracts/EVMRuntime.sol

@@ -1609,7 +1690,13 @@ contract EVMRuntime is EVMConstants {
        }
        state.gas -= retEvm.gas;

-        retEvm.data = state.mem.toBytes(inOffset, inSize);
+	bytes memory cd = state.mem.toBytes(inOffset, inSize);


indentation

johannbarbie · 2020-01-13T08:09:20Z

test/helpers/tokenBag.js

+  return tokenBag;
+}
+
+module.exports = TokenBagHelpers;


johannbarbie · 2020-01-13T08:10:20Z

utils/EVMRuntime.js

+      const success = runState.tokenBag.transfer(color, from, to, amount);
+
+      if (success) {
+        runState.stack.push(new BN(1));


add comment here if 1 is success or error

or use constant

johannbarbie · 2020-01-13T08:10:36Z

utils/EVMRuntime.js

+    const data = this.memLoad(runState, inOffset, inLength);
+    const funcSig = this.getFuncSig(data);
+
+    if (funcSig === '0x22334455') {


update sigHash

johannbarbie · 2020-01-13T08:11:38Z

utils/EVMRuntime.js

+      runState.stack.push(new BN(1));
+      runState.returnValue = returnValue;
+      return;
+    } else if (funcSig === '0x12341234') {


update sigHash

johannbarbie · 2020-01-13T08:14:55Z

utils/EVMRuntime.js

+    const data = this.memLoad(runState, inOffset, inLength);
+    const funcSig = this.getFuncSig(data);
+
+    if (toAddress.gten(0) && toAddress.lten(8)) {


the address has to be larger than or equal to 0 and less than or equal 8? 🤔
when does this condition match?

ah, precompiles, got it.

johannbarbie

🥓

Jan added 3 commits December 30, 2019 23:55

WIP: balanceOf working test

0581812

Add readData.

4707cd1

Attempt transfer implementation. Broken commit.

52f0c55

TheReturnOfJan changed the title ~~Hofman~~ WIP: Hofman Jan 5, 2020

Refactor a bit.

171ee55

Transfer test now passing.

fe8f108

Jan added 4 commits January 6, 2020 13:42

Some cleanup.

107bb7c

Uncomment tests.

6c04762

Linting...

63c8899

Some more linting ...

271ed08

johannbarbie reviewed Jan 7, 2020

View reviewed changes

Fix off-chain stepper.

5aa2977

johannbarbie reviewed Jan 13, 2020

View reviewed changes

johannbarbie requested changes Jan 13, 2020

View reviewed changes

troggy changed the title ~~WIP: Hofman~~ implement Hofman structure Jan 13, 2020

troggy changed the title ~~implement Hofman structure~~ implement Hofmann structure Jan 13, 2020

Jan added 2 commits January 13, 2020 16:53

Cosmetics.

d02876c

Indentation.

571ba8f

johannbarbie approved these changes Jan 13, 2020

View reviewed changes

johannbarbie merged commit b060a2f into master Jan 13, 2020

johannbarbie deleted the hofman branch January 13, 2020 16:34

-,
-,
-,
+,

implement Hofmann structure #169

implement Hofmann structure #169

Conversation

TheReturnOfJan commented Jan 5, 2020 • edited by johannbarbie Loading

troggy commented Jan 5, 2020

TheReturnOfJan commented Jan 5, 2020

troggy commented Jan 5, 2020

johannbarbie commented Jan 6, 2020

TheReturnOfJan commented Jan 6, 2020

TheReturnOfJan commented Jan 6, 2020

johannbarbie commented Jan 6, 2020

TheReturnOfJan commented Jan 6, 2020

johannbarbie commented Jan 6, 2020

TheReturnOfJan commented Jan 6, 2020

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

johannbarbie left a 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

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

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

johannbarbie Jan 13, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

johannbarbie left a comment

Choose a reason for hiding this comment

TheReturnOfJan commented Jan 5, 2020 •

edited by johannbarbie

Loading

johannbarbie Jan 13, 2020 •

edited

Loading