From 69e52f617fe3dd54fb901097fbc4f05c375837a9 Mon Sep 17 00:00:00 2001 From: tac0turtle Date: Mon, 15 Dec 2025 06:38:17 -0800 Subject: [PATCH] move seqeucners to pkg --- .gitignore | 1 + CLAUDE.md | 14 +++++++------- apps/evm/cmd/post_tx_cmd.go | 2 +- apps/evm/cmd/run.go | 6 +++--- apps/grpc/Dockerfile | 1 - apps/grpc/README.md | 2 +- apps/grpc/cmd/run.go | 6 +++--- apps/testapp/cmd/run.go | 6 +++--- block/internal/syncing/syncer.go | 2 +- {sequencers => pkg/sequencers}/based/README.md | 2 +- {sequencers => pkg/sequencers}/based/sequencer.go | 2 +- .../sequencers}/based/sequencer_test.go | 0 .../sequencers}/common/checkpoint.go | 0 .../sequencers}/common/checkpoint_test.go | 0 .../sequencers}/common/size_validation.go | 0 {sequencers => pkg/sequencers}/single/README.md | 0 {sequencers => pkg/sequencers}/single/queue.go | 0 .../sequencers}/single/queue_test.go | 0 {sequencers => pkg/sequencers}/single/sequencer.go | 2 +- .../sequencers}/single/sequencer_test.go | 0 20 files changed, 23 insertions(+), 23 deletions(-) rename {sequencers => pkg/sequencers}/based/README.md (99%) rename {sequencers => pkg/sequencers}/based/sequencer.go (99%) rename {sequencers => pkg/sequencers}/based/sequencer_test.go (100%) rename {sequencers => pkg/sequencers}/common/checkpoint.go (100%) rename {sequencers => pkg/sequencers}/common/checkpoint_test.go (100%) rename {sequencers => pkg/sequencers}/common/size_validation.go (100%) rename {sequencers => pkg/sequencers}/single/README.md (100%) rename {sequencers => pkg/sequencers}/single/queue.go (100%) rename {sequencers => pkg/sequencers}/single/queue_test.go (100%) rename {sequencers => pkg/sequencers}/single/sequencer.go (99%) rename {sequencers => pkg/sequencers}/single/sequencer_test.go (100%) diff --git a/.gitignore b/.gitignore index a5a621904b..7e7576c6d4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ docs/.vitepress/cache .claude .gocache .gomodcache +/.cache diff --git a/CLAUDE.md b/CLAUDE.md index 70bcf6a9ac..3a858289b1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -44,15 +44,15 @@ The project uses a zero-dependency core package pattern: - **core/** - Contains only interfaces and types, no external dependencies - **block/** - Block management, creation, validation, and synchronization -- **p2p/** - Networking layer built on libp2p -- **sequencing/** - Modular sequencer implementations -- **testapp/** - Reference implementation for testing +- **pkg/p2p/** - Networking layer built on libp2p +- **pkg/sequencers/** - Modular sequencer implementations +- **apps/testapp/** - Reference implementation for testing ### Key Interfaces -- **Executor** (core/executor.go) - Handles state transitions -- **Sequencer** (core/sequencer.go) - Orders transactions -- **DA** (core/da.go) - Data availability layer abstraction +- **Execution** (`core/execution/execution.go`) - State transition interface and types +- **Sequencer** (`core/sequencer/sequencing.go`) - Orders transactions +- **DA** (`core/da/types.go`) - Data availability layer abstraction ### Modular Design @@ -120,7 +120,7 @@ go test -race ./package/... ### Adding a New DA Layer -1. Implement the `DA` interface from `core/da.go` +1. Implement the `DA` interface from `core/da/types.go` 2. Add configuration in the appropriate config package 3. Wire it up in the initialization code 4. Add tests following existing patterns diff --git a/apps/evm/cmd/post_tx_cmd.go b/apps/evm/cmd/post_tx_cmd.go index 7b03a0926a..8ac7cbb1dc 100644 --- a/apps/evm/cmd/post_tx_cmd.go +++ b/apps/evm/cmd/post_tx_cmd.go @@ -16,7 +16,7 @@ import ( rollcmd "github.com/evstack/ev-node/pkg/cmd" rollconf "github.com/evstack/ev-node/pkg/config" genesispkg "github.com/evstack/ev-node/pkg/genesis" - seqcommon "github.com/evstack/ev-node/sequencers/common" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" "github.com/evstack/ev-node/types" ) diff --git a/apps/evm/cmd/run.go b/apps/evm/cmd/run.go index 06af78e61f..d79299f04c 100644 --- a/apps/evm/cmd/run.go +++ b/apps/evm/cmd/run.go @@ -27,9 +27,9 @@ import ( "github.com/evstack/ev-node/pkg/p2p" "github.com/evstack/ev-node/pkg/p2p/key" "github.com/evstack/ev-node/pkg/store" - "github.com/evstack/ev-node/sequencers/based" - seqcommon "github.com/evstack/ev-node/sequencers/common" - "github.com/evstack/ev-node/sequencers/single" + "github.com/evstack/ev-node/pkg/sequencers/based" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" + "github.com/evstack/ev-node/pkg/sequencers/single" "github.com/evstack/ev-node/apps/evm/server" ) diff --git a/apps/grpc/Dockerfile b/apps/grpc/Dockerfile index 3f7be5c13f..19fae6246d 100644 --- a/apps/grpc/Dockerfile +++ b/apps/grpc/Dockerfile @@ -12,7 +12,6 @@ COPY go.mod go.sum ./ COPY apps/grpc/go.mod apps/grpc/go.sum ./apps/grpc/ COPY core/go.mod ./core/ COPY execution/grpc/go.mod execution/grpc/go.sum ./execution/grpc/ -COPY sequencers/single/go.mod sequencers/single/go.sum ./sequencers/single/ # Download dependencies RUN go mod download diff --git a/apps/grpc/README.md b/apps/grpc/README.md index 51a49ebc09..3c384f9b4d 100644 --- a/apps/grpc/README.md +++ b/apps/grpc/README.md @@ -151,4 +151,4 @@ If you have issues connecting to the DA layer: - [Evolve Documentation](https://ev.xyz) - [gRPC Execution Interface](../../execution/grpc/README.md) -- [Single Sequencer Documentation](../../sequencers/single/README.md) +- [Single Sequencer Documentation](../../pkg/sequencers/single/README.md) diff --git a/apps/grpc/cmd/run.go b/apps/grpc/cmd/run.go index 305b2e2a44..f525b4f9ac 100644 --- a/apps/grpc/cmd/run.go +++ b/apps/grpc/cmd/run.go @@ -23,9 +23,9 @@ import ( "github.com/evstack/ev-node/pkg/p2p" "github.com/evstack/ev-node/pkg/p2p/key" "github.com/evstack/ev-node/pkg/store" - "github.com/evstack/ev-node/sequencers/based" - seqcommon "github.com/evstack/ev-node/sequencers/common" - "github.com/evstack/ev-node/sequencers/single" + "github.com/evstack/ev-node/pkg/sequencers/based" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" + "github.com/evstack/ev-node/pkg/sequencers/single" ) const ( diff --git a/apps/testapp/cmd/run.go b/apps/testapp/cmd/run.go index 690a2764db..cc7f7c1ad3 100644 --- a/apps/testapp/cmd/run.go +++ b/apps/testapp/cmd/run.go @@ -21,9 +21,9 @@ import ( "github.com/evstack/ev-node/pkg/p2p" "github.com/evstack/ev-node/pkg/p2p/key" "github.com/evstack/ev-node/pkg/store" - "github.com/evstack/ev-node/sequencers/based" - seqcommon "github.com/evstack/ev-node/sequencers/common" - "github.com/evstack/ev-node/sequencers/single" + "github.com/evstack/ev-node/pkg/sequencers/based" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" + "github.com/evstack/ev-node/pkg/sequencers/single" ) const testDbName = "testapp" diff --git a/block/internal/syncing/syncer.go b/block/internal/syncing/syncer.go index f65d7ba66a..3409ed3cdb 100644 --- a/block/internal/syncing/syncer.go +++ b/block/internal/syncing/syncer.go @@ -19,7 +19,7 @@ import ( coreda "github.com/evstack/ev-node/core/da" coreexecutor "github.com/evstack/ev-node/core/execution" - seqcommon "github.com/evstack/ev-node/sequencers/common" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" "github.com/evstack/ev-node/block/internal/cache" "github.com/evstack/ev-node/block/internal/common" diff --git a/sequencers/based/README.md b/pkg/sequencers/based/README.md similarity index 99% rename from sequencers/based/README.md rename to pkg/sequencers/based/README.md index 9b425b5a96..580e041003 100644 --- a/sequencers/based/README.md +++ b/pkg/sequencers/based/README.md @@ -16,7 +16,7 @@ This design ensures that all transactions are force-included from DA, making the ### Key Interfaces -The Based Sequencer implements the `Sequencer` interface from `core/sequencer.go`: +The Based Sequencer implements the `Sequencer` interface from `core/sequencer/sequencing.go`: - `SubmitBatchTxs()` - No-op for based sequencer (transactions are not accepted) - `GetNextBatch()` - Retrieves the next batch from DA via forced inclusion diff --git a/sequencers/based/sequencer.go b/pkg/sequencers/based/sequencer.go similarity index 99% rename from sequencers/based/sequencer.go rename to pkg/sequencers/based/sequencer.go index 7960cd52df..c06e687e5e 100644 --- a/sequencers/based/sequencer.go +++ b/pkg/sequencers/based/sequencer.go @@ -14,7 +14,7 @@ import ( coreda "github.com/evstack/ev-node/core/da" coresequencer "github.com/evstack/ev-node/core/sequencer" "github.com/evstack/ev-node/pkg/genesis" - seqcommon "github.com/evstack/ev-node/sequencers/common" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" ) // ForcedInclusionRetriever defines the interface for retrieving forced inclusion transactions from DA diff --git a/sequencers/based/sequencer_test.go b/pkg/sequencers/based/sequencer_test.go similarity index 100% rename from sequencers/based/sequencer_test.go rename to pkg/sequencers/based/sequencer_test.go diff --git a/sequencers/common/checkpoint.go b/pkg/sequencers/common/checkpoint.go similarity index 100% rename from sequencers/common/checkpoint.go rename to pkg/sequencers/common/checkpoint.go diff --git a/sequencers/common/checkpoint_test.go b/pkg/sequencers/common/checkpoint_test.go similarity index 100% rename from sequencers/common/checkpoint_test.go rename to pkg/sequencers/common/checkpoint_test.go diff --git a/sequencers/common/size_validation.go b/pkg/sequencers/common/size_validation.go similarity index 100% rename from sequencers/common/size_validation.go rename to pkg/sequencers/common/size_validation.go diff --git a/sequencers/single/README.md b/pkg/sequencers/single/README.md similarity index 100% rename from sequencers/single/README.md rename to pkg/sequencers/single/README.md diff --git a/sequencers/single/queue.go b/pkg/sequencers/single/queue.go similarity index 100% rename from sequencers/single/queue.go rename to pkg/sequencers/single/queue.go diff --git a/sequencers/single/queue_test.go b/pkg/sequencers/single/queue_test.go similarity index 100% rename from sequencers/single/queue_test.go rename to pkg/sequencers/single/queue_test.go diff --git a/sequencers/single/sequencer.go b/pkg/sequencers/single/sequencer.go similarity index 99% rename from sequencers/single/sequencer.go rename to pkg/sequencers/single/sequencer.go index 8b114e1e06..574a394d05 100644 --- a/sequencers/single/sequencer.go +++ b/pkg/sequencers/single/sequencer.go @@ -17,7 +17,7 @@ import ( coreda "github.com/evstack/ev-node/core/da" coresequencer "github.com/evstack/ev-node/core/sequencer" "github.com/evstack/ev-node/pkg/genesis" - seqcommon "github.com/evstack/ev-node/sequencers/common" + seqcommon "github.com/evstack/ev-node/pkg/sequencers/common" ) // ErrInvalidId is returned when the chain id is invalid diff --git a/sequencers/single/sequencer_test.go b/pkg/sequencers/single/sequencer_test.go similarity index 100% rename from sequencers/single/sequencer_test.go rename to pkg/sequencers/single/sequencer_test.go