all: resolved conflicts

.github/CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Before you do a feature request please check and make sure that it isn't possible
 through some other means. The JavaScript enabled console is a powerful feature
-in the right hands. Please check our [Bitchin' tricks](https://github.com/ethereum/go-ethereum/wiki/bitchin-tricks) wiki page for more info
+in the right hands. Please check our [Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info
 and help.
 
 ## Contributing

.mailmap

@@ -65,7 +65,8 @@ Enrique Fynn <[email protected]>
 
 Vincent G <[email protected]>
 
-RJ Catalano <[email protected]>
+RJ Catalano <[email protected]>
+RJ Catalano <[email protected]> <[email protected]>
 
 Nchinda Nchinda <[email protected]>
 
@@ -109,3 +110,14 @@ Frank Wang <[email protected]>
 Gary Rong <[email protected]>
 
 Guillaume Nicolas <[email protected]>
+
+Sorin Neacsu <[email protected]>
+Sorin Neacsu <[email protected]> <[email protected]>
+
+Valentin Wüstholz <[email protected]>
+Valentin Wüstholz <[email protected]> <[email protected]>
+
+Armin Braun <[email protected]>
+
+Ernesto del Toro <[email protected]>
+Ernesto del Toro <[email protected]> <[email protected]>

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.7.x
+      go: 1.8.x
       script:
         - sudo modprobe fuse
         - sudo chmod 666 /dev/fuse
@@ -17,19 +17,29 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.8.x
+      go: 1.9.x
       script:
         - sudo modprobe fuse
         - sudo chmod 666 /dev/fuse
         - sudo chown root:$USER /etc/fuse.conf
         - go run build/ci.go install
         - go run build/ci.go test -coverage
 
+    - os: osx
+      go: 1.9.x
+      script:
+        - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
+        - brew update
+        - brew install caskroom/cask/brew-cask
+        - brew cask install osxfuse
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage
+
     # These are the latest Go versions.
     - os: linux
       dist: trusty
       sudo: required
-      go: 1.9.x
+      go: "1.10"
       script:
         - sudo modprobe fuse
         - sudo chmod 666 /dev/fuse
@@ -38,7 +48,7 @@ matrix:
         - go run build/ci.go test -coverage
 
     - os: osx
-      go: 1.9.x
+      go: "1.10"
       script:
         - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
         - brew update
@@ -185,6 +195,8 @@ matrix:
         - 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 -deploy trunk -upload gethstore/builds
 
     # This builder does the Azure archive purges to avoid accumulating junk

AUTHORS

@@ -1,85 +1,173 @@
 # This is the official list of go-ethereum authors for copyright purposes.
 
+Afri Schoedon <[email protected]>
+Agustin Armellini Fischer <[email protected]>
+Airead <[email protected]>
+Alan Chen <[email protected]>
+Alejandro Isaza <[email protected]>
 Ales Katona <[email protected]>
 Alex Leverington <[email protected]>
+Alex Wu <[email protected]>
 Alexandre Van de Sande <[email protected]>
+Ali Hajimirza <[email protected]>
+Anton Evangelatov <[email protected]>
+Arba Sasmoyo <[email protected]>
+Armani Ferrante <[email protected]>
+Armin Braun <[email protected]>
 Aron Fischer <[email protected]>
 Bas van Kervel <[email protected]>
 Benjamin Brent <[email protected]>
+Benoit Verkindt <[email protected]>
+Bo <[email protected]>
+Bo Ye <[email protected]>
+Bob Glickstein <[email protected]>
 Brian Schroeder <[email protected]>
 Casey Detrio <[email protected]>
+Chase Wright <[email protected]>
 Christoph Jentzsch <[email protected]>
 Daniel A. Nagy <[email protected]>
+Daniel Sloof <[email protected]>
+Darrel Herbst <[email protected]>
+Dave Appleton <[email protected]>
 Diego Siqueira <[email protected]>
+Dmitry Shulyak <[email protected]>
+Egon Elbre <[email protected]>
+Elias Naur <[email protected]>
 Elliot Shepherd <[email protected]>
 Enrique Fynn <[email protected]>
+Ernesto del Toro <[email protected]>
 Ethan Buchman <[email protected]>
+Eugene Valeyev <[email protected]>
+Evangelos Pappas <[email protected]>
+Evgeny Danilenko <[email protected]>
 Fabian Vogelsteller <[email protected]>
+Fabio Barone <[email protected]>
 Fabio Berger <[email protected]>
+FaceHo <[email protected]>
 Felix Lange <[email protected]>
+Fiisio <[email protected]>
 Frank Wang <[email protected]>
+Furkan KAMACI <[email protected]>
 Gary Rong <[email protected]>
+George Ornbo <[email protected]>
 Gregg Dourgarian <[email protected]>
+Guillaume Ballet <[email protected]>
 Guillaume Nicolas <[email protected]>
 Gustav Simonsson <[email protected]>
 Hao Bryan Cheng <[email protected]>
 Henning Diedrich <[email protected]>
 Isidoro Ghezzi <[email protected]>
+Ivan Daniluk <[email protected]>
 Jae Kwon <[email protected]>
 Jamie Pitts <[email protected]>
+Janoš Guljaš <[email protected]>
 Jason Carver <[email protected]>
+Jay Guo <[email protected]>
 Jeff R. Allen <[email protected]>
 Jeffrey Wilcke <[email protected]>
 Jens Agerberg <[email protected]>
+Jia Chenhui <[email protected]>
+Jim McDonald <[email protected]>
+Joel Burget <[email protected]>
 Jonathan Brown <[email protected]>
 Joseph Chow <[email protected]>
 Justin Clark-Casey <[email protected]>
 Justin Drake <[email protected]>
 Kenji Siu <[email protected]>
 Kobi Gurkan <[email protected]>
+Konrad Feldmeier <[email protected]>
+Kurkó Mihály <[email protected]>
+Kyuntae Ethan Kim <[email protected]>
 Lefteris Karapetsas <[email protected]>
 Leif Jurvetson <[email protected]>
+Leo Shklovskii <[email protected]>
 Lewis Marshall <[email protected]>
+Lio李欧 <[email protected]>
 Louis Holbrook <[email protected]>
 Luca Zeug <[email protected]>
+Magicking <[email protected]>
 Maran Hidskes <[email protected]>
 Marek Kotewicz <[email protected]>
+Mark <[email protected]>
 Martin Holst Swende <[email protected]>
 Matthew Di Ferrante <[email protected]>
 Matthew Wampler-Doty <[email protected]>
+Maximilian Meister <[email protected]>
 Micah Zoltu <[email protected]>
+Michael Ruminer <[email protected]>
+Miguel Mota <[email protected]>
+Miya Chen <[email protected]>
 Nchinda Nchinda <[email protected]>
 Nick Dodson <[email protected]>
 Nick Johnson <[email protected]>
+Nicolas Guillaume <[email protected]>
+Noman <[email protected]>
+Oli Bye <[email protected]>
+Paul Litvak <[email protected]>
 Paulo L F Casaretto <[email protected]>
+Paweł Bylica <[email protected]>
 Peter Pratscher <[email protected]>
+Petr Mikusek <[email protected]>
 Péter Szilágyi <[email protected]>
-RJ Catalano <rj@erisindustries.com>
+RJ Catalano <catalanor0220@gmail.com>
 Ramesh Nair <[email protected]>
 Ricardo Catalinas Jiménez <[email protected]>
+Ricardo Domingos <[email protected]>
+Richard Hart <[email protected]>
+Rob <[email protected]>
+Robert Zaremba <[email protected]>
+Russ Cox <[email protected]>
 Rémy Roy <[email protected]>
+S. Matthew English <[email protected]>
 Shintaro Kaneko <[email protected]>
+Sorin Neacsu <[email protected]>
 Stein Dekker <[email protected]>
+Steve Waldman <[email protected]>
 Steven Roose <[email protected]>
 Taylor Gerring <[email protected]>
 Thomas Bocek <[email protected]>
+Ti Zhou <[email protected]>
 Tosh Camille <[email protected]>
-Valentin Wüstholz <wuestholz@users.noreply.github.com>
+Valentin Wüstholz <wuestholz@gmail.com>
 Victor Farazdagi <[email protected]>
 Victor Tran <[email protected]>
 Viktor Trón <[email protected]>
 Ville Sundell <[email protected]>
 Vincent G <[email protected]>
 Vitalik Buterin <[email protected]>
+Vitaly V <[email protected]>
 Vivek Anand <[email protected]>
 Vlad Gluhovsky <[email protected]>
 Yohann Léon <[email protected]>
 Yoichi Hirai <[email protected]>
+Yondon Fu <[email protected]>
+Zach <[email protected]>
 Zahoor Mohamed <[email protected]>
+Zoe Nolan <[email protected]>
 Zsolt Felföldi <[email protected]>
+am2rican5 <[email protected]>
+ayeowch <[email protected]>
+b00ris <[email protected]>
+bailantaotao <[email protected]>
+baizhenxuan <[email protected]>
+bloonfield <[email protected]>
+changhong <[email protected]>
+evgk <[email protected]>
+ferhat elmas <[email protected]>
 holisticode <[email protected]>
+jtakalai <[email protected]>
 ken10100147 <[email protected]>
 ligi <[email protected]>
+mark.lin <[email protected]>
+necaremus <[email protected]>
+njupt-moon <[email protected]>
+nkbai <[email protected]>
+rhaps107 <[email protected]>
+slumber1122 <[email protected]>
+sunxiaojun2014 <[email protected]>
+terasum <[email protected]>
+tsarpaul <[email protected]>
 xiekeyang <[email protected]>
+yoza <[email protected]>
 ΞTHΞЯSPHΞЯΞ <{viktor.tron,nagydani,zsfelfoldi}@gmail.com>
 Максим Чусовлянов <[email protected]>

README.md

@@ -56,16 +56,14 @@ the user doesn't care about years-old historical data, so we can fast-sync quick
 state of the network. To do so:
 
 ```
-$ geth --fast --cache=512 console
+$ geth console
 ```
 
 This command will:
 
- * Start geth in fast sync mode (`--fast`), causing it to download more data in exchange for avoiding
-   processing the entire history of the Ethereum network, which is very CPU intensive.
- * Bump the memory allowance of the database to 512MB (`--cache=512`), which can help significantly in
-   sync times especially for HDD users. This flag is optional and you can set it as high or as low as
-   you'd like, though we'd recommend the 512MB - 2GB range.
+ * Start geth in fast 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 up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console),
    (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API)
    as well as Geth's own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs).
@@ -80,12 +78,11 @@ entire system. In other words, instead of attaching to the main network, you wan
 network with your node, which is fully equivalent to the main network, but with play-Ether only.
 
 ```
-$ geth --testnet --fast --cache=512 console
+$ geth --testnet console
 ```
 
-The `--fast`, `--cache` flags and `console` subcommand have the exact same meaning as above and they
-are equally useful on the testnet too. Please see above for their explanations if you've skipped to
-here.
+The `console` subcommand have the exact same meaning as above and they are equally useful on the
+testnet too. Please see above for their explanations if you've skipped to here.
 
 Specifying the `--testnet` flag however will reconfigure your Geth instance a bit:
 
@@ -102,6 +99,14 @@ over between the main network and test network, you should make sure to always u
 for play-money and real-money. Unless you manually move accounts, Geth will by default correctly
 separate the two networks and will not make any accounts available between them.*
 
+### Full node on the Rinkeby test network
+
+The above test network is a cross client one based on the ethash proof-of-work consensus algorithm. As such, it has certain extra overhead and is more susceptible to reorganization attacks due to the network's low difficulty / security. Go Ethereum also supports connecting to a proof-of-authority based test network called [*Rinkeby*](https://www.rinkeby.io) (operated by members of the community). This network is lighter, more secure, but is only supported by go-ethereum.
+
+```
+$ geth --rinkeby console
+```
+
 ### Configuration
 
 As an alternative to passing the numerous flags to the `geth` binary, you can also pass a configuration file via:
@@ -125,10 +130,10 @@ One of the quickest ways to get Ethereum up and running on your machine is by us
 ```
 docker run -d --name ethereum-node -v /Users/alice/ethereum:/root \
            -p 8545:8545 -p 30303:30303 \
-           ethereum/client-go --fast --cache=512
+           ethereum/client-go
 ```
 
-This will start geth in fast sync mode with a DB memory allowance of 512MB just as the above command does.  It will also create a persistent volume in your home directory for saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image.
+This will start geth in fast-sync mode with a DB memory allowance of 1GB just as the above command does.  It will also create a persistent volume in your home directory for saving your blockchain as well as map the default ports. There is also an `alpine` tag available for a slim version of the image.
 
 Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containers and/or hosts. By default, `geth` binds to the local interface and RPC endpoints is not accessible from the outside.
 

VERSION

@@ -1 +1 @@
-1.8.0
+1.8.2

accounts/abi/abi.go

@@ -97,7 +97,6 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
 		Type      string
 		Name      string
 		Constant  bool
-		Indexed   bool
 		Anonymous bool
 		Inputs    []Argument
 		Outputs   []Argument

accounts/abi/bind/backend.go

@@ -52,12 +52,6 @@ type ContractCaller interface {
 	CallContract(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) ([]byte, error)
 }
 
-// DeployBackend wraps the operations needed by WaitMined and WaitDeployed.
-type DeployBackend interface {
-	TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
-	CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error)
-}
-
 // PendingContractCaller defines methods to perform contract calls on the pending state.
 // Call will try to discover this interface when access to the pending state is requested.
 // If the backend does not support the pending state, Call returns ErrNoPendingState.
@@ -90,8 +84,29 @@ type ContractTransactor interface {
 	SendTransaction(ctx context.Context, tx *types.Transaction) error
 }
 
+// ContractFilterer defines the methods needed to access log events using one-off
+// queries or continuous event subscriptions.
+type ContractFilterer interface {
+	// FilterLogs executes a log filter operation, blocking during execution and
+	// returning all the results in one batch.
+	//
+	// TODO(karalabe): Deprecate when the subscription one can return past data too.
+	FilterLogs(ctx context.Context, query ethereum.FilterQuery) ([]types.Log, error)
+
+	// SubscribeFilterLogs creates a background log filtering operation, returning
+	// a subscription immediately, which can be used to stream the found events.
+	SubscribeFilterLogs(ctx context.Context, query ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error)
+}
+
+// DeployBackend wraps the operations needed by WaitMined and WaitDeployed.
+type DeployBackend interface {
+	TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
+	CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error)
+}
+
 // ContractBackend defines the methods needed to work with contracts on a read-write basis.
 type ContractBackend interface {
 	ContractCaller
 	ContractTransactor
+	ContractFilterer
 }