Merge pull request ethereum#97 from mdehoog/upstream-merge

Merge latest from upstream

.github/CODEOWNERS

@@ -5,7 +5,6 @@ accounts/usbwallet @karalabe
 accounts/scwallet @gballet
 accounts/abi @gballet @MariusVanDerWijden
 cmd/clef @holiman
-cmd/puppeth @karalabe
 consensus @karalabe
 core/ @karalabe @holiman @rjl493456442
 eth/ @karalabe @holiman @rjl493456442
@@ -14,7 +13,6 @@ eth/tracers/ @s1na
 graphql/ @gballet @s1na
 les/ @zsfelfoldi @rjl493456442
 light/ @zsfelfoldi @rjl493456442
-mobile/ @karalabe @ligi
 node/ @fjl
 p2p/ @fjl @zsfelfoldi
 rpc/ @fjl @holiman

.travis.yml

@@ -120,75 +120,6 @@ 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 Android Maven and Azure uploads
- - stage: build
- if: type = push
- os: linux
- dist: bionic
- addons:
- apt:
- packages:
- - openjdk-8-jdk
- env:
- - azure-android
- - maven-android
- - GO111MODULE=on
- git:
- submodules: false # avoid cloning ethereum/tests
- before_install:
- # Install Android and it's dependencies manually, Travis is stale
- - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- - curl https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -o android.zip
- - unzip -q android.zip -d $HOME/sdk && rm android.zip
- - mv $HOME/sdk/cmdline-tools $HOME/sdk/latest && mkdir $HOME/sdk/cmdline-tools && mv $HOME/sdk/latest $HOME/sdk/cmdline-tools
- - export PATH=$PATH:$HOME/sdk/cmdline-tools/latest/bin
- - export ANDROID_HOME=$HOME/sdk
-
- - yes | sdkmanager --licenses >/dev/null
- - sdkmanager "platform-tools" "platforms;android-15" "platforms;android-19" "platforms;android-24" "ndk-bundle"
-
- # Install Go to allow building with
- - curl https://dl.google.com/go/go1.19.5.linux-amd64.tar.gz | tar -xz
- - export PATH=`pwd`/go/bin:$PATH
- - export GOROOT=`pwd`/go
- - export GOPATH=$HOME/go
- script:
- # Build the Android archive and upload it to Maven Central and Azure
- - mkdir -p $GOPATH/src/github.com/ethereum
- - ln -s `pwd` $GOPATH/src/github.com/ethereum/go-ethereum
- - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -signify SIGNIFY_KEY -deploy https://oss.sonatype.org -upload gethstore/builds
-
- # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
- - stage: build
- if: type = push
- os: osx
- go: 1.19.x
- env:
- - azure-osx
- - azure-ios
- - cocoapods-ios
- - 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
-
- # Build the iOS framework and upload it to CocoaPods and Azure
- - gem uninstall cocoapods -a -x
- - gem install cocoapods
-
- - mv ~/.cocoapods/repos/master ~/.cocoapods/repos/master.bak
- - sed -i '.bak' 's/repo.join/!repo.join/g' $(dirname `gem which cocoapods`)/cocoapods/sources_manager.rb
- - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git clone --depth=1 https://github.com/CocoaPods/Specs.git ~/.cocoapods/repos/master && pod setup --verbose; fi
-
- - xctool -version
- - xcrun simctl list
-
- # Workaround for https://github.com/golang/go/issues/23749
- - export CGO_CFLAGS_ALLOW='-fmodules|-fblocks|-fobjc-arc'
- - go run build/ci.go xcode -signer IOS_SIGNING_KEY -signify SIGNIFY_KEY -deploy trunk -upload gethstore/builds
-
  # These builders run the tests
  - stage: build
  os: linux

Makefile

@@ -16,18 +16,6 @@ geth:
 all:
  $(GORUN) build/ci.go install
 
-android:
- $(GORUN) build/ci.go aar --local
- @echo "Done building."
- @echo "Import \"$(GOBIN)/geth.aar\" to use the library."
- @echo "Import \"$(GOBIN)/geth-sources.jar\" to add javadocs"
- @echo "For more info see https://stackoverflow.com/questions/20994336/android-studio-how-to-attach-javadoc"
-
-ios:
- $(GORUN) build/ci.go xcode --local
- @echo "Done building."
- @echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
-
 test: all
  $(GORUN) build/ci.go test
 

README.md

@@ -43,7 +43,6 @@ directory.
 | `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`). |
-| `puppeth` | a CLI wizard that aids in creating a new Ethereum network. |
 
 ## Running `geth`
 
@@ -322,12 +321,8 @@ also need to configure a miner to process transactions and create new blocks for
 
 #### Running a private miner
 
-Mining on the public Ethereum network is a complex task as it's only feasible using GPUs,
-requiring an OpenCL or CUDA enabled `ethminer` instance. For information on such a
-setup, please consult the [EtherMining subreddit](https://www.reddit.com/r/EtherMining/)
-and the [ethminer](https://github.com/ethereum-mining/ethminer) repository.
 
-In a private network setting, however, a single CPU miner instance is more than enough for
+In a private network setting a single CPU miner instance is more than enough for
 practical purposes as it can produce a stable stream of blocks at the correct intervals
 without needing heavy resources (consider running on a single thread, no need for multiple
 ones either). To start a `geth` instance for mining, run it with all your usual flags, extended
@@ -364,7 +359,7 @@ Please make sure your contributions adhere to our coding guidelines:
  * Commit messages should be prefixed with the package(s) they modify.
  * E.g. "eth, rpc: make trace configs optional"
 
-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.
 

accounts/abi/bind/bind.go

@@ -22,7 +22,6 @@ package bind
 
 import (
  "bytes"
- "errors"
  "fmt"
  "go/format"
  "regexp"
@@ -39,8 +38,6 @@ type Lang int
 
 const (
  LangGo Lang = iota
- LangJava
- LangObjC
 )
 
 func isKeyWord(arg string) bool {
@@ -221,11 +218,6 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
  if evmABI.HasReceive() {
  receive = &tmplMethod{Original: evmABI.Receive}
  }
- // There is no easy way to pass arbitrary java objects to the Go side.
- if len(structs) > 0 && lang == LangJava {
- return "", errors.New("java binding for tuple arguments is not supported yet")
- }
-
  contracts[types[i]] = &tmplContract{
  Type: capitalise(types[i]),
  InputABI: strings.ReplaceAll(strippedABI, "\"", "\\\""),
@@ -298,8 +290,7 @@ func Bind(types []string, abis []string, bytecodes []string, fsigs []map[string]
 // bindType is a set of type binders that convert Solidity types to some supported
 // programming language types.
 var bindType = map[Lang]func(kind abi.Type, structs map[string]*tmplStruct) string{
- LangGo: bindTypeGo,
- LangJava: bindTypeJava,
+ LangGo: bindTypeGo,
 }
 
 // bindBasicTypeGo converts basic solidity types(except array, slice and tuple) to Go ones.
@@ -342,86 +333,10 @@ func bindTypeGo(kind abi.Type, structs map[string]*tmplStruct) string {
  }
 }
 
-// bindBasicTypeJava converts basic solidity types(except array, slice and tuple) to Java ones.
-func bindBasicTypeJava(kind abi.Type) string {
- switch kind.T {
- case abi.AddressTy:
- return "Address"
- case abi.IntTy, abi.UintTy:
- // Note that uint and int (without digits) are also matched,
- // these are size 256, and will translate to BigInt (the default).
- parts := regexp.MustCompile(`(u)?int([0-9]*)`).FindStringSubmatch(kind.String())
- if len(parts) != 3 {
- return kind.String()
- }
- // All unsigned integers should be translated to BigInt since gomobile doesn't
- // support them.
- if parts[1] == "u" {
- return "BigInt"
- }
-
- namedSize := map[string]string{
- "8": "byte",
- "16": "short",
- "32": "int",
- "64": "long",
- }[parts[2]]
-
- // default to BigInt
- if namedSize == "" {
- namedSize = "BigInt"
- }
- return namedSize
- case abi.FixedBytesTy, abi.BytesTy:
- return "byte[]"
- case abi.BoolTy:
- return "boolean"
- case abi.StringTy:
- return "String"
- case abi.FunctionTy:
- return "byte[24]"
- default:
- return kind.String()
- }
-}
-
-// pluralizeJavaType explicitly converts multidimensional types to predefined
-// types in go side.
-func pluralizeJavaType(typ string) string {
- switch typ {
- case "boolean":
- return "Bools"
- case "String":
- return "Strings"
- case "Address":
- return "Addresses"
- case "byte[]":
- return "Binaries"
- case "BigInt":
- return "BigInts"
- }
- return typ + "[]"
-}
-
-// bindTypeJava converts a Solidity type to a Java one. Since there is no clear mapping
-// from all Solidity types to Java ones (e.g. uint17), those that cannot be exactly
-// mapped will use an upscaled type (e.g. BigDecimal).
-func bindTypeJava(kind abi.Type, structs map[string]*tmplStruct) string {
- switch kind.T {
- case abi.TupleTy:
- return structs[kind.TupleRawName+kind.String()].Name
- case abi.ArrayTy, abi.SliceTy:
- return pluralizeJavaType(bindTypeJava(*kind.Elem, structs))
- default:
- return bindBasicTypeJava(kind)
- }
-}
-
 // bindTopicType is a set of type binders that convert Solidity types to some
 // supported programming language topic types.
 var bindTopicType = map[Lang]func(kind abi.Type, structs map[string]*tmplStruct) string{
- LangGo: bindTopicTypeGo,
- LangJava: bindTopicTypeJava,
+ LangGo: bindTopicTypeGo,
 }
 
 // bindTopicTypeGo converts a Solidity topic type to a Go one. It is almost the same
@@ -441,28 +356,10 @@ func bindTopicTypeGo(kind abi.Type, structs map[string]*tmplStruct) string {
  return bound
 }
 
-// bindTopicTypeJava converts a Solidity topic type to a Java one. It is almost the same
-// functionality as for simple types, but dynamic types get converted to hashes.
-func bindTopicTypeJava(kind abi.Type, structs map[string]*tmplStruct) string {
- bound := bindTypeJava(kind, structs)
-
- // todo(rjl493456442) according solidity documentation, indexed event
- // parameters that are not value types i.e. arrays and structs are not
- // stored directly but instead a keccak256-hash of an encoding is stored.
- //
- // We only convert strings and bytes to hash, still need to deal with
- // array(both fixed-size and dynamic-size) and struct.
- if bound == "String" || bound == "byte[]" {
- bound = "Hash"
- }
- return bound
-}
-
 // bindStructType is a set of type binders that convert Solidity tuple types to some supported
 // programming language struct definition.
 var bindStructType = map[Lang]func(kind abi.Type, structs map[string]*tmplStruct) string{
- LangGo: bindStructTypeGo,
- LangJava: bindStructTypeJava,
+ LangGo: bindStructTypeGo,
 }
 
 // bindStructTypeGo converts a Solidity tuple type to a Go one and records the mapping
@@ -511,74 +408,10 @@ func bindStructTypeGo(kind abi.Type, structs map[string]*tmplStruct) string {
  }
 }
 
-// bindStructTypeJava converts a Solidity tuple type to a Java one and records the mapping
-// in the given map.
-// Notably, this function will resolve and record nested struct recursively.
-func bindStructTypeJava(kind abi.Type, structs map[string]*tmplStruct) string {
- switch kind.T {
- case abi.TupleTy:
- // We compose a raw struct name and a canonical parameter expression
- // together here. The reason is before solidity v0.5.11, kind.TupleRawName
- // is empty, so we use canonical parameter expression to distinguish
- // different struct definition. From the consideration of backward
- // compatibility, we concat these two together so that if kind.TupleRawName
- // is not empty, it can have unique id.
- id := kind.TupleRawName + kind.String()
- if s, exist := structs[id]; exist {
- return s.Name
- }
- var fields []*tmplField
- for i, elem := range kind.TupleElems {
- field := bindStructTypeJava(*elem, structs)
- fields = append(fields, &tmplField{Type: field, Name: decapitalise(kind.TupleRawNames[i]), SolKind: *elem})
- }
- name := kind.TupleRawName
- if name == "" {
- name = fmt.Sprintf("Class%d", len(structs))
- }
- structs[id] = &tmplStruct{
- Name: name,
- Fields: fields,
- }
- return name
- case abi.ArrayTy, abi.SliceTy:
- return pluralizeJavaType(bindStructTypeJava(*kind.Elem, structs))
- default:
- return bindBasicTypeJava(kind)
- }
-}
-
 // namedType is a set of functions that transform language specific types to
 // named versions that may be used inside method names.
 var namedType = map[Lang]func(string, abi.Type) string{
- LangGo: func(string, abi.Type) string { panic("this shouldn't be needed") },
- LangJava: namedTypeJava,
-}
-
-// namedTypeJava converts some primitive data types to named variants that can
-// be used as parts of method names.
-func namedTypeJava(javaKind string, solKind abi.Type) string {
- switch javaKind {
- case "byte[]":
- return "Binary"
- case "boolean":
- return "Bool"
- default:
- parts := regexp.MustCompile(`(u)?int([0-9]*)(\[[0-9]*\])?`).FindStringSubmatch(solKind.String())
- if len(parts) != 4 {
- return javaKind
- }
- switch parts[2] {
- case "8", "16", "32", "64":
- if parts[3] == "" {
- return capitalise(fmt.Sprintf("%sint%s", parts[1], parts[2]))
- }
- return capitalise(fmt.Sprintf("%sint%ss", parts[1], parts[2]))
-
- default:
- return javaKind
- }
- }
+ LangGo: func(string, abi.Type) string { panic("this shouldn't be needed") },
 }
 
 // alias returns an alias of the given string based on the aliasing rules
@@ -593,8 +426,7 @@ func alias(aliases map[string]string, n string) string {
 // methodNormalizer is a name transformer that modifies Solidity method names to
 // conform to target language naming conventions.
 var methodNormalizer = map[Lang]func(string) string{
- LangGo: abi.ToCamelCase,
- LangJava: decapitalise,
+ LangGo: abi.ToCamelCase,
 }
 
 // capitalise makes a camel-case string which starts with an upper case character.