Optimize batch for reducing rollup cost

.dockerignore

@@ -0,0 +1 @@
+prover/

.gitignore

@@ -15,6 +15,7 @@ contracts/yarn.lock
 build/bin
 cache
 out
+ops/docker/.devnet
 ops/l2-genesis/.devnet
 ops/l2-genesis/.qanet
 ops/l2-genesis/.testnet

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "go-ethereum"]
 path = go-ethereum
 url = https://github.com/morph-l2/go-ethereum.git
-branch = release/2.0.x
+branch = feature/block_context

Dockerfile.l2-node

@@ -0,0 +1,24 @@
+# Build Stage
+FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu as builder
+
+# Set working directory and copy necessary files
+COPY . /morph
+WORKDIR /morph/node
+
+# Run build command
+RUN make build
+
+# Final Stage
+FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu
+
+# Update and install dependencies, then clean up unnecessary files
+RUN apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy the built binaries from the builder image to the final image
+COPY --from=builder /morph/node/build/bin/tendermint /usr/local/bin/
+COPY --from=builder /morph/node/build/bin/morphnode /usr/local/bin/
+
+# Set the default command
+CMD ["morphnode", "--home", "/data"]

Makefile

@@ -1,7 +1,7 @@
 ################## update dependencies ####################
 
-ETHEREUM_TARGET_VERSION := morph-v2.0.2
-TENDERMINT_TARGET_VERSION := v0.3.1
+ETHEREUM_TARGET_VERSION := v1.10.14-0.20241226065029-3b9465a03a8c
+TENDERMINT_TARGET_VERSION := v0.3.2-0.20250115141431-c84dfe5c8533
 
 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
 TENDERMINT_MODULE_NAME := github.com/morph-l2/tendermint
@@ -143,6 +143,7 @@ devnet-down:
 devnet-clean-build: devnet-down
 	docker volume ls --filter name=docker-* --format='{{.Name}}' | xargs -r docker volume rm
 	rm -rf ops/l2-genesis/.devnet
+	rm -rf ops/docker/.devnet
 	rm -rf ops/docker/consensus/beacondata ops/docker/consensus/validatordata ops/docker/consensus/genesis.ssz
 	rm -rf ops/docker/execution/geth
 .PHONY: devnet-clean-build

MakefileEc2.mk

@@ -37,3 +37,19 @@ build-bk-prod-morph-prod-testnet-to-morph-tx-submitter-holesky:
 	cp tx-submitter/tx-submitter dist/
 	tar -czvf tx-submitter.tar.gz dist
 	aws s3 cp tx-submitter.tar.gz s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/tx-submitter.tar.gz
+
+
+build-bk-test-morph-test-qanet-to-morph-node-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/node && make build
+	cp node/build/bin/morphnode dist/
+	cp node/build/bin/tendermint dist/
+	tar -czvf morph-node.tar.gz dist
+	aws s3 cp morph-node.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/morph-node.tar.gz
+
+build-bk-test-morph-test-qanet-to-morph-tx-submitter-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o tx-submitter/tx-submitter ./tx-submitter/cmd
+	cp tx-submitter/tx-submitter dist/
+	tar -czvf tx-submitter.tar.gz dist
+	aws s3 cp tx-submitter.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/tx-submitter.tar.gz

MakefileEks.mk

@@ -6,6 +6,7 @@ LDFLAGSSTRING +=-X main.GitVersion=$(GITVERSION)
 LDFLAGS := -ldflags "$(LDFLAGSSTRING)"
 
 # gas-oracle
+# mainnet
 build-bk-prod-morph-prod-mainnet-to-morph-gas-price-oracle:
 	if [ ! -d dist ]; then mkdir -p dist; fi
 	cd $(PWD)/gas-oracle/app && cargo build --release
@@ -18,7 +19,21 @@ start-bk-prod-morph-prod-mainnet-to-morph-gas-price-oracle:
 	/data/secret-manager-wrapper ./app
 
 
+# qanet
+build-bk-test-morph-test-qanet-to-morph-gas-price-oracle-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/gas-oracle/app && cargo build --release
+	cp gas-oracle/app/target/release/app dist/
+	aws s3 cp s3://morph-7637-morph-technical-department-qanet-data/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+
+start-bk-test-morph-test-qanet-to-morph-gas-price-oracle-qanet:
+	/data/secret-manager-wrapper ./app
+
+
 # prover
+# mainnet
 build-bk-prod-morph-prod-mainnet-to-morph-prover:
 	if [ ! -d dist ]; then mkdir -p dist; fi
 	cd $(PWD)/prover/bin/server && RUSTFLAGS="-C target-feature=+avx2,+avx512f" cargo build --release
@@ -28,10 +43,10 @@ build-bk-prod-morph-prod-mainnet-to-morph-prover:
 	tar -xvzf secret-manager-wrapper.tar.gz
 
 start-bk-prod-morph-prod-mainnet-to-morph-prover:
-	#if [ ! -d morph-prover-data/sp1-circuits ]; then aws s3 cp s3://morph-0582-morph-technical-department-mainnet-data/morph-setup/sp1-circuits morph-prover-data/; fi
 	/data/secret-manager-wrapper ./prover-server
 
 # challenge-handler
+# mainnet
 build-bk-prod-morph-prod-mainnet-to-morph-challenge-handler:
 	if [ ! -d dist ]; then mkdir -p dist; fi
 	cd $(PWD)/prover/bin/challenge && cargo build --release
@@ -43,8 +58,8 @@ build-bk-prod-morph-prod-mainnet-to-morph-challenge-handler:
 start-bk-prod-morph-prod-mainnet-to-morph-challenge-handler:
 	/data/secret-manager-wrapper ./challenge-handler
 
-
 # shadow-proving
+# mainnet
 build-bk-prod-morph-prod-mainnet-to-morph-shadow-proving:
 	if [ ! -d dist ]; then mkdir -p dist; fi
 	cd $(PWD)/prover/bin/shadow-prove && cargo build --release
@@ -55,6 +70,8 @@ build-bk-prod-morph-prod-mainnet-to-morph-shadow-proving:
 start-bk-prod-morph-prod-mainnet-to-morph-shadow-proving:
 	/data/secret-manager-wrapper  ./shadow-proving
 
+# staking-oracle
+# mainnet
 build-bk-prod-morph-prod-mainnet-to-morph-staking-oracle:
 	if [ ! -d dist ]; then mkdir -p dist; fi
 	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
@@ -63,4 +80,79 @@ build-bk-prod-morph-prod-mainnet-to-morph-staking-oracle:
 	tar -xvzf secret-manager-wrapper.tar.gz
 
 start-bk-prod-morph-prod-mainnet-to-morph-staking-oracle:
+	/data/secret-manager-wrapper  ./staking-oracle
+
+# qanet
+build-bk-test-morph-test-qanet-to-morph-staking-oracle-qanet:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
+	cp oracle/staking-oracle dist/
+	aws s3 cp s3://morph-7637-morph-technical-department-qanet-data/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+start-bk-test-morph-test-qanet-to-morph-staking-oracle-qanet:
+	/data/secret-manager-wrapper  ./staking-oracle
+
+
+# gas-oracle
+# testnet
+build-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/gas-oracle/app && cargo build --release
+	cp gas-oracle/app/target/release/app dist/
+	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+
+start-bk-prod-morph-prod-testnet-to-morph-gas-price-oracle-holesky:
+	/data/secret-manager-wrapper ./app
+
+# prover
+# testnet
+build-bk-prod-morph-prod-testnet-to-morph-prover-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/prover/bin/server && RUSTFLAGS="-C target-feature=+avx2,+avx512f" cargo build --release
+	cp prover/target/release/prover-server dist/
+	cp -r prover/configs dist/
+	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+start-bk-prod-morph-prod-testnet-to-morph-prover-holesky:
+	/data/secret-manager-wrapper ./prover-server
+
+# challenge-handler
+# testnet
+build-bk-prod-morph-prod-testnet-to-morph-challenge-handler-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/prover/bin/challenge && cargo build --release
+	cp prover/bin/challenge/target/release/challenge-handler dist/
+	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+
+start-bk-prod-morph-prod-testnet-to-morph-challenge-handler-holesky:
+	/data/secret-manager-wrapper ./challenge-handler
+
+# shadow-proving
+# testnet
+build-bk-prod-morph-prod-testnet-to-morph-shadow-proving-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	cd $(PWD)/prover/bin/shadow-prove && cargo build --release
+	cp prover/bin/shadow-prove/target/release/shadow-proving dist/
+	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+start-bk-prod-morph-prod-testnet-to-morph-shadow-proving-holesky:
+	/data/secret-manager-wrapper  ./shadow-proving
+
+# staking-oracle
+# testnet
+build-bk-prod-morph-prod-testnet-to-morph-staking-oracle-holesky:
+	if [ ! -d dist ]; then mkdir -p dist; fi
+	env GO111MODULE=on CGO_LDFLAGS="-ldl" CGO_ENABLED=1 go build -v $(LDFLAGS) -o oracle/staking-oracle ./oracle/cmd/staking-oracle
+	cp oracle/staking-oracle dist/
+	aws s3 cp s3://morph-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/secret-manager-wrapper.tar.gz ./
+	tar -xvzf secret-manager-wrapper.tar.gz
+
+start-bk-prod-morph-prod-testnet-to-morph-staking-oracle-holesky:
 	/data/secret-manager-wrapper  ./staking-oracle