Skip to content
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

Jump to bottom

feat(deps): add devnet-slots-in-an-epoch argument #533

Draft
wants to merge 3 commits into
base: next/2.0
Choose a base branch
from
+43 −31
Draft

feat(deps): add devnet-slots-in-an-epoch argument #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e4f2e
chore(devnet): Bump anvil version to nightly-626221f5ef44b4af950a08e0…
fmoura Jul 25, 2024
c71013f
feat(devnet): add devnet devnet-finalization-offset config
fmoura Jul 25, 2024
00405b5
chore(deps): Remove Devnet 'BlockToWaitForOnStartup' as it is no long…
fmoura Aug 27, 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
2 changes: 1 addition & 1 deletion build/docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ target "common" {
BASE_IMAGE = "debian:bookworm-20240311-slim"
RUST_VERSION = "1.78.0"
GO_VERSION = "1.22.1"
FOUNDRY_NIGHTLY_VERSION = "293fad73670b7b59ca901c7f2105bf7a29165a90"
FOUNDRY_NIGHTLY_VERSION = "626221f5ef44b4af950a08e09bd714650d9eb77d"
MACHINE_EMULATOR_VERSION = "0.18.1"
MACHINE_TOOLS_VERSION = "0.16.1"
MACHINE_IMAGE_KERNEL_VERSION = "0.20.0"
Expand Down
8 changes: 6 additions & 2 deletions cmd/cartesi-rollups-cli/root/deps/deps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,15 @@ func init() {

Cmd.Flags().StringVar(&depsConfig.Devnet.BlockTime, "devnet-block-time",
deps.DefaultDevnetBlockTime,
"Devnet mining block time")
"Devnet mining block time in seconds when 'interval mining' is enabled.")

Cmd.Flags().BoolVar(&depsConfig.Devnet.NoMining, "devnet-no-mining",
deps.DefaultDevnetNoMining,
"Devnet disable mining")
"Disable Devnet 'auto/interval mining'.")

Cmd.Flags().StringVar(&depsConfig.Devnet.BlockFinalizationOffset, "devnet-finalization-offset",
deps.DefaultSlotsInAnEpoch,
"Devnet finalization block offset in blocks")

Cmd.Flags().BoolVar(&disablePostgres, "disable-postgres", false, "Disable Postgres")

Expand Down
23 changes: 12 additions & 11 deletions docs/cli/cartesi-rollups-cli_run-deps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ cartesi-rollups-cli run-deps
### Options

```
--devnet-block-time string Devnet mining block time (default "1")
--devnet-docker-image string Devnet docker image name (default "cartesi/rollups-node-devnet:devel")
--devnet-mapped-port string Devnet local listening port number (default "8545")
--devnet-no-mining Devnet disable mining
--disable-devnet Disable Devnet
--disable-postgres Disable Postgres
-h, --help help for run-deps
--postgres-docker-image string Postgres docker image name (default "postgres:16-alpine")
--postgres-mapped-port string Postgres local listening port number (default "5432")
--postgres-password string Postgres password (default "password")
-v, --verbose verbose logs
--devnet-block-time string Devnet mining block time in seconds when 'interval mining' is enabled. (default "1")
--devnet-docker-image string Devnet docker image name (default "cartesi/rollups-node-devnet:devel")
--devnet-finalization-offset string Devnet finalization block offset in blocks (default "1")
--devnet-mapped-port string Devnet local listening port number (default "8545")
--devnet-no-mining Disable Devnet 'auto/interval mining'.
--disable-devnet Disable Devnet
--disable-postgres Disable Postgres
-h, --help help for run-deps
--postgres-docker-image string Postgres docker image name (default "postgres:16-alpine")
--postgres-mapped-port string Postgres local listening port number (default "5432")
--postgres-password string Postgres password (default "password")
-v, --verbose verbose logs
```

### SEE ALSO
Expand Down
34 changes: 21 additions & 13 deletions internal/deps/deps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ import (
)

const (
DefaultPostgresDatabase = "postgres"
DefaultPostgresDockerImage = "postgres:16-alpine"
DefaultPostgresPort = "5432"
DefaultPostgresUser = "postgres"
DefaultPostgresPassword = "password"
DefaultDevnetDockerImage = "cartesi/rollups-node-devnet:devel"
DefaultDevnetPort = "8545"
DefaultDevnetBlockTime = "1"
DefaultDevnetBlockToWaitForOnStartup = "21"
DefaultDevnetNoMining = false
DefaultPostgresDatabase = "postgres"
DefaultPostgresDockerImage = "postgres:16-alpine"
DefaultPostgresPort = "5432"
DefaultPostgresUser = "postgres"
DefaultPostgresPassword = "password"
DefaultDevnetDockerImage = "cartesi/rollups-node-devnet:devel"
DefaultDevnetPort = "8545"
DefaultDevnetBlockTime = "1"
DefaultSlotsInAnEpoch = "1"
DefaultDevnetNoMining = false

numPostgresCheckReadyAttempts = 2
pollInterval = 5 * time.Second
Expand Down Expand Up @@ -61,7 +61,7 @@ type DevnetConfig struct {
DockerImage string
Port string
BlockTime string
BlockToWaitForOnStartup string
BlockFinalizationOffset string
NoMining bool
}

Expand All @@ -77,7 +77,7 @@ func NewDefaultDepsConfig() *DepsConfig {
DefaultDevnetDockerImage,
DefaultDevnetPort,
DefaultDevnetBlockTime,
DefaultDevnetBlockToWaitForOnStartup,
DefaultSlotsInAnEpoch,
DefaultDevnetNoMining,
},
}
Expand Down Expand Up @@ -257,14 +257,22 @@ func Run(ctx context.Context, depsConfig DepsConfig) (*DepsContainers, error) {
"--load-state",
"/usr/share/devnet/anvil_state.json",
}

if depsConfig.Devnet.BlockFinalizationOffset != "" {
cmd = append(cmd,
"--slots-in-an-epoch",
depsConfig.Devnet.BlockFinalizationOffset,
)
}

var waitStrategy *wait.LogStrategy
if depsConfig.Devnet.NoMining {
cmd = append(cmd, "--no-mining")
waitStrategy = wait.ForLog("net_listening")
} else {
cmd = append(cmd, "--block-time",
depsConfig.Devnet.BlockTime)
waitStrategy = wait.ForLog("Block Number: " + depsConfig.Devnet.BlockToWaitForOnStartup)
waitStrategy = wait.ForLog("Listening on 0.0.0.0:8545")
}
devNetReq := testcontainers.ContainerRequest{
Image: depsConfig.Devnet.DockerImage,
Expand Down
7 changes: 3 additions & 4 deletions internal/node/machinehash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,9 @@ func createMachineSnapshot() (string, error) {
func startDevnet() (*deps.DepsContainers, error) {
container, err := deps.Run(context.Background(), deps.DepsConfig{
Devnet: &deps.DevnetConfig{
DockerImage: deps.DefaultDevnetDockerImage,
BlockTime: deps.DefaultDevnetBlockTime,
BlockToWaitForOnStartup: deps.DefaultDevnetBlockToWaitForOnStartup,
Port: testutil.GetCartesiTestDepsPortRange(),
DockerImage: deps.DefaultDevnetDockerImage,
BlockTime: deps.DefaultDevnetBlockTime,
Port: testutil.GetCartesiTestDepsPortRange(),
},
})
if err != nil {
Expand Down
Loading