mdehoog · roberto-bayardo · Mar 17, 2023 · Feb 16, 2023 · Feb 16, 2023 · Feb 16, 2023
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -35,6 +35,6 @@ and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/devguide)
+Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/geth-developer/dev-guide)
 for more details on configuring your environment, managing project dependencies
 and testing procedures.
diff --git a/.travis.yml b/.travis.yml
@@ -5,18 +5,15 @@ jobs:
  allow_failures:
  - stage: build
  os: osx
- go: 1.17.x
  env:
  - azure-osx
- - azure-ios
- - cocoapods-ios
 
  include:
  # This builder only tests code linters on latest version of Go
  - stage: lint
  os: linux
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - lint
  git:
@@ -31,7 +28,7 @@ jobs:
  os: linux
  arch: amd64
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - docker
  services:
@@ -48,7 +45,7 @@ jobs:
  os: linux
  arch: arm64
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - docker
  services:
@@ -60,37 +57,13 @@ jobs:
  script:
  - go run build/ci.go docker -image -manifest amd64,arm64 -upload ethereum/client-go
 
- # This builder does the Ubuntu PPA upload
- - stage: build
- if: type = push
- os: linux
- dist: bionic
- go: 1.19.x
- env:
- - ubuntu-ppa
- - GO111MODULE=on
- git:
- submodules: false # avoid cloning ethereum/tests
- addons:
- apt:
- packages:
- - devscripts
- - debhelper
- - dput
- - fakeroot
- - python-bzrlib
- - python-paramiko
- script:
- - echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
- - go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
-
  # This builder does the Linux Azure uploads
  - stage: build
  if: type = push
  os: linux
  dist: bionic
  sudo: required
- go: 1.19.x
+ go: 1.20.x
  env:
  - azure-linux
  - GO111MODULE=on
@@ -120,43 +93,81 @@ jobs:
  - go run build/ci.go install -dlgo -arch arm64 -cc aarch64-linux-gnu-gcc
  - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
 
+ # This builder does the OSX Azure uploads
+ - stage: build
+ if: type = push
+ os: osx
+ go: 1.20.x
+ env:
+ - azure-osx
+ - GO111MODULE=on
+ git:
+ submodules: false # avoid cloning ethereum/tests
+ script:
+ - go run build/ci.go install -dlgo
+ - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -signify SIGNIFY_KEY -upload gethstore/builds
+
  # These builders run the tests
  - stage: build
  os: linux
  arch: amd64
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - GO111MODULE=on
  script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
+ - go run build/ci.go test $TEST_PACKAGES
 
  - stage: build
  if: type = pull_request
  os: linux
  arch: arm64
  dist: bionic
- go: 1.18.x
+ go: 1.19.x
+ env:
+ - GO111MODULE=on
+ script:
+ - go run build/ci.go test $TEST_PACKAGES
+
+ - stage: build
+ os: linux
+ dist: bionic
+ go: 1.19.x
  env:
  - GO111MODULE=on
  script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
+ - go run build/ci.go test $TEST_PACKAGES
 
+ # This builder does the Ubuntu PPA nightly uploads
  - stage: build
+ if: type = cron || (type = push && tag ~= /^v[0-9]/)
  os: linux
  dist: bionic
- go: 1.18.x
+ go: 1.20.x
  env:
+ - ubuntu-ppa
  - GO111MODULE=on
+ git:
+ submodules: false # avoid cloning ethereum/tests
+ addons:
+ apt:
+ packages:
+ - devscripts
+ - debhelper
+ - dput
+ - fakeroot
+ - python-bzrlib
+ - python-paramiko
  script:
- - go run build/ci.go test -coverage $TEST_PACKAGES
+ - echo '|1|7SiYPr9xl3uctzovOTj4gMwAC1M=|t6ReES75Bo/PxlOPJ6/GsGbTrM0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0aKz5UTUndYgIGG7dQBV+HaeuEZJ2xPHo2DS2iSKvUL4xNMSAY4UguNW+pX56nAQmZKIZZ8MaEvSj6zMEDiq6HFfn5JcTlM80UwlnyKe8B8p7Nk06PPQLrnmQt5fh0HmEcZx+JU9TZsfCHPnX7MNz4ELfZE6cFsclClrKim3BHUIGq//t93DllB+h4O9LHjEUsQ1Sr63irDLSutkLJD6RXchjROXkNirlcNVHH/jwLWR5RcYilNX7S5bIkK8NlWPjsn/8Ua5O7I9/YoE97PpO6i73DTGLh5H9JN/SITwCKBkgSDWUt61uPK3Y11Gty7o2lWsBjhBUm2Y38CBsoGmBw==' >> ~/.ssh/known_hosts
+ - go run build/ci.go debsrc -upload ethereum/ethereum -sftp-user geth-ci -signer "Go Ethereum Linux Builder <[email protected]>"
 
  # This builder does the Azure archive purges to avoid accumulating junk
  - stage: build
  if: type = cron
  os: linux
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - azure-purge
  - GO111MODULE=on
@@ -170,9 +181,9 @@ jobs:
  if: type = cron
  os: linux
  dist: bionic
- go: 1.19.x
+ go: 1.20.x
  env:
  - GO111MODULE=on
  script:
- - go run build/ci.go test -race -coverage $TEST_PACKAGES
+ - go run build/ci.go test -race $TEST_PACKAGES
 
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.19-alpine as builder
+FROM golang:1.20-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

diff --git a/Dockerfile.alltools b/Dockerfile.alltools
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.19-alpine as builder
+FROM golang:1.20-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ archives are published at https://geth.ethereum.org/downloads/.
 
 For prerequisites and detailed build instructions please read the [Installation Instructions](https://geth.ethereum.org/docs/getting-started/installing-geth).
 
-Building `geth` requires both a Go (version 1.18 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.19 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell
@@ -36,18 +36,18 @@ directory.
 
 | Command | Description |
 | :--------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI page](https://geth.ethereum.org/docs/interface/command-line-options) for command line options. |
+| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI page](https://geth.ethereum.org/docs/fundamentals/command-line-options) for command line options. |
 | `clef` | Stand-alone signing tool, which can be used as a backend signer for `geth`. |
 | `devp2p` | Utilities to interact with nodes on the networking layer, without running a full blockchain. |
-| `abigen` | Source code generator to convert Ethereum contract definitions into easy-to-use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://docs.soliditylang.org/en/develop/abi-spec.html) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://geth.ethereum.org/docs/dapp/native-bindings) page for details. |
+| `abigen` | Source code generator to convert Ethereum contract definitions into easy-to-use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://docs.soliditylang.org/en/develop/abi-spec.html) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://geth.ethereum.org/docs/developers/dapp-developer/native-bindings) page for details. |
 | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. |
 | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug run`). |
 | `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://ethereum.org/en/developers/docs/data-structures-and-encoding/rlp)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). |
 
 ## Running `geth`
 
 Going through all the possible command line flags is out of scope here (please consult our
-[CLI Wiki page](https://geth.ethereum.org/docs/interface/command-line-options)),
+[CLI Wiki page](https://geth.ethereum.org/docs/fundamentals/command-line-options)),
 but we've enumerated a few common parameter combos to get you up to speed quickly
 on how you can run your own `geth` instance.
 
@@ -82,10 +82,10 @@ This command will:
  * Start `geth` in snap sync mode (default, can be changed with the `--syncmode` flag),
  causing it to download more data in exchange for avoiding processing the entire history
  of the Ethereum network, which is very CPU intensive.
- * Start the built-in interactive [JavaScript console](https://geth.ethereum.org/docs/interface/javascript-console),
+ * Start the built-in interactive [JavaScript console](https://geth.ethereum.org/docs/interacting-with-geth/javascript-console),
  (via the trailing `console` subcommand) through which you can interact using [`web3` methods](https:/ChainSafe/web3.js/blob/0.20.7/DOCUMENTATION.md) 
  (note: the `web3` version bundled within `geth` is very old, and not up to date with official docs),
- as well as `geth`'s own [management APIs](https://geth.ethereum.org/docs/rpc/server).
+ as well as `geth`'s own [management APIs](https://geth.ethereum.org/docs/interacting-with-geth/rpc).
  This tool is optional and if you leave it out you can always attach it to an already running
  `geth` instance with `geth attach`.
 
@@ -175,7 +175,7 @@ accessible from the outside.
 As a developer, sooner rather than later you'll want to start interacting with `geth` and the
 Ethereum network via your own programs and not manually through the console. To aid
 this, `geth` has built-in support for a JSON-RPC based APIs ([standard APIs](https://ethereum.github.io/execution-apis/api-documentation/)
-and [`geth` specific APIs](https://geth.ethereum.org/docs/rpc/server)).
+and [`geth` specific APIs](https://geth.ethereum.org/docs/interacting-with-geth/rpc)).
 These can be exposed via HTTP, WebSockets and IPC (UNIX sockets on UNIX based
 platforms, and named pipes on Windows).