diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9f2dbfcb80..a69cfa3a55 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ Before you do a feature request please check and make sure that it isn't possible through some other means. The JavaScript enabled console is a powerful feature -in the right hands. Please check our [Wiki page](https://github.com/ethereum/go-ethereum/wiki) for more info +in the right hands. Please check our [Wiki page](https://github.com/etherinc/go-ethereum/wiki) for more info and help. ## Contributing @@ -11,6 +11,6 @@ If you'd like to contribute to go-ethereum please fork, fix, commit and send a pull request. Commits which do not comply with the coding standards are ignored (use gofmt!). -See [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide) +See [Developers' Guide](https://github.com/etherinc/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/.travis.yml b/.travis.yml index ba62b87bf5..956b078dc6 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/etherinc/go-ethereum sudo: false matrix: include: @@ -157,8 +157,8 @@ matrix: - mv android-ndk-r15c $HOME - export ANDROID_NDK=$HOME/android-ndk-r15c - - mkdir -p $GOPATH/src/github.com/ethereum - - ln -s `pwd` $GOPATH/src/github.com/ethereum + - mkdir -p $GOPATH/src/github.com/etherinc + - ln -s `pwd` $GOPATH/src/github.com/etherinc - go run build/ci.go aar -signer ANDROID_SIGNING_KEY -deploy https://oss.sonatype.org -upload gethstore/builds # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads diff --git a/README.md b/README.md index 6f95d29ce8..07b28fcf44 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/etherinc/go-ethereum) [![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/etherinc/go-ethereum/wiki/Building-Ethereum) on the wiki. Building geth requires both a Go (version 1.7 or later) and a C compiler. @@ -32,19 +32,19 @@ 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/etherinc/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/etherinc/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/etherinc/go-ethereum/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. | | `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 isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug`). | -| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/ethereum/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/ethereum/rpc-tests/blob/master/README.md) for details. | -| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/ethereum/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | +| `gethrpctest` | Developer utility tool to support our [ethereum/rpc-test](https://github.com/etherinc/rpc-tests) test suite which validates baseline conformity to the [Ethereum JSON RPC](https://github.com/etherinc/wiki/wiki/JSON-RPC) specs. Please see the [test suite's readme](https://github.com/etherinc/rpc-tests/blob/master/README.md) for details. | +| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://github.com/etherinc/wiki/wiki/RLP)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | | `swarm` | swarm daemon and tools. This is the entrypoint for the swarm network. `swarm --help` for command line options and subcommands. See https://swarm-guide.readthedocs.io for swarm documentation. | | `puppeth` | a CLI wizard that aids in creating a new Ethereum network. | ## 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/etherinc/go-ethereum/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. @@ -66,9 +66,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), - (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). + * Start up Geth's built-in interactive [JavaScript console](https://github.com/etherinc/go-ethereum/wiki/JavaScript-Console), + (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/etherinc/wiki/wiki/JavaScript-API) + as well as Geth's own [management APIs](https://github.com/etherinc/go-ethereum/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`. @@ -136,8 +136,8 @@ Do not forget `--rpcaddr 0.0.0.0`, if you want to access RPC from other containe 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 +support for a JSON-RPC based APIs ([standard APIs](https://github.com/etherinc/wiki/wiki/JSON-RPC) and +[Geth specific APIs](https://github.com/etherinc/go-ethereum/wiki/Management-APIs)). These can be exposed via HTTP, WebSockets and IPC (unix sockets on unix based platforms, and named pipes on Windows). The IPC interface is enabled by default and exposes all the APIs supported by Geth, whereas the HTTP @@ -229,7 +229,7 @@ $ bootnode --genkey=boot.key $ bootnode --nodekey=boot.key ``` -With the bootnode online, it will display an [`enode` URL](https://github.com/ethereum/wiki/wiki/enode-url-format) +With the bootnode online, it will display an [`enode` URL](https://github.com/etherinc/wiki/wiki/enode-url-format) that other nodes can use to connect to it and exchange peer information. Make sure to replace the displayed IP address information (most probably `[::]`) with your externally accessible IP to get the actual `enode` URL. @@ -290,7 +290,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/etherinc/go-ethereum/wiki/Developers'-Guide) for more details on configuring your environment, managing project dependencies and testing procedures. ## License diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 2d43b631c2..95b39493f0 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,8 +27,8 @@ import ( "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b52..2833494c97 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/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/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 ca60cc1b43..94acfbb9d0 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,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/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index bd342a8cb9..993a8bc8e9 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,21 +24,21 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "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/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/filters" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 83ad1c8ae7..c2819dd37a 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ 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/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index e31b454812..270f29720f 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/etherinc/go-ethereum/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/etherinc/go-ethereum/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index c4838e6470..b90249d128 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/etherinc/go-ethereum/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 7202ee67a1..aac545953f 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/etherinc/go-ethereum/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index 600dfcda97..70b119d5e1 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index d129993ca1..e9ff0bf5dc 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 49e6dc813a..175ed8c652 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,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/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 595f169f3a..e8ea4fdbb7 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/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 cca61e433d..71976b04ec 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -244,7 +244,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/ethereum/go-ethereum/pull/15568 +https://github.com/etherinc/go-ethereum/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index f434ffdbef..8fbb81ae32 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 9ad99f90d2..93311f91e6 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265bd..057e789f29 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 36401ee677..18d84240cb 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index e55af12939..bdc8531855 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 80efb3f7ea..658802d8ab 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // reads the integer based on its kind diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 4d7fe638c4..5da3cd20f6 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 76951e1a42..20974edd8e 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/hd.go b/accounts/hd.go index 277f688e48..c6ec7feaeb 100644 --- a/accounts/hd.go +++ b/accounts/hd.go @@ -53,7 +53,7 @@ var DefaultLedgerBaseDerivationPath = DerivationPath{0x80000000 + 44, 0x80000000 // the `coin_type` 60' (or 0x8000003C) to Ethereum. // // The root path for Ethereum is m/44'/60'/0'/0 according to the specification -// from https://github.com/ethereum/EIPs/issues/84, albeit it's not set in stone +// from https://github.com/etherinc/EIPs/issues/84, albeit it's not set in stone // yet whether accounts should increment the last component or the children of // that. We will go with the simpler approach of incrementing the last component. type DerivationPath []uint32 diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 71f698ece7..4c08afea50 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c046..cbd6fbf9c1 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index c91b7b7b61..3f2694d201 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" set "gopkg.in/fatih/set.v0" ) diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 211fa863d7..1145156299 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 80ccd37419..0c854bc3e3 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -17,7 +17,7 @@ // Package keystore implements encrypted storage of secp256k1 private keys. // // Keys are stored as encrypted JSON files according to the Web3 Secret Storage specification. -// See https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition for more information. +// See https://github.com/etherinc/wiki/wiki/Web3-Secret-Storage-Definition for more information. package keystore import ( @@ -33,11 +33,11 @@ import ( "sync" "time" - "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/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index eaec39f7df..b33ce5af1f 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -19,7 +19,7 @@ This key store behaves as KeyStorePlain with the difference that the private key is encrypted and on disk uses another JSON encoding. -The crypto is documented at https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition +The crypto is documented at https://github.com/etherinc/wiki/wiki/Web3-Secret-Storage-Definition */ @@ -36,10 +36,10 @@ import ( "io/ioutil" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/randentropy" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/keystore/keystore_passphrase_test.go b/accounts/keystore/keystore_passphrase_test.go index 630682cebd..8b1b55123d 100644 --- a/accounts/keystore/keystore_passphrase_test.go +++ b/accounts/keystore/keystore_passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index b490ca72b8..70d0073d74 100644 --- a/accounts/keystore/keystore_plain.go +++ b/accounts/keystore/keystore_plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index a1c3bc4b6c..1d868d0c8b 100644 --- a/accounts/keystore/keystore_plain_test.go +++ b/accounts/keystore/keystore_plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 6fb0a78088..55de023e7e 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 758fdfe364..7f26abfaa5 100644 --- a/accounts/keystore/keystore_wallet.go +++ b/accounts/keystore/keystore_wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 1554294e14..92f02145c4 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) @@ -64,7 +64,7 @@ func decryptPreSaleKey(fileContent []byte, password string) (key *Key, err error iv := encSeedBytes[:16] cipherText := encSeedBytes[16:] /* - See https://github.com/ethereum/pyethsaletool + See https://github.com/etherinc/pyethsaletool pyethsaletool generates the encryption key from password by 2000 rounds of PBKDF2 with HMAC-SHA-256 using password as salt (:(). diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index bbcfb99257..6ce9a735d2 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 96ca298fc5..0b92fe3917 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 61fc98ccc8..f405f5b073 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index f5def61d23..66bce1d90f 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index b84a955992..7230cd913e 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/usbwallet/internal/trezor" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 8b3b5a5224..ab4052a4e7 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,11 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" "github.com/karalabe/hid" ) diff --git a/bmt/bmt_test.go b/bmt/bmt_test.go index 57df83060a..21017b5da3 100644 --- a/bmt/bmt_test.go +++ b/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/crypto/sha3" ) const ( diff --git a/build/ci.go b/build/ci.go index 1f98bb8438..0e2734c4b1 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,7 +58,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/etherinc/go-ethereum/internal/build" ) var ( @@ -737,7 +737,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", "--ndk", os.Getenv("ANDROID_NDK"))) - 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/etherinc/go-ethereum/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -857,7 +857,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "--target", "ios", "--tags", "ios", "-v", "github.com/etherinc/go-ethereum/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb.control b/build/deb.control index 5c9ce6705c..b20de3faca 100644 --- a/build/deb.control +++ b/build/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.9 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/etherinc/go-ethereum.git +Vcs-Browser: https://github.com/etherinc/go-ethereum Package: {{.Name}} Architecture: any diff --git a/build/env.sh b/build/env.sh index 3914555d1b..7d91f6f937 100755 --- a/build/env.sh +++ b/build/env.sh @@ -10,7 +10,7 @@ fi # Create fake Go workspace if it doesn't exist yet. workspace="$PWD/build/_workspace" root="$PWD" -ethdir="$workspace/src/github.com/ethereum" +ethdir="$workspace/src/github.com/etherinc" if [ ! -L "$ethdir/go-ethereum" ]; then mkdir -p "$ethdir" cd "$ethdir" diff --git a/build/mvn.pom b/build/mvn.pom index 7670246ba9..1d0c4d8c7a 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/etherinc/go-ethereum 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/etherinc/go-ethereum/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/etherinc/go-ethereum diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 9afc6a2820..340eadcdff 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/etherinc/go-ethereum/issues" +!define UPDATEURL "https://github.com/etherinc/go-ethereum/releases" +!define ABOUTURL "https://github.com/etherinc/go-ethereum#ethereum-go" !define /date NOW "%Y%m%d" PageEx license @@ -33,7 +33,7 @@ Section "Geth" GETH_IDX SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30103)" "" 6 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30103 "" "" SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30103)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30103 "" "" - # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147) + # Set default IPC endpoint (https://github.com/etherinc/EIPs/issues/147) ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc" diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh index e8f9a9bcc0..33805d231e 100644 --- a/build/nsis.uninstall.nsh +++ b/build/nsis.uninstall.nsh @@ -21,7 +21,7 @@ Section "Uninstall" SimpleFC::AdvRemoveRule "Geth outgoing peers (TCP:30103)" SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30103)" - # Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147) + # Remove IPC endpoint (https://github.com/etherinc/EIPs/issues/147) ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" # Remove install directory from PATH diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280c7..f8e886c4c9 100644 --- a/build/pod.podspec +++ b/build/pod.podspec @@ -2,12 +2,12 @@ Pod::Spec.new do |spec| spec.name = 'Geth' spec.version = '{{.Version}}' spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } - spec.homepage = 'https://github.com/ethereum/go-ethereum' + spec.homepage = 'https://github.com/etherinc/go-ethereum' 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/etherinc/go-ethereum.git', :commit => '{{.Commit}}' } spec.platform = :ios spec.ios.deployment_target = '9.0' diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 3a1ae6f4c3..54b0dc3989 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/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index ecfc6fc24e..880746a9bb 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,13 +24,13 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p/netutil" ) func main() { diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 6d57d17fb4..67c8b7c78f 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 219a5460b8..fe48cd2150 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -5,9 +5,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 2a9e5ee483..513096aefb 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 531a931c82..1bf7bcf47e 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 8ce4fe5cde..e9ac69a584 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/etherinc/go-ethereum/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 0e563bf922..77166fa009 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70..e744d2bb5c 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/etherinc/go-ethereum/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 4a442cf784..8995231d9b 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/etherinc/go-ethereum/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 753ca62264..a699a6112b 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/etherinc/go-ethereum/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/json_logger.go b/cmd/evm/json_logger.go index 47daf7dbbc..5ba1803cc4 100644 --- a/cmd/evm/json_logger.go +++ b/cmd/evm/json_logger.go @@ -22,9 +22,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 6c39cf8b88..9f21c96091 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index a9a2e5420f..e0b3a271b1 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( goruntime "runtime" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/cmd/evm/internal/compiler" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/core/vm/runtime" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 071ea94ad0..736bf9c7a9 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 08cab012b8..17fb85fe61 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/ethstats" + "github.com/etherinc/go-ethereum/les" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/params" "golang.org/x/net/websocket" ) @@ -450,7 +450,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/ethereum/go-ethereum/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/etherinc/go-ethereum/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 0db5c4ce0f..7201679dbc 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/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 3ea22ccfab..efa0562480 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -173,7 +173,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/ethereum/go-ethereum/issues/1785 +// https://github.com/etherinc/go-ethereum/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go index ce9dbe6c0a..54a94b6b10 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/cmd/internal/browser" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/cmd/internal/browser" + "github.com/etherinc/go-ethereum/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) @@ -41,7 +41,7 @@ var bugCommand = cli.Command{ Category: "MISCELLANEOUS COMMANDS", } -const issueUrl = "https://github.com/ethereum/go-ethereum/issues/new" +const issueUrl = "https://github.com/etherinc/go-ethereum/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 35bf576e1d..2442ad41df 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,17 +25,17 @@ 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/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 50e4de2e78..c5da3e0611 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,12 +27,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/dashboard" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/params" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 9d5cc38a1b..b8718cf4e0 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -23,10 +23,10 @@ import ( "path/filepath" "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/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) @@ -42,7 +42,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/etherinc/go-ethereum/wiki/Javascipt-Console.`, } attachCommand = cli.Command{ @@ -55,7 +55,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/etherinc/go-ethereum/wiki/Javascipt-Console. This command allows to open a console on a running geth node.`, } @@ -68,7 +68,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/etherinc/go-ethereum/wiki/Javascipt-Console`, } ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 258b9e6dd9..ae8e9fdda7 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index a8dbc51630..1e6887d92e 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index cb8d63bf71..d8e95c96bd 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,17 +25,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/internal/debug" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index aa9b1ee568..7495fb65d9 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index cd19caa276..7ed5e427fc 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/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index da82facac3..3bdd85d7f0 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/etherinc/go-ethereum/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index a2bcaff027..f17955dbf6 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 56b74d135b..70afae6463 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -29,12 +29,12 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index f747f47395..a3f9ff05cf 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -21,11 +21,11 @@ import ( "errors" "math" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a..30601eb22f 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 1092c4c88e..29a13f86ec 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -211,7 +211,7 @@ var dashboardContent = ` 
ethereumwallet --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFullFlat}}


-

You can download the Ethereum Wallet from https://github.com/ethereum/mist/releases.

+

You can download the Ethereum Wallet from https://github.com/etherinc/mist/releases.

@@ -232,7 +232,7 @@ var dashboardContent = ` 
mist --rpc $HOME/.{{.Network}}/geth.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFullFlat}}


-

You can download the Mist browser from https://github.com/ethereum/mist/releases.

+

You can download the Mist browser from https://github.com/etherinc/mist/releases.

@@ -256,7 +256,7 @@ var dashboardContent = `

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.

Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +

The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Java code you can now import the geth archive and connect to Ethereum: 

import org.ethereum.geth.*;
@@ -287,7 +287,7 @@ node.start();

Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.

Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.


-

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +

Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.

Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.

Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous): 

import Geth
@@ -337,7 +337,7 @@ try! node?.start(); 
eth --config {{.CppGenesis}} --datadir $HOME/.{{.Network}} --peerset "{{.CppBootnodes}}"


-

You can find cpp-ethereum at https://github.com/ethereum/cpp-ethereum/.

+

You can find cpp-ethereum at https://github.com/etherinc/cpp-ethereum/.

@@ -401,7 +401,7 @@ try! node?.start(); 
pyethapp -c eth.genesis="$(cat {{.PythonGenesis}})" -c eth.network_id={{.NetworkID}} -c data_dir=$HOME/.config/pyethapp/{{.Network}} -c discovery.bootstrap_nodes="[{{.PythonBootnodes}}]" -c eth.block.HOMESTEAD_FORK_BLKNUM={{.Homestead}} -c eth.block.ANTI_DOS_FORK_BLKNUM={{.Tangerine}} -c eth.block.SPURIOUS_DRAGON_FORK_BLKNUM={{.Spurious}} -c eth.block.METROPOLIS_FORK_BLKNUM={{.Byzantium}} -c eth.block.DAO_FORK_BLKNUM=18446744073709551615 run --console


-

You can find pyethapp at https://github.com/ethereum/pyethapp/.

+

You can find pyethapp at https://github.com/etherinc/pyethapp/.

@@ -419,7 +419,7 @@ try! node?.start();

Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.

Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.


-

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/ethereum/go-ethereum/cmd/puppeth

+

Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:

go get github.com/etherinc/go-ethereum/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 20b7afe236..b792b2f519 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index 427134153b..6befd3a956 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // explorerDockerfile is the Dockerfile required to run a block explorer. diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 06754954ad..4def058c80 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 35c0efc8ad..fc8e8e1ae3 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // nginxDockerfile is theis the Dockerfile required to build an nginx reverse- diff --git a/cmd/puppeth/module_node.go b/cmd/puppeth/module_node.go index 69cb19c349..052de20636 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 67f47c70e8..e801ae5177 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 26382dac13..f3d5007075 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 158261ce05..5d981bf358 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go index 2e2b4644cf..ba5ec46faa 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -30,9 +30,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 5f781c4152..b8bf52b5d5 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index fb2529c267..6517f7681d 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // deployEthstats queries the user for various input on deploying an ethstats diff --git a/cmd/puppeth/wizard_explorer.go b/cmd/puppeth/wizard_explorer.go index 48d88a5149..7cddd5fab1 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // deployExplorer creates a new block explorer based on some user input. diff --git a/cmd/puppeth/wizard_faucet.go b/cmd/puppeth/wizard_faucet.go index 9eb3c6db1e..4b3ca22ee7 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index f255ef6e65..aa0087f82e 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" ) // makeGenesis creates a new genesis struct based on some user input. diff --git a/cmd/puppeth/wizard_intro.go b/cmd/puppeth/wizard_intro.go index 84998afc93..02e99903b3 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index e19180bb16..af6ba91027 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index d780c550b1..e310250efb 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 4eeae93a0b..e53ec8e7d9 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // ensureVirtualHost checks whether a reverse-proxy is running on the specified diff --git a/cmd/puppeth/wizard_node.go b/cmd/puppeth/wizard_node.go index aa2c2b6fb4..cb9a4470b5 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" ) // deployNode creates a new node configuration based on some user input. diff --git a/cmd/puppeth/wizard_wallet.go b/cmd/puppeth/wizard_wallet.go index f226436196..a062d05f66 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..4d91f87f21 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/etherinc/go-ethereum/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 29b5faefa8..2cfdf8dfa7 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -27,13 +27,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/etherinc/go-ethereum/swarm/api" ) var ( @@ -83,7 +83,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/ethereum/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/etherinc/go-ethereum/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 166980d148..d33b20af09 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/swarm" + "github.com/etherinc/go-ethereum/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index dfd2d069b9..214aff96db 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 792e8d0d7a..b52b2be09f 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..a7eea1808d 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/etherinc/go-ethereum/cmd/utils" + swarm "github.com/etherinc/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 77315a4265..dea0481d81 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -31,23 +31,23 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/contracts/ens" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/internal/debug" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/swarm" + bzzapi "github.com/etherinc/go-ethereum/swarm/api" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index aa276e0f9b..1717321055 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/swarm/api" + swarm "github.com/etherinc/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index ed15028685..6fc04cb292 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,13 +27,13 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/internal/cmdtest" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9f4c525bb9..6c99727ae1 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -30,8 +30,8 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/etherinc/go-ethereum/cmd/utils" + swarm "github.com/etherinc/go-ethereum/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 53cdf7861c..30a304da4c 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -26,12 +26,12 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/internal/debug" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..3a6871b5c1 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 28baafb1c9..3d70c4695d 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,34 +28,34 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/fdlimit" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/clique" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/dashboard" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/ethstats" + "github.com/etherinc/go-ethereum/les" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/params" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 20582faa79..4499d824bb 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -34,16 +34,16 @@ import ( "strings" "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/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/console" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/whisper/mailserver" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 9bd1de103a..99be7245fd 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..8f6ca8e735 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/etherinc/go-ethereum/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..4e08c5da02 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..4c25d588e4 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index 6dab2436de..a9453073ef 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/etherinc/go-ethereum/common" ) var tt256 = new(big.Int).Lsh(big.NewInt(1), 256) diff --git a/common/number/uint_test.go b/common/number/uint_test.go index 3ab9e4c344..8ca1f20e9f 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/etherinc/go-ethereum/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index fdc67480c2..da9cfef9e8 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto/sha3" ) const ( diff --git a/common/types_test.go b/common/types_test.go index db636812ce..eafab63cf5 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -124,7 +124,7 @@ func TestAddressHexChecksum(t *testing.T) { Input string Output string }{ - // Test cases from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md#specification + // Test cases from https://github.com/etherinc/EIPs/blob/master/EIPS/eip-55.md#specification {"0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed", "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"}, {"0xfb6916095ca1df60bb79ce92ce3ea74c37c5d359", "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359"}, {"0xdbf03b407c01e7cd3cbea99509d93f8dddc8c6fb", "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB"}, diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 0e7ad90aec..136b2f4d46 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/etherinc/go-ethereum/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b875eef012..d723a52204 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -17,10 +17,10 @@ package clique import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 2bdad9092a..698d1c214d 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,20 +25,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9ebdb8df15..47082d38d9 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 8b51e6e094..a4335c339e 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index be5e661c12..69edea599d 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" "math/big" ) diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 10767bb312..b9aa1ce492 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -26,11 +26,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index a54f3b582c..2d57e8049b 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/types" ) // Tests that verification caches can be correctly generated. diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index a9897a8b02..51ae78629b 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,13 +25,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" set "gopkg.in/fatih/set.v0" ) @@ -323,7 +323,7 @@ var ( // the difficulty that a new block should have when created at time given the // parent block's time and difficulty. The calculation uses the Byzantium rules. func calcDifficultyByzantium(time uint64, parent *types.Header) *big.Int { - // https://github.com/ethereum/EIPs/issues/100. + // https://github.com/etherinc/EIPs/issues/100. // algorithm: // diff = (parent_diff + // (parent_diff / 2048 * max((2 if len(parent.uncles) else 1) - ((timestamp - parent.timestamp) // 9), -99)) @@ -358,7 +358,7 @@ func calcDifficultyByzantium(time uint64, parent *types.Header) *big.Int { x.Set(params.MinimumDifficulty) } // calculate a fake block numer for the ice-age delay: - // https://github.com/ethereum/EIPs/pull/669 + // https://github.com/etherinc/EIPs/pull/669 // fake_block_number = min(0, block.number - 3_000_000 fakeBlockNumber := new(big.Int) if parent.Number.Cmp(big2999999) >= 0 { @@ -382,7 +382,7 @@ func calcDifficultyByzantium(time uint64, parent *types.Header) *big.Int { // the difficulty that a new block should have when created at time given the // parent block's time and difficulty. The calculation uses the Homestead rules. func calcDifficultyHomestead(time uint64, parent *types.Header) *big.Int { - // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2.md + // https://github.com/etherinc/EIPs/blob/master/EIPS/eip-2.md // algorithm: // diff = (parent_diff + // (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99)) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66..1a3953ccdb 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 91e20112ae..19f292c9b5 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,9 +33,9 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rpc" "github.com/hashicorp/golang-lru/simplelru" metrics "github.com/rcrowley/go-metrics" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 31116da437..a4d4b686cc 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/types" ) // Tests that ethash works correctly in test mode. @@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/ethereum/go-ethereum/issues/14943 +// It reproduces https://github.com/etherinc/go-ethereum/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index b5e742d8bb..d8dfb9e2a0 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" ) // Seal implements consensus.Engine, attempting to find a nonce that satisfies diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52..1ac6086ce7 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..e4f8c24fe1 100644 --- a/consensus/misc/forks.go +++ b/consensus/misc/forks.go @@ -19,9 +19,9 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b28cc438e2..29a3dab4a1 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts/usbwallet" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 52fe1f542a..ab7d871db6 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/etherinc/go-ethereum/internal/jsre" + "github.com/etherinc/go-ethereum/internal/web3ext" + "github.com/etherinc/go-ethereum/rpc" "github.com/mattn/go-colorable" "github.com/peterh/liner" "github.com/robertkrimen/otto" diff --git a/console/console_test.go b/console/console_test.go index 7b1629c032..bd6113f880 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/node" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/internal/jsre" + "github.com/etherinc/go-ethereum/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index da3e107db4..7d232ff9e8 100644 --- a/containers/docker/develop-alpine/Dockerfile +++ b/containers/docker/develop-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/etherinc/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/develop-ubuntu/Dockerfile b/containers/docker/develop-ubuntu/Dockerfile index 255b49bebb..04b0f99685 100644 --- a/containers/docker/develop-ubuntu/Dockerfile +++ b/containers/docker/develop-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 https://github.com/etherinc/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile index 13028fc9d6..08e6e4314c 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apk del go git make gcc musl-dev linux-headers && \ diff --git a/containers/docker/master-ubuntu/Dockerfile b/containers/docker/master-ubuntu/Dockerfile index d56d205a57..2c820561f8 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.7 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.7 https://github.com/etherinc/go-ethereum && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/containers/vagrant/Vagrantfile b/containers/vagrant/Vagrantfile index 72ec366e21..92da08fd7d 100644 --- a/containers/vagrant/Vagrantfile +++ b/containers/vagrant/Vagrantfile @@ -34,5 +34,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| end config.vm.synced_folder ".", "/vagrant", :disabled => true - config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/ethereum/go-ethereum" + config.vm.synced_folder "../../", "/home/vagrant/go/src/github.com/etherinc/go-ethereum" end diff --git a/containers/vagrant/provisioners/shell/centos.sh b/containers/vagrant/provisioners/shell/centos.sh index 744da4bfd4..1479b88d66 100755 --- a/containers/vagrant/provisioners/shell/centos.sh +++ b/containers/vagrant/provisioners/shell/centos.sh @@ -6,6 +6,6 @@ sudo yum update -y wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/debian.sh b/containers/vagrant/provisioners/shell/debian.sh index 1c1793336d..9af5e4b76b 100755 --- a/containers/vagrant/provisioners/shell/debian.sh +++ b/containers/vagrant/provisioners/shell/debian.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/containers/vagrant/provisioners/shell/ubuntu.sh b/containers/vagrant/provisioners/shell/ubuntu.sh index 1c1793336d..9af5e4b76b 100755 --- a/containers/vagrant/provisioners/shell/ubuntu.sh +++ b/containers/vagrant/provisioners/shell/ubuntu.sh @@ -6,6 +6,6 @@ sudo apt-get update wget --continue https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz sudo tar -C /usr/local -xzf go1.8.1.linux-amd64.tar.gz -GETH_PATH="~vagrant/go/src/github.com/ethereum/go-ethereum/build/bin/" +GETH_PATH="~vagrant/go/src/github.com/etherinc/go-ethereum/build/bin/" echo "export PATH=$PATH:/usr/local/go/bin:$GETH_PATH" >> ~vagrant/.bashrc diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b2b2365f31..e1ea2271dd 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/etherinc/go-ethereum/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 92bd896e0a..f8a5eaae8c 100644 --- a/contracts/chequebook/cheque.go +++ b/contracts/chequebook/cheque.go @@ -36,14 +36,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/contracts/chequebook/contract" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/services/swap/swap" ) // TODO(zelig): watch peer solvency and notify of bouncing cheques diff --git a/contracts/chequebook/cheque_test.go b/contracts/chequebook/cheque_test.go index b7555d0815..b5ab0fe687 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/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/contracts/chequebook/contract" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e275ac9b8d..9f4faba6bd 100644 --- a/contracts/chequebook/contract/chequebook.go +++ b/contracts/chequebook/contract/chequebook.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index 45f6d68f3e..67357502f9 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/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" + "github.com/etherinc/go-ethereum/contracts/chequebook/contract" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/README.md b/contracts/ens/README.md index c09b47e39d..89edb8730d 100644 --- a/contracts/ens/README.md +++ b/contracts/ens/README.md @@ -2,7 +2,7 @@ ## Usage -Full documentation for the Ethereum Name Service [can be found as EIP 137](https://github.com/ethereum/EIPs/issues/137). +Full documentation for the Ethereum Name Service [can be found as EIP 137](https://github.com/etherinc/EIPs/issues/137). This package offers a simple binding that streamlines the registration of arbitrary UTF8 domain names to swarm content hashes. ## Development diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index cbf6cb05b3..d760716efa 100644 --- a/contracts/ens/contract/ens.go +++ b/contracts/ens/contract/ens.go @@ -6,12 +6,12 @@ package contract import ( "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index a08380adfc..a35a455ef4 100644 --- a/contracts/ens/contract/fifsregistrar.go +++ b/contracts/ens/contract/fifsregistrar.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/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index c567d5884a..53c5415007 100644 --- a/contracts/ens/contract/publicresolver.go +++ b/contracts/ens/contract/publicresolver.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index 06045a5cd8..a12e539f95 100644 --- a/contracts/ens/ens.go +++ b/contracts/ens/ens.go @@ -23,11 +23,11 @@ package ens import ( "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/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/contracts/ens/contract" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 0016f47dbf..3d634da55d 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,11 +20,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/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/accounts/abi/bind/backends" + "github.com/etherinc/go-ethereum/contracts/ens/contract" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index ce22f93f92..136b4149fc 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 318c4e4d80..300cc841d8 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index e23f0d19d1..8ce85e4d46 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 98958809b7..27fceaf52a 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -19,10 +19,10 @@ package core import ( "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index e334b3c3cd..59aa4c00f2 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 8d141fddb5..fbbf926107 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,20 +27,20 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 635379161c..be0cff00bf 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // newTestBlockChain creates a blockchain without validation. @@ -1202,7 +1202,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/etherinc/go-ethereum/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..bf06dbcf57 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/etherinc/go-ethereum/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 540085450d..405272267a 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/types" ) // errSectionOutOfBounds is returned if the user tried to add more bloom filters diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0..3e9a59b6d0 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index ce3031702f..f7ad57f0a9 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 7a5f78ef3a..75ca4beecd 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) const testSectionSize = 4096 @@ -82,7 +82,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifter from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/etherinc/go-ethereum/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 158ed83245..ce257d6dde 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ 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/event" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index 9fc09eda51..bcc460141e 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 6744428ffb..b4aac3d927 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/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 93be43ddce..1d40b1ea09 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -20,12 +20,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index e0a3e3ff37..78bf0a97f4 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/database_util.go b/core/database_util.go index c6b125dae9..0010cc4079 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) // DatabaseReader wraps the Get method of a backing data store. diff --git a/core/database_util_test.go b/core/database_util_test.go index ab4e45a478..6e9bf9b379 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index 6f404f612b..ac8645d49a 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 55db53927b..9e61383a10 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,10 +19,10 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..780980dc57 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..02021bb914 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index ce94721d40..85239ad1b8 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,15 +25,15 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index cd548d4b1d..5cbf1e6e76 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 0e5215293d..d63aac1ac5 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -25,12 +25,12 @@ import ( mrand "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 698a2924cb..210a82441a 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..f510f245f0 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -34,8 +34,8 @@ import ( "sort" "strconv" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/state/database.go b/core/state/database.go index 36926ec69d..3edaa5a92e 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -20,9 +20,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 46e612850a..a0061e3e53 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..60a7d8340c 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -20,9 +20,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 9e46c851cd..10c1e86e98 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index a89bb3d13a..06a982bb64 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/etherinc/go-ethereum/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..5799aa3236 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/etherinc/go-ethereum/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 1cfdd3a890..e94ba1d19b 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index b2112bfaec..4d03c14682 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,9 +22,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index dbbb59d5c6..f6b0496d5b 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 776693e248..ef37b21881 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index d9e3d9b797..84062ef48d 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -30,9 +30,9 @@ import ( check "gopkg.in/check.v1" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to @@ -119,7 +119,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a statedb object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://github.com/etherinc/go-ethereum/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" db, _ := ethdb.NewMemDatabase() diff --git a/core/state/sync.go b/core/state/sync.go index 28fcf6ae05..d823e7bd96 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -19,9 +19,9 @@ package state import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 8f14a44e7a..9d985a97a2 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index 4dc58b9dea..0dcb6b9d17 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,14 +17,14 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index 390473fffd..77a8cfdbd1 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index e872d7b530..759cb8b9cb 100644 --- a/core/tx_journal.go +++ b/core/tx_journal.go @@ -21,10 +21,10 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 55fc42617d..838ff2ccd5 100644 --- a/core/tx_list.go +++ b/core/tx_list.go @@ -22,9 +22,9 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index d579f501af..136b1d8cc0 100644 --- a/core/tx_list_test.go +++ b/core/tx_list_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/tx_pool.go b/core/tx_pool.go index dc3ddc4232..08be2f9be4 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 158b9776ba..78f31290b9 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -26,13 +26,13 @@ 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/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa7..540fb06a5c 100644 --- a/core/types.go +++ b/core/types.go @@ -17,9 +17,9 @@ package core import ( - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/block.go b/core/types/block.go index 92b868d9da..ec8b47986a 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1..6e8256e05a 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c5..d501958986 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..c6a78fc4cf 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/etherinc/go-ethereum/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..ec0f83f68b 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9cf4..627cb3823e 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653..4f4769cba4 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index c297adebb6..83e529ae98 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096..bba0804abd 100644 --- a/core/types/gen_tx_json.go +++ b/core/types/gen_tx_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index be5de38da7..f024346127 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..7794e78905 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index f945f6f6a2..e5162cc731 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -22,9 +22,9 @@ import ( "io" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/rlp" ) //go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/transaction.go b/core/types/transaction.go index 5660582baf..1fda9ed6e4 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index dfc84fdac7..e3b31e8928 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..472c53bca7 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index d1861b14cd..363a222cd7 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,13 +23,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) // The values in those tests are from the Transaction Tests -// at github.com/ethereum/tests. +// at github.com/etherinc/tests. var ( emptyTx = NewTransaction( 0, diff --git a/core/vm/analysis.go b/core/vm/analysis.go index f9c4298d39..dc0b339878 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/etherinc/go-ethereum/common" ) // destinations stores one map per contract (keyed by hash of code). diff --git a/core/vm/common.go b/core/vm/common.go index 17de38decb..cdf6c263c9 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 66748e8215..6d2b8ea09a 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/etherinc/go-ethereum/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 7344b6043c..46c23d51c4 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -21,11 +21,11 @@ import ( "errors" "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/crypto/bn256" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/bn256" + "github.com/etherinc/go-ethereum/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 513651835a..75b66e3ce0 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -5,7 +5,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index 46e7baff4c..ecd398c6e6 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index dd64d5f178..84f4b99172 100644 --- a/core/vm/gas.go +++ b/core/vm/gas.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 83adba428e..23b322e297 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index ade3ca6318..5a2b4c7f0c 100644 --- a/core/vm/gen_structlog.go +++ b/core/vm/gen_structlog.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 7661725010..0c6a7d9ec0 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 18644989c1..d216acadc5 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/params" ) func TestByteOp(t *testing.T) { diff --git a/core/vm/interface.go b/core/vm/interface.go index 1ef91cf1d6..42fd928811 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 482e67a3a9..cb808d520e 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,10 +20,10 @@ import ( "fmt" "sync/atomic" - "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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index a1c5ad9c67..a1191b5059 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 4c820d8b53..fd637e0d1a 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 915f7177e7..c284659b59 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index bec0235bcc..56851a3741 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index b71ead0d77..eddda01db6 100644 --- a/core/vm/noop.go +++ b/core/vm/noop.go @@ -19,8 +19,8 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9d..24e1c8adfe 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,9 +17,9 @@ package runtime import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index ef5929985c..8a56027700 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.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/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..4a6bb43697 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 2c4dc50265..cf4acd6970 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/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..3048e743c6 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index eb3acfb10d..79d40abb9a 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -25,7 +25,7 @@ int evmjit_run(void* _jit, void* _data, void* _env); void evmjit_destroy(void* _jit); // Shared library evmjit (e.g. libevmjit.so) is expected to be installed in /usr/local/lib -// More: https://github.com/ethereum/evmjit +// More: https://github.com/etherinc/evmjit #cgo LDFLAGS: -levmjit */ import "C" @@ -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/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/params" ) type JitVm struct { diff --git a/crypto/crypto.go b/crypto/crypto.go index 1c4d5a2e02..f45a3f892c 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,10 +28,10 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 8350354623..1353a3d761 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 9cd5c79f7e..76f6db63f3 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -40,7 +40,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..a937d6279d 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/etherinc/go-ethereum/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index df80481857..75962b1ee0 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index f6582ecd54..90c2627da4 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221e..15178663b7 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..e3821173c9 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var ( diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d..00177a55d9 100644 --- a/dashboard/cpu.go +++ b/dashboard/cpu.go @@ -21,7 +21,7 @@ package dashboard import ( "syscall" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 09038638ed..3b358d7534 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -35,10 +35,10 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" "github.com/rcrowley/go-metrics" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index a345b57e49..0e0c329639 100644 --- a/eth/api.go +++ b/eth/api.go @@ -25,17 +25,17 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/miner" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index 91f392f94f..fbe04d17fb 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 248bc3ab6a..ee7f78ba95 100644 --- a/eth/api_test.go +++ b/eth/api_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 07c4457bc3..6dfdbfb57b 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/tracers" + "github.com/etherinc/go-ethereum/internal/ethapi" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 94aad23101..5e50cd1ba7 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,29 +25,29 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/clique" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/filters" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/internal/ethapi" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/miner" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index c5597391c5..f744085f4c 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) const ( diff --git a/eth/config.go b/eth/config.go index dd7f42c7d9..360ba52e3a 100644 --- a/eth/config.go +++ b/eth/config.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index d41afa17c0..abb5dd1d53 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index d496fa6a4d..8f05f66902 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -20,9 +20,9 @@ import ( "context" "sync" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/rpc" ) // PublicDownloaderAPI provides an API which gives information about the current synchronisation status. diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 7f490d9e9b..37080cb37a 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,13 +25,13 @@ 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/log" - "github.com/ethereum/go-ethereum/params" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" "github.com/rcrowley/go-metrics" ) diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index d94d55f114..aeddaf6bf5 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/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index b45acff7d0..79ea211e41 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader 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/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" ) // FakePeer is a mock downloader peer that operates on a local database instance diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 58764ccf06..b9eaaeefb2 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/etherinc/go-ethereum/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index a4aa861146..a4ba271a9d 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index a1a70e46ea..7154c37da5 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" "github.com/rcrowley/go-metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 9cc65a208c..579f3059c1 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/trie" ) // stateReq represents a batch of state fetch requests groupped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index 3f30ea9dd1..ae394599c2 100644 --- a/eth/downloader/types.go +++ b/eth/downloader/types.go @@ -19,7 +19,7 @@ package downloader import ( "fmt" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/types" ) // peerDropFn is a callback type for dropping a peer detected as malicious. diff --git a/eth/fetcher/fetcher.go b/eth/fetcher/fetcher.go index 50966f5eeb..e8975d071e 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 9d53b98b60..94d2fe6f06 100644 --- a/eth/fetcher/fetcher_test.go +++ b/eth/fetcher/fetcher_test.go @@ -24,13 +24,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index 1ed8075bf3..0e7ceac738 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/etherinc/go-ethereum/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 406c9442e0..f310b03e50 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/rpc" ) var ( @@ -101,7 +101,7 @@ func (api *PublicFilterAPI) timeoutLoop() { // It is part of the filter package because this filter can be used throug the // `eth_getFilterChanges` polling method that is also used for log filters. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newpendingtransactionfilter +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_newpendingtransactionfilter func (api *PublicFilterAPI) NewPendingTransactionFilter() rpc.ID { var ( pendingTxs = make(chan common.Hash) @@ -167,7 +167,7 @@ func (api *PublicFilterAPI) NewPendingTransactions(ctx context.Context) (*rpc.Su // NewBlockFilter creates a filter that fetches blocks that are imported into the chain. // It is part of the filter package since polling goes with eth_getFilterChanges. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newblockfilter +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_newblockfilter func (api *PublicFilterAPI) NewBlockFilter() rpc.ID { var ( headers = make(chan *types.Header) @@ -289,7 +289,7 @@ type FilterCriteria struct { // // In case "fromBlock" > "toBlock" an error is returned. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_newfilter +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_newfilter func (api *PublicFilterAPI) NewFilter(crit FilterCriteria) (rpc.ID, error) { logs := make(chan []*types.Log) logsSub, err := api.events.SubscribeLogs(ethereum.FilterQuery(crit), logs) @@ -324,7 +324,7 @@ func (api *PublicFilterAPI) NewFilter(crit FilterCriteria) (rpc.ID, error) { // GetLogs returns logs matching the given argument that are stored within the state. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getlogs +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_getlogs func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([]*types.Log, error) { // Convert the RPC block numbers into internal representations if crit.FromBlock == nil { @@ -345,7 +345,7 @@ func (api *PublicFilterAPI) GetLogs(ctx context.Context, crit FilterCriteria) ([ // UninstallFilter removes the filter with the given filter id. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_uninstallfilter +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_uninstallfilter func (api *PublicFilterAPI) UninstallFilter(id rpc.ID) bool { api.filtersMu.Lock() f, found := api.filters[id] @@ -363,7 +363,7 @@ func (api *PublicFilterAPI) UninstallFilter(id rpc.ID) bool { // GetFilterLogs returns the logs for the filter with the given id. // If the filter could not be found an empty array of logs is returned. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getfilterlogs +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_getfilterlogs func (api *PublicFilterAPI) GetFilterLogs(ctx context.Context, id rpc.ID) ([]*types.Log, error) { api.filtersMu.Lock() f, found := api.filters[id] @@ -397,7 +397,7 @@ func (api *PublicFilterAPI) GetFilterLogs(ctx context.Context, id rpc.ID) ([]*ty // For pending transaction and block filters the result is []common.Hash. // (pending)Log filters return []Log. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_getfilterchanges +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_getfilterchanges func (api *PublicFilterAPI) GetFilterChanges(id rpc.ID) (interface{}, error) { api.filtersMu.Lock() defer api.filtersMu.Unlock() diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 4ae37f9779..89ae708937 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 0a0929bc10..8c0f063637 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 43d7e2a812..41d2fee5d1 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index b09998f9c7..359242ba97 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/rpc" ) // Type determines the kind of filter and is used to put the filter in to diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 7ec3b4be7f..50c192dcd1 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 0018142c46..e1ad089035 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 54325692c6..962c9bc2d7 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,11 +22,11 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/internal/ethapi" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 4f2e82d941..9aef09611d 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index c2426544f6..534e82f610 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/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/fetcher" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index e336dfa285..1d42836dd3 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index 2b05cea801..b2ca912a56 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -27,18 +27,18 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 5fa2597d4d..a90c27dbe5 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/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 42ead53965..c8ba6f2cef 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index cd7db57f23..2a70c0744a 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -21,11 +21,11 @@ import ( "io" "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/event" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index b2f93d8dd1..afea4a5b30 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -22,12 +22,12 @@ 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/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index a8ae646170..f2547778a5 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 88c10c7f74..8a999a06a3 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" ) // Tests that fast sync gets disabled as soon as a real block is successfully diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go index f3f848fc1b..45f09574b7 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 7224a1489f..2e5eda46ca 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..a96dc3c918 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/eth/tracers/internal/tracers" + "github.com/etherinc/go-ethereum/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index bf8120228f..a3821dfc84 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 87a912901a..c54ba25025 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,12 +24,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be98..afcfc7ab10 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/etherinc/go-ethereum" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..abb8715abd 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethdb/database.go b/ethdb/database.go index d86585f079..b10371d4ce 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 5e4a3ca34a..a969cdd7ac 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -25,7 +25,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 8efd7bf845..b947d96467 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/etherinc/go-ethereum/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index ae7e252654..6b9064e2f0 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/les" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..08776fc104 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..82370d8501 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..44d5a4f7fc 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/etherinc/go-ethereum/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..31188a7289 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/interfaces.go b/interfaces.go index 1ae1eba48a..858dd52e2b 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,8 +22,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/debug/api.go b/internal/debug/api.go index 3547b05641..4cfdde388d 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 6247cc7dc0..2dc5f75c4d 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,8 +24,8 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/log/term" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/log/term" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..b7d212d9fc 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -23,7 +23,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 5a9c948b83..4a61cef556 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 314086335c..339dbcd1a5 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -25,21 +25,21 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -421,7 +421,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/etherinc/go-ethereum/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -448,7 +448,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/etherinc/go-ethereum/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") @@ -1225,7 +1225,7 @@ func (s *PublicTransactionPoolAPI) SendRawTransaction(ctx context.Context, encod // // The account associated with addr must be unlocked. // -// https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign +// https://github.com/etherinc/wiki/wiki/JSON-RPC#eth_sign func (s *PublicTransactionPoolAPI) Sign(addr common.Address, data hexutil.Bytes) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index af95d7906f..bac95326be 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -21,17 +21,17 @@ import ( "context" "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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 9c7ad16d18..96268c60e6 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index 9bb899384b..1355056264 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5862,7 +5862,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/etherinc/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f05865eca6..4be1f61cf8 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/jsre/deps" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 56f617a7db..4d51c57807 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 6a324cb04b..4d1c4871f1 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/bloombits" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/eth/filters" + "github.com/etherinc/go-ethereum/eth/gasprice" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/internal/ethapi" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/params" + rpc "github.com/etherinc/go-ethereum/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index de233d7518..45244bc48d 100644 --- a/les/bloombits.go +++ b/les/bloombits.go @@ -19,8 +19,8 @@ package les import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/light" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index 3fc4df30b9..f36a8f71a7 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809cc..e57037cea9 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/etherinc/go-ethereum/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..aaa144db8a 100644 --- a/les/flowcontrol/manager.go +++ b/les/flowcontrol/manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 5c93133fb7..9899dd399a 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,22 +26,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index e5446c031d..05cc8178a3 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) func expectResponse(r p2p.MsgReader, msgcode, reqID, bv uint64, data interface{}) error { diff --git a/les/helper_test.go b/les/helper_test.go index bf08e1e2f7..3e228e84e3 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,19 +25,19 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/les/flowcontrol" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index 0162a1d1ad..c3eafc4306 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/etherinc/go-ethereum/metrics" + "github.com/etherinc/go-ethereum/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index f8412aaad7..97ac2b24d2 100644 --- a/les/odr.go +++ b/les/odr.go @@ -19,10 +19,10 @@ package les import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 937a4f1d9d..832d7d934e 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 88e121cda6..895a4e2e04 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) type odrTestFn func(ctx context.Context, db ethdb.Database, config *params.ChainConfig, bc *core.BlockChain, lc *light.LightChain, bhash common.Hash) []byte diff --git a/les/peer.go b/les/peer.go index b72c80d35a..8165c46589 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/les/flowcontrol" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index e1c4625bce..ff44ed787f 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/secp256k1" + "github.com/etherinc/go-ethereum/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c13625de8e..575e86a535 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ 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/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index dd15b56acf..04b4440b92 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 85ebbf8988..5d0f1ddb94 100644 --- a/les/server.go +++ b/les/server.go @@ -24,17 +24,17 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/les/flowcontrol" + "github.com/etherinc/go-ethereum/light" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index a84c29c3ac..ade24670cc 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index c0e17f97d9..6226bcf6e8 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..6ffe4246d6 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 24529ef82e..0ad99a0976 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 0af7551d41..96ef21b7ec 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index ffdb71bb79..f4875b2c1c 100644 --- a/light/nodeset.go +++ b/light/nodeset.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index e2c3d9c5a4..673e7c7aee 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "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/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index d3f9374fd8..3c384a3188 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index a0eb6303d4..30773818aa 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "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/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index bbac58d121..7a8307bfe3 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -23,15 +23,15 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/bitutil" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index c07e99461c..8bb1e075cc 100644 --- a/light/trie.go +++ b/light/trie.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index 0d6b2cc1d8..6c9b1ec377 100644 --- a/light/trie_test.go +++ b/light/trie_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index ca41490bdc..24991bf955 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ 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/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index 13d7d3cebb..f5916d05d1 100644 --- a/light/txpool_test.go +++ b/light/txpool_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0b07abb2ac..89a0757937 100644 --- a/log/format.go +++ b/log/format.go @@ -22,7 +22,7 @@ const ( // locationTrims are trimmed for display to avoid unwieldy log lines. var locationTrims = []string{ - "github.com/ethereum/go-ethereum/", + "github.com/etherinc/go-ethereum/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/metrics.go b/metrics/metrics.go index c82661d802..02f0768bcf 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" ) diff --git a/miner/agent.go b/miner/agent.go index e3cebbd2e2..507ebe8382 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index fec0a40f5a..9de9e94546 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 287e7530c3..11ef98e732 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 7a4fc7cc5a..67e033b8e7 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -20,9 +20,9 @@ import ( "container/ring" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/log" ) // headerRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 456af1764a..d753771777 100644 --- a/miner/unconfirmed_test.go +++ b/miner/unconfirmed_test.go @@ -19,8 +19,8 @@ package miner import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 15395ae0b9..724d7e993f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/consensus" + "github.com/etherinc/go-ethereum/consensus/misc" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..867c78af88 100644 --- a/mobile/accounts.go +++ b/mobile/accounts.go @@ -23,10 +23,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..a22eec5701 100644 --- a/mobile/android_test.go +++ b/mobile/android_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/build" + "github.com/etherinc/go-ethereum/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android @@ -207,7 +207,7 @@ func TestAndroid(t *testing.T) { } } // Generate the mobile bindings for Geth and add the tester class - gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/ethereum/go-ethereum/mobile") + gobind := exec.Command("gomobile", "bind", "-javapkg", "org.ethereum", "github.com/etherinc/go-ethereum/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index dd7b158786..9a50210d29 100644 --- a/mobile/big.go +++ b/mobile/big.go @@ -22,7 +22,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index 7a1bf9e605..9dd14c2152 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/etherinc/go-ethereum/accounts/abi" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 047d8e1f65..180ea190da 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index e22c8ce8f8..c083471ab7 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/etherinc/go-ethereum/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 66399c6b56..d905a6e539 100644 --- a/mobile/ethclient.go +++ b/mobile/ethclient.go @@ -21,8 +21,8 @@ package geth import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 0eb1d90552..28753574d0 100644 --- a/mobile/ethereum.go +++ b/mobile/ethereum.go @@ -21,8 +21,8 @@ package geth import ( "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + ethereum "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 7e3b8f4915..b129b0fa65 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/eth" + "github.com/etherinc/go-ethereum/eth/downloader" + "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/ethstats" + "github.com/etherinc/go-ethereum/les" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/params" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..2973fcb081 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a..3e848885d5 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/etherinc/go-ethereum/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..e3eae78244 100644 --- a/mobile/logger.go +++ b/mobile/logger.go @@ -19,7 +19,7 @@ package geth import ( "os" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..06ab9a269f 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/etherinc/go-ethereum/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..15b4e7e664 100644 --- a/mobile/params.go +++ b/mobile/params.go @@ -21,9 +21,9 @@ package geth import ( "encoding/json" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/types.go b/mobile/types.go index 4790afceff..9338b46c05 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/rlp" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..55e581c821 100644 --- a/mobile/vm.go +++ b/mobile/vm.go @@ -21,7 +21,7 @@ package geth import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/types" ) // Log represents a contract log event. These events are generated by the LOG diff --git a/node/api.go b/node/api.go index 1b04b70938..4fec16313d 100644 --- a/node/api.go +++ b/node/api.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" "github.com/rcrowley/go-metrics" ) diff --git a/node/config.go b/node/config.go index 7a0c1688ec..047d1f33dd 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/accounts/keystore" + "github.com/etherinc/go-ethereum/accounts/usbwallet" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..ad8618a31c 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -24,8 +24,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 1610880849..70e1b9e9c0 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index ff7258033e..20eb992b47 100644 --- a/node/node.go +++ b/node/node.go @@ -26,13 +26,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/internal/debug" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c..6558c31c2a 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,9 +20,9 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 2880efa619..3d4698497a 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/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 55062a5004..101d069f87 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/etherinc/go-ethereum/accounts" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 8eddce3ed7..ac7d484d45 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/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index f5ff2c2117..9e0cf4c834 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index ad18ef9abe..2c66d762c7 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index b136609f24..4b6bada0bf 100644 --- a/p2p/discover/database.go +++ b/p2p/discover/database.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discover/node.go b/p2p/discover/node.go index da787e496f..1f338446e8 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index ef5fa7095a..8b51bfd265 100644 --- a/p2p/discover/node_test.go +++ b/p2p/discover/node_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..59f8a73c7b 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,7 +25,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index ec4eb94ad5..fdcfce44f8 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,9 +32,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 1037cc6099..e79d02bba0 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 60436952d8..c082f26b46 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/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index ccc8121fb5..1b22e92745 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..5837201352 100644 --- a/p2p/discv5/database.go +++ b/p2p/discv5/database.go @@ -28,9 +28,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index f9baf126f1..c3ef0ea0b7 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,13 +24,13 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 369282ca9c..32ef0653b6 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index adb42e0959..8cdd9609a1 100644 --- a/p2p/discv5/node.go +++ b/p2p/discv5/node.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index dc10b94304..935b75e998 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..048f54b01d 100644 --- a/p2p/discv5/ntp.go +++ b/p2p/discv5/ntp.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 0a551011b1..449aec91a7 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/etherinc/go-ethereum/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 2cf05009cb..61e3329314 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/etherinc/go-ethereum/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..7e954cecd2 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index 37ce8d23cb..427dca77d8 100644 --- a/p2p/discv5/ticket.go +++ b/p2p/discv5/ticket.go @@ -25,10 +25,10 @@ import ( "sort" "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/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index e7a7f8e02a..00b177f92b 100644 --- a/p2p/discv5/topic.go +++ b/p2p/discv5/topic.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..2a696995c0 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 5437718173..d2166ca23e 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/log" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 5e59716f01..cc3b48ce84 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 2c3afb43e9..e1b64139c3 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -35,9 +35,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 31c4a53c9d..a4a730a5ac 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 7591e6effb..0d21c19dbe 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,8 +22,8 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 5690494bf4..2a5ad06d7f 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -27,9 +27,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 98b61901d5..e4605d120a 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/etherinc/go-ethereum/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c66..6ee2fbaaf3 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index bad1c8c8b2..66497fd43d 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..420e894fe9 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/etherinc/go-ethereum/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 24037ecc13..4f34a9fc78 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,12 +35,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/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/crypto/secp256k1" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index f4cefa650b..a3e108071e 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/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index 2cff94ea5b..191791d955 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/mclock" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discv5" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 10c36528eb..ecf5533686 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 8ef5629fb5..ed840bf9a5 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,9 +28,9 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p/discover" ) // DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index a566fb27d8..f3515fe404 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 4c6fb86b1d..3c7ae8825c 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,12 +23,12 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 5b4b47fe2f..eadf43735d 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,11 +25,11 @@ import ( "os" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 6a0ead53a5..07ccd75474 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,13 +25,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 97dd742e88..88ae58183d 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -29,11 +29,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 677a8fb147..6176820c59 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index c38e288552..42c2c5d29c 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index de8ec0b337..74dfdd01a3 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index caf428ece1..d5de2f8d3a 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/event" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" ) var dialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 2a062121be..d2ef4dbbfc 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/simulations/adapters" ) // TestNetworkSimulation creates a multi-node simulation network with each node diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 28886e924a..5401476c68 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/params/config.go b/params/config.go index 788717b24e..36a02f46ec 100644 --- a/params/config.go +++ b/params/config.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) var ( @@ -108,7 +108,7 @@ type ChainConfig struct { DAOForkBlock *big.Int `json:"daoForkBlock,omitempty"` // TheDAO hard-fork switch block (nil = no fork) DAOForkSupport bool `json:"daoForkSupport,omitempty"` // Whether the nodes supports or opposes the DAO hard-fork - // EIP150 implements the Gas price changes (https://github.com/ethereum/EIPs/issues/150) + // EIP150 implements the Gas price changes (https://github.com/etherinc/EIPs/issues/150) EIP150Block *big.Int `json:"eip150Block,omitempty"` // EIP150 HF block (nil = no fork) EIP150Hash common.Hash `json:"eip150Hash,omitempty"` // EIP150 HF hash (needed for header only clients as only gas pricing changed) diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..93d0fb01cf 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index 8aa84ec982..2b541f9d39 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 8276a9eadd..923d95336a 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -22,7 +22,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/rpc" ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index 4f354d389e..eba91c44f8 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -31,7 +31,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 8de18a56fe..1e8e22d354 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index 2e7fd599e2..74f8082de6 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 30c288349e..d18932d5e0 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index f2375604ed..35fc98f54c 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 30cef9b22e..a7e76aa1b9 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 4214fc86a0..207044e154 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index 8c4bca2ec0..9ab14eca9e 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -29,9 +29,9 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) var hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}") diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index e673f76c42..e686fcb74a 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 8165d52d7e..a3a12aa41d 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -33,7 +33,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index c1d144e370..f73640e01e 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,8 +25,8 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index 140c938ae0..7d48d49612 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -22,14 +22,14 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/contracts/ens" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/swarm/network" + "github.com/etherinc/go-ethereum/swarm/services/swap" + "github.com/etherinc/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 5636b6dafb..2044a0e00a 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index f5dc90e2e5..518b0bb108 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 8a15e735dc..1f302b9fc6 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/error.go b/swarm/api/http/error.go index dbd97182fd..7faf74ed34 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,8 +28,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/api" ) //templateMap holds a mapping of an HTTP error code to a template diff --git a/swarm/api/http/error_test.go b/swarm/api/http/error_test.go index ed52bafbd2..167f01ada2 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/etherinc/go-ethereum/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 0194317716..7f5df64c62 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/etherinc/go-ethereum/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/etherinc/go-ethereum/common/httpclient" + "github.com/etherinc/go-ethereum/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 74341899d2..0eda6a7921 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,10 +35,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/storage" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 305d5cf7db..02d6ecc3ff 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/swarm/api" + swarm "github.com/etherinc/go-ethereum/swarm/api/client" + "github.com/etherinc/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/swarm/testutil" ) func TestBzzGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 53ce7b5a22..0e13b338e7 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 685a300fca..87b3400728 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 7098ca16fd..92ac050c4f 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 6631196c17..5de8af9b8b 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/etherinc/go-ethereum/swarm/network" ) type Control struct { diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7f5..1a6ff1873a 100644 --- a/swarm/dev/Makefile +++ b/swarm/dev/Makefile @@ -3,12 +3,12 @@ default: build build: - go build -o bin/swarm github.com/ethereum/go-ethereum/cmd/swarm - go build -o bin/geth github.com/ethereum/go-ethereum/cmd/geth - go build -o bin/bootnode github.com/ethereum/go-ethereum/cmd/bootnode + go build -o bin/swarm github.com/etherinc/go-ethereum/cmd/swarm + go build -o bin/geth github.com/etherinc/go-ethereum/cmd/geth + go build -o bin/bootnode github.com/etherinc/go-ethereum/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v github.com/etherinc/go-ethereum/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa36..f765236fb9 100644 --- a/swarm/dev/bashrc +++ b/swarm/dev/bashrc @@ -1,4 +1,4 @@ -export ROOT="${GOPATH}/src/github.com/ethereum/go-ethereum" +export ROOT="${GOPATH}/src/github.com/etherinc/go-ethereum" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 2ad600dedf..9f9b50097c 100755 --- a/swarm/dev/run.sh +++ b/swarm/dev/run.sh @@ -80,7 +80,7 @@ run_image() { --rm \ --hostname "${name}" \ --name "${name}" \ - --volume "${ROOT}:/go/src/github.com/ethereum/go-ethereum" \ + --volume "${ROOT}:/go/src/github.com/etherinc/go-ethereum" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index c94a0773f5..fb7d861680 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 2493bdab19..b9cd5a3e6c 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -17,7 +17,7 @@ package fuse import ( - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 42af36345f..297c61c2aa 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -27,8 +27,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 75742845a2..a09fb1706c 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -29,9 +29,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index d39966c0e3..dd2ccfb8f5 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 17540d2f9f..1fc9966b6e 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,8 +22,8 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) // Handler for storage/retrieval related protocol requests diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 88a82a678c..1885ab6bee 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 2504a46100..e97849ea16 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/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/netutil" + "github.com/etherinc/go-ethereum/swarm/network/kademlia" + "github.com/etherinc/go-ethereum/swarm/storage" ) // Hive is the logistic manager of the swarm diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go index 4c38a846f9..93e6aa362d 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/etherinc/go-ethereum/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index c062c8eafb..47cc2836ac 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/etherinc/go-ethereum/common" ) func (Address) Generate(rand *rand.Rand, size int) reflect.Value { diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index b37ced5ba0..ee6c3d71c9 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index 0abc42a19c..bffb9083d0 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/swarm/network/messages.go b/swarm/network/messages.go index d920def959..ac9c5c559c 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/etherinc/go-ethereum/contracts/chequebook" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/swarm/network/kademlia" + "github.com/etherinc/go-ethereum/swarm/services/swap" + "github.com/etherinc/go-ethereum/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index a418c1dbbd..9dad0da68c 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,12 +37,12 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - bzzswap "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/contracts/chequebook" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + bzzswap "github.com/etherinc/go-ethereum/swarm/services/swap" + "github.com/etherinc/go-ethereum/swarm/services/swap/swap" + "github.com/etherinc/go-ethereum/swarm/storage" ) const ( diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 88b4b68dd0..82455f0c09 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go index be21d156f9..10e4c8bcf2 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index 6d729fcb9e..4cd923489f 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,8 +22,8 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/storage" ) // syncer parameters (global, not peer specific) default values diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 1f9b22b904..2fd90af1ea 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,14 +26,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" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/contracts/chequebook" + "github.com/etherinc/go-ethereum/contracts/chequebook/contract" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index a78f1f0e2a..cd59578d1f 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index 222e0770f3..ab30b59956 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/etherinc/go-ethereum/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 6b828970b6..803a130772 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index cd4c2ef139..b008ea3718 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 2532490cc9..74b5d27cef 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/etherinc/go-ethereum/compression/rle" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go index 46a5c16ccc..0cee8fcc7f 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -32,8 +32,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go index dd165b5768..279f7a50d6 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/etherinc/go-ethereum/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 44a2669f12..5463dbf219 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) /* diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index 3cb25ac625..d37548188d 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) const ( diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 5d4f17deb1..6503f0a073 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index d35f1f9294..70ccc7a090 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,9 +24,9 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/bmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/bmt" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 3be3660b58..44c2022546 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -23,22 +23,22 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/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/fuse" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/accounts/abi/bind" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/contracts/chequebook" + "github.com/etherinc/go-ethereum/contracts/ens" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethclient" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/node" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/swarm/api" + httpapi "github.com/etherinc/go-ethereum/swarm/api/http" + "github.com/etherinc/go-ethereum/swarm/fuse" + "github.com/etherinc/go-ethereum/swarm/network" + "github.com/etherinc/go-ethereum/swarm/storage" ) // the swarm stack diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index f2922fab00..daabca46c1 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/etherinc/go-ethereum/swarm/api" + httpapi "github.com/etherinc/go-ethereum/swarm/api/http" + "github.com/etherinc/go-ethereum/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index beba484833..4f815d5b80 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,17 +24,17 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) // A BlockTest checks handling of entire blocks. @@ -150,7 +150,7 @@ func (t *BlockTest) genesis(config *params.ChainConfig) *core.Genesis { } } -/* See https://github.com/ethereum/tests/wiki/Blockchain-Tests-II +/* See https://github.com/etherinc/tests/wiki/Blockchain-Tests-II Whether a block is valid or not is a bit subtle, it's defined by presence of blockHeader, transactions and uncleHeaders fields. If they are missing, the block is diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index a449b1cfa6..09264758ab 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -22,8 +22,8 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 7541477933..80a8f19a79 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/consensus/ethash" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 5cfd4bd0ae..ee54601259 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..3ba63eb0e5 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..cfeb8374f2 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..51314f4c80 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d97..49fe4f3f37 100644 --- a/tests/gen_tttransaction.go +++ b/tests/gen_tttransaction.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..f89f2ad27d 100644 --- a/tests/gen_vmexec.go +++ b/tests/gen_vmexec.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 9e884efe39..c553421e56 100644 --- a/tests/init.go +++ b/tests/init.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index ebb0d32c34..59df951209 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a6428..17be4211b4 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 100c776c1a..dcd26b08fd 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 18280d2a46..facf0c8a75 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,22 +23,22 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) // StateTest checks transaction processing without block context. -// See https://github.com/ethereum/EIPs/issues/176 for the test format specification. +// See https://github.com/etherinc/EIPs/issues/176 for the test format specification. type StateTest struct { json stJSON } @@ -219,7 +219,7 @@ func (tx *stTransaction) toMessage(ps stPostState) (core.Message, error) { dataHex := tx.Data[ps.Indexes.Data] valueHex := tx.Value[ps.Indexes.Value] gasLimit := tx.GasLimit[ps.Indexes.Gas] - // Value, Data hex encoding is messy: https://github.com/ethereum/tests/issues/203 + // Value, Data hex encoding is messy: https://github.com/etherinc/tests/issues/203 value := new(big.Int) if valueHex != "0x" { v, ok := math.ParseBig256(valueHex) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index c743996c2a..73dcb7a685 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 2028d2a278..ee7a167f25 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core/types" + "github.com/etherinc/go-ethereum/params" + "github.com/etherinc/go-ethereum/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225e9..f76d9ca1e7 100644 --- a/tests/vm_test.go +++ b/tests/vm_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index b365167a69..680ef576ad 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,19 +22,19 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/core" + "github.com/etherinc/go-ethereum/core/state" + "github.com/etherinc/go-ethereum/core/vm" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/params" ) // VMTest checks EVM execution without block or transaction context. -// See https://github.com/ethereum/tests/wiki/VM-Tests for the test format specification. +// See https://github.com/etherinc/tests/wiki/VM-Tests for the test format specification. type VMTest struct { json vmJSON } diff --git a/trie/database.go b/trie/database.go index d79120813d..ab24ef59cd 100644 --- a/trie/database.go +++ b/trie/database.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" ) // secureKeyPrefix is the database key prefix used to store trie node preimages. diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..5793e76b95 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/etherinc/go-ethereum/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 2fc44787ac..d84e87412e 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto/sha3" + "github.com/etherinc/go-ethereum/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 76146c0d64..ac65a95e6a 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index dce1c78b5d..e630b025f6 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,8 +22,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index a7697fc0c6..402087648d 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index 508e4a6cf4..445c33d06f 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index fff313d7fd..94e02c2b4b 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 3881ee18a0..fa1095d643 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index aedf5a1cde..931a9c6d04 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index b573a9f732..7dbbe6191c 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 4a720612b6..58079488fb 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index e37a1ae109..94901d64b4 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,9 +21,9 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" "github.com/rcrowley/go-metrics" ) diff --git a/trie/trie_test.go b/trie/trie_test.go index 9972226288..64770b7df4 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -30,10 +30,10 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/ethdb" + "github.com/etherinc/go-ethereum/rlp" ) func init() { diff --git a/vendor/github.com/ethereum/ethash/src/libethash/io.h b/vendor/github.com/ethereum/ethash/src/libethash/io.h index 7a27089c7d..85903daf22 100644 --- a/vendor/github.com/ethereum/ethash/src/libethash/io.h +++ b/vendor/github.com/ethereum/ethash/src/libethash/io.h @@ -38,7 +38,7 @@ extern "C" { // 10 is for maximum number of digits of a uint32_t (for REVISION) // 1 is for - and 16 is for the first 16 hex digits for first 8 bytes of // the seedhash and last 1 is for the null terminating character -// Reference: https://github.com/ethereum/wiki/wiki/Ethash-DAG +// Reference: https://github.com/etherinc/wiki/wiki/Ethash-DAG #define DAG_MUTABLE_NAME_MAX_SIZE (6 + 10 + 1 + 16 + 1) /// Possible return values of @see ethash_io_prepare enum ethash_io_rc { @@ -80,7 +80,7 @@ enum ethash_io_rc { * data directory. If it does not exist it's created. * @param[in] seedhash The seedhash of the current block number, used in the * naming of the file as can be seen from the spec at: - * https://github.com/ethereum/wiki/wiki/Ethash-DAG + * https://github.com/etherinc/wiki/wiki/Ethash-DAG * @param[out] output_file If there was no failure then this will point to an open * file descriptor. User is responsible for closing it. * In the case of memo match then the file is open on read @@ -175,7 +175,7 @@ char* ethash_io_create_filename( /** * Gets the default directory name for the DAG depending on the system * - * The spec defining this directory is here: https://github.com/ethereum/wiki/wiki/Ethash-DAG + * The spec defining this directory is here: https://github.com/etherinc/wiki/wiki/Ethash-DAG * * @param[out] strbuf A string buffer of sufficient size to keep the * null termninated string of the directory name diff --git a/vendor/vendor.json b/vendor/vendor.json index 4360223298..29f3b8a414 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -754,5 +754,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/ethereum/go-ethereum" + "rootPath": "github.com/etherinc/go-ethereum" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 0ec6ec570c..1aea3d8ec0 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,12 +21,12 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/cmd/utils" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/rlp" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index 9155ee85a6..f48d5f73d6 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 61b4775d95..887d12cba8 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/etherinc/go-ethereum" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/rpc" + whisper "github.com/etherinc/go-ethereum/whisper/whisperv5" ) // Client defines typed wrappers for the Whisper v5 RPC API. diff --git a/whisper/whisperv2/api.go b/whisper/whisperv2/api.go index 5c6d170959..680a9dc39d 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/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" ) // PublicWhisperAPI provides the whisper RPC service. diff --git a/whisper/whisperv2/doc.go b/whisper/whisperv2/doc.go index 7252f44b10..38323712bf 100644 --- a/whisper/whisperv2/doc.go +++ b/whisper/whisperv2/doc.go @@ -17,7 +17,7 @@ /* Package whisper implements the Whisper PoC-1. -(https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec) +(https://github.com/etherinc/wiki/wiki/Whisper-PoC-1-Protocol-Spec) Whisper combines aspects of both DHTs and datagram messaging systems (e.g. UDP). As such it may be likened and compared to both, not dissimilar to the diff --git a/whisper/whisperv2/envelope.go b/whisper/whisperv2/envelope.go index 9f1c682040..01c0c4cb8a 100644 --- a/whisper/whisperv2/envelope.go +++ b/whisper/whisperv2/envelope.go @@ -15,7 +15,7 @@ // along with the go-ethereum library. If not, see . // Contains the Whisper protocol Envelope element. For formal details please see -// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes. +// the specs at https://github.com/etherinc/wiki/wiki/Whisper-PoC-1-Protocol-Spec#envelopes. package whisperv2 @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/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 490ed9f6f8..db9fd2fffc 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/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" ) func TestEnvelopeOpen(t *testing.T) { diff --git a/whisper/whisperv2/filter.go b/whisper/whisperv2/filter.go index 7404859b78..ee1f860260 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/etherinc/go-ethereum/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..872607a229 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/logger" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/whisper" ) func main() { diff --git a/whisper/whisperv2/message.go b/whisper/whisperv2/message.go index 66648c3be8..009241a6bd 100644 --- a/whisper/whisperv2/message.go +++ b/whisper/whisperv2/message.go @@ -15,7 +15,7 @@ // along with the go-ethereum library. If not, see . // Contains the Whisper protocol Message element. For formal details please see -// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages. +// the specs at https://github.com/etherinc/wiki/wiki/Whisper-PoC-1-Protocol-Spec#messages. package whisperv2 @@ -26,10 +26,10 @@ import ( "math/rand" "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/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/log" ) // 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 c760ac54c4..febfda4597 100644 --- a/whisper/whisperv2/message_test.go +++ b/whisper/whisperv2/message_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto" ) // 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 71798408b9..ea88705aa3 100644 --- a/whisper/whisperv2/peer.go +++ b/whisper/whisperv2/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/peer_test.go b/whisper/whisperv2/peer_test.go index 87ca5063df..252f6dc3e7 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/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" ) type testPeer struct { diff --git a/whisper/whisperv2/topic.go b/whisper/whisperv2/topic.go index 3e2b47bd3f..87b9e0c845 100644 --- a/whisper/whisperv2/topic.go +++ b/whisper/whisperv2/topic.go @@ -15,11 +15,11 @@ // along with the go-ethereum library. If not, see . // Contains the Whisper protocol Topic element. For formal details please see -// the specs at https://github.com/ethereum/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics. +// the specs at https://github.com/etherinc/wiki/wiki/Whisper-PoC-1-Protocol-Spec#topics. package whisperv2 -import "github.com/ethereum/go-ethereum/crypto" +import "github.com/etherinc/go-ethereum/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 e111a34146..bc7efa89fb 100644 --- a/whisper/whisperv2/whisper.go +++ b/whisper/whisperv2/whisper.go @@ -22,13 +22,13 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/event/filter" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv2/whisper_test.go b/whisper/whisperv2/whisper_test.go index 1e0d3f85d4..1699c34b49 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/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" ) func startTestCluster(n int) []*Whisper { diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index b4494d0d61..71a3c211e6 100644 --- a/whisper/whisperv5/api.go +++ b/whisper/whisperv5/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" ) const ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..1f0e4e1671 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/etherinc/go-ethereum/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..64a759df3f 100644 --- a/whisper/whisperv5/envelope.go +++ b/whisper/whisperv5/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 3190334ebb..40bb191dfc 100644 --- a/whisper/whisperv5/filter.go +++ b/whisper/whisperv5/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 01034a3513..e0eed0ba35 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9..1d20b0ee44 100644 --- a/whisper/whisperv5/gen_criteria_json.go +++ b/whisper/whisperv5/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d07..592d99ff07 100644 --- a/whisper/whisperv5/gen_message_json.go +++ b/whisper/whisperv5/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad3..71cb106749 100644 --- a/whisper/whisperv5/gen_newmessage_json.go +++ b/whisper/whisperv5/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv5 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index c27535cd1a..3d60490d8a 100644 --- a/whisper/whisperv5/message.go +++ b/whisper/whisperv5/message.go @@ -27,10 +27,10 @@ import ( "errors" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/log" ) // Options specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 2edf945df0..4afbbce124 100644 --- a/whisper/whisperv5/message_test.go +++ b/whisper/whisperv5/message_test.go @@ -21,8 +21,8 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 179c931795..9971f9b54d 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 39e48a610a..e0d5305449 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/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4ea67eefa..fb030f0a4e 100644 --- a/whisper/whisperv5/topic.go +++ b/whisper/whisperv5/topic.go @@ -19,8 +19,8 @@ package whisperv5 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 85849ccce4..150578ade7 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 8af085292a..3d86fac19e 100644 --- a/whisper/whisperv5/whisper_test.go +++ b/whisper/whisperv5/whisper_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 8ae2882e1f..f0379204fd 100644 --- a/whisper/whisperv6/api.go +++ b/whisper/whisperv6/api.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/rpc" ) const ( diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 52c8f95ea6..bfe06f7257 100644 --- a/whisper/whisperv6/benchmarks_test.go +++ b/whisper/whisperv6/benchmarks_test.go @@ -20,7 +20,7 @@ import ( "crypto/sha256" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index 881945e9a8..b75b0b9fb6 100644 --- a/whisper/whisperv6/envelope.go +++ b/whisper/whisperv6/envelope.go @@ -26,11 +26,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/math" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv6/envelope_test.go b/whisper/whisperv6/envelope_test.go index 1ee1bec41b..dcf8ab04ea 100644 --- a/whisper/whisperv6/envelope_test.go +++ b/whisper/whisperv6/envelope_test.go @@ -22,7 +22,7 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index eb0c65fa3b..d4a61dda73 100644 --- a/whisper/whisperv6/filter.go +++ b/whisper/whisperv6/filter.go @@ -21,9 +21,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index fc7db76712..d0cac123d9 100644 --- a/whisper/whisperv6/filter_test.go +++ b/whisper/whisperv6/filter_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..0cfbfaba54 100644 --- a/whisper/whisperv6/gen_criteria_json.go +++ b/whisper/whisperv6/gen_criteria_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..74887058bc 100644 --- a/whisper/whisperv6/gen_message_json.go +++ b/whisper/whisperv6/gen_message_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..566227d97c 100644 --- a/whisper/whisperv6/gen_newmessage_json.go +++ b/whisper/whisperv6/gen_newmessage_json.go @@ -5,7 +5,7 @@ package whisperv6 import ( "encoding/json" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 7def35f14f..72565f096d 100644 --- a/whisper/whisperv6/message.go +++ b/whisper/whisperv6/message.go @@ -28,10 +28,10 @@ import ( mrand "math/rand" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/crypto/ecies" + "github.com/etherinc/go-ethereum/log" ) // MessageParams specifies the exact way a message should be wrapped diff --git a/whisper/whisperv6/message_test.go b/whisper/whisperv6/message_test.go index 12a269f5db..5f0f41e807 100644 --- a/whisper/whisperv6/message_test.go +++ b/whisper/whisperv6/message_test.go @@ -23,9 +23,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 4f9a7c3780..2b6835cf58 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -21,10 +21,10 @@ import ( "math" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index f1773066c5..ff30d52b9b 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/p2p/discover" + "github.com/etherinc/go-ethereum/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..fe74b4b719 100644 --- a/whisper/whisperv6/topic.go +++ b/whisper/whisperv6/topic.go @@ -19,8 +19,8 @@ package whisperv6 import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index d75ad04ac3..a511dfa91d 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/etherinc/go-ethereum/common" + "github.com/etherinc/go-ethereum/crypto" + "github.com/etherinc/go-ethereum/log" + "github.com/etherinc/go-ethereum/p2p" + "github.com/etherinc/go-ethereum/rlp" + "github.com/etherinc/go-ethereum/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv6/whisper_test.go b/whisper/whisperv6/whisper_test.go index 838cb7b851..988b71c469 100644 --- a/whisper/whisperv6/whisper_test.go +++ b/whisper/whisperv6/whisper_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/etherinc/go-ethereum/common" "golang.org/x/crypto/pbkdf2" )