Skip to content

feat: enable mock servers with intercept command #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MSevey merged 15 commits into from
Nov 13, 2024
Merged

feat: enable mock servers with intercept command #1911

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ed0de75
feat: add default rollup id to be used with mock sequencer
MSevey Nov 5, 2024
5933aa2
chore: fix flag handling
MSevey Nov 8, 2024
56fd800
fix: resolve errors around handling rollup id flag
MSevey Nov 8, 2024
28057b2
feat: add mock services to intercept command
MSevey Nov 8, 2024
a145f2f
chore: clean up handling of starting or connecting to sequencer
MSevey Nov 8, 2024
e1c6810
chore: clean up handling of da and sequencing flags
MSevey Nov 8, 2024
d7b7dfc
chore: clean up intercept command
MSevey Nov 8, 2024
9ed62e3
chore: update flag parsing
MSevey Nov 8, 2024
b92ebb6
fix: wrong input
MSevey Nov 8, 2024
033678b
chore: update cli docs
MSevey Nov 8, 2024
95f06c5
chore: clean up
MSevey Nov 8, 2024
7c22e63
Merge branch 'main' of github.com:rollkit/rollkit into default-rollup-id
MSevey Nov 13, 2024
4025fa6
chore: minor typo fix
MSevey Nov 13, 2024
0ab8f17
feat: only start mock servers for intercept if start command
MSevey Nov 13, 2024
82a5d36
chore: remove unnecessary breakpoint
MSevey Nov 13, 2024
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
feat: only start mock servers for intercept if start command
  • Loading branch information
@MSevey
MSevey committed Nov 13, 2024
commit 0ab8f176abb498bbe12a3cbb9eb34a83b440958c
66 changes: 35 additions & 31 deletions cmd/rollkit/commands/intercept.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func InterceptCommand(
) (shouldExecute bool, err error) {
// Grab flags and verify command
flags := []string{}
isStartCommand := false
if len(os.Args) >= 2 {
flags = os.Args[1:]

Expand All @@ -36,6 +37,7 @@ func InterceptCommand(
"version", "--version", "v", "-v":
return
case "start":
isStartCommand = true
goto readTOML
Comment thread
MSevey marked this conversation as resolved.
Resolved
}

Expand Down Expand Up @@ -67,39 +69,41 @@ readTOML:
return
}

// Try and launch mock services or connect to default addresses
daAddress := parseFlag(flags, rollconf.FlagDAAddress)
if daAddress == "" {
daAddress = rollconf.DefaultDAAddress
}
daSrv, err := tryStartMockDAServJSONRPC(rollkitCommand.Context(), daAddress, proxy.NewServer)
if err != nil && !errors.Is(err, errDAServerAlreadyRunning) {
return shouldExecute, fmt.Errorf("failed to launch mock da server: %w", err)
}
// nolint:errcheck,gosec
defer func() {
if daSrv != nil {
daSrv.Stop(rollkitCommand.Context())
if isStartCommand {
// Try and launch mock services or connect to default addresses
daAddress := parseFlag(flags, rollconf.FlagDAAddress)
if daAddress == "" {
daAddress = rollconf.DefaultDAAddress
}
}()
sequencerAddress := parseFlag(flags, rollconf.FlagSequencerAddress)
if sequencerAddress == "" {
sequencerAddress = rollconf.DefaultSequencerAddress
}
rollupID := parseFlag(flags, rollconf.FlagSequencerRollupID)
if rollupID == "" {
rollupID = rollconf.DefaultSequencerRollupID
}
seqSrv, err := tryStartMockSequencerServerGRPC(sequencerAddress, rollupID)
if err != nil && !errors.Is(err, errSequencerAlreadyRunning) {
return shouldExecute, fmt.Errorf("failed to launch mock sequencing server: %w", err)
}
// nolint:errcheck,gosec
defer func() {
if seqSrv != nil {
seqSrv.Stop()
daSrv, err := tryStartMockDAServJSONRPC(rollkitCommand.Context(), daAddress, proxy.NewServer)
if err != nil && !errors.Is(err, errDAServerAlreadyRunning) {
return shouldExecute, fmt.Errorf("failed to launch mock da server: %w", err)
}
}()
// nolint:errcheck,gosec
defer func() {
if daSrv != nil {
daSrv.Stop(rollkitCommand.Context())
}
}()
sequencerAddress := parseFlag(flags, rollconf.FlagSequencerAddress)
if sequencerAddress == "" {
sequencerAddress = rollconf.DefaultSequencerAddress
}
rollupID := parseFlag(flags, rollconf.FlagSequencerRollupID)
if rollupID == "" {
rollupID = rollconf.DefaultSequencerRollupID
}
seqSrv, err := tryStartMockSequencerServerGRPC(sequencerAddress, rollupID)
if err != nil && !errors.Is(err, errSequencerAlreadyRunning) {
return shouldExecute, fmt.Errorf("failed to launch mock sequencing server: %w", err)
}
// nolint:errcheck,gosec
defer func() {
if seqSrv != nil {
seqSrv.Stop()
}
}()
}
return shouldExecute, runEntrypoint(&rollkitConfig, flags)
}

Expand Down