cleanup

Author: lukeiannucci

.github/workflows/push-docker-rollup-creator.yml

@@ -5,9 +5,6 @@ on:
     tags:
       # Match tags in the format YYYYMMDD
       - "20[0-9][0-9][0-1][0-9][0-3][0-9]*"
-  pull_request:
-    branches:
-      - "*"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -58,7 +55,7 @@ jobs:
           build-args: NITRO_CONTRACTS_BRANCH=v3.1.0
           file: ./docker/rollupcreator.Dockerfile
           platforms: linux/amd64
-          push: ${{ github.event_name == 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -77,7 +74,7 @@ jobs:
 
       - name: Login to Github Container Repo
         uses: docker/login-action@v3
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -100,7 +97,7 @@ jobs:
           build-args: NITRO_CONTRACTS_BRANCH=v3.1.0
           file: ./docker/rollupcreator.Dockerfile
           platforms: linux/arm64
-          push: ${{ github.event_name == 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -134,11 +131,11 @@ jobs:
         with:
             tags: ghcr.io/espressosystems/timeboost/rollup-creator:${{steps.metadata.outputs.version}}
             inputs: ghcr.io/espressosystems/timeboost/rollup-creator@${{needs.build.outputs.digest}},ghcr.io/espressosystems/timeboost/rollup-creator@${{needs.build-arm.outputs.digest}}
-            push: ${{ github.event_name == 'pull_request' }}
+            push: ${{ github.event_name != 'pull_request' }}
 
       - name: Create and push manifest images to latest
         uses: Noelware/docker-manifest-action@master
         with:
             tags: ghcr.io/espressosystems/timeboost/rollup-creator:latest
             inputs: ghcr.io/espressosystems/timeboost/rollup-creator@${{needs.build.outputs.digest}},ghcr.io/espressosystems/timeboost/rollup-creator@${{needs.build-arm.outputs.digest}}
-            push: ${{ github.event_name == 'pull_request' }}
+            push: ${{ github.event_name != 'pull_request' }}

docker-compose.yml

@@ -54,7 +54,7 @@ services:
       - timeboost
   rollup-creator:
     pid: host
-    image: ghcr.io/espressosystems/timeboost/rollup-creator:rollup-creator-round2
+    image: ghcr.io/espressosystems/timeboost/rollup-creator:pr-529
     volumes:
       - "config:/config"
     environment:
@@ -70,7 +70,6 @@ services:
       PARENT_CHAIN_RPC: "http://demo-l1-network:8545"
       SEQUENCER_ADDRESS: 0x2F1eAe7Dd46D88f08fC2f8ED27Fcb2Ab183eb2d0
       WASM_MODULE_ROOT: 0xdb698a2576298f25448bc092e52cf13b1e24141c997135d70f217d674bbeb69a
-      BATCH_POSTERS: 0x3f1eae7d46d88f08fc2f8ed27fcb2ab183eb2d0e
     command: ["create-rollup-testnode"]
     networks:
       - timeboost
@@ -191,7 +190,7 @@ services:
     command:
       - --conf.file=/nitro-config/sequencer_config.json
       - --node.seq-coordinator.my-url=http://nitro1:8547
-      - --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer
+      - --http.api=net,web3,eth,txpool,debug,timeboost,auctioneer,batcher
       - --node.decentralized-timeboost-sequencer.block-retry-duration=0s
       - --node.decentralized-timeboost-sequencer.decentralized-timeboost-bridge-config.internal-timeboost-grpc-url=node1:8003
       - --node.batch-poster.parent-chain-wallet.private-key=d785ccfe237647fca51042e2083e085ec29201d5a39f5a61f0da5cab315799ac

nitro-config/sequencer_config.json

@@ -41,7 +41,11 @@
             "enable": false
         },
         "decentralized-timeboost-sequencer": {
-            "enable": true
+            "enable": true,
+            "hotshot-urls": [
+                "http://espresso-dev-node:41000",
+                "http://espresso-dev-node:41000"
+            ]
         },
         "decentralized-timeboost-delayed-sequencer": {
             "enable": true

test-configs/c0/committee.toml

@@ -10,6 +10,7 @@ address = "127.0.0.1:8000"
 http_api = "127.0.0.1:8004"
 grpc_api = "127.0.0.1:8003"
 batch_poster_api = "127.0.0.1:8547"
+sig_key_address = "0x647ff873518108c6ae1e3b310bb6d68c72d369ab"
 
 [[members]]
 node = "node_1"
@@ -20,6 +21,7 @@ address = "127.0.0.1:8010"
 http_api = "127.0.0.1:8014"
 grpc_api = "127.0.0.1:8013"
 batch_poster_api = "127.0.0.1:8557"
+sig_key_address = "0xd3ab3e193f9c438100f6aefa164a214b5be55379"
 
 [[members]]
 node = "node_2"
@@ -30,6 +32,7 @@ address = "127.0.0.1:8020"
 http_api = "127.0.0.1:8024"
 grpc_api = "127.0.0.1:8023"
 batch_poster_api = "127.0.0.1:8567"
+sig_key_address = "0x92be0a723a8cf1c2e74c5c5ebd57625fd7b26bc5"
 
 [[members]]
 node = "node_3"
@@ -40,6 +43,7 @@ address = "127.0.0.1:8030"
 http_api = "127.0.0.1:8034"
 grpc_api = "127.0.0.1:8033"
 batch_poster_api = "127.0.0.1:8577"
+sig_key_address = "0xa064549353fafd38f1000627acc581c9354b1cbe"
 
 [[members]]
 node = "node_4"
@@ -50,3 +54,4 @@ address = "127.0.0.1:8040"
 http_api = "127.0.0.1:8044"
 grpc_api = "127.0.0.1:8043"
 batch_poster_api = "127.0.0.1:8587"
+sig_key_address = "0x9bfc8551ffd3a21f856490870f111051b1ef39ab"

timeboost-config/src/binaries/mkconfig.rs

@@ -5,7 +5,9 @@ use std::num::NonZeroU8;
 use std::path::PathBuf;
 use std::str::FromStr;
 
+use alloy::consensus::crypto::secp256k1::public_key_to_address;
 use alloy::eips::BlockNumberOrTag;
+use alloy::signers::k256::ecdsa::VerifyingKey;
 use anyhow::{Result, bail};
 use ark_std::rand::SeedableRng as _;
 use clap::{Parser, ValueEnum};
@@ -288,6 +290,8 @@ impl Args {
                 },
             };
 
+            let pub_key = VerifyingKey::from_sec1_bytes(&config.keys.signing.public.to_bytes())?;
+
             members.push(CommitteeMember {
                 node: format!("node_{i}"),
                 signing_key: config.keys.signing.public,
@@ -309,6 +313,7 @@ impl Args {
                             .map(|a| a.with_offset(GRPC_API_PORT_OFFSET))
                     })
                     .unwrap_or_else(|| bind_addr.clone().with_offset(GRPC_API_PORT_OFFSET)),
+                sig_key_address: public_key_to_address(pub_key),
             });
 
             let mut node_config_file = File::create(self.output.join(format!("node_{i}.toml")))?;

timeboost-config/src/committee.rs

@@ -26,6 +26,7 @@ pub struct CommitteeMember {
     pub http_api: Address,
     pub grpc_api: Address,
     pub batch_poster_api: Address,
+    pub sig_key_address: alloy::primitives::Address,
 }
 
 impl CommitteeConfig {