diff --git a/.gitmodules b/.gitmodules index 8e8091378..8e75b5bce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "go-ethereum"] path = go-ethereum url = https://github.com/morph-l2/go-ethereum.git -branch = release/2.0.x diff --git a/Makefile b/Makefile index 5b554518f..c77456812 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ################## update dependencies #################### - +ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.0.8 ETHEREUM_TARGET_VERSION := morph-v2.0.8 TENDERMINT_TARGET_VERSION := v0.3.2 @@ -39,7 +39,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 ####################