Feat: use cmd to setup data committee

.github/workflows/push-docker-develop.yml

@@ -29,4 +29,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            hermeznetwork/zkevm-node:develop
+            hermeznetwork/cdk-validium-node:develop

.github/workflows/push-docker-tagged.yml

@@ -30,4 +30,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            hermeznetwork/zkevm-node:${{ github.ref_name }}
+            hermeznetwork/cdk-validium-node:${{ github.ref_name }}

.github/workflows/test-e2e.yml

@@ -17,7 +17,7 @@ jobs:
       matrix:
         go-version: [ 1.19.x ]
         goarch: [ "amd64" ]
-        e2e-group: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
+        e2e-group: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, cdk-validium-1 ]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code

.gitignore

@@ -16,6 +16,6 @@
 .env
 out.dat
 
-cmd/__debug_bin
+**__debug_bin
 
 .venv

Dockerfile

@@ -13,8 +13,7 @@ RUN cd /src && make build
 
 # CONTAINER FOR RUNNING BINARY
 FROM alpine:3.18.0
-COPY --from=build /src/dist/zkevm-node /app/zkevm-node
-COPY --from=build /src/config/environments/testnet/node.config.toml /app/example.config.toml
+COPY --from=build /src/dist/cdk-validium-node /app/cdk-validium-node
 RUN apk update && apk add postgresql15-client
 EXPOSE 8123
-CMD ["/bin/sh", "-c", "/app/zkevm-node run"]
+CMD ["/bin/sh", "-c", "/app/cdk-validium-node run"]

Makefile

@@ -12,13 +12,13 @@ endif
 GOBASE := $(shell pwd)
 GOBIN := $(GOBASE)/dist
 GOENVVARS := GOBIN=$(GOBIN) CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH)
-GOBINARY := zkevm-node
+GOBINARY := cdk-validium-node
 GOCMD := $(GOBASE)/cmd
 
-LDFLAGS += -X 'github.com/0xPolygonHermez/zkevm-node.Version=$(VERSION)'
-LDFLAGS += -X 'github.com/0xPolygonHermez/zkevm-node.GitRev=$(GITREV)'
-LDFLAGS += -X 'github.com/0xPolygonHermez/zkevm-node.GitBranch=$(GITBRANCH)'
-LDFLAGS += -X 'github.com/0xPolygonHermez/zkevm-node.BuildDate=$(DATE)'
+LDFLAGS += -X 'github.com/0xPolygon/cdk-validium-node.Version=$(VERSION)'
+LDFLAGS += -X 'github.com/0xPolygon/cdk-validium-node.GitRev=$(GITREV)'
+LDFLAGS += -X 'github.com/0xPolygon/cdk-validium-node.GitBranch=$(GITBRANCH)'
+LDFLAGS += -X 'github.com/0xPolygon/cdk-validium-node.BuildDate=$(DATE)'
 
 # Variables
 VENV           = .venv
@@ -35,25 +35,11 @@ build: ## Builds the binary locally into ./dist
 
 .PHONY: build-docker
 build-docker: ## Builds a docker image with the node binary
-	docker build -t zkevm-node -f ./Dockerfile .
+	docker build -t snapchain/cdk-validium-node -f ./Dockerfile .
 
 .PHONY: build-docker-nc
 build-docker-nc: ## Builds a docker image with the node binary - but without build cache
-	docker build --no-cache=true -t zkevm-node -f ./Dockerfile .
-
-.PHONY: run-rpc
-run-rpc: ## Runs all the services need to run a local zkEMV RPC node
-	docker-compose up -d zkevm-state-db zkevm-pool-db
-	sleep 2
-	docker-compose up -d zkevm-prover
-	sleep 5
-	docker-compose up -d zkevm-sync
-	sleep 2
-	docker-compose up -d zkevm-rpc
-
-.PHONY: stop
-stop: ## Stops all services
-	docker-compose down
+	docker build --no-cache=true -t snapchain/cdk-validium-node -f ./Dockerfile .
 
 .PHONY: install-linter
 install-linter: ## Installs the linter
@@ -119,9 +105,9 @@ install-git-hooks: ## Moves hook files to the .git/hooks directory
 
 .PHONY: generate-code-from-proto
 generate-code-from-proto: ## Generates code from proto files
-	cd proto/src/proto/hashdb/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../merkletree/pb --go-grpc_out=../../../../../merkletree/pb --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative hashdb.proto
+	cd proto/src/proto/hashdb/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../merkletree/hashdb --go-grpc_out=../../../../../merkletree/hashdb --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative hashdb.proto
 	cd proto/src/proto/executor/v1 && protoc --proto_path=. --go_out=../../../../../state/runtime/executor --go-grpc_out=../../../../../state/runtime/executor --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative executor.proto
-	cd proto/src/proto/aggregator/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../aggregator/pb --go-grpc_out=../../../../../aggregator/pb --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative aggregator.proto
+	cd proto/src/proto/aggregator/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../aggregator/prover --go-grpc_out=../../../../../aggregator/prover --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative aggregator.proto
 
 ## Help display.
 ## Pulls comments from beside commands and prints a nicely formatted
@@ -132,4 +118,4 @@ generate-code-from-proto: ## Generates code from proto files
 help: ## Prints this help
 		@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
 		| sort \
-		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'