Feature/correct machine advancer

.github/workflows/build.yml

@@ -19,6 +19,51 @@ permissions:
   contents: write
 
 jobs:
+  build-ci-base:
+    runs-on: ubuntu-22.04
+    outputs:
+      output: ${{ steps.export_tag.outputs.image_tag }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            name=ghcr.io/cartesi/rollups-node-ci
+          tags: |
+            type=semver,pattern={{version}}
+            type=ref,event=branch
+            type=ref,event=pr
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: depot/setup-action@v1
+      - name: Build and push docker image
+        id: docker_build
+        uses: depot/bake-action@v1
+        with:
+          files: |
+            ./docker-bake.hcl
+            ${{ steps.docker_meta.outputs.bake-file }}
+            ./docker-bake.platforms.hcl
+          targets: rollups-node-ci
+          push: true
+          project: ${{ vars.DEPOT_PROJECT }}
+          workdir: build
+
+      - name: Export Image Tag
+        id : export_tag
+        run : echo "image_tag=${{steps.docker_meta.outputs.version}}" >> "$GITHUB_OUTPUT"
+
   do-basic-checks:
     runs-on: ubuntu-22.04
     steps:
@@ -40,16 +85,38 @@ jobs:
           path: ./
           config: .github/license-check/config.json
 
-      - name: Check auto generated files
-        run: make check-generate
-
       - name: Lint Markdown docs
         uses: DavidAnson/markdownlint-cli2-action@v16
         with:
           globs: |
             *.md
             docs/*.md
 
+  check-generated-files:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/cartesi/rollups-node-ci:${{needs.build-ci-base.outputs.output}}
+    needs:
+      - build-ci-base
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Fix VCS Issue
+        run : git config --global --add safe.directory /__w/rollups-node/rollups-node
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+            go-version-file: 'go.mod'
+
+      - name: Check auto generated files
+        run: make check-generate
+
+
   test-rust:
     runs-on: ubuntu-22.04
     env:
@@ -126,51 +193,6 @@ jobs:
       - name: Run tests
         run: cargo test
 
-  build-ci-base:
-    runs-on: ubuntu-22.04
-    outputs:
-      output: ${{ steps.export_tag.outputs.image_tag }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            name=ghcr.io/cartesi/rollups-node-ci
-          tags: |
-            type=semver,pattern={{version}}
-            type=ref,event=branch
-            type=ref,event=pr
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: depot/setup-action@v1
-      - name: Build and push docker image
-        id: docker_build
-        uses: depot/bake-action@v1
-        with:
-          files: |
-            ./docker-bake.hcl
-            ${{ steps.docker_meta.outputs.bake-file }}
-            ./docker-bake.platforms.hcl
-          targets: rollups-node-ci
-          push: true
-          project: ${{ vars.DEPOT_PROJECT }}
-          workdir: build
-
-      - name: Export Image Tag
-        id : export_tag
-        run : echo "image_tag=${{steps.docker_meta.outputs.version}}" >> "$GITHUB_OUTPUT"
-
   test-go:
     runs-on: ubuntu-22.04
     container:

build/Dockerfile

@@ -375,6 +375,42 @@ ARG GO_BUILD_PATH
 ARG ROLLUPS_NODE_VERSION
 WORKDIR ${GO_BUILD_PATH}
 
+ARG MACHINE_EMULATOR_VERSION
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install ca-certificates and curl (setup).
+RUN <<EOF
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends ca-certificates curl
+EOF
+
+# Install the cartesi-machine (cartesi/machine-emulator).
+RUN <<EOF
+    set -e
+    URL=https://github.com/cartesi/machine-emulator/releases/download
+    VERSION=v${MACHINE_EMULATOR_VERSION}
+    ARCH=$(dpkg --print-architecture)
+    ARTIFACT=cartesi-machine-${VERSION}_${ARCH}.deb
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./cartesi-machine.deb
+    apt-get install -y ./cartesi-machine.deb
+    rm ./cartesi-machine.deb
+EOF
+
+# Configure cartesi user and cartesi group.
+RUN <<EOF
+    set -e
+    addgroup --system --gid 102 cartesi
+    adduser --system --uid 102 \
+        --disabled-login \
+        --gecos "cartesi user" \
+        --home /nonexistent \
+        --ingroup cartesi \
+        --no-create-home \
+        --shell /bin/false \
+        cartesi
+EOF
+
 # Download external dependencies.
 COPY go.mod .
 COPY go.sum .

cmd/cartesi-rollups-advancer/main.go

@@ -0,0 +1,105 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+package main
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/cartesi/rollups-node/internal/node/advancer"
+	"github.com/cartesi/rollups-node/internal/node/advancer/machines"
+	"github.com/cartesi/rollups-node/internal/node/config"
+	"github.com/cartesi/rollups-node/internal/node/startup"
+	"github.com/cartesi/rollups-node/internal/repository"
+	"github.com/spf13/cobra"
+)
+
+const CMD_NAME = "advancer"
+
+var (
+	buildVersion = "devel"
+	Cmd          = &cobra.Command{
+		Use:   CMD_NAME,
+		Short: "Runs the Advancer",
+		Long:  "Runs the Advancer in standalone mode",
+		Run:   run,
+	}
+)
+
+func init() {
+	flags := Cmd.Flags()
+	flags.BytesHex("application-address", nil, "")
+	flags.String("server-address", "", "")
+	flags.String("snapshot", "", "")
+	flags.Int64("snapshot-input-index", -1, "")
+	flags.Uint64("machine-inc-cycles", 50_000_000, "")
+	flags.Uint64("machine-max-cycles", 5_000_000_000, "")
+	flags.Uint64("machine-advance-timeout", 60, "")
+	flags.Uint64("machine-inspect-timeout", 10, "")
+}
+
+func main() {
+	err := Cmd.Execute()
+	if err != nil {
+		os.Exit(1)
+	}
+}
+
+func getDatabase(ctx context.Context, c config.NodeConfig) (*repository.Database, error) {
+	err := startup.ValidateSchema(c)
+	if err != nil {
+		return nil, fmt.Errorf("invalid database schema: %w", err)
+	}
+
+	database, err := repository.Connect(ctx, c.PostgresEndpoint.Value)
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect to the database: %w", err)
+	}
+
+	return database, nil
+}
+
+func run(cmd *cobra.Command, args []string) {
+	startTime := time.Now()
+
+	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer stop()
+
+	c := config.FromEnv()
+	startup.ConfigLogs(c)
+
+	slog.Info("Starting the Cartesi Rollups Node Advancer", "version", buildVersion, "config", c)
+
+	database, err := getDatabase(ctx, c)
+	if err != nil {
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+	defer database.Close()
+
+	repo := &repository.AdvancerRepository{Database: database}
+
+	machines, err := machines.Load(ctx, c, repo)
+	if err != nil {
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+	defer machines.Close()
+
+	advancer, err := advancer.New(machines, repo)
+
+	poller, err := advancer.Poller(5 * time.Second)
+
+	ready := make(chan struct{}, 1)
+
+	if err := poller.Start(ctx, ready); err != nil {
+		slog.Error("advancer exited with an error", "error", err)
+		os.Exit(1)
+	}
+}

cmd/cartesi-rollups-cli/root/app/add/add.go

@@ -118,7 +118,7 @@ func run(cmd *cobra.Command, args []string) {
 		IConsensusAddress:  common.HexToAddress(iConsensusAddress),
 	}
 
-	err := cmdcommom.Database.InsertApplication(ctx, &application)
+	_, err := cmdcommom.Database.InsertApplication(ctx, &application)
 	cobra.CheckErr(err)
 	fmt.Printf("Application %v successfully added\n", application.ContractAddress)
 }

cmd/cartesi-rollups-cli/root/db/check/check.go

@@ -3,10 +3,10 @@
 package check
 
 import (
-	"fmt"
+	"log/slog"
 
 	"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/root/common"
-	"github.com/cartesi/rollups-node/internal/repository"
+	"github.com/cartesi/rollups-node/internal/repository/schema"
 	"github.com/spf13/cobra"
 )
 
@@ -17,13 +17,12 @@ var Cmd = &cobra.Command{
 }
 
 func run(cmd *cobra.Command, args []string) {
-
-	schemaManager, err := repository.NewSchemaManager(common.PostgresEndpoint)
+	schema, err := schema.New(common.PostgresEndpoint)
 	cobra.CheckErr(err)
-	defer schemaManager.Close()
+	defer schema.Close()
 
-	err = schemaManager.ValidateSchemaVersion()
+	version, err := schema.ValidateVersion()
 	cobra.CheckErr(err)
 
-	fmt.Printf("Database Schema is at the correct version: %d\n", repository.EXPECTED_VERSION)
+	slog.Info("Database Schema is at the correct version.", "version", version)
 }

cmd/cartesi-rollups-cli/root/db/upgrade/upgrade.go

@@ -3,11 +3,10 @@
 package upgrade
 
 import (
-	"fmt"
 	"log/slog"
 
 	"github.com/cartesi/rollups-node/cmd/cartesi-rollups-cli/root/common"
-	"github.com/cartesi/rollups-node/internal/repository"
+	"github.com/cartesi/rollups-node/internal/repository/schema"
 	"github.com/spf13/cobra"
 )
 
@@ -18,21 +17,15 @@ var Cmd = &cobra.Command{
 }
 
 func run(cmd *cobra.Command, args []string) {
-
-	schemaManager, err := repository.NewSchemaManager(common.PostgresEndpoint)
+	schema, err := schema.New(common.PostgresEndpoint)
 	cobra.CheckErr(err)
-	defer schemaManager.Close()
+	defer schema.Close()
 
-	err = schemaManager.Upgrade()
+	err = schema.Upgrade()
 	cobra.CheckErr(err)
 
-	version, err := schemaManager.GetVersion()
+	version, err := schema.ValidateVersion()
 	cobra.CheckErr(err)
 
-	if repository.EXPECTED_VERSION != version {
-		slog.Warn("Current version is different to expected one")
-	}
-
-	fmt.Printf("Database Schema successfully Updated. Current version is %d\n", version)
-
+	slog.Info("Database Schema successfully Updated.", "version", version)
 }