Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tests according to Mega-EOF spec #1238

Merged
merged 16 commits into from
Sep 6, 2023

Conversation

hugo-dc
Copy link
Member

@hugo-dc hugo-dc commented Jun 28, 2023

@hugo-dc hugo-dc changed the title Update tests according to Mega-EOF spec WIP: Update tests according to Mega-EOF spec Jun 28, 2023
@winsvega
Copy link
Collaborator

winsvega commented Jul 7, 2023

has all of this been postphoned to Prague ?

@gumb0
Copy link
Member

gumb0 commented Jul 11, 2023

has all of this been postphoned to Prague ?

Yes it was.

@gumb0
Copy link
Member

gumb0 commented Jul 12, 2023

BlockChain test jsons are mostly not updated yet?

@hugo-dc hugo-dc force-pushed the update-tests branch 2 times, most recently from f6265ec to e53f5f5 Compare July 19, 2023 02:05
@hugo-dc
Copy link
Member Author

hugo-dc commented Jul 20, 2023

All State Tests and blockchain tests has been filled with evmone.

@gumb0
Copy link
Member

gumb0 commented Aug 17, 2023

Rebased without refilling

@hugo-dc
Copy link
Member Author

hugo-dc commented Aug 20, 2023

Rebased without refilling

Tried refilling but seems the rebase didn't affect the fillers in this PR, json files were not modified.

@hugo-dc hugo-dc changed the title WIP: Update tests according to Mega-EOF spec Update tests according to Mega-EOF spec Aug 21, 2023
@hugo-dc hugo-dc marked this pull request as ready for review August 21, 2023 15:33
@gumb0
Copy link
Member

gumb0 commented Aug 22, 2023

@winsvega This is ready to go, please review

# deployed code:
# code section: PUSH1(0) POP STOP
# data section: aabbccdd
- ':label eof1_initcode_deploying_valid_eof1_with_data :raw 0xef0001010004020001002903000000000000027fef00010100040200010004030004000000000160005000aabbccdd0000000000600052601b6000f3'
- ':label eof1_initcode_deploying_valid_eof1_with_data :yul-eof { mstore(0, 0xef00010100040200010004040004000000000160005000aabbccdd0000000000) return(0, 27) }'
Copy link
Collaborator

Choose a reason for hiding this comment

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

there is now an argument support you can pass to the script like if you have custom solc version build with prague support (solc has --evm-version flag)
so you can use it here without custom .sh as :yul prague {

Copy link
Member Author

@hugo-dc hugo-dc Aug 28, 2023

Choose a reason for hiding this comment

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

Thanks for the heads up, Does this new feature still requires having a yul-eof.sh script or it is no longer needed?

Currently, as these changes in spec are recent, I'm using a yul-eof.sh script that converts the yul code to EVM and then to EOF.

@@ -217,16 +217,16 @@ for (i=0; i<10; i++) push10 += "30"

push100 = "" // Push a hundred values into the stack
// assume push10 is code segment 1
for(var i=0; i<10; i++) push100 += "B00001"
for(var i=0; i<10; i++) push100 += "E30001"
Copy link
Collaborator

Choose a reason for hiding this comment

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

please use .py test fillers for combinatorics tests in the future

@winsvega
Copy link
Collaborator

please rebase on develop

@qbzzt qbzzt self-requested a review August 25, 2023 02:29
Copy link
Collaborator

@qbzzt qbzzt left a comment

Choose a reason for hiding this comment

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

I checked the PR, and it looks good. If retesteth fills the tests and they run correctly, I think this should be merged.

@hugo-dc
Copy link
Member Author

hugo-dc commented Aug 28, 2023

please rebase on develop

Rebased

@winsvega winsvega merged commit 7e5aa01 into ethereum:develop Sep 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants