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

feat: rollup rework #136

Merged
merged 14 commits into from
Apr 22, 2024
Merged

feat: rollup rework #136

merged 14 commits into from
Apr 22, 2024

Conversation

mpolitzer
Copy link
Contributor

@mpolitzer mpolitzer commented Sep 14, 2023

This PR simplifies the cartesi machine rollup by removing input-metadata, voucher_hashes and notice_hashes.

  • The input-metadata contents will be integrated into the rollup input, details are yet to be determined.
  • vouchers, notices and other types of messages will now be encoded in userspace. The cartesi-machine and the linux driver will treat them as binary blobs.
  • yield will now pass the blob size in its data field. This way we won't need to inspect the encoded data.
  • yield/HTIF won't care about the details of the messages anymore, so we will simplify the defines as well.

test

./remote-cartesi-machine 127.0.0.1:5001 &
cartesi-machine.lua --remote-address=127.0.0.1:5001 --checkin-address=127.0.0.1:5002 \
  --rollup-advance-state=input_index_begin:0,input_index_end:1 \
  --rollup --flash-drive=label:test,filename:../../kernel/artifacts/linux-selftest-5.15.63-ctsi-2-v0.0.0.ext2 \
  -- /mnt/test/drivers/cartesi/rollup_read

@mpolitzer mpolitzer requested a review from a team September 14, 2023 17:11
@mpolitzer mpolitzer mentioned this pull request Sep 14, 2023
16 tasks
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch from 7512b6c to 24f202e Compare September 21, 2023 13:11
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch 2 times, most recently from beaa590 to 1f0390b Compare October 4, 2023 14:58
src/cartesi-machine.lua Outdated Show resolved Hide resolved
src/cartesi-machine.lua Outdated Show resolved Hide resolved
src/cartesi-machine.lua Outdated Show resolved Hide resolved
Copy link
Contributor

@diegonehab diegonehab left a comment

Choose a reason for hiding this comment

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

I don't think we are removing exceptions and reports yet. So let's keep the names. Also, see comments in code. There was a recent merge in main, so please rebase.

@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch from 1f0390b to c5068bc Compare October 6, 2023 16:48
@edubart edubart added the enhancement New feature or request label Oct 7, 2023
@edubart edubart linked an issue Oct 7, 2023 that may be closed by this pull request
16 tasks
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch 4 times, most recently from 0373768 to ee1e8b9 Compare October 11, 2023 02:43
@mpolitzer mpolitzer marked this pull request as ready for review October 11, 2023 02:50
@mpolitzer mpolitzer marked this pull request as draft October 24, 2023 13:29
src/cartesi-machine.lua Outdated Show resolved Hide resolved
src/cartesi-machine.lua Outdated Show resolved Hide resolved
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch 3 times, most recently from 5b4e63f to fff6511 Compare November 10, 2023 15:08
Copy link
Contributor

@diegonehab diegonehab left a comment

Choose a reason for hiding this comment

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

See comment.

@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch from fff6511 to b5ff909 Compare December 19, 2023 21:03
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch from b5ff909 to 9f3c65d Compare January 10, 2024 21:45
Copy link
Contributor

@edubart edubart left a comment

Choose a reason for hiding this comment

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

I reviewed and only found minor issues while testing locally.

tests/Makefile Outdated Show resolved Hide resolved
tools/template/tests-data-copyright.template Show resolved Hide resolved
tests/Makefile Show resolved Hide resolved
src/machine-config.h Show resolved Hide resolved
tests/lua/cmio-test.lua Show resolved Hide resolved
@mpolitzer mpolitzer force-pushed the feature/rollup-rework branch 3 times, most recently from cb2b954 to 62abd09 Compare April 19, 2024 14:39
@vfusco vfusco force-pushed the feature/rollup-rework branch from 62abd09 to ad09b84 Compare April 20, 2024 20:03
@mpolitzer mpolitzer merged commit ad09b84 into main Apr 22, 2024
8 checks passed
@mpolitzer mpolitzer deleted the feature/rollup-rework branch April 22, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Rollup simplification
5 participants