chore(proto): move optimistic block protos to v1 #1707
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
b1711e8 to
f27c8d6
Compare
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
f27c8d6 to
00b2ae6
Compare
noot
reviewed
Oct 23, 2024
The auctioneer stuff remains v1alpha1 here, it is just updated to use the correct (v1) version of everything else. |
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
00b2ae6 to
acc9564
Compare
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
acc9564 to
9a65f20
Compare
|
Have to push back on this naming convention. v1 sequencer block with v1alpha1 optimistic block? We should have probably not nested the optimistic block bits under sequencerblock in this way, but provided a structure like in the protocol APIs. I am not sure how to best tackle this, but I feel like going with Would like to pull @joroshiba into this. |
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
9a65f20 to
b9e041c
Compare
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
b9e041c to
76f6587
Compare
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
76f6587 to
711bba5
Compare
SuperFluffy
reviewed
Nov 4, 2024
proto/sequencerblockapis/astria/sequencerblock/optimisticblock/v1alpha1/optimistic_block.proto
Outdated
Show resolved
Hide resolved
joroshiba
reviewed
Nov 5, 2024
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
711bba5 to
d1edce9
Compare
itamarreif
force-pushed
the
itamarreif/auctioneer/protos-v1-update
branch
from
d1edce9 to
4287b94
Compare
joroshiba
approved these changes
Nov 19, 2024
This was referenced Nov 19, 2024
|
This unfortunately imports the wrong generated code and doesn't name it according to our convention. This PR should not have been merged. (It also lacks a CHANGELOG). |
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 5, 2024
…c match (#1825) ## Summary Deletes and regenerates all code in `astria-core/src/generated`. Fixes bad imports by nesting generated Astria APIs under a new `astria` module. Fixes badly named modules. ## Background #1236 noticed that some protobuf files were skipped during code generation because of a `tonic_build::Builder::extern_path` statement. This showed up again when reworking the protobuf compilation tool to first clear the target directory for storing the generated rust files, where now an `include!` statement in `astria_core::generated` failed because the file was not in fact generated. This was not detected because the file was still committed to the repository at an earlier point. #1707 then added new generated code under a wrongly named `optimistic_block` module, which should have been named `optimistic` to be in line with its protobuf package counterpart. The present change is primarily to the `tools/protobuf-compiler` binary, which first purges the output directory (minus the handwritten `mod.rs`) before generating new code. ## Changes - Update `tools/protobuf-compiler` to clear `astria-core/src/generated` prior to repopulating it from `proto/` - Remove the module `sequencerblock::optimisticblock` - Add module `sequencerblock::optimistic` - Update all services that import Astria APIs from `astria_core::generated` to `astria_core::generated::astria`. ## Testing This is just code organization. Import paths were updated, code still compiles and tests pass. ## Changelogs Changelogs updated. ## Breaking Changelist - This is a breaking change for all consumers of `astria_core` that now need to import many items from `astria_core::generated::astria` that were directly under `astria_core::generated` before. ## Override Freeze This code touches services by changing their imports (`astria_core::generated -> astria_core::generated::astria`) but does change any implementation details. ## Related Issues Fixes and amends #1707. Supersedes #1824 Closes #1823
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This updates the protos used for the auctioneer to be based on the new v1 protos.
Background
We bumped our proto definition versions from
v1alpha_tov1.Changes
sequencerblock/optimistic_blockfile into its own subpackage in order to havesequencerblock.optimisticblock.v1alpha1FilteredSequencerBlockfrom v1Breaking Changelist
closes #1767