@@ -48,10 +48,10 @@
GitHub Issues
- https://github.com/eximchain/go-ethereum/issues/
+ https://github.com/ethereum/go-ethereum/issues/
- https://github.com/eximchain/go-ethereum
+ https://github.com/ethereum/go-ethereum
diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh
index 32badc8cfb..57ef5a37c6 100644
--- a/build/nsis.install.nsh
+++ b/build/nsis.install.nsh
@@ -3,9 +3,9 @@ InstallDir "$InstDir"
OutFile "${OUTPUTFILE}" # set through command line arguments
# Links for "Add/Remove Programs"
-!define HELPURL "https://github.com/eximchain/go-ethereum/issues"
-!define UPDATEURL "https://github.com/eximchain/go-ethereum/releases"
-!define ABOUTURL "https://github.com/eximchain/go-ethereum#ethereum-go"
+!define HELPURL "https://github.com/ethereum/go-ethereum/issues"
+!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases"
+!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go"
!define /date NOW "%Y%m%d"
PageEx license
diff --git a/build/pod.podspec b/build/pod.podspec
index d66da14b21..2c14c280c7 100644
--- a/build/pod.podspec
+++ b/build/pod.podspec
@@ -2,12 +2,12 @@ Pod::Spec.new do |spec|
spec.name = 'Geth'
spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' }
- spec.homepage = 'https://github.com/eximchain/go-ethereum'
+ spec.homepage = 'https://github.com/ethereum/go-ethereum'
spec.authors = { {{range .Contributors}}
'{{.Name}}' => '{{.Email}}',{{end}}
}
spec.summary = 'iOS Ethereum Client'
- spec.source = { :git => 'https://github.com/eximchain/go-ethereum.git', :commit => '{{.Commit}}' }
+ spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' }
spec.platform = :ios
spec.ios.deployment_target = '9.0'
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go
index f6fc1a9451..3a1ae6f4c3 100644
--- a/cmd/abigen/main.go
+++ b/cmd/abigen/main.go
@@ -24,8 +24,8 @@ import (
"os"
"strings"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common/compiler"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common/compiler"
)
var (
diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go
index 13e32c101e..2e93cc04d2 100644
--- a/cmd/bootnode/main.go
+++ b/cmd/bootnode/main.go
@@ -24,13 +24,13 @@ import (
"net"
"os"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
)
func main() {
diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go
index 23a75c7b1f..6d57d17fb4 100644
--- a/cmd/ethkey/generate.go
+++ b/cmd/ethkey/generate.go
@@ -23,9 +23,9 @@ import (
"os"
"path/filepath"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/crypto"
"github.com/pborman/uuid"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go
index 47311f9965..dbf5afc0ce 100644
--- a/cmd/ethkey/inspect.go
+++ b/cmd/ethkey/inspect.go
@@ -21,9 +21,9 @@ import (
"fmt"
"io/ioutil"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/crypto"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go
index acffd6f6c1..2a9e5ee483 100644
--- a/cmd/ethkey/main.go
+++ b/cmd/ethkey/main.go
@@ -20,7 +20,7 @@ import (
"fmt"
"os"
- "github.com/eximchain/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/cmd/utils"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go
index 66a7bfe171..531a931c82 100644
--- a/cmd/ethkey/message.go
+++ b/cmd/ethkey/message.go
@@ -21,10 +21,10 @@ import (
"fmt"
"io/ioutil"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go
index 6763d81ce1..6006f6b5bb 100644
--- a/cmd/ethkey/run_test.go
+++ b/cmd/ethkey/run_test.go
@@ -22,7 +22,7 @@ import (
"testing"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/internal/cmdtest"
+ "github.com/ethereum/go-ethereum/internal/cmdtest"
)
type testEthkey struct {
diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go
index 92128f2f6f..0e563bf922 100644
--- a/cmd/ethkey/utils.go
+++ b/cmd/ethkey/utils.go
@@ -22,9 +22,9 @@ import (
"io/ioutil"
"strings"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/crypto"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go
index 54516bc687..c019a2fe70 100644
--- a/cmd/evm/compiler.go
+++ b/cmd/evm/compiler.go
@@ -21,7 +21,7 @@ import (
"fmt"
"io/ioutil"
- "github.com/eximchain/go-ethereum/cmd/evm/internal/compiler"
+ "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
cli "gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
index fa8129041d..4a442cf784 100644
--- a/cmd/evm/disasm.go
+++ b/cmd/evm/disasm.go
@@ -22,7 +22,7 @@ import (
"io/ioutil"
"strings"
- "github.com/eximchain/go-ethereum/core/asm"
+ "github.com/ethereum/go-ethereum/core/asm"
cli "gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go
index 9a9240dd1e..753ca62264 100644
--- a/cmd/evm/internal/compiler/compiler.go
+++ b/cmd/evm/internal/compiler/compiler.go
@@ -20,7 +20,7 @@ import (
"errors"
"fmt"
- "github.com/eximchain/go-ethereum/core/asm"
+ "github.com/ethereum/go-ethereum/core/asm"
)
func Compile(fn string, src []byte, debug bool) (string, error) {
diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go
index 2a7c14b9ff..0e7a911896 100644
--- a/cmd/evm/json_logger.go
+++ b/cmd/evm/json_logger.go
@@ -22,9 +22,9 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/vm"
)
type JSONLogger struct {
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index e492e0a344..a59cb1fb84 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -22,7 +22,7 @@ import (
"math/big"
"os"
- "github.com/eximchain/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/cmd/utils"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 9371f7e6b1..8a7399840c 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -27,16 +27,16 @@ import (
goruntime "runtime"
- "github.com/eximchain/go-ethereum/cmd/evm/internal/compiler"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/core/vm/runtime"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/vm/runtime"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
cli "gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index 043fd75b85..071ea94ad0 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -23,10 +23,10 @@ import (
"io/ioutil"
"os"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/tests"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/tests"
cli "gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 7faab9c8de..5bad09bbd5 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -41,23 +41,23 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethclient"
- "github.com/eximchain/go-ethereum/ethstats"
- "github.com/eximchain/go-ethereum/les"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/ethstats"
+ "github.com/ethereum/go-ethereum/les"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/params"
"golang.org/x/net/websocket"
)
@@ -450,7 +450,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) {
case *noauthFlag:
username, avatar, address, err = authNoAuth(msg.URL)
default:
- err = errors.New("Something funky happened, please open an issue at https://github.com/eximchain/go-ethereum/issues")
+ err = errors.New("Something funky happened, please open an issue at https://github.com/ethereum/go-ethereum/issues")
}
if err != nil {
if err = sendError(conn, err); err != nil {
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index c4f7959e37..0db5c4ce0f 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -20,12 +20,12 @@ import (
"fmt"
"io/ioutil"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go
index 12c1b85dd2..3ea22ccfab 100644
--- a/cmd/geth/accountcmd_test.go
+++ b/cmd/geth/accountcmd_test.go
@@ -173,7 +173,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could
`)
}
-// https://github.com/eximchain/go-ethereum/issues/1785
+// https://github.com/ethereum/go-ethereum/issues/1785
func TestUnlockFlagMultiIndex(t *testing.T) {
datadir := tmpDatadirWithKeystore(t)
geth := runGeth(t,
diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go
index d128ee476d..ce9dbe6c0a 100644
--- a/cmd/geth/bugcmd.go
+++ b/cmd/geth/bugcmd.go
@@ -26,10 +26,10 @@ import (
"runtime"
"strings"
- "github.com/eximchain/go-ethereum/cmd/internal/browser"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/cmd/internal/browser"
+ "github.com/ethereum/go-ethereum/params"
- "github.com/eximchain/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/cmd/utils"
cli "gopkg.in/urfave/cli.v1"
)
@@ -41,7 +41,7 @@ var bugCommand = cli.Command{
Category: "MISCELLANEOUS COMMANDS",
}
-const issueUrl = "https://github.com/eximchain/go-ethereum/issues/new"
+const issueUrl = "https://github.com/ethereum/go-ethereum/issues/new"
// reportBug reports a bug by opening a new URL to the go-ethereum GH issue
// tracker and setting default values as the issue body.
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index eca4fb83ee..c9ab72b6df 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -25,17 +25,17 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/trie"
"github.com/syndtr/goleveldb/leveldb/util"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index faa8580a5c..50e4de2e78 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -27,12 +27,12 @@ import (
cli "gopkg.in/urfave/cli.v1"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/dashboard"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/params"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv5"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/dashboard"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/params"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
"github.com/naoina/toml"
)
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index 7bdeadfd56..2500a969cf 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -24,10 +24,10 @@ import (
"strings"
"syscall"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/rpc"
"gopkg.in/urfave/cli.v1"
)
@@ -43,7 +43,7 @@ var (
Description: `
The Geth console is an interactive shell for the JavaScript runtime environment
which exposes a node admin interface as well as the Ðapp JavaScript API.
-See https://github.com/eximchain/go-ethereum/wiki/JavaScript-Console.`,
+See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`,
}
attachCommand = cli.Command{
@@ -56,7 +56,7 @@ See https://github.com/eximchain/go-ethereum/wiki/JavaScript-Console.`,
Description: `
The Geth console is an interactive shell for the JavaScript runtime environment
which exposes a node admin interface as well as the Ðapp JavaScript API.
-See https://github.com/eximchain/go-ethereum/wiki/JavaScript-Console.
+See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.
This command allows to open a console on a running geth node.`,
}
@@ -69,7 +69,7 @@ This command allows to open a console on a running geth node.`,
Category: "CONSOLE COMMANDS",
Description: `
The JavaScript VM exposes a node admin interface as well as the Ðapp
-JavaScript API. See https://github.com/eximchain/go-ethereum/wiki/JavaScript-Console`,
+JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console`,
}
)
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
index e20c33beaa..258b9e6dd9 100644
--- a/cmd/geth/consolecmd_test.go
+++ b/cmd/geth/consolecmd_test.go
@@ -27,7 +27,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
const (
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
index c129d581ac..a8dbc51630 100644
--- a/cmd/geth/dao_test.go
+++ b/cmd/geth/dao_test.go
@@ -23,10 +23,10 @@ import (
"path/filepath"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// Genesis block for nodes which don't care about the DAO fork (i.e. not configured)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index fba890b158..f5a3fa941a 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -25,17 +25,17 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/ethclient"
- "github.com/eximchain/go-ethereum/internal/debug"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/node"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go
index 5a3d0229b6..aa9b1ee568 100644
--- a/cmd/geth/misccmd.go
+++ b/cmd/geth/misccmd.go
@@ -23,10 +23,10 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/params"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go
index 98a21731ac..cd19caa276 100644
--- a/cmd/geth/monitorcmd.go
+++ b/cmd/geth/monitorcmd.go
@@ -25,9 +25,9 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/gizak/termui"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go
index bce0d99dd5..da82facac3 100644
--- a/cmd/geth/run_test.go
+++ b/cmd/geth/run_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/internal/cmdtest"
+ "github.com/ethereum/go-ethereum/internal/cmdtest"
)
func tmpdir(t *testing.T) string {
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 7a25d8ce91..a1558c2330 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -24,8 +24,8 @@ import (
"strings"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/internal/debug"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go
index b80cb2fee1..0c8ed038d5 100644
--- a/cmd/p2psim/main.go
+++ b/cmd/p2psim/main.go
@@ -45,12 +45,12 @@ import (
"strings"
"text/tabwriter"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/rpc"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go
index 6b488b9b56..1974a94aa2 100644
--- a/cmd/puppeth/genesis.go
+++ b/cmd/puppeth/genesis.go
@@ -21,11 +21,11 @@ import (
"errors"
"math"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/params"
)
// cppEthereumGenesisSpec represents the genesis specification format used by the
diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go
index 6946c80b23..b6a029a01a 100644
--- a/cmd/puppeth/module.go
+++ b/cmd/puppeth/module.go
@@ -25,7 +25,7 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
var (
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index acc3a875fb..3832b247f8 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -26,7 +26,7 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// dashboardContent is the actual dashboard HTML content to serve up when users
@@ -256,7 +256,7 @@ var dashboardContent = `
Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.
Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
- The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.
+
The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Java code you can now import the geth archive and connect to Ethereum:
import org.ethereum.geth.*;
@@ -287,7 +287,7 @@ node.start();
Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.
Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
- Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.
+
Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous):
import Geth
@@ -419,7 +419,7 @@ try! node?.start();
Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.
Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.
- Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:
go get github.com/eximchain/go-ethereum/cmd/puppeth
+ Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:
go get github.com/ethereum/go-ethereum/cmd/puppeth
Copyright 2017. The go-ethereum Authors.
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go
index a38d55118f..20b7afe236 100644
--- a/cmd/puppeth/module_ethstats.go
+++ b/cmd/puppeth/module_ethstats.go
@@ -25,7 +25,7 @@ import (
"strings"
"text/template"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// ethstatsDockerfile is the Dockerfile required to build an ethstats backend
diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go
index b28ebf9107..427134153b 100644
--- a/cmd/puppeth/module_explorer.go
+++ b/cmd/puppeth/module_explorer.go
@@ -25,7 +25,7 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// explorerDockerfile is the Dockerfile required to run a block explorer.
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go
index 4b027b1a03..976bf04d00 100644
--- a/cmd/puppeth/module_faucet.go
+++ b/cmd/puppeth/module_faucet.go
@@ -26,8 +26,8 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
)
// faucetDockerfile is the Dockerfile required to build an faucet container to
diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go
index 0ca32db220..35c0efc8ad 100644
--- a/cmd/puppeth/module_nginx.go
+++ b/cmd/puppeth/module_nginx.go
@@ -24,7 +24,7 @@ import (
"path/filepath"
"strconv"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// nginxDockerfile is theis the Dockerfile required to build an nginx reverse-
diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go
index a7e2f8bcab..2609fd976e 100644
--- a/cmd/puppeth/module_node.go
+++ b/cmd/puppeth/module_node.go
@@ -26,8 +26,8 @@ import (
"strings"
"text/template"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
)
// nodeDockerfile is the Dockerfile required to run an Ethereum node.
diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go
index 76da1462c3..5e5032bedf 100644
--- a/cmd/puppeth/module_wallet.go
+++ b/cmd/puppeth/module_wallet.go
@@ -25,7 +25,7 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// walletDockerfile is the Dockerfile required to run a web wallet.
diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go
index cc01b08a8e..26382dac13 100644
--- a/cmd/puppeth/puppeth.go
+++ b/cmd/puppeth/puppeth.go
@@ -22,7 +22,7 @@ import (
"os"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go
index 135f0de08c..158261ce05 100644
--- a/cmd/puppeth/ssh.go
+++ b/cmd/puppeth/ssh.go
@@ -28,7 +28,7 @@ import (
"path/filepath"
"strings"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/terminal"
)
diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go
index b768d6958b..b88a61de7d 100644
--- a/cmd/puppeth/wizard.go
+++ b/cmd/puppeth/wizard.go
@@ -30,9 +30,9 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/log"
"golang.org/x/crypto/ssh/terminal"
)
diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go
index f2376b9c2a..5f781c4152 100644
--- a/cmd/puppeth/wizard_dashboard.go
+++ b/cmd/puppeth/wizard_dashboard.go
@@ -19,7 +19,7 @@ package main
import (
"fmt"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// deployDashboard queries the user for various input on deploying a web-service
diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go
index d6c7644a8e..fb2529c267 100644
--- a/cmd/puppeth/wizard_ethstats.go
+++ b/cmd/puppeth/wizard_ethstats.go
@@ -20,7 +20,7 @@ import (
"fmt"
"sort"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// deployEthstats queries the user for various input on deploying an ethstats
diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go
index c40a56d5a7..413511c1c3 100644
--- a/cmd/puppeth/wizard_explorer.go
+++ b/cmd/puppeth/wizard_explorer.go
@@ -21,7 +21,7 @@ import (
"fmt"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// deployExplorer creates a new block explorer based on some user input.
diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go
index 2fd00d87dc..9a429bc96d 100644
--- a/cmd/puppeth/wizard_faucet.go
+++ b/cmd/puppeth/wizard_faucet.go
@@ -20,8 +20,8 @@ import (
"encoding/json"
"fmt"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/log"
)
// deployFaucet queries the user for various input on deploying a faucet, after
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index d2cff15135..f255ef6e65 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -25,10 +25,10 @@ import (
"math/rand"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
)
// makeGenesis creates a new genesis struct based on some user input.
diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go
index df069e724b..60aa0f7ffb 100644
--- a/cmd/puppeth/wizard_intro.go
+++ b/cmd/puppeth/wizard_intro.go
@@ -26,7 +26,7 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// makeWizard creates and returns a new puppeth wizard.
diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go
index 3ed7e58047..90bf7ae3c8 100644
--- a/cmd/puppeth/wizard_netstats.go
+++ b/cmd/puppeth/wizard_netstats.go
@@ -23,8 +23,8 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/log"
"github.com/olekukonko/tablewriter"
)
diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go
index ac5ce17731..d780c550b1 100644
--- a/cmd/puppeth/wizard_network.go
+++ b/cmd/puppeth/wizard_network.go
@@ -20,7 +20,7 @@ import (
"fmt"
"strings"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// manageServers displays a list of servers the user can disconnect from, and an
diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go
index f34d658abb..4eeae93a0b 100644
--- a/cmd/puppeth/wizard_nginx.go
+++ b/cmd/puppeth/wizard_nginx.go
@@ -19,7 +19,7 @@ package main
import (
"fmt"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// ensureVirtualHost checks whether a reverse-proxy is running on the specified
diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go
index 671dd29a4b..a60948bc67 100644
--- a/cmd/puppeth/wizard_node.go
+++ b/cmd/puppeth/wizard_node.go
@@ -21,9 +21,9 @@ import (
"fmt"
"time"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
)
// deployNode creates a new node configuration based on some user input.
diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go
index bebc1084ac..933cd9ae59 100644
--- a/cmd/puppeth/wizard_wallet.go
+++ b/cmd/puppeth/wizard_wallet.go
@@ -21,7 +21,7 @@ import (
"fmt"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// deployWallet creates a new web wallet based on some user input.
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go
index b9d7acaf83..d0f993c5b8 100644
--- a/cmd/rlpdump/main.go
+++ b/cmd/rlpdump/main.go
@@ -26,7 +26,7 @@ import (
"os"
"strings"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rlp"
)
var (
diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go
index 0928f7c5d3..adac772bab 100644
--- a/cmd/swarm/config.go
+++ b/cmd/swarm/config.go
@@ -28,13 +28,13 @@ import (
cli "gopkg.in/urfave/cli.v1"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
"github.com/naoina/toml"
- bzzapi "github.com/eximchain/go-ethereum/swarm/api"
+ bzzapi "github.com/ethereum/go-ethereum/swarm/api"
)
var (
@@ -84,7 +84,7 @@ var tomlSettings = toml.Config{
MissingField: func(rt reflect.Type, field string) error {
link := ""
if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" {
- link = fmt.Sprintf(", check github.com/eximchain/go-ethereum/swarm/api/config.go for available fields")
+ link = fmt.Sprintf(", check github.com/ethereum/go-ethereum/swarm/api/config.go for available fields")
}
return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link)
},
diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go
index fc4cbc6797..9bf584f50c 100644
--- a/cmd/swarm/config_test.go
+++ b/cmd/swarm/config_test.go
@@ -25,9 +25,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/rpc"
- "github.com/eximchain/go-ethereum/swarm"
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/swarm"
+ "github.com/ethereum/go-ethereum/swarm/api"
"github.com/docker/docker/pkg/reexec"
)
diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go
index e298072cc5..dfd2d069b9 100644
--- a/cmd/swarm/db.go
+++ b/cmd/swarm/db.go
@@ -22,9 +22,9 @@ import (
"os"
"path/filepath"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go
index e6694983b8..792e8d0d7a 100644
--- a/cmd/swarm/hash.go
+++ b/cmd/swarm/hash.go
@@ -21,8 +21,8 @@ import (
"fmt"
"os"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go
index d9298baeb6..57b5517c6e 100644
--- a/cmd/swarm/list.go
+++ b/cmd/swarm/list.go
@@ -22,8 +22,8 @@ import (
"strings"
"text/tabwriter"
- "github.com/eximchain/go-ethereum/cmd/utils"
- swarm "github.com/eximchain/go-ethereum/swarm/api/client"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ swarm "github.com/ethereum/go-ethereum/swarm/api/client"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 51bce94c22..360020b77b 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -28,22 +28,22 @@ import (
"strings"
"syscall"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethclient"
- "github.com/eximchain/go-ethereum/internal/debug"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/swarm"
- bzzapi "github.com/eximchain/go-ethereum/swarm/api"
- swarmmetrics "github.com/eximchain/go-ethereum/swarm/metrics"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/swarm"
+ bzzapi "github.com/ethereum/go-ethereum/swarm/api"
+ swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go
index 8f548bc8cc..41a69a5d05 100644
--- a/cmd/swarm/manifest.go
+++ b/cmd/swarm/manifest.go
@@ -24,9 +24,9 @@ import (
"path/filepath"
"strings"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/swarm/api"
- swarm "github.com/eximchain/go-ethereum/swarm/api/client"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ swarm "github.com/ethereum/go-ethereum/swarm/api/client"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go
index 0b75583090..594cfa55cb 100644
--- a/cmd/swarm/run_test.go
+++ b/cmd/swarm/run_test.go
@@ -27,13 +27,13 @@ import (
"time"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/internal/cmdtest"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
- "github.com/eximchain/go-ethereum/swarm"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/internal/cmdtest"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/swarm"
)
func init() {
diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go
index fc1d7a4eae..9f4c525bb9 100644
--- a/cmd/swarm/upload.go
+++ b/cmd/swarm/upload.go
@@ -30,8 +30,8 @@ import (
"path/filepath"
"strings"
- "github.com/eximchain/go-ethereum/cmd/utils"
- swarm "github.com/eximchain/go-ethereum/swarm/api/client"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ swarm "github.com/ethereum/go-ethereum/swarm/api/client"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 5f05b7128e..186d18d8f5 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -27,12 +27,12 @@ import (
"strings"
"syscall"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/internal/debug"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/rlp"
)
const (
diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go
index bd6f49239f..e5bf8724c1 100644
--- a/cmd/utils/customflags.go
+++ b/cmd/utils/customflags.go
@@ -27,7 +27,7 @@ import (
"path"
"strings"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common/math"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 287bfb293f..ff78a0fcc7 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -28,34 +28,34 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/fdlimit"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/clique"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/dashboard"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/ethstats"
- "github.com/eximchain/go-ethereum/les"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/p2p/netutil"
- "github.com/eximchain/go-ethereum/params"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv5"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/fdlimit"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/clique"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/dashboard"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/ethstats"
+ "github.com/ethereum/go-ethereum/les"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/params"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
"gopkg.in/urfave/cli.v1"
)
diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
index 261ba3a8e0..988c50ce3d 100644
--- a/cmd/wnode/main.go
+++ b/cmd/wnode/main.go
@@ -35,16 +35,16 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/console"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/whisper/mailserver"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv6"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/whisper/mailserver"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
"golang.org/x/crypto/pbkdf2"
)
diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go
index 28b7267160..9bd1de103a 100644
--- a/common/bitutil/compress_test.go
+++ b/common/bitutil/compress_test.go
@@ -21,7 +21,7 @@ import (
"math/rand"
"testing"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
// Tests that data bitset encoding and decoding works and is bijective.
diff --git a/common/debug.go b/common/debug.go
index bbde7b21e2..61acd8ce70 100644
--- a/common/debug.go
+++ b/common/debug.go
@@ -26,7 +26,7 @@ import (
// Report gives off a warning requesting the user to submit an issue to the github tracker.
func Report(extra ...interface{}) {
- fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/eximchain/go-ethereum/issues")
+ fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ethereum/go-ethereum/issues")
fmt.Fprintln(os.Stderr, extra...)
_, file, line, _ := runtime.Caller(1)
diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go
index 2007dcba80..80180d9186 100644
--- a/common/hexutil/json_example_test.go
+++ b/common/hexutil/json_example_test.go
@@ -20,7 +20,7 @@ import (
"encoding/json"
"fmt"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
type MyType [5]byte
diff --git a/common/math/big_test.go b/common/math/big_test.go
index 647b6b256e..be9810dc8c 100644
--- a/common/math/big_test.go
+++ b/common/math/big_test.go
@@ -22,7 +22,7 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func TestHexOrDecimal256(t *testing.T) {
diff --git a/common/number/int.go b/common/number/int.go
index fb29ca10e1..6dab2436de 100644
--- a/common/number/int.go
+++ b/common/number/int.go
@@ -19,7 +19,7 @@ package number
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
var tt256 = new(big.Int).Lsh(big.NewInt(1), 256)
diff --git a/common/number/uint_test.go b/common/number/uint_test.go
index fca8652132..3ab9e4c344 100644
--- a/common/number/uint_test.go
+++ b/common/number/uint_test.go
@@ -20,7 +20,7 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func TestSet(t *testing.T) {
diff --git a/common/types.go b/common/types.go
index ca01ae9e03..fdc67480c2 100644
--- a/common/types.go
+++ b/common/types.go
@@ -23,8 +23,8 @@ import (
"math/rand"
"reflect"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
)
const (
diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go
index 16fab3824a..0e7ad90aec 100644
--- a/compression/rle/read_write.go
+++ b/compression/rle/read_write.go
@@ -21,7 +21,7 @@ import (
"bytes"
"errors"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto"
)
const (
diff --git a/consensus/clique/api.go b/consensus/clique/api.go
index ea02bba4ce..b875eef012 100644
--- a/consensus/clique/api.go
+++ b/consensus/clique/api.go
@@ -17,10 +17,10 @@
package clique
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/rpc"
)
// API is a user facing RPC API to allow controlling the signer and voting
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
index 760b16430f..2bdad9092a 100644
--- a/consensus/clique/clique.go
+++ b/consensus/clique/clique.go
@@ -25,20 +25,20 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
lru "github.com/hashicorp/golang-lru"
)
diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go
index 4b35b4fb97..9ebdb8df15 100644
--- a/consensus/clique/snapshot.go
+++ b/consensus/clique/snapshot.go
@@ -20,10 +20,10 @@ import (
"bytes"
"encoding/json"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
lru "github.com/hashicorp/golang-lru"
)
diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go
index 6943b2e823..8b51e6e094 100644
--- a/consensus/clique/snapshot_test.go
+++ b/consensus/clique/snapshot_test.go
@@ -22,12 +22,12 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
type testerVote struct {
diff --git a/consensus/consensus.go b/consensus/consensus.go
index 2e25c73e9a..be5e661c12 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -18,11 +18,11 @@
package consensus
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
"math/big"
)
diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go
index 77642e7822..905a7b1ea7 100644
--- a/consensus/ethash/algorithm.go
+++ b/consensus/ethash/algorithm.go
@@ -27,11 +27,11 @@ import (
"time"
"unsafe"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go
index 27897e87b0..841e39233f 100644
--- a/consensus/ethash/algorithm_test.go
+++ b/consensus/ethash/algorithm_test.go
@@ -25,9 +25,9 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Tests whether the dataset size calculator works correctly by cross checking the
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
index 5df2f80782..99eec82211 100644
--- a/consensus/ethash/consensus.go
+++ b/consensus/ethash/consensus.go
@@ -24,13 +24,13 @@ import (
"runtime"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
set "gopkg.in/fatih/set.v0"
)
diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go
index c45d9f1cb7..438a99dd66 100644
--- a/consensus/ethash/consensus_test.go
+++ b/consensus/ethash/consensus_test.go
@@ -23,9 +23,9 @@ import (
"path/filepath"
"testing"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
)
type diffTest struct {
diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go
index dee9c7ea34..1b3dcee302 100644
--- a/consensus/ethash/ethash.go
+++ b/consensus/ethash/ethash.go
@@ -33,10 +33,10 @@ import (
"unsafe"
mmap "github.com/edsrzf/mmap-go"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/hashicorp/golang-lru/simplelru"
)
diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go
index c60170b60f..31116da437 100644
--- a/consensus/ethash/ethash_test.go
+++ b/consensus/ethash/ethash_test.go
@@ -24,7 +24,7 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Tests that ethash works correctly in test mode.
@@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) {
}
// This test checks that cache lru logic doesn't crash under load.
-// It reproduces https://github.com/eximchain/go-ethereum/issues/14943
+// It reproduces https://github.com/ethereum/go-ethereum/issues/14943
func TestCacheFileEvict(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "ethash-test")
if err != nil {
diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go
index b25237599a..b5e742d8bb 100644
--- a/consensus/ethash/sealer.go
+++ b/consensus/ethash/sealer.go
@@ -24,10 +24,10 @@ import (
"runtime"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
)
// Seal implements consensus.Engine, attempting to find a nonce that satisfies
diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go
index 83d3ef3539..9b22bd7a52 100644
--- a/consensus/misc/dao.go
+++ b/consensus/misc/dao.go
@@ -21,9 +21,9 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go
index 976b02c9a6..4a5e7c37e0 100644
--- a/consensus/misc/forks.go
+++ b/consensus/misc/forks.go
@@ -19,9 +19,9 @@ package misc
import (
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
)
// VerifyForkHashes verifies that blocks conforming to network hard-forks do have
diff --git a/console/bridge.go b/console/bridge.go
index 6d144f8564..b28cc438e2 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -23,9 +23,9 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/accounts/usbwallet"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts/usbwallet"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/robertkrimen/otto"
)
diff --git a/console/console.go b/console/console.go
index 307e11f48c..b280d4e65d 100644
--- a/console/console.go
+++ b/console/console.go
@@ -28,9 +28,9 @@ import (
"strings"
"syscall"
- "github.com/eximchain/go-ethereum/internal/jsre"
- "github.com/eximchain/go-ethereum/internal/web3ext"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/internal/jsre"
+ "github.com/ethereum/go-ethereum/internal/web3ext"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/mattn/go-colorable"
"github.com/peterh/liner"
"github.com/robertkrimen/otto"
diff --git a/console/console_test.go b/console/console_test.go
index e593125bfc..7b1629c032 100644
--- a/console/console_test.go
+++ b/console/console_test.go
@@ -26,12 +26,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/internal/jsre"
- "github.com/eximchain/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/internal/jsre"
+ "github.com/ethereum/go-ethereum/node"
)
const (
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
index a04cc70e78..1f3e1112ec 100644
--- a/containers/docker/develop-alpine/Dockerfile
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
RUN \
apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
- git clone --depth 1 https://github.com/eximchain/go-ethereum && \
+ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \
apk del go git make gcc musl-dev linux-headers && \
diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile
index 1c77c078f2..8c4fe9f595 100644
--- a/containers/docker/develop-ubuntu/Dockerfile
+++ b/containers/docker/develop-ubuntu/Dockerfile
@@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH
RUN \
apt-get update && apt-get upgrade -q -y && \
apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \
- git clone --depth 1 https://github.com/eximchain/go-ethereum && \
+ git clone --depth 1 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \
apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
index 07ed4abc17..8d4e7fe81a 100644
--- a/containers/docker/master-alpine/Dockerfile
+++ b/containers/docker/master-alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
RUN \
apk add --update go git make gcc musl-dev linux-headers ca-certificates && \
- git clone --depth 1 --branch release/1.8 https://github.com/eximchain/go-ethereum && \
+ git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \
apk del go git make gcc musl-dev linux-headers && \
diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile
index 1649b38827..4cfc4f58c0 100644
--- a/containers/docker/master-ubuntu/Dockerfile
+++ b/containers/docker/master-ubuntu/Dockerfile
@@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH
RUN \
apt-get update && apt-get upgrade -q -y && \
apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \
- git clone --depth 1 --branch release/1.8 https://github.com/eximchain/go-ethereum && \
+ git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \
(cd go-ethereum && make geth) && \
cp go-ethereum/build/bin/geth /geth && \
apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \
diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go
index e27d600c4e..b2b2365f31 100644
--- a/contracts/chequebook/api.go
+++ b/contracts/chequebook/api.go
@@ -20,7 +20,7 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
const Version = "1.0"
diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go
index dc1324846e..92bd896e0a 100644
--- a/contracts/chequebook/cheque.go
+++ b/contracts/chequebook/cheque.go
@@ -36,14 +36,14 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/contracts/chequebook/contract"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/services/swap/swap"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/contracts/chequebook/contract"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/services/swap/swap"
)
// TODO(zelig): watch peer solvency and notify of bouncing cheques
diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go
index 597b5f0e4f..6b6b28e657 100644
--- a/contracts/chequebook/cheque_test.go
+++ b/contracts/chequebook/cheque_test.go
@@ -24,12 +24,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/accounts/abi/bind/backends"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/contracts/chequebook/contract"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/chequebook/contract"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
)
var (
diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go
index 3cce81be79..e275ac9b8d 100644
--- a/contracts/chequebook/contract/chequebook.go
+++ b/contracts/chequebook/contract/chequebook.go
@@ -7,12 +7,12 @@ import (
"math/big"
"strings"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
)
// ChequebookABI is the input ABI used to generate the binding from.
diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go
index 6505bc4ec6..45f6d68f3e 100644
--- a/contracts/chequebook/gencode.go
+++ b/contracts/chequebook/gencode.go
@@ -25,11 +25,11 @@ import (
"io/ioutil"
"math/big"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/accounts/abi/bind/backends"
- "github.com/eximchain/go-ethereum/contracts/chequebook/contract"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+ "github.com/ethereum/go-ethereum/contracts/chequebook/contract"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
)
var (
diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go
index dadc65a6b6..cbf6cb05b3 100644
--- a/contracts/ens/contract/ens.go
+++ b/contracts/ens/contract/ens.go
@@ -6,12 +6,12 @@ package contract
import (
"strings"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
)
// ENSABI is the input ABI used to generate the binding from.
diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go
index 53efbb7872..a08380adfc 100644
--- a/contracts/ens/contract/fifsregistrar.go
+++ b/contracts/ens/contract/fifsregistrar.go
@@ -6,10 +6,10 @@ package contract
import (
"strings"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// FIFSRegistrarABI is the input ABI used to generate the binding from.
diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go
index 7249e30e8f..c567d5884a 100644
--- a/contracts/ens/contract/publicresolver.go
+++ b/contracts/ens/contract/publicresolver.go
@@ -7,12 +7,12 @@ import (
"math/big"
"strings"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
)
// PublicResolverABI is the input ABI used to generate the binding from.
diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go
index 3a6bf65194..06045a5cd8 100644
--- a/contracts/ens/ens.go
+++ b/contracts/ens/ens.go
@@ -23,11 +23,11 @@ package ens
import (
"strings"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/contracts/ens/contract"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/ens/contract"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
)
var (
diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go
index 10ffbc2f74..0016f47dbf 100644
--- a/contracts/ens/ens_test.go
+++ b/contracts/ens/ens_test.go
@@ -20,11 +20,11 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/accounts/abi/bind/backends"
- "github.com/eximchain/go-ethereum/contracts/ens/contract"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+ "github.com/ethereum/go-ethereum/contracts/ens/contract"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
)
var (
diff --git a/core/asm/asm.go b/core/asm/asm.go
index 40ff1b4173..ce22f93f92 100644
--- a/core/asm/asm.go
+++ b/core/asm/asm.go
@@ -21,7 +21,7 @@ import (
"encoding/hex"
"fmt"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/vm"
)
// Iterator for disassembled EVM instructions
diff --git a/core/asm/compiler.go b/core/asm/compiler.go
index 4618a1ae11..1b9025a549 100644
--- a/core/asm/compiler.go
+++ b/core/asm/compiler.go
@@ -23,8 +23,8 @@ import (
"os"
"strings"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/vm"
)
// Compiler contains information about the parsed source
diff --git a/core/bench_test.go b/core/bench_test.go
index 9f21fbe681..e23f0d19d1 100644
--- a/core/bench_test.go
+++ b/core/bench_test.go
@@ -23,14 +23,14 @@ import (
"os"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
func BenchmarkInsertChain_empty_memdb(b *testing.B) {
diff --git a/core/block_validator.go b/core/block_validator.go
index bb94d88024..98958809b7 100644
--- a/core/block_validator.go
+++ b/core/block_validator.go
@@ -19,10 +19,10 @@ package core
import (
"fmt"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
)
// BlockValidator is responsible for validating block headers, uncles and
diff --git a/core/block_validator_test.go b/core/block_validator_test.go
index f36b6e90f1..e334b3c3cd 100644
--- a/core/block_validator_test.go
+++ b/core/block_validator_test.go
@@ -21,11 +21,11 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// Tests that simple header verification works, for both good and bad blocks.
diff --git a/core/blockchain.go b/core/blockchain.go
index 0f986a0155..b33eb85a44 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -27,20 +27,20 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
"github.com/hashicorp/golang-lru"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)
diff --git a/core/blockchain_test.go b/core/blockchain_test.go
index 7c1027c85d..748cdc5c71 100644
--- a/core/blockchain_test.go
+++ b/core/blockchain_test.go
@@ -24,14 +24,14 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// Test fork of length N starting from block i
@@ -1196,7 +1196,7 @@ func TestEIP161AccountRemoval(t *testing.T) {
// tests that under weird reorg conditions the blockchain and its internal header-
// chain return the same latest block/header.
//
-// https://github.com/eximchain/go-ethereum/pull/15941
+// https://github.com/ethereum/go-ethereum/pull/15941
func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
// Generate a canonical chain to act as the main dataset
engine := ethash.NewFaker()
diff --git a/core/blocks.go b/core/blocks.go
index 1d76dfcdd2..f20ba4aaf2 100644
--- a/core/blocks.go
+++ b/core/blocks.go
@@ -16,7 +16,7 @@
package core
-import "github.com/eximchain/go-ethereum/common"
+import "github.com/ethereum/go-ethereum/common"
// BadHashes represent a set of manually tracked bad hashes (usually hard forks)
var BadHashes = map[common.Hash]bool{
diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go
index a257c1129c..540085450d 100644
--- a/core/bloombits/generator.go
+++ b/core/bloombits/generator.go
@@ -19,7 +19,7 @@ package bloombits
import (
"errors"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/types"
)
// errSectionOutOfBounds is returned if the user tried to add more bloom filters
diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go
index d1fbf25871..f9bcef96e0 100644
--- a/core/bloombits/generator_test.go
+++ b/core/bloombits/generator_test.go
@@ -21,7 +21,7 @@ import (
"math/rand"
"testing"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Tests that batched bloom bits are correctly rotated from the input bloom
diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go
index a790690239..ce3031702f 100644
--- a/core/bloombits/matcher.go
+++ b/core/bloombits/matcher.go
@@ -26,8 +26,8 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/crypto"
)
// bloomIndexes represents the bit indexes inside the bloom filter that belong
diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go
index d0847ce493..7a5f78ef3a 100644
--- a/core/bloombits/matcher_test.go
+++ b/core/bloombits/matcher_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
const testSectionSize = 4096
@@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) {
// Tests that the matcher can properly find matches if the starting block is
// shifter from a multiple of 8. This is needed to cover an optimisation with
-// bitset matching https://github.com/eximchain/go-ethereum/issues/15309.
+// bitset matching https://github.com/ethereum/go-ethereum/issues/15309.
func TestMatcherShifted(t *testing.T) {
// Block 0 always matches in the tests, skip ahead of first 8 blocks with the
// start to get a potential zero byte in the matcher bitset.
diff --git a/core/chain_indexer.go b/core/chain_indexer.go
index 615d43b440..158ed83245 100644
--- a/core/chain_indexer.go
+++ b/core/chain_indexer.go
@@ -23,11 +23,11 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
)
// ChainIndexerBackend defines the methods needed to process chain segments in
diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go
index a82b7172d7..9fc09eda51 100644
--- a/core/chain_indexer_test.go
+++ b/core/chain_indexer_test.go
@@ -23,9 +23,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// Runs multiple tests with randomized parameters.
diff --git a/core/chain_makers.go b/core/chain_makers.go
index c56c0713df..31c9e3fb77 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -20,14 +20,14 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// So we can deterministically seed different blockchains
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go
index e5935a9988..93be43ddce 100644
--- a/core/chain_makers_test.go
+++ b/core/chain_makers_test.go
@@ -20,12 +20,12 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
func ExampleGenerateChain() {
diff --git a/core/dao_test.go b/core/dao_test.go
index 6a53d92500..e0a3e3ff37 100644
--- a/core/dao_test.go
+++ b/core/dao_test.go
@@ -20,10 +20,10 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// Tests that DAO-fork enabled clients can properly filter out fork-commencing
diff --git a/core/database_util.go b/core/database_util.go
index 4d22bfd2f6..8c46989854 100644
--- a/core/database_util.go
+++ b/core/database_util.go
@@ -24,13 +24,13 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
// DatabaseReader wraps the Get method of a backing data store.
diff --git a/core/database_util_test.go b/core/database_util_test.go
index 92069f305c..ab4e45a478 100644
--- a/core/database_util_test.go
+++ b/core/database_util_test.go
@@ -21,11 +21,11 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Tests block header storage and retrieval operations.
diff --git a/core/events.go b/core/events.go
index 5db54870ba..6f404f612b 100644
--- a/core/events.go
+++ b/core/events.go
@@ -17,8 +17,8 @@
package core
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// TxPreEvent is posted when a transaction enters the transaction pool.
diff --git a/core/evm.go b/core/evm.go
index 2dc3c33829..55db53927b 100644
--- a/core/evm.go
+++ b/core/evm.go
@@ -19,10 +19,10 @@ package core
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
)
// ChainContext supports retrieving headers and consensus parameters from the
diff --git a/core/gen_genesis.go b/core/gen_genesis.go
index e9a4097938..bb8ea1d6a2 100644
--- a/core/gen_genesis.go
+++ b/core/gen_genesis.go
@@ -7,10 +7,10 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/params"
)
var _ = (*genesisSpecMarshaling)(nil)
diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go
index 005d038b97..64fb9b9248 100644
--- a/core/gen_genesis_account.go
+++ b/core/gen_genesis_account.go
@@ -7,9 +7,9 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*genesisAccountMarshaling)(nil)
diff --git a/core/genesis.go b/core/genesis.go
index 86f0f77772..b6ead2250a 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -25,15 +25,15 @@ import (
"math/big"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
//go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go
diff --git a/core/genesis_test.go b/core/genesis_test.go
index 64074d1acd..052ded6991 100644
--- a/core/genesis_test.go
+++ b/core/genesis_test.go
@@ -22,11 +22,11 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
func TestDefaultGenesisBlock(t *testing.T) {
diff --git a/core/headerchain.go b/core/headerchain.go
index 99a5177ea0..73cd5d2c41 100644
--- a/core/headerchain.go
+++ b/core/headerchain.go
@@ -25,12 +25,12 @@ import (
mrand "math/rand"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
"github.com/hashicorp/golang-lru"
"sync/atomic"
)
diff --git a/core/helper_test.go b/core/helper_test.go
index 22bed47140..698a2924cb 100644
--- a/core/helper_test.go
+++ b/core/helper_test.go
@@ -20,9 +20,9 @@ import (
"container/list"
"fmt"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
)
// Implement our EthTest Manager
diff --git a/core/mkalloc.go b/core/mkalloc.go
index d3e06d3429..565e8c5826 100644
--- a/core/mkalloc.go
+++ b/core/mkalloc.go
@@ -34,8 +34,8 @@ import (
"sort"
"strconv"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/rlp"
)
type allocItem struct{ Addr, Balance *big.Int }
diff --git a/core/state/database.go b/core/state/database.go
index 9948ee11ca..36926ec69d 100644
--- a/core/state/database.go
+++ b/core/state/database.go
@@ -20,9 +20,9 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/trie"
lru "github.com/hashicorp/golang-lru"
)
diff --git a/core/state/dump.go b/core/state/dump.go
index f9862f172a..46e612850a 100644
--- a/core/state/dump.go
+++ b/core/state/dump.go
@@ -20,9 +20,9 @@ import (
"encoding/json"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
type DumpAccount struct {
diff --git a/core/state/iterator.go b/core/state/iterator.go
index 72b8e45f9d..6a5c73d3d1 100644
--- a/core/state/iterator.go
+++ b/core/state/iterator.go
@@ -20,9 +20,9 @@ import (
"bytes"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
// NodeIterator is an iterator to traverse the entire state trie post-order,
diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go
index e473d48626..9e46c851cd 100644
--- a/core/state/iterator_test.go
+++ b/core/state/iterator_test.go
@@ -20,8 +20,8 @@ import (
"bytes"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// Tests that the node iterator indeed walks over the entire database contents.
diff --git a/core/state/journal.go b/core/state/journal.go
index 37806f7c5f..a89bb3d13a 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -19,7 +19,7 @@ package state
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
type journalEntry interface {
diff --git a/core/state/managed_state.go b/core/state/managed_state.go
index 692f51a5f7..1390ef4a00 100644
--- a/core/state/managed_state.go
+++ b/core/state/managed_state.go
@@ -19,7 +19,7 @@ package state
import (
"sync"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
type account struct {
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
index dce301ce26..1cfdd3a890 100644
--- a/core/state/managed_state_test.go
+++ b/core/state/managed_state_test.go
@@ -19,8 +19,8 @@ package state
import (
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
)
var addr = common.BytesToAddress([]byte("test"))
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 97640d1b0c..b2112bfaec 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -22,9 +22,9 @@ import (
"io"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
var emptyCodeHash = crypto.Keccak256(nil)
diff --git a/core/state/state_test.go b/core/state/state_test.go
index 6e8be09585..6d42d63d82 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -21,9 +21,9 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
checker "gopkg.in/check.v1"
)
diff --git a/core/state/statedb.go b/core/state/statedb.go
index f949091400..776693e248 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -23,12 +23,12 @@ import (
"sort"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
type revision struct {
diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go
index e5407e9ca4..d9e3d9b797 100644
--- a/core/state/statedb_test.go
+++ b/core/state/statedb_test.go
@@ -30,9 +30,9 @@ import (
check "gopkg.in/check.v1"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// Tests that updating a state trie does not leak any database writes prior to
@@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) {
// TestCopy tests that copying a statedb object indeed makes the original and
// the copy independent of each other. This test is a regression test against
-// https://github.com/eximchain/go-ethereum/pull/15549.
+// https://github.com/ethereum/go-ethereum/pull/15549.
func TestCopy(t *testing.T) {
// Create a random state test to copy and modify "independently"
db, _ := ethdb.NewMemDatabase()
diff --git a/core/state/sync.go b/core/state/sync.go
index 4f9e217e36..28fcf6ae05 100644
--- a/core/state/sync.go
+++ b/core/state/sync.go
@@ -19,9 +19,9 @@ package state
import (
"bytes"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
// NewStateSync create a new state trie download scheduler.
diff --git a/core/state/sync_test.go b/core/state/sync_test.go
index 64ddd2fbdb..8f14a44e7a 100644
--- a/core/state/sync_test.go
+++ b/core/state/sync_test.go
@@ -21,10 +21,10 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/trie"
)
// testAccount is the data associated with an account used by the state tests.
diff --git a/core/state_processor.go b/core/state_processor.go
index cc392c515b..4dc58b9dea 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -17,14 +17,14 @@
package core
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/params"
)
// StateProcessor is a basic Processor, which takes care of transitioning
diff --git a/core/state_transition.go b/core/state_transition.go
index ab45e89faf..b19bc12e42 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -21,10 +21,10 @@ import (
"math"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/core/tx_journal.go b/core/tx_journal.go
index dba0801bef..e872d7b530 100644
--- a/core/tx_journal.go
+++ b/core/tx_journal.go
@@ -21,10 +21,10 @@ import (
"io"
"os"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
)
// errNoActiveJournal is returned if a transaction is attempted to be inserted
diff --git a/core/tx_list.go b/core/tx_list.go
index 7c1ae864d1..55fc42617d 100644
--- a/core/tx_list.go
+++ b/core/tx_list.go
@@ -22,9 +22,9 @@ import (
"math/big"
"sort"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
)
// nonceHeap is a heap.Interface implementation over 64bit unsigned integers for
diff --git a/core/tx_list_test.go b/core/tx_list_test.go
index d8b8d835a4..d579f501af 100644
--- a/core/tx_list_test.go
+++ b/core/tx_list_test.go
@@ -20,8 +20,8 @@ import (
"math/rand"
"testing"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
)
// Tests that transactions can be added to strict lists and list contents and
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 1f0708a2a4..089bd215ad 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -25,13 +25,13 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/params"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
index 96699dacb6..1cf533aa65 100644
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@@ -26,13 +26,13 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
)
// testTxPoolConfig is a transaction pool configuration without stateful disk
diff --git a/core/types.go b/core/types.go
index f81902d870..d0bbaf0aa7 100644
--- a/core/types.go
+++ b/core/types.go
@@ -17,9 +17,9 @@
package core
import (
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
)
// Validator is an interface which defines the standard for block validation. It
diff --git a/core/types/block.go b/core/types/block.go
index 95277e2d44..92b868d9da 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -27,10 +27,10 @@ import (
"time"
"unsafe"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/rlp"
)
var (
diff --git a/core/types/block_test.go b/core/types/block_test.go
index dc3fcb655b..a35fbc25b1 100644
--- a/core/types/block_test.go
+++ b/core/types/block_test.go
@@ -23,8 +23,8 @@ import (
"reflect"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
)
// from bcValidBlockTest.json, "SimpleTx"
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index e38b3fa231..a76b6f33c5 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -20,8 +20,8 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
)
type bytesBacked interface {
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index 18df7a107b..a28ac0e7af 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -54,7 +54,7 @@ func TestBloom(t *testing.T) {
import (
"testing"
- "github.com/eximchain/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/state"
)
func TestBloom9(t *testing.T) {
diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go
index 6ea416641b..00c42c5bc6 100644
--- a/core/types/derive_sha.go
+++ b/core/types/derive_sha.go
@@ -19,9 +19,9 @@ package types
import (
"bytes"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
type DerivableList interface {
diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
index 7f01ec18ec..1b92cd9cf4 100644
--- a/core/types/gen_header_json.go
+++ b/core/types/gen_header_json.go
@@ -7,8 +7,8 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*headerMarshaling)(nil)
diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go
index f54335ee7e..1b5ae3c653 100644
--- a/core/types/gen_log_json.go
+++ b/core/types/gen_log_json.go
@@ -6,8 +6,8 @@ import (
"encoding/json"
"errors"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*logMarshaling)(nil)
diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go
index 8f5018ccfc..c297adebb6 100644
--- a/core/types/gen_receipt_json.go
+++ b/core/types/gen_receipt_json.go
@@ -6,8 +6,8 @@ import (
"encoding/json"
"errors"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*receiptMarshaling)(nil)
diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go
index b308f3840b..c27da67096 100644
--- a/core/types/gen_tx_json.go
+++ b/core/types/gen_tx_json.go
@@ -7,8 +7,8 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*txdataMarshaling)(nil)
diff --git a/core/types/log.go b/core/types/log.go
index 700a2403e7..be5de38da7 100644
--- a/core/types/log.go
+++ b/core/types/log.go
@@ -20,9 +20,9 @@ import (
"fmt"
"io"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/rlp"
)
//go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go
diff --git a/core/types/log_test.go b/core/types/log_test.go
index 58444efa45..0e56acfe4a 100644
--- a/core/types/log_test.go
+++ b/core/types/log_test.go
@@ -23,8 +23,8 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var unmarshalLogTests = map[string]struct {
diff --git a/core/types/receipt.go b/core/types/receipt.go
index 645b13c8d1..f945f6f6a2 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -22,9 +22,9 @@ import (
"io"
"unsafe"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/rlp"
)
//go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go
diff --git a/core/types/transaction.go b/core/types/transaction.go
index c36fdaf9f0..5660582baf 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -24,10 +24,10 @@ import (
"math/big"
"sync/atomic"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
//go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index b8e555f5ad..dfc84fdac7 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -22,9 +22,9 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go
index 207f320c69..689fc38a9b 100644
--- a/core/types/transaction_signing_test.go
+++ b/core/types/transaction_signing_test.go
@@ -20,9 +20,9 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
func TestEIP155Signing(t *testing.T) {
diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go
index 086e2260fa..d1861b14cd 100644
--- a/core/types/transaction_test.go
+++ b/core/types/transaction_test.go
@@ -23,9 +23,9 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
// The values in those tests are from the Transaction Tests
diff --git a/core/vm/analysis.go b/core/vm/analysis.go
index a2316d13bf..f9c4298d39 100644
--- a/core/vm/analysis.go
+++ b/core/vm/analysis.go
@@ -19,7 +19,7 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// destinations stores one map per contract (keyed by hash of code).
diff --git a/core/vm/common.go b/core/vm/common.go
index 16766a132d..17de38decb 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -19,8 +19,8 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
)
// calculates the memory size required for a step
diff --git a/core/vm/contract.go b/core/vm/contract.go
index d371653b7a..66748e8215 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -19,7 +19,7 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// ContractRef is a reference to the contract's backing object
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 1f5d50399f..237450ea96 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -21,11 +21,11 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/bn256"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/bn256"
+ "github.com/ethereum/go-ethereum/params"
"golang.org/x/crypto/ripemd160"
)
diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go
index 6ff8401a94..96083337c9 100644
--- a/core/vm/contracts_test.go
+++ b/core/vm/contracts_test.go
@@ -21,7 +21,7 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// precompiledTest defines the input/output pairs for precompiled contract tests.
diff --git a/core/vm/evm.go b/core/vm/evm.go
index 9d5244bcf8..46e7baff4c 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -21,9 +21,9 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/params"
)
// emptyCodeHash is used by create to ensure deployment is disallowed to already
diff --git a/core/vm/gas.go b/core/vm/gas.go
index a8fef846be..dd64d5f178 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -19,7 +19,7 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
const (
diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
index 61ca7e0159..83adba428e 100644
--- a/core/vm/gas_table.go
+++ b/core/vm/gas_table.go
@@ -17,9 +17,9 @@
package vm
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/params"
)
// memoryGasCosts calculates the quadratic gas for memory expansion. It does so
diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go
index e0227edc01..ade3ca6318 100644
--- a/core/vm/gen_structlog.go
+++ b/core/vm/gen_structlog.go
@@ -6,9 +6,9 @@ import (
"encoding/json"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*structLogMarshaling)(nil)
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index d4dac53c21..66e804fb7e 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -21,11 +21,11 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go
index fad1e5fb62..134363bb74 100644
--- a/core/vm/instructions_test.go
+++ b/core/vm/instructions_test.go
@@ -20,8 +20,8 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/params"
)
type twoOperandTest struct {
diff --git a/core/vm/interface.go b/core/vm/interface.go
index 849df78235..1ef91cf1d6 100644
--- a/core/vm/interface.go
+++ b/core/vm/interface.go
@@ -19,8 +19,8 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// StateDB is an EVM database for full state querying.
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
index 2033df7646..95490adfc4 100644
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -20,8 +20,8 @@ import (
"fmt"
"sync/atomic"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/params"
)
// Config are the configuration options for the Interpreter
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
index 6ef5fb96b3..3389941353 100644
--- a/core/vm/jump_table.go
+++ b/core/vm/jump_table.go
@@ -20,7 +20,7 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
type (
diff --git a/core/vm/logger.go b/core/vm/logger.go
index c50d7c58fd..4c820d8b53 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -23,10 +23,10 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/types"
)
type Storage map[common.Hash]common.Hash
diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go
index 522deaf04f..915f7177e7 100644
--- a/core/vm/logger_test.go
+++ b/core/vm/logger_test.go
@@ -20,8 +20,8 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/params"
)
type dummyContractRef struct {
diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go
index 7fcee8f77d..bec0235bcc 100644
--- a/core/vm/memory_table.go
+++ b/core/vm/memory_table.go
@@ -19,7 +19,7 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common/math"
)
func memorySha3(stack *Stack) *big.Int {
diff --git a/core/vm/noop.go b/core/vm/noop.go
index afd272c06f..b71ead0d77 100644
--- a/core/vm/noop.go
+++ b/core/vm/noop.go
@@ -19,8 +19,8 @@ package vm
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool {
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index 857b7b5e92..31c9b9cf9d 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -17,9 +17,9 @@
package runtime
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/vm"
)
func NewEnv(cfg *Config) *vm.EVM {
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index 625138fcf9..edbf541766 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -21,12 +21,12 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// Config is a basic type specifying certain configuration flags for running
diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go
index d18bc042cc..b7d0ddc384 100644
--- a/core/vm/runtime/runtime_example_test.go
+++ b/core/vm/runtime/runtime_example_test.go
@@ -19,8 +19,8 @@ package runtime_test
import (
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/vm/runtime"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm/runtime"
)
func ExampleExecute() {
diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
index 05b05f7d72..2c4dc50265 100644
--- a/core/vm/runtime/runtime_test.go
+++ b/core/vm/runtime/runtime_test.go
@@ -21,11 +21,11 @@ import (
"strings"
"testing"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
)
func TestDefaults(t *testing.T) {
diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go
index ea0c169041..a4b1cfcd89 100644
--- a/core/vm/stack_table.go
+++ b/core/vm/stack_table.go
@@ -19,7 +19,7 @@ package vm
import (
"fmt"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
func makeStackFunc(pop, push int) stackValidationFunc {
diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go
index 660d1fd5d0..eb3acfb10d 100644
--- a/core/vm/vm_jit.go
+++ b/core/vm/vm_jit.go
@@ -38,9 +38,9 @@ import (
"math/big"
"unsafe"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/params"
)
type JitVm struct {
diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go
index bc5ea45935..a8dfa8f67d 100644
--- a/crypto/bn256/bn256_fast.go
+++ b/crypto/bn256/bn256_fast.go
@@ -19,7 +19,7 @@
// Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
package bn256
-import "github.com/eximchain/go-ethereum/crypto/bn256/cloudflare"
+import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
// G1 is an abstract cyclic group. The zero value is suitable for use as the
// output of an operation, but cannot be used as an input.
diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go
index 7c4d1dba12..f360b0541f 100644
--- a/crypto/bn256/bn256_fuzz.go
+++ b/crypto/bn256/bn256_fuzz.go
@@ -22,8 +22,8 @@ import (
"bytes"
"math/big"
- cloudflare "github.com/eximchain/go-ethereum/crypto/bn256/cloudflare"
- google "github.com/eximchain/go-ethereum/crypto/bn256/google"
+ cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare"
+ google "github.com/ethereum/go-ethereum/crypto/bn256/google"
)
// FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries.
diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go
index 415ef5d69a..61373763b8 100644
--- a/crypto/bn256/bn256_slow.go
+++ b/crypto/bn256/bn256_slow.go
@@ -19,7 +19,7 @@
// Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve.
package bn256
-import "github.com/eximchain/go-ethereum/crypto/bn256/google"
+import "github.com/ethereum/go-ethereum/crypto/bn256/google"
// G1 is an abstract cyclic group. The zero value is suitable for use as the
// output of an operation, but cannot be used as an input.
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 317e885256..1c4d5a2e02 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -28,10 +28,10 @@ import (
"math/big"
"os"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/rlp"
)
var (
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index c2b1699a89..8350354623 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -25,7 +25,7 @@ import (
"os"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791"
diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go
index 2b773610f4..9cd5c79f7e 100644
--- a/crypto/ecies/ecies_test.go
+++ b/crypto/ecies/ecies_test.go
@@ -40,7 +40,7 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto"
)
var dumpEnc bool
diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go
index 450f7cffd1..6312daf5a1 100644
--- a/crypto/ecies/params.go
+++ b/crypto/ecies/params.go
@@ -42,7 +42,7 @@ import (
"fmt"
"hash"
- ethcrypto "github.com/eximchain/go-ethereum/crypto"
+ ethcrypto "github.com/ethereum/go-ethereum/crypto"
)
var (
diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go
index 7f7941a9e5..df80481857 100644
--- a/crypto/secp256k1/curve.go
+++ b/crypto/secp256k1/curve.go
@@ -36,7 +36,7 @@ import (
"math/big"
"unsafe"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common/math"
)
/*
diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go
index be2ff17823..f6582ecd54 100644
--- a/crypto/secp256k1/secp256_test.go
+++ b/crypto/secp256k1/secp256_test.go
@@ -24,8 +24,8 @@ import (
"encoding/hex"
"testing"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto/randentropy"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto/randentropy"
)
const TestCount = 1000
diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
index e7e51cbb32..340bfc221e 100644
--- a/crypto/signature_cgo.go
+++ b/crypto/signature_cgo.go
@@ -23,8 +23,8 @@ import (
"crypto/elliptic"
"fmt"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto/secp256k1"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
)
// Ecrecover returns the uncompressed public key that created the given signature.
diff --git a/crypto/signature_test.go b/crypto/signature_test.go
index cded969ca6..aecff76bfb 100644
--- a/crypto/signature_test.go
+++ b/crypto/signature_test.go
@@ -22,9 +22,9 @@ import (
"reflect"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var (
diff --git a/dashboard/assets.go b/dashboard/assets.go
index 2d705bd557..521d134a6a 100644
--- a/dashboard/assets.go
+++ b/dashboard/assets.go
@@ -31423,7 +31423,7 @@ var _bundleJs = []byte((((((((((`!function(modules) {
}, _react2.default.createElement("span", {
style: _common.styles.light
}, "Commit "), _react2.default.createElement("a", {
- href: "https://github.com/eximchain/go-ethereum/commit/" + general.commit,
+ href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit,
target: "_blank",
style: {
color: "inherit",
diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx
index 493818416b..20830cbba8 100644
--- a/dashboard/assets/components/Footer.jsx
+++ b/dashboard/assets/components/Footer.jsx
@@ -165,7 +165,7 @@ class Footer extends Component {
{general.commit && (
{'Commit '}
-
+
{general.commit.substring(0, 8)}
diff --git a/dashboard/cpu.go b/dashboard/cpu.go
index d063532dc3..c89879028d 100644
--- a/dashboard/cpu.go
+++ b/dashboard/cpu.go
@@ -21,7 +21,7 @@ package dashboard
import (
"syscall"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// getProcessCPUTime retrieves the process' CPU time since program startup.
diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go
index 119d01e225..399fa34c08 100644
--- a/dashboard/dashboard.go
+++ b/dashboard/dashboard.go
@@ -33,11 +33,11 @@ import (
"time"
"github.com/elastic/gosigar"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
"golang.org/x/net/websocket"
)
diff --git a/eth/api.go b/eth/api.go
index 0124355a20..a345b57e49 100644
--- a/eth/api.go
+++ b/eth/api.go
@@ -25,17 +25,17 @@ import (
"os"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/miner"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/miner"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/trie"
)
// PublicEthereumAPI provides an API to access Ethereum full node-related
diff --git a/eth/api_backend.go b/eth/api_backend.go
index 01d00bed5b..ecd5488a24 100644
--- a/eth/api_backend.go
+++ b/eth/api_backend.go
@@ -20,20 +20,20 @@ import (
"context"
"math/big"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
)
// EthApiBackend implements ethapi.Backend for full nodes
diff --git a/eth/api_test.go b/eth/api_test.go
index 1159b42b00..900a82bb6a 100644
--- a/eth/api_test.go
+++ b/eth/api_test.go
@@ -21,9 +21,9 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/ethdb"
)
var dumper = spew.ConfigState{Indent: " "}
diff --git a/eth/api_tracer.go b/eth/api_tracer.go
index 5d7b373b1a..07c4457bc3 100644
--- a/eth/api_tracer.go
+++ b/eth/api_tracer.go
@@ -26,18 +26,18 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth/tracers"
- "github.com/eximchain/go-ethereum/internal/ethapi"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/tracers"
+ "github.com/ethereum/go-ethereum/internal/ethapi"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/trie"
)
const (
diff --git a/eth/backend.go b/eth/backend.go
index 697be3935f..94aad23101 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -25,29 +25,29 @@ import (
"sync"
"sync/atomic"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/clique"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/filters"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/internal/ethapi"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/miner"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/clique"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/filters"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/internal/ethapi"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/miner"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
)
type LesServer interface {
diff --git a/eth/bloombits.go b/eth/bloombits.go
index 678344e858..c5597391c5 100644
--- a/eth/bloombits.go
+++ b/eth/bloombits.go
@@ -19,13 +19,13 @@ package eth
import (
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
const (
diff --git a/eth/config.go b/eth/config.go
index b61f240eba..dd7f42c7d9 100644
--- a/eth/config.go
+++ b/eth/config.go
@@ -24,13 +24,13 @@ import (
"runtime"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/params"
)
// DefaultConfig contains default settings for use on the Ethereum main net.
diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go
index b52c944fb2..d41afa17c0 100644
--- a/eth/db_upgrade.go
+++ b/eth/db_upgrade.go
@@ -21,11 +21,11 @@ import (
"bytes"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
)
var deduplicateData = []byte("dbUpgrade_20170714deduplicateData")
diff --git a/eth/downloader/api.go b/eth/downloader/api.go
index 4053a304d9..d496fa6a4d 100644
--- a/eth/downloader/api.go
+++ b/eth/downloader/api.go
@@ -20,9 +20,9 @@ import (
"context"
"sync"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/rpc"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/rpc"
)
// PublicDownloaderAPI provides an API which gives information about the current synchronisation status.
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
index 2b129c7aa0..62842adbc6 100644
--- a/eth/downloader/downloader.go
+++ b/eth/downloader/downloader.go
@@ -25,15 +25,15 @@ import (
"sync/atomic"
"time"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/params"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go
index 7a6f0d7648..cb671a7df4 100644
--- a/eth/downloader/downloader_test.go
+++ b/eth/downloader/downloader_test.go
@@ -25,15 +25,15 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/trie"
)
var (
diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go
index d57b5a1bff..b45acff7d0 100644
--- a/eth/downloader/fakepeer.go
+++ b/eth/downloader/fakepeer.go
@@ -19,10 +19,10 @@ package downloader
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// FakePeer is a mock downloader peer that operates on a local database instance
diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go
index 2f0f5faa35..d4eb337946 100644
--- a/eth/downloader/metrics.go
+++ b/eth/downloader/metrics.go
@@ -19,7 +19,7 @@
package downloader
import (
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
var (
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
index 9e5d6d8933..a4aa861146 100644
--- a/eth/downloader/peer.go
+++ b/eth/downloader/peer.go
@@ -29,9 +29,9 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go
index a039571efa..359cce54b5 100644
--- a/eth/downloader/queue.go
+++ b/eth/downloader/queue.go
@@ -25,10 +25,10 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)
diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go
index 967f430d74..ee6c7b4914 100644
--- a/eth/downloader/statesync.go
+++ b/eth/downloader/statesync.go
@@ -22,13 +22,13 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/trie"
)
// stateReq represents a batch of state fetch requests groupped together into
diff --git a/eth/downloader/types.go b/eth/downloader/types.go
index 63883d1202..3f30ea9dd1 100644
--- a/eth/downloader/types.go
+++ b/eth/downloader/types.go
@@ -19,7 +19,7 @@ package downloader
import (
"fmt"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/types"
)
// peerDropFn is a callback type for dropping a peer detected as malicious.
diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go
index d1f082e000..db554e1440 100644
--- a/eth/fetcher/fetcher.go
+++ b/eth/fetcher/fetcher.go
@@ -22,10 +22,10 @@ import (
"math/rand"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)
diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go
index 81e5b23b85..9d53b98b60 100644
--- a/eth/fetcher/fetcher_test.go
+++ b/eth/fetcher/fetcher_test.go
@@ -24,13 +24,13 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go
index da89fc3169..d68d12f000 100644
--- a/eth/fetcher/metrics.go
+++ b/eth/fetcher/metrics.go
@@ -19,7 +19,7 @@
package fetcher
import (
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
var (
diff --git a/eth/filters/api.go b/eth/filters/api.go
index de9dc30af3..406c9442e0 100644
--- a/eth/filters/api.go
+++ b/eth/filters/api.go
@@ -25,13 +25,13 @@ import (
"sync"
"time"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/rpc"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/rpc"
)
var (
diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go
index 69e02e7cf1..4ae37f9779 100644
--- a/eth/filters/api_test.go
+++ b/eth/filters/api_test.go
@@ -21,8 +21,8 @@ import (
"fmt"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rpc"
)
func TestUnmarshalJSONNewFilterArgs(t *testing.T) {
diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go
index 341b721e08..0a0929bc10 100644
--- a/eth/filters/bench_test.go
+++ b/eth/filters/bench_test.go
@@ -23,14 +23,14 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/node"
)
func BenchmarkBloomBits512(b *testing.B) {
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index a8a7b1bbf8..5dfe60e772 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -20,13 +20,13 @@ import (
"context"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/rpc"
)
type Backend interface {
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index 7375067bac..f8097c7b95 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -25,12 +25,12 @@ import (
"sync"
"time"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/rpc"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/rpc"
)
// Type determines the kind of filter and is used to put the filter in to
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
index 984d8fbfe8..61761151a2 100644
--- a/eth/filters/filter_system_test.go
+++ b/eth/filters/filter_system_test.go
@@ -25,16 +25,16 @@ import (
"testing"
"time"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
)
type testBackend struct {
diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go
index 0784a14c91..0018142c46 100644
--- a/eth/filters/filter_test.go
+++ b/eth/filters/filter_test.go
@@ -23,14 +23,14 @@ import (
"os"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
)
func makeReceipt(addr common.Address) *types.Receipt {
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
index 36ec0d8f71..54325692c6 100644
--- a/eth/gasprice/gasprice.go
+++ b/eth/gasprice/gasprice.go
@@ -22,11 +22,11 @@ import (
"sort"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/internal/ethapi"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/internal/ethapi"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
)
var maxPrice = big.NewInt(500 * params.Shannon)
diff --git a/eth/gen_config.go b/eth/gen_config.go
index 291d46f6de..4f2e82d941 100644
--- a/eth/gen_config.go
+++ b/eth/gen_config.go
@@ -5,12 +5,12 @@ package eth
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
)
var _ = (*configMarshaling)(nil)
diff --git a/eth/handler.go b/eth/handler.go
index fab45d49b9..3fae0cd00d 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -26,20 +26,20 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/fetcher"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/fetcher"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
const (
diff --git a/eth/handler_test.go b/eth/handler_test.go
index 7bc6669102..e336dfa285 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -23,18 +23,18 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/params"
)
// Tests that protocol versions and modes of operations are matched up properly.
diff --git a/eth/helper_test.go b/eth/helper_test.go
index 7d32901e81..2b05cea801 100644
--- a/eth/helper_test.go
+++ b/eth/helper_test.go
@@ -27,18 +27,18 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/eth/metrics.go b/eth/metrics.go
index 2e138eebe0..0533a2a875 100644
--- a/eth/metrics.go
+++ b/eth/metrics.go
@@ -17,8 +17,8 @@
package eth
import (
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p"
)
var (
diff --git a/eth/peer.go b/eth/peer.go
index dcbcfd0d5d..42ead53965 100644
--- a/eth/peer.go
+++ b/eth/peer.go
@@ -23,10 +23,10 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
"gopkg.in/fatih/set.v0"
)
diff --git a/eth/protocol.go b/eth/protocol.go
index 1d403cac57..cd7db57f23 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -21,11 +21,11 @@ import (
"io"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Constants to match up protocol versions and messages
diff --git a/eth/protocol_test.go b/eth/protocol_test.go
index 0b554eab51..b2f93d8dd1 100644
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@@ -22,12 +22,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
)
func init() {
diff --git a/eth/sync.go b/eth/sync.go
index 888800c209..e49e40087e 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -21,11 +21,11 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
const (
diff --git a/eth/sync_test.go b/eth/sync_test.go
index a173bd3646..88c10c7f74 100644
--- a/eth/sync_test.go
+++ b/eth/sync_test.go
@@ -21,9 +21,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
// Tests that fast sync gets disabled as soon as a real block is successfully
diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go
index 550f616184..4cec9e633c 100644
--- a/eth/tracers/tracer.go
+++ b/eth/tracers/tracer.go
@@ -25,11 +25,11 @@ import (
"time"
"unsafe"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
duktape "gopkg.in/olebedev/go-duktape.v3"
)
diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go
index 0843a259d3..117c376b81 100644
--- a/eth/tracers/tracer_test.go
+++ b/eth/tracers/tracer_test.go
@@ -24,9 +24,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/params"
)
type account struct{}
diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go
index 4aa5589d95..4e1ef23ad2 100644
--- a/eth/tracers/tracers.go
+++ b/eth/tracers/tracers.go
@@ -21,7 +21,7 @@ import (
"strings"
"unicode"
- "github.com/eximchain/go-ethereum/eth/tracers/internal/tracers"
+ "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers"
)
// all contains all the built in JavaScript tracers by name.
diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go
index e86c30028a..bf8120228f 100644
--- a/eth/tracers/tracers_test.go
+++ b/eth/tracers/tracers_test.go
@@ -25,15 +25,15 @@ import (
"strings"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/tests"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/tests"
)
// To generate a new callTracer test, copy paste the makeTest method below into
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
index bf24f0d29b..87a912901a 100644
--- a/ethclient/ethclient.go
+++ b/ethclient/ethclient.go
@@ -24,12 +24,12 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
)
// Client defines typed wrappers for the Ethereum RPC API.
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
index 404ba04787..178eb2be98 100644
--- a/ethclient/ethclient_test.go
+++ b/ethclient/ethclient_test.go
@@ -16,7 +16,7 @@
package ethclient
-import "github.com/eximchain/go-ethereum"
+import "github.com/ethereum/go-ethereum"
// Verify that Client implements the ethereum interfaces.
var (
diff --git a/ethclient/signer.go b/ethclient/signer.go
index 3a9508f82f..74a93f1e2f 100644
--- a/ethclient/signer.go
+++ b/ethclient/signer.go
@@ -20,8 +20,8 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// senderFromServer is a types.Signer that remembers the sender address returned by the RPC
diff --git a/ethdb/database.go b/ethdb/database.go
index 528bd46aad..8c557e4820 100644
--- a/ethdb/database.go
+++ b/ethdb/database.go
@@ -22,8 +22,8 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/filter"
diff --git a/ethdb/database_test.go b/ethdb/database_test.go
index 5cd45733bc..5e4a3ca34a 100644
--- a/ethdb/database_test.go
+++ b/ethdb/database_test.go
@@ -25,7 +25,7 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/ethdb"
)
func newTestLDB() (*ethdb.LDBDatabase, func()) {
diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go
index 57019e461a..8efd7bf845 100644
--- a/ethdb/memory_database.go
+++ b/ethdb/memory_database.go
@@ -20,7 +20,7 @@ import (
"errors"
"sync"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
/*
diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go
index dfb84eee04..ae7e252654 100644
--- a/ethstats/ethstats.go
+++ b/ethstats/ethstats.go
@@ -30,17 +30,17 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/les"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/les"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
"golang.org/x/net/websocket"
)
diff --git a/event/example_feed_test.go b/event/example_feed_test.go
index 6c68fa7ffe..9b5ad50df5 100644
--- a/event/example_feed_test.go
+++ b/event/example_feed_test.go
@@ -19,7 +19,7 @@ package event_test
import (
"fmt"
- "github.com/eximchain/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/event"
)
func ExampleFeed_acknowledgedEvents() {
diff --git a/event/example_scope_test.go b/event/example_scope_test.go
index e4b10149b6..825a8deeac 100644
--- a/event/example_scope_test.go
+++ b/event/example_scope_test.go
@@ -20,7 +20,7 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/event"
)
// This example demonstrates how SubscriptionScope can be used to control the lifetime of
diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go
index 2cdcc5e0e3..5c76b55d98 100644
--- a/event/example_subscription_test.go
+++ b/event/example_subscription_test.go
@@ -19,7 +19,7 @@ package event_test
import (
"fmt"
- "github.com/eximchain/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/event"
)
func ExampleNewSubscription() {
diff --git a/event/subscription.go b/event/subscription.go
index d1642cdf2c..d03f465075 100644
--- a/event/subscription.go
+++ b/event/subscription.go
@@ -21,7 +21,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/common/mclock"
)
// Subscription represents a stream of events. The carrier of the events is typically a
diff --git a/interfaces.go b/interfaces.go
index d60cb36828..1ae1eba48a 100644
--- a/interfaces.go
+++ b/interfaces.go
@@ -22,8 +22,8 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// NotFound is returned by API methods if the requested item does not exist.
diff --git a/internal/debug/api.go b/internal/debug/api.go
index d04bef2192..048b7d7635 100644
--- a/internal/debug/api.go
+++ b/internal/debug/api.go
@@ -33,7 +33,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// Handler is the global debugging handler.
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
index 88d8c77160..1f181bf8b0 100644
--- a/internal/debug/flags.go
+++ b/internal/debug/flags.go
@@ -24,10 +24,10 @@ import (
"os"
"runtime"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/log/term"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/metrics/exp"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log/term"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics/exp"
colorable "github.com/mattn/go-colorable"
"gopkg.in/urfave/cli.v1"
)
diff --git a/internal/debug/trace.go b/internal/debug/trace.go
index b609576977..cab5deaafd 100644
--- a/internal/debug/trace.go
+++ b/internal/debug/trace.go
@@ -23,7 +23,7 @@ import (
"os"
"runtime/trace"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// StartGoTrace turns on tracing, writing to the given file.
diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go
index f97f657881..61ddff688c 100644
--- a/internal/ethapi/addrlock.go
+++ b/internal/ethapi/addrlock.go
@@ -19,7 +19,7 @@ package ethapi
import (
"sync"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
type AddrLocker struct {
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 064d5249b9..6525aa212c 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -25,21 +25,21 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/util"
)
@@ -421,7 +421,7 @@ func signHash(data []byte) []byte {
//
// The key used to calculate the signature is decrypted with the given password.
//
-// https://github.com/eximchain/go-ethereum/wiki/Management-APIs#personal_sign
+// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign
func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) {
// Look up the wallet containing the requested signer
account := accounts.Account{Address: addr}
@@ -448,7 +448,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c
// Note, the signature must conform to the secp256k1 curve R, S and V values, where
// the V value must be be 27 or 28 for legacy reasons.
//
-// https://github.com/eximchain/go-ethereum/wiki/Management-APIs#personal_ecRecover
+// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover
func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) {
if len(sig) != 65 {
return common.Address{}, fmt.Errorf("signature must be 65 bytes long")
diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go
index f3055e6468..af95d7906f 100644
--- a/internal/ethapi/backend.go
+++ b/internal/ethapi/backend.go
@@ -21,17 +21,17 @@ import (
"context"
"math/big"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
)
// Backend interface provides the common API services (that are provided by
diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go
index 842fd92d40..9c7ad16d18 100644
--- a/internal/guide/guide_test.go
+++ b/internal/guide/guide_test.go
@@ -30,8 +30,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Tests that the account management snippets work correctly.
diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js
index 8355cd06f6..9bb899384b 100644
--- a/internal/jsre/deps/web3.js
+++ b/internal/jsre/deps/web3.js
@@ -5862,7 +5862,7 @@ module.exports = Shh;
* @author Alex Beregszaszi
* @date 2016
*
- * Reference: https://github.com/eximchain/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33
+ * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33
*/
"use strict";
diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go
index 26cba78738..f05865eca6 100644
--- a/internal/jsre/jsre.go
+++ b/internal/jsre/jsre.go
@@ -26,8 +26,8 @@ import (
"math/rand"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/internal/jsre/deps"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/internal/jsre/deps"
"github.com/robertkrimen/otto"
)
diff --git a/les/api_backend.go b/les/api_backend.go
index 9b93ee2dc0..3fc5c33a44 100644
--- a/les/api_backend.go
+++ b/les/api_backend.go
@@ -20,21 +20,21 @@ import (
"context"
"math/big"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
)
type LesApiBackend struct {
diff --git a/les/backend.go b/les/backend.go
index 99da605c19..6a324cb04b 100644
--- a/les/backend.go
+++ b/les/backend.go
@@ -22,27 +22,27 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/bloombits"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/eth/filters"
- "github.com/eximchain/go-ethereum/eth/gasprice"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/internal/ethapi"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/params"
- rpc "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/bloombits"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/eth/filters"
+ "github.com/ethereum/go-ethereum/eth/gasprice"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/internal/ethapi"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/params"
+ rpc "github.com/ethereum/go-ethereum/rpc"
)
type LightEthereum struct {
diff --git a/les/bloombits.go b/les/bloombits.go
index 45e62adf45..de233d7518 100644
--- a/les/bloombits.go
+++ b/les/bloombits.go
@@ -19,8 +19,8 @@ package les
import (
"time"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/light"
)
const (
diff --git a/les/fetcher.go b/les/fetcher.go
index 4424a71ed0..e12a2c78a2 100644
--- a/les/fetcher.go
+++ b/les/fetcher.go
@@ -22,13 +22,13 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go
index 7adefeb075..d50eb809cc 100644
--- a/les/flowcontrol/control.go
+++ b/les/flowcontrol/control.go
@@ -21,7 +21,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/common/mclock"
)
const fcTimeConst = time.Millisecond
diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go
index bab1eb4010..28cc6f0fe7 100644
--- a/les/flowcontrol/manager.go
+++ b/les/flowcontrol/manager.go
@@ -21,7 +21,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/common/mclock"
)
const rcConst = 1000000
diff --git a/les/handler.go b/les/handler.go
index 6da52b6c80..9627f392be 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -26,22 +26,22 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
const (
diff --git a/les/handler_test.go b/les/handler_test.go
index 5891946d80..9468032f67 100644
--- a/les/handler_test.go
+++ b/les/handler_test.go
@@ -23,18 +23,18 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error {
diff --git a/les/helper_test.go b/les/helper_test.go
index 1b1dfce61a..6d997a1a36 100644
--- a/les/helper_test.go
+++ b/les/helper_test.go
@@ -25,20 +25,20 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/les/flowcontrol"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/les/flowcontrol"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/les/metrics.go b/les/metrics.go
index b8de63d7cf..c282a62a1a 100644
--- a/les/metrics.go
+++ b/les/metrics.go
@@ -17,8 +17,8 @@
package les
import (
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p"
)
var (
diff --git a/les/odr.go b/les/odr.go
index 4554aa190d..f8412aaad7 100644
--- a/les/odr.go
+++ b/les/odr.go
@@ -19,10 +19,10 @@ package les
import (
"context"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
)
// LesOdr implements light.OdrBackend
diff --git a/les/odr_requests.go b/les/odr_requests.go
index 23ef6df3b0..34d759dd2a 100644
--- a/les/odr_requests.go
+++ b/les/odr_requests.go
@@ -23,15 +23,15 @@ import (
"errors"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
var (
diff --git a/les/odr_test.go b/les/odr_test.go
index 756274ed9b..88e121cda6 100644
--- a/les/odr_test.go
+++ b/les/odr_test.go
@@ -23,17 +23,17 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte
diff --git a/les/peer.go b/les/peer.go
index fb853d15bf..caf5680778 100644
--- a/les/peer.go
+++ b/les/peer.go
@@ -26,13 +26,13 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/les/flowcontrol"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/les/flowcontrol"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
)
var (
diff --git a/les/protocol.go b/les/protocol.go
index cbdba65a14..e1c4625bce 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -26,11 +26,11 @@ import (
"io"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/secp256k1"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Constants to match up protocol versions and messages
diff --git a/les/request_test.go b/les/request_test.go
index 9dc97c060e..c13625de8e 100644
--- a/les/request_test.go
+++ b/les/request_test.go
@@ -21,12 +21,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/light"
)
var testBankSecureTrieKey = secAddr(testBankAddress)
diff --git a/les/retrieve.go b/les/retrieve.go
index 6fc5aff272..e262a3cb47 100644
--- a/les/retrieve.go
+++ b/les/retrieve.go
@@ -26,7 +26,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/common/mclock"
)
var (
diff --git a/les/server.go b/les/server.go
index 2417941297..28b87008a0 100644
--- a/les/server.go
+++ b/les/server.go
@@ -23,17 +23,17 @@ import (
"math"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/les/flowcontrol"
- "github.com/eximchain/go-ethereum/light"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/les/flowcontrol"
+ "github.com/ethereum/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/rlp"
)
type LesServer struct {
diff --git a/les/serverpool.go b/les/serverpool.go
index b30cca5a48..a84c29c3ac 100644
--- a/les/serverpool.go
+++ b/les/serverpool.go
@@ -27,13 +27,13 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/rlp"
)
const (
diff --git a/les/sync.go b/les/sync.go
index 584ce0b5fc..c0e17f97d9 100644
--- a/les/sync.go
+++ b/les/sync.go
@@ -20,9 +20,9 @@ import (
"context"
"time"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/light"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/light"
)
const (
diff --git a/les/txrelay.go b/les/txrelay.go
index 5634e843ca..7a02cc837e 100644
--- a/les/txrelay.go
+++ b/les/txrelay.go
@@ -19,8 +19,8 @@ package les
import (
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
type ltrInfo struct {
diff --git a/light/lightchain.go b/light/lightchain.go
index 1fb48d2a69..2784615d35 100644
--- a/light/lightchain.go
+++ b/light/lightchain.go
@@ -24,16 +24,16 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/hashicorp/golang-lru"
)
diff --git a/light/lightchain_test.go b/light/lightchain_test.go
index 2308e1161b..0af7551d41 100644
--- a/light/lightchain_test.go
+++ b/light/lightchain_test.go
@@ -21,12 +21,12 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// So we can deterministically seed different blockchains
diff --git a/light/nodeset.go b/light/nodeset.go
index 1186a0afc0..6f25219c13 100644
--- a/light/nodeset.go
+++ b/light/nodeset.go
@@ -20,10 +20,10 @@ import (
"errors"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/rlp"
)
// NodeSet stores a set of trie nodes. It implements trie.Database and can also
diff --git a/light/odr.go b/light/odr.go
index 33bfd60ec8..e2c3d9c5a4 100644
--- a/light/odr.go
+++ b/light/odr.go
@@ -22,10 +22,10 @@ import (
"context"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// NoOdr is the default context passed to an ODR capable function when the ODR
diff --git a/light/odr_test.go b/light/odr_test.go
index 6c667ff0f3..d3f9374fd8 100644
--- a/light/odr_test.go
+++ b/light/odr_test.go
@@ -24,18 +24,18 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
var (
diff --git a/light/odr_util.go b/light/odr_util.go
index 190beb250b..d56330e36b 100644
--- a/light/odr_util.go
+++ b/light/odr_util.go
@@ -20,11 +20,11 @@ import (
"bytes"
"context"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
var sha3_nil = crypto.Keccak256Hash(nil)
diff --git a/light/postprocess.go b/light/postprocess.go
index 1a53eb9694..384a635f76 100644
--- a/light/postprocess.go
+++ b/light/postprocess.go
@@ -22,15 +22,15 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/bitutil"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/bitutil"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/trie"
)
const (
diff --git a/light/trie.go b/light/trie.go
index 8aa189e528..c07e99461c 100644
--- a/light/trie.go
+++ b/light/trie.go
@@ -21,12 +21,12 @@ import (
"errors"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/trie"
)
func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB {
diff --git a/light/trie_test.go b/light/trie_test.go
index fdfa73fd5c..0d6b2cc1d8 100644
--- a/light/trie_test.go
+++ b/light/trie_test.go
@@ -23,13 +23,13 @@ import (
"testing"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/trie"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/trie"
)
func TestNodeIterator(t *testing.T) {
diff --git a/light/txpool.go b/light/txpool.go
index e5142e15b8..ca41490bdc 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -22,15 +22,15 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
const (
diff --git a/light/txpool_test.go b/light/txpool_test.go
index e38add09dc..13d7d3cebb 100644
--- a/light/txpool_test.go
+++ b/light/txpool_test.go
@@ -23,13 +23,13 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
type testTxRelay struct {
diff --git a/log/format.go b/log/format.go
index d60eb2b6cd..0b07abb2ac 100644
--- a/log/format.go
+++ b/log/format.go
@@ -22,7 +22,7 @@ const (
// locationTrims are trimmed for display to avoid unwieldy log lines.
var locationTrims = []string{
- "github.com/eximchain/go-ethereum/",
+ "github.com/ethereum/go-ethereum/",
}
// PrintOrigins sets or unsets log location (file:line) printing for terminal
diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go
index 8b78b15859..c19d00a94d 100644
--- a/metrics/exp/exp.go
+++ b/metrics/exp/exp.go
@@ -8,7 +8,7 @@ import (
"net/http"
"sync"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
type exp struct {
diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go
index 55b18438dd..d5cb4da66f 100644
--- a/metrics/influxdb/influxdb.go
+++ b/metrics/influxdb/influxdb.go
@@ -6,7 +6,7 @@ import (
uurl "net/url"
"time"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
"github.com/influxdata/influxdb/client"
)
diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go
index 8a1f4534b4..f8c8c9ecb7 100644
--- a/metrics/librato/librato.go
+++ b/metrics/librato/librato.go
@@ -7,7 +7,7 @@ import (
"regexp"
"time"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
// a regexp for extracting the unit from time.Duration.String
diff --git a/metrics/metrics.go b/metrics/metrics.go
index 766958120a..e24324814c 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -11,7 +11,7 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// Enabled is checked by the constructor functions for all of the
diff --git a/miner/agent.go b/miner/agent.go
index 5975955032..e3cebbd2e2 100644
--- a/miner/agent.go
+++ b/miner/agent.go
@@ -21,8 +21,8 @@ import (
"sync/atomic"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/log"
)
type CpuAgent struct {
diff --git a/miner/miner.go b/miner/miner.go
index 32680ebce3..d9256e9787 100644
--- a/miner/miner.go
+++ b/miner/miner.go
@@ -21,17 +21,17 @@ import (
"fmt"
"sync/atomic"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
)
// Backend wraps all methods required for mining.
diff --git a/miner/remote_agent.go b/miner/remote_agent.go
index bff9d5a1e2..287e7530c3 100644
--- a/miner/remote_agent.go
+++ b/miner/remote_agent.go
@@ -23,11 +23,11 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
)
type hashrate struct {
diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go
index 995ae37bca..7a4fc7cc5a 100644
--- a/miner/unconfirmed.go
+++ b/miner/unconfirmed.go
@@ -20,9 +20,9 @@ import (
"container/ring"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/log"
)
// headerRetriever is used by the unconfirmed block set to verify whether a previously
diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go
index ba49c07f91..456af1764a 100644
--- a/miner/unconfirmed_test.go
+++ b/miner/unconfirmed_test.go
@@ -19,8 +19,8 @@ package miner
import (
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// noopHeaderRetriever is an implementation of headerRetriever that always
diff --git a/miner/worker.go b/miner/worker.go
index 4ab312c8af..15395ae0b9 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -24,17 +24,17 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/consensus"
- "github.com/eximchain/go-ethereum/consensus/misc"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
+ "github.com/ethereum/go-ethereum/consensus/misc"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/params"
"gopkg.in/fatih/set.v0"
)
diff --git a/mobile/accounts.go b/mobile/accounts.go
index 615dc12aa4..4d979bffff 100644
--- a/mobile/accounts.go
+++ b/mobile/accounts.go
@@ -23,10 +23,10 @@ import (
"errors"
"time"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
const (
diff --git a/mobile/android_test.go b/mobile/android_test.go
index 59101e0ef7..3d3bd66d08 100644
--- a/mobile/android_test.go
+++ b/mobile/android_test.go
@@ -25,7 +25,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/internal/build"
+ "github.com/ethereum/go-ethereum/internal/build"
)
// androidTestClass is a Java class to do some lightweight tests against the Android
@@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) {
}
}
// Generate the mobile bindings for Geth and add the tester class
- gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/eximchain/go-ethereum/mobile")
+ gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile")
if output, err := gobind.CombinedOutput(); err != nil {
t.Logf("%s", output)
t.Fatalf("failed to run gomobile bind: %v", err)
diff --git a/mobile/big.go b/mobile/big.go
index 96638e7ad6..dd7b158786 100644
--- a/mobile/big.go
+++ b/mobile/big.go
@@ -22,7 +22,7 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// A BigInt represents a signed multi-precision integer.
diff --git a/mobile/bind.go b/mobile/bind.go
index 37fb5086ec..d6e621a258 100644
--- a/mobile/bind.go
+++ b/mobile/bind.go
@@ -22,10 +22,10 @@ import (
"math/big"
"strings"
- "github.com/eximchain/go-ethereum/accounts/abi"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/accounts/abi"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Signer is an interaface defining the callback when a contract requires a
diff --git a/mobile/common.go b/mobile/common.go
index 46b546bfcd..047d8e1f65 100644
--- a/mobile/common.go
+++ b/mobile/common.go
@@ -24,7 +24,7 @@ import (
"fmt"
"strings"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// Hash represents the 32 byte Keccak256 hash of arbitrary data.
diff --git a/mobile/discover.go b/mobile/discover.go
index ea9f6f8451..9b3c93ccd9 100644
--- a/mobile/discover.go
+++ b/mobile/discover.go
@@ -22,7 +22,7 @@ package geth
import (
"errors"
- "github.com/eximchain/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
)
// Enode represents a host on the network.
diff --git a/mobile/ethclient.go b/mobile/ethclient.go
index 683634e2bc..66399c6b56 100644
--- a/mobile/ethclient.go
+++ b/mobile/ethclient.go
@@ -21,8 +21,8 @@ package geth
import (
"math/big"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/ethclient"
)
// EthereumClient provides access to the Ethereum APIs.
diff --git a/mobile/ethereum.go b/mobile/ethereum.go
index f44cdd2885..0eb1d90552 100644
--- a/mobile/ethereum.go
+++ b/mobile/ethereum.go
@@ -21,8 +21,8 @@ package geth
import (
"errors"
- ethereum "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common"
+ ethereum "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common"
)
// Subscription represents an event subscription where events are
diff --git a/mobile/geth.go b/mobile/geth.go
index 0b4305d16c..7e3b8f4915 100644
--- a/mobile/geth.go
+++ b/mobile/geth.go
@@ -24,17 +24,17 @@ import (
"fmt"
"path/filepath"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/eth"
- "github.com/eximchain/go-ethereum/eth/downloader"
- "github.com/eximchain/go-ethereum/ethclient"
- "github.com/eximchain/go-ethereum/ethstats"
- "github.com/eximchain/go-ethereum/les"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/params"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv5"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/eth/downloader"
+ "github.com/ethereum/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/ethstats"
+ "github.com/ethereum/go-ethereum/les"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/params"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
)
// NodeConfig represents the collection of configuration values to fine tune the Geth
diff --git a/mobile/init.go b/mobile/init.go
index e45c9652a7..2025d85edc 100644
--- a/mobile/init.go
+++ b/mobile/init.go
@@ -22,7 +22,7 @@ import (
"os"
"runtime"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
func init() {
diff --git a/mobile/interface.go b/mobile/interface.go
index 61b2cb7354..ac0c26088a 100644
--- a/mobile/interface.go
+++ b/mobile/interface.go
@@ -22,7 +22,7 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// Interface represents a wrapped version of Go's interface{}, with the capacity
diff --git a/mobile/logger.go b/mobile/logger.go
index fdca9b35fe..7078c4fd2c 100644
--- a/mobile/logger.go
+++ b/mobile/logger.go
@@ -19,7 +19,7 @@ package geth
import (
"os"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go).
diff --git a/mobile/p2p.go b/mobile/p2p.go
index 13e696f5dc..a80d9fff2e 100644
--- a/mobile/p2p.go
+++ b/mobile/p2p.go
@@ -21,7 +21,7 @@ package geth
import (
"errors"
- "github.com/eximchain/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p"
)
// NodeInfo represents pi short summary of the information known about the host.
diff --git a/mobile/params.go b/mobile/params.go
index 545bd051ff..45fe870ee3 100644
--- a/mobile/params.go
+++ b/mobile/params.go
@@ -21,9 +21,9 @@ package geth
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/params"
)
// MainnetGenesis returns the JSON spec to use for the main Ethereum network. It
diff --git a/mobile/types.go b/mobile/types.go
index cecf48899e..4790afceff 100644
--- a/mobile/types.go
+++ b/mobile/types.go
@@ -23,9 +23,9 @@ import (
"errors"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/rlp"
)
// A Nonce is a 64-bit hash which proves (combined with the mix-hash) that
diff --git a/mobile/vm.go b/mobile/vm.go
index 260371c62c..72093e3d5b 100644
--- a/mobile/vm.go
+++ b/mobile/vm.go
@@ -21,7 +21,7 @@ package geth
import (
"errors"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/types"
)
// Log represents a contract log event. These events are generated by the LOG
diff --git a/node/api.go b/node/api.go
index 66d487a2be..a3b8bc0bb5 100644
--- a/node/api.go
+++ b/node/api.go
@@ -22,12 +22,12 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
)
// PrivateAdminAPI is the collection of administrative API methods exposed only
diff --git a/node/config.go b/node/config.go
index a2d7199023..dda24583ee 100644
--- a/node/config.go
+++ b/node/config.go
@@ -25,14 +25,14 @@ import (
"runtime"
"strings"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/accounts/keystore"
- "github.com/eximchain/go-ethereum/accounts/usbwallet"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/accounts/keystore"
+ "github.com/ethereum/go-ethereum/accounts/usbwallet"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
const (
diff --git a/node/config_test.go b/node/config_test.go
index abfa4dfb66..b81d3d6120 100644
--- a/node/config_test.go
+++ b/node/config_test.go
@@ -24,8 +24,8 @@ import (
"runtime"
"testing"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/p2p"
)
// Tests that datadirs can be successfully created, be them manually configured
diff --git a/node/defaults.go b/node/defaults.go
index 26d70b6b42..8875605807 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -22,8 +22,8 @@ import (
"path/filepath"
"runtime"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/nat"
)
const (
diff --git a/node/node.go b/node/node.go
index b1a2bb59a1..b02aecfad1 100644
--- a/node/node.go
+++ b/node/node.go
@@ -26,13 +26,13 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/internal/debug"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/internal/debug"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/prometheus/prometheus/util/flock"
)
diff --git a/node/node_example_test.go b/node/node_example_test.go
index e8f0239293..ee06f4065c 100644
--- a/node/node_example_test.go
+++ b/node/node_example_test.go
@@ -20,9 +20,9 @@ import (
"fmt"
"log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
)
// SampleService is a trivial network service that can be attached to a node for
diff --git a/node/node_test.go b/node/node_test.go
index 9664e17449..2880efa619 100644
--- a/node/node_test.go
+++ b/node/node_test.go
@@ -24,9 +24,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
)
var (
diff --git a/node/service.go b/node/service.go
index 30adea87cb..55062a5004 100644
--- a/node/service.go
+++ b/node/service.go
@@ -19,11 +19,11 @@ package node
import (
"reflect"
- "github.com/eximchain/go-ethereum/accounts"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
)
// ServiceContext is a collection of service independent options inherited from
diff --git a/node/utils_test.go b/node/utils_test.go
index 651e02e9ad..8eddce3ed7 100644
--- a/node/utils_test.go
+++ b/node/utils_test.go
@@ -22,8 +22,8 @@ package node
import (
"reflect"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
)
// NoopService is a trivial implementation of the Service interface.
diff --git a/p2p/dial.go b/p2p/dial.go
index f615e40f10..d8feceb9f3 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -24,9 +24,9 @@ import (
"net"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
)
const (
diff --git a/p2p/dial_test.go b/p2p/dial_test.go
index b05d75521f..2a7941fc65 100644
--- a/p2p/dial_test.go
+++ b/p2p/dial_test.go
@@ -24,8 +24,8 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
)
func init() {
diff --git a/p2p/discover/database.go b/p2p/discover/database.go
index 11e928c47d..6f98de9b42 100644
--- a/p2p/discover/database.go
+++ b/p2p/discover/database.go
@@ -27,9 +27,9 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/iterator"
diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index a1f7a438dc..3b0c84115c 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -31,9 +31,9 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/secp256k1"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
)
const NodeIDBits = 512
diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go
index c8a528ead9..ed8db4dc65 100644
--- a/p2p/discover/node_test.go
+++ b/p2p/discover/node_test.go
@@ -28,8 +28,8 @@ import (
"testing/quick"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
func ExampleNewNode() {
diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go
index c1267e354a..1bb52399fb 100644
--- a/p2p/discover/ntp.go
+++ b/p2p/discover/ntp.go
@@ -25,7 +25,7 @@ import (
"sort"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index 29ba955e89..6509326e69 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -33,10 +33,10 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
)
const (
diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go
index 923da54c0c..3ce48d2995 100644
--- a/p2p/discover/table_test.go
+++ b/p2p/discover/table_test.go
@@ -28,8 +28,8 @@ import (
"testing/quick"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
func TestTable_pingReplace(t *testing.T) {
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go
index 3430c4f908..524c6e4988 100644
--- a/p2p/discover/udp.go
+++ b/p2p/discover/udp.go
@@ -25,11 +25,11 @@ import (
"net"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/p2p/netutil"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/rlp"
)
const Version = 4
diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go
index 959869b137..db9804f7bc 100644
--- a/p2p/discover/udp_test.go
+++ b/p2p/discover/udp_test.go
@@ -34,9 +34,9 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
func init() {
diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go
index 728c5c7823..3c2d5744c3 100644
--- a/p2p/discv5/database.go
+++ b/p2p/discv5/database.go
@@ -28,9 +28,9 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/errors"
"github.com/syndtr/goleveldb/leveldb/iterator"
diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go
index 0eb73b88bb..52c677b623 100644
--- a/p2p/discv5/net.go
+++ b/p2p/discv5/net.go
@@ -24,13 +24,13 @@ import (
"net"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/netutil"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/rlp"
)
var (
diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go
index 85ca2fd8c6..369282ca9c 100644
--- a/p2p/discv5/net_test.go
+++ b/p2p/discv5/net_test.go
@@ -22,8 +22,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
func TestNetwork_Lookup(t *testing.T) {
diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go
index a02192a766..fd88a55b15 100644
--- a/p2p/discv5/node.go
+++ b/p2p/discv5/node.go
@@ -30,8 +30,8 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
// Node represents a host on the network.
diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go
index ebb28db0de..ce4ad9e4d4 100644
--- a/p2p/discv5/node_test.go
+++ b/p2p/discv5/node_test.go
@@ -27,8 +27,8 @@ import (
"testing/quick"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
func ExampleNewNode() {
diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go
index 9af0de5b56..4fb5f657ae 100644
--- a/p2p/discv5/ntp.go
+++ b/p2p/discv5/ntp.go
@@ -26,7 +26,7 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go
index 3fe08bb933..543faecd48 100644
--- a/p2p/discv5/sim_test.go
+++ b/p2p/discv5/sim_test.go
@@ -28,7 +28,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// In this test, nodes try to randomly resolve each other.
diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go
index f97041160f..2cf05009cb 100644
--- a/p2p/discv5/table.go
+++ b/p2p/discv5/table.go
@@ -29,7 +29,7 @@ import (
"net"
"sort"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
const (
diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go
index 02d75f1373..a29943dab9 100644
--- a/p2p/discv5/table_test.go
+++ b/p2p/discv5/table_test.go
@@ -27,8 +27,8 @@ import (
"testing/quick"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
type nullTransport struct{}
diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go
index 19dedd1169..b3d1ac4baf 100644
--- a/p2p/discv5/ticket.go
+++ b/p2p/discv5/ticket.go
@@ -25,10 +25,10 @@ import (
"sort"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go
index c025123f44..e7a7f8e02a 100644
--- a/p2p/discv5/topic.go
+++ b/p2p/discv5/topic.go
@@ -23,8 +23,8 @@ import (
"math/rand"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go
index 22fb1b6eb6..ba79993f29 100644
--- a/p2p/discv5/topic_test.go
+++ b/p2p/discv5/topic_test.go
@@ -21,8 +21,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
)
func TestTopicRadius(t *testing.T) {
diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go
index 1f4b482bac..6ce72d2c15 100644
--- a/p2p/discv5/udp.go
+++ b/p2p/discv5/udp.go
@@ -24,12 +24,12 @@ import (
"net"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/p2p/netutil"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/rlp"
)
const Version = 4
diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go
index b7ded6d9b3..7d31815947 100644
--- a/p2p/discv5/udp_test.go
+++ b/p2p/discv5/udp_test.go
@@ -27,9 +27,9 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
func init() {
diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go
index b27dcde290..2c3afb43e9 100644
--- a/p2p/enr/enr.go
+++ b/p2p/enr/enr.go
@@ -35,9 +35,9 @@ import (
"io"
"sort"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/rlp"
)
const SizeLimit = 300 // maximum encoded size of a node record in bytes
diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go
index 42f67e55a7..ce7767d105 100644
--- a/p2p/enr/enr_test.go
+++ b/p2p/enr/enr_test.go
@@ -24,8 +24,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go
index b1db1ed23a..7591e6effb 100644
--- a/p2p/enr/entries.go
+++ b/p2p/enr/entries.go
@@ -22,8 +22,8 @@ import (
"io"
"net"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Entry is implemented by known node record entry types.
diff --git a/p2p/message.go b/p2p/message.go
index 5d336f2fb9..50b419970d 100644
--- a/p2p/message.go
+++ b/p2p/message.go
@@ -25,9 +25,9 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Msg defines the structure of a p2p message.
diff --git a/p2p/metrics.go b/p2p/metrics.go
index d249a82886..4cbff90aca 100644
--- a/p2p/metrics.go
+++ b/p2p/metrics.go
@@ -21,7 +21,7 @@ package p2p
import (
"net"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
var (
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
index adec83fd14..a254648c66 100644
--- a/p2p/nat/nat.go
+++ b/p2p/nat/nat.go
@@ -25,7 +25,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
"github.com/jackpal/go-nat-pmp"
)
diff --git a/p2p/peer.go b/p2p/peer.go
index 698fb9deeb..477d8c2190 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -24,11 +24,11 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rlp"
)
const (
diff --git a/p2p/protocol.go b/p2p/protocol.go
index d81aa7bc0a..ee747ba23d 100644
--- a/p2p/protocol.go
+++ b/p2p/protocol.go
@@ -19,7 +19,7 @@ package p2p
import (
"fmt"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
// Protocol represents a P2P subprotocol implementation.
diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go
index f606071198..9914c99587 100644
--- a/p2p/protocols/protocol.go
+++ b/p2p/protocols/protocol.go
@@ -34,7 +34,7 @@ import (
"reflect"
"sync"
- "github.com/eximchain/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p"
)
// error codes used by this protocol scheme
diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go
index 1f6ab939a5..053f537a62 100644
--- a/p2p/protocols/protocol_test.go
+++ b/p2p/protocols/protocol_test.go
@@ -23,10 +23,10 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- p2ptest "github.com/eximchain/go-ethereum/p2p/testing"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ p2ptest "github.com/ethereum/go-ethereum/p2p/testing"
)
// handshake message type
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index 0ebe71f1ea..1889edac99 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -35,12 +35,12 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/crypto/secp256k1"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/crypto/secp256k1"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/golang/snappy"
)
diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go
index f0389f224d..bca4604021 100644
--- a/p2p/rlpx_test.go
+++ b/p2p/rlpx_test.go
@@ -31,11 +31,11 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rlp"
)
func TestSharedSecret(t *testing.T) {
diff --git a/p2p/server.go b/p2p/server.go
index 159a2fa72c..c41d1dc156 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -25,14 +25,14 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/mclock"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/discv5"
- "github.com/eximchain/go-ethereum/p2p/nat"
- "github.com/eximchain/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/mclock"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discv5"
+ "github.com/ethereum/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
)
const (
diff --git a/p2p/server_test.go b/p2p/server_test.go
index 03e4670861..10c36528eb 100644
--- a/p2p/server_test.go
+++ b/p2p/server_test.go
@@ -25,10 +25,10 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
func init() {
diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go
index 213f6af023..8ef5629fb5 100644
--- a/p2p/simulations/adapters/docker.go
+++ b/p2p/simulations/adapters/docker.go
@@ -28,9 +28,9 @@ import (
"strings"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
// DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker
diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go
index c1ae1e0eaf..a566fb27d8 100644
--- a/p2p/simulations/adapters/exec.go
+++ b/p2p/simulations/adapters/exec.go
@@ -36,11 +36,11 @@ import (
"time"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
"golang.org/x/net/websocket"
)
diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go
index 15895eb199..48d7c17301 100644
--- a/p2p/simulations/adapters/inproc.go
+++ b/p2p/simulations/adapters/inproc.go
@@ -23,12 +23,12 @@ import (
"net"
"sync"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
)
// SimAdapter is a NodeAdapter which creates in-memory simulation nodes and
diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go
index 85e162f308..5b4b47fe2f 100644
--- a/p2p/simulations/adapters/types.go
+++ b/p2p/simulations/adapters/types.go
@@ -25,11 +25,11 @@ import (
"os"
"github.com/docker/docker/pkg/reexec"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
)
// Node represents a node in a simulation network which is created by a
diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go
index c087b207f3..6a0ead53a5 100644
--- a/p2p/simulations/examples/ping-pong.go
+++ b/p2p/simulations/examples/ping-pong.go
@@ -25,13 +25,13 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/rpc"
)
var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`)
diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go
index f0e973bd26..97dd742e88 100644
--- a/p2p/simulations/http.go
+++ b/p2p/simulations/http.go
@@ -29,11 +29,11 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/julienschmidt/httprouter"
"golang.org/x/net/websocket"
)
diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go
index 49f86d8b15..677a8fb147 100644
--- a/p2p/simulations/http_test.go
+++ b/p2p/simulations/http_test.go
@@ -27,12 +27,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/rpc"
)
// testService implements the node.Service interface and provides protocols
diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go
index 78af767fda..c38e288552 100644
--- a/p2p/simulations/mocker.go
+++ b/p2p/simulations/mocker.go
@@ -24,8 +24,8 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
//a map of mocker names to its function
diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go
index b0c3142761..de8ec0b337 100644
--- a/p2p/simulations/mocker_test.go
+++ b/p2p/simulations/mocker_test.go
@@ -27,7 +27,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
func TestMocker(t *testing.T) {
diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go
index 760b711e2a..caf428ece1 100644
--- a/p2p/simulations/network.go
+++ b/p2p/simulations/network.go
@@ -24,11 +24,11 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/event"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/event"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
)
var dialBanTimeout = 200 * time.Millisecond
diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go
index 63d4745b62..2a062121be 100644
--- a/p2p/simulations/network_test.go
+++ b/p2p/simulations/network_test.go
@@ -22,8 +22,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
)
// TestNetworkSimulation creates a multi-node simulation network with each node
diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go
index b989edbf3b..28886e924a 100644
--- a/p2p/simulations/simulation.go
+++ b/p2p/simulations/simulation.go
@@ -20,7 +20,7 @@ import (
"context"
"time"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
// Simulation provides a framework for running actions in a simulated network
diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go
index c46b1bc43c..45c6e61425 100644
--- a/p2p/testing/peerpool.go
+++ b/p2p/testing/peerpool.go
@@ -20,8 +20,8 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
)
type TestPeer interface {
diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go
index 8354cdd8b5..361285f06e 100644
--- a/p2p/testing/protocolsession.go
+++ b/p2p/testing/protocolsession.go
@@ -22,10 +22,10 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
)
var errTimedOut = errors.New("timed out")
diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go
index 684f962cdb..a797412d60 100644
--- a/p2p/testing/protocoltester.go
+++ b/p2p/testing/protocoltester.go
@@ -32,14 +32,14 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/simulations"
- "github.com/eximchain/go-ethereum/p2p/simulations/adapters"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/simulations"
+ "github.com/ethereum/go-ethereum/p2p/simulations/adapters"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
)
// ProtocolTester is the tester environment used for unit testing protocol
diff --git a/params/config.go b/params/config.go
index 995b62c28f..dc02c7ca37 100644
--- a/params/config.go
+++ b/params/config.go
@@ -20,7 +20,7 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
var (
diff --git a/params/dao.go b/params/dao.go
index 45ef817631..da3c8dfc99 100644
--- a/params/dao.go
+++ b/params/dao.go
@@ -19,7 +19,7 @@ package params
import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// DAOForkBlockExtra is the block header extra-data field to set for the DAO fork
diff --git a/rpc/client.go b/rpc/client.go
index 8f5f948271..8aa84ec982 100644
--- a/rpc/client.go
+++ b/rpc/client.go
@@ -32,7 +32,7 @@ import (
"sync/atomic"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
var (
diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go
index cae46f50e3..8276a9eadd 100644
--- a/rpc/client_example_test.go
+++ b/rpc/client_example_test.go
@@ -22,7 +22,7 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/rpc"
)
// In this example, our client whishes to track the latest 'block number'
diff --git a/rpc/client_test.go b/rpc/client_test.go
index 1ff9c40f5b..4f354d389e 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -31,7 +31,7 @@ import (
"time"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
func TestClientRequest(t *testing.T) {
diff --git a/rpc/ipc.go b/rpc/ipc.go
index 4236bf42e9..8de18a56fe 100644
--- a/rpc/ipc.go
+++ b/rpc/ipc.go
@@ -21,7 +21,7 @@ import (
"fmt"
"net"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on
diff --git a/rpc/json.go b/rpc/json.go
index 00d4492940..837011f51b 100644
--- a/rpc/json.go
+++ b/rpc/json.go
@@ -26,7 +26,7 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
const (
diff --git a/rpc/server.go b/rpc/server.go
index be75bcfe19..11373b504c 100644
--- a/rpc/server.go
+++ b/rpc/server.go
@@ -25,7 +25,7 @@ import (
"sync"
"sync/atomic"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
"gopkg.in/fatih/set.v0"
)
diff --git a/rpc/types.go b/rpc/types.go
index 07131eac7a..f2375604ed 100644
--- a/rpc/types.go
+++ b/rpc/types.go
@@ -23,7 +23,7 @@ import (
"strings"
"sync"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
"gopkg.in/fatih/set.v0"
)
diff --git a/rpc/types_test.go b/rpc/types_test.go
index 4cc2ee57be..68b6d3c54f 100644
--- a/rpc/types_test.go
+++ b/rpc/types_test.go
@@ -20,7 +20,7 @@ import (
"encoding/json"
"testing"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common/math"
)
func TestBlockNumberJSONUnmarshal(t *testing.T) {
diff --git a/rpc/websocket.go b/rpc/websocket.go
index d131d88692..a6e1cec28a 100644
--- a/rpc/websocket.go
+++ b/rpc/websocket.go
@@ -29,7 +29,7 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
"golang.org/x/net/websocket"
"gopkg.in/fatih/set.v0"
)
diff --git a/swarm/api/api.go b/swarm/api/api.go
index 20c8e9212b..0cf12fdbed 100644
--- a/swarm/api/api.go
+++ b/swarm/api/api.go
@@ -30,10 +30,10 @@ import (
"path/filepath"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
var hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}")
diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go
index d0fe396349..4ee26bd8ad 100644
--- a/swarm/api/api_test.go
+++ b/swarm/api/api_test.go
@@ -24,9 +24,9 @@ import (
"os"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
func testApi(t *testing.T, f func(*Api)) {
diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go
index 07b58e1372..8165d52d7e 100644
--- a/swarm/api/client/client.go
+++ b/swarm/api/client/client.go
@@ -33,7 +33,7 @@ import (
"strconv"
"strings"
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/api"
)
var (
diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go
index 8cfdba2644..c1d144e370 100644
--- a/swarm/api/client/client_test.go
+++ b/swarm/api/client/client_test.go
@@ -25,8 +25,8 @@ import (
"sort"
"testing"
- "github.com/eximchain/go-ethereum/swarm/api"
- "github.com/eximchain/go-ethereum/swarm/testutil"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/testutil"
)
// TestClientUploadDownloadRaw test uploading and downloading raw data to swarm
diff --git a/swarm/api/config.go b/swarm/api/config.go
index f3b2051bb6..6b224140a4 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -22,14 +22,14 @@ import (
"os"
"path/filepath"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/contracts/ens"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/swarm/network"
- "github.com/eximchain/go-ethereum/swarm/services/swap"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/ens"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/swarm/network"
+ "github.com/ethereum/go-ethereum/swarm/services/swap"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
const (
diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go
index efbcc7d9df..5636b6dafb 100644
--- a/swarm/api/config_test.go
+++ b/swarm/api/config_test.go
@@ -20,8 +20,8 @@ import (
"reflect"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
func TestConfig(t *testing.T) {
diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go
index d0c2df3947..f5dc90e2e5 100644
--- a/swarm/api/filesystem.go
+++ b/swarm/api/filesystem.go
@@ -26,9 +26,9 @@ import (
"path/filepath"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
const maxParallelFiles = 5
diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go
index 7fb7a78b28..8a15e735dc 100644
--- a/swarm/api/filesystem_test.go
+++ b/swarm/api/filesystem_test.go
@@ -24,8 +24,8 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test")
diff --git a/swarm/api/http/error.go b/swarm/api/http/error.go
index 4152c3a717..9a65412cf9 100644
--- a/swarm/api/http/error.go
+++ b/swarm/api/http/error.go
@@ -28,9 +28,9 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/swarm/api"
)
//templateMap holds a mapping of an HTTP error code to a template
diff --git a/swarm/api/http/error_test.go b/swarm/api/http/error_test.go
index e112ff5322..dc545722e1 100644
--- a/swarm/api/http/error_test.go
+++ b/swarm/api/http/error_test.go
@@ -25,7 +25,7 @@ import (
"golang.org/x/net/html"
- "github.com/eximchain/go-ethereum/swarm/testutil"
+ "github.com/ethereum/go-ethereum/swarm/testutil"
)
func TestError(t *testing.T) {
diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go
index fe559e1303..0194317716 100644
--- a/swarm/api/http/roundtripper.go
+++ b/swarm/api/http/roundtripper.go
@@ -20,17 +20,17 @@ import (
"fmt"
"net/http"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
/*
http roundtripper to register for bzz url scheme
-see https://github.com/eximchain/go-ethereum/issues/2040
+see https://github.com/ethereum/go-ethereum/issues/2040
Usage:
import (
- "github.com/eximchain/go-ethereum/common/httpclient"
- "github.com/eximchain/go-ethereum/swarm/api/http"
+ "github.com/ethereum/go-ethereum/common/httpclient"
+ "github.com/ethereum/go-ethereum/swarm/api/http"
)
client := httpclient.New()
// for (private) swarm proxy running locally
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index adad17dadd..b8e7436cf0 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -35,11 +35,11 @@ import (
"strings"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/swarm/api"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"github.com/rs/cors"
)
diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go
index 4964e644bd..b2efc0ea15 100644
--- a/swarm/api/http/server_test.go
+++ b/swarm/api/http/server_test.go
@@ -26,11 +26,11 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/swarm/api"
- swarm "github.com/eximchain/go-ethereum/swarm/api/client"
- "github.com/eximchain/go-ethereum/swarm/storage"
- "github.com/eximchain/go-ethereum/swarm/testutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ swarm "github.com/ethereum/go-ethereum/swarm/api/client"
+ "github.com/ethereum/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/swarm/testutil"
)
func TestBzzGetPath(t *testing.T) {
diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go
index 4182a625d6..cd9d212897 100644
--- a/swarm/api/http/templates.go
+++ b/swarm/api/http/templates.go
@@ -20,7 +20,7 @@ import (
"html/template"
"path"
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/api"
)
type htmlListData struct {
diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go
index 1b82d3a766..685a300fca 100644
--- a/swarm/api/manifest.go
+++ b/swarm/api/manifest.go
@@ -27,9 +27,9 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
const (
diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go
index 85b0467825..7098ca16fd 100644
--- a/swarm/api/manifest_test.go
+++ b/swarm/api/manifest_test.go
@@ -25,7 +25,7 @@ import (
"strings"
"testing"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
func manifest(paths ...string) (manifestReader storage.LazySectionReader) {
diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go
index ca424ff26d..6631196c17 100644
--- a/swarm/api/testapi.go
+++ b/swarm/api/testapi.go
@@ -17,7 +17,7 @@
package api
import (
- "github.com/eximchain/go-ethereum/swarm/network"
+ "github.com/ethereum/go-ethereum/swarm/network"
)
type Control struct {
diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile
index 6f37d7108f..365964b7f5 100644
--- a/swarm/dev/Makefile
+++ b/swarm/dev/Makefile
@@ -3,12 +3,12 @@
default: build
build:
- go build -o bin/swarm github.com/eximchain/go-ethereum/cmd/swarm
- go build -o bin/geth github.com/eximchain/go-ethereum/cmd/geth
- go build -o bin/bootnode github.com/eximchain/go-ethereum/cmd/bootnode
+ go build -o bin/swarm github.com/ethereum/go-ethereum/cmd/swarm
+ go build -o bin/geth github.com/ethereum/go-ethereum/cmd/geth
+ go build -o bin/bootnode github.com/ethereum/go-ethereum/cmd/bootnode
cluster: build
scripts/boot-cluster.sh
test:
- go test -v github.com/eximchain/go-ethereum/swarm/...
+ go test -v github.com/ethereum/go-ethereum/swarm/...
diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc
index 3e5734d6e7..efb504fa36 100644
--- a/swarm/dev/bashrc
+++ b/swarm/dev/bashrc
@@ -1,4 +1,4 @@
-export ROOT="${GOPATH}/src/github.com/eximchain/go-ethereum"
+export ROOT="${GOPATH}/src/github.com/ethereum/go-ethereum"
export PATH="${ROOT}/swarm/dev/bin:${PATH}"
cd "${ROOT}/swarm/dev"
diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh
index 59b89cd87e..2ad600dedf 100755
--- a/swarm/dev/run.sh
+++ b/swarm/dev/run.sh
@@ -80,7 +80,7 @@ run_image() {
--rm \
--hostname "${name}" \
--name "${name}" \
- --volume "${ROOT}:/go/src/github.com/eximchain/go-ethereum" \
+ --volume "${ROOT}:/go/src/github.com/ethereum/go-ethereum" \
--volume "/var/run/docker.sock:/var/run/docker.sock" \
${docker_args} \
"${name}" \
diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go
index e4160b9961..c94a0773f5 100644
--- a/swarm/fuse/fuse_file.go
+++ b/swarm/fuse/fuse_file.go
@@ -26,8 +26,8 @@ import (
"bazil.org/fuse"
"bazil.org/fuse/fs"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"golang.org/x/net/context"
)
diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go
index 9649c277cd..2493bdab19 100644
--- a/swarm/fuse/swarmfs.go
+++ b/swarm/fuse/swarmfs.go
@@ -17,7 +17,7 @@
package fuse
import (
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/api"
"sync"
"time"
)
diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go
index b8132e4fba..42af36345f 100644
--- a/swarm/fuse/swarmfs_test.go
+++ b/swarm/fuse/swarmfs_test.go
@@ -27,8 +27,8 @@ import (
"path/filepath"
"testing"
- "github.com/eximchain/go-ethereum/swarm/api"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
type fileInfo struct {
diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go
index b0eb51d4a0..75742845a2 100644
--- a/swarm/fuse/swarmfs_unix.go
+++ b/swarm/fuse/swarmfs_unix.go
@@ -29,9 +29,9 @@ import (
"bazil.org/fuse"
"bazil.org/fuse/fs"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/api"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/api"
)
var (
diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go
index e955f3cbe4..169b674876 100644
--- a/swarm/fuse/swarmfs_util.go
+++ b/swarm/fuse/swarmfs_util.go
@@ -24,7 +24,7 @@ import (
"os/exec"
"runtime"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
func externalUnmount(mountPoint string) error {
diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go
index 30306de9bb..48b231b219 100644
--- a/swarm/metrics/flags.go
+++ b/swarm/metrics/flags.go
@@ -19,10 +19,10 @@ package metrics
import (
"time"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/log"
- gethmetrics "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/metrics/influxdb"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/log"
+ gethmetrics "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics/influxdb"
"gopkg.in/urfave/cli.v1"
)
diff --git a/swarm/network/depo.go b/swarm/network/depo.go
index 816fda0c7f..5ffbf8be11 100644
--- a/swarm/network/depo.go
+++ b/swarm/network/depo.go
@@ -22,9 +22,9 @@ import (
"fmt"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
//metrics variables
diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go
index a079039d8b..88a82a678c 100644
--- a/swarm/network/forwarding.go
+++ b/swarm/network/forwarding.go
@@ -21,8 +21,8 @@ import (
"math/rand"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
const requesterCount = 3
diff --git a/swarm/network/hive.go b/swarm/network/hive.go
index b330d74397..8404ffcc2a 100644
--- a/swarm/network/hive.go
+++ b/swarm/network/hive.go
@@ -22,13 +22,13 @@ import (
"path/filepath"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/netutil"
- "github.com/eximchain/go-ethereum/swarm/network/kademlia"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/netutil"
+ "github.com/ethereum/go-ethereum/swarm/network/kademlia"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
// Hive is the logistic manager of the swarm
diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go
index 9596a7b283..4c38a846f9 100644
--- a/swarm/network/kademlia/address.go
+++ b/swarm/network/kademlia/address.go
@@ -21,7 +21,7 @@ import (
"math/rand"
"strings"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
type Address common.Hash
diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go
index 4e27ef1e27..c062c8eafb 100644
--- a/swarm/network/kademlia/address_test.go
+++ b/swarm/network/kademlia/address_test.go
@@ -21,7 +21,7 @@ import (
"reflect"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func (Address) Generate(rand *rand.Rand, size int) reflect.Value {
diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go
index 7415fab272..b37ced5ba0 100644
--- a/swarm/network/kademlia/kaddb.go
+++ b/swarm/network/kademlia/kaddb.go
@@ -24,7 +24,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
type NodeData interface {
diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go
index 5e87087f0f..b5999b52d4 100644
--- a/swarm/network/kademlia/kademlia.go
+++ b/swarm/network/kademlia/kademlia.go
@@ -23,8 +23,8 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
)
//metrics variables
diff --git a/swarm/network/messages.go b/swarm/network/messages.go
index 1f8f35e87c..d920def959 100644
--- a/swarm/network/messages.go
+++ b/swarm/network/messages.go
@@ -21,11 +21,11 @@ import (
"net"
"time"
- "github.com/eximchain/go-ethereum/contracts/chequebook"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/swarm/network/kademlia"
- "github.com/eximchain/go-ethereum/swarm/services/swap"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/contracts/chequebook"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/swarm/network/kademlia"
+ "github.com/ethereum/go-ethereum/swarm/services/swap"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
/*
diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go
index f15c84f9e5..1cbe00a973 100644
--- a/swarm/network/protocol.go
+++ b/swarm/network/protocol.go
@@ -37,13 +37,13 @@ import (
"strconv"
"time"
- "github.com/eximchain/go-ethereum/contracts/chequebook"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/p2p"
- bzzswap "github.com/eximchain/go-ethereum/swarm/services/swap"
- "github.com/eximchain/go-ethereum/swarm/services/swap/swap"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/contracts/chequebook"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/p2p"
+ bzzswap "github.com/ethereum/go-ethereum/swarm/services/swap"
+ "github.com/ethereum/go-ethereum/swarm/services/swap/swap"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
//metrics variables
diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go
index 1ec50c66e9..88b4b68dd0 100644
--- a/swarm/network/syncdb.go
+++ b/swarm/network/syncdb.go
@@ -20,8 +20,8 @@ import (
"encoding/binary"
"fmt"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/iterator"
)
diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go
index 7727e1af44..be21d156f9 100644
--- a/swarm/network/syncdb_test.go
+++ b/swarm/network/syncdb_test.go
@@ -25,9 +25,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
func init() {
diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go
index 1b56544b0e..6d729fcb9e 100644
--- a/swarm/network/syncer.go
+++ b/swarm/network/syncer.go
@@ -22,8 +22,8 @@ import (
"fmt"
"path/filepath"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
// syncer parameters (global, not peer specific) default values
diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go
index 171e2355ed..1f9b22b904 100644
--- a/swarm/services/swap/swap.go
+++ b/swarm/services/swap/swap.go
@@ -26,14 +26,14 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/contracts/chequebook"
- "github.com/eximchain/go-ethereum/contracts/chequebook/contract"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/swarm/services/swap/swap"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/chequebook"
+ "github.com/ethereum/go-ethereum/contracts/chequebook/contract"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/swarm/services/swap/swap"
)
// SwAP Swarm Accounting Protocol with
diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go
index b0951566f3..a78f1f0e2a 100644
--- a/swarm/services/swap/swap/swap.go
+++ b/swarm/services/swap/swap/swap.go
@@ -22,7 +22,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
// SwAP Swarm Accounting Protocol with
diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go
index 5e9631f667..222e0770f3 100644
--- a/swarm/services/swap/swap/swap_test.go
+++ b/swarm/services/swap/swap/swap_test.go
@@ -21,7 +21,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
type testInPayment struct {
diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go
index bedc540ea4..2b397f8010 100644
--- a/swarm/storage/chunker.go
+++ b/swarm/storage/chunker.go
@@ -24,7 +24,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
/*
diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go
index ba1c570b51..c8bd12299a 100644
--- a/swarm/storage/chunker_test.go
+++ b/swarm/storage/chunker_test.go
@@ -27,7 +27,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
)
/*
diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go
index 49efc62a21..cd4c2ef139 100644
--- a/swarm/storage/common_test.go
+++ b/swarm/storage/common_test.go
@@ -24,7 +24,7 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
type brokenLimitedReader struct {
diff --git a/swarm/storage/database.go b/swarm/storage/database.go
index 668148aee4..2532490cc9 100644
--- a/swarm/storage/database.go
+++ b/swarm/storage/database.go
@@ -22,7 +22,7 @@ package storage
import (
"fmt"
- "github.com/eximchain/go-ethereum/compression/rle"
+ "github.com/ethereum/go-ethereum/compression/rle"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/iterator"
"github.com/syndtr/goleveldb/leveldb/opt"
diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go
index 36856080f7..421bb061d5 100644
--- a/swarm/storage/dbstore.go
+++ b/swarm/storage/dbstore.go
@@ -32,9 +32,9 @@ import (
"io/ioutil"
"sync"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/rlp"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/iterator"
)
diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go
index 1835e6a39b..dd165b5768 100644
--- a/swarm/storage/dbstore_test.go
+++ b/swarm/storage/dbstore_test.go
@@ -21,7 +21,7 @@ import (
"io/ioutil"
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func initDbStore(t *testing.T) *DbStore {
diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go
index b1bdf88be7..44a2669f12 100644
--- a/swarm/storage/dpa.go
+++ b/swarm/storage/dpa.go
@@ -23,7 +23,7 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
/*
diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go
index 8bcebeb5ad..ece0c86155 100644
--- a/swarm/storage/localstore.go
+++ b/swarm/storage/localstore.go
@@ -19,7 +19,7 @@ package storage
import (
"encoding/binary"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/metrics"
)
//metrics variables
diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go
index 83e379b3f9..d6be542203 100644
--- a/swarm/storage/memstore.go
+++ b/swarm/storage/memstore.go
@@ -22,8 +22,8 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
)
//metrics variables
diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go
index 0da4ac55d6..5d4f17deb1 100644
--- a/swarm/storage/netstore.go
+++ b/swarm/storage/netstore.go
@@ -21,7 +21,7 @@ import (
"path/filepath"
"time"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/log"
)
/*
diff --git a/swarm/storage/types.go b/swarm/storage/types.go
index 50d43281f7..d35f1f9294 100644
--- a/swarm/storage/types.go
+++ b/swarm/storage/types.go
@@ -24,9 +24,9 @@ import (
"io"
"sync"
- "github.com/eximchain/go-ethereum/bmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/bmt"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
)
type Hasher func() hash.Hash
diff --git a/swarm/swarm.go b/swarm/swarm.go
index 47022bf60a..0a120db1fa 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -27,24 +27,24 @@ import (
"time"
"unicode"
- "github.com/eximchain/go-ethereum/accounts/abi/bind"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/contracts/chequebook"
- "github.com/eximchain/go-ethereum/contracts/ens"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethclient"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
- "github.com/eximchain/go-ethereum/node"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rpc"
- "github.com/eximchain/go-ethereum/swarm/api"
- httpapi "github.com/eximchain/go-ethereum/swarm/api/http"
- "github.com/eximchain/go-ethereum/swarm/fuse"
- "github.com/eximchain/go-ethereum/swarm/network"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/accounts/abi/bind"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/chequebook"
+ "github.com/ethereum/go-ethereum/contracts/ens"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethclient"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/node"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ httpapi "github.com/ethereum/go-ethereum/swarm/api/http"
+ "github.com/ethereum/go-ethereum/swarm/fuse"
+ "github.com/ethereum/go-ethereum/swarm/network"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
var (
diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go
index bad8f62e0a..8b1ae28884 100644
--- a/swarm/swarm_test.go
+++ b/swarm/swarm_test.go
@@ -19,7 +19,7 @@ package swarm
import (
"testing"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func TestParseEnsAPIAddress(t *testing.T) {
diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go
index d45b21c924..f2922fab00 100644
--- a/swarm/testutil/http.go
+++ b/swarm/testutil/http.go
@@ -22,9 +22,9 @@ import (
"os"
"testing"
- "github.com/eximchain/go-ethereum/swarm/api"
- httpapi "github.com/eximchain/go-ethereum/swarm/api/http"
- "github.com/eximchain/go-ethereum/swarm/storage"
+ "github.com/ethereum/go-ethereum/swarm/api"
+ httpapi "github.com/ethereum/go-ethereum/swarm/api/http"
+ "github.com/ethereum/go-ethereum/swarm/storage"
)
func NewTestSwarmServer(t *testing.T) *TestSwarmServer {
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index f0f7a5d479..beba484833 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -24,17 +24,17 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
// A BlockTest checks handling of entire blocks.
diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index d69b9c147c..6006373009 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -21,8 +21,8 @@ import (
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go
index e860a77fd7..00d699cf75 100644
--- a/tests/difficulty_test_util.go
+++ b/tests/difficulty_test_util.go
@@ -20,11 +20,11 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/consensus/ethash"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/consensus/ethash"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
)
//go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go
diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go
index f8542b0464..5cfd4bd0ae 100644
--- a/tests/gen_btheader.go
+++ b/tests/gen_btheader.go
@@ -6,10 +6,10 @@ import (
"encoding/json"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/types"
)
var _ = (*btHeaderMarshaling)(nil)
diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go
index c2e63d2e1f..88f36ce999 100644
--- a/tests/gen_difficultytest.go
+++ b/tests/gen_difficultytest.go
@@ -6,8 +6,8 @@ import (
"encoding/json"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*difficultyTestMarshaling)(nil)
diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go
index d5fd532f49..1d4baf2fd7 100644
--- a/tests/gen_stenv.go
+++ b/tests/gen_stenv.go
@@ -7,8 +7,8 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*stEnvMarshaling)(nil)
diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go
index a762d50d0e..451ffcbf43 100644
--- a/tests/gen_sttransaction.go
+++ b/tests/gen_sttransaction.go
@@ -6,8 +6,8 @@ import (
"encoding/json"
"math/big"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*stTransactionMarshaling)(nil)
diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go
index e272b2f209..2948842d97 100644
--- a/tests/gen_tttransaction.go
+++ b/tests/gen_tttransaction.go
@@ -7,9 +7,9 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*ttTransactionMarshaling)(nil)
diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go
index 9a14f26347..a5f01cf456 100644
--- a/tests/gen_vmexec.go
+++ b/tests/gen_vmexec.go
@@ -7,9 +7,9 @@ import (
"errors"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
)
var _ = (*vmExecMarshaling)(nil)
diff --git a/tests/init.go b/tests/init.go
index a524883489..ff8ee7da18 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -20,7 +20,7 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
// This table defines supported forks and their chain config.
diff --git a/tests/init_test.go b/tests/init_test.go
index c181cff232..fbb214b08c 100644
--- a/tests/init_test.go
+++ b/tests/init_test.go
@@ -29,7 +29,7 @@ import (
"strings"
"testing"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
var (
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go
index 87ca5b59e2..58ef8a6428 100644
--- a/tests/rlp_test_util.go
+++ b/tests/rlp_test_util.go
@@ -24,7 +24,7 @@ import (
"math/big"
"strings"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rlp"
)
// RLPTest is the JSON structure of a single RLP test.
diff --git a/tests/state_test.go b/tests/state_test.go
index db33fdeee5..9ca5f18303 100644
--- a/tests/state_test.go
+++ b/tests/state_test.go
@@ -22,7 +22,7 @@ import (
"reflect"
"testing"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/vm"
)
func TestState(t *testing.T) {
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index bdbf55aa24..3b761bd771 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -23,18 +23,18 @@ import (
"math/big"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
// StateTest checks transaction processing without block context.
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index 857d39f2d5..c743996c2a 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -20,7 +20,7 @@ import (
"math/big"
"testing"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/params"
)
func TestTransaction(t *testing.T) {
diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go
index deed0d2786..2028d2a278 100644
--- a/tests/transaction_test_util.go
+++ b/tests/transaction_test_util.go
@@ -22,12 +22,12 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core/types"
- "github.com/eximchain/go-ethereum/params"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core/types"
+ "github.com/ethereum/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/rlp"
)
// TransactionTest checks RLP decoding and sender derivation of transactions.
diff --git a/tests/vm_test.go b/tests/vm_test.go
index ca2883f82e..c9f5e225e9 100644
--- a/tests/vm_test.go
+++ b/tests/vm_test.go
@@ -19,7 +19,7 @@ package tests
import (
"testing"
- "github.com/eximchain/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/core/vm"
)
func TestVM(t *testing.T) {
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 3f0cfe8969..b365167a69 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -22,15 +22,15 @@ import (
"fmt"
"math/big"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/core"
- "github.com/eximchain/go-ethereum/core/state"
- "github.com/eximchain/go-ethereum/core/vm"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/params"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/state"
+ "github.com/ethereum/go-ethereum/core/vm"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/params"
)
// VMTest checks EVM execution without block or transaction context.
diff --git a/trie/database.go b/trie/database.go
index 5e38ba2775..da36e72f98 100644
--- a/trie/database.go
+++ b/trie/database.go
@@ -20,9 +20,9 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
)
// secureKeyPrefix is the database key prefix used to store trie node preimages.
diff --git a/trie/errors.go b/trie/errors.go
index 8e26b48881..567b80078c 100644
--- a/trie/errors.go
+++ b/trie/errors.go
@@ -19,7 +19,7 @@ package trie
import (
"fmt"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete)
diff --git a/trie/hasher.go b/trie/hasher.go
index 58f6e43f81..2fc44787ac 100644
--- a/trie/hasher.go
+++ b/trie/hasher.go
@@ -21,9 +21,9 @@ import (
"hash"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto/sha3"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto/sha3"
+ "github.com/ethereum/go-ethereum/rlp"
)
type hasher struct {
diff --git a/trie/iterator.go b/trie/iterator.go
index 6b5f9a9fc3..76146c0d64 100644
--- a/trie/iterator.go
+++ b/trie/iterator.go
@@ -21,7 +21,7 @@ import (
"container/heap"
"errors"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
// Iterator is a key-value trie iterator that traverses a Trie.
diff --git a/trie/iterator_test.go b/trie/iterator_test.go
index 1e475cd532..dce1c78b5d 100644
--- a/trie/iterator_test.go
+++ b/trie/iterator_test.go
@@ -22,8 +22,8 @@ import (
"math/rand"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
)
func TestIterator(t *testing.T) {
diff --git a/trie/node.go b/trie/node.go
index f176ba716c..a7697fc0c6 100644
--- a/trie/node.go
+++ b/trie/node.go
@@ -21,8 +21,8 @@ import (
"io"
"strings"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/rlp"
)
var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"}
diff --git a/trie/proof.go b/trie/proof.go
index 819a4e2478..508e4a6cf4 100644
--- a/trie/proof.go
+++ b/trie/proof.go
@@ -20,11 +20,11 @@ import (
"bytes"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Prove constructs a merkle proof for key. The result contains all encoded nodes
diff --git a/trie/proof_test.go b/trie/proof_test.go
index 028502ff2e..fff313d7fd 100644
--- a/trie/proof_test.go
+++ b/trie/proof_test.go
@@ -23,9 +23,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
)
func init() {
diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index a0c9871534..3881ee18a0 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -19,8 +19,8 @@ package trie
import (
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
)
// SecureTrie wraps a trie with key hashing. In a secure trie, all
diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go
index e8ca834545..aedf5a1cde 100644
--- a/trie/secure_trie_test.go
+++ b/trie/secure_trie_test.go
@@ -22,9 +22,9 @@ import (
"sync"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
)
func newEmptySecure() *SecureTrie {
diff --git a/trie/sync.go b/trie/sync.go
index c62c089a23..b573a9f732 100644
--- a/trie/sync.go
+++ b/trie/sync.go
@@ -20,8 +20,8 @@ import (
"errors"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
"gopkg.in/karalabe/cookiejar.v2/collections/prque"
)
diff --git a/trie/sync_test.go b/trie/sync_test.go
index a4a5cfdd32..4a720612b6 100644
--- a/trie/sync_test.go
+++ b/trie/sync_test.go
@@ -20,8 +20,8 @@ import (
"bytes"
"testing"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
)
// makeTestTrie create a sample test trie to test node-wise reconstruction.
diff --git a/trie/trie.go b/trie/trie.go
index b6725c75da..31a404e3a0 100644
--- a/trie/trie.go
+++ b/trie/trie.go
@@ -21,10 +21,10 @@ import (
"bytes"
"fmt"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/metrics"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/metrics"
)
var (
diff --git a/trie/trie_test.go b/trie/trie_test.go
index 9a953e8489..9972226288 100644
--- a/trie/trie_test.go
+++ b/trie/trie_test.go
@@ -30,10 +30,10 @@ import (
"testing/quick"
"github.com/davecgh/go-spew/spew"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/ethdb"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/ethdb"
+ "github.com/ethereum/go-ethereum/rlp"
)
func init() {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 4fdfa592fb..bf55bc437f 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -766,5 +766,5 @@
"revisionTime": "2017-08-11T01:42:03Z"
}
],
- "rootPath": "github.com/eximchain/go-ethereum"
+ "rootPath": "github.com/ethereum/go-ethereum"
}
diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go
index 4851024fe4..57e6505ad1 100644
--- a/whisper/mailserver/mailserver.go
+++ b/whisper/mailserver/mailserver.go
@@ -20,12 +20,12 @@ import (
"encoding/binary"
"fmt"
- "github.com/eximchain/go-ethereum/cmd/utils"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/rlp"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv6"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/rlp"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
"github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/util"
)
diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go
index c4373fb899..d5b993afb9 100644
--- a/whisper/mailserver/server_test.go
+++ b/whisper/mailserver/server_test.go
@@ -25,9 +25,9 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv6"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
)
const powRequirement = 0.00001
diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go
index 9733098a95..61b4775d95 100644
--- a/whisper/shhclient/client.go
+++ b/whisper/shhclient/client.go
@@ -19,10 +19,10 @@ package shhclient
import (
"context"
- "github.com/eximchain/go-ethereum"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/rpc"
- whisper "github.com/eximchain/go-ethereum/whisper/whisperv5"
+ "github.com/ethereum/go-ethereum"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/rpc"
+ whisper "github.com/ethereum/go-ethereum/whisper/whisperv5"
)
// Client defines typed wrappers for the Whisper v5 RPC API.
diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go
index c59b3fadbe..ee566625c9 100644
--- a/whisper/whisperv5/api.go
+++ b/whisper/whisperv5/api.go
@@ -24,12 +24,12 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
)
const (
diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go
index 4c58d3fa68..dcfbcb56d8 100644
--- a/whisper/whisperv5/benchmarks_test.go
+++ b/whisper/whisperv5/benchmarks_test.go
@@ -19,7 +19,7 @@ package whisperv5
import (
"testing"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto"
)
func BenchmarkDeriveKeyMaterial(b *testing.B) {
diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go
index 618cbe91fa..169cbba9dd 100644
--- a/whisper/whisperv5/envelope.go
+++ b/whisper/whisperv5/envelope.go
@@ -26,11 +26,11 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Envelope represents a clear-text data packet to transmit through the Whisper
diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go
index fd1daac674..3190334ebb 100644
--- a/whisper/whisperv5/filter.go
+++ b/whisper/whisperv5/filter.go
@@ -21,9 +21,9 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
)
type Filter struct {
diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go
index bd73d8c419..01034a3513 100644
--- a/whisper/whisperv5/filter_test.go
+++ b/whisper/whisperv5/filter_test.go
@@ -22,8 +22,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
var seed int64
diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go
index bb9b684286..1c0e389ad9 100644
--- a/whisper/whisperv5/gen_criteria_json.go
+++ b/whisper/whisperv5/gen_criteria_json.go
@@ -5,7 +5,7 @@ package whisperv5
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*criteriaOverride)(nil)
diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go
index af3f04f4e0..b4c4274d07 100644
--- a/whisper/whisperv5/gen_message_json.go
+++ b/whisper/whisperv5/gen_message_json.go
@@ -5,7 +5,7 @@ package whisperv5
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*messageOverride)(nil)
diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go
index 4ef7ad96b5..97ffb64ad3 100644
--- a/whisper/whisperv5/gen_newmessage_json.go
+++ b/whisper/whisperv5/gen_newmessage_json.go
@@ -5,7 +5,7 @@ package whisperv5
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*newMessageOverride)(nil)
diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go
index 94462cfc24..c27535cd1a 100644
--- a/whisper/whisperv5/message.go
+++ b/whisper/whisperv5/message.go
@@ -27,10 +27,10 @@ import (
"errors"
"strconv"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/log"
)
// Options specifies the exact way a message should be wrapped into an Envelope.
diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go
index 276c9765dd..2edf945df0 100644
--- a/whisper/whisperv5/message_test.go
+++ b/whisper/whisperv5/message_test.go
@@ -21,8 +21,8 @@ import (
mrand "math/rand"
"testing"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
func generateMessageParams() (*MessageParams, error) {
diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go
index 5c0784c076..179c931795 100644
--- a/whisper/whisperv5/peer.go
+++ b/whisper/whisperv5/peer.go
@@ -20,10 +20,10 @@ import (
"fmt"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
set "gopkg.in/fatih/set.v0"
)
diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go
index 8c911dae7b..bae2adb6f5 100644
--- a/whisper/whisperv5/peer_test.go
+++ b/whisper/whisperv5/peer_test.go
@@ -25,11 +25,11 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/nat"
)
var keys []string = []string{
diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go
index 2373317055..c4ea67eefa 100644
--- a/whisper/whisperv5/topic.go
+++ b/whisper/whisperv5/topic.go
@@ -19,8 +19,8 @@
package whisperv5
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
// Topic represents a cryptographically secure, probabilistic partial
diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go
index b831fdcc15..85849ccce4 100644
--- a/whisper/whisperv5/whisper.go
+++ b/whisper/whisperv5/whisper.go
@@ -26,11 +26,11 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/syndtr/goleveldb/leveldb/errors"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/sync/syncmap"
diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go
index e6a7e68fd0..8af085292a 100644
--- a/whisper/whisperv5/whisper_test.go
+++ b/whisper/whisperv5/whisper_test.go
@@ -23,7 +23,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
)
func TestWhisperBasic(t *testing.T) {
diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go
index 56a6d94bf6..96e2b17e7c 100644
--- a/whisper/whisperv6/api.go
+++ b/whisper/whisperv6/api.go
@@ -24,12 +24,12 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/rpc"
)
const (
diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go
index a36acf2a6d..0473179da5 100644
--- a/whisper/whisperv6/benchmarks_test.go
+++ b/whisper/whisperv6/benchmarks_test.go
@@ -20,7 +20,7 @@ import (
"crypto/sha256"
"testing"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto"
"golang.org/x/crypto/pbkdf2"
)
diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go
index f97746b2ff..c42d1fa8ac 100644
--- a/whisper/whisperv6/envelope.go
+++ b/whisper/whisperv6/envelope.go
@@ -26,11 +26,11 @@ import (
"math/big"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/math"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/math"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/rlp"
)
// Envelope represents a clear-text data packet to transmit through the Whisper
diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go
index 6f63c9d3ce..410b250a3f 100644
--- a/whisper/whisperv6/envelope_test.go
+++ b/whisper/whisperv6/envelope_test.go
@@ -22,7 +22,7 @@ import (
mrand "math/rand"
"testing"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto"
)
func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) {
diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go
index 277e2b598e..2f170ddebe 100644
--- a/whisper/whisperv6/filter.go
+++ b/whisper/whisperv6/filter.go
@@ -21,9 +21,9 @@ import (
"fmt"
"sync"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
)
// Filter represents a Whisper message filter
diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go
index fec70dbbc3..0bb7986c39 100644
--- a/whisper/whisperv6/filter_test.go
+++ b/whisper/whisperv6/filter_test.go
@@ -22,8 +22,8 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
)
var seed int64
diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go
index e6a7046507..1a428d6df7 100644
--- a/whisper/whisperv6/gen_criteria_json.go
+++ b/whisper/whisperv6/gen_criteria_json.go
@@ -5,7 +5,7 @@ package whisperv6
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*criteriaOverride)(nil)
diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go
index cf25f26967..6218f5df6e 100644
--- a/whisper/whisperv6/gen_message_json.go
+++ b/whisper/whisperv6/gen_message_json.go
@@ -5,7 +5,7 @@ package whisperv6
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*messageOverride)(nil)
diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go
index 281a98d632..75a1279ae3 100644
--- a/whisper/whisperv6/gen_newmessage_json.go
+++ b/whisper/whisperv6/gen_newmessage_json.go
@@ -5,7 +5,7 @@ package whisperv6
import (
"encoding/json"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
var _ = (*newMessageOverride)(nil)
diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go
index 0df7e16b20..b8318cbe8f 100644
--- a/whisper/whisperv6/message.go
+++ b/whisper/whisperv6/message.go
@@ -28,10 +28,10 @@ import (
mrand "math/rand"
"strconv"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/crypto/ecies"
- "github.com/eximchain/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/crypto/ecies"
+ "github.com/ethereum/go-ethereum/log"
)
// MessageParams specifies the exact way a message should be wrapped
diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go
index ea67e9717f..0a5c1c8533 100644
--- a/whisper/whisperv6/message_test.go
+++ b/whisper/whisperv6/message_test.go
@@ -23,9 +23,9 @@ import (
mrand "math/rand"
"testing"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/rlp"
)
func generateMessageParams() (*MessageParams, error) {
diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go
index 22fa35d648..2bf1c905b2 100644
--- a/whisper/whisperv6/peer.go
+++ b/whisper/whisperv6/peer.go
@@ -22,10 +22,10 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
set "gopkg.in/fatih/set.v0"
)
diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go
index c798ddc029..ec985ae65b 100644
--- a/whisper/whisperv6/peer_test.go
+++ b/whisper/whisperv6/peer_test.go
@@ -27,12 +27,12 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/p2p/discover"
- "github.com/eximchain/go-ethereum/p2p/nat"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/p2p/discover"
+ "github.com/ethereum/go-ethereum/p2p/nat"
)
var keys = []string{
diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go
index 4436d08ea3..4dd8f283c3 100644
--- a/whisper/whisperv6/topic.go
+++ b/whisper/whisperv6/topic.go
@@ -19,8 +19,8 @@
package whisperv6
import (
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/common/hexutil"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
)
// TopicType represents a cryptographically secure, probabilistic partial
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index 558de52812..880cced098 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -26,12 +26,12 @@ import (
"sync"
"time"
- "github.com/eximchain/go-ethereum/common"
- "github.com/eximchain/go-ethereum/crypto"
- "github.com/eximchain/go-ethereum/log"
- "github.com/eximchain/go-ethereum/p2p"
- "github.com/eximchain/go-ethereum/rlp"
- "github.com/eximchain/go-ethereum/rpc"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/crypto"
+ "github.com/ethereum/go-ethereum/log"
+ "github.com/ethereum/go-ethereum/p2p"
+ "github.com/ethereum/go-ethereum/rlp"
+ "github.com/ethereum/go-ethereum/rpc"
"github.com/syndtr/goleveldb/leveldb/errors"
"golang.org/x/crypto/pbkdf2"
"golang.org/x/sync/syncmap"
diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go
index 5d1e12fc5e..7fe256309e 100644
--- a/whisper/whisperv6/whisper_test.go
+++ b/whisper/whisperv6/whisper_test.go
@@ -24,7 +24,7 @@ import (
"testing"
"time"
- "github.com/eximchain/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common"
"golang.org/x/crypto/pbkdf2"
)