Merge branch 'main' into chore/sync-main-with-develop

.github/workflows/arm_deb_packager.yml

@@ -42,41 +42,41 @@ jobs:
         run: make build
 
       - name: making directory structure
-        run: mkdir -p packaging/deb/aggkit/usr/bin/
+        run: mkdir -p packaging/deb/cdk/usr/bin/
       - name: copying necessary binary for arm64
         run: cp -rp target/aggkit-node packaging/deb/aggkit/usr/bin/aggkit-node
 
       # Control file creation
       - name: Create control file
         run: |
-          echo "Package: aggkit" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Version: ${{ env.VERSION }}" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Section: base" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Priority: optional" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Architecture: arm64" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Maintainer: [email protected]" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Description: aggkit binary package" >> packaging/deb/aggkit/DEBIAN/control
+          echo "Package: cdk" >> packaging/deb/cdk/DEBIAN/control
+          echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk/DEBIAN/control
+          echo "Section: base" >> packaging/deb/cdk/DEBIAN/control
+          echo "Priority: optional" >> packaging/deb/cdk/DEBIAN/control
+          echo "Architecture: arm64" >> packaging/deb/cdk/DEBIAN/control
+          echo "Maintainer: [email protected]" >> packaging/deb/cdk/DEBIAN/control
+          echo "Description: cdk binary package" >> packaging/deb/cdk/DEBIAN/control
 
-      - name: Creating package for binary for aggkit ${{ env.ARCH }}
-        run: cp -rp packaging/deb/aggkit packaging/deb/aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}
+      - name: Creating package for binary for cdk ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64
 
       - name: Running package build
-        run: dpkg-deb --build --root-owner-group packaging/deb/aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64
 
       - name: create checksum for the arm64 package
-        run: cd packaging/deb/ && sha256sum aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        run: cd packaging/deb/ && sha256sum cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
         env:
           ARCH: arm64
 
-      - name: Release aggkit Packages
+      - name: Release cdk Packages
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
           prerelease: true
           files: |
-            packaging/deb/aggkit**.deb
-            packaging/deb/aggkit**.deb.checksum
+            packaging/deb/cdk**.deb
+            packaging/deb/cdk**.deb.checksum

.github/workflows/arm_rpm_packager.yml

@@ -48,20 +48,20 @@ jobs:
           mkdir -p packaging/rpm/RPMS
           mkdir -p packaging/rpm/SRPMS
           
-          touch packaging/rpm/aggkit.spec 
-          echo "Name: aggkit" >> packaging/rpm/SPECS/aggkit.spec
-          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/aggkit.spec
-          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/aggkit.spec
-          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/aggkit.spec
-          echo "BuildArch: aarch64" >> packaging/rpm/SPECS/aggkit.spec
-          echo "Summary: aggkit rpm package" >> packaging/rpm/SPECS/aggkit.spec
+          touch packaging/rpm/cdk.spec 
+          echo "Name: cdk" >> packaging/rpm/SPECS/cdk.spec
+          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/cdk.spec
+          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/cdk.spec
+          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/cdk.spec
+          echo "BuildArch: aarch64" >> packaging/rpm/SPECS/cdk.spec
+          echo "Summary: cdk rpm package" >> packaging/rpm/SPECS/cdk.spec
           
-          echo "%description" >> packaging/rpm/SPECS/aggkit.spec
-          echo "aggkit rpm package" >> packaging/rpm/SPECS/aggkit.spec
+          echo "%description" >> packaging/rpm/SPECS/cdk.spec
+          echo "cdk rpm package" >> packaging/rpm/SPECS/cdk.spec
           
-          echo "%pre" >> packaging/rpm/SPECS/aggkit.spec
-          echo "getent group aggkit >/dev/null || groupadd -r aggkit" >> packaging/rpm/SPECS/aggkit.spec
-          echo "getent passwd aggkit >/dev/null || useradd -s /bin/false -d /opt/aggkit -r aggkit -g aggkit" >> packaging/rpm/SPECS/aggkit.spec
+          echo "%pre" >> packaging/rpm/SPECS/cdk.spec
+          echo "getent group cdk >/dev/null || groupadd -r cdk" >> packaging/rpm/SPECS/cdk.spec
+          echo "getent passwd cdk >/dev/null || useradd -s /bin/false -d /opt/cdk -r cdk -g cdk" >> packaging/rpm/SPECS/cdk.spec
           
           echo "%install" >> packaging/rpm/SPECS/aggkit.spec
           echo "mkdir -p %{buildroot}/usr/bin" >> packaging/rpm/SPECS/aggkit.spec
@@ -75,24 +75,24 @@ jobs:
 
       - name: Construct rpm package
         run: |
-          rpmbuild --define "_topdir /home/runner/work/aggkit/aggkit/packaging/rpm_build" \
+          rpmbuild --define "_topdir /home/runner/work/cdk/cdk/packaging/rpm_build" \
                    --define "_builddir %{_topdir}/BUILD" \
                    --define "_rpmdir %{_topdir}/RPMS" \
                    --define "_srcrpmdir %{_topdir}/SRPMS" \
                    --define "__spec_install_post /bin/true" \
-                   -bb packaging/rpm/SPECS/aggkit.spec
+                   -bb packaging/rpm/SPECS/cdk.spec
 
       - name: Rename file for post rpm build and for checksum
-        run: mv /home/runner/work/aggkit/aggkit/packaging/rpm_build/RPMS/aarch64/aggkit-${{ env.GIT_TAG1 }}-1.aarch64.rpm /home/runner/work/aggkit/aggkit/packaging/rpm_build/RPMS/aarch64/aggkit-${{ env.GIT_TAG1 }}.aarch64.rpm
+        run: mv /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}-1.aarch64.rpm /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm
 
       - name: Checksum for the rpm package
-        run: sha256sum /home/runner/work/aggkit/aggkit/packaging/rpm_build/RPMS/aarch64/aggkit-${{ env.GIT_TAG1 }}.aarch64.rpm > /home/runner/work/aggkit/aggkit/packaging/rpm_build/RPMS/aarch64/aggkit-${{ env.GIT_TAG1 }}.aarch64.rpm.checksum
+        run: sha256sum /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm > /home/runner/work/cdk/cdk/packaging/rpm_build/RPMS/aarch64/cdk-${{ env.GIT_TAG1 }}.aarch64.rpm.checksum
 
-      - name: Release aggkit Packages
+      - name: Release cdk Packages
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
           prerelease: true
           files: |
-            packaging/rpm_build/RPMS/aarch64/aggkit-**.rpm
-            packaging/rpm_build/RPMS/aarch64/aggkit-**.rpm.checksum
+            packaging/rpm_build/RPMS/aarch64/cdk-**.rpm
+            packaging/rpm_build/RPMS/aarch64/cdk-**.rpm.checksum

.github/workflows/test-resequence.yml

@@ -17,10 +17,10 @@ jobs:
     #   matrix:
     #     da-mode: [ "rollup" ]
     steps:
-      - name: Checkout aggkit
+      - name: Checkout cdk
         uses: actions/checkout@v4
         with:
-          path: aggkit
+          path: cdk
 
       - name: Checkout cdk-erigon
         uses: actions/checkout@v4
@@ -50,8 +50,8 @@ jobs:
           /usr/local/bin/polycli version
 
       - name: Build docker image
-        working-directory: ./aggkit
-        run: docker build -t aggkit:local --file Dockerfile .
+        working-directory: ./cdk
+        run: docker build -t cdk:local --file Dockerfile .
 
       - name: Remove unused flags
         working-directory: ./kurtosis-cdk

.github/workflows/test-unit.yml

@@ -37,4 +37,4 @@ jobs:
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/x86_deb_packager.yml

@@ -41,42 +41,42 @@ jobs:
         run: make build
 
       - name: making directory structure
-        run: mkdir -p packaging/deb/aggkit/usr/bin/
+        run: mkdir -p packaging/deb/cdk/usr/bin/
       - name: copying necessary binary for amd64
         run: cp -rp target/aggkit-node packaging/deb/aggkit/usr/bin/aggkit-node
 
       # Control file creation
       - name: Create control file
         run: |
-          echo "Package: aggkit" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Version: ${{ env.VERSION }}" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Section: base" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Priority: optional" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Architecture: amd64" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Maintainer: [email protected]" >> packaging/deb/aggkit/DEBIAN/control
-          echo "Description: aggkit binary package" >> packaging/deb/aggkit/DEBIAN/control
+          echo "Package: cdk" >> packaging/deb/cdk/DEBIAN/control
+          echo "Version: ${{ env.VERSION }}" >> packaging/deb/cdk/DEBIAN/control
+          echo "Section: base" >> packaging/deb/cdk/DEBIAN/control
+          echo "Priority: optional" >> packaging/deb/cdk/DEBIAN/control
+          echo "Architecture: amd64" >> packaging/deb/cdk/DEBIAN/control
+          echo "Maintainer: [email protected]" >> packaging/deb/cdk/DEBIAN/control
+          echo "Description: cdk binary package" >> packaging/deb/cdk/DEBIAN/control
 
-      - name: Creating package for binary for aggkit ${{ env.ARCH }}
-        run: cp -rp packaging/deb/aggkit packaging/deb/aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}
+      - name: Creating package for binary for cdk ${{ env.ARCH }}
+        run: cp -rp packaging/deb/cdk packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: amd64
 
       - name: Running package build
-        run: dpkg-deb --build --root-owner-group packaging/deb/aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}
+        run: dpkg-deb --build --root-owner-group packaging/deb/cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: amd64
 
       - name: Create checksum for the amd64 package
-        run: cd packaging/deb/ && sha256sum aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > aggkit-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
+        run: cd packaging/deb/ && sha256sum cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb > cdk-${{ env.GIT_TAG }}-${{ env.ARCH }}.deb.checksum
         env:
           ARCH: amd64
 
 
-      - name: Release aggkit Packages
+      - name: Release cdk Packages
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
           prerelease: true
           files: |
-            packaging/deb/aggkit**.deb
-            packaging/deb/aggkit**.deb.checksum
+            packaging/deb/cdk**.deb
+            packaging/deb/cdk**.deb.checksum

Dockerfile

@@ -28,4 +28,4 @@ USER appuser
 
 EXPOSE 5576/tcp
 
-CMD ["/bin/sh", "-c", "aggkit"]
+CMD ["/bin/sh", "-c", "cdk"]

Makefile

@@ -12,7 +12,7 @@ endif
 GOBASE := $(shell pwd)
 GOBIN := $(GOBASE)/target
 GOENVVARS := GOBIN=$(GOBIN) CGO_ENABLED=1 GOARCH=$(ARCH)
-GOBINARY := aggkit
+GOBINARY := cdk-node
 GOCMD := $(GOBASE)/cmd
 
 LDFLAGS += -X 'github.com/agglayer/aggkit.Version=$(VERSION)'
@@ -61,12 +61,12 @@ build-tools: ## Builds the tools
 	$(GOENVVARS) go build -o $(GOBIN)/aggsender_find_imported_bridge ./tools/aggsender_find_imported_bridge
 
 .PHONY: build-docker
-build-docker: ## Builds a docker image with the aggkit binary
-	docker build -t aggkit -f ./Dockerfile .
+build-docker: ## Builds a docker image with the cdk binary
+	docker build -t cdk -f ./Dockerfile .
 
 .PHONY: build-docker-nc
-build-docker-nc: ## Builds a docker image with the aggkit binary - but without build cache
-	docker build --no-cache=true -t aggkit -f ./Dockerfile .
+build-docker-nc: ## Builds a docker image with the cdk binary - but without build cache
+	docker build --no-cache=true -t cdk -f ./Dockerfile .
 
 .PHONY: test-unit
 test-unit: