diff --git a/.travis.yml b/.travis.yml index 87725251b9..e54029b9da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/ubiq/go-ubiq sudo: false matrix: include: diff --git a/README.md b/README.md index f0ed7e7663..29e2e240e3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Official golang implementation of the Ethereum protocol. [![API Reference]( https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 -)](https://godoc.org/github.com/ethereum/go-ethereum) +)](https://godoc.org/github.com/ubiq/go-ubiq) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/go-ethereum?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) Automated builds are available for stable releases and the unstable master branch. @@ -13,7 +13,7 @@ Binary archives are published at https://geth.ethereum.org/downloads/. ## Building the source For prerequisites and detailed build instructions please read the -[Installation Instructions](https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum) +[Installation Instructions](https://github.com/ubiq/go-ubiq/wiki/Building-Ethereum) on the wiki. Building geth requires both a Go and a C compiler. @@ -32,8 +32,8 @@ The go-ethereum project comes with several wrappers/executables found in the `cm | Command | Description | |:----------:|-------------| -| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options) for command line options | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | +| **`geth`** | Our main Ethereum CLI client. It is the entry point into the Ethereum network (main-, test- or private net), capable of running as a full node (default) archive node (retaining all historical state) or a light node (retrieving data live). It can be used by other processes as a gateway into the Ethereum network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI Wiki page](https://github.com/ubiq/go-ubiq/wiki/Command-Line-Options) for command line options | +| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://github.com/ethereum/wiki/wiki/Ethereum-Contract-ABI) with expanded functionality if the contract bytecode is also available. However it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://github.com/ubiq/go-ubiq/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts) wiki page for details. | | `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. | | `disasm` | Bytecode disassembler to convert EVM (Ethereum Virtual Machine) bytecode into more user friendly assembly-like opcodes (e.g. `echo "6001" | disasm`). For details on the individual opcodes, please see pages 22-30 of the [Ethereum Yellow Paper](http://gavwood.com/paper.pdf). | | `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow insolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | @@ -46,7 +46,7 @@ The go-ethereum project comes with several wrappers/executables found in the `cm ## Running geth Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://github.com/ethereum/go-ethereum/wiki/Command-Line-Options)), but we've +[CLI Wiki page](https://github.com/ubiq/go-ubiq/wiki/Command-Line-Options)), but we've enumerated a few common parameter combos to get you up to speed quickly on how you can run your own Geth instance. @@ -68,9 +68,9 @@ This command will: * Bump the memory allowance of the database to 512MB (`--cache=512`), which can help significantly in sync times especially for HDD users. This flag is optional and you can set it as high or as low as you'd like, though we'd recommend the 512MB - 2GB range. - * Start up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), + * Start up Geth's built-in interactive [JavaScript console](https://github.com/ubiq/go-ubiq/wiki/JavaScript-Console), (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as Geth's own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). + as well as Geth's own [management APIs](https://github.com/ubiq/go-ubiq/wiki/Management-APIs). This too is optional and if you leave it out you can always attach to an already running Geth instance with `geth --attach`. @@ -119,7 +119,7 @@ This will start geth in fast sync mode with a DB memory allowance of 512MB just As a developer, sooner rather than later you'll want to start interacting with Geth and the Ethereum network via your own programs and not manually through the console. To aid this, Geth has built in support for a JSON-RPC based APIs ([standard APIs](https://github.com/ethereum/wiki/wiki/JSON-RPC) and -[Geth specific APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs)). These can be +[Geth specific APIs](https://github.com/ubiq/go-ubiq/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (unix sockets on unix based platroms, and named pipes on Windows). The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP @@ -266,7 +266,7 @@ Please make sure your contributions adhere to our coding guidelines: * Commit messages should be prefixed with the package(s) they modify. * E.g. "eth, rpc: make trace configs optional" -Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +Please see the [Developers' Guide](https://github.com/ubiq/go-ubiq/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 2efac1307d..9cc4374916 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -24,7 +24,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // The ABI holds information about a contract's context and available diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 85e25f9ea8..1f9beb0ab6 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) // formatSilceOutput add padding to the value and adds a size diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index a20852fca0..8cef0ee7be 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 4509e222d5..91e005f0a3 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -20,9 +20,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" "golang.org/x/net/context" ) diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 00a8cd3e92..1c627ccd21 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -22,16 +22,16 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" "golang.org/x/net/context" ) diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 7df02e83f3..de10dadc4d 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" "golang.org/x/net/context" ) diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 84cf22e3c3..2516d9685e 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/ubiq/go-ubiq/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -28,7 +28,7 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ubiq/go-ubiq/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 6ebc8ea0a3..b76ffcaecf 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 64dd598c0b..ed0dd0c061 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/ubiq/go-ubiq/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index bbb6d6a75b..0e74c62f2c 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index d3ed02575a..97ea7fc0ad 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "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/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/accounts/abi/bind/backends" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" "golang.org/x/net/context" ) diff --git a/accounts/abi/event.go b/accounts/abi/event.go index e74c7c732c..71b2deddac 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index b5054a0329..b87127a466 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func TestEventId(t *testing.T) { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index d56f3bc3dd..dc6017e637 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" ) // Callable method given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 3d58422925..3814d774b1 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,7 +20,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var ( diff --git a/accounts/abi/packing.go b/accounts/abi/packing.go index 0c37edf174..f4c9c1e14d 100644 --- a/accounts/abi/packing.go +++ b/accounts/abi/packing.go @@ -19,7 +19,7 @@ package abi import ( "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/account_manager.go b/accounts/account_manager.go index abe442388e..e6dee17ca1 100644 --- a/accounts/account_manager.go +++ b/accounts/account_manager.go @@ -32,8 +32,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 2e5f2b44a4..5ae3aa55c7 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var testSigData = make([]byte, 32) diff --git a/accounts/addrcache.go b/accounts/addrcache.go index 0a904f7883..3430a20657 100644 --- a/accounts/addrcache.go +++ b/accounts/addrcache.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/addrcache_test.go b/accounts/addrcache_test.go index e5f08cffc4..8f3c2705d1 100644 --- a/accounts/addrcache_test.go +++ b/accounts/addrcache_test.go @@ -28,7 +28,7 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var ( diff --git a/accounts/key.go b/accounts/key.go index dbcb49dcff..79f20c8b88 100644 --- a/accounts/key.go +++ b/accounts/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/secp256k1" "github.com/pborman/uuid" ) diff --git a/accounts/key_store_passphrase.go b/accounts/key_store_passphrase.go index 4a777956d6..1f31b592de 100644 --- a/accounts/key_store_passphrase.go +++ b/accounts/key_store_passphrase.go @@ -35,9 +35,9 @@ import ( "io/ioutil" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/randentropy" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/key_store_passphrase_test.go b/accounts/key_store_passphrase_test.go index 217393fa5e..367e26375e 100644 --- a/accounts/key_store_passphrase_test.go +++ b/accounts/key_store_passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const ( diff --git a/accounts/key_store_plain.go b/accounts/key_store_plain.go index 2cbaa94df5..12324c0246 100644 --- a/accounts/key_store_plain.go +++ b/accounts/key_store_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type keyStorePlain struct { diff --git a/accounts/key_store_test.go b/accounts/key_store_test.go index d0713caa05..dbd3480f70 100644 --- a/accounts/key_store_test.go +++ b/accounts/key_store_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func tmpKeyStore(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/presale.go b/accounts/presale.go index bb82821b9d..211a241564 100644 --- a/accounts/presale.go +++ b/accounts/presale.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/watch.go b/accounts/watch.go index 309e4d458c..c1812b147d 100644 --- a/accounts/watch.go +++ b/accounts/watch.go @@ -21,8 +21,8 @@ package accounts import ( "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "github.com/rjeczalik/notify" ) diff --git a/build/ci.go b/build/ci.go index 0e1ed37cab..2c125e132c 100644 --- a/build/ci.go +++ b/build/ci.go @@ -56,7 +56,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/ubiq/go-ubiq/internal/build" ) var ( @@ -664,7 +664,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ubiq/go-ubiq/mobile")) meta := newMavenMetadata(env) build.Render("build/mvn.pom", meta.Package+".pom", 0755, meta) @@ -782,7 +782,7 @@ func doXCodeFramework(cmdline []string) { if err := os.Mkdir(archive, os.ModePerm); err != nil { log.Fatal(err) } - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "--prefix", "GE", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "--prefix", "GE", "-v", "github.com/ubiq/go-ubiq/mobile") bind.Dir, _ = filepath.Abs(archive) build.MustRun(bind) build.MustRunCommand("tar", "-zcvf", archive+".tar.gz", archive) diff --git a/build/deb.control b/build/deb.control index d39393d290..820eff00a3 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.7 Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: git://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: git://github.com/ubiq/go-ubiq.git +Vcs-Browser: https://github.com/ubiq/go-ubiq Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..77895f67e0 100644 --- a/build/mvn.pom +++ b/build/mvn.pom @@ -11,7 +11,7 @@ Android Ethereum Client Android port of the go-ethereum libraries and node - https://github.com/ethereum/go-ethereum + https://github.com/ubiq/go-ubiq 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/ubiq/go-ubiq/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/ubiq/go-ubiq diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index f9ad8e95e1..4cf631354f 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/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/ubiq/go-ubiq/issues" +!define UPDATEURL "https://github.com/ubiq/go-ubiq/releases" +!define ABOUTURL "https://github.com/ubiq/go-ubiq#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index c43af3e824..e5727fc976 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = '{{.Name}}' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/ethereum/go-ethereum' + spec.homepage = 'https://github.com/ubiq/go-ubiq' spec.authors = { {{range .Contributors}} '{{.Name}}' => '{{.Email}}',{{end}} } spec.summary = 'iOS Ethereum Client' - spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' } + spec.source = { :git => 'https://github.com/ubiq/go-ubiq.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 dfbd025dad..5946e164a9 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common/compiler" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index abecac3d8c..84d76aceb3 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -23,12 +23,12 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/nat" ) func main() { diff --git a/cmd/bzzd/main.go b/cmd/bzzd/main.go index b2f14a4a95..3517272f7a 100644 --- a/cmd/bzzd/main.go +++ b/cmd/bzzd/main.go @@ -24,20 +24,20 @@ import ( "runtime" "strconv" - "github.com/ethereum/go-ethereum/accounts" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/console" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethclient" + "github.com/ubiq/go-ubiq/internal/debug" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/swarm" + bzzapi "github.com/ubiq/go-ubiq/swarm/api" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/bzzhash/main.go b/cmd/bzzhash/main.go index 0ae99acc07..8ebe059470 100644 --- a/cmd/bzzhash/main.go +++ b/cmd/bzzhash/main.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/swarm/storage" ) func main() { diff --git a/cmd/disasm/main.go b/cmd/disasm/main.go index ba1295ba1f..4e6d860d90 100644 --- a/cmd/disasm/main.go +++ b/cmd/disasm/main.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" ) func main() { diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 7ce663dc03..f082623608 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -25,9 +25,9 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/tests" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 2c4329fa50..085831d4dd 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -25,16 +25,16 @@ import ( "runtime" "time" - "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/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/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 237af99eb5..0f18acf17f 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/console" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index b6abde6d89..d4131b3779 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -172,7 +172,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/ethereum/go-ethereum/issues/1785 +// https://github.com/ubiq/go-ubiq/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 19e723bfa2..73bcea0a5b 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/console" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index b1c435e00f..5423974dc3 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -21,10 +21,10 @@ import ( "os/signal" "strings" - "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" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/console" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/rpc" "gopkg.in/urfave/cli.v1" ) @@ -38,7 +38,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/ethereum/go-ethereum/wiki/Javascipt-Console +See https://github.com/ubiq/go-ubiq/wiki/Javascipt-Console `, } attachCommand = cli.Command{ @@ -50,7 +50,7 @@ See https://github.com/ethereum/go-ethereum/wiki/Javascipt-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/ethereum/go-ethereum/wiki/Javascipt-Console. +See https://github.com/ubiq/go-ubiq/wiki/Javascipt-Console. This command allows to open a console on a running geth node. `, } @@ -62,7 +62,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/ethereum/go-ethereum/wiki/Javascipt-Console +JavaScript API. See https://github.com/ubiq/go-ubiq/wiki/Javascipt-Console `, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 3f09c0414e..0d72d54f37 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/rpc" ) // Tests that a node embedded within a console can be started up properly and diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index f90bb182df..4c9d6e4f90 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/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 0eab77f7eb..e6f8a30061 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -29,18 +29,18 @@ import ( "time" "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/contracts/release" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/console" + "github.com/ubiq/go-ubiq/contracts/release" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/internal/debug" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index 03a1244945..81515a3c56 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,9 +25,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index e4abf6b30c..6e006e64cd 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -21,8 +21,8 @@ package main import ( "io" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/ubiq/go-ubiq/cmd/utils" + "github.com/ubiq/go-ubiq/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/gethrpctest/main.go b/cmd/gethrpctest/main.go index 850bf8eb22..9fbaa7eb2e 100644 --- a/cmd/gethrpctest/main.go +++ b/cmd/gethrpctest/main.go @@ -23,14 +23,14 @@ import ( "os" "os/signal" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv2" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/tests" + whisper "github.com/ubiq/go-ubiq/whisper/whisperv2" ) const defaultTestKey = "b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 10eea1fde0..61790ba6ad 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 584afc8043..8c4a9ec4ec 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -25,14 +25,14 @@ import ( "regexp" "runtime" - "github.com/ethereum/go-ethereum/common" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/internal/debug" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index dd18fd78ca..b1fdf3acf4 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -29,27 +29,27 @@ import ( "strings" "github.com/ethereum/ethash" - "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/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" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "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" - "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv2" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/les" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rpc" + whisper "github.com/ubiq/go-ubiq/whisper/whisperv2" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/version.go b/cmd/utils/version.go index 05dd257fc3..3d4f3dc3e1 100644 --- a/cmd/utils/version.go +++ b/cmd/utils/version.go @@ -21,10 +21,10 @@ import ( "fmt" "runtime" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/common/README.md b/common/README.md index adea022b7f..3f751711c6 100644 --- a/common/README.md +++ b/common/README.md @@ -8,7 +8,7 @@ The common package contains the ethereum utility library. # Installation As a subdirectory the main go-ethereum repository, you get it with -`go get github.com/ethereum/go-ethereum`. +`go get github.com/ubiq/go-ubiq`. # Usage diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index b682107d9c..4be441aa3a 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -29,8 +29,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go index e4d96bd018..d4a8c3cf5a 100644 --- a/common/compiler/solidity_test.go +++ b/common/compiler/solidity_test.go @@ -23,7 +23,7 @@ import ( "path" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const ( diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..599346c8e9 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/ethereum/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/ubiq/go-ubiq/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/httpclient/httpclient.go b/common/httpclient/httpclient.go index a0a1efd388..4077d7e542 100644 --- a/common/httpclient/httpclient.go +++ b/common/httpclient/httpclient.go @@ -22,8 +22,8 @@ import ( "net/http" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) type HTTPClient struct { diff --git a/common/httpclient/httpclient_test.go b/common/httpclient/httpclient_test.go index 670893f8a0..0d158f8ce3 100644 --- a/common/httpclient/httpclient_test.go +++ b/common/httpclient/httpclient_test.go @@ -23,8 +23,8 @@ import ( "path" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func TestGetAuthContent(t *testing.T) { diff --git a/common/math/dist.go b/common/math/dist.go index 913fbfbd47..4b3495d66e 100644 --- a/common/math/dist.go +++ b/common/math/dist.go @@ -20,7 +20,7 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type Summer interface { diff --git a/common/math/exp.go b/common/math/exp.go index 6f6c040e07..b8dcd77df7 100644 --- a/common/math/exp.go +++ b/common/math/exp.go @@ -19,7 +19,7 @@ package math import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // wordSize is the size number of bits in a big.Int Word. diff --git a/common/number/int.go b/common/number/int.go index 6dab2436de..838673b721 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/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 3ab9e4c344..5b736508b0 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func TestSet(t *testing.T) { diff --git a/common/registrar/ethreg/api.go b/common/registrar/ethreg/api.go index a32653554e..0bd3970ec9 100644 --- a/common/registrar/ethreg/api.go +++ b/common/registrar/ethreg/api.go @@ -20,19 +20,19 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/common/registrar" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/compiler" + "github.com/ubiq/go-ubiq/common/registrar" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) // registryAPIBackend is a backend for an Ethereum Registry. diff --git a/common/registrar/registrar.go b/common/registrar/registrar.go index 0606f6985f..e516b0b452 100644 --- a/common/registrar/registrar.go +++ b/common/registrar/registrar.go @@ -22,10 +22,10 @@ import ( "math/big" "regexp" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) /* diff --git a/common/registrar/registrar_test.go b/common/registrar/registrar_test.go index b2287803c2..f2bbafb916 100644 --- a/common/registrar/registrar_test.go +++ b/common/registrar/registrar_test.go @@ -19,8 +19,8 @@ package registrar import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) type testBackend struct { diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 03dffd607d..88ed7b05fc 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" ) const ( diff --git a/console/bridge.go b/console/bridge.go index 7f7e6feb11..0e3d67effe 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -22,9 +22,9 @@ import ( "io" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 6e3d7e43cb..b3876a6cf9 100644 --- a/console/console.go +++ b/console/console.go @@ -27,9 +27,9 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/internal/jsre" + "github.com/ubiq/go-ubiq/internal/web3ext" + "github.com/ubiq/go-ubiq/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 d5010b907d..4e0e4ba9f1 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/internal/jsre" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/params" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index 3393c43374..409308a75b 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.4 RUN \ apk add --update go git make gcc musl-dev && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/ubiq/go-ubiq && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 5131c473a6..cd0963eb7a 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.4 RUN \ apk add --update go git make gcc musl-dev && \ - git clone --depth 1 --branch release/1.5 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.5 https://github.com/ubiq/go-ubiq && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 5d263eb765..ac7239f37b 100644 --- a/containers/vagrant/Vagrantfile +++ b/containers/vagrant/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure(2) do |config| vb.memory = "2048" end - config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/ethereum/go-ethereum" + config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/ubiq/go-ubiq" config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provision "shell", inline: <<-SHELL diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b2b2365f31..e0974bc5b4 100644 --- a/contracts/chequebook/api.go +++ b/contracts/chequebook/api.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 5ece1391b5..08dbbdd71e 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -35,14 +35,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/contracts/chequebook/contract" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/services/swap/swap" "golang.org/x/net/context" ) diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index e35a21cc50..c87c3c7ce2 100644 --- a/contracts/chequebook/cheque_test.go +++ b/contracts/chequebook/cheque_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "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" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/accounts/abi/bind/backends" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/contracts/chequebook/contract" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 47090152cc..3efc33c85f 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "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/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index faa927279d..e7b6e70925 100644 --- a/contracts/chequebook/gencode.go +++ b/contracts/chequebook/gencode.go @@ -25,11 +25,11 @@ import ( "io/ioutil" "math/big" - "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" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/accounts/abi/bind/backends" + "github.com/ubiq/go-ubiq/contracts/chequebook/contract" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index aca16de508..2a8bfecaef 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,10 +6,10 @@ package contract import ( "strings" - "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/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index 7806742cf7..22daaca046 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -22,11 +22,11 @@ import ( "math/big" "strings" - "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" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/contracts/ens/contract" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" ) // swarm domain name registry and resolver diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 7609668733..be90688f16 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/accounts/abi/bind/backends" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/contracts/release/contract.go b/contracts/release/contract.go index 6a0b099311..c4f49921ca 100644 --- a/contracts/release/contract.go +++ b/contracts/release/contract.go @@ -7,10 +7,10 @@ import ( "math/big" "strings" - "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/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) // ReleaseOracleABI is the input ABI used to generate the binding from. diff --git a/contracts/release/contract_test.go b/contracts/release/contract_test.go index 11a039992b..574ef960af 100644 --- a/contracts/release/contract_test.go +++ b/contracts/release/contract_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "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/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/accounts/abi/bind/backends" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/crypto" ) // setupReleaseTest creates a blockchain simulator and deploys a version oracle diff --git a/contracts/release/release.go b/contracts/release/release.go index cd79112cd1..835c1d5343 100644 --- a/contracts/release/release.go +++ b/contracts/release/release.go @@ -24,16 +24,16 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/les" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) @@ -141,7 +141,7 @@ func (r *ReleaseService) checker() { warning := fmt.Sprintf("Client v%d.%d.%d-%x seems older than the latest upstream release v%d.%d.%d-%x", r.config.Major, r.config.Minor, r.config.Patch, r.config.Commit[:4], version.Major, version.Minor, version.Patch, version.Commit[:4]) - howtofix := fmt.Sprintf("Please check https://github.com/ethereum/go-ethereum/releases for new releases") + howtofix := fmt.Sprintf("Please check https://github.com/ubiq/go-ubiq/releases for new releases") separator := strings.Repeat("-", len(warning)) glog.V(logger.Warn).Info(separator) diff --git a/core/asm.go b/core/asm.go index b2e47b5e91..42ff73887d 100644 --- a/core/asm.go +++ b/core/asm.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" ) func Disassemble(script []byte) (asm []string) { diff --git a/core/bench_test.go b/core/bench_test.go index a208ea2504..7469f84651 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "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/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 3353683c07..43d2825ac9 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -21,12 +21,12 @@ import ( "math/big" "time" - "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/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" "gopkg.in/fatih/set.v0" ) diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 6fcab1e5f0..1481ee4a1a 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,14 +21,14 @@ import ( "math/big" "testing" - "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/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow/ezp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow/ezp" ) func testChainConfig() *params.ChainConfig { diff --git a/core/blockchain.go b/core/blockchain.go index bbcff3b92d..fb6ebc7a53 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,20 +28,20 @@ import ( "sync/atomic" "time" - "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/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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 934ae74e1a..a1caaa457e 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -28,16 +28,16 @@ import ( "time" "github.com/ethereum/ethash" - "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/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/params" - "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/core/blocks.go b/core/blocks.go index ecccc541f0..adf554ae6e 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/ubiq/go-ubiq/common" // Set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/chain_makers.go b/core/chain_makers.go index e1dafb32dc..5d74169cd8 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "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/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" ) /* diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 487cd6e186..a124ebaa6b 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "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/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" ) func ExampleGenerateChain() { diff --git a/core/chain_pow.go b/core/chain_pow.go index c3b5788c19..b03b8d08da 100644 --- a/core/chain_pow.go +++ b/core/chain_pow.go @@ -19,8 +19,8 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/pow" ) // nonceCheckResult contains the result of a nonce verification. diff --git a/core/chain_pow_test.go b/core/chain_pow_test.go index 1400b166f0..bf00561873 100644 --- a/core/chain_pow_test.go +++ b/core/chain_pow_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "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" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" ) // failPow is a non-validating proof of work implementation, that returns true diff --git a/core/dao.go b/core/dao.go index 1260c310ae..30047b4218 100644 --- a/core/dao.go +++ b/core/dao.go @@ -20,9 +20,9 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/params" ) // ValidateDAOHeaderExtraData validates the extra-data field of a block header to diff --git a/core/dao_test.go b/core/dao_test.go index f461131f49..4bfb1c0157 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/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 84669de35b..0708a0d465 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/core/database_util_test.go b/core/database_util_test.go index 83750aa60a..105ef86a8b 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -24,14 +24,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) type diffTest struct { diff --git a/core/error.go b/core/error.go index 0ba506f468..2808962c10 100644 --- a/core/error.go +++ b/core/error.go @@ -21,7 +21,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var ( diff --git a/core/events.go b/core/events.go index bed8c7b900..7829ea5a94 100644 --- a/core/events.go +++ b/core/events.go @@ -19,9 +19,9 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/execution.go b/core/execution.go index e3ea1006c8..cbc9dfd196 100644 --- a/core/execution.go +++ b/core/execution.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) // Call executes within the given contract diff --git a/core/genesis.go b/core/genesis.go index 8509f664dd..4e8d21c30e 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -26,13 +26,13 @@ import ( "math/big" "strings" - "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/ethdb" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) // WriteGenesisBlock writes the genesis block to the database as block number 0 diff --git a/core/headerchain.go b/core/headerchain.go index c536945712..1b7c4d7436 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -27,13 +27,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index fd6a5491c5..29e8cffc22 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,11 +20,11 @@ import ( "container/list" "fmt" - "github.com/ethereum/go-ethereum/core/types" - // "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/core/types" + // "github.com/ubiq/go-ubiq/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" ) // Implement our EthTest Manager diff --git a/core/state/dump.go b/core/state/dump.go index 8294d61b9f..e536ae9925 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 14265b277a..69c8fe750a 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -21,9 +21,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/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 aa05c5dfe7..aa09c3d4d8 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/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 720c821b93..19be72250e 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -19,7 +19,7 @@ package state import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index ad73dc0dc6..5497f24190 100644 --- a/core/state/managed_state.go +++ b/core/state/managed_state.go @@ -19,7 +19,7 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 3f7bc2aa85..40eadfece2 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 2b5dfea7d8..ba96f01638 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,12 +22,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index 435d1d8293..407d634229 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -23,9 +23,9 @@ import ( checker "gopkg.in/check.v1" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" ) type StateSuite struct { diff --git a/core/state/statedb.go b/core/state/statedb.go index 1c4af02958..a354473818 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,14 +23,14 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index a44818b7ce..e12fae0274 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -28,9 +28,9 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to diff --git a/core/state/sync.go b/core/state/sync.go index bab9c8e7ee..5da6f2b85f 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -20,10 +20,10 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) // StateSync is the main state synchronisation scheduler, which provides yet the diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 8111320e66..f2b8855a2d 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/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 375b317f12..0acfff00bb 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -19,13 +19,13 @@ package core import ( "math/big" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/core/state_transition.go b/core/state_transition.go index 8abe17b0a2..6c7fa2a38c 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/core/tx_list.go b/core/tx_list.go index c3ddf3148e..24b3e32132 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,7 +22,7 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/core/types" ) // 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 92b2119371..341c61c320 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/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 edcbc21ebf..666835528f 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -24,14 +24,14 @@ import ( "sync" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 009d198869..4d10b41941 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "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/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" ) func transaction(nonce uint64, gaslimit *big.Int, key *ecdsa.PrivateKey) *types.Transaction { diff --git a/core/types.go b/core/types.go index d84d0987f4..a6efaefe99 100644 --- a/core/types.go +++ b/core/types.go @@ -19,9 +19,9 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" ) // Validator is an interface which defines the standard for block validation. diff --git a/core/types/block.go b/core/types/block.go index 68504ffcc8..3f968f40dc 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -28,9 +28,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index b95bddcfce..1b5cbc4337 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -23,8 +23,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d3945a734b..8dcf204877 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,9 +20,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..6b5d2cce33 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/ethereum/go-ethereum/core/state" + "github.com/ubiq/go-ubiq/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..f9eeaee203 100644 --- a/core/types/derive_sha.go +++ b/core/types/derive_sha.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) type DerivableList interface { diff --git a/core/types/json_test.go b/core/types/json_test.go index d80cda68b2..f82ff3d986 100644 --- a/core/types/json_test.go +++ b/core/types/json_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var unmarshalHeaderTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index b00fdabff6..dda2d26763 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -23,9 +23,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/core/types/transaction.go b/core/types/transaction.go index 323bfaee60..d45137c600 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -26,10 +26,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) var ErrInvalidSig = errors.New("invalid transaction v, r, s values") diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 7d571643f2..0429c8c306 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) var ErrInvalidChainId = errors.New("invalid chaid id for signer") diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index dc618e5703..e53202ced8 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index ca105566ad..9e01c5c305 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -22,9 +22,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index a0f6158217..66e77be818 100644 --- a/core/vm/analysis.go +++ b/core/vm/analysis.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var bigMaxUint64 = new(big.Int).SetUint64(^uint64(0)) diff --git a/core/vm/asm.go b/core/vm/asm.go index d7dbde5e82..aea6553221 100644 --- a/core/vm/asm.go +++ b/core/vm/asm.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // Disassemble disassembles the byte code and returns the string diff --git a/core/vm/common.go b/core/vm/common.go index 2878b92d2a..e338813863 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -20,8 +20,8 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/params" ) // Type is the VM type accepted by **NewVm** diff --git a/core/vm/contract.go b/core/vm/contract.go index 70455a4c23..771f7ce260 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index b45f14724b..48c3234758 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -19,11 +19,11 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) // PrecompiledAccount represents a native ethereum contract diff --git a/core/vm/environment.go b/core/vm/environment.go index e97c1e58c7..7720a2adac 100644 --- a/core/vm/environment.go +++ b/core/vm/environment.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/params" ) // Environment is an EVM requirement and helper which allows access to outside diff --git a/core/vm/errors.go b/core/vm/errors.go index 1766bf9fbb..11e6f443e7 100644 --- a/core/vm/errors.go +++ b/core/vm/errors.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) var OutOfGasError = errors.New("Out of gas") diff --git a/core/vm/gas.go b/core/vm/gas.go index fdbc0df7f7..3bc404e81f 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 4f98953b52..e43660474f 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/math" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) type programInstruction interface { diff --git a/core/vm/jit.go b/core/vm/jit.go index b75558d398..ebbc58a359 100644 --- a/core/vm/jit.go +++ b/core/vm/jit.go @@ -22,11 +22,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/vm/jit_optimiser.go b/core/vm/jit_optimiser.go index 31ad0c2e2b..9886eb4d7f 100644 --- a/core/vm/jit_optimiser.go +++ b/core/vm/jit_optimiser.go @@ -20,8 +20,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // optimeProgram optimises a JIT program creating segments out of program diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go index 6f7ba9250a..95aa6241c1 100644 --- a/core/vm/jit_test.go +++ b/core/vm/jit_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) const maxRun = 1000 diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 4e997f636e..c6f234e6ea 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) type jumpPtr struct { diff --git a/core/vm/jump_table_test.go b/core/vm/jump_table_test.go index 6a6bb5cf42..e90dd83bc2 100644 --- a/core/vm/jump_table_test.go +++ b/core/vm/jump_table_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) func TestInit(t *testing.T) { diff --git a/core/vm/log.go b/core/vm/log.go index b292f5f436..373ddeacde 100644 --- a/core/vm/log.go +++ b/core/vm/log.go @@ -22,8 +22,8 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" ) var errMissingLogFields = errors.New("missing required JSON log fields") diff --git a/core/vm/logger.go b/core/vm/logger.go index 9e13d703be..1df003bc7e 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -22,7 +22,7 @@ import ( "os" "unicode" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index d4d164eb6f..2f61841720 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type dummyContractRef struct { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index f1a2b60d3e..5db661943a 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -19,11 +19,11 @@ package runtime import ( "math/big" - "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/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/params" ) // Env is a basic runtime environment required for running the EVM. diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index d51b435f8a..7a7535012b 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -20,11 +20,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" ) // The default, always homestead, rule set for the vm env diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..27bfa805e5 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 88c76c7319..0a65ef8ef3 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,11 +21,11 @@ import ( "strings" "testing" - "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" + "github.com/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/util_test.go b/core/vm/util_test.go index 5783ee0153..5844e3ad43 100644 --- a/core/vm/util_test.go +++ b/core/vm/util_test.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) type ruleSet struct { diff --git a/core/vm/vm.go b/core/vm/vm.go index 56aca69123..64b5418197 100644 --- a/core/vm/vm.go +++ b/core/vm/vm.go @@ -21,11 +21,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) // Config are the configuration options for the EVM diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index f6e4a515bc..42590652a9 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) type JitVm struct { diff --git a/core/vm_env.go b/core/vm_env.go index 43637bd132..a4fb561d41 100644 --- a/core/vm_env.go +++ b/core/vm_env.go @@ -19,11 +19,11 @@ package core import ( "math/big" - "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/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/params" ) // GetHashFn returns a function for which the VM env can query block hashes through diff --git a/crypto/crypto.go b/crypto/crypto.go index e611bd8f40..7f8c935e2d 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,11 +30,11 @@ import ( "encoding/hex" "errors" - "github.com/ethereum/go-ethereum/common" - "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/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/crypto/ripemd160" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 80c9a9aaee..b44c63214a 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -27,8 +27,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/asn1.go b/crypto/ecies/asn1.go index 40dabd329b..187321e7fc 100644 --- a/crypto/ecies/asn1.go +++ b/crypto/ecies/asn1.go @@ -42,7 +42,7 @@ import ( "hash" "math/big" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) var ( diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index cb09061ced..db2ecdc249 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -42,7 +42,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 511c53ebc0..abea1f733d 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) var ( diff --git a/crypto/encrypt_decrypt_test.go b/crypto/encrypt_decrypt_test.go index fcf40b70fd..88b4146617 100644 --- a/crypto/encrypt_decrypt_test.go +++ b/crypto/encrypt_decrypt_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func TestBox(t *testing.T) { diff --git a/crypto/secp256k1/secp256.go b/crypto/secp256k1/secp256.go index 4999c5c951..ebf92c5072 100644 --- a/crypto/secp256k1/secp256.go +++ b/crypto/secp256k1/secp256.go @@ -42,7 +42,7 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/ubiq/go-ubiq/crypto/randentropy" ) //#define USE_FIELD_5X64 diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index fc6fc9b32e..cc87d867df 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "testing" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/ubiq/go-ubiq/crypto/randentropy" ) const TestCount = 1000 diff --git a/errs/errors.go b/errs/errors.go index 675649efa2..d9ee8faeef 100644 --- a/errs/errors.go +++ b/errs/errors.go @@ -19,8 +19,8 @@ package errs import ( "fmt" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) /* diff --git a/errs/errors_test.go b/errs/errors_test.go index d6d14b45ea..2428590ed8 100644 --- a/errs/errors_test.go +++ b/errs/errors_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/logger" + "github.com/ubiq/go-ubiq/logger" ) func testErrors() *Errors { diff --git a/eth/api.go b/eth/api.go index b3185c3926..69421e9c7d 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,18 +28,18 @@ import ( "time" "github.com/ethereum/ethash" - "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/internal/ethapi" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "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/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/miner" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/api_backend.go b/eth/api_backend.go index 0925132ef0..c5369c3e36 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -19,19 +19,19 @@ package eth import ( "math/big" - "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/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/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/eth/gasprice" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/params" + rpc "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/backend.go b/eth/backend.go index 67598bdbb3..58d3d6ecba 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -29,25 +29,25 @@ import ( "time" "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/common/registrar/ethreg" - "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/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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "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/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/httpclient" + "github.com/ubiq/go-ubiq/common/registrar/ethreg" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/eth/filters" + "github.com/ubiq/go-ubiq/eth/gasprice" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/miner" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rpc" ) const ( diff --git a/eth/backend_test.go b/eth/backend_test.go index 212c4c4d37..29d5efd68a 100644 --- a/eth/backend_test.go +++ b/eth/backend_test.go @@ -20,12 +20,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" ) func TestMipmapUpgrade(t *testing.T) { diff --git a/eth/bad_block.go b/eth/bad_block.go index e0f05f540f..ab9425cc0e 100644 --- a/eth/bad_block.go +++ b/eth/bad_block.go @@ -23,11 +23,11 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/eth/bind.go b/eth/bind.go index 747965d370..010862fa33 100644 --- a/eth/bind.go +++ b/eth/bind.go @@ -19,12 +19,12 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum" - "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/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index 5fd73a5867..f49e64f1b6 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -24,13 +24,13 @@ import ( "math/big" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" ) var useSequentialKeys = []byte("dbUpgrade_20160530sequentialKeys") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index e41376810f..a198ea60d9 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -19,9 +19,9 @@ package downloader import ( "sync" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index b1f4b8169b..3db459ab20 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -28,15 +28,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + ethereum "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/trie" "github.com/rcrowley/go-metrics" ) diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 86638ae2d0..95f037a39f 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" - "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/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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/trie" ) var ( diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 0d76c7dfd2..59fd6e17ef 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/ubiq/go-ubiq/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index b0bfc66c82..b062aef8b7 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -30,7 +30,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index b7ad920995..930f6cee14 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -26,14 +26,14 @@ import ( "sync/atomic" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/trie" "github.com/rcrowley/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/types.go b/eth/downloader/types.go index e105104864..a83d770773 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) // headerCheckFn is a callback type for verifying a header's presence in the local chain. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index e225b49965..ed4372a1bc 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -23,11 +23,11 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 426bfd5428..9b81f57265 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 1ed8075bf3..8006824b57 100644 --- a/eth/fetcher/metrics.go +++ b/eth/fetcher/metrics.go @@ -19,7 +19,7 @@ package fetcher import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/ubiq/go-ubiq/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 8345132629..8b49b957f9 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -27,11 +27,11 @@ import ( "golang.org/x/net/context" - "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/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 98eb6cbaa2..86a3d9727e 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 4004af3002..0c42c2099f 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,12 +20,12 @@ import ( "math" "time" - "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/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index c2c072a9f9..b30535cc1d 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "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/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index d6d4199cc2..69edc9c2a8 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -24,14 +24,14 @@ import ( "golang.org/x/net/context" - "github.com/ethereum/go-ethereum/common" - "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/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rpc" ) var ( diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index a8c767ead6..d0a4240faf 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -24,13 +24,13 @@ import ( "golang.org/x/net/context" - "github.com/ethereum/go-ethereum/common" - "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/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index eb2df4a96e..52ca0a24a5 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -21,12 +21,12 @@ import ( "math/rand" "sync" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/eth/gasprice/lightprice.go b/eth/gasprice/lightprice.go index 8886d32d7d..32ba0e8ee0 100644 --- a/eth/gasprice/lightprice.go +++ b/eth/gasprice/lightprice.go @@ -21,9 +21,9 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/eth/handler.go b/eth/handler.go index 8f05cc5b1a..f78a00ea9f 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -26,20 +26,20 @@ import ( "sync/atomic" "time" - "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/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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/eth/fetcher" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index f599e9e869..f3e83549b4 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,16 +23,16 @@ import ( "testing" "time" - "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/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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/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 f239767850..8165b698f7 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,15 +27,15 @@ import ( "sync" "testing" - "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/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 5fa2597d4d..c447298386 100644 --- a/eth/metrics.go +++ b/eth/metrics.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index aa85631ea2..38d9813f69 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index 3f65c204bc..f058596cca 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,9 +21,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index 0aac19f435..07b05bddd2 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index 6584bb1e2a..2dd963fe31 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,12 +21,12 @@ import ( "sync/atomic" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 198ffaf272..df3962a6ad 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index a095aa0767..6bccce924e 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 102c0d3b21..349f7e217f 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -16,7 +16,7 @@ package ethclient -import "github.com/ethereum/go-ethereum" +import "github.com/ubiq/go-ubiq" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethdb/database.go b/ethdb/database.go index 96d9a59820..46378f168f 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 0e69a1218c..479eb2b45c 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func newDb() *LDBDatabase { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index a729f52332..1b0e2cf70a 100644 --- a/ethdb/memory_database.go +++ b/ethdb/memory_database.go @@ -20,7 +20,7 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) /* diff --git a/interfaces.go b/interfaces.go index aab0e2029c..11897825ee 100644 --- a/interfaces.go +++ b/interfaces.go @@ -20,9 +20,9 @@ package ethereum import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" "golang.org/x/net/context" ) diff --git a/internal/debug/api.go b/internal/debug/api.go index 96091541b5..024a2ca754 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,8 +33,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index d7bbfae1eb..d5a678bcd0 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -22,8 +22,8 @@ import ( _ "net/http/pprof" "runtime" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index c0cf921ff0..19c23f131b 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,8 +23,8 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index a25eff5ed8..2aa807b21c 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,18 +26,18 @@ import ( "time" "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "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/ethdb" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" "golang.org/x/net/context" @@ -305,7 +305,7 @@ func signHash(message string) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/ubiq/go-ubiq/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, message string, addr common.Address, passwd string) (string, error) { hash := signHash(message) signature, err := s.b.AccountManager().SignWithPassphrase(addr, passwd, hash) @@ -321,7 +321,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, message string, addr commo // hash = keccak256("\x19Ethereum Signed Message:\n"${message length}${message}) // addr = ecrecover(hash, signature) // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/ubiq/go-ubiq/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, message string, signature string) (common.Address, error) { var ( hash = signHash(message) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index fdc4a39dc8..6376a51635 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -20,16 +20,16 @@ package ethapi import ( "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "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/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" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/internal/ethapi/solc.go b/internal/ethapi/solc.go index b9acc518b6..f0317703f3 100644 --- a/internal/ethapi/solc.go +++ b/internal/ethapi/solc.go @@ -19,8 +19,8 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common/compiler" + "github.com/ubiq/go-ubiq/rpc" ) func makeCompilerAPIs(solcPath string) []rpc.API { diff --git a/internal/ethapi/tracer.go b/internal/ethapi/tracer.go index 5f69826a3b..cbf6b69d2b 100644 --- a/internal/ethapi/tracer.go +++ b/internal/ethapi/tracer.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" "github.com/robertkrimen/otto" ) diff --git a/internal/ethapi/tracer_test.go b/internal/ethapi/tracer_test.go index b88178a6d7..fbce039ef5 100644 --- a/internal/ethapi/tracer_test.go +++ b/internal/ethapi/tracer_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" ) type Env struct { diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4813893047..70e8ab95e0 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,7 +26,7 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index b77767ed70..8dcaafc6e1 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -19,19 +19,19 @@ package les import ( "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "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/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/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/eth/gasprice" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/params" + rpc "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/les/backend.go b/les/backend.go index 1264acfd18..5a4b13bb5a 100644 --- a/les/backend.go +++ b/les/backend.go @@ -23,26 +23,26 @@ import ( "time" "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/common/httpclient" - "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/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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/compiler" + "github.com/ubiq/go-ubiq/common/httpclient" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/eth/filters" + "github.com/ubiq/go-ubiq/eth/gasprice" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/internal/ethapi" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/params" + rpc "github.com/ubiq/go-ubiq/rpc" ) type LightEthereum struct { diff --git a/les/fetcher.go b/les/fetcher.go index ae9bf84749..514371dfc2 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" ) type lightFetcher struct { diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index acb131ea4f..b6c423f617 100644 --- a/les/flowcontrol/control.go +++ b/les/flowcontrol/control.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ubiq/go-ubiq/common/mclock" ) const fcTimeConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 83d73666f8..f72ae4b303 100644 --- a/les/handler.go +++ b/les/handler.go @@ -25,23 +25,23 @@ import ( "sync" "time" - "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/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "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/pow" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 37c5dd2268..d887650bde 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -20,14 +20,14 @@ import ( "math/rand" "testing" - "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/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/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 a5428e954f..1bb89cacb3 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,17 +26,17 @@ import ( "sync" "testing" - "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/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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/les/flowcontrol" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index aa0796790e..faa714329d 100644 --- a/les/metrics.go +++ b/les/metrics.go @@ -17,8 +17,8 @@ package les import ( - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/ubiq/go-ubiq/metrics" + "github.com/ubiq/go-ubiq/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 444b1da2a2..a9b16efb3b 100644 --- a/les/odr.go +++ b/les/odr.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common/mclock" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/les/odr_requests.go b/les/odr_requests.go index f4bd518886..9de1c567a4 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -22,16 +22,16 @@ import ( "bytes" "encoding/binary" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) type LesOdrRequest interface { diff --git a/les/odr_test.go b/les/odr_test.go index 80f7b8208c..df5d5adb73 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -22,15 +22,15 @@ import ( "testing" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/net/context" ) diff --git a/les/peer.go b/les/peer.go index 5d566d8992..67f5beb0ec 100644 --- a/les/peer.go +++ b/les/peer.go @@ -23,14 +23,14 @@ import ( "math/big" "sync" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/les/flowcontrol" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 46da2b8c8b..4eaaef87c7 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index a6fbb06ce3..0a5536a166 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/light" "golang.org/x/net/context" ) diff --git a/les/server.go b/les/server.go index c763e8c632..eeb5814822 100644 --- a/les/server.go +++ b/les/server.go @@ -23,18 +23,18 @@ import ( "sync" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/les/flowcontrol" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" ) type LesServer struct { diff --git a/les/sync.go b/les/sync.go index 72c979c61f..bc719df0a4 100644 --- a/les/sync.go +++ b/les/sync.go @@ -19,9 +19,9 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/light" "golang.org/x/net/context" ) diff --git a/les/txrelay.go b/les/txrelay.go index 036158f5d2..d4170247de 100644 --- a/les/txrelay.go +++ b/les/txrelay.go @@ -19,8 +19,8 @@ package les import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 1cea7a8927..545544797e 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -22,16 +22,16 @@ import ( "sync/atomic" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" + "github.com/ubiq/go-ubiq/rlp" "github.com/hashicorp/golang-lru" "golang.org/x/net/context" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 0ba9258873..aa52385af2 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/ethereum/ethash" - "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/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" "github.com/hashicorp/golang-lru" "golang.org/x/net/context" ) diff --git a/light/odr.go b/light/odr.go index 679569bf90..029d4a71bb 100644 --- a/light/odr.go +++ b/light/odr.go @@ -21,12 +21,12 @@ package light import ( "math/big" - "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/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/net/context" ) diff --git a/light/odr_test.go b/light/odr_test.go index 50255a7f32..b4c4bec0b0 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" + "github.com/ubiq/go-ubiq/trie" "golang.org/x/net/context" ) diff --git a/light/odr_util.go b/light/odr_util.go index 5c72f90e9b..2841af09ea 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -21,14 +21,14 @@ import ( "errors" "math/big" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/net/context" ) diff --git a/light/state.go b/light/state.go index 88f60efbbe..73375fbfd3 100644 --- a/light/state.go +++ b/light/state.go @@ -19,10 +19,10 @@ package light import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/light/state_object.go b/light/state_object.go index 61c3888fe3..d247c11448 100644 --- a/light/state_object.go +++ b/light/state_object.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/net/context" ) diff --git a/light/state_test.go b/light/state_test.go index d594ab9ff0..7b9ce4f618 100644 --- a/light/state_test.go +++ b/light/state_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "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/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" "golang.org/x/net/context" ) diff --git a/light/trie.go b/light/trie.go index c5525358a4..81a68a2f00 100644 --- a/light/trie.go +++ b/light/trie.go @@ -17,8 +17,8 @@ package light import ( - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/trie" "golang.org/x/net/context" ) diff --git a/light/txpool.go b/light/txpool.go index 309bc3a322..679e6d6fa9 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -21,15 +21,15 @@ import ( "sync" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/net/context" ) diff --git a/light/txpool_test.go b/light/txpool_test.go index 759b6b8ab7..737d38ca78 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "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/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/params" "golang.org/x/net/context" ) diff --git a/light/vm_env.go b/light/vm_env.go index 5d330b072a..b3a7db8d7a 100644 --- a/light/vm_env.go +++ b/light/vm_env.go @@ -19,12 +19,12 @@ package light import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "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/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/params" "golang.org/x/net/context" ) diff --git a/logger/glog/glog.go b/logger/glog/glog.go index edaa21f075..6fe129725f 100644 --- a/logger/glog/glog.go +++ b/logger/glog/glog.go @@ -122,7 +122,7 @@ var severityName = []string{ // these path prefixes are trimmed for display, but not when // matching vmodule filters. var trimPrefixes = []string{ - "/github.com/ethereum/go-ethereum", + "/github.com/ubiq/go-ubiq", "/github.com/ethereum/ethash", } diff --git a/logger/log.go b/logger/log.go index 38a6ce1391..77b0df8660 100644 --- a/logger/log.go +++ b/logger/log.go @@ -22,7 +22,7 @@ import ( "log" "os" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func openLogFile(datadir string, filename string) *os.File { diff --git a/metrics/metrics.go b/metrics/metrics.go index d756894f38..0bc9fc505b 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -23,8 +23,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/miner/agent.go b/miner/agent.go index 16f2a77230..999aae6b6d 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,10 +21,10 @@ import ( "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/pow" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index 76dbb8380f..49c9597d08 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,18 +22,18 @@ import ( "math/big" "sync/atomic" - "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/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/eth/downloader" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 00b5f7e089..aa77bb4a4c 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -24,9 +24,9 @@ import ( "time" "github.com/ethereum/ethash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) type hashrate struct { diff --git a/miner/worker.go b/miner/worker.go index 2933b6bd3b..a81c3217cd 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,18 +24,18 @@ import ( "sync/atomic" "time" - "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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/pow" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 41498b6f01..7c34442e5d 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,7 +23,7 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" + "github.com/ubiq/go-ubiq/accounts" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 0a3fa93ae0..c19463a33b 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/ubiq/go-ubiq/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -144,7 +144,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/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ubiq/go-ubiq/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/bind.go b/mobile/bind.go index 50adc6b0f1..e94a6947ca 100644 --- a/mobile/bind.go +++ b/mobile/bind.go @@ -22,10 +22,10 @@ import ( "math/big" "strings" - "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/ubiq/go-ubiq/accounts/abi" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/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 ab1810bf16..eeeb863932 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9df2d04c3e..026c7ac11e 100644 --- a/mobile/discover.go +++ b/mobile/discover.go @@ -22,7 +22,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 668d65e322..f29b3349ed 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,9 +21,9 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 6e8046ac9b..ed0e868806 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/ubiq/go-ubiq" + "github.com/ubiq/go-ubiq/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index e209b667ca..678aa91e8a 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,16 +24,16 @@ import ( "math/big" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/whisper/whisperv2" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/eth" + "github.com/ubiq/go-ubiq/ethclient" + "github.com/ubiq/go-ubiq/les" + "github.com/ubiq/go-ubiq/light" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/whisper/whisperv2" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 0fbc6bd3e8..c8596ec8a4 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -21,8 +21,8 @@ package geth import ( "runtime" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index b585b86420..7793b72926 100644 --- a/mobile/interface.go +++ b/mobile/interface.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/p2p.go b/mobile/p2p.go index 97ae626dc2..c0d2fe7186 100644 --- a/mobile/p2p.go +++ b/mobile/p2p.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/p2p" + "github.com/ubiq/go-ubiq/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 1b9f124b44..a845e3f6e9 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -19,9 +19,9 @@ package geth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/params" ) // MainnetChainConfig returns the chain configurations for the main Ethereum network. diff --git a/mobile/types.go b/mobile/types.go index bb5ccc6251..6568b67456 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/core/types" ) // 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 a68917ca65..6d8edf9443 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ubiq/go-ubiq/core/vm" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index 631e92c8ea..93f7ec87e0 100644 --- a/node/api.go +++ b/node/api.go @@ -21,11 +21,11 @@ import ( "strings" "time" - "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/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/rpc" "github.com/rcrowley/go-metrics" ) diff --git a/node/config.go b/node/config.go index 8d85b7ff82..6553d27110 100644 --- a/node/config.go +++ b/node/config.go @@ -26,14 +26,14 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/nat" ) var ( diff --git a/node/config_test.go b/node/config_test.go index b258d2a8b8..96d6fc2c7c 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,7 +24,7 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/node.go b/node/node.go index d49ae3a457..b1ca0fc6b2 100644 --- a/node/node.go +++ b/node/node.go @@ -26,14 +26,14 @@ import ( "sync" "syscall" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/internal/debug" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index 01ff683c03..0b2004141c 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,10 +20,10 @@ import ( "fmt" "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" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/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 d9b26453bf..7421f9b0bd 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 1cd1fe808e..01ef806a22 100644 --- a/node/service.go +++ b/node/service.go @@ -19,11 +19,11 @@ package node import ( "reflect" - "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" + "github.com/ubiq/go-ubiq/accounts" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 7cdfc2b3aa..a78a5e4f0a 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -22,8 +22,8 @@ package node import ( "reflect" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 691b8539e3..5b2163e5b6 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -23,9 +23,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 05d9b75626..7268495468 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discover" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index d6ea507bb6..2fd1bc841c 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,10 +27,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 eec0bae0c4..96ab5866ce 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -30,9 +30,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 3d1662d0b9..d6fbd73f43 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index c1a4b3af10..3397aafe98 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index ad0b5c8ca3..3694591300 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 1a24057408..66d994cb46 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 74758b6fdb..041ca2d856 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -25,11 +25,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index f43bf37269..8e0a0a0066 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/rlp" ) func init() { diff --git a/p2p/discv5/crypto.go b/p2p/discv5/crypto.go index 48b2a8a729..af179d29f6 100644 --- a/p2p/discv5/crypto.go +++ b/p2p/discv5/crypto.go @@ -18,7 +18,7 @@ package discv5 import ( //"github.com/btcsuite/btcd/btcec" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) func S256() *secp256k1.BitCurve { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 7c47c27fd0..3525784b79 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -27,10 +27,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 7ad6f1e5b9..0e1ecb78ea 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,14 +24,14 @@ import ( "net" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/mclock" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 422daa33ba..48fc3e894d 100644 --- a/p2p/discv5/net_test.go +++ b/p2p/discv5/net_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index b6b6f149dd..a9bb5c799d 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..b21b574d92 100644 --- a/p2p/discv5/node_test.go +++ b/p2p/discv5/node_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 81c0e63365..d1b76c905c 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,8 +26,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 2e232fbaac..448b10a66b 100644 --- a/p2p/discv5/sim_test.go +++ b/p2p/discv5/sim_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 2cf05009cb..b7daf7b914 100644 --- a/p2p/discv5/table.go +++ b/p2p/discv5/table.go @@ -29,7 +29,7 @@ import ( "net" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..fee3857095 100644 --- a/p2p/discv5/table_test.go +++ b/p2p/discv5/table_test.go @@ -27,8 +27,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 2025043144..43a20454c2 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,9 +25,9 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/mclock" + "github.com/ubiq/go-ubiq/crypto" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 625921e84c..49dac88561 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,7 +23,7 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ubiq/go-ubiq/common/mclock" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..cfab3745c5 100644 --- a/p2p/discv5/topic_test.go +++ b/p2p/discv5/topic_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 46d3200bff..53c8fa726e 100644 --- a/p2p/discv5/udp.go +++ b/p2p/discv5/udp.go @@ -24,12 +24,12 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index cacc0f0046..e6bbdec28c 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/rlp" ) func init() { diff --git a/p2p/message.go b/p2p/message.go index 1292d21213..24ce34026a 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 98b61901d5..bb1303b530 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,7 @@ package p2p import ( "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ubiq/go-ubiq/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index f9ba93613e..8e37cfcefd 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index b9d6c099dd..ae7a2b4457 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..4324216cae 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,7 +19,7 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 2a9bdc121f..b2ea7f6dd0 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -34,12 +34,12 @@ import ( "sync" "time" - "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/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/rlp" ) const ( diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index f4cefa650b..8f853bb833 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/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" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index 7381127dc9..29f4a670be 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/nat" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 313d086ec4..62afffcd5a 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/p2p/discover" ) func init() { diff --git a/params/bootnodes.go b/params/bootnodes.go index 830b309d69..4ab9094ce5 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -17,8 +17,8 @@ package params import ( - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/discv5" ) // MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on diff --git a/params/config.go b/params/config.go index 6d8d73a9be..b35786a6af 100644 --- a/params/config.go +++ b/params/config.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // MainnetChainConfig is the chain parameters to run a node on the main network. diff --git a/params/dao.go b/params/dao.go index 3e2a68cc9e..c4ba7fdfb7 100644 --- a/params/dao.go +++ b/params/dao.go @@ -21,7 +21,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // TestNetDAOForkBlock is the block number where the DAO hard-fork commences on diff --git a/params/util.go b/params/util.go index d3c805455b..1fc4f13f4e 100644 --- a/params/util.go +++ b/params/util.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) var ( diff --git a/pow/block.go b/pow/block.go index 11807113dc..aec5d28c8e 100644 --- a/pow/block.go +++ b/pow/block.go @@ -19,8 +19,8 @@ package pow import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" ) type Block interface { diff --git a/pow/dagger/dagger.go b/pow/dagger/dagger.go index f54ba71ca1..a392e6ff84 100644 --- a/pow/dagger/dagger.go +++ b/pow/dagger/dagger.go @@ -22,9 +22,9 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/logger" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/logger" ) var powlogger = logger.NewLogger("POW") diff --git a/pow/dagger/dagger_test.go b/pow/dagger/dagger_test.go index 39b74df306..449419957b 100644 --- a/pow/dagger/dagger_test.go +++ b/pow/dagger/dagger_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func BenchmarkDaggerSearch(b *testing.B) { diff --git a/pow/ezp/pow.go b/pow/ezp/pow.go index 0f7ee35709..e18416a4b7 100644 --- a/pow/ezp/pow.go +++ b/pow/ezp/pow.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/pow" ) var powlogger = logger.NewLogger("POW") diff --git a/rpc/client.go b/rpc/client.go index 34a3b78317..e5e4f86977 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -30,8 +30,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 3462b3685b..3d72f5714a 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -21,7 +21,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/rpc" "golang.org/x/net/context" ) diff --git a/rpc/client_test.go b/rpc/client_test.go index 476c8c6f36..6343df2e2f 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -30,8 +30,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/rpc/ipc.go b/rpc/ipc.go index c2b9e38710..b0273105da 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -19,8 +19,8 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" ) diff --git a/rpc/json.go b/rpc/json.go index a7053e3f53..74704b8954 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -25,8 +25,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 996c637004..e3ef3ef0fe 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,8 +22,8 @@ import ( "runtime" "sync/atomic" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/websocket.go b/rpc/websocket.go index fc3cd07099..67e693f184 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/net/context" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" diff --git a/swarm/api/api.go b/swarm/api/api.go index 673cff350a..ad66e10219 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -23,10 +23,10 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) var ( diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index b098119591..ee103873ad 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/config.go b/swarm/api/config.go index c04a015efa..46e9f40648 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -24,11 +24,11 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/swarm/network" + "github.com/ubiq/go-ubiq/swarm/services/swap" + "github.com/ubiq/go-ubiq/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 8fe3ddacc2..2ecf28cbf7 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) var ( diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 428f3e3acc..04c03e2903 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -25,10 +25,10 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index a3a644b730..2c3fd3585f 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,18 +20,18 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/ubiq/go-ubiq/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/ubiq/go-ubiq/common/httpclient" + "github.com/ubiq/go-ubiq/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally @@ -45,7 +45,7 @@ If Host is left empty, localhost is assumed. Using a public gateway, the above few lines gives you the leanest bzz-scheme aware read-only http client. You really only ever need this if you need go-native swarm access to bzz addresses, e.g., -github.com/ethereum/go-ethereum/common/natspec +github.com/ubiq/go-ubiq/common/natspec */ diff --git a/swarm/api/http/roundtripper_test.go b/swarm/api/http/roundtripper_test.go index 9afad20aed..10ced7d901 100644 --- a/swarm/api/http/roundtripper_test.go +++ b/swarm/api/http/roundtripper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/httpclient" + "github.com/ubiq/go-ubiq/common/httpclient" ) const port = "3222" diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 9be60ef94b..449bf79131 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -27,10 +27,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/api" ) const ( diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index a289c01f96..a42c148351 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -22,10 +22,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 20b8117c64..df049029dd 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 6631196c17..5d329e01aa 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ubiq/go-ubiq/swarm/network" ) type Control struct { diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 79987cc6be..094dc47e87 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -21,9 +21,9 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index fef79c70bb..a512b28424 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -20,9 +20,9 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index f5ebdd0080..247f13147a 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,12 +22,12 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/swarm/network/kademlia" + "github.com/ubiq/go-ubiq/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 16c5ce5322..fbbdfb076c 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -21,7 +21,7 @@ import ( "math/rand" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index c062c8eafb..1b4efc4585 100644 --- a/swarm/network/kademlia/address_test.go +++ b/swarm/network/kademlia/address_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/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 53a7db451c..ffa2b79fcd 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index 87c57cefe6..4afe668ac7 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) const ( diff --git a/swarm/network/messages.go b/swarm/network/messages.go index d3858c4240..732999829a 100644 --- a/swarm/network/messages.go +++ b/swarm/network/messages.go @@ -21,11 +21,11 @@ import ( "net" "time" - "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" + "github.com/ubiq/go-ubiq/contracts/chequebook" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/swarm/network/kademlia" + "github.com/ubiq/go-ubiq/swarm/services/swap" + "github.com/ubiq/go-ubiq/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 5e65108d6b..33022f1af5 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -36,15 +36,15 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/errs" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - 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" + "github.com/ubiq/go-ubiq/contracts/chequebook" + "github.com/ubiq/go-ubiq/errs" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + bzzswap "github.com/ubiq/go-ubiq/swarm/services/swap" + "github.com/ubiq/go-ubiq/swarm/services/swap/swap" + "github.com/ubiq/go-ubiq/swarm/storage" ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index cef32610f6..29b37ac0e3 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,9 +20,9 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 ed43fbd066..37db1d95f0 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index e871666bd1..d4393ead52 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,9 +22,9 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 f72036d720..c87d707144 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -25,15 +25,15 @@ import ( "sync" "time" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/contracts/chequebook" + "github.com/ubiq/go-ubiq/contracts/chequebook/contract" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/swarm/services/swap/swap" "golang.org/x/net/context" ) diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index 9d5da7c3a7..9f1d655370 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index 222e0770f3..50a884e2c5 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/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type testInPayment struct { diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 889b28a70b..d377f96aed 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 2532490cc9..136bb254ae 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/ethereum/go-ethereum/compression/rle" + "github.com/ubiq/go-ubiq/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 5ecc5c5006..12b48a0355 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -28,9 +28,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/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 e2f36a6bc8..841e63200b 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 31b6c54ac2..575460ad6a 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) /* diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 334229aedf..4af08a9dc4 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) /* diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index 79e1927b94..d4390d1298 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) const ( diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 0dcbc01008..177f66f315 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,8 +24,8 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 1dce8cafd1..93e89c8190 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -21,21 +21,21 @@ import ( "crypto/ecdsa" "fmt" - "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/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "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" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ubiq/go-ubiq/accounts/abi/bind" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/contracts/chequebook" + "github.com/ubiq/go-ubiq/contracts/ens" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/node" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/rpc" + "github.com/ubiq/go-ubiq/swarm/api" + httpapi "github.com/ubiq/go-ubiq/swarm/api/http" + "github.com/ubiq/go-ubiq/swarm/network" + "github.com/ubiq/go-ubiq/swarm/storage" "golang.org/x/net/context" ) diff --git a/tests/block_test_util.go b/tests/block_test_util.go index f043295466..d72d0fa8a6 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -27,16 +27,16 @@ import ( "strings" "github.com/ethereum/ethash" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/event" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) // Block Test JSON Format diff --git a/tests/files/ansible/test-files/docker-go/Dockerfile b/tests/files/ansible/test-files/docker-go/Dockerfile index a5a2f0f231..e37b9d182e 100644 --- a/tests/files/ansible/test-files/docker-go/Dockerfile +++ b/tests/files/ansible/test-files/docker-go/Dockerfile @@ -1,4 +1,4 @@ -# Adjusted from https://github.com/ethereum/go-ethereum/blob/develop/Dockerfile +# Adjusted from https://github.com/ubiq/go-ubiq/blob/develop/Dockerfile FROM ubuntu:14.04 ## Environment setup @@ -34,14 +34,14 @@ RUN go install -v ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop unused.txt ## Fetch and install go-ethereum -RUN go get -u -v -d github.com/ethereum/go-ethereum/... -WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum +RUN go get -u -v -d github.com/ubiq/go-ubiq/... +WORKDIR $GOPATH/src/github.com/ubiq/go-ubiq RUN git checkout develop RUN git pull -RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi +RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ubiq/go-ubiq/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi RUN go install -v ./cmd/ethtest ENTRYPOINT ["ethtest"] diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index ac53a4f52c..b227a99cfb 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index ac839186aa..5f911a03cb 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) func BenchmarkStateCall1024(b *testing.B) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 01998c2a47..b17a0be8be 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -26,15 +26,15 @@ import ( "strings" "testing" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) func RunStateTestWithReader(chainConfig *params.ChainConfig, r io.Reader, skipTests []string) error { diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 317355eb34..3eaa255723 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/params" ) func TestTransactions(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 678513e11a..a45e602fe1 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -23,11 +23,11 @@ import ( "io" "runtime" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" + "github.com/ubiq/go-ubiq/rlp" ) // Transaction Test JSON Format diff --git a/tests/util.go b/tests/util.go index 53955a47fa..855fd22060 100644 --- a/tests/util.go +++ b/tests/util.go @@ -22,15 +22,15 @@ import ( "math/big" "os" - "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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/types" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) var ( diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 50660134b7..e1be960b65 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -24,12 +24,12 @@ import ( "strconv" "testing" - "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" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/params" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/core/state" + "github.com/ubiq/go-ubiq/core/vm" + "github.com/ubiq/go-ubiq/ethdb" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/params" ) func RunVmTestWithReader(r io.Reader, skipTests []string) error { diff --git a/trie/errors.go b/trie/errors.go index 76129a70bf..6d88eb1999 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -19,7 +19,7 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index e6261819c1..32ffe805f0 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index afde6e19e6..4074115eec 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -16,7 +16,7 @@ package trie -import "github.com/ethereum/go-ethereum/common" +import "github.com/ubiq/go-ubiq/common" // Iterator is a key-value trie iterator that traverses a Trie. type Iterator struct { diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 2bcc3700e6..6c27f21af8 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -19,8 +19,8 @@ package trie import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 4aa0cab65a..20e8593371 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/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 bea5e5c098..35ac75b535 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rlp" ) // Prove constructs a merkle proof for key. The result contains all diff --git a/trie/proof_test.go b/trie/proof_test.go index 91ebcd4a57..7d0776dd1d 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/rlp" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 4d9ebe4d37..b606ad8ab1 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -17,9 +17,9 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) var secureKeyPrefix = []byte("secure-key-") diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index 159640fdaf..99b5151249 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -22,9 +22,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 2158ab750c..d46202204d 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 5292fe5cb1..5391210e79 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 035a80e74c..638a4da054 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto/sha3" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "github.com/rcrowley/go-metrics" ) diff --git a/trie/trie_test.go b/trie/trie_test.go index 14ac5a6669..753471c0c6 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/ethdb" ) func init() { diff --git a/vendor.conf b/vendor.conf index 30c96e81bb..8e411b0f60 100644 --- a/vendor.conf +++ b/vendor.conf @@ -1,5 +1,5 @@ # package -github.com/ethereum/go-ethereum +github.com/ubiq/go-ubiq # import github.com/Azure/azure-sdk-for-go v5.0.0-beta-5-gbd73d95 diff --git a/vendor/github.com/ethereum/ethash/.travis.yml b/vendor/github.com/ethereum/ethash/.travis.yml index b83b02bf3c..363852bc16 100644 --- a/vendor/github.com/ethereum/ethash/.travis.yml +++ b/vendor/github.com/ethereum/ethash/.travis.yml @@ -9,9 +9,9 @@ before_install: # Set up go-ethereum - sudo apt-get update -y -qq - sudo apt-get install -yqq libgmp3-dev - - git clone --depth=10 https://github.com/ethereum/go-ethereum ${GOPATH}/src/github.com/ethereum/go-ethereum + - git clone --depth=10 https://github.com/ubiq/go-ubiq ${GOPATH}/src/github.com/ubiq/go-ubiq # use canned dependencies from the go-ethereum repository - - export GOPATH=$GOPATH:$GOPATH/src/github.com/ethereum/go-ethereum/Godeps/_workspace/ + - export GOPATH=$GOPATH:$GOPATH/src/github.com/ubiq/go-ubiq/Godeps/_workspace/ - echo $GOPATH install: diff --git a/vendor/github.com/ethereum/ethash/ethash.go b/vendor/github.com/ethereum/ethash/ethash.go index 2a31aaf2d3..d76cc4c702 100644 --- a/vendor/github.com/ethereum/ethash/ethash.go +++ b/vendor/github.com/ethereum/ethash/ethash.go @@ -40,11 +40,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/pow" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/pow" ) var ( diff --git a/whisper/shhapi/api.go b/whisper/shhapi/api.go index 50a8eb34a7..92d3294a5a 100644 --- a/whisper/shhapi/api.go +++ b/whisper/shhapi/api.go @@ -22,12 +22,12 @@ import ( "fmt" mathrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/rpc" + "github.com/ubiq/go-ubiq/whisper/whisperv5" ) var whisperOffLineErr = errors.New("whisper is offline") diff --git a/whisper/shhapi/api_test.go b/whisper/shhapi/api_test.go index 8ce198595e..0e8443f1ef 100644 --- a/whisper/shhapi/api_test.go +++ b/whisper/shhapi/api_test.go @@ -19,8 +19,8 @@ package shhapi import ( "testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/ubiq/go-ubiq/rpc" + "github.com/ubiq/go-ubiq/whisper/whisperv5" ) func TestBasic(x *testing.T) { diff --git a/whisper/whisperv2/api.go b/whisper/whisperv2/api.go index 9c9c6a84c3..9cdd2a507b 100644 --- a/whisper/whisperv2/api.go +++ b/whisper/whisperv2/api.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/rpc" ) // PublicWhisperAPI provides the whisper RPC service. diff --git a/whisper/whisperv2/envelope.go b/whisper/whisperv2/envelope.go index 7110ab4571..b4104228eb 100644 --- a/whisper/whisperv2/envelope.go +++ b/whisper/whisperv2/envelope.go @@ -25,10 +25,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv2/envelope_test.go b/whisper/whisperv2/envelope_test.go index 75e2fbe8a6..36bb3e2ec1 100644 --- a/whisper/whisperv2/envelope_test.go +++ b/whisper/whisperv2/envelope_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" ) func TestEnvelopeOpen(t *testing.T) { diff --git a/whisper/whisperv2/filter.go b/whisper/whisperv2/filter.go index 8ce4a54fb4..22d80c096e 100644 --- a/whisper/whisperv2/filter.go +++ b/whisper/whisperv2/filter.go @@ -21,7 +21,7 @@ package whisperv2 import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/event/filter" + "github.com/ubiq/go-ubiq/event/filter" ) // Filter is used to subscribe to specific types of whisper messages. diff --git a/whisper/whisperv2/main.go b/whisper/whisperv2/main.go index be41604890..6480345fcf 100644 --- a/whisper/whisperv2/main.go +++ b/whisper/whisperv2/main.go @@ -27,12 +27,12 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/nat" + "github.com/ubiq/go-ubiq/whisper" ) func main() { diff --git a/whisper/whisperv2/message.go b/whisper/whisperv2/message.go index 7ef9d0912a..cf065207a4 100644 --- a/whisper/whisperv2/message.go +++ b/whisper/whisperv2/message.go @@ -24,10 +24,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" ) // Message represents an end-user data packet to transmit through the Whisper diff --git a/whisper/whisperv2/message_test.go b/whisper/whisperv2/message_test.go index efa64e431a..ffff82653e 100644 --- a/whisper/whisperv2/message_test.go +++ b/whisper/whisperv2/message_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/secp256k1" ) // Tests whether a message can be wrapped without any identity or encryption. diff --git a/whisper/whisperv2/peer.go b/whisper/whisperv2/peer.go index 404ebd513e..a65d6ed5b4 100644 --- a/whisper/whisperv2/peer.go +++ b/whisper/whisperv2/peer.go @@ -20,11 +20,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/peer_test.go b/whisper/whisperv2/peer_test.go index 9755e134c4..4b5bba9670 100644 --- a/whisper/whisperv2/peer_test.go +++ b/whisper/whisperv2/peer_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" ) type testPeer struct { diff --git a/whisper/whisperv2/topic.go b/whisper/whisperv2/topic.go index 3e2b47bd3f..0d7d242d0b 100644 --- a/whisper/whisperv2/topic.go +++ b/whisper/whisperv2/topic.go @@ -19,7 +19,7 @@ package whisperv2 -import "github.com/ethereum/go-ethereum/crypto" +import "github.com/ubiq/go-ubiq/crypto" // Topic represents a cryptographically secure, probabilistic partial // classifications of a message, determined as the first (left) 4 bytes of the diff --git a/whisper/whisperv2/whisper.go b/whisper/whisperv2/whisper.go index d9054959e5..7c7afe00fe 100644 --- a/whisper/whisperv2/whisper.go +++ b/whisper/whisperv2/whisper.go @@ -21,14 +21,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/event/filter" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/event/filter" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rpc" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/whisper_test.go b/whisper/whisperv2/whisper_test.go index 1e0d3f85d4..8a113cdd36 100644 --- a/whisper/whisperv2/whisper_test.go +++ b/whisper/whisperv2/whisper_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" ) func startTestCluster(n int) []*Whisper { diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index 8bb6c05745..77e3249082 100644 --- a/whisper/whisperv5/benchmarks_test.go +++ b/whisper/whisperv5/benchmarks_test.go @@ -19,7 +19,7 @@ package whisperv5 import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 57d454a08b..c5cc20e080 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,10 +26,10 @@ import ( "math" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/crypto/ecies" + "github.com/ubiq/go-ubiq/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 5cc7be5874..ddff532379 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -20,7 +20,7 @@ import ( "crypto/ecdsa" "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 8c25b05190..eb930a5223 100644 --- a/whisper/whisperv5/filter_test.go +++ b/whisper/whisperv5/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) var seed int64 diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 680d1f8a22..9ce886e119 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -30,10 +30,10 @@ import ( "fmt" mrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 78041fc1a2..538e83366d 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/crypto" ) func copyFromBuf(dst []byte, src []byte, beg int) int { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index fc1afb6d6a..90c5ef3507 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,11 +20,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 03c4725d8e..e6beea66c8 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "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" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/p2p/discover" + "github.com/ubiq/go-ubiq/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c29c344bef..9f85766fc2 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ubiq/go-ubiq/common" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 8368108244..e7225145c6 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/logger/glog" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" + "github.com/ubiq/go-ubiq/logger" + "github.com/ubiq/go-ubiq/logger/glog" + "github.com/ubiq/go-ubiq/p2p" + "github.com/ubiq/go-ubiq/rlp" "golang.org/x/crypto/pbkdf2" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 1db26265a5..a90a1dd01a 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ubiq/go-ubiq/common" + "github.com/ubiq/go-ubiq/crypto" ) func TestWhisperBasic(x *testing.T) {