alls: sync with upstream

accounts/abi/bind/bind.go

@@ -43,6 +43,43 @@ const (
  LangObjC
 )
 
+func isKeyWord(arg string) bool {
+ switch arg {
+ case "break":
+ case "case":
+ case "chan":
+ case "const":
+ case "continue":
+ case "default":
+ case "defer":
+ case "else":
+ case "fallthrough":
+ case "for":
+ case "func":
+ case "go":
+ case "goto":
+ case "if":
+ case "import":
+ case "interface":
+ case "iota":
+ case "map":
+ case "make":
+ case "new":
+ case "package":
+ case "range":
+ case "return":
+ case "select":
+ case "struct":
+ case "switch":
+ case "type":
+ case "var":
+ default:
+ return false
+ }
+
+ return true
+}
+
 // Bind generates a Go wrapper around a contract ABI. This wrapper isn't meant
 // to be used as is in client code, but rather as an intermediate struct which
 // enforces compile time type safety and naming convention opposed to having to
@@ -114,7 +151,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
  normalized.Inputs = make([]abi.Argument, len(original.Inputs))
  copy(normalized.Inputs, original.Inputs)
  for j, input := range normalized.Inputs {
- if input.Name == "" {
+ if input.Name == "" || isKeyWord(input.Name) {
  normalized.Inputs[j].Name = fmt.Sprintf("arg%d", j)
  }
  if hasStruct(input.Type) {
@@ -158,7 +195,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
  normalized.Inputs = make([]abi.Argument, len(original.Inputs))
  copy(normalized.Inputs, original.Inputs)
  for j, input := range normalized.Inputs {
- if input.Name == "" {
+ if input.Name == "" || isKeyWord(input.Name) {
  normalized.Inputs[j].Name = fmt.Sprintf("arg%d", j)
  }
  // Event is a bit special, we need to define event struct in binding,

accounts/abi/bind/bind_test.go

@@ -1972,7 +1972,7 @@ var bindTests = []struct {
  }
  }
  `,
- bytecode: []string{`0x608060405234801561001057600080fd5b5061042b806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063c2bb515f1461003b578063cce7b04814610059575b600080fd5b610043610075565b60405161005091906101af565b60405180910390f35b610073600480360381019061006e91906103ac565b6100b5565b005b61007d6100b8565b604051806040016040528060405180602001604052806000815250815260200160405180602001604052806000815250815250905090565b50565b604051806040016040528060608152602001606081525090565b600081519050919050565b600082825260208201905092915050565b60005b8381101561010c5780820151818401526020810190506100f1565b8381111561011b576000848401525b50505050565b6000601f19601f8301169050919050565b600061013d826100d2565b61014781856100dd565b93506101578185602086016100ee565b61016081610121565b840191505092915050565b600060408301600083015184820360008601526101888282610132565b915050602083015184820360208601526101a28282610132565b9150508091505092915050565b600060208201905081810360008301526101c9818461016b565b905092915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61022282610121565b810181811067ffffffffffffffff82111715610241576102406101ea565b5b80604052505050565b60006102546101d1565b90506102608282610219565b919050565b600080fd5b600080fd5b600080fd5b600067ffffffffffffffff82111561028f5761028e6101ea565b5b61029882610121565b9050602081019050919050565b82818337600083830152505050565b60006102c76102c284610274565b61024a565b9050828152602081018484840111156102e3576102e261026f565b5b6102ee8482856102a5565b509392505050565b600082601f83011261030b5761030a61026a565b5b813561031b8482602086016102b4565b91505092915050565b60006040828403121561033a576103396101e5565b5b610344604061024a565b9050600082013567ffffffffffffffff81111561036457610363610265565b5b610370848285016102f6565b600083015250602082013567ffffffffffffffff81111561039457610393610265565b5b6103a0848285016102f6565b60208301525092915050565b6000602082840312156103c2576103c16101db565b5b600082013567ffffffffffffffff8111156103e0576103df6101e0565b5b6103ec84828501610324565b9150509291505056fea264697066735822122033bca1606af9b6aeba1673f98c52003cec19338539fb44b86690ce82c51483b564736f6c634300080e0033`},
+ bytecode: []string{"0x608060405234801561001057600080fd5b5061042b806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063c2bb515f1461003b578063cce7b04814610059575b600080fd5b610043610075565b60405161005091906101af565b60405180910390f35b610073600480360381019061006e91906103ac565b6100b5565b005b61007d6100b8565b604051806040016040528060405180602001604052806000815250815260200160405180602001604052806000815250815250905090565b50565b604051806040016040528060608152602001606081525090565b600081519050919050565b600082825260208201905092915050565b60005b8381101561010c5780820151818401526020810190506100f1565b8381111561011b576000848401525b50505050565b6000601f19601f8301169050919050565b600061013d826100d2565b61014781856100dd565b93506101578185602086016100ee565b61016081610121565b840191505092915050565b600060408301600083015184820360008601526101888282610132565b915050602083015184820360208601526101a28282610132565b9150508091505092915050565b600060208201905081810360008301526101c9818461016b565b905092915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61022282610121565b810181811067ffffffffffffffff82111715610241576102406101ea565b5b80604052505050565b60006102546101d1565b90506102608282610219565b919050565b600080fd5b600080fd5b600080fd5b600067ffffffffffffffff82111561028f5761028e6101ea565b5b61029882610121565b9050602081019050919050565b82818337600083830152505050565b60006102c76102c284610274565b61024a565b9050828152602081018484840111156102e3576102e261026f565b5b6102ee8482856102a5565b509392505050565b600082601f83011261030b5761030a61026a565b5b813561031b8482602086016102b4565b91505092915050565b60006040828403121561033a576103396101e5565b5b610344604061024a565b9050600082013567ffffffffffffffff81111561036457610363610265565b5b610370848285016102f6565b600083015250602082013567ffffffffffffffff81111561039457610393610265565b5b6103a0848285016102f6565b60208301525092915050565b6000602082840312156103c2576103c16101db565b5b600082013567ffffffffffffffff8111156103e0576103df6101e0565b5b6103ec84828501610324565b9150509291505056fea264697066735822122033bca1606af9b6aeba1673f98c52003cec19338539fb44b86690ce82c51483b564736f6c634300080e0033"},
  abi: []string{`[ { "anonymous": false, "inputs": [ { "indexed": false, "internalType": "int256", "name": "msg", "type": "int256" }, { "indexed": false, "internalType": "int256", "name": "_msg", "type": "int256" } ], "name": "log", "type": "event" }, { "inputs": [ { "components": [ { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "bytes", "name": "_data", "type": "bytes" } ], "internalType": "struct oracle.request", "name": "req", "type": "tuple" } ], "name": "addRequest", "outputs": [], "stateMutability": "pure", "type": "function" }, { "inputs": [], "name": "getRequest", "outputs": [ { "components": [ { "internalType": "bytes", "name": "data", "type": "bytes" }, { "internalType": "bytes", "name": "_data", "type": "bytes" } ], "internalType": "struct oracle.request", "name": "", "type": "tuple" } ], "stateMutability": "pure", "type": "function" } ]`},
  imports: `
  "math/big"
@@ -2003,6 +2003,43 @@ var bindTests = []struct {
  }
  `,
  },
+ {
+ name: "RangeKeyword",
+ contract: `
+ // SPDX-License-Identifier: GPL-3.0
+ pragma solidity >=0.4.22 <0.9.0;
+ contract keywordcontract {
+ function functionWithKeywordParameter(range uint256) public pure {}
+ }
+ `,
+ bytecode: []string{"0x608060405234801561001057600080fd5b5060dc8061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063527a119f14602d575b600080fd5b60436004803603810190603f9190605b565b6045565b005b50565b6000813590506055816092565b92915050565b600060208284031215606e57606d608d565b5b6000607a848285016048565b91505092915050565b6000819050919050565b600080fd5b6099816083565b811460a357600080fd5b5056fea2646970667358221220d4f4525e2615516394055d369fb17df41c359e5e962734f27fd683ea81fd9db164736f6c63430008070033"},
+ abi: []string{`[{"inputs":[{"internalType":"uint256","name":"range","type":"uint256"}],"name":"functionWithKeywordParameter","outputs":[],"stateMutability":"pure","type":"function"}]`},
+ imports: `
+ "math/big"
+
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth/ethconfig"
+ `,
+ tester: `
+ var (
+ key, _ = crypto.GenerateKey()
+ user, _ = bind.NewKeyedTransactorWithChainID(key, big.NewInt(1337))
+ sim = backends.NewSimulatedBackend(core.GenesisAlloc{user.From: {Balance: big.NewInt(1000000000000000000)}}, ethconfig.Defaults.Miner.GasCeil)
+ )
+ _, tx, _, err := DeployRangeKeyword(user, sim)
+ if err != nil {
+ t.Fatalf("error deploying contract: %v", err)
+ }
+ sim.Commit()
+
+ if _, err = bind.WaitDeployed(nil, sim, tx); err != nil {
+ t.Errorf("error deploying the contract: %v", err)
+ }
+ `,
+ },
 }
 
 // Tests that packages generated by the binder can be successfully compiled and

core/blockchain.go

@@ -898,22 +898,25 @@ func (bc *BlockChain) Export(w io.Writer) error {
 
 // ExportN writes a subset of the active chain to the given writer.
 func (bc *BlockChain) ExportN(w io.Writer, first uint64, last uint64) error {
- if !bc.chainmu.TryLock() {
- return errChainStopped
- }
- defer bc.chainmu.Unlock()
-
  if first > last {
  return fmt.Errorf("export failed: first (%d) is greater than last (%d)", first, last)
  }
  log.Info("Exporting batch of blocks", "count", last-first+1)
 
- start, reported := time.Now(), time.Now()
+ var (
+ parentHash common.Hash
+ start = time.Now()
+ reported = time.Now()
+ )
  for nr := first; nr <= last; nr++ {
  block := bc.GetBlockByNumber(nr)
  if block == nil {
  return fmt.Errorf("export failed on #%d: not found", nr)
  }
+ if nr > first && block.ParentHash() != parentHash {
+ return fmt.Errorf("export failed: chain reorg during export")
+ }
+ parentHash = block.Hash()
  if err := block.EncodeRLP(w); err != nil {
  return err
  }

core/state/state_object.go

@@ -50,7 +50,7 @@ func (s Storage) String() (str string) {
 }
 
 func (s Storage) Copy() Storage {
- cpy := make(Storage)
+ cpy := make(Storage, len(s))
  for key, value := range s {
  cpy[key] = value
  }

eth/tracers/logger/logger.go

@@ -40,7 +40,7 @@ type Storage map[common.Hash]common.Hash
 
 // Copy duplicates the current storage.
 func (s Storage) Copy() Storage {
- cpy := make(Storage)
+ cpy := make(Storage, len(s))
  for key, value := range s {
  cpy[key] = value
  }

internal/ethapi/transaction_args.go

@@ -165,9 +165,15 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error {
  args.Gas = &estimated
  log.Trace("Estimate gas usage automatically", "gas", args.Gas)
  }
- if args.ChainID == nil {
- id := (*hexutil.Big)(b.ChainConfig().ChainID)
- args.ChainID = id
+ // If chain id is provided, ensure it matches the local chain id. Otherwise, set the local
+ // chain id as the default.
+ want := b.ChainConfig().ChainID
+ if args.ChainID != nil {
+ if have := (*big.Int)(args.ChainID); have.Cmp(want) != 0 {
+ return fmt.Errorf("chainId does not match node's (have=%v, want=%v)", have, want)
+ }
+ } else {
+ args.ChainID = (*hexutil.Big)(want)
  }
  return nil
 }

node/rpcstack.go

@@ -28,6 +28,7 @@ import (
  "strings"
  "sync"
  "sync/atomic"
+ "time"
 
  "github.com/ethereum/go-ethereum/log"
  "github.com/ethereum/go-ethereum/rpc"
@@ -80,6 +81,10 @@ type httpServer struct {
  handlerNames map[string]string
 }
 
+const (
+ shutdownTimeout = 5 * time.Second
+)
+
 func newHTTPServer(log log.Logger, timeouts rpc.HTTPTimeouts) *httpServer {
  h := &httpServer{log: log, timeouts: timeouts, handlerNames: make(map[string]string)}
 
@@ -260,7 +265,13 @@ func (h *httpServer) doStop() {
  h.wsHandler.Store((*rpcHandler)(nil))
  wsHandler.server.Stop()
  }
- h.server.Shutdown(context.Background())
+ ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
+ defer cancel()
+ err := h.server.Shutdown(ctx)
+ if err == ctx.Err() {
+ h.log.Warn("HTTP server graceful shutdown timed out")
+ h.server.Close()
+ }
  h.listener.Close()
  h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())