fix: CI pipeline fixes post-monorepo merge

.github/workflows/tests.yaml → .github/workflows/go-tests-op-translator.yaml

@@ -1,10 +1,15 @@
-name: OP translator tests
+name: Go Tests op-translator
 
-# Controls when the action will run.
 on:
-  # Triggers the workflow on pull request events but only for the main branch
+  # Run workflow on every push to main. This ensures that cross-service PRs that
+  # depend on op-translator are tested.
+  push:
+    branches:
+      - main
+  # Only run on PRs that touch op-translator
   pull_request:
-    branches: [main]
+    paths:
+      - "op-translator/**"
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -14,6 +19,11 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
+    # Defaults for the job
+    defaults:
+      run:
+        working-directory: op-translator
+
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -31,4 +41,4 @@ jobs:
         run: go build -v ./...
 
       - name: Run Unit Tests
-        run: make test
+        run: make test

.github/workflows/golangci-lint.yaml

@@ -1,25 +1,31 @@
-name: golangci-lint
+name: Go Lint
+
 on:
+  # Run workflow on every push to main. This ensures that cross-service PRs that
+  # depend on op-translator or metabased-publisher are tested.
   push:
     branches:
-      - master
       - main
+  # Only run on PRs that touch op-translator or metabased-publisher
   pull_request:
+    paths:
+      - "op-translator/**"
+      - "metabased-publisher/**"
 
 permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
   # pull-requests: read
 
 jobs:
-  golangci:
-    name: lint
+  golangci-op-translator:
+    name: go-lint-op-translator
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: "1.23"
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6.1.0
@@ -30,7 +36,7 @@ jobs:
           version: v1.60.3
 
           # Optional: working directory, useful for monorepos
-          # working-directory: somedir
+          working-directory: op-translator
 
           # Optional: golangci-lint command line arguments.
           #
@@ -52,4 +58,52 @@ jobs:
           # skip-build-cache: true
 
           # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
-          # install-mode: "goinstall"
+          # install-mode: "goinstall"
+
+  # TODO: Re-enable once metabased-publisher is working:
+  # *************************************************************************************
+  # golangci-metabased-publisher:
+  #   name: go-lint-metabased-publisher
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-go@v5
+  #       with:
+  #         go-version: "1.23"
+  #         cache: false
+  #     - name: golangci-lint
+  #       uses: golangci/golangci-lint-action@v6.1.0
+  #       with:
+  # *************************************************************************************
+  # Require: The version of golangci-lint to use.
+  # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+  # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+  # TODO: Re-enable once metabased-publisher is working:
+  # version: v1.60.3
+
+  # Optional: working directory, useful for monorepos
+  # TODO: Re-enable once metabased-publisher is working:
+  # working-directory: metabased-publisher
+
+  # Optional: golangci-lint command line arguments.
+  #
+  # Note: By default, the `.golangci.yaml` file should be at the root of the repository.
+  # The location of the configuration file can be changed by using `--config=`
+  # TODO: Re-enable once metabased-publisher is working:
+  # args: --timeout=10m --config=.golangci.yaml --allow-parallel-runners
+
+  # Optional: show only new issues if it's a pull request. The default value is `false`.
+  # only-new-issues: true
+
+  # Optional: if set to true, then all caching functionality will be completely disabled,
+  #           takes precedence over all other caching options.
+  # skip-cache: true
+
+  # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
+  # skip-pkg-cache: true
+
+  # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
+  # skip-build-cache: true
+
+  # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+  # install-mode: "goinstall"

.github/workflows/rust-clippy.yml

@@ -1,10 +1,15 @@
 name: Rust Clippy Check
 
 on:
+  # Run workflow on every push to main. This ensures that cross-service PRs that
+  # depend on metabased-sequencer are tested.
   push:
     branches:
       - main
+  # Only run on PRs that touch metabased-sequencer
   pull_request:
+    paths:
+      - "metabased-sequencer/**"
 
 env:
   CARGO_TERM_COLOR: always

.github/workflows/rust-tests.yml → .github/workflows/rust-tests-metabased-sequencer.yml

@@ -1,14 +1,23 @@
-name: Rust Tests
+name: Rust Tests metabased-sequencer
 
 on:
+  # Run workflow on every push to main. This ensures that cross-service PRs that
+  # depend on metabased-sequencer are tested.
   push:
     branches:
       - main
+  # Only run on PRs that touch metabased-sequencer
   pull_request:
+    paths:
+      - "metabased-sequencer/**"
 
 env:
   CARGO_TERM_COLOR: always
 
+defaults:
+  run:
+    working-directory: metabased-sequencer
+
 jobs:
   test:
     name: Run Rust Tests
@@ -24,6 +33,8 @@ jobs:
 
       - name: Cache Cargo dependencies
         uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: "metabased-sequencer -> target"
 
       - name: Run tests
         run: cargo test --all

.pre-commit-config.yaml

@@ -5,7 +5,11 @@ repos:
     rev: v1.0.3
     hooks:
       - id: go-fmt-import
+        files: ^(op-translator|metabased-publisher)/
       - id: go-vet
+        files: ^(op-translator|metabased-publisher)/
       - id: go-lint
+        files: ^(op-translator|metabased-publisher)/
       - id: golangci-lint # requires github.com/golangci/golangci-lint
-        args: [--config=.golangci.yaml --allow-parallel-runners]
+        files: ^(op-translator|metabased-publisher)/
+        args: [--config=.golangci.yaml --allow-parallel-runners]

README.md

@@ -1,2 +1,3 @@
-# metabased-dev-container
-Dev Container for Metabased dev environment setup
+# Metabased Rollup Monorepo
+
+The monorepo for the Metabased rollup stack. Containers the sequencer, smart contracts, RPC node, dev environments, and more!

metabased-publisher/cmd/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
-	"github.com/SyndicateProtocol/op-translator/metabased-publisher/flags"
-	"github.com/SyndicateProtocol/op-translator/metabased-publisher/metrics"
-	"github.com/SyndicateProtocol/op-translator/metabased-publisher/publisher"
+	"github.com/SyndicateProtocol/metabased-rollup/metabased-publisher/flags"
+	"github.com/SyndicateProtocol/metabased-rollup/metabased-publisher/metrics"
+	"github.com/SyndicateProtocol/metabased-rollup/metabased-publisher/publisher"
 	"github.com/urfave/cli/v2"
 
 	opservice "github.com/ethereum-optimism/optimism/op-service"

metabased-publisher/go.mod

@@ -0,0 +1,116 @@
+module github.com/SyndicateProtocol/metabased-rollup/metabased-publisher
+
+go 1.23.0
+
+require (
+	github.com/SyndicateProtocol/metabased-rollup/op-translator v0.0.0
+	github.com/ethereum-optimism/optimism v1.9.3
+	github.com/ethereum/go-ethereum v1.14.8
+	github.com/stretchr/testify v1.9.0
+	github.com/urfave/cli/v2 v2.27.4
+)
+
+require (
+	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bits-and-blooms/bitset v1.10.0 // indirect
+	github.com/btcsuite/btcd v0.24.2 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cockroachdb/errors v1.11.3 // indirect
+	github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
+	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
+	github.com/cockroachdb/pebble v1.1.2 // indirect
+	github.com/cockroachdb/redact v1.1.5 // indirect
+	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
+	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 // indirect
+	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac // indirect
+	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
+	github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/getsentry/sentry-go v0.27.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-bexpr v0.1.11 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/holiman/uint256 v1.3.1 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
+	github.com/knadh/koanf/parsers/dotenv v1.0.0 // indirect
+	github.com/knadh/koanf/providers/file v1.1.0 // indirect
+	github.com/knadh/koanf/providers/posflag v0.1.0 // indirect
+	github.com/knadh/koanf/v2 v2.1.1 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/pointerstructure v1.2.1 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.20.4 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/rs/cors v1.11.0 // indirect
+	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/supranational/blst v0.3.11 // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/term v0.24.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
+)
+
+// Local module replacement
+replace github.com/SyndicateProtocol/metabased-rollup/op-translator => ../op-translator