More progress integrating EVMOne #2
Conversation
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
…re progress Signed-off-by: Ignacio Hagopian <jsign.uy@gmail.com>
| @@ -1,72 +1,54 @@ | |||
| const std = @import("std"); | |||
There was a problem hiding this comment.
Much nicer to see main.zig now to play with things.
It still has limited usage, but it will keep getting more complete.
| .kind = evmc.EVMC_CALL, // TODO(jsign): generalize. | ||
| .flags = evmc.EVMC_STATIC, | ||
| .depth = 0, | ||
| .gas = @intCast(txn.gas_limit), // TODO(jsign): why evmc expects a i64 for gas instead of u64? |
There was a problem hiding this comment.
I'm unsure why EVMC defines .gas as a signed integer instead of unsigned; maybe I'm missing something.
| .create2_salt = .{ | ||
| .bytes = [_]u8{0} ** 32, // TODO: fix this. | ||
| }, | ||
| .code_address = util.to_evmc_address(txn.to), // TODO: fix this when .kind is generalized. |
There was a problem hiding this comment.
| const addr_typeinfo = @typeInfo(@TypeOf(address)); | ||
| if (@TypeOf(address) != Address and addr_typeinfo.Optional.child != Address) { | ||
| @compileError("address must be of type Address or ?Address"); | ||
| // ### EVMC Host Interface ### |
There was a problem hiding this comment.
So now my next steps is mainly to fix these @panic("TODO"). At least, at a minimum, to run this spec-test successfully.
Then keep adding more spec-tests and keep completing the implementation.
| fn call(ctx: ?*evmc.struct_evmc_host_context, msg: [*c]const evmc.struct_evmc_message) callconv(.C) evmc.struct_evmc_result { | ||
| const vm: *VM = @as(*VM, @alignCast(@ptrCast(ctx.?))); | ||
| log.debug("call()", .{}); // TODO(jsign): explore creating custom formatter? | ||
|
|
||
| // Persist the current context. We'll restore it after the call return. | ||
| const current_context = vm.*.exec_context.?; | ||
| _ = current_context; | ||
|
|
||
| // Create the new context to be used to do the call. | ||
| vm.exec_context = ExecutionContext{ .address = util.from_evmc_address(msg.*.recipient) }; | ||
|
|
||
| var recipient_code: Bytecode = &[_]u8{}; | ||
| const recipient_account = vm.statedb.get(util.from_evmc_address(msg.*.code_address)); | ||
| if (recipient_account) |account| { | ||
| recipient_code = account.code; | ||
| } else unreachable; | ||
|
|
||
| if (vm.evm.*.execute) |exec| { | ||
| // TODO(jsign): EVMC_SHANGHAI should be configurable at runtime. | ||
| // TODO(jsign): remove ptrCast | ||
| var result = exec(vm.evm, @ptrCast(&vm.host), @ptrCast(vm), evmc.EVMC_SHANGHAI, @ptrCast(msg), recipient_code.ptr, recipient_code.len); | ||
| log.debug("execution result: status_code={}, gas_left={}", .{ result.status_code, result.gas_left }); | ||
| } else unreachable; | ||
|
|
||
| @panic("TODO"); |
There was a problem hiding this comment.
Already made some progress for call(...) which is something I need for the existing spec-test to run, since it's a contract call that calls another contract.
Here we see how we keep the current_context, and create a new context to do the call to the other contract.
This is still incomplete, but shows how ExecContext in vm.exec_context is used.
| } | ||
|
|
||
| fn call(ctx: ?*evmc.struct_evmc_host_context, msg: [*c]const evmc.struct_evmc_message) callconv(.C) evmc.struct_evmc_result { | ||
| const vm: *VM = @as(*VM, @alignCast(@ptrCast(ctx.?))); |
There was a problem hiding this comment.
Note how EVMC sends us an ctx opaque{} via params that we know is our VM.
This opaque{} is something our VM can tell EVMOne to always send in every EVMC interface call, so I choose that to be a reference to our VM instance. Having the *VM means we can access the current execution context and useful fields (e.g: statedb, etc)..
This line will be included in all the other EVMC interfaces that have @panic("TODO").
|
Both |
This PR:
vm/vm.zig, which integrates better with EVMOne. I like how it looks; I still have to make more progress, but that will be next. I'd invite skim againvm/vm.zigsince it might be worth it.src/main.zigto now use theVMabstraction instead of hacky direct usage of EVMOne. Now it's using something closer to the real APIs.I'd suggest seeing the code directly in the merged version, since looking at diffs or doing reviews now can confuse these kinds of "big changes". Maybe it's worth doing it when things settle down a bit or if the changes are more self-contained:
I left some comments that might be interesting for readers.
cc @gballet