Revert "Fix migration "

.gitignore

@@ -19,17 +19,3 @@ local-geth/*
 **/thumbs.db
 **/desktop.ini
 **/.directory
-.idea/
-
-# generated files
-scripts/generated
-localstate.swagger.json
-**/swagger-bindata/bindata.go
-**/*.pb.go
-**/*.capnp.go
-**/*.pb.gw.go
-**/*_mngen.go
-**/*_mngen_test.go
-node_modules/
-**/package-lock.json
-package.json

.vscode/launch.json

@@ -14,40 +14,49 @@
       "args": ["--config", "./assets/config/bootnode.toml", "bootnode"]
     },
     {
-      "name": "val1",
+      "name": "validator0",
       "type": "go",
       "request": "launch",
       "mode": "debug",
       "program": "${workspaceFolder}/cmd",
       "cwd": "${workspaceFolder}",
-      "args": ["--config", "./scripts/generated/config/validator1.toml", "validator"]
+      "args": ["--config", "./assets/config/validator0.toml", "validator"]
     },
     {
-      "name": "val2",
+      "name": "validator1",
       "type": "go",
       "request": "launch",
       "mode": "debug",
       "program": "${workspaceFolder}/cmd",
       "cwd": "${workspaceFolder}",
-      "args": ["--config", "./scripts/generated/config/validator2.toml", "validator"]
+      "args": ["--config", "./assets/config/validator1.toml", "validator"]
     },
     {
-      "name": "val3",
+      "name": "validator2",
       "type": "go",
       "request": "launch",
       "mode": "debug",
       "program": "${workspaceFolder}/cmd",
       "cwd": "${workspaceFolder}",
-      "args": ["--config", "./scripts/generated/config/validator3.toml", "validator"]
+      "args": ["--config", "./assets/config/validator2.toml", "validator"]
     },
     {
-      "name": "val4",
+      "name": "validator3",
       "type": "go",
       "request": "launch",
       "mode": "debug",
       "program": "${workspaceFolder}/cmd",
       "cwd": "${workspaceFolder}",
-      "args": ["--config", "./scripts/generated/config/validator4.toml", "validator"]
+      "args": ["--config", "./assets/config/validator3.toml", "validator"]
     },
+    {
+      "name": "validator4",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceFolder}/cmd",
+      "cwd": "${workspaceFolder}",
+      "args": ["--config", "./assets/config/validator4.toml", "validator"]
+    }
   ]
 }

Makefile

@@ -1,35 +1,18 @@
+GOCMD=go
+GOBUILD=$(GOCMD) build
+GOCLEAN=$(GOCMD) clean
+GOGET=$(GOCMD) get
 BINARY_NAME=madnet
 RACE_DETECTOR=madrace
-YELLOW=\033[0;33;1m
-NOCOL=\033[31;0m
 
-build:
-	go build -o $(BINARY_NAME) ./cmd/main.go;
+all: test build
 
-race:
-	go build -o $(RACE_DETECTOR) -race ./cmd/main.go;
-
-generate: generate-bridge generate-go
+build: 
+	$(GOCMD) build -o $(BINARY_NAME) ./cmd/main.go
 
-generate-bridge:
-	export MSYS_NO_PATHCONV=1 &&\
-	export PASS_PERMVARS=1 &&\
-	mkdir bridge/node_modules 2>/dev/null || true &&\
-	docker/update-container.sh docker/generate-bridge/Dockerfile madnet-generate-bridge "-v $$PWD/bridge:/app -v /app/node_modules/" &&\
-	docker start -ia madnet-generate-bridge
-
-generate-go:
-	export MSYS_NO_PATHCONV=1 &&\
-	export PASS_PERMVARS=1 &&\
-	./docker/update-container.sh docker/generate-go/Dockerfile madnet-generate-go "-v $$PWD:/app -v /app/bridge -v /app/.git" &&\
-	docker start -ia madnet-generate-go
+race:
+	$(GOCMD) build -o $(RACE_DETECTOR) -race ./cmd/main.go
 
-clean:
-	go clean
+clean: 
+	$(GOCLEAN)
 	rm -f $(BINARY_NAME)
-	rm -f $(RACE_DETECTOR)
-	rm -rf localrpc/swagger-bindata/bindata.go localrpc/swagger/localstate.swagger.json **/*.pb.go **/*.capnp.go **/*.pb.gw.go **/*_mngen.go **/*_mngen_test.go bridge/artifacts bridge/bindings bridge/cache bridge/typechain-types bridge/node_modules
-
-	docker container rm -vf madnet-generate-go madnet-generate-bridge 2> /dev/null
-	docker image rm -f madnet-generate-go madnet-generate-bridge 2> /dev/null
-	docker builder prune -f