From 7ef71b261dba8b97533c5dcbcbecc63f67164f27 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Sat, 8 Oct 2016 10:01:24 -0400 Subject: [PATCH] merge cleanup --- .travis.yml | 2 +- README.md | 10 +++---- build/deb.control | 4 +-- cmd/geth/dao_test.go | 8 ++--- containers/docker/develop-alpine/Dockerfile | 2 +- containers/vagrant/Vagrantfile | 2 +- core/dao.go | 6 ++-- core/dao_test.go | 6 ++-- core/state/journal.go | 2 +- internal/build/env.go | 2 +- logger/glog/glog.go | 2 +- params/dao.go | 4 +-- params/util.go~HEAD | 33 --------------------- trie/hasher.go | 6 ++-- 14 files changed, 28 insertions(+), 61 deletions(-) delete mode 100644 params/util.go~HEAD diff --git a/.travis.yml b/.travis.yml index 17a7955b3a..12bfdc8026 100644 --- a/.travis.yml +++ b/.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: diff --git a/README.md b/README.md index 700138c289..288a4c9d68 100644 --- a/README.md +++ b/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. diff --git a/build/deb.control b/build/deb.control index d39393d290..6bc192e936 100644 --- a/build/deb.control +++ b/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-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://github.com/expanse-project/go-expanse.git +Vcs-Browser: https://github.com/expanse-project/go-expanse Package: {{.Name}} Architecture: any diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 7058fb385c..6f21560f9a 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/expanse-project/go-expanse/common" + "github.com/expanse-project/go-expanse/core" + "github.com/expanse-project/go-expanse/ethdb" + "github.com/expanse-project/go-expanse/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 02edf35dcc..56aeaa1157 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/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 && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 5d263eb765..c764878ae6 100644 --- a/containers/vagrant/Vagrantfile +++ b/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 diff --git a/core/dao.go b/core/dao.go index e315c9884b..9299e8d190 100644 --- a/core/dao.go +++ b/core/dao.go @@ -20,9 +20,9 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/expanse-project/go-expanse/core/state" + "github.com/expanse-project/go-expanse/core/types" + "github.com/expanse-project/go-expanse/params" ) // ValidateDAOHeaderExtraData validates the extra-data field of a block header to diff --git a/core/dao_test.go b/core/dao_test.go index 0830b12316..3bdbb10a7e 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/expanse-project/go-expanse/ethdb" + "github.com/expanse-project/go-expanse/event" + "github.com/expanse-project/go-expanse/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/state/journal.go b/core/state/journal.go index 720c821b93..fdbfca937a 100644 --- a/core/state/journal.go +++ b/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 { diff --git a/internal/build/env.go b/internal/build/env.go index cd33550921..40becaabaf 100644 --- a/internal/build/env.go +++ b/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 } diff --git a/logger/glog/glog.go b/logger/glog/glog.go index edaa21f075..07d4350c85 100644 --- a/logger/glog/glog.go +++ b/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", } diff --git a/params/dao.go b/params/dao.go index 3e2a68cc9e..d53b961d5c 100644 --- a/params/dao.go +++ b/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. diff --git a/params/util.go~HEAD b/params/util.go~HEAD deleted file mode 100644 index 7420bbd3a2..0000000000 --- a/params/util.go~HEAD +++ /dev/null @@ -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 . - -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 -} diff --git a/trie/hasher.go b/trie/hasher.go index 87e02fb858..d6ca3220a7 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/expanse-project/go-expanse/common" + "github.com/expanse-project/go-expanse/crypto/sha3" + "github.com/expanse-project/go-expanse/rlp" ) type hasher struct {