package & artifact renaming

Dockerfile

@@ -13,6 +13,6 @@ RUN cd /src && make build
 
 # CONTAINER FOR RUNNING BINARY
 FROM alpine:3.16.0
-COPY --from=build /src/dist/supernets2.0-data-availability /app/supernets2.0-data-availability
+COPY --from=build /src/dist/supernets2-data-availability /app/supernets2-data-availability
 EXPOSE 8444
-CMD ["/bin/sh", "-c", "/app/supernets2.0-data-availability run"]
+CMD ["/bin/sh", "-c", "/app/supernets2-data-availability run"]

Makefile

@@ -12,25 +12,25 @@ endif
 GOBASE := $(shell pwd)
 GOBIN := $(GOBASE)/dist
 GOENVVARS := GOBIN=$(GOBIN) CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH)
-GOBINARY := supernets2.0-data-availability
+GOBINARY := supernets2-data-availability
 GOCMD := $(GOBASE)/cmd
 
-LDFLAGS += -X 'github.com/0xPolygon/supernets2.0-data-availability.Version=$(VERSION)'
-LDFLAGS += -X 'github.com/0xPolygon/supernets2.0-data-availability.GitRev=$(GITREV)'
-LDFLAGS += -X 'github.com/0xPolygon/supernets2.0-data-availability.GitBranch=$(GITBRANCH)'
-LDFLAGS += -X 'github.com/0xPolygon/supernets2.0-data-availability.BuildDate=$(DATE)'
+LDFLAGS += -X 'github.com/0xPolygon/supernets2-data-availability.Version=$(VERSION)'
+LDFLAGS += -X 'github.com/0xPolygon/supernets2-data-availability.GitRev=$(GITREV)'
+LDFLAGS += -X 'github.com/0xPolygon/supernets2-data-availability.GitBranch=$(GITBRANCH)'
+LDFLAGS += -X 'github.com/0xPolygon/supernets2-data-availability.BuildDate=$(DATE)'
 
 .PHONY: build
 build: ## Builds the binary locally into ./dist
 	$(GOENVVARS) go build -ldflags "all=$(LDFLAGS)" -o $(GOBIN)/$(GOBINARY) $(GOCMD)
 
 .PHONY: build-docker
 build-docker: ## Builds a docker image with the node binary
-	docker build -t supernets2.0-data-availability -f ./Dockerfile .
+	docker build -t supernets2-data-availability -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 supernets2.0-data-availability -f ./Dockerfile .
+	docker build --no-cache=true -t supernets2-data-availability -f ./Dockerfile .
 
 .PHONY: install-linter
 install-linter: ## Installs the linter

README.md

@@ -1,2 +1,2 @@
-# supernets2.0-data-availability
-supernets2.0-data-availability
+# supernets2-data-availability
+supernets2-data-availability

client/client.go

@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/sequence"
+	"github.com/0xPolygon/supernets2-data-availability/sequence"
 	"github.com/ethereum/go-ethereum/common"
 )
 

client/datacom.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/sequence"
+	"github.com/0xPolygon/supernets2-data-availability/sequence"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/client"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 )

cmd/main.go

@@ -6,19 +6,19 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/config"
-	"github.com/0xPolygon/supernets2.0-data-availability/db"
-	"github.com/0xPolygon/supernets2.0-data-availability/dummyinterfaces"
-	"github.com/0xPolygon/supernets2.0-data-availability/services/datacom"
-	"github.com/0xPolygon/supernets2.0-data-availability/services/sync"
+	"github.com/0xPolygon/supernets2-data-availability/config"
+	"github.com/0xPolygon/supernets2-data-availability/db"
+	"github.com/0xPolygon/supernets2-data-availability/dummyinterfaces"
+	"github.com/0xPolygon/supernets2-data-availability/services/datacom"
+	"github.com/0xPolygon/supernets2-data-availability/services/sync"
 	"github.com/0xPolygonHermez/zkevm-node"
 	dbConf "github.com/0xPolygonHermez/zkevm-node/db"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
 	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/urfave/cli/v2"
 )
 
-const appName = "supernets2.0-data-availability"
+const appName = "supernets2-data-availability"
 
 var (
 	configFileFlag = cli.StringFlag{

config/default.go

@@ -26,7 +26,7 @@ Outputs = ["stderr"]
 User = "committee_user"
 Password = "committee_password"
 Name = "committee_db"
-Host = "supernets2.0-data-availability-db"
+Host = "supernets2-data-availability-db"
 Port = "5432"
 EnableLog = false
 MaxConns = 200

db/db.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/offchaindata"
+	"github.com/0xPolygon/supernets2-data-availability/offchaindata"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 	"github.com/0xPolygonHermez/zkevm-node/state"
 	"github.com/ethereum/go-ethereum/common"

go.mod

@@ -1,4 +1,4 @@
-module github.com/0xPolygon/supernets2.0-data-availability
+module github.com/0xPolygon/supernets2-data-availability
 
 go 1.19
 

sequence/sequence.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/batch"
-	"github.com/0xPolygon/supernets2.0-data-availability/offchaindata"
+	"github.com/0xPolygon/supernets2-data-availability/batch"
+	"github.com/0xPolygon/supernets2-data-availability/offchaindata"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/ethereum/go-ethereum/common"

sequence/sequence_test.go

@@ -4,7 +4,7 @@ import (
 	"crypto/ecdsa"
 	"testing"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/batch"
+	"github.com/0xPolygon/supernets2-data-availability/batch"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

services/datacom/datacom.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/ecdsa"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/sequence"
+	"github.com/0xPolygon/supernets2-data-availability/sequence"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
 	"github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 	"github.com/jackc/pgx/v4"

services/datacom/interfaces.go

@@ -3,7 +3,7 @@ package datacom
 import (
 	"context"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/offchaindata"
+	"github.com/0xPolygon/supernets2-data-availability/offchaindata"
 	"github.com/jackc/pgx/v4"
 )
 

services/datacom/tracker.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/config"
+	"github.com/0xPolygon/supernets2-data-availability/config"
 	"github.com/0xPolygonHermez/zkevm-node/etherman"
 	"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
 	"github.com/0xPolygonHermez/zkevm-node/log"

test/Makefile

@@ -1,13 +1,13 @@
 STOP := docker compose down
-RUN-DB := docker compose up -d supernets2.0-data-availability-db
+RUN-DB := docker compose up -d supernets2-data-availability-db
 
 .PHONY: run
 run: ## Runs a full data node
 	docker compose up -d
 
 .PHONY: run-local
 run-local: ## Runs a full data node
-	docker compose up -d supernets2.0-data-availability-db
+	docker compose up -d supernets2-data-availability-db
 	docker compose up -d zkevm-mock-l1-network
 	go run ../cmd run --cfg config/test.local.toml
 

test/config/test.docker.toml

@@ -15,7 +15,7 @@ Outputs = ["stderr"]
 User = "committee_user"
 Password = "committee_password"
 Name = "committee_db"
-Host = "supernets2.0-data-availability-db"
+Host = "supernets2-data-availability-db"
 Port = "5432"
 EnableLog = false
 MaxConns = 200

test/docker-compose.yml

@@ -1,16 +1,16 @@
 version: "3.5"
 networks:
   default:
-    name: supernets2.0
+    name: supernets2
 services:
 
-  supernets2.0-data-availability:
-    container_name: supernets2.0-data-availability
+  supernets2-data-availability:
+    container_name: supernets2-data-availability
     restart: unless-stopped
     depends_on:
-      supernets2.0-data-availability-db:
+      supernets2-data-availability-db:
         condition: service_healthy
-    image: supernets2.0-data-availability
+    image: supernets2-data-availability
     deploy:
       resources:
         limits:
@@ -25,10 +25,10 @@ services:
     command:
       - "/bin/sh"
       - "-c"
-      - "/app/supernets2.0-data-availability run --cfg /app/config.toml"
+      - "/app/supernets2-data-availability run --cfg /app/config.toml"
 
-  supernets2.0-data-availability-db:
-    container_name: supernets2.0-data-availability-db
+  supernets2-data-availability-db:
+    container_name: supernets2-data-availability-db
     restart: unless-stopped
     image: postgres
     healthcheck:

test/e2e/e2e_test.go

@@ -6,10 +6,10 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/batch"
-	"github.com/0xPolygon/supernets2.0-data-availability/client"
-	"github.com/0xPolygon/supernets2.0-data-availability/config"
-	"github.com/0xPolygon/supernets2.0-data-availability/sequence"
+	"github.com/0xPolygon/supernets2-data-availability/batch"
+	"github.com/0xPolygon/supernets2-data-availability/client"
+	"github.com/0xPolygon/supernets2-data-availability/config"
+	"github.com/0xPolygon/supernets2-data-availability/sequence"
 	cfgTypes "github.com/0xPolygonHermez/zkevm-node/config/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"

test/e2e/tracker_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/0xPolygon/supernets2.0-data-availability/config"
-	"github.com/0xPolygon/supernets2.0-data-availability/services/datacom"
+	"github.com/0xPolygon/supernets2-data-availability/config"
+	"github.com/0xPolygon/supernets2-data-availability/services/datacom"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"