Adjust previous commit history(#225)

Dockerfile

@@ -1,27 +1,32 @@
-FROM golang:1.19.7-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21.1-alpine3.18 as builder
 RUN apk add --no-cache gcc git make musl-dev
 
 COPY ./go.mod /app/go.mod
 COPY ./go.sum /app/go.sum
 COPY ./Makefile /app/Makefile
 
-COPY ./bindings /app/bindings
+COPY ./op-node /app/op-node
+COPY ./op-chain-ops /app/op-chain-ops
+COPY ./op-service /app/op-service
+#COPY ./op-signer /app/op-signer
+COPY ./op-batcher /app/op-batcher
+COPY ./op-bindings /app/op-bindings
 COPY ./components /app/components
 COPY ./utils /app/utils
 
 COPY ./.git /app/.git
 WORKDIR /app
 RUN make build
 
-FROM alpine:3.17 as runner
+FROM alpine:3.18 as runner
 
 RUN addgroup user && \
     adduser -G user -s /bin/sh -h /home/user -D user
 
 USER user
 WORKDIR /home/user/
 
-FROM alpine:3.17 as runner-with-kroma-log
+FROM alpine:3.18 as runner-with-kroma-log
 
 RUN addgroup user && \
     adduser -G user -s /bin/sh -h /home/user -D user

Makefile

@@ -6,9 +6,9 @@ LD_FLAGS_ARGS +=-X main.Meta=$(GIT_COMMIT)
 LD_FLAGS := -ldflags "$(LD_FLAGS_ARGS)"
 
 build:
-	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-node ./components/node/cmd/main.go
-	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-stateviz ./components/node/cmd/stateviz/main.go
-	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-batcher ./components/batcher/cmd/main.go
+	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-node ./op-node/cmd/main.go
+	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-stateviz ./op-node/cmd/stateviz/main.go
+	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-batcher ./op-batcher/cmd/main.go
 	GO111MODULE=on go build -v $(LD_FLAGS) -o bin/kroma-validator ./components/validator/cmd/main.go
 .PHONY: build
 
@@ -17,10 +17,12 @@ clean:
 .PHONY: clean
 
 test:
-	go test ./bindings/...
+	go test ./op-bindings/...
+	go test ./op-batcher/...
+	go test ./op-node/...
 	go test ./components/...
 	go test ./utils/...
-	go test ./e2e/... -timeout 30m # requires a minimum of 30min in a CI
+	go test ./op-e2e/... -timeout 30m # requires a minimum of 30min in a CI
 	yarn test
 .PHONY: test
 
@@ -30,8 +32,8 @@ lint:
 .PHONY: lint
 
 bindings:
-	make -C ./bindings
-.PHONY: bindings
+	make -C ./op-bindings
+.PHONY: op-bindings
 
 contracts-snapshot:
 	@(cd ./packages/contracts && yarn gas-snapshot && yarn storage-snapshot)