Release/0.4.x

.github/workflows/contracts.yml

@@ -47,7 +47,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Install Foundry
               uses: foundry-rs/foundry-toolchain@v1
               with:

.github/workflows/deployer.yml

@@ -28,7 +28,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Lint
               run: |
                   rm -rf $HOME/.cache/golangci-lint
@@ -40,6 +40,6 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Run tests
               run: make test

.github/workflows/node.yml

@@ -28,7 +28,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Lint
               run: |
                   rm -rf $HOME/.cache/golangci-lint
@@ -40,7 +40,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Run build
               run: make build
             - name: Run tests

.github/workflows/oracle.yml

@@ -1,47 +1,47 @@
-name: Oracle
+# name: Oracle
 
-on:
-    push:
-        branches:
-            - main
-        paths:
-            - "oracle/**"
-            - ".github/workflows/oracle.yaml"
-    pull_request:
-        paths:
-            - "build/**"
-            - "bindings/**"
-            - "node/**"
-            - "oracle/**"
-            - ".github/workflows/oracle.yaml"
+# on:
+#     push:
+#         branches:
+#             - main
+#         paths:
+#             - "oracle/**"
+#             - ".github/workflows/oracle.yaml"
+#     pull_request:
+#         paths:
+#             - "build/**"
+#             - "bindings/**"
+#             - "node/**"
+#             - "oracle/**"
+#             - ".github/workflows/oracle.yaml"
 
-defaults:
-    run:
-        working-directory: "oracle"
+# defaults:
+#     run:
+#         working-directory: "oracle"
 
-jobs:
-    check:
-        if: github.event.pull_request.draft == false
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - name: Install Go
-              uses: actions/setup-go@v5
-              with:
-                  go-version: 1.22.x
-            - name: Lint
-              run: |
-                  rm -rf $HOME/.cache/golangci-lint
-                  make lint
-    test:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-            - name: Install Go
-              uses: actions/setup-go@v5
-              with:
-                  go-version: 1.22.x
-            - name: Run build
-              run: make build
-            - name: Run tests
-              run: make test
+# jobs:
+#     check:
+#         if: github.event.pull_request.draft == false
+#         runs-on: ubuntu-latest
+#         steps:
+#             - uses: actions/checkout@v3
+#             - name: Install Go
+#               uses: actions/setup-go@v5
+#               with:
+#                   go-version: 1.24.x
+#             - name: Lint
+#               run: |
+#                   rm -rf $HOME/.cache/golangci-lint
+#                   make lint
+#     test:
+#         runs-on: ubuntu-latest
+#         steps:
+#             - uses: actions/checkout@v3
+#             - name: Install Go
+#               uses: actions/setup-go@v5
+#               with:
+#                   go-version: 1.24.x
+#             - name: Run build
+#               run: make build
+#             - name: Run tests
+#               run: make test

.github/workflows/prover.yml

@@ -24,10 +24,9 @@ jobs:
         steps:
             - uses: actions/checkout@v4
             - uses: dtolnay/rust-toolchain@stable
-              with:
-                  components: rustfmt
+            - run: rustup component add rustfmt --toolchain nightly-2024-07-07
             - run: cargo fmt --all --check
-    
+
     build:
         name: build
         runs-on: ubuntu-latest

.github/workflows/tx-submitter.yml

@@ -29,7 +29,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Lint
               run: |
                   rm -rf $HOME/.cache/golangci-lint
@@ -41,7 +41,7 @@ jobs:
             - name: Install Go
               uses: actions/setup-go@v5
               with:
-                  go-version: 1.22.x
+                  go-version: 1.24.x
             - name: Run build
               run: make build
             - name: Run tests

.gitignore

@@ -20,12 +20,18 @@ ops/l2-genesis/.devnet
 ops/l2-genesis/.qanet
 ops/l2-genesis/.testnet
 ops/l2-genesis/.holesky
+ops/l2-genesis/.hoodi
 ops/l2-genesis/.mainnet
 ops/l2-genesis/.morphtestnet
 ops/devnet-morph/devnet/__pycache__
 contracts/qanetL1.json
 contracts/holesky.json
+contracts/hoodi.json
+contracts/mainnet.json
 .env
 
 # logs
-*.log
+*.log
+
+# mpt-switch-test (local testing only)
+ops/mpt-switch-test

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "go-ethereum"]
 path = go-ethereum
 url = https://github.com/morph-l2/go-ethereum.git
-branch = main

Dockerfile.l2-node

@@ -0,0 +1,24 @@
+# Build Stage
+FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.24-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.24-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,8 @@
 ################## update dependencies ####################
+ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.1.2
+ETHEREUM_TARGET_VERSION := morph-v2.1.2
+TENDERMINT_TARGET_VERSION := v0.3.3
 
-ETHEREUM_TARGET_VERSION := v1.10.14-0.20241224100051-1582a364edc0
-TENDERMINT_TARGET_VERSION := v0.3.1
 
 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
 TENDERMINT_MODULE_NAME := github.com/morph-l2/tendermint
@@ -30,6 +31,7 @@ update_all_mod:
 	@$(MAKE) update_mod MODULE=ops/tools
 	@$(MAKE) update_mod MODULE=oracle
 	@$(MAKE) update_mod MODULE=tx-submitter
+	@$(MAKE) update_mod MODULE=token-price-oracle
 
 
 update:
@@ -39,7 +41,13 @@ update:
 
 submodules:
 	git submodule update --init
-	git submodule update --remote 
+	@if [ -d "go-ethereum" ]; then \
+		echo "Updating go-ethereum submodule to tag $(ETHEREUM_SUBMODULE_COMMIT_OR_TAG)..."; \
+		cd go-ethereum && \
+		git fetch --tags && \
+		git checkout $(ETHEREUM_SUBMODULE_COMMIT_OR_TAG) && \
+		cd ..; \
+	fi
 .PHONY: submodules
 
 ################## bindings ####################
@@ -58,12 +66,13 @@ lint-sol:
 .PHONY: lint-sol
 
 lint-go:
+	go work sync
 	make -C bindings lint
 	make -C contracts lint-go
 	make -C node lint
 	make -C ops/l2-genesis lint
 	make -C ops/tools lint
-	make -C oracle lint
+##	make -C oracle lint
 	make -C tx-submitter lint
 .PHONY: lint-go
 
@@ -120,7 +129,7 @@ go-rust-alpine-builder:
 go-ubuntu-builder:
 	@if [ -z "$(shell docker images -q morph/go-ubuntu-builder 2> /dev/null)" ]; then \
 		echo "Docker image morph/go-ubuntu-builder does not exist. Building..."; \
-		cd ops/docker/intermediate && docker build -t morph/go-ubuntu-builder:go-1.22-ubuntu . -f go-ubuntu-builder.Dockerfile; \
+		cd ops/docker/intermediate && docker build -t morph/go-ubuntu-builder:go-1.24-ubuntu . -f go-ubuntu-builder.Dockerfile; \
 	else \
 		echo "Docker image morph/go-ubuntu-builder already exists."; \
 	fi
@@ -140,7 +149,7 @@ devnet-down:
 	cd ops/docker && docker compose -f docker-compose-4nodes.yml down
 .PHONY: devnet-down
 
-devnet-clean-build: devnet-down
+devnet-clean-build: devnet-down devnet-l1-clean
 	docker volume ls --filter name=docker-* --format='{{.Name}}' | xargs -r docker volume rm
 	rm -rf ops/l2-genesis/.devnet
 	rm -rf ops/docker/.devnet
@@ -156,6 +165,10 @@ devnet-clean: devnet-clean-build
 devnet-l1:
 	python3 ops/devnet-morph/main.py --polyrepo-dir=. --only-l1
 
+devnet-l1-clean:
+	@cd ops/docker && ./layer1/scripts/clean.sh
+.PHONY: devnet-l1-clean
+
 devnet-logs:
 	@(cd ops/docker && docker-compose logs -f)
 .PHONY: devnet-logs

MakefileEc2.mk

@@ -22,34 +22,34 @@ build-bk-prod-morph-prod-mainnet-to-morph-tx-submitter:
 	tar -czvf tx-submitter.tar.gz dist
 	aws s3 cp tx-submitter.tar.gz s3://morph-0582-morph-technical-department-mainnet-data/morph-setup/tx-submitter.tar.gz
 
-# build for holesky
-build-bk-prod-morph-prod-testnet-to-morph-node-holesky:
+# build for qanet
+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-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/morph-node.tar.gz
+	aws s3 cp morph-node.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/morph-node.tar.gz
 
-build-bk-prod-morph-prod-testnet-to-morph-tx-submitter-holesky:
+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-0582-morph-technical-department-testnet-data/testnet/holesky/morph-setup/tx-submitter.tar.gz
-
-
-build-bk-test-morph-test-qanet-to-morph-node-qanet:
+	aws s3 cp tx-submitter.tar.gz s3://morph-7637-morph-technical-department-qanet-data/morph-setup/tx-submitter.tar.gz
+  
+ # build for hoodi
+build-bk-prod-morph-prod-testnet-to-morph-node-hoodi:
 	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
+	aws s3 cp morph-node.tar.gz s3://morph-0582-morph-technical-department-testnet-data/testnet/hoodi/morph-setup/morph-node.tar.gz
 
-build-bk-test-morph-test-qanet-to-morph-tx-submitter-qanet:
+build-bk-prod-morph-prod-testnet-to-morph-tx-submitter-hoodi:
 	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
+	aws s3 cp tx-submitter.tar.gz s3://morph-0582-morph-technical-department-testnet-data/testnet/hoodi/morph-setup/tx-submitter.tar.gz