diff --git a/Dockerfile.mockccc b/Dockerfile.mockccc new file mode 100644 index 000000000000..dd71826118b6 --- /dev/null +++ b/Dockerfile.mockccc @@ -0,0 +1,25 @@ +# Support setting various labels on the final image +ARG COMMIT="" +ARG VERSION="" +ARG BUILDNUM="" + +# Build Geth in a stock Go builder container +FROM scrolltech/go-rust-builder:go-1.19-rust-nightly-2022-12-10 as builder + +ADD . /go-ethereum +RUN cd /go-ethereum && env GO111MODULE=on go run build/ci.go install ./cmd/geth + +# Pull Geth into a second stage deploy alpine container +FROM ubuntu:20.04 + +COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/ + +EXPOSE 8545 8546 30303 30303/udp +ENTRYPOINT ["geth"] + +# Add some metadata labels to help programatic image consumption +ARG COMMIT="" +ARG VERSION="" +ARG BUILDNUM="" + +LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM" diff --git a/Dockerfile.mockccc.alpine b/Dockerfile.mockccc.alpine new file mode 100644 index 000000000000..ec46f60773e3 --- /dev/null +++ b/Dockerfile.mockccc.alpine @@ -0,0 +1,28 @@ +# Support setting various labels on the final image +ARG COMMIT="" +ARG VERSION="" +ARG BUILDNUM="" + +# Build Geth in a stock Go builder container +FROM golang:1.18-alpine as builder + +RUN apk add --no-cache gcc musl-dev linux-headers git + +ADD . /go-ethereum +RUN cd /go-ethereum && go run build/ci.go install ./cmd/geth + +# Pull Geth into a second stage deploy alpine container +FROM alpine:latest + +RUN apk add --no-cache ca-certificates +COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/ + +EXPOSE 8545 8546 30303 30303/udp +ENTRYPOINT ["geth"] + +# Add some metadata labels to help programatic image consumption +ARG COMMIT="" +ARG VERSION="" +ARG BUILDNUM="" + +LABEL commit="$COMMIT" version="$VERSION" buildnum="$BUILDNUM" diff --git a/Makefile b/Makefile index b94293163342..2a0c148d569e 100644 --- a/Makefile +++ b/Makefile @@ -60,3 +60,12 @@ devtools: env GOBIN= go install ./cmd/abigen @type "solc" 2> /dev/null || echo 'Please install solc' @type "protoc" 2> /dev/null || echo 'Please install protoc' + +docker: + docker build --platform linux/x86_64 -t scrolltech/l2geth:latest ./ -f Dockerfile + +mockccc_docker: + docker build --platform linux/x86_64 -t scrolltech/l2geth:latest ./ -f Dockerfile.mockccc + +mockccc_alpine_docker: + docker build --platform linux/x86_64 -t scrolltech/l2geth:latest ./ -f Dockerfile.mockccc.alpine diff --git a/rollup/circuitcapacitychecker/mock.go b/rollup/circuitcapacitychecker/mock.go index 6d3c78903666..6526f635d5c5 100644 --- a/rollup/circuitcapacitychecker/mock.go +++ b/rollup/circuitcapacitychecker/mock.go @@ -20,9 +20,15 @@ func (ccc *CircuitCapacityChecker) Reset() { } func (ccc *CircuitCapacityChecker) ApplyTransaction(traces *types.BlockTrace) (*types.RowConsumption, error) { - return nil, nil + return &types.RowConsumption{types.SubCircuitRowUsage{ + Name: "mock", + RowNumber: 1, + }}, nil } func (ccc *CircuitCapacityChecker) ApplyBlock(traces *types.BlockTrace) (*types.RowConsumption, error) { - return nil, nil + return &types.RowConsumption{types.SubCircuitRowUsage{ + Name: "mock", + RowNumber: 2, + }}, nil }