Merge pull request #761 from marioevz/geth-cancun

clients/go-ethereum: Cancun support

Author: marioevz

clients/go-ethereum/Dockerfile

@@ -17,6 +17,32 @@ FROM ethereum/client-go:$branch as builder
 
 ## ----
 
+## ----
+## Uncomment the steps below (and comment out the steps above!) to build
+## go-ethereum from a git branch.
+
+# FROM alpine:latest as builder
+# ARG user=ethereum
+# ARG repo=go-ethereum
+# ARG branch=master
+# RUN \
+#   apk add --update bash curl jq go git make gcc musl-dev         \
+#         ca-certificates linux-headers                         && \
+#   git clone --depth 1 --branch $branch                           \
+#       https://github.com/$user/$repo                          && \
+#   (cd go-ethereum && make geth)                               && \
+#   (cd go-ethereum                                             && \
+#   echo "{}"                                                      \
+#   | jq ".+ {\"repo\":\"$(git config --get remote.origin.url)\"}" \
+#   | jq ".+ {\"branch\":\"$(git rev-parse --abbrev-ref HEAD)\"}"  \
+#   | jq ".+ {\"commit\":\"$(git rev-parse HEAD)\"}"               \
+#   > /version.json)                                            && \
+#   cp go-ethereum/build/bin/geth /usr/local/bin/geth           && \
+#   apk del go git make gcc musl-dev linux-headers              && \
+#   rm -rf /go-ethereum && rm -rf /var/cache/apk/*
+
+## ----
+
 FROM alpine:latest
 RUN apk add --update bash curl jq
 COPY --from=builder /usr/local/bin/geth /usr/local/bin/geth

clients/go-ethereum/mapper.jq

@@ -55,6 +55,7 @@ def to_bool:
     "mergeForkBlock": env.HIVE_MERGE_BLOCK_ID|to_int,
     "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int,
     "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int,
+    "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
     "terminalTotalDifficultyPassed": true,
   }|remove_empty
 }