merge cleanup

.travis.yml

@@ -1,5 +1,5 @@
 language: go
-go_import_path: github.com/ethereum/go-ethereum
+go_import_path: github.com/expanse-project/go-expanse
 sudo: false
 matrix:
   include:

README.md

@@ -56,7 +56,7 @@ Go Expanse comes with several wrappers/executables found in
 ## Running geth
 
 Going through all the possible command line flags is out of scope here (please consult our
-[CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options)), but we've
+[CLI Wiki page](https://github.com/expanse-project/go-expanse/wiki/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.
 
@@ -78,9 +78,9 @@ This command will:
  * 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 up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console),
+ * Start up Geth's built-in interactive [JavaScript console](https://github.com/expanse-project/go-expanse/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).
+   as well as Geth's own [management APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs).
    This too is optional and if you leave it out you can always attach to an already running Geth instance
    with `geth --attach`.
 
@@ -117,7 +117,7 @@ them.*
 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://github.com/ethereum/wiki/wiki/JSON-RPC) and
-[Geth specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be
+[Geth specific APIs](https://github.com/expanse-project/go-expanse/wiki/Management-APIs)). These can be
 exposed via HTTP, WebSockets and IPC (unix sockets on unix based platroms, and named pipes on Windows).
 
 The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP
@@ -250,7 +250,7 @@ limit blocks converge to (`--targetgaslimit`) and the price transactions are acc
 
 If you'd like to contribute to go-expanse, please fork, fix, commit and send a pull request
 for the maintainers to review and merge into the main code base. If you wish to submit more
-complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum)
+complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/expanse-project/go-expanse)
 to ensure those changes are in line with the general philosophy of the project and/or get some
 early feedback which can make both your efforts much lighter as well as our review and merge
 procedures quick and simple.

build/deb.control

@@ -5,8 +5,8 @@ Maintainer: {{.Author}}
 Build-Depends: debhelper (>= 8.0.0), golang-1.7
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
-Vcs-Git: git://github.com/ethereum/go-ethereum.git
+Vcs-Git: git://github.com/expanse-project/go-expanse.git
-Vcs-Browser: https://github.com/ethereum/go-ethereum
+Vcs-Browser: https://github.com/expanse-project/go-expanse
 
 Package: {{.Name}}
 Architecture: any

cmd/geth/dao_test.go

@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/expanse-project/go-expanse/common"
-	"github.com/ethereum/go-ethereum/core"
+	"github.com/expanse-project/go-expanse/core"
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/expanse-project/go-expanse/params"
 )
 
 // Genesis block for nodes which don't care about the DAO fork (i.e. not configured)

containers/docker/develop-alpine/Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.3
 
 RUN \
   apk add --update go git make gcc musl-dev         && \
-  git clone https://github.com/ethereum/go-ethereum && \
+  git clone https://github.com/expanse-project/go-expanse && \
   (cd go-ethereum && git checkout develop)          && \
   (cd go-ethereum && make gexp)                     && \
   cp go-ethereum/build/bin/gexp /gexp               && \

containers/vagrant/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure(2) do |config|
     vb.memory = "2048"
   end
 
-  config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/ethereum/go-ethereum"
+  config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/expanse-project/go-expanse"
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   config.vm.provision "shell", inline: <<-SHELL

core/dao.go

@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/expanse-project/go-expanse/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/expanse-project/go-expanse/core/types"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/expanse-project/go-expanse/params"
 )
 
 // ValidateDAOHeaderExtraData validates the extra-data field of a block header to

core/dao_test.go

@@ -20,9 +20,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/expanse-project/go-expanse/ethdb"
-	"github.com/ethereum/go-ethereum/event"
+	"github.com/expanse-project/go-expanse/event"
-	"github.com/ethereum/go-ethereum/params"
+	"github.com/expanse-project/go-expanse/params"
 )
 
 // Tests that DAO-fork enabled clients can properly filter out fork-commencing

core/state/journal.go

@@ -19,7 +19,7 @@ package state
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/expanse-project/go-expanse/common"
 )
 
 type journalEntry interface {

internal/build/env.go

@@ -76,7 +76,7 @@ func Env() Environment {
 
 // LocalEnv returns build environment metadata gathered from git.
 func LocalEnv() Environment {
-	env := applyEnvFlags(Environment{Name: "local", Repo: "ethereum/go-ethereum"})
+	env := applyEnvFlags(Environment{Name: "local", Repo: "expanse-project/go-expanse"})
 	if _, err := os.Stat(".git"); err != nil {
 		return env
 	}

logger/glog/glog.go

@@ -122,7 +122,7 @@ var severityName = []string{
 // these path prefixes are trimmed for display, but not when
 // matching vmodule filters.
 var trimPrefixes = []string{
-	"/github.com/ethereum/go-ethereum",
+	"/github.com/expanse-project/go-expanse",
 	"/github.com/ethereum/ethash",
 }
 

params/dao.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/expanse-project/go-expanse/common"
 )
 
 // TestNetDAOForkBlock is the block number where the DAO hard-fork commences on
@@ -43,7 +43,7 @@ var DAOForkBlockExtra = common.FromHex("0x64616f2d686172642d666f726b")
 var DAOForkExtraRange = big.NewInt(10)
 
 // DAORefundContract is the address of the refund contract to send DAO balances to.
-var DAORefundContract = common.HexToAddress("0xbf4ed7b27f1d666546e30d74d50d173d20bca754")
+var DAORefundContract = common.HexToAddress("0x6a620a92Ec2D11a70428b45a795909bd28AedA45")
 
 // DAODrainList is the list of accounts whose full balances will be moved into a
 // refund contract at the beginning of the dao-fork block.

params/util.go~HEAD

@@ -1,33 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package params
-
-import "math/big"
-
-var (
-	TestNetHomesteadBlock = big.NewInt(1000)    // testnet homestead block
-	MainNetHomesteadBlock = big.NewInt(200000)   // mainnet homestead block
-	HomesteadBlock        = MainNetHomesteadBlock // homestead block used to check against
-)
-
-func IsHomestead(blockNumber *big.Int) bool {
-	// for unit tests TODO: flip to true after homestead is live
-	if blockNumber == nil {
-		return false
-	}
-	return blockNumber.Cmp(HomesteadBlock) >= 0
-}

trie/hasher.go

@@ -21,9 +21,9 @@ import (
 	"hash"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
+	"github.com/expanse-project/go-expanse/common"
-	"github.com/ethereum/go-ethereum/crypto/sha3"
+	"github.com/expanse-project/go-expanse/crypto/sha3"
-	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/expanse-project/go-expanse/rlp"
 )
 
 type hasher struct {