chore: move build and common source files to root

Author: colinlyguo

bridge/Dockerfile

@@ -1,8 +1,9 @@
 # Build bridge in a stock Go builder container
 FROM scrolltech/go-builder:1.17 as builder
 
-ADD ./bridge /bridge
-ADD ./store /store
+COPY ./bridge /bridge
+COPY ./store /store
+COPY ./utils /utils
 
 RUN cd /bridge/cmd/bridge/ && go build -v -p 4
 

bridge/Makefile

@@ -15,7 +15,7 @@ bridge: ## Builds the Bridge instance.
 	GOBIN=$(PWD)/build/bin go install ./cmd/bridge
 
 lint: ## Lint the files - used for CI
-	GOBIN=$(PWD)/build/bin go run build/lint.go
+	GOBIN=$(PWD)/build/bin go run ../build/lint.go
 
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

bridge/cmd/bridge/db_client.go

@@ -11,7 +11,7 @@ import (
 
 	"scroll-tech/bridge/bridge/l1"
 	"scroll-tech/bridge/bridge/l2"
-	"scroll-tech/bridge/cmd/utils"
+	"scroll-tech/utils"
 	"scroll-tech/bridge/config"
 	"scroll-tech/store"
 )
@@ -24,54 +24,54 @@ func main() {
 	app.Name = "bridge"
 	app.Usage = "The Scroll Bridge"
 	app.Version = "v0.0.1"
-	app.Flags = append(app.Flags, commonFlags...)
-	app.Flags = append(app.Flags, apiFlags...)
-	app.Flags = append(app.Flags, l1Flags...)
-	app.Flags = append(app.Flags, l2Flags...)
-	app.Flags = append(app.Flags, dbflags...)
+	app.Flags = append(app.Flags, utils.CommonFlags...)
+	app.Flags = append(app.Flags, utils.APIFlags...)
+	app.Flags = append(app.Flags, utils.L1Flags...)
+	app.Flags = append(app.Flags, utils.L2Flags...)
+	app.Flags = append(app.Flags, utils.DBflags...)
 
 	app.Before = func(ctx *cli.Context) error {
-		return setup(ctx)
+		return utils.Setup(ctx)
 	}
 	app.Commands = []*cli.Command{
 		{
 			Name:   "reset",
 			Usage:  "Clean and reset database.",
-			Action: ResetDB,
+			Action: utils.ResetDB,
 			Flags: []cli.Flag{
-				&configFileFlag,
+				&utils.ConfigFileFlag,
 			},
 		},
 		{
 			Name:   "status",
 			Usage:  "Check migration status.",
-			Action: CheckDBStatus,
+			Action: utils.CheckDBStatus,
 			Flags: []cli.Flag{
-				&configFileFlag,
+				&utils.ConfigFileFlag,
 			},
 		},
 		{
 			Name:   "version",
 			Usage:  "Display the current database version.",
-			Action: DBVersion,
+			Action: utils.DBVersion,
 			Flags: []cli.Flag{
-				&configFileFlag,
+				&utils.ConfigFileFlag,
 			},
 		},
 		{
 			Name:   "migrate",
 			Usage:  "Migrate the database to the latest version.",
-			Action: MigrateDB,
+			Action: utils.MigrateDB,
 			Flags: []cli.Flag{
-				&configFileFlag,
+				&utils.ConfigFileFlag,
 			},
 		},
 		{
 			Name:   "rollback",
 			Usage:  "Roll back the database to a previous <version>. Rolls back a single migration if no version specified.",
-			Action: RollbackDB,
+			Action: utils.RollbackDB,
 			Flags: []cli.Flag{
-				&configFileFlag,
+				&utils.ConfigFileFlag,
 				&cli.IntFlag{
 					Name:  "version",
 					Usage: "Rollback to the specified version.",
@@ -89,23 +89,23 @@ func main() {
 }
 
 func applyConfig(ctx *cli.Context, cfg *config.Config) {
-	if ctx.IsSet(l1ChainIDFlag.Name) {
-		cfg.L1Config.ChainID = ctx.Int64(l1ChainIDFlag.Name)
+	if ctx.IsSet(utils.L1ChainIDFlag.Name) {
+		cfg.L1Config.ChainID = ctx.Int64(utils.L1ChainIDFlag.Name)
 	}
-	if ctx.IsSet(l1UrlFlag.Name) {
-		cfg.L1Config.Endpoint = ctx.String(l1UrlFlag.Name)
+	if ctx.IsSet(utils.L1UrlFlag.Name) {
+		cfg.L1Config.Endpoint = ctx.String(utils.L1UrlFlag.Name)
 	}
-	if ctx.IsSet(l2ChainIDFlag.Name) {
-		cfg.L2Config.ChainID = ctx.Int64(l2ChainIDFlag.Name)
+	if ctx.IsSet(utils.L2ChainIDFlag.Name) {
+		cfg.L2Config.ChainID = ctx.Int64(utils.L2ChainIDFlag.Name)
 	}
-	if ctx.IsSet(l2UrlFlag.Name) {
-		cfg.L2Config.Endpoint = ctx.String(l2UrlFlag.Name)
+	if ctx.IsSet(utils.L2UrlFlag.Name) {
+		cfg.L2Config.Endpoint = ctx.String(utils.L2UrlFlag.Name)
 	}
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(configFileFlag.Name)
+	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -149,7 +149,7 @@ func action(ctx *cli.Context) error {
 	}
 
 	// Register api and start rpc service.
-	if ctx.Bool(httpEnabledFlag.Name) {
+	if ctx.Bool(utils.HTTPEnabledFlag.Name) {
 		srv := rpc.NewServer()
 		apis := l2Backend.APIs()
 		for _, api := range apis {
@@ -160,8 +160,8 @@ func action(ctx *cli.Context) error {
 		handler, addr, err := utils.StartHTTPEndpoint(
 			fmt.Sprintf(
 				"%s:%d",
-				ctx.String(httpListenAddrFlag.Name),
-				ctx.Int(httpPortFlag.Name)),
+				ctx.String(utils.HTTPListenAddrFlag.Name),
+				ctx.Int(utils.HTTPPortFlag.Name)),
 			rpc.DefaultHTTPTimeouts,
 			srv)
 		if err != nil {

bridge/cmd/bridge/logger.go

@@ -3,21 +3,20 @@ module scroll-tech/bridge
 go 1.17
 
 require (
-	github.com/jmoiron/sqlx v1.3.5
-	github.com/mattn/go-colorable v0.1.11
-	github.com/mattn/go-isatty v0.0.14
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20220920070544-3a7da33cd53d
 	github.com/stretchr/testify v1.7.2
 	github.com/urfave/cli/v2 v2.3.0
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
 	scroll-tech/internal v1.0.0
 	scroll-tech/store v1.0.0
+	scroll-tech/utils v1.0.0
 )
 
 replace (
 	scroll-tech/coordinator v1.0.0 => ../coordinator
 	scroll-tech/internal v1.0.0 => ../internal
 	scroll-tech/store v1.0.0 => ../store
+	scroll-tech/utils v1.0.0 => ../utils
 )
 
 require (
@@ -54,7 +53,10 @@ require (
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
+	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/lib/pq v1.10.6 // indirect
+	github.com/mattn/go-colorable v0.1.11 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/pointerstructure v1.2.0 // indirect

bridge/cmd/bridge/main.go

@@ -30,7 +30,7 @@ func goBin() string {
 func main() {
 	log.SetFlags(log.Lshortfile)
 
-	if _, err := os.Stat(filepath.Join("build", "lint.go")); os.IsNotExist(err) {
+	if _, err := os.Stat(filepath.Join("../build", "lint.go")); os.IsNotExist(err) {
 		log.Fatal("should run build from root dir")
 	}
 
@@ -50,7 +50,7 @@ func lint() {
 		log.Fatalf("could not list pkgs: %v\n%s", err, string(out))
 	}
 
-	cmd = exec.Command(filepath.Join(goBin(), "golangci-lint"))
+	cmd = exec.Command("golangci-lint")
 	cmd.Args = append(cmd.Args, "run", "--config", ".golangci.yml")
 
 	if *v {