Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Add ABI version #5

Open
jochem-brouwer wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Add ABI version #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c0fc33d
add abi check (does not work)
jochem-brouwer Aug 4, 2023
ac42b09
try to fix test
jochem-brouwer Aug 4, 2023
4b81ca1
this passes?
jochem-brouwer Aug 4, 2023
c949df3
this does not pass
jochem-brouwer Aug 4, 2023
dddf6fe
restore old version
jochem-brouwer Aug 4, 2023
d5a8e8d
add comments
jochem-brouwer Aug 4, 2023
097c04e
update stack comments + add input length check
jochem-brouwer Aug 4, 2023
0f04d73
add wrong sig check
jochem-brouwer Aug 4, 2023
7fd49b4
fix contract
jochem-brouwer Aug 4, 2023
4109929
add revert fn macro
jochem-brouwer Aug 4, 2023
b7a1f49
Merge branch 'main' into abi-version
jochem-brouwer Aug 4, 2023
ddd5985
fix comments
jochem-brouwer Aug 4, 2023
3846d29
use selector
jochem-brouwer Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 37 additions & 25 deletions src/main.etk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@
0xfffffffffffffffffffffffffffffffffffffffe
%end

# get_input loads the first word of input from calldata.
%macro get_input()
%push0() # [0]
calldataload # [calldata[0..32]]
push1 4 # [4]
Copy link
Owner

@lightclient lightclient Aug 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh this is 4 words, you'll actually need to load 1 word and mask out the upper 4 bytes. you can see how to do that here: https://github.com/lightclient/erc20/blob/7b0d75d60f4e746c697a9ff88c62da411ac3f3b5/src/jump_table.etk#L20-L23

Copy link
Author

@jochem-brouwer jochem-brouwer Aug 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calldataload puts 32 bytes from calldata on stack, and item on stack is the offset?

Copy link
Author

@jochem-brouwer jochem-brouwer Aug 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not load function selector but it loads the timestamp input from calldata BTW

Copy link
Contributor

@holiman holiman Aug 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh this is 4 words

Nope, the calldataload offset is a byte-offset, not word-offset

func opCallDataLoad(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) {
	x := scope.Stack.peek()
	if offset, overflow := x.Uint64WithOverflow(); !overflow {
		data := getData(scope.Contract.Input, offset, 32)
		x.SetBytes(data)

So it's correct

Copy link
Owner

@lightclient lightclient Aug 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah you're right i got confused with how i was mloading the data in the other project!

calldataload # [calldata[4:36]]
%end

# get_timestamp_index calculates the index a timestamp should be stored at.
Expand All @@ -52,10 +51,13 @@
mod # [timestamp % rootmod]
%end

%macro revert()
%push0() # [0]
%push0() # [0, 0]
revert # []
# revert_if_neq reverts if the top two stack arguments are not equal
# stack: [a, b] (assumed precondition)
%macro revert_if_neq()
eq # [a == b]
iszero # [a != b]
push1 revert # [revert, a != b]
jumpi # []
%end

# -----------------------------------------------------------------------------
Expand All @@ -64,27 +66,26 @@

# Protect the submit routine by verifying the caller is equal to sysaddr().
caller # [caller]
push20 sysaddr() # [sysaddr, caller]
push20 sysaddr() # [sysaddr, caller]
eq # [sysaddr == caller]
push1 submit # [submitaddr, sysaddr == caller]
jumpi # []

# Fallthrough if addresses don't match -- this means the caller intends to read
# a root.

# -----------------------------------------------------------------------------
# READ ROOT -------------------------------------------------------------------
# -----------------------------------------------------------------------------

# Check if calldata is equal to 32 bytes.
push1 32 # [32]
calldatasize # [calldatasize, 32]
eq # [calldatasize == 32]
# Check if calldata is 36 bytes
push1 36 # [36]
calldatasize # [calldatasize, 36]
%revert_if_neq()

# Jump to continue if length-check passed, otherwise revert.
push1 load # [load_addr, calldatasize == 32]
jumpi # []
%revert() # []
# Check if calldata has the function signature
push1 0 # [0]
calldataload # [calldataload]
push1 224 # [224, calldataload]
shr # [calldataload >> 224]
push4 selector("get(uint256)") # [function_sig, calldataload >> 224]
%revert_if_neq()

# Load stored timestamp.
load:
Expand All @@ -96,11 +97,8 @@ dup1 # [time_index, time_index]
sload # [timestamp, time_index]

# Verify stored timestamp matches input.
%get_input() # [input, timestamp, time_index]
eq # [input == timestamp, time_index]
iszero # [input != timestamp, time_index]
push1 exit # [exit_addr, got != want, time_index]
jumpi # [time_index]
%get_input() # [got, want, time_index]
%revert_if_neq()

# Extend index to get root index.
push3 rootmod() # [rootmod, time_index]
Expand Down Expand Up @@ -142,3 +140,17 @@ stop # []
# -----------------------------------------------------------------------------
# SUBMIT END ------------------------------------------------------------------
# -----------------------------------------------------------------------------

##########
# REVERT #
##########

revert:
jumpdest
%push0()
%push0()
revert

##############
# REVERT END #
##############
13 changes: 12 additions & 1 deletion test/Contract.t.sol.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,23 @@ contract ContractTest is Test {
vm.store(unit, timestamp_idx(), timestamp());
vm.store(unit, root_idx(), root);

(bool ret, bytes memory data) = unit.call(bytes.concat(timestamp()));
(bool ret, bytes memory data) = unit.call(bytes.concat(bytes4(0x9507d39a), bytes32(uint256(block.timestamp))));

assertTrue(ret);
assertEq(data, bytes.concat(root));
}

function testReadWrongSig() public {
assertTrue(unit != address(0));

vm.store(unit, timestamp_idx(), timestamp());
vm.store(unit, root_idx(), root);

(bool ret, /*bytes memory data*/) = unit.call(bytes.concat(bytes4(0x01020304), bytes32(uint256(block.timestamp))));

assertFalse(ret);
}

function testUpdate() public {
vm.prank(sysaddr);
(bool ret, bytes memory data) = unit.call(bytes.concat(root));
Expand Down