Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
e0c9d5e
include the validator hasher
randygrok May 19, 2025
3791755
add attestation commit
randygrok May 20, 2025
39f40b7
first batch of changes
randygrok May 21, 2025
21d3136
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
randygrok May 21, 2025
519df96
refactor for clarity
randygrok May 21, 2025
1ab5f07
add better comment for publishBlockInternal
randygrok May 21, 2025
21283d2
temp commit before finishing last tests
randygrok May 23, 2025
fd46274
update and it does forge blocks
randygrok May 23, 2025
782aba0
add payload provider for signature
randygrok May 26, 2025
adf4ad5
add signature payload provider
randygrok May 26, 2025
eaef309
add header hasher
randygrok May 26, 2025
20e9d17
include proto for attestation
randygrok May 26, 2025
d58ff27
build blocks
randygrok May 26, 2025
22427fd
remove unused code
randygrok May 27, 2025
a039e4f
remove unused code
randygrok May 27, 2025
54c7c06
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
randygrok May 27, 2025
e242311
Fixes after merge
randygrok May 28, 2025
f29fa1f
fix tests
randygrok May 28, 2025
7eb6017
fix lint
randygrok May 28, 2025
a8f5ed9
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
randygrok May 28, 2025
fdef9f0
go mod tidy
randygrok May 28, 2025
0c913cb
go mod tidy
randygrok May 28, 2025
1d39a24
fix linter
randygrok May 28, 2025
9ffa5af
fix tests
randygrok May 29, 2025
a856d9f
update apps evm based
randygrok May 29, 2025
df6dc00
fix e2e
randygrok May 29, 2025
330f476
delete bins
randygrok May 29, 2025
db366b4
fix some tests
randygrok May 29, 2025
5280c5b
fix some more tests
randygrok May 29, 2025
7c0325c
Merge branch 'main' into feat/fix-block-fields-ibc
randygrok May 29, 2025
ddfd254
fix some more tests 2
randygrok May 29, 2025
51ec46b
fix some more tests 3
randygrok May 29, 2025
2ad973f
Merge branch 'main' into feat/fix-block-fields-ibc
randygrok May 29, 2025
654b267
remove comment
randygrok May 29, 2025
f892f8a
fix linter
randygrok May 29, 2025
d4b4a1e
fix failed test
randygrok May 29, 2025
65ab03c
add variadic options
randygrok Jun 2, 2025
6a441b7
bring up the stack the manager options
randygrok Jun 3, 2025
47df1ad
use latest
randygrok Jun 3, 2025
c620107
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
randygrok Jun 3, 2025
6d13bfe
remove old header hasher
randygrok Jun 4, 2025
f16a969
fix tests
randygrok Jun 4, 2025
725de12
remove unused fields
randygrok Jun 4, 2025
6ae8751
Refactor: replace createDefaultSignaturePayloadProvider with types.Cr…
randygrok Jun 4, 2025
21492c1
use utils
randygrok Jun 4, 2025
5e4aa31
some comments from the review
randygrok Jun 4, 2025
8bb299c
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
randygrok Jun 4, 2025
a54894a
fix build problem
randygrok Jun 4, 2025
be96a0c
solve e2e
randygrok Jun 4, 2025
52d4fc8
Merge branch 'main' into feat/fix-block-fields-ibc
randygrok Jun 4, 2025
d7aad29
provide default values
randygrok Jun 4, 2025
153026d
Merge branch 'feat/fix-block-fields-ibc' of github.com-randy:rollkit/…
randygrok Jun 4, 2025
5811214
fix evm tests
randygrok Jun 4, 2025
15a6cf2
Merge branch 'main' into feat/fix-block-fields-ibc
randygrok Jun 5, 2025
8728d14
Merge branch 'main' into feat/fix-block-fields-ibc
randygrok Jun 6, 2025
91a658c
remove magic number
randygrok Jun 6, 2025
372dbf1
create default header hasher now private
randygrok Jun 6, 2025
cb91837
fix tests
randygrok Jun 6, 2025
2872be6
refactor and rename the blockDataWithSignature
randygrok Jun 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into feat/fix-block-fields…
…-ibc
  • Loading branch information
randygrok committed May 27, 2025
commit 54c7c0621d7566c4c48e5241c3d6a1084e2f77e7
5 changes: 0 additions & 5 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ body:
description: Please provide versions of all relevant components
placeholder: |
Rollkit:
Go-DA:
DA Implementation:
Go-Sequencing:
Sequencing Implementation:
Go-Execution:
Execution Implementation:
validations:
required: true
Expand Down
26 changes: 1 addition & 25 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,37 +39,13 @@ jobs:
with:
go-version-file: ./go.mod
- name: Run unit test
run: go test -race -covermode=atomic -coverprofile=coverage.txt ./...
run: make test-cover
- name: upload coverage report
uses: codecov/codecov-action@v5.4.3
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.txt

test_single_sequencer:
name: Run Single Sequencer Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up go
uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- name: Run unit test
run: cd sequencers/single && go test ./...

test_da:
name: Run DA Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up go
uses: actions/setup-go@v5
with:
go-version-file: ./go.mod
- name: Run unit test
run: cd da && go test ./...

e2e-tests:
name: Run E2E System Tests
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rollkit

Rollkit is the first sovereign rollup framework. For more in-depth information about Rollkit, please visit our [website][docs].
Rollkit is the first sovereign application framework. For more in-depth information about Rollkit, please visit our [website][docs].

<!-- markdownlint-disable MD013 -->
[![Go Report Card](https://goreportcard.com/badge/github.com/rollkit/rollkit)](https://goreportcard.com/report/github.com/rollkit/rollkit)
Expand Down Expand Up @@ -44,7 +44,7 @@ testapp start

## Building with Rollkit

Rollkit is the first sovereign rollup framework that allows you to launch
Rollkit is the first sovereign application framework that allows you to launch
a sovereign, customizable blockchain as easily as a smart contract.
TestApp serves as a reference implementation to help you get started with your own Rollkit-based blockchain.

Expand Down
20 changes: 20 additions & 0 deletions apps/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
This pkg defines a set of sequencer configurations that can be used out of the box.

The configurations are:

RETH:
- Single with RETH
- Based with RETH

ABCI:
- Based with ABCI
- Single with ABCI and an attestor set

Custom:
- Single sequencer with grpc to an external execution environment
- Based with grpc to an external execution environment

These configurations can be used as examples to develop your own chain.
*/
package apps
2 changes: 1 addition & 1 deletion rollups/evm/based/README.md → apps/evm/based/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Note: Replace `<path_to>` with the actual path to your go-execution-evm reposito
|------|-------------|
| `--based.url` | URL for Celestia light node or other DA endpoint (default `http://localhost:26658`) |
| `--based.auth` | Auth token for based DA layer |
| `--based.namespace` | Hex-encoded namespace ID for submitting rollup transactions (e.g., `010203...`) |
| `--based.namespace` | Hex-encoded namespace ID for submitting transactions (e.g., `010203...`) |
| `--based.start-height` | Starting DA height for fetching transactions (default `0`) |
| `--based.max-height-drift` | Max number of DA heights to look ahead during batching (default `1`) |
| `--based.gas-multiplier` | Gas multiplier to apply on DA submission (default `1.0`) |
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions rollups/evm/based/cmd/run.go → apps/evm/based/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
}
rollDA = &client.DA
} else {
rollDA = coreda.NewDummyDA(100_000, 0, 0)
rollDA = coreda.NewDummyDA(100_000, 0, 0, nodeConfig.DA.BlockTime.Duration)
}

var basedDA coreda.DA
Expand All @@ -128,7 +128,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
}
basedDA = &client.DA
} else {
basedDA = coreda.NewDummyDA(100_000, 0, 0)
basedDA = coreda.NewDummyDA(100_000, 0, 0, nodeConfig.DA.BlockTime.Duration)
}

datastore, err := store.NewDefaultKVStore(nodeConfig.RootDir, nodeConfig.DBPath, "based")
Expand Down Expand Up @@ -171,7 +171,7 @@ func NewExtendedRunNodeCmd(ctx context.Context) *cobra.Command {
// StartNode might need adjustment if it strictly requires coreda.Client methods.
// For now, assume it can work with coreda.DA or will be adjusted later.
// We also need to pass the namespace config for rollDA.
return rollcmd.StartNode(logger, cmd, executor, sequencer, rollDA, nodeKey, p2pClient, datastore, nodeConfig)
return rollcmd.StartNode(logger, cmd, executor, sequencer, rollDA, p2pClient, datastore, nodeConfig)
},
}

Expand Down
5 changes: 1 addition & 4 deletions rollups/evm/based/go.mod → apps/evm/based/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/rollkit/rollkit/rollups/evm/based
module github.com/rollkit/rollkit/apps/evm/based

go 1.24.1

Expand Down Expand Up @@ -45,7 +45,6 @@ require (
github.com/consensys/gnark-crypto v0.14.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down Expand Up @@ -76,7 +75,6 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/flatbuffers v24.12.23+incompatible // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -177,7 +175,6 @@ require (
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rollkit/go-sequencing v0.4.1 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/rs/zerolog v1.34.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
Expand Down
4 changes: 0 additions & 4 deletions rollups/evm/based/go.sum → apps/evm/based/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
Expand Down Expand Up @@ -691,8 +689,6 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/rollkit/go-execution-evm v0.1.1-0.20250328070936-d9a866002f5f h1:FkmfAl4DPvTAWn70IGKWQUznIvv0tZ8Ou+F3CbJWCMw=
github.com/rollkit/go-execution-evm v0.1.1-0.20250328070936-d9a866002f5f/go.mod h1:qSQTrbuEBwDdiVLPTbJGxqS0KwGYHqqfmCr9VxNv4Tc=
github.com/rollkit/go-sequencing v0.4.1 h1:P0x1wUFIAhdEeqUbrRAF343iExKhq9UkVOBbi45l750=
github.com/rollkit/go-sequencing v0.4.1/go.mod h1:QnOk8mqyVgFWdMnjvZVBG4x8GC/TsRtoN5XdPZzfCSs=
github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
Expand Down
36 changes: 36 additions & 0 deletions apps/evm/based/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package main

import (
"context"
"fmt"
"os"

"github.com/rollkit/rollkit/apps/evm/based/cmd"
rollcmd "github.com/rollkit/rollkit/pkg/cmd"
"github.com/spf13/cobra"
)

const (
AppName = "evm-based"
)

var RootCmd = &cobra.Command{
Use: AppName,
Short: "evm-based is a based evm execution environment for rollkit, out of the box it works with reth",
}

func main() {
rootCmd := RootCmd
ctx := context.Background()
rootCmd.AddCommand(
cmd.NewExtendedRunNodeCmd(ctx),
rollcmd.VersionCmd,
cmd.InitCmd(),
rollcmd.NetInfoCmd,
)

if err := rootCmd.Execute(); err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
}
10 changes: 5 additions & 5 deletions rollups/evm/single/Dockerfile → apps/evm/single/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Make sure to build this from the root of the directory: rollkit
# docker build -f rollups/evm/single/Dockerfile -t ghcr.io/rollkit/rollkit-evm-single:<version> .
# docker build -f apps/evm/single/Dockerfile -t ghcr.io/rollkit/rollkit-evm-single:<version> .

FROM golang:1.24-alpine AS build-env

Expand All @@ -8,7 +8,7 @@ WORKDIR /src
COPY . .

# Uncomment the following lines to build the binary from source in the dockerfile directly
# WORKDIR /src/rollups/evm/single
# WORKDIR /src/apps/evm/single

# RUN go mod tidy -compat=1.19 && \
# CGO_ENABLED=0 go build -o /src/evm-single .
Expand All @@ -21,11 +21,11 @@ WORKDIR /root
# Copy the binary from evm-single
# Make sure to build it first with the following command:
# GOOS=linux GOARCH=amd64 go build -o evm-single .
COPY rollups/evm/single/evm-single /usr/bin/evm-single
COPY apps/evm/single/evm-single /usr/bin/evm-single

# Uncomment the following lines to build the binary from source in the dockerfile directly
# COPY --from=build-env /src/evm-single /usr/bin/evm-single
COPY rollups/evm/single/entrypoint.sh /usr/bin/entrypoint.sh
COPY apps/evm/single/entrypoint.sh /usr/bin/entrypoint.sh
RUN chmod +x /usr/bin/entrypoint.sh

ENTRYPOINT ["/usr/bin/entrypoint.sh"]
ENTRYPOINT ["/usr/bin/entrypoint.sh"]
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var RunCmd = &cobra.Command{
return err
}

return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, p2pClient, datastore, nodeConfig)
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig)
},
}

Expand Down
4 changes: 4 additions & 0 deletions apps/evm/single/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/*
This package implements a single sequencer chain for RETH
*/
package main
File renamed without changes.
5 changes: 1 addition & 4 deletions rollups/evm/single/go.mod → apps/evm/single/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/rollkit/rollkit/rollups/evm/single
module github.com/rollkit/rollkit/apps/evm/single

go 1.24.1

Expand Down Expand Up @@ -46,7 +46,6 @@ require (
github.com/consensys/gnark-crypto v0.14.0 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down Expand Up @@ -77,7 +76,6 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/flatbuffers v24.12.23+incompatible // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -178,7 +176,6 @@ require (
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rollkit/go-sequencing v0.4.1 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand Down
4 changes: 0 additions & 4 deletions rollups/evm/single/go.sum → apps/evm/single/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,6 @@ github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
Expand Down Expand Up @@ -691,8 +689,6 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
github.com/rollkit/go-execution-evm v0.1.1-0.20250328070936-d9a866002f5f h1:FkmfAl4DPvTAWn70IGKWQUznIvv0tZ8Ou+F3CbJWCMw=
github.com/rollkit/go-execution-evm v0.1.1-0.20250328070936-d9a866002f5f/go.mod h1:qSQTrbuEBwDdiVLPTbJGxqS0KwGYHqqfmCr9VxNv4Tc=
github.com/rollkit/go-sequencing v0.4.1 h1:P0x1wUFIAhdEeqUbrRAF343iExKhq9UkVOBbi45l750=
github.com/rollkit/go-sequencing v0.4.1/go.mod h1:QnOk8mqyVgFWdMnjvZVBG4x8GC/TsRtoN5XdPZzfCSs=
github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion rollups/evm/single/main.go → apps/evm/single/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
rollcmd "github.com/rollkit/rollkit/pkg/cmd"
rollkitconfig "github.com/rollkit/rollkit/pkg/config"

"github.com/rollkit/rollkit/rollups/evm/single/cmd"
"github.com/rollkit/rollkit/apps/evm/single/cmd"
)

func main() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 1 addition & 4 deletions rollups/testapp/cmd/root.go → apps/testapp/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,5 @@ func init() {
// RootCmd is the root command for Rollkit
var RootCmd = &cobra.Command{
Use: AppName,
Short: "The first sovereign rollup framework that allows you to launch a sovereign, customizable blockchain as easily as a smart contract.",
Long: `
Rollkit is the first sovereign rollup framework that allows you to launch a sovereign, customizable blockchain as easily as a smart contract.
If the --home flag is not specified, the rollkit command will create a folder "~/.testapp" where it will store node keys, config, and data.`,
Short: "Testapp is a test application for Rollkit, it consists of a simple key-value store and a single sequencer.",
}
4 changes: 2 additions & 2 deletions rollups/testapp/cmd/run.go → apps/testapp/cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"github.com/rs/zerolog"
"github.com/spf13/cobra"

kvexecutor "github.com/rollkit/rollkit/apps/testapp/kv"
"github.com/rollkit/rollkit/da/jsonrpc"
rollcmd "github.com/rollkit/rollkit/pkg/cmd"
"github.com/rollkit/rollkit/pkg/config"
"github.com/rollkit/rollkit/pkg/p2p"
"github.com/rollkit/rollkit/pkg/p2p/key"
"github.com/rollkit/rollkit/pkg/store"
kvexecutor "github.com/rollkit/rollkit/rollups/testapp/kv"
"github.com/rollkit/rollkit/sequencers/single"
)

Expand Down Expand Up @@ -106,6 +106,6 @@ var RunCmd = &cobra.Command{
return err
}

return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, nodeKey, p2pClient, datastore, nodeConfig)
return rollcmd.StartNode(logger, cmd, executor, sequencer, &daJrpc.DA, p2pClient, datastore, nodeConfig)
},
}
7 changes: 1 addition & 6 deletions rollups/testapp/go.mod → apps/testapp/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/rollkit/rollkit/rollups/testapp
module github.com/rollkit/rollkit/apps/testapp

go 1.24.1

Expand Down Expand Up @@ -34,7 +34,6 @@ require (
github.com/cloudwego/base64x v0.1.5 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cosmos/gogoproto v1.7.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
Expand All @@ -56,7 +55,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/google/flatbuffers v24.12.23+incompatible // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -149,7 +147,6 @@ require (
github.com/quic-go/quic-go v0.50.1 // indirect
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rollkit/go-sequencing v0.4.1 // indirect
github.com/rollkit/rollkit/core v0.0.0-20250312114929-104787ba1a4c // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand Down Expand Up @@ -185,8 +182,6 @@ require (
golang.org/x/tools v0.31.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.