chore(proto): update execution service to use sequencerblock (#954)

## Summary
Updates the execution API to be dependent on sequencerblock instead of
sequencer, couple minor updates around CI needed for that.

## Changes
- make execution API dependent on sequencerblock instead of sequencer
- modified breaking changes check to be based on wire_json, allow
breaking changes in alpha apis

---------

Co-authored-by: elizabeth <[email protected]>

.github/workflows/release.yml

@@ -21,34 +21,38 @@ jobs:
         with:
           version: "1.15.1"
           github_token: ${{ github.token }}
-      - uses: bufbuild/buf-push-action@v1
+      - name: "Upload Composer API Protos"
+        uses: bufbuild/buf-push-action@v1
         with:
-          draft:  ${{ github.ref_name != 'main'}}
-          input: "proto/sequencerapis"
+          draft: ${{ github.ref_name != 'main'}}
+          input: "proto/composerapis"
           buf_token: ${{ secrets.BUF_TOKEN }}
-      - name: "Update Execution API dependency"
-        run: |
-          cd proto/executionapis
-          buf mod update --only buf.build/astria/astria
-      - uses: bufbuild/buf-push-action@v1
+      - name: "Upload Sequencer API Protos"
+        uses: bufbuild/buf-push-action@v1
         with:
           draft:  ${{ github.ref_name != 'main'}}
-          input: "proto/executionapis"
-          buf_token: ${{ secrets.BUF_TOKEN }}
-      - uses: bufbuild/buf-push-action@v1
-        with:
-          draft: ${{ github.ref_name != 'main'}}
-          input: "proto/composerapis"
+          input: "proto/sequencerapis"
           buf_token: ${{ secrets.BUF_TOKEN }}
       - name: "Update Sequencer Block API dependency"
         run: |
           cd proto/sequencerblockapis
           buf mod update --only buf.build/astria/astria
-      - uses: bufbuild/buf-push-action@v1
+      - name: "Upload Sequencer Block API Protos"
+        uses: bufbuild/buf-push-action@v1
         with:
           draft: ${{ github.ref_name != 'main'}}
           input: "proto/sequencerblockapis"
           buf_token: ${{ secrets.BUF_TOKEN }}
+      - name: "Update Execution API dependency"
+        run: |
+          cd proto/executionapis
+          buf mod update --only buf.build/astria/sequencerblock-apis
+      - name: "Upload Execution API Protos"
+        uses: bufbuild/buf-push-action@v1
+        with:
+          draft:  ${{ github.ref_name != 'main'}}
+          input: "proto/executionapis"
+          buf_token: ${{ secrets.BUF_TOKEN }}
 
   charts:
     permissions:

crates/astria-conductor/src/executor/client.rs

@@ -9,7 +9,7 @@ use astria_core::{
             v1alpha2 as raw,
             v1alpha2::execution_service_client::ExecutionServiceClient,
         },
-        sequencer::v1::RollupData,
+        sequencerblock::v1alpha1::RollupData,
     },
     sequencerblock::Protobuf as _,
 };

crates/astria-conductor/src/executor/tests.rs

@@ -28,17 +28,17 @@ use astria_core::{
             GetGenesisInfoRequest,
             UpdateCommitmentStateRequest,
         },
-        sequencer::v1::RollupData as RawRollupData,
+        sequencerblock::v1alpha1::RollupData as RawRollupData,
     },
-    sequencer::v1::{
-        block::RollupData,
-        test_utils::{
-            make_cometbft_block,
-            ConfigureCometBftBlock,
-        },
+    sequencer::v1::test_utils::{
+        make_cometbft_block,
+        ConfigureCometBftBlock,
     },
     sequencerblock::{
-        v1alpha1::SequencerBlock,
+        v1alpha1::{
+            block::RollupData,
+            SequencerBlock,
+        },
         Protobuf as _,
     },
 };

proto/composerapis/buf.yaml

@@ -2,7 +2,7 @@ version: v1
 name: buf.build/astria/composer-apis
 breaking:
   use:
-    - FILE
+    - WIRE_JSON
 lint:
   use:
     - BASIC

proto/executionapis/astria/execution/v1alpha2/execution.proto

@@ -2,7 +2,7 @@ syntax = 'proto3';
 
 package astria.execution.v1alpha2;
 
-import "astria/sequencer/v1/block.proto";
+import "astria/sequencerblock/v1alpha1/block.proto";
 import "google/protobuf/timestamp.proto";
 
 // GenesisInfo contains the information needed to start a rollup chain.
@@ -68,7 +68,7 @@ message ExecuteBlockRequest {
   // The hash of previous block, which new block will be created on top of.
   bytes prev_block_hash = 1;
   // List of transactions to include in the new block.
-  repeated astria.sequencer.v1.RollupData transactions = 2;
+  repeated astria.sequencerblock.v1alpha1.RollupData transactions = 2;
   // Timestamp to be used for new block.
   google.protobuf.Timestamp timestamp = 3;
 }

proto/executionapis/buf.lock

@@ -4,10 +4,15 @@ deps:
   - remote: buf.build
     owner: astria
     repository: astria
-    commit: 51f595462a364486811100e428886cc2
-    digest: shake256:34645b8695bf64300b793b7b9f10d1f2395141de2da074bf2890164c5b1b07f7d25768d6232a3a8953c68e215843c31bf2363e77f5a57cd302a56337afea92b0
+    commit: c770a40390134c30826726731fe76912
+    digest: shake256:87750605078d356048942d7abd89a87fc0eb1c1cc1e97bdbfcd2f56aee28b189e2a4f5296c734f36aab6fdb22a246517dbedb79dfec6fc6c3c1128ac6a25881d
+  - remote: buf.build
+    owner: astria
+    repository: sequencerblock-apis
+    commit: 172c219fe23d410fba22fb24a1df29e5
+    digest: shake256:65152e1778e8545855bf04783be514df0dda1d34949f8c6e3b5b3b53d8260d2aa39c35ea51d7723b0bc1e3e702b031203bbc16c18fb6f364124d9d794456b7ed
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 75b4300737fb4efca0831636be94e517
-    digest: shake256:d865f55b8ceb838c90c28b09894ab43d07f42551108c23760004a6a4e28fe24d3a1f7380a3c9278edb329a338a9cc5db8ad9f394de548e70d534e98504972d67
+    commit: 7a6bc1e3207144b38e9066861e1de0ff
+    digest: shake256:d646836485c34192401253703c4e7ce899c826fceec060bf4b2a62c4749bd9976dc960833e134a1f814725e1ffd60b1bb3cf0335a7e99ef0e8cec34b070ffb66

proto/executionapis/buf.yaml

@@ -1,10 +1,11 @@
 version: v1
 name: buf.build/astria/execution-apis
 breaking:
+  ignore_unstable_packages: true
   use:
-    - FILE
+    - WIRE_JSON
 deps:
- - buf.build/astria/astria
+  - buf.build/astria/sequencerblock-apis
 lint:
   use:
     - BASIC

proto/sequencerapis/buf.yaml

@@ -3,7 +3,7 @@ name: buf.build/astria/astria
 breaking:
   ignore_unstable_packages: true
   use:
-    - FILE
+    - WIRE_JSON
 deps:
   - buf.build/googleapis/googleapis
 lint:

proto/sequencerblockapis/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Settler Labs Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

proto/sequencerblockapis/buf.yaml

@@ -1,5 +1,9 @@
 version: v1
 name: buf.build/astria/sequencerblock-apis
+breaking:
+  ignore_unstable_packages: true
+  use:
+    - WIRE_JSON
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/astria/astria