Merge pull request #73 from junnmm/merge-upstream-v1.10.20

!!! Merge upstream v1.10.20

.golangci.yml

@@ -67,5 +67,6 @@ issues:
  exclude:
  - 'SA1019: event.TypeMux is deprecated: use Feed'
  - 'SA1019: strings.Title is deprecated'
+ - 'SA1019: strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.'
  - 'SA1029: should not use built-in type string as key for value'
- - 'G306: Expect WriteFile permissions to be 0600 or less'
+ - 'G306: Expect WriteFile permissions to be 0600 or less'

README.md

@@ -112,7 +112,7 @@ HTTP based JSON-RPC API options:
  * `--ws.api` API's offered over the WS-RPC interface (default: `eth,net,web3`)
  * `--ws.origins` Origins from which to accept websockets requests
  * `--ipcdisable` Disable the IPC-RPC server
- * `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,shh,txpool,web3`)
+ * `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,txpool,web3`)
  * `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it)
 
 You'll need to use your own programming environments' capabilities (libraries, tools, etc) to

build/checksums.txt

@@ -15,44 +15,24 @@ b3b815f47ababac13810fc6021eb73d65478e0b2db4b09d348eefad9581a2334 go1.18.1.linux
 c30bc3f1f7314a953fe208bd9cd5e24bd9403392a6c556ced3677f9f70f71fe1 go1.18.1.windows-amd64.zip
 2c4a8265030eac37f906634f5c13c22c3d0ea725f2488e1bca005c6b981653d7 go1.18.1.windows-arm64.zip
 
-03c181fc1bb29ea3e73cbb23399c43b081063833a7cf7554b94e5a98308df53e golangci-lint-1.45.2-linux-riscv64.deb
-08a50bbbf451ede6d5354179eb3e14a5634e156dfa92cb9a2606f855a637e35b golangci-lint-1.45.2-linux-ppc64le.rpm
-0d12f6ec1296b5a70e392aa88cd2295cceef266165eb7028e675f455515dd1c9 golangci-lint-1.45.2-linux-armv7.deb
-10f2846e2e50e4ea8ae426ee62dcd2227b23adddd8e991aa3c065927ac948735 golangci-lint-1.45.2-linux-ppc64le.deb
-1463049b744871168095e3e8f687247d6040eeb895955b869889ea151e0603ab golangci-lint-1.45.2-linux-arm64.tar.gz
-15720f9c4c6f9324af695f081dc189adc7751b255759e78d7b2df1d7e9192533 golangci-lint-1.45.2-linux-amd64.deb
-166d922e4d3cfe3d47786c590154a9c8ea689dff0aa92b73d2f5fc74fc570c29 golangci-lint-1.45.2-linux-arm64.rpm
-1a3754c69f7cc19ab89cbdcc2550da4cf9abb3120383c6b3bd440c1ec22da2e6 golangci-lint-1.45.2-freebsd-386.tar.gz
-1dec0aa46d4f0d241863b573f70129bdf1de9c595cf51172a840a588a4cd9fc5 golangci-lint-1.45.2-windows-amd64.zip
-3198453806517c1ad988229f5e758ef850e671203f46d6905509df5bdf4dc24b golangci-lint-1.45.2-freebsd-armv7.tar.gz
-46a3cd1749d7b98adc2dc01510ddbe21abe42689c8a53fb0e81662713629f215 golangci-lint-1.45.2-linux-386.deb
-4e28bfb593d464b9e160f2acd5b71993836a183270bf8299b78ad31f7a168c0d golangci-lint-1.45.2-linux-arm64.deb
-5157a58c8f9ab85c33af2e46f0d7c57a3b1e8953b81d61130e292e09f545cfab golangci-lint-1.45.2-linux-mips64le.tar.gz
-518cd027644129fbf8ec4f02bd6f9ad7278aae826f92b63c80d4d0819ddde49a golangci-lint-1.45.2-linux-armv6.rpm
-595ad6c6dade4c064351bc309f411703e457f8ffbb7a1806b3d8ee713333427f golangci-lint-1.45.2-linux-amd64.tar.gz
-6994d6c80f0730751090986184a3481b4be2e6b6e84416238a2b857910045a4f golangci-lint-1.45.2-windows-arm64.zip
-6c81652fc340118811b487f713c441fc6f527800bf5fd11b8929d08124efa015 golangci-lint-1.45.2-linux-armv7.tar.gz
-726cb045559b7518bafdd3459de70a0647c087eb1b4634627a4b2e95b1258580 golangci-lint-1.45.2-freebsd-amd64.tar.gz
-77df3774cdfda49b956d4a0e676da9a9b883f496ee37293c530770fef6b1d24e golangci-lint-1.45.2-linux-mips64.deb
-7a9840f279a7d5d405bb434e101c2290964b3729630ac2add29280b962b7b9a5 golangci-lint-1.45.2-windows-armv6.zip
-7d4bf9a5d80ec467aaaf66e78dbdcab567bbc6ba8151334c714eee58766aae32 golangci-lint-1.45.2-windows-armv7.zip
-7e5f8821d39bb11d273b0841b34355f56bd5a45a2d5179f0d09e614e0efc0482 golangci-lint-1.45.2-linux-s390x.rpm
-828de1bde796b23d8656b17a8885fbd879ef612795d62d1e4618126b419728b5 golangci-lint-1.45.2-linux-mips64.rpm
-879a52107a797678a03c175cc7cf441411a14a01f66dc87f70bdfa304a4129a6 golangci-lint-1.45.2-windows-386.zip
-87b6c7e3a3769f7d9abeb3bb82119b3c91e3c975300f6834fdeef8b2e37c98ff golangci-lint-1.45.2-linux-amd64.rpm
-8b605c6d686c8af53ecc4ef39544541eeb1644d34cc10f9ffc5087808210c4ff golangci-lint-1.45.2-linux-s390x.deb
-9427dbf51d0ac6f73a0f992838bd40c817470cc5bf6c8e2e2bea6fac46d7af6e golangci-lint-1.45.2-linux-ppc64le.tar.gz
-995e509e895ca6a64ffc7395ac884d5961bdec98423cb896b17f345a9b4a19cf golangci-lint-1.45.2-darwin-amd64.tar.gz
-a3f36278f2ea5516341e9071a2df6e65df272be80230b5406a12b72c6d425bee golangci-lint-1.45.2-linux-armv7.rpm
-a5e12c50c23e87ac1deffc872f92ae85427b1198604969399805ae47cfe43f08 golangci-lint-1.45.2-linux-riscv64.tar.gz
-aa8fa1be0729dbc2fbc4e01e82027097613eee74bd686ebef20f860b01fff8b3 golangci-lint-1.45.2-freebsd-armv6.tar.gz
-c2b9669decc1b638cf2ee9060571af4e255f6dfcbb225c293e3a7ee4bb2c7217 golangci-lint-1.45.2-darwin-arm64.tar.gz
-dfa8bdaf0387aec1cd5c1aa8857f67b2bbdfc2e42efce540c8fb9bbe3e8af302 golangci-lint-1.45.2-linux-armv6.tar.gz
-eb8b8539dd017eee5c131ea9b875893ab2cebeeca41e8c6624907fb02224d643 golangci-lint-1.45.2-linux-386.rpm
-ed6c7e17a857f30d715c5302fa250d95936936b277024bffea201187a257d7a7 golangci-lint-1.45.2-linux-armv6.deb
-ef4d0154ace4001f01b288baeb118176242efb4fd163e178763e3213b77ef30b golangci-lint-1.45.2-linux-mips64le.deb
-ef7002a2229f5ff5ba201a715fcf877664ea88decbe58e69d163293913024955 golangci-lint-1.45.2-linux-s390x.tar.gz
-f13ecbd09228632e6bbe91a8324bd675c406eed22eb6d2c1e8192eed9ec4f914 golangci-lint-1.45.2-linux-386.tar.gz
-f4cd9cfb09252f51699407277512263cae8409b665dd764f55a34738d0e89edc golangci-lint-1.45.2-linux-riscv64.rpm
-fb1945dc59d37c9d14bf0a4aea11ea8651fa0e1d582ea80c4c44d0a536c08893 golangci-lint-1.45.2-linux-mips64.tar.gz
-fe542c22738010f453c735a3c410decfd3784d1bd394b395c298ee298fc4c606 golangci-lint-1.45.2-linux-mips64le.rpm
+658078aaaf7608693f37c4cf1380b2af418ab8b2d23fdb33e7e2d4339328590e golangci-lint-1.46.2-darwin-amd64.tar.gz
+81f9b4afd62ec5e612ef8bc3b1d612a88b56ff289874831845cdad394427385f golangci-lint-1.46.2-darwin-arm64.tar.gz
+943486e703e62ec55ecd90caeb22bcd39f8cc3962a93eec18c06b7bae12cb46f golangci-lint-1.46.2-freebsd-386.tar.gz
+a75dd9ba7e08e8315c411697171db5375c0f6a1ece9e6fbeb9e9a4386822e17d golangci-lint-1.46.2-freebsd-amd64.tar.gz
+83eedca1af72e8be055a1235177eb1b33524fbf08bec5730df2e6c3efade2b23 golangci-lint-1.46.2-freebsd-armv6.tar.gz
+513d276c490de6f82baa01f9346d8d78b385f2ae97608f42f05d1f0f1314cd54 golangci-lint-1.46.2-freebsd-armv7.tar.gz
+461a60016d516c69d406dc3e2d4957b722dbe684b7085dfac4802d0f84409e27 golangci-lint-1.46.2-linux-386.tar.gz
+242cd4f2d6ac0556e315192e8555784d13da5d1874e51304711570769c4f2b9b golangci-lint-1.46.2-linux-amd64.tar.gz
+ff5448ada2b3982581984d64b0dec614dba0a3ea4cab2d6a343c77927fc89f7e golangci-lint-1.46.2-linux-arm64.tar.gz
+177f5210ef04aee282bfbc6ec519d36af5fb7d2b2c8d3f4ea5e59fdba71b0a27 golangci-lint-1.46.2-linux-armv6.tar.gz
+10dd512a36ee978a1009edbca3ba3af410f0fda8df4d85f0e4793a24213870cc golangci-lint-1.46.2-linux-armv7.tar.gz
+67779fa517c688c9db1090c3c456117d95c6b92979c623fe8cce8fb84251f21e golangci-lint-1.46.2-linux-mips64.tar.gz
+c085f0f57bdccbb2c902a41b72ce210a3dfff16ca856789374745ab52004b6ee golangci-lint-1.46.2-linux-mips64le.tar.gz
+abecef6421499248e58ed75d2938bc12b4b1f98b057f25060680b77bb51a881e golangci-lint-1.46.2-linux-ppc64le.tar.gz
+134843a8f5c5c182c11979ea75f5866945d54757b2a04f3e5e04a0cf4fbf3a39 golangci-lint-1.46.2-linux-riscv64.tar.gz
+9fe21a9476567aafe7a2e1a926b9641a39f920d4c0ea8eda9d968bc6136337f9 golangci-lint-1.46.2-linux-s390x.tar.gz
+b48a421ec12a43f8fc8f977b9cf7d4a1ea1c4b97f803a238de7d3ce4ab23a84b golangci-lint-1.46.2-windows-386.zip
+604acc1378a566abb0eac799362f3a37b7fcb5fa2268aeb2d5d954c829367301 golangci-lint-1.46.2-windows-amd64.zip
+927def10db073da9687594072e6a3d9c891f67fa897105a2cfd715e018e7386c golangci-lint-1.46.2-windows-arm64.zip
+729b76ed1d8b4e2612e38772b211503cb940e00a137bbaace1aa066f7c943737 golangci-lint-1.46.2-windows-armv6.zip
+ea27c86d91e0b245ecbcfbf6cdb4ac0522d4bc6dca56bba02ea1bc77ad2917ac golangci-lint-1.46.2-windows-armv7.zip

build/ci.go

@@ -132,12 +132,12 @@ var (
  // Note: the following Ubuntu releases have been officially deprecated on Launchpad:
  // wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite
  debDistroGoBoots = map[string]string{
- "trusty":  "golang-1.11", // EOL: 04/2024
- "xenial":  "golang-go", // EOL: 04/2026
- "bionic":  "golang-go", // EOL: 04/2028
- "focal":  "golang-go", // EOL: 04/2030
- "impish":  "golang-go", // EOL: 07/2022
- "jammy":  "golang-go", // EOL: 04/2032
+ "trusty": "golang-1.11", // EOL: 04/2024
+ "xenial": "golang-go", // EOL: 04/2026
+ "bionic": "golang-go", // EOL: 04/2028
+ "focal": "golang-go", // EOL: 04/2030
+ "impish": "golang-go", // EOL: 07/2022
+ "jammy": "golang-go", // EOL: 04/2032
  //"kinetic": "golang-go", // EOL: 07/2023
  }
 
@@ -224,6 +224,9 @@ func doInstall(cmdline []string) {
  gobuild.Args = append(gobuild.Args, "-p", "1")
  }
 
+ // Disable CLI markdown doc generation in release builds.
+ gobuild.Args = append(gobuild.Args, "-tags", "urfave_cli_no_docs")
+
  // We use -trimpath to avoid leaking local paths into the built executables.
  gobuild.Args = append(gobuild.Args, "-trimpath")
 
@@ -333,7 +336,7 @@ func doLint(cmdline []string) {
 
 // downloadLinter downloads and unpacks golangci-lint.
 func downloadLinter(cachedir string) string {
- const version = "1.45.2"
+ const version = "1.46.2"
 
  csdb := build.MustLoadChecksums("build/checksums.txt")
  arch := runtime.GOARCH

build/deb/ethereum/completions/bash/geth

@@ -0,0 +1,16 @@
+_geth_bash_autocomplete() {
+ if [[ "${COMP_WORDS[0]}" != "source" ]]; then
+ local cur opts base
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ if [[ "$cur" == "-"* ]]; then
+ opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} ${cur} --generate-bash-completion )
+ else
+ opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
+ fi
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ return 0
+ fi
+}
+
+complete -o bashdefault -o default -o nospace -F _geth_bash_autocomplete geth

build/deb/ethereum/completions/zsh/_geth

@@ -0,0 +1,18 @@
+_geth_zsh_autocomplete() {
+ local -a opts
+ local cur
+ cur=${words[-1]}
+ if [[ "$cur" == "-"* ]]; then
+ opts=("${(@f)$(${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+ else
+ opts=("${(@f)$(${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+ fi
+
+ if [[ "${opts[1]}" != "" ]]; then
+ _describe 'values' opts
+ else
+ _files
+ fi
+}
+
+compdef _geth_zsh_autocomplete geth

build/deb/ethereum/deb.install

@@ -1 +1,5 @@
 build/bin/{{.BinaryName}} usr/bin
+{{- if eq .BinaryName "geth" }}
+build/deb/ethereum/completions/bash/geth etc/bash_completion.d
+build/deb/ethereum/completions/zsh/_geth usr/share/zsh/vendor-completions
+{{end -}}

cmd/abigen/main.go

@@ -30,7 +30,7 @@ import (
  "github.com/ethereum/go-ethereum/crypto"
  "github.com/ethereum/go-ethereum/internal/flags"
  "github.com/ethereum/go-ethereum/log"
- "gopkg.in/urfave/cli.v1"
+ "github.com/urfave/cli/v2"
 )
 
 var (
@@ -39,49 +39,52 @@ var (
  gitDate = ""
 
  app *cli.App
+)
 
+var (
  // Flags needed by abigen
- abiFlag = cli.StringFlag{
+ abiFlag = &cli.StringFlag{
  Name: "abi",
  Usage: "Path to the Ethereum contract ABI json to bind, - for STDIN",
  }
- binFlag = cli.StringFlag{
+ binFlag = &cli.StringFlag{
  Name: "bin",
  Usage: "Path to the Ethereum contract bytecode (generate deploy method)",
  }
- typeFlag = cli.StringFlag{
+ typeFlag = &cli.StringFlag{
  Name: "type",
  Usage: "Struct name for the binding (default = package name)",
  }
- jsonFlag = cli.StringFlag{
+ jsonFlag = &cli.StringFlag{
  Name: "combined-json",
  Usage: "Path to the combined-json file generated by compiler, - for STDIN",
  }
- excFlag = cli.StringFlag{
+ excFlag = &cli.StringFlag{
  Name: "exc",
  Usage: "Comma separated types to exclude from binding",
  }
- pkgFlag = cli.StringFlag{
+ pkgFlag = &cli.StringFlag{
  Name: "pkg",
  Usage: "Package name to generate the binding into",
  }
- outFlag = cli.StringFlag{
+ outFlag = &cli.StringFlag{
  Name: "out",
  Usage: "Output file for the generated binding (default = stdout)",
  }
- langFlag = cli.StringFlag{
+ langFlag = &cli.StringFlag{
  Name: "lang",
  Usage: "Destination language for the bindings (go, java, objc)",
  Value: "go",
  }
- aliasFlag = cli.StringFlag{
+ aliasFlag = &cli.StringFlag{
  Name: "alias",
  Usage: "Comma separated aliases for function and event renaming, e.g. original1=alias1, original2=alias2",
  }
 )
 
 func init() {
  app = flags.NewApp(gitCommit, gitDate, "ethereum checkpoint helper tool")
+ app.Name = "abigen"
  app.Flags = []cli.Flag{
  abiFlag,
  binFlag,
@@ -93,17 +96,17 @@ func init() {
  langFlag,
  aliasFlag,
  }
- app.Action = utils.MigrateFlags(abigen)
- cli.CommandHelpTemplate = flags.OriginCommandHelpTemplate
+ app.Action = abigen
 }
 
 func abigen(c *cli.Context) error {
  utils.CheckExclusive(c, abiFlag, jsonFlag) // Only one source can be selected.
- if c.GlobalString(pkgFlag.Name) == "" {
+
+ if c.String(pkgFlag.Name) == "" {
  utils.Fatalf("No destination package specified (--pkg)")
  }
  var lang bind.Lang
- switch c.GlobalString(langFlag.Name) {
+ switch c.String(langFlag.Name) {
  case "go":
  lang = bind.LangGo
  case "java":
@@ -112,7 +115,7 @@ func abigen(c *cli.Context) error {
  lang = bind.LangObjC
  utils.Fatalf("Objc binding generation is uncompleted")
  default:
- utils.Fatalf("Unsupported destination language \"%s\" (--lang)", c.GlobalString(langFlag.Name))
+ utils.Fatalf("Unsupported destination language \"%s\" (--lang)", c.String(langFlag.Name))
  }
  // If the entire solidity code was specified, build and bind based on that
  var (
@@ -123,13 +126,13 @@ func abigen(c *cli.Context) error {
  libs = make(map[string]string)
  aliases = make(map[string]string)
  )
- if c.GlobalString(abiFlag.Name) != "" {
+ if c.String(abiFlag.Name) != "" {
  // Load up the ABI, optional bytecode and type name from the parameters
  var (
  abi []byte
  err error
  )
- input := c.GlobalString(abiFlag.Name)
+ input := c.String(abiFlag.Name)
  if input == "-" {
  abi, err = io.ReadAll(os.Stdin)
  } else {
@@ -141,7 +144,7 @@ func abigen(c *cli.Context) error {
  abis = append(abis, string(abi))
 
  var bin []byte
- if binFile := c.GlobalString(binFlag.Name); binFile != "" {
+ if binFile := c.String(binFlag.Name); binFile != "" {
  if bin, err = os.ReadFile(binFile); err != nil {
  utils.Fatalf("Failed to read input bytecode: %v", err)
  }
@@ -151,22 +154,22 @@ func abigen(c *cli.Context) error {
  }
  bins = append(bins, string(bin))
 
- kind := c.GlobalString(typeFlag.Name)
+ kind := c.String(typeFlag.Name)
  if kind == "" {
- kind = c.GlobalString(pkgFlag.Name)
+ kind = c.String(pkgFlag.Name)
  }
  types = append(types, kind)
  } else {
  // Generate the list of types to exclude from binding
  exclude := make(map[string]bool)
- for _, kind := range strings.Split(c.GlobalString(excFlag.Name), ",") {
+ for _, kind := range strings.Split(c.String(excFlag.Name), ",") {
  exclude[strings.ToLower(kind)] = true
  }
  var contracts map[string]*compiler.Contract
 
- if c.GlobalIsSet(jsonFlag.Name) {
+ if c.IsSet(jsonFlag.Name) {
  var (
- input = c.GlobalString(jsonFlag.Name)
+ input = c.String(jsonFlag.Name)
  jsonOutput []byte
  err error
  )
@@ -207,28 +210,28 @@ func abigen(c *cli.Context) error {
  }
  }
  // Extract all aliases from the flags
- if c.GlobalIsSet(aliasFlag.Name) {
+ if c.IsSet(aliasFlag.Name) {
  // We support multi-versions for aliasing
  // e.g.
  // foo=bar,foo2=bar2
  // foo:bar,foo2:bar2
  re := regexp.MustCompile(`(?:(\w+)[:=](\w+))`)
- submatches := re.FindAllStringSubmatch(c.GlobalString(aliasFlag.Name), -1)
+ submatches := re.FindAllStringSubmatch(c.String(aliasFlag.Name), -1)
  for _, match := range submatches {
  aliases[match[1]] = match[2]
  }
  }
  // Generate the contract binding
- code, err := bind.Bind(types, abis, bins, sigs, c.GlobalString(pkgFlag.Name), lang, libs, aliases)
+ code, err := bind.Bind(types, abis, bins, sigs, c.String(pkgFlag.Name), lang, libs, aliases)
  if err != nil {
  utils.Fatalf("Failed to generate ABI binding: %v", err)
  }
  // Either flush it out to a file or display on the standard output
- if !c.GlobalIsSet(outFlag.Name) {
+ if !c.IsSet(outFlag.Name) {
  fmt.Printf("%s\n", code)
  return nil
  }
- if err := os.WriteFile(c.GlobalString(outFlag.Name), []byte(code), 0600); err != nil {
+ if err := os.WriteFile(c.String(outFlag.Name), []byte(code), 0600); err != nil {
  utils.Fatalf("Failed to write ABI binding: %v", err)
  }
  return nil

cmd/checkpoint-admin/common.go

@@ -28,12 +28,12 @@ import (
  "github.com/ethereum/go-ethereum/ethclient"
  "github.com/ethereum/go-ethereum/params"
  "github.com/ethereum/go-ethereum/rpc"
- "gopkg.in/urfave/cli.v1"
+ "github.com/urfave/cli/v2"
 )
 
 // newClient creates a client with specified remote URL.
 func newClient(ctx *cli.Context) *ethclient.Client {
- client, err := ethclient.Dial(ctx.GlobalString(nodeURLFlag.Name))
+ client, err := ethclient.Dial(ctx.String(nodeURLFlag.Name))
  if err != nil {
  utils.Fatalf("Failed to connect to Ethereum node: %v", err)
  }
@@ -64,9 +64,9 @@ func getContractAddr(client *rpc.Client) common.Address {
 func getCheckpoint(ctx *cli.Context, client *rpc.Client) *params.TrustedCheckpoint {
  var checkpoint *params.TrustedCheckpoint
 
- if ctx.GlobalIsSet(indexFlag.Name) {
+ if ctx.IsSet(indexFlag.Name) {
  var result [3]string
- index := uint64(ctx.GlobalInt64(indexFlag.Name))
+ index := uint64(ctx.Int64(indexFlag.Name))
  if err := client.Call(&result, "les_getCheckpoint", index); err != nil {
  utils.Fatalf("Failed to get local checkpoint %v, please ensure the les API is exposed", err)
  }