diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9f2dbfcb..42f3c466 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/FusionFoundation/efsn/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/FusionFoundation/efsn/wiki/Developers'-Guide) for more details on configuring your environment, testing, and dependency management. diff --git a/.travis.yml b/.travis.yml index 40ffad82..e19c857f 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/FusionFoundation/efsn sudo: false matrix: include: diff --git a/README.md b/README.md index 6978aa74..b23a4f83 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ The API reference can be found [here](https://github.com/FUSIONFoundation/web3-f ## 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/FusionFoundation/efsn/wiki/Building-Ethereum) on the wiki. Building efsn requires both a Go (version 1.7 or later) and a C compiler. @@ -101,19 +101,19 @@ The go-ethereum project comes with several wrappers/executables found in the `cm | Command | Description | |:----------:|-------------| -| **`efsn`** | 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. | +| **`efsn`** | 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/FusionFoundation/efsn/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/FusionFoundation/efsn/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`). | -| `swarm` | Swarm daemon and tools. This is the entrypoint for the Swarm network. `swarm --help` for command line options and subcommands. See [Swarm README](https://github.com/ethereum/go-ethereum/tree/master/swarm) for more information. | +| `swarm` | Swarm daemon and tools. This is the entrypoint for the Swarm network. `swarm --help` for command line options and subcommands. See [Swarm README](https://github.com/FusionFoundation/efsn/tree/master/swarm) for more information. | | `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/FusionFoundation/efsn/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. @@ -133,9 +133,9 @@ This command will: * Start geth in fast sync mode (default, can be changed with the `--syncmode` flag), causing it to download more data in exchange for avoiding processing the entire history of the Ethereum network, which is very CPU intensive. - * Start up Geth's built-in interactive [JavaScript console](https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console), + * Start up Geth's built-in interactive [JavaScript console](https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console), (via the trailing `console` subcommand) through which you can invoke all official [`web3` methods](https://github.com/ethereum/wiki/wiki/JavaScript-API) - as well as Geth's own [management APIs](https://github.com/ethereum/go-ethereum/wiki/Management-APIs). + as well as Geth's own [management APIs](https://github.com/FusionFoundation/efsn/wiki/Management-APIs). This tool is optional and if you leave it out you can always attach to an already running Geth instance with `geth attach`. @@ -211,7 +211,7 @@ 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 +[Geth specific APIs](https://github.com/FusionFoundation/efsn/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 @@ -351,7 +351,7 @@ anyone on the internet, and are grateful for even the smallest of fixes! If you'd like to contribute to go-ethereum, please fork, fix, commit and send a pull request for the maintainers to review and merge into the main code base. If you wish to submit more -complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/ethereum/go-ethereum) +complex changes though, please check up with the core devs first on [our gitter channel](https://gitter.im/FusionFoundation/efsn) to ensure those changes are in line with the general philosophy of the project and/or get some early feedback which can make both your efforts much lighter as well as our review and merge procedures quick and simple. @@ -364,7 +364,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/FusionFoundation/efsn/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 8018df77..d463dbee 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b..06f2467d 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 ca60cc1b..46924b21 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index fc0ccbf5..e13b6b9a 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,22 +24,22 @@ 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/rawdb" - "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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/filters" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/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 83ad1c8a..30555760 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/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 172bed8f..7cdf5443 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/FusionFoundation/efsn/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/FusionFoundation/efsn/accounts/abi" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 0e5b1c16..9218c699 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/FusionFoundation/efsn/common" "golang.org/x/tools/imports" ) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index e6ed50a0..54fd75c8 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/FusionFoundation/efsn/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 600dfcda..d6f0bdf5 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/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 d129993c..6de6e24f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 8f409297..5d3eab1e 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/accounts/abi/bind/backends" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index a3f6be97..5c26fcb2 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 3bfdd7c0..fdd19a1f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -323,7 +323,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/ethereum/go-ethereum/pull/15568 +https://github.com/FusionFoundation/efsn/pull/15568 */ type testResult struct { diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 58310576..8d0acd7b 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/FusionFoundation/efsn/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 4d706846..908ffd01 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265..7812e6c6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 58a5b7a5..e75b5b94 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/FusionFoundation/efsn/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index f6b36f18..5dacc719 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/FusionFoundation/efsn/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 d5875140..07eaa322 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/FusionFoundation/efsn/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 97552b90..eb4f017e 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/FusionFoundation/efsn/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index cb1eae28..a8c74b3d 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index da3a46eb..a6c26da1 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c0..fc990cda 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 73ff6ae9..0fc9a0f1 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 9e3e4856..cbcae6c2 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 2918047c..8995cf83 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/event" ) var ( diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go index 5aa3a6bb..e358d533 100644 --- a/accounts/keystore/keystore_passphrase.go +++ b/accounts/keystore/keystore_passphrase.go @@ -38,9 +38,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" @@ -120,7 +120,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/ethereum/go-ethereum/issues." + + "https://github.com/FusionFoundation/efsn/issues." + "The error was : %s" return fmt.Errorf(msg, tmpName, err) } diff --git a/accounts/keystore/keystore_passphrase_test.go b/accounts/keystore/keystore_passphrase_test.go index 630682ce..8c94f63d 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/FusionFoundation/efsn/common" ) const ( diff --git a/accounts/keystore/keystore_plain.go b/accounts/keystore/keystore_plain.go index f62a133c..d90c9ce6 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/FusionFoundation/efsn/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/keystore_plain_test.go b/accounts/keystore/keystore_plain_test.go index f66de48a..f66384fb 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 6fb0a780..2693cde8 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/keystore_wallet.go b/accounts/keystore/keystore_wallet.go index 758fdfe3..bee19cc4 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 1554294e..bb5374b2 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index bbcfb992..f393b07f 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/FusionFoundation/efsn/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 96ca298f..ee4431e9 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/FusionFoundation/efsn/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 640320bc..209d1fa8 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index 2583fbc4..18bbdc31 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index b84a9559..7cf2b26a 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/usbwallet/internal/trezor" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 6cef6e0f..04ef999d 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" "github.com/karalabe/hid" ) diff --git a/build/ci.go b/build/ci.go index 51b855b2..46949520 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,9 +58,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" - sv "github.com/ethereum/go-ethereum/swarm/version" + "github.com/FusionFoundation/efsn/internal/build" + "github.com/FusionFoundation/efsn/params" + sv "github.com/FusionFoundation/efsn/swarm/version" ) var ( @@ -781,7 +781,7 @@ func doAndroidArchive(cmdline []string) { // Build the Android archive and Maven resources build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init", "--ndk", os.Getenv("ANDROID_NDK"))) - build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) + build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/FusionFoundation/efsn/mobile")) if *local { // If we're building locally, copy bundle to build dir and skip Maven @@ -907,7 +907,7 @@ func doXCodeFramework(cmdline []string) { // Build the iOS XCode framework build.MustRun(goTool("get", "golang.org/x/mobile/cmd/gomobile", "golang.org/x/mobile/cmd/gobind")) build.MustRun(gomobileTool("init")) - bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") + bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "--tags", "ios", "-v", "github.com/FusionFoundation/efsn/mobile") if *local { // If we're building locally, use the build folder and stop afterwards diff --git a/build/deb/ethereum-swarm/deb.control b/build/deb/ethereum-swarm/deb.control index 8cd325bf..5b302e3b 100644 --- a/build/deb/ethereum-swarm/deb.control +++ b/build/deb/ethereum-swarm/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 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/FusionFoundation/efsn.git +Vcs-Browser: https://github.com/FusionFoundation/efsn {{range .Executables}} Package: {{$.ExeName .}} diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control index defb106f..d357b300 100644 --- a/build/deb/ethereum/deb.control +++ b/build/deb/ethereum/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), golang-1.10 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/FusionFoundation/efsn.git +Vcs-Browser: https://github.com/FusionFoundation/efsn Package: {{.Name}} Architecture: any diff --git a/build/mvn.pom b/build/mvn.pom index 7670246b..9c926b06 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/FusionFoundation/efsn 2015 @@ -48,10 +48,10 @@ GitHub Issues - https://github.com/ethereum/go-ethereum/issues/ + https://github.com/FusionFoundation/efsn/issues/ - https://github.com/ethereum/go-ethereum + https://github.com/FusionFoundation/efsn diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index f2f75a65..d0304d97 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/FusionFoundation/efsn/issues" +!define UPDATEURL "https://github.com/FusionFoundation/efsn/releases" +!define ABOUTURL "https://github.com/FusionFoundation/efsn#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/pod.podspec b/build/pod.podspec index 2c14c280..fa3d4029 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/FusionFoundation/efsn' 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/FusionFoundation/efsn.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 3ac37ba7..c8c832a7 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 182f3df0..28b4c87c 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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 367458f0..19c15f08 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,15 +35,15 @@ import ( "runtime" "strings" - "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/node" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/signer/core" + "github.com/FusionFoundation/efsn/signer/rules" + "github.com/FusionFoundation/efsn/signer/storage" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/accountcmd.go b/cmd/efsn/accountcmd.go index 388ac393..ce348fb6 100644 --- a/cmd/efsn/accountcmd.go +++ b/cmd/efsn/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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/accountcmd_test.go b/cmd/efsn/accountcmd_test.go index 3ea22ccf..7a47daaf 100644 --- a/cmd/efsn/accountcmd_test.go +++ b/cmd/efsn/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/FusionFoundation/efsn/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) geth := runGeth(t, diff --git a/cmd/efsn/bugcmd.go b/cmd/efsn/bugcmd.go index 47654d7c..07b65c2b 100644 --- a/cmd/efsn/bugcmd.go +++ b/cmd/efsn/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/FusionFoundation/efsn/cmd/internal/browser" + "github.com/FusionFoundation/efsn/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/FusionFoundation/efsn/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/FusionFoundation/efsn/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/efsn/chaincmd.go b/cmd/efsn/chaincmd.go index 562c7e0d..f724f0f2 100644 --- a/cmd/efsn/chaincmd.go +++ b/cmd/efsn/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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/config.go b/cmd/efsn/config.go index cc3fc4e7..9d2a5678 100644 --- a/cmd/efsn/config.go +++ b/cmd/efsn/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/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/dashboard" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/params" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" "github.com/naoina/toml" ) diff --git a/cmd/efsn/consolecmd.go b/cmd/efsn/consolecmd.go index 8f27af0c..14ced20c 100644 --- a/cmd/efsn/consolecmd.go +++ b/cmd/efsn/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`, +See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,7 +56,7 @@ See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/ethereum/go-ethereum/wiki/JavaScript-Console. +See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console. This command allows to open a console on a running efsn node.`, } @@ -69,7 +69,7 @@ This command allows to open a console on a running efsn 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/JavaScript-Console`, +JavaScript API. See https://github.com/FusionFoundation/efsn/wiki/JavaScript-Console`, } ) diff --git a/cmd/efsn/consolecmd_test.go b/cmd/efsn/consolecmd_test.go index bbc00a19..ae06a703 100644 --- a/cmd/efsn/consolecmd_test.go +++ b/cmd/efsn/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/params" ) const ( diff --git a/cmd/efsn/dao_test.go b/cmd/efsn/dao_test.go index 3f4fa13a..94b28ba5 100644 --- a/cmd/efsn/dao_test.go +++ b/cmd/efsn/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/efsn/main.go b/cmd/efsn/main.go index 95ffd0a4..cfd33f67 100644 --- a/cmd/efsn/main.go +++ b/cmd/efsn/main.go @@ -29,16 +29,16 @@ import ( "time" "github.com/elastic/gosigar" - "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/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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/ethclient" + "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/node" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/misccmd.go b/cmd/efsn/misccmd.go index ecde4d70..cfc313a9 100644 --- a/cmd/efsn/misccmd.go +++ b/cmd/efsn/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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/monitorcmd.go b/cmd/efsn/monitorcmd.go index 17271cce..6a0ee4e8 100644 --- a/cmd/efsn/monitorcmd.go +++ b/cmd/efsn/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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/efsn/run_test.go b/cmd/efsn/run_test.go index c643d37b..03d20ed4 100644 --- a/cmd/efsn/run_test.go +++ b/cmd/efsn/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/FusionFoundation/efsn/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/efsn/usage.go b/cmd/efsn/usage.go index 6abfac9e..62499692 100644 --- a/cmd/efsn/usage.go +++ b/cmd/efsn/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/internal/debug" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index d1ae2ae0..306a608c 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index fe9a0c15..8b41d75b 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index ba03d4d9..5c23ef69 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index c434da0c..22afb080 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/FusionFoundation/efsn/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 5caea69f..1087f906 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5..78d7c83e 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/FusionFoundation/efsn/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 6f60ebaf..224c944b 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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe..0e8899c5 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/FusionFoundation/efsn/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 69f611e3..3f24d062 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/FusionFoundation/efsn/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 753ca622..19986395 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/FusionFoundation/efsn/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 f16424fb..3744b2af 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/vm" ) type JSONLogger struct { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a59cb1fb..f2816a2e 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/FusionFoundation/efsn/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 962fc021..18c1edea 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( "runtime/pprof" "time" - "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/FusionFoundation/efsn/cmd/evm/internal/compiler" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/core/vm/runtime" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 6d5ff069..9bb635af 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/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index f981c23a..665c31ad 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethclient" + "github.com/FusionFoundation/efsn/ethstats" + "github.com/FusionFoundation/efsn/les" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/params" "golang.org/x/net/websocket" ) @@ -447,7 +447,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/FusionFoundation/efsn/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 6604b671..38b24d2e 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index 5f39a889..566e337c 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/params" ) // cppEthereumGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a0..5f7726c7 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/FusionFoundation/efsn/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 341cd48c..8226a056 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/FusionFoundation/efsn/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -256,7 +256,7 @@ var dashboardContent = `

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

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


-

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

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

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

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

import org.ethereum.efsn.*;
@@ -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 efsn framework and connect to Ethereum (ObjC should be analogous): 

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

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

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


-

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

go get github.com/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/FusionFoundation/efsn/cmd/puppeth


Copyright 2017. The go-ethereum Authors.

diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index a7d99a29..224926ff 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/FusionFoundation/efsn/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 e916deaf..734a09a1 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/FusionFoundation/efsn/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 9894c86e..11809c6b 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 7f87661d..ea1c30e1 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/FusionFoundation/efsn/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 42f40511..8ebe917b 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 aab3c0c8..8a2fbc88 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/FusionFoundation/efsn/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index f9b8fe48..eb93c021 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index c5075960..2135e095 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/FusionFoundation/efsn/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 b88a61de..6b941dbb 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 5f781c41..8aa7d5d9 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/FusionFoundation/efsn/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 fb2529c2..8a091824 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/FusionFoundation/efsn/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 1894846e..41503790 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/FusionFoundation/efsn/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 382cb2ef..a72d7eac 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/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 6c4cd571..a3b4da93 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 60aa0f7f..72aa27ec 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/FusionFoundation/efsn/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 99ca11bb..7684a72b 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/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index c0ddcc2a..9104d401 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/FusionFoundation/efsn/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 4eeae93a..f5c5cc4b 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/FusionFoundation/efsn/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 5560d2bd..4464293c 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 a5d925cc..7b4de987 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/FusionFoundation/efsn/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 d0f993c5..92c3b247 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/FusionFoundation/efsn/rlp" ) var ( diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go index 67e852dd..4739a9dc 100644 --- a/cmd/swarm/access.go +++ b/cmd/swarm/access.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index 106e6dd9..87cbaa21 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -32,13 +32,13 @@ import ( "testing" "time" - "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/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/api" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" + "github.com/FusionFoundation/efsn/swarm/testutil" ) const ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 57bdad22..225c62d6 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/FusionFoundation/efsn/swarm/api" ) var ( @@ -93,7 +93,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/FusionFoundation/efsn/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 eb080839..aca65784 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -26,9 +26,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/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm" + "github.com/FusionFoundation/efsn/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index fe03f2d1..3093ce85 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index 91bc2c93..5f8d5f76 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/api" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index 525538ad..44e2ca62 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm" + "github.com/FusionFoundation/efsn/swarm" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index e1427cab..9c7bc3af 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/fuse" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 4f38b094..cdb2c3b3 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" colorable "github.com/mattn/go-colorable" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index d679806e..78adc40d 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 01b3f4ab..fa190e25 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/FusionFoundation/efsn/cmd/utils" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index c93344c4..38adf213 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -29,21 +29,21 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" - "github.com/ethereum/go-ethereum/swarm/tracing" - sv "github.com/ethereum/go-ethereum/swarm/version" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm" + bzzapi "github.com/FusionFoundation/efsn/swarm/api" + swarmmetrics "github.com/FusionFoundation/efsn/swarm/metrics" + "github.com/FusionFoundation/efsn/swarm/tracing" + sv "github.com/FusionFoundation/efsn/swarm/version" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 0216ffc1..c154a94b 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -22,9 +22,9 @@ import ( "os" "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/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/swarm/api" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest_test.go b/cmd/swarm/manifest_test.go index 08fe0b2e..843a5fe8 100644 --- a/cmd/swarm/manifest_test.go +++ b/cmd/swarm/manifest_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/FusionFoundation/efsn/swarm/api" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" ) // TestManifestChange tests manifest add, update and remove diff --git a/cmd/swarm/mru.go b/cmd/swarm/mru.go index 6176b6d6..4b8a2860 100644 --- a/cmd/swarm/mru.go +++ b/cmd/swarm/mru.go @@ -22,11 +22,11 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common/hexutil" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/FusionFoundation/efsn/cmd/utils" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" + "github.com/FusionFoundation/efsn/swarm/storage/mru" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 3e766dc1..7e77cc6f 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -32,13 +32,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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/internal/cmdtest" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm" ) func init() { diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 70aee192..39a0fae1 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -20,7 +20,7 @@ import ( "os" "sort" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" colorable "github.com/mattn/go-colorable" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 5e0ff4b0..a27826b2 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9eae2a3f..11251ac5 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/FusionFoundation/efsn/cmd/utils" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index c3199dad..c12c31c8 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/FusionFoundation/efsn/log" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" colorable "github.com/mattn/go-colorable" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 58d72f32..cf3934ff 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724..cfae4008 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/FusionFoundation/efsn/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 22ccec62..78aa9e57 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,35 +28,35 @@ 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/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/metrics/influxdb" - "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/whisperv6" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/fdlimit" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/clique" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/dashboard" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/ethstats" + "github.com/FusionFoundation/efsn/les" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/metrics/influxdb" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/params" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index d60e15c4..0000faf2 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,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/whisperv6" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/console" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/whisper/mailserver" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 13a13011..8a9885b5 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/FusionFoundation/efsn/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce..3c299fa5 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/FusionFoundation/efsn/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 80180d91..ab16a61d 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/FusionFoundation/efsn/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc..7c6d7be4 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/FusionFoundation/efsn/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index c61348f4..531da25a 100644 --- a/common/types.go +++ b/common/types.go @@ -26,9 +26,9 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/rlp" ) // Lengths of hashes and addresses in bytes. diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 6bcf987a..11613581 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 eae09f91..90c0310c 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 54d4555f..bba18de9 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,10 +21,10 @@ import ( "encoding/json" "sort" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 41dae142..163b47d7 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, @@ -363,7 +363,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this + // batch (https://github.com/FusionFoundation/efsn/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index f2a0eb19..40c1841b 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/datong/api.go b/consensus/datong/api.go index 935174ff..e92b7cb6 100644 --- a/consensus/datong/api.go +++ b/consensus/datong/api.go @@ -1,10 +1,10 @@ package datong 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/rpc" ) // API wacom diff --git a/consensus/datong/consensus.go b/consensus/datong/consensus.go index 90e8b34f..b3713ede 100644 --- a/consensus/datong/consensus.go +++ b/consensus/datong/consensus.go @@ -9,18 +9,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "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/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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" ) var ( diff --git a/consensus/datong/snapshot.go b/consensus/datong/snapshot.go index b2503620..806366f8 100644 --- a/consensus/datong/snapshot.go +++ b/consensus/datong/snapshot.go @@ -4,8 +4,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) // Snapshot wacom diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index f252a7f3..2b10f91e 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,11 +27,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index c58479e2..94a5ba78 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index a04ea235..32ccaedc 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 548c57cd..7a7b3553 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,15 +25,15 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/crypto/sha3" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) // Ethash proof-of-work protocol constants. @@ -622,10 +622,10 @@ func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header r.Sub(r, header.Number) r.Mul(r, blockReward) r.Div(r, big8) - state.AddBalance(uncle.Coinbase, r) + state.AddBalance( uncle.Coinbase, common.SystemAssetID, r) r.Div(blockReward, big32) reward.Add(reward, r) } - state.AddBalance(header.Coinbase, reward) + state.AddBalance(header.Coinbase, common.SystemAssetID, reward) } diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd..951b2956 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/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index d124cb1e..4a043134 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,12 +34,12 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "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/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 8eded2ca..bb069952 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" ) // Tests that ethash works correctly in test mode. @@ -55,7 +55,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/FusionFoundation/efsn/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 06c98a78..c7e3751b 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,10 +29,10 @@ import ( "sync" "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 436359af..ea695f37 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index dfd6af17..570bd0ec 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37..1967b454 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b0b4d379..acfdb5ad 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/FusionFoundation/efsn/accounts/usbwallet" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 3c397f80..aba2f73f 100644 --- a/console/console.go +++ b/console/console.go @@ -28,9 +28,9 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/internal/jsre" + "github.com/FusionFoundation/efsn/internal/web3ext" + "github.com/FusionFoundation/efsn/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 26465ca6..52280c71 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/internal/jsre" + "github.com/FusionFoundation/efsn/node" ) const ( diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile index bda0dd7d..c6810350 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/FusionFoundation/efsn && \ (cd go-ethereum && make geth) && \ cp efsn/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 364e7a80..80b84d43 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/FusionFoundation/efsn && \ (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 f6c4effc..00655461 100644 --- a/containers/docker/master-alpine/Dockerfile +++ b/containers/docker/master-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.7 RUN \ apk add --update go git make gcc musl-dev linux-headers ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://github.com/FusionFoundation/efsn && \ (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 70cacda1..015c72cb 100644 --- a/containers/docker/master-ubuntu/Dockerfile +++ b/containers/docker/master-ubuntu/Dockerfile @@ -5,7 +5,7 @@ ENV PATH=/usr/lib/go-1.9/bin:$PATH RUN \ apt-get update && apt-get upgrade -q -y && \ apt-get install -y --no-install-recommends golang-1.9 git make gcc libc-dev ca-certificates && \ - git clone --depth 1 --branch release/1.8 https://github.com/ethereum/go-ethereum && \ + git clone --depth 1 --branch release/1.8 https://github.com/FusionFoundation/efsn && \ (cd go-ethereum && make geth) && \ cp go-ethereum/build/bin/geth /geth && \ apt-get remove -y golang-1.9 git make gcc libc-dev && apt autoremove -y && apt-get clean && \ diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b2b2365f..a89a6b59 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/FusionFoundation/efsn/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 92bd896e..a36d1930 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/contracts/chequebook/contract" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 4bd2e176..c4b07e05 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/accounts/abi/bind/backends" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/chequebook/contract" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e275ac9b..03af160c 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 ddfe8d15..c2ade745 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/accounts/abi/bind/backends" + "github.com/FusionFoundation/efsn/contracts/chequebook/contract" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index cbf6cb05..dd7ff73e 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 a08380ad..80c9d3f4 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/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 c567d588..13b31031 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 75d9d0e4..fed72853 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/ens/contract" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 411b0419..8215e93e 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/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/accounts/abi/bind/backends" + "github.com/FusionFoundation/efsn/contracts/ens/contract" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index ce22f93f..032e5945 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/FusionFoundation/efsn/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index c7a54407..c26dc1ea 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 53cba051..b85edbde 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 1329f624..75f953e8 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/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 9319a783..c8ea3ba9 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/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 35528f76..6688a8c9 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,23 +27,23 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/datong" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 8c369d53..394bb15c 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,16 +24,16 @@ import ( "testing" "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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // So we can deterministically seed different blockchains @@ -1230,7 +1230,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/FusionFoundation/efsn/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 f20ba4aa..cf4a7ae2 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/FusionFoundation/efsn/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 ae07481a..f620ad9a 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/FusionFoundation/efsn/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96..8d756aea 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/FusionFoundation/efsn/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 3ec0d5ae..da821823 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/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/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 91143e52..b5710420 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/FusionFoundation/efsn/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/FusionFoundation/efsn/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 585a8df3..5cee6403 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/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 a029dec6..da346da3 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 0bc453fd..afaf554f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 64b64fd6..c6a93e2c 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/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 966139bc..7ff68962 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/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/events.go b/core/events.go index 710bdb58..291727d9 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index 8df4e496..f4e1de31 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index fee7f147..0b6f8753 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b92..b8206089 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index d9d4c0e4..a40fd384 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,17 +25,17 @@ 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/rawdb" - "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/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/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 c7d54f20..7ce10bb2 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ 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/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 495ad3c6..8b834229 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,14 +26,14 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/datong" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 051384d8..0fa78c7d 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c58..5a03736c 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/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index da543283..bf28c511 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -21,10 +21,10 @@ import ( "encoding/binary" "math/big" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index 9ddae6e2..4d9f2394 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4ff7e5bd..2c493ce4 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -17,10 +17,10 @@ package rawdb import ( - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index d9c10e14..213920f7 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 514328e8..0a345fca 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,10 +19,10 @@ package rawdb import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index ef597ef3..0d399342 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/state/database.go b/core/state/database.go index c1b63099..e21a79ff 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 21829da7..65f7504e 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -21,9 +21,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3..3e7a7582 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/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 9e46c851..a641efac 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 ea453d41..1a18ba64 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/FusionFoundation/efsn/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a..4df063d0 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/FusionFoundation/efsn/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 3d9c4e86..1f0eb38f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index 6f8f73bd..2e84e4f5 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index a09273f3..c30cf8a6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index e133fa64..fa480953 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) type revision struct { @@ -555,19 +555,14 @@ func (db *StateDB) ForEachStorage(addr common.Address, cb func(key, value common if so == nil { return } - - // When iterating over the storage check the cache first - for h, value := range so.cachedStorage { - cb(h, value) - } - it := trie.NewIterator(so.getTrie(db.db).NodeIterator(nil)) for it.Next() { - // ignore cached values key := common.BytesToHash(db.trie.GetKey(it.Key)) - if _, ok := so.cachedStorage[key]; !ok { - cb(key, common.BytesToHash(it.Value)) + if value, dirty := so.dirtyStorage[key]; dirty { + cb(key, value) + continue } + cb(key, common.BytesToHash(it.Value)) } } @@ -595,7 +590,7 @@ func (self *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range self.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/FusionFoundation/efsn/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index cbd5bc75..b879c7d7 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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/FusionFoundation/efsn/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) @@ -422,7 +422,7 @@ func (s *StateSuite) TestTouchDelete(c *check.C) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://github.com/FusionFoundation/efsn/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { sdb, _ := New(common.Hash{}, NewDatabase(ethdb.NewMemDatabase())) addr := common.HexToAddress("aaaa") diff --git a/core/state/sync.go b/core/state/sync.go index c566e790..91bf0148 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 31774016..2fa67757 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/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 503a35d1..2bb636a5 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index 98774cce..ce9d11c7 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -25,13 +25,13 @@ import ( "reflect" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) var ( @@ -263,7 +263,7 @@ func (st *StateTransition) gasUsed() uint64 { return st.initialGas - st.gas } -var outputCommands = true +var outputCommands = false func outputCommandInfo(param1 string, param2 string, param3 interface{}) { if outputCommands { diff --git a/core/tx_cacher.go b/core/tx_cacher.go index bcaa5ead..c33c29dc 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/FusionFoundation/efsn/core/types" ) // senderCacher is a concurrent transaction sender recoverer anc cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 41b5156d..0fb14b7f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 57abc514..a8e6abfc 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 d579f501..232c5a10 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/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 cb26d07b..ba14ec25 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 5a592054..2f2d6662 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0a..24d43176 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/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 8a21bba1..eb5cfc25 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,10 +26,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25..d35ff85f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d045c9e6..4fed2b2b 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/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7..b5d357b3 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/FusionFoundation/efsn/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5b..96d7690b 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9c..c8480ca1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c6..19df4dd9 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 5c807a4c..ae11802d 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da670..95b7da27 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index b629b47e..2acbde14 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/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 0e56acfe..e5f6a6da 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 3d1fc95a..0a3f0884 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/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 af4a71f0..b2d9b01a 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/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 c195d23a..ceab5420 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a..ae3ae16b 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index b390f45c..a85437e2 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -23,9 +23,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index f9c4298d..3dbca007 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/FusionFoundation/efsn/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 17de38de..cd939510 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 26bca689..d82a9a4a 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/FusionFoundation/efsn/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 20b741f8..ba57552f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/bn256" + "github.com/FusionFoundation/efsn/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337..70a8fba9 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index fc040c62..e0dd33eb 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/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 bba7058c..f82a603c 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/FusionFoundation/efsn/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 10b4f719..ae7834ba 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so @@ -455,7 +455,7 @@ func gasSuicide(gt params.GasTable, evm *EVM, contract *Contract, stack *Stack, if eip158 { // if empty and transfers value - if evm.StateDB.Empty(address) && evm.StateDB.GetBalance(contract.Address()).Sign() != 0 { + if evm.StateDB.Empty(address) && evm.StateDB.GetBalance(common.SystemAssetID, contract.Address()).Sign() != 0 { gas += gt.CreateBySuicide } } else if !evm.StateDB.Exist(address) { diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index ade3ca63..69974e85 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index ca9e775a..b214b144 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/params" ) var ( @@ -392,7 +392,7 @@ func opAddress(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memo func opBalance(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { slot := stack.peek() - slot.Set(interpreter.evm.StateDB.GetBalance(common.BigToAddress(slot))) + slot.Set(interpreter.evm.StateDB.GetBalance(common.SystemAssetID,common.BigToAddress(slot))) return nil, nil } @@ -855,8 +855,8 @@ func opStop(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory } func opSuicide(pc *uint64, interpreter *EVMInterpreter, contract *Contract, memory *Memory, stack *Stack) ([]byte, error) { - balance := interpreter.evm.StateDB.GetBalance(contract.Address()) - interpreter.evm.StateDB.AddBalance(common.BigToAddress(stack.pop()), balance) + balance := interpreter.evm.StateDB.GetBalance(common.SystemAssetID,contract.Address()) + interpreter.evm.StateDB.AddBalance(common.BigToAddress(stack.pop()), common.SystemAssetID, balance) interpreter.evm.StateDB.Suicide(contract.Address()) return nil, nil diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 48caadf1..27ed1264 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 2497fcaa..ef6371b6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 8e934f60..d1366caf 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,8 +20,8 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index deedf70c..408db273 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/FusionFoundation/efsn/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 85acb8d6..15571d37 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index cdbb70dc..b70b1f5b 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 722862b1..00f1c7c9 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/FusionFoundation/efsn/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 8fa6c90c..c032814c 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/FusionFoundation/efsn/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index b71ead0d..aa0a1903 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 31c9b9cf..6f17b3b1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index cd325f7c..f84999dc 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/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 b7d0ddc3..2f9235b0 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index ef664bda..5a7dc04d 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/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd..e26a1da6 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/FusionFoundation/efsn/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 5c081493..9c1621e0 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" +import "github.com/FusionFoundation/efsn/crypto/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index 6aa14211..93ef85fd 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -10,8 +10,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/FusionFoundation/efsn/crypto/bn256/cloudflare" + google "github.com/FusionFoundation/efsn/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 47df49d4..a9048899 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/google" +import "github.com/FusionFoundation/efsn/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 3211957e..7e1b3446 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 177c19c0..fbf8b283 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index f33f204d..ce51a017 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/FusionFoundation/efsn/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5..1396c792 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/FusionFoundation/efsn/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc22..d221c819 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/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/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 aecff76b..a3455f3f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index f3e7cf98..97b35799 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -32727,7 +32727,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit, + href: "https://github.com/FusionFoundation/efsn/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/assets/components/Footer.jsx b/dashboard/assets/components/Footer.jsx index 20830cbb..b3193774 100644 --- a/dashboard/assets/components/Footer.jsx +++ b/dashboard/assets/components/Footer.jsx @@ -165,7 +165,7 @@ class Footer extends Component { {general.commit && ( {'Commit '} - + {general.commit.substring(0, 8)} diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c8987902..36acbb9d 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/FusionFoundation/efsn/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 3ba92ac7..9ab69d2e 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -35,11 +35,11 @@ import ( "io" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" "github.com/mohae/deepcopy" "golang.org/x/net/websocket" ) diff --git a/dashboard/log.go b/dashboard/log.go index 5d852d60..1e3ca97e 100644 --- a/dashboard/log.go +++ b/dashboard/log.go @@ -26,7 +26,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" "github.com/mohae/deepcopy" "github.com/rjeczalik/notify" ) diff --git a/eth/api.go b/eth/api.go index 708f75a7..3b2fc36a 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,17 +28,17 @@ import ( "strings" "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/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "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/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index ee0f9902..81356959 100644 --- a/eth/api_backend.go +++ b/eth/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/rawdb" - "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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 47b062a4..0b9f76d6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index 5b7f168e..7b96c9e6 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,19 +26,19 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/tracers" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 72ae74ff..07e8f68c 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,31 +25,31 @@ 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/datong" - "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/rawdb" - "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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/clique" + "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/filters" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/miner" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index c7bb5614..9eef4dd5 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" ) const ( diff --git a/eth/config.go b/eth/config.go index 08d4c1f9..edf4971c 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 91c6322d..3407f9c9 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/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 fbde9c6c..59b06476 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + ethereum "github.com/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index d1a9a869..3b8ce611 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 59832fac..fcedb445 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 d4eb3379..03ac94e2 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/FusionFoundation/efsn/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 428a60f8..2b546bd0 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index a0e8a6d4..3b0adfda 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" ) var ( diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 8d33dfec..bd220d7b 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/trie" ) // stateReq represents a batch of state fetch requests grouped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index ff70bfa0..7019cb12 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/FusionFoundation/efsn/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 f0b5e806..36eb47c0 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,11 +22,11 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 3d4f0d1e..39dcda99 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f0..60eff661 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/FusionFoundation/efsn/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 5ed80a88..35297406 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 02229a75..993923b9 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index fe74fb54..abc394eb 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/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 071613ad..6987dca2 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 70139c1a..e39920a5 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,14 +25,14 @@ 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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 e71080b1..044a7db8 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ 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/rawdb" - "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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 396a03d6..324a4d65 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 3b8db78a..8cbce542 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" ) var maxPrice = big.NewInt(500 * params.GWei) diff --git a/eth/gen_config.go b/eth/gen_config.go index d401a917..177c4e63 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -6,12 +6,12 @@ import ( "math/big" "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index f89f68c9..b2c332c3 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/fetcher" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 0885a044..e9fc1e7e 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/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 3c101f65..687cb594 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a8..35860377 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/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index b5f45085..b915f126 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -24,10 +24,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/eth/protocol.go b/eth/protocol.go index 8e78bf47..64a95d40 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index aa43dfa9..62be38e1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index e49e4008..ddb4cc09 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 88c10c7f..e1186c74 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/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/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 b519236f..58b253c1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) @@ -187,7 +187,7 @@ func (dw *dbWrapper) pushObject(vm *duktape.Context) { // Push the wrapper for statedb.GetBalance vm.PushGoFunction(func(ctx *duktape.Context) int { - pushBigInt(dw.db.GetBalance(common.BytesToAddress(popSlice(ctx))), ctx) + pushBigInt(dw.db.GetBalance(common.SystemAssetID,common.BytesToAddress(popSlice(ctx))), ctx) return 1 }) vm.PutPropString(obj, "getBalance") diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 117c376b..4611dc11 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23a..ce2fc932 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/FusionFoundation/efsn/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 58b62472..a465b9e5 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/params" ) type account struct{} diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index b40837c8..aa2b0c7a 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be..307d00f8 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/FusionFoundation/efsn" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e..06c29fbe 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 99abd09b..6c1cddb2 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 74675cbe..44a08583 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/FusionFoundation/efsn/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 727f2f7c..887dd475 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/FusionFoundation/efsn/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index ec472e85..26aab393 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,18 +30,18 @@ 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/consensus/datong" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/datong" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/les" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50d..9170d2ba 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/FusionFoundation/efsn/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8dee..b0993985 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/FusionFoundation/efsn/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 5c76b55d..fdc5e094 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/FusionFoundation/efsn/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f4650..6a0d88bc 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/FusionFoundation/efsn/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 26b0fcbc..f848cec3 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 86a4218f..b67b3565 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 7d7eba98..5083acaf 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,10 +24,10 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/log/term" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/log/term" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaa..9e8f7a5c 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/FusionFoundation/efsn/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff68..ee4f0710 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/FusionFoundation/efsn/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index cbda7c7f..6429ca49 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,22 +26,22 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "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/rawdb" - "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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -424,7 +424,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/FusionFoundation/efsn/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} @@ -451,7 +451,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/FusionFoundation/efsn/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/api_fsn.go b/internal/ethapi/api_fsn.go index a8a6be5b..cea83738 100644 --- a/internal/ethapi/api_fsn.go +++ b/internal/ethapi/api_fsn.go @@ -6,13 +6,13 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" ) var lastBlockOfBuyTickets = int64(0) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index 0bdd765a..12ab821e 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/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 9c7ad16d..6de3d1d1 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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/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 abd4b4fe..1e453c5e 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/FusionFoundation/efsn/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4c7664f1..1a1de7b2 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 56e2f246..150e738b 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,22 @@ 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/rawdb" - "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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index a3474a68..0b30fc9c 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/rawdb" - "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/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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/bloombits" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/eth/filters" + "github.com/FusionFoundation/efsn/eth/gasprice" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/params" + rpc "github.com/FusionFoundation/efsn/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index aea0fcd5..393459fa 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/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/light" ) const ( diff --git a/les/commons.go b/les/commons.go index 0b6cf371..162d45ca 100644 --- a/les/commons.go +++ b/les/commons.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/fetcher.go b/les/fetcher.go index cc539c42..70cddd46 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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809..7aa4d66d 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/FusionFoundation/efsn/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0f..8d61fb47 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/FusionFoundation/efsn/common/mclock" ) const rcConst = 1000000 diff --git a/les/freeclient.go b/les/freeclient.go index 5ee607be..47c596eb 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index e95abc7a..7ac8bd43 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/ethdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 243a6dab..4d037b41 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,23 +26,23 @@ 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/rawdb" - "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/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 43be7f41..67d02e44 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/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 29496d6a..fe44ebb1 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,20 +26,20 @@ 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/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/les/flowcontrol" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a..8e853b54 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/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 9def05a6..7f21a364 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/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 77b1b6d0..f6f47ff7 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index e6458adf..839dc6b8 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/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/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 70c863c2..a9f94e60 100644 --- a/les/peer.go +++ b/les/peer.go @@ -25,13 +25,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/les/flowcontrol" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index ee4c2239..31468e84 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,12 +26,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/secp256k1" + "github.com/FusionFoundation/efsn/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index f02c2a3d..ae091699 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index d77cfea7..175656d2 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/light" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/light" ) var ( diff --git a/les/server.go b/les/server.go index 2fa0456d..098ffb7c 100644 --- a/les/server.go +++ b/les/server.go @@ -23,19 +23,19 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/les/flowcontrol" + "github.com/FusionFoundation/efsn/light" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 1a4c7522..5ed3cd08 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/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 1ac64558..d47a6ab5 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc83..878a890f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 8e2734c2..026de7d6 100644 --- a/light/lightchain.go +++ b/light/lightchain.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/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index d45c0656..6f9a0ae3 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ 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/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c..29e6a77e 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/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 900be054..83ab5182 100644 --- a/light/odr.go +++ b/light/odr.go @@ -23,11 +23,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 3da7b305..048e728b 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 073f0d64..1aa15ee8 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 2f8cb73a..e449b6ba 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ 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/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/bitutil" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index c07e9946..1e69f33d 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/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 51ce9017..1105f631 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/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 6e8527d9..5a666ec6 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/rawdb" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index ce77573e..555ab1b6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 7902b296..537ddb37 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/FusionFoundation/efsn/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 325a193c..04a0c88f 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,7 +8,7 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index 31a5c21b..b567bbd5 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 2138e01a..ce56b028 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 2a2b804e..dd7c3f11 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/miner.go b/miner/miner.go index 5218c121..3982c2d2 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,15 +22,15 @@ 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/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" ) // Backend wraps all methods required for mining. diff --git a/miner/stress_clique.go b/miner/stress_clique.go index 56d93b98..a190a069 100644 --- a/miner/stress_clique.go +++ b/miner/stress_clique.go @@ -29,19 +29,19 @@ import ( "os" "time" - "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/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/fdlimit" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" ) func main() { diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 6f7a9724..44b2ec6b 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -29,20 +29,20 @@ import ( "path/filepath" "time" - "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/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" - "github.com/ethereum/go-ethereum/eth/downloader" - "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/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/fdlimit" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3eb29bc7..b402216c 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" ) // chainRetriever 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 42e77f3e..9db380f7 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 8579c5c8..cf02d10b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,16 +25,16 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/misc" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/params" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index db0ff434..c5362548 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -21,17 +21,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/consensus" + "github.com/FusionFoundation/efsn/consensus/clique" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bff..a7274769 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 463a300c..d933fb56 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/FusionFoundation/efsn/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/FusionFoundation/efsn/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 dd7b1587..52cfa8f3 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/FusionFoundation/efsn/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a2..90a455e5 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/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 047d8e1f..c381f03d 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 091c00e9..70e5a091 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/FusionFoundation/efsn/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 662125c4..54982a40 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/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 59da8523..dd7ad448 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/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index e3e2e905..38bb3d6d 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ 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/internal/debug" - "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/whisperv6" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/eth" + "github.com/FusionFoundation/efsn/eth/downloader" + "github.com/FusionFoundation/efsn/ethclient" + "github.com/FusionFoundation/efsn/ethstats" + "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/les" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/params" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85e..aa0a45cc 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c2608..4a8c7b88 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/FusionFoundation/efsn/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd..fd20dab4 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/FusionFoundation/efsn/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 a80d9fff..cb6de0f6 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/FusionFoundation/efsn/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870e..805504a9 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/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/shhclient.go b/mobile/shhclient.go index a069c9bd..578feb64 100755 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -19,8 +19,8 @@ package geth import ( - "github.com/ethereum/go-ethereum/whisper/shhclient" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/FusionFoundation/efsn/whisper/shhclient" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. diff --git a/mobile/types.go b/mobile/types.go index 443d07ea..d2b92d28 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,10 +23,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/rlp" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" ) // 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 72093e3d..b73d76bd 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/FusionFoundation/efsn/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 2656c212..9e9f6170 100644 --- a/node/api.go +++ b/node/api.go @@ -22,12 +22,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 04b26396..ed5641d8 100644 --- a/node/config.go +++ b/node/config.go @@ -25,15 +25,15 @@ 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/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/accounts/usbwallet" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index 672e76fa..09fc85c7 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 8a2c913f..6240b8ae 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/rpc" ) const ( diff --git a/node/node.go b/node/node.go index d320e1a6..b987a96a 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/internal/debug" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f406..f8aec1c7 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/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/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 e51900bd..66c3e0cc 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 6a96d9b1..1afdcb93 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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 9801b1ed..ff4c2f8b 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/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 4baca7d9..22ff6f73 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/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 2a7941fc..9f87cae8 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/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 22554145..4c5f7583 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 7b089ef7..afb42596 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -31,9 +31,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index 0b55b1ed..0c39e1c1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399..451ac614 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/FusionFoundation/efsn/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index a130b549..a7e734d6 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -32,10 +32,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index ed55ebd9..5ef08e89 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -28,8 +28,8 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 7599713f..88c35da2 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index bae3afc8..f1cc2bd2 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744..b99a2a64 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index cb11d7ea..c98fe281 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/FusionFoundation/efsn/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index d7051929..f50965a2 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 1a813767..4a4226ae 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 0b5a1ec3..259f25b5 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index a523b4e8..40718b08 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657..65fd766a 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/FusionFoundation/efsn/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 5659339d..b085b8db 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/FusionFoundation/efsn/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 4f4b2426..a2ad4833 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/FusionFoundation/efsn/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943da..beead807 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index ae4b18e7..3b8bd5ac 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 609a4129..4594e69e 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/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f..69dc6367 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 49e1cb81..fbcde7e1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/p2p/netutil" + "github.com/FusionFoundation/efsn/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 1ea23089..17b9d7c4 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 48683471..f9f080ca 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -34,7 +34,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/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 21e20e62..8e92eb21 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 71c7653a..9f6e9047 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/enr/idscheme.go b/p2p/enr/idscheme.go index efaf6804..8afc2ebc 100644 --- a/p2p/enr/idscheme.go +++ b/p2p/enr/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/rlp" ) // Registry of known identity schemes. diff --git a/p2p/message.go b/p2p/message.go index a4eac54d..f681de0c 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,9 +25,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/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 2d52fd1f..4551af01 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/FusionFoundation/efsn/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c..a142270c 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/FusionFoundation/efsn/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 482e3d50..767493e7 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,11 +25,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/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 948aeb49..1a04b3f3 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/FusionFoundation/efsn/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index 615f74b5..250b999a 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -38,12 +38,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/swarm/spancontext" + "github.com/FusionFoundation/efsn/swarm/tracing" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 11df8ff3..6f281ad7 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" ) // handshake message type diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 46b66686..9aed5ad6 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/crypto/secp256k1" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 7ae80077..9ffcc943 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,12 +31,12 @@ 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/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index f9a38fcc..cdbae02e 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -26,14 +26,14 @@ import ( "sync/atomic" "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/mclock" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discv5" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 3f24a79b..3ec71b58 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index d145c46b..cbe8019f 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,8 +28,8 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" ) var ( diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index e64cebc2..8e10c391 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -35,11 +35,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/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index dbef0730..3c2a258c 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ 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/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index e1e092f6..c853608d 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/FusionFoundation/efsn/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 2c4b9dd8..28804ebc 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,11 +26,11 @@ import ( "strconv" "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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/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 6a0ead53..16199b10 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/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/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 24001f19..e94b7ae8 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/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/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 732d49f5..0ea913a4 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/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 389b1e3e..470df661 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index de8ec0b3..1d272cb6 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/FusionFoundation/efsn/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 0fb7485a..cb69b6bf 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/FusionFoundation/efsn/event" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index f178bac5..154469ea 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/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/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 28886e92..13faa59c 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/FusionFoundation/efsn/p2p/discover" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index ed00396e..71937f8c 100644 --- a/p2p/testing/peerpool.go +++ b/p2p/testing/peerpool.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index e3ec41ad..ecd4a4a2 100644 --- a/p2p/testing/protocolsession.go +++ b/p2p/testing/protocolsession.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "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/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index c99578fe..23c4a260 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -32,14 +32,14 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index da18105d..3fb35194 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/FusionFoundation/efsn/common" ) // Genesis hashes to enforce below configs on. @@ -114,16 +114,16 @@ var ( // // This configuration is intentionally not using keyed fields to force anyone // adding flags to the config to also have to set these fields. - AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil} + AllEthashProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil, nil} // AllCliqueProtocolChanges contains every protocol change (EIPs) introduced // and accepted by the Ethereum core developers into the Clique consensus. // // This configuration is intentionally not using keyed fields to force anyone // adding flags to the config to also have to set these fields. - AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}} + AllCliqueProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, nil, &CliqueConfig{Period: 0, Epoch: 30000}, nil} - TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil} + TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, nil, new(EthashConfig), nil, nil} TestRules = TestChainConfig.Rules(new(big.Int)) ) @@ -166,6 +166,7 @@ type ChainConfig struct { // Various consensus engines Ethash *EthashConfig `json:"ethash,omitempty"` Clique *CliqueConfig `json:"clique,omitempty"` + DaTong *DaTongConfig `json:"datong,omitempty"` } // EthashConfig is the consensus engine configs for proof-of-work based sealing. @@ -405,3 +406,13 @@ func (c *ChainConfig) Rules(num *big.Int) Rules { IsConstantinople: c.IsConstantinople(num), } } + +// DaTongConfig is the consensus engine configs for proof-of-stake based sealing. +type DaTongConfig struct { + Period uint64 `json:"period"` +} + +// String implements the stringer interface, returning the consensus engine details. +func (c *DaTongConfig) String() string { + return "datong" +} diff --git a/params/dao.go b/params/dao.go index da3c8dfc..01d861ac 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/FusionFoundation/efsn/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rlp/encode.go b/rlp/encode.go index be70819a..a6883525 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -24,7 +24,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) var ( diff --git a/rpc/client.go b/rpc/client.go index d96189a2..51badfef 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -33,7 +33,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 9c21c12d..80d54f24 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/FusionFoundation/efsn/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 4f354d38..a17d95d7 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/FusionFoundation/efsn/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 8ca6d4eb..3c5b99e7 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/http.go b/rpc/http.go index f3bd1f29..807401b0 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,7 +31,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" "github.com/rs/cors" ) diff --git a/rpc/ipc.go b/rpc/ipc.go index b05e503d..d18d5d51 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/json.go b/rpc/json.go index a523eeb8..cf9fd672 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 214e1d3e..183b8af0 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -26,7 +26,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) const MetadataApi = "rpc" diff --git a/rpc/types.go b/rpc/types.go index 4252c360..7115b240 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -24,7 +24,7 @@ import ( "sync" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c5..178d22d2 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/FusionFoundation/efsn/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index eae8320e..759a95a3 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -31,7 +31,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index 0fef2493..bed739d8 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index 2afeec73..bfe4080d 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/accounts/abi" + "github.com/FusionFoundation/efsn/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index 9a2a49cc..4de3dedb 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,15 +25,15 @@ import ( "math/big" "reflect" - "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/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/accounts/usbwallet" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" ) // ExternalAPI defines the external API through which signing requests are made. @@ -374,7 +374,7 @@ func (api *SignerAPI) SignTransaction(ctx context.Context, args SendTxArgs, meth // // 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/FusionFoundation/efsn/wiki/Management-APIs#personal_sign func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, data hexutil.Bytes) (hexutil.Bytes, error) { sighash, msg := SignHash(data) // We make the request prior to looking up if we actually have the account, to prevent @@ -413,7 +413,7 @@ func (api *SignerAPI) Sign(ctx context.Context, addr common.MixedcaseAddress, da // 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/FusionFoundation/efsn/wiki/Management-APIs#personal_ecRecover func (api *SignerAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 50ad0219..a377c860 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -27,13 +27,13 @@ import ( "testing" "time" - "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/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/accounts/keystore" + "github.com/FusionFoundation/efsn/cmd/utils" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index d0ba733d..09beeddb 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 2f969669..cc50c583 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,9 +25,9 @@ import ( "sync" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 5640ed03..27b28120 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 2acc0a4f..ff0754db 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -22,10 +22,10 @@ import ( "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/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index 288456df..3b288962 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -22,7 +22,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) // The validation package contains validation checks for transactions @@ -124,7 +124,7 @@ func (v *Validator) validate(msgs *ValidationMessages, txargs *SendTxArgs, metho if txargs.To == nil { //Contract creation should contain sufficient data to deploy a contract // A typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106 + // e.g. https://github.com/FusionFoundation/efsn/issues/16106 if len(data) == 0 { if txargs.Value.ToInt().Cmp(big.NewInt(0)) > 0 { // Sending ether into black hole diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index 2b33a863..dd83a430 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 711e2ddd..8f134142 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,12 +22,12 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/signer/core" + "github.com/FusionFoundation/efsn/signer/rules/deps" + "github.com/FusionFoundation/efsn/signer/storage" "github.com/robertkrimen/otto" ) diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index b6060eba..e2ffd5dc 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "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/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/FusionFoundation/efsn/accounts" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/internal/ethapi" + "github.com/FusionFoundation/efsn/signer/core" + "github.com/FusionFoundation/efsn/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 399637a4..077edf26 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index 77804905..d4d07521 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" "github.com/mattn/go-colorable" ) diff --git a/swarm/README.md b/swarm/README.md index e8196321..fc14a055 100755 --- a/swarm/README.md +++ b/swarm/README.md @@ -4,7 +4,7 @@ Swarm is a distributed storage platform and content distribution service, a native base layer service of the ethereum web3 stack. The primary objective of Swarm is to provide a decentralized and redundant store for dapp code and data as well as block chain and state data. Swarm is also set out to provide various base layer services for web3, including node-to-node messaging, media streaming, decentralised database services and scalable state-channel infrastructure for decentralised service economies. -[![Travis](https://travis-ci.org/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.org/ethereum/go-ethereum) +[![Travis](https://travis-ci.org/FusionFoundation/efsn.svg?branch=master)](https://travis-ci.org/FusionFoundation/efsn) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethersphere/orange-lounge?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ## Table of Contents @@ -27,9 +27,9 @@ Swarm is a distributed storage platform and content distribution service, a nati Building Swarm requires Go (version 1.10 or later). - go get -d github.com/ethereum/go-ethereum + go get -d github.com/FusionFoundation/efsn - go install github.com/ethereum/go-ethereum/cmd/swarm + go install github.com/FusionFoundation/efsn/cmd/swarm ## Running Swarm @@ -90,12 +90,12 @@ Swarm documentation can be found at [https://swarm-guide.readthedocs.io](https:/ We assume that you have Go v1.10 installed, and `GOPATH` is set. -You must have your working copy under `$GOPATH/src/github.com/ethereum/go-ethereum`. +You must have your working copy under `$GOPATH/src/github.com/FusionFoundation/efsn`. Most likely you will be working from your fork of `go-ethereum`, let's say from `github.com/nirname/go-ethereum`. Clone or move your fork into the right place: ``` -git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/ethereum/go-ethereum +git clone git@github.com:nirname/go-ethereum.git $GOPATH/src/github.com/FusionFoundation/efsn ``` @@ -181,7 +181,7 @@ Once you have `stateth` installed, and you have Docker running locally, you have 1. Run `stateth` and keep it running in the background ``` -stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/ethereum/go-ethereum/swarm/grafana_dashboards --influxdb-database metrics +stateth --rm --grafana-dashboards-folder $GOPATH/src/github.com/FusionFoundation/efsn/swarm/grafana_dashboards --influxdb-database metrics ``` 2. Run `swarm` with at least the following params: @@ -228,7 +228,7 @@ Please make sure your contributions adhere to our coding guidelines: * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. * Pull requests need to be based on and opened against the `master` branch. - * [Code review guidelines](https://github.com/ethereum/go-ethereum/wiki/Code-Review-Guidelines). + * [Code review guidelines](https://github.com/FusionFoundation/efsn/wiki/Code-Review-Guidelines). * Commit messages should be prefixed with the package(s) they modify. * E.g. "swarm/fuse: ignore default manifest entry" diff --git a/swarm/api/act.go b/swarm/api/act.go index 52d90982..2968b25d 100755 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -12,13 +12,13 @@ import ( "strings" "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/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/sctx" + "github.com/FusionFoundation/efsn/swarm/storage" "golang.org/x/crypto/scrypt" cli "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/api/api.go b/swarm/api/api.go index d7b6d841..e08b01e8 100755 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -34,15 +34,15 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/multihash" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/ens" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/multihash" + "github.com/FusionFoundation/efsn/swarm/spancontext" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mru" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index a65bf07e..56ed284f 100755 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -27,11 +27,11 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/sctx" + "github.com/FusionFoundation/efsn/swarm/storage" ) func init() { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 3d06e9e1..83fd887c 100755 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -34,8 +34,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/storage/mru" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index f9312d48..ba833d8a 100755 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,13 +25,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/multihash" - "github.com/ethereum/go-ethereum/swarm/storage/mru" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/swarm/api" + swarmhttp "github.com/FusionFoundation/efsn/swarm/api/http" + "github.com/FusionFoundation/efsn/swarm/multihash" + "github.com/FusionFoundation/efsn/swarm/storage/mru" + "github.com/FusionFoundation/efsn/swarm/testutil" ) func serverFunc(api *api.API) testutil.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index baa13105..85ea6693 100755 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -23,16 +23,16 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/ens" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/pss" + "github.com/FusionFoundation/efsn/swarm/services/swap" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index bd7e1d87..37573760 100755 --- 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index ffe6c16d..f397e566 100755 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/swarm/storage/encryption" ) type RefEncryption struct { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 8251ebc4..4dd0b67f 100755 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -27,9 +27,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index fe7527b1..e792a64f 100755 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index 3b2dcc7d..bf30e406 100755 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -6,11 +6,11 @@ import ( "runtime/debug" "strings" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/sctx" + "github.com/FusionFoundation/efsn/swarm/spancontext" "github.com/pborman/uuid" ) diff --git a/swarm/api/http/response.go b/swarm/api/http/response.go index c9fb9d28..24968d67 100755 --- a/swarm/api/http/response.go +++ b/swarm/api/http/response.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/api" ) var ( diff --git a/swarm/api/http/response_test.go b/swarm/api/http/response_test.go index 50a704be..7c6c397e 100755 --- a/swarm/api/http/response_test.go +++ b/swarm/api/http/response_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/html" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/FusionFoundation/efsn/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index be8ea398..494536f3 100755 --- 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/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/FusionFoundation/efsn/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/FusionFoundation/efsn/common/httpclient" + "github.com/FusionFoundation/efsn/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index 431e1173..2b799b31 100755 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -3,8 +3,8 @@ package http import ( "context" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/sctx" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/sctx" ) type contextKey int diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index af1269b9..b94ff270 100755 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -36,12 +36,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mru" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index 4a3ca042..2a00c508 100755 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -36,16 +36,16 @@ 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/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/api" + swarm "github.com/FusionFoundation/efsn/swarm/api/client" + "github.com/FusionFoundation/efsn/swarm/multihash" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mru" + "github.com/FusionFoundation/efsn/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 986f5f88..84099a3e 100755 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -22,7 +22,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/FusionFoundation/efsn/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index d44ad227..7f79524c 100755 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 1c8e53c4..e4f39610 100755 --- 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/FusionFoundation/efsn/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 8a48fe5b..eef57079 100755 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -20,7 +20,7 @@ import ( "context" "path" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) type Response struct { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 4c7d0982..d4d84e5d 100755 --- 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/FusionFoundation/efsn/swarm/network" ) type Control struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 80851708..4775541a 100755 --- a/swarm/api/uri.go +++ b/swarm/api/uri.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index ea649e27..d82c93c4 100755 --- a/swarm/api/uri_test.go +++ b/swarm/api/uri_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index 760aa11d..9cdbb4de 100755 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/FusionFoundation/efsn/crypto/sha3" ) // the actual data length generated (could be longer than max datalength of the BMT) diff --git a/swarm/dev/Makefile b/swarm/dev/Makefile index 365964b7..849035d4 100755 --- 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/FusionFoundation/efsn/cmd/swarm + go build -o bin/geth github.com/FusionFoundation/efsn/cmd/geth + go build -o bin/bootnode github.com/FusionFoundation/efsn/cmd/bootnode cluster: build scripts/boot-cluster.sh test: - go test -v github.com/ethereum/go-ethereum/swarm/... + go test -v github.com/FusionFoundation/efsn/swarm/... diff --git a/swarm/dev/bashrc b/swarm/dev/bashrc index efb504fa..2041442c 100755 --- 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/FusionFoundation/efsn" export PATH="${ROOT}/swarm/dev/bin:${PATH}" cd "${ROOT}/swarm/dev" diff --git a/swarm/dev/run.sh b/swarm/dev/run.sh index 2ad600de..228f7367 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/FusionFoundation/efsn" \ --volume "/var/run/docker.sock:/var/run/docker.sock" \ ${docker_args} \ "${name}" \ diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 7f66451f..6c2ecd9c 100755 --- a/swarm/fuse/fuse_dir.go +++ b/swarm/fuse/fuse_dir.go @@ -25,7 +25,7 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index ca04f737..2e98f75a 100755 --- 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/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index c7aa983b..9e281844 100755 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/FusionFoundation/efsn/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 87d91855..2082d0b6 100755 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -29,10 +29,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/storage" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 9ff55cc3..8be9fe4d 100755 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -30,9 +30,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 4f2e1416..d440b023 100755 --- 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/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index ce372632..c94eff11 100755 --- a/swarm/log/log.go +++ b/swarm/log/log.go @@ -1,8 +1,8 @@ package log import ( - l "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + l "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 79490fd3..7353c3fc 100755 --- a/swarm/metrics/flags.go +++ b/swarm/metrics/flags.go @@ -19,10 +19,10 @@ package metrics import ( "time" - "github.com/ethereum/go-ethereum/cmd/utils" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/cmd/utils" + gethmetrics "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/metrics/influxdb" + "github.com/FusionFoundation/efsn/swarm/log" "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index 30195948..9304ea3f 100755 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/FusionFoundation/efsn/swarm/pot" ) // discovery bzz extension for requesting and relaying node address records diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go index 494bc819..a1d13a10 100755 --- a/swarm/network/discovery_test.go +++ b/swarm/network/discovery_test.go @@ -19,7 +19,7 @@ package network import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" ) /*** diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index 413b40cb..2a22b008 100755 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/storage" ) var searchTimeout = 1 * time.Second diff --git a/swarm/network/fetcher_test.go b/swarm/network/fetcher_test.go index 21b81d65..ea5b24a9 100755 --- a/swarm/network/fetcher_test.go +++ b/swarm/network/fetcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" ) var requestedPeerID = discover.MustHexID("1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439") diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 425c1d5a..3b28e614 100755 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index 7ea000c1..cc008525 100755 --- a/swarm/network/hive_test.go +++ b/swarm/network/hive_test.go @@ -22,8 +22,8 @@ import ( "os" "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/state" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" + "github.com/FusionFoundation/efsn/swarm/state" ) func newHiveTester(t *testing.T, params *HiveParams, n int, store state.Store) (*bzzTester, *Hive) { diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go index 55a0c6f1..1a38ade1 100755 --- a/swarm/network/kademlia.go +++ b/swarm/network/kademlia.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/pot" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index 903c8dbd..c1df940a 100755 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/pot" ) func init() { diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 91a1f6d7..ebdc9eac 100755 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -26,13 +26,13 @@ import ( "testing" "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/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" ) var ( diff --git a/swarm/network/priorityqueue/priorityqueue.go b/swarm/network/priorityqueue/priorityqueue.go index 53850260..2f621347 100755 --- a/swarm/network/priorityqueue/priorityqueue.go +++ b/swarm/network/priorityqueue/priorityqueue.go @@ -29,7 +29,7 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" ) var ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index d509d157..4a467037 100755 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "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/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index 0fc85837..304199fc 100755 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -23,11 +23,11 @@ import ( "sync" "testing" - "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/protocols" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" ) const ( diff --git a/swarm/network/simulation/bucket.go b/swarm/network/simulation/bucket.go index ddbedb52..ccfcada5 100755 --- a/swarm/network/simulation/bucket.go +++ b/swarm/network/simulation/bucket.go @@ -17,7 +17,7 @@ package simulation import ( - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" ) // BucketKey is the type that should be used for keys in simulation buckets. diff --git a/swarm/network/simulation/bucket_test.go b/swarm/network/simulation/bucket_test.go index 461d9982..69d38221 100755 --- a/swarm/network/simulation/bucket_test.go +++ b/swarm/network/simulation/bucket_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionalities using subtests. diff --git a/swarm/network/simulation/connect.go b/swarm/network/simulation/connect.go index 3d0f6cb3..1f432c8c 100755 --- a/swarm/network/simulation/connect.go +++ b/swarm/network/simulation/connect.go @@ -19,7 +19,7 @@ package simulation import ( "strings" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" ) // ConnectToPivotNode connects the node with provided NodeID diff --git a/swarm/network/simulation/connect_test.go b/swarm/network/simulation/connect_test.go index 10d73e4a..90d3234a 100755 --- a/swarm/network/simulation/connect_test.go +++ b/swarm/network/simulation/connect_test.go @@ -19,7 +19,7 @@ package simulation import ( "testing" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" ) func TestConnectToPivotNode(t *testing.T) { diff --git a/swarm/network/simulation/events.go b/swarm/network/simulation/events.go index 980a9a75..78fa7f92 100755 --- a/swarm/network/simulation/events.go +++ b/swarm/network/simulation/events.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/ethereum/go-ethereum/p2p" + "github.com/FusionFoundation/efsn/p2p" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/swarm/network/simulation/example_test.go b/swarm/network/simulation/example_test.go index 2a811692..55f02b72 100755 --- a/swarm/network/simulation/example_test.go +++ b/swarm/network/simulation/example_test.go @@ -22,12 +22,12 @@ import ( "sync" "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/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" ) // Every node can have a Kademlia associated using the node bucket under diff --git a/swarm/network/simulation/http.go b/swarm/network/simulation/http.go index 69ae3bae..5e415dfa 100755 --- a/swarm/network/simulation/http.go +++ b/swarm/network/simulation/http.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/simulations" ) // Package defaults. diff --git a/swarm/network/simulation/http_test.go b/swarm/network/simulation/http_test.go index 775cf921..51fba91e 100755 --- a/swarm/network/simulation/http_test.go +++ b/swarm/network/simulation/http_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index 3e45cb0c..1bb88290 100755 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -21,11 +21,11 @@ import ( "encoding/hex" "time" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/network" ) // BucketKeyKademlia is the key to be used for storing the kademlia diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go index d11fe7e4..c134fd25 100755 --- a/swarm/network/simulation/kademlia_test.go +++ b/swarm/network/simulation/kademlia_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" ) func TestWaitTillHealthy(t *testing.T) { diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index 784588fa..d9199ac9 100755 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -24,10 +24,10 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) // NodeIDs returns NodeIDs for all nodes in the network. diff --git a/swarm/network/simulation/node_test.go b/swarm/network/simulation/node_test.go index 94f0b4fa..b48b83ca 100755 --- a/swarm/network/simulation/node_test.go +++ b/swarm/network/simulation/node_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" ) func TestUpDownNodeIDs(t *testing.T) { diff --git a/swarm/network/simulation/service.go b/swarm/network/simulation/service.go index 02e7ad0c..81a5c635 100755 --- a/swarm/network/simulation/service.go +++ b/swarm/network/simulation/service.go @@ -17,9 +17,9 @@ package simulation import ( - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index 2c7a18b0..863a22a4 100755 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" ) // Common errors that are returned by functions in this package. diff --git a/swarm/network/simulation/simulation_test.go b/swarm/network/simulation/simulation_test.go index eed09bf5..e427f141 100755 --- a/swarm/network/simulation/simulation_test.go +++ b/swarm/network/simulation/simulation_test.go @@ -24,11 +24,11 @@ import ( "testing" "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/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index 913d6d83..2c08c495 100755 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -31,15 +31,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 9419de0c..2a5231b3 100755 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "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/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 4d4eb6c3..8bfaf342 100755 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index e0d776e3..19c4e63b 100755 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -31,15 +31,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - mockdb "github.com/ethereum/go-ethereum/swarm/storage/mock/db" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/pot" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" + mockdb "github.com/FusionFoundation/efsn/swarm/storage/mock/db" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index d0f27eeb..37b7946a 100755 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -22,12 +22,12 @@ import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/spancontext" + "github.com/FusionFoundation/efsn/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index ece54d4e..b6e554af 100755 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" ) func TestStreamerRetrieveRequest(t *testing.T) { diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 6716e593..25164505 100755 --- a/swarm/network/stream/intervals/dbstore_test.go +++ b/swarm/network/stream/intervals/dbstore_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/swarm/state" ) // TestDBStore tests basic functionality of DBStore. diff --git a/swarm/network/stream/intervals/store_test.go b/swarm/network/stream/intervals/store_test.go index 0ab14c06..f7023f4c 100755 --- a/swarm/network/stream/intervals/store_test.go +++ b/swarm/network/stream/intervals/store_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/FusionFoundation/efsn/swarm/state" ) var ErrNotFound = errors.New("not found") diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go index 452aaca7..64a23522 100755 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -27,15 +27,15 @@ import ( "testing" "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/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" ) func TestIntervalsLive(t *testing.T) { diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index 2e1a81e8..b9752a53 100755 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - bv "github.com/ethereum/go-ethereum/swarm/network/bitvector" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/log" + bv "github.com/FusionFoundation/efsn/swarm/network/bitvector" + "github.com/FusionFoundation/efsn/swarm/spancontext" + "github.com/FusionFoundation/efsn/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 5fdaa7b8..94fce862 100755 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -22,14 +22,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/swarm/log" + pq "github.com/FusionFoundation/efsn/swarm/network/priorityqueue" + "github.com/FusionFoundation/efsn/swarm/network/stream/intervals" + "github.com/FusionFoundation/efsn/swarm/spancontext" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index 19eaad34..6eaa4989 100755 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" ) //constants for random file generation diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index 7cd09099..2b45891d 100755 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -26,18 +26,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - mockdb "github.com/ethereum/go-ethereum/swarm/storage/mock/db" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/pot" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" + mockdb "github.com/FusionFoundation/efsn/swarm/storage/mock/db" ) const MaxTimeout = 600 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index 319fc62c..73aa8739 100755 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/stream/intervals" + "github.com/FusionFoundation/efsn/swarm/pot" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index 06e96b9a..9be22063 100755 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/FusionFoundation/efsn/crypto/sha3" + p2ptest "github.com/FusionFoundation/efsn/p2p/testing" ) func TestStreamerSubscribe(t *testing.T) { diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index e9811a67..ddb1af24 100755 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -22,9 +22,9 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index 469d520f..32216d15 100755 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -28,17 +28,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "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/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - mockdb "github.com/ethereum/go-ethereum/swarm/storage/mock/db" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" + mockdb "github.com/FusionFoundation/efsn/swarm/storage/mock/db" ) const dataChunkCount = 200 diff --git a/swarm/network_test.go b/swarm/network_test.go index 86a90433..e95c1a27 100755 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/network/simulation" + "github.com/FusionFoundation/efsn/swarm/storage" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 3974ebca..506f8373 100755 --- a/swarm/pot/address.go +++ b/swarm/pot/address.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index aeb23dfc..aa5e4006 100755 --- a/swarm/pot/pot_test.go +++ b/swarm/pot/pot_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index eba7bb72..99ae1d9d 100755 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 532a2238..9c58ad67 100755 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index f3606987..f327e243 100755 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "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/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/pss" + "github.com/FusionFoundation/efsn/swarm/state" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv5" ) type protoCtrl struct { diff --git a/swarm/pss/client/doc.go b/swarm/pss/client/doc.go index 080af45a..9d8bac58 100755 --- a/swarm/pss/client/doc.go +++ b/swarm/pss/client/doc.go @@ -28,11 +28,11 @@ // "context" // "fmt" // "os" -// pss "github.com/ethereum/go-ethereum/swarm/pss/client" -// "github.com/ethereum/go-ethereum/p2p/protocols" -// "github.com/ethereum/go-ethereum/p2p" -// "github.com/ethereum/go-ethereum/swarm/pot" -// "github.com/ethereum/go-ethereum/swarm/log" +// pss "github.com/FusionFoundation/efsn/swarm/pss/client" +// "github.com/FusionFoundation/efsn/p2p/protocols" +// "github.com/FusionFoundation/efsn/p2p" +// "github.com/FusionFoundation/efsn/swarm/pot" +// "github.com/FusionFoundation/efsn/swarm/log" // ) // // type FooMsg struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index e3ead77d..705239f1 100755 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ 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/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 0fc7e798..1a579910 100755 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index 723092c3..8fe4410c 100755 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index 3c655f21..581c5f55 100755 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "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/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/pss" + "github.com/FusionFoundation/efsn/swarm/state" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv5" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index ff635f40..fa2c18e6 100755 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index 5fcae090..b740acfb 100755 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 0b6ea33c..b87a177d 100755 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index b96649fe..1e0d951d 100755 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/pot" + "github.com/FusionFoundation/efsn/swarm/storage" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv5" ) const ( diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 6ba04cb5..e695f392 100755 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,22 +34,22 @@ 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/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "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/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/metrics/influxdb" + "github.com/FusionFoundation/efsn/node" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/p2p/simulations" + "github.com/FusionFoundation/efsn/p2p/simulations/adapters" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/state" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv5" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index 1e33ecdc..b8e2e7fe 100755 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/swarm/storage" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv5" ) const ( diff --git a/swarm/pss/writeup.md b/swarm/pss/writeup.md index a0506ffa..096554b0 100755 --- a/swarm/pss/writeup.md +++ b/swarm/pss/writeup.md @@ -36,22 +36,22 @@ go test -race -v ./swarm/pss -cpu 4 -run TestNetwork 1 ================== 2 WARNING: DATA RACE 3 Read at 0x00c424d456a0 by goroutine 1089: - 4 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).forward.func1() - 5 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:654 +0x44f - 6 github.com/ethereum/go-ethereum/swarm/network.(*Kademlia).eachConn.func1() - 7 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/network/kademlia.go:350 +0xc9 - 8 github.com/ethereum/go-ethereum/pot.(*Pot).eachNeighbour.func1() - 9 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/pot/pot.go:599 +0x59 + 4 github.com/FusionFoundation/efsn/swarm/pss.(*Pss).forward.func1() + 5 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/swarm/pss/pss.go:654 +0x44f + 6 github.com/FusionFoundation/efsn/swarm/network.(*Kademlia).eachConn.func1() + 7 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/swarm/network/kademlia.go:350 +0xc9 + 8 github.com/FusionFoundation/efsn/pot.(*Pot).eachNeighbour.func1() + 9 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/pot/pot.go:599 +0x59 ... 28 29 Previous write at 0x00c424d456a0 by goroutine 829: - 30 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run() - 31 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:192 +0x16a - 32 github.com/ethereum/go-ethereum/swarm/pss.(*Pss).Run-fm() - 33 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/swarm/pss/pss.go:185 +0x63 - 34 github.com/ethereum/go-ethereum/p2p.(*Peer).startProtocols.func1() - 35 /Users/nonsense/code/src/github.com/ethereum/go-ethereum/p2p/peer.go:347 +0x8b + 30 github.com/FusionFoundation/efsn/swarm/pss.(*Pss).Run() + 31 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/swarm/pss/pss.go:192 +0x16a + 32 github.com/FusionFoundation/efsn/swarm/pss.(*Pss).Run-fm() + 33 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/swarm/pss/pss.go:185 +0x63 + 34 github.com/FusionFoundation/efsn/p2p.(*Peer).startProtocols.func1() + 35 /Users/nonsense/code/src/github.com/FusionFoundation/efsn/p2p/peer.go:347 +0x8b ... ``` diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 91fa54fc..6d9d2ad5 100755 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -27,14 +27,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/swarm/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/chequebook" + "github.com/FusionFoundation/efsn/contracts/chequebook/contract" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/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 0afca9ab..b865339a 100755 --- 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/swarm/log" + "github.com/FusionFoundation/efsn/swarm/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 d0e34f8a..97818072 100755 --- 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/FusionFoundation/efsn/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 40292e88..88316e1b 100755 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -23,10 +23,10 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/metrics" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/FusionFoundation/efsn/metrics" + ch "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" olog "github.com/opentracing/opentracing-go/log" ) diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index db719ca0..d3f1049c 100755 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -25,7 +25,7 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/FusionFoundation/efsn/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 33133edd..1e434990 100755 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/FusionFoundation/efsn/log" + ch "github.com/FusionFoundation/efsn/swarm/chunk" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 3b5d003d..b09c9268 100755 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/encryption/encryption_test.go b/swarm/storage/encryption/encryption_test.go index c3abefdc..15abaae6 100755 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -21,9 +21,9 @@ import ( "crypto/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto/sha3" ) var expectedTransformedHex = "352187af3a843decc63ceca6cb01ea39dbcf77caf0a8f705f5c30d557044ceec9392b94a79376f1e5c10cd0c0f2a98e5353bf22b3ea4fdac6677ee553dec192e3db64e179d0474e96088fb4abd2babd67de123fb398bdf84d818f7bda2c1ab60b3ea0e0569ae54aa969658eb4844e6960d2ff44d7c087ee3aaffa1c0ee5df7e50b615f7ad90190f022934ad5300c7d1809bfe71a11cc04cece5274eb97a5f20350630522c1dbb7cebaf4f97f84e03f5cfd88f2b48880b25d12f4d5e75c150f704ef6b46c72e07db2b705ac3644569dccd22fd8f964f6ef787fda63c46759af334e6f665f70eac775a7017acea49f3c7696151cb1b9434fa4ac27fb803921ffb5ec58dafa168098d7d5b97e384be3384cf5bc235c3d887fef89fe76c0065f9b8d6ad837b442340d9e797b46ef5709ea3358bc415df11e4830de986ef0f1c418ffdcc80e9a3cda9bea0ab5676c0d4240465c43ba527e3b4ea50b4f6255b510e5d25774a75449b0bd71e56c537ade4fcf0f4d63c99ae1dbb5a844971e2c19941b8facfcfc8ee3056e7cb3c7114c5357e845b52f7103cb6e00d2308c37b12baa5b769e1cc7b00fc06f2d16e70cc27a82cb9c1a4e40cb0d43907f73df2c9db44f1b51a6b0bc6d09f77ac3be14041fae3f9df2da42df43ae110904f9ecee278030185254d7c6e918a5512024d047f77a992088cb3190a6587aa54d0c7231c1cd2e455e0d4c07f74bece68e29cd8ba0190c0bcfb26d24634af5d91a81ef5d4dd3d614836ce942ddbf7bb1399317f4c03faa675f325f18324bf9433844bfe5c4cc04130c8d5c329562b7cd66e72f7355de8f5375a72202971613c32bd7f3fcdcd51080758cd1d0a46dbe8f0374381dbc359f5864250c63dde8131cbd7c98ae2b0147d6ea4bf65d1443d511b18e6d608bbb46ac036353b4c51df306a10a6f6939c38629a5c18aaf89cac04bd3ad5156e6b92011c88341cb08551bab0a89e6a46538f5af33b86121dba17e3a434c273f385cd2e8cb90bdd32747d8425d929ccbd9b0815c73325988855549a8489dfd047daf777aaa3099e54cf997175a5d9e1edfe363e3b68c70e02f6bf4fcde6a0f3f7d0e7e98bde1a72ae8b6cd27b32990680cc4a04fc467f41c5adcaddabfc71928a3f6872c360c1d765260690dd28b269864c8e380d9c92ef6b89b0094c8f9bb22608b4156381b19b920e9583c9616ce5693b4d2a6c689f02e6a91584a8e501e107403d2689dd0045269dd9946c0e969fb656a3b39d84a798831f5f9290f163eb2f97d3ae25071324e95e2256d9c1e56eb83c26397855323edc202d56ad05894333b7f0ed3c1e4734782eb8bd5477242fd80d7a89b12866f85cfae476322f032465d6b1253993033fccd4723530630ab97a1566460af9c90c9da843c229406e65f3fa578bd6bf04dee9b6153807ddadb8ceefc5c601a8ab26023c67b1ab1e8e0f29ce94c78c308005a781853e7a2e0e51738939a657c987b5e611f32f47b5ff461c52e63e0ea390515a8e1f5393dae54ea526934b5f310b76e3fa050e40718cb4c8a20e58946d6ee1879f08c52764422fe542b3240e75eccb7aa75b1f8a651e37a3bc56b0932cdae0e985948468db1f98eb4b77b82081ea25d8a762db00f7898864984bd80e2f3f35f236bf57291dec28f550769943bcfb6f884b7687589b673642ef7fe5d7d5a87d3eca5017f83ccb9a3310520474479464cb3f433440e7e2f1e28c0aef700a45848573409e7ab66e0cfd4fe5d2147ace81bc65fd8891f6245cd69246bbf5c27830e5ab882dd1d02aba34ff6ca9af88df00fd602892f02fedbdc65dedec203faf3f8ff4a97314e0ddb58b9ab756a61a562597f4088b445fcc3b28a708ca7b1485dcd791b779fbf2b3ef1ec5c6205f595fbe45a02105034147e5a146089c200a49dae33ae051a08ea5f974a21540aaeffa7f9d9e3d35478016fb27b871036eb27217a5b834b461f535752fb5f1c8dded3ae14ce3a2ef6639e2fe41939e3509e46e347a95d50b2080f1ba42c804b290ddc912c952d1cec3f2661369f738feacc0dbf1ea27429c644e45f9e26f30c341acd34c7519b2a1663e334621691e810767e9918c2c547b2e23cce915f97d26aac8d0d2fcd3edb7986ad4e2b8a852edebad534cb6c0e9f0797d3563e5409d7e068e48356c67ce519246cd9c560e881453df97cbba562018811e6cf8c327f399d1d1253ab47a19f4a0ccc7c6d86a9603e0551da310ea595d71305c4aad96819120a92cdbaf1f77ec8df9cc7c838c0d4de1e8692dd81da38268d1d71324bcffdafbe5122e4b81828e021e936d83ae8021eac592aa52cd296b5ce392c7173d622f8e07d18f59bb1b08ba15211af6703463b09b593af3c37735296816d9f2e7a369354a5374ea3955e14ca8ac56d5bfe4aef7a21bd825d6ae85530bee5d2aaaa4914981b3dfdb2e92ec2a27c83d74b59e84ff5c056f7d8945745f2efc3dcf28f288c6cd8383700fb2312f7001f24dd40015e436ae23e052fe9070ea9535b9c989898a9bda3d5382cf10e432fae6ccf0c825b3e6436edd3a9f8846e5606f8563931b5f29ba407c5236e5730225dda211a8504ec1817bc935e1fd9a532b648c502df302ed2063aed008fd5676131ac9e95998e9447b02bd29d77e38fcfd2959f2de929b31970335eb2a74348cc6918bc35b9bf749eab0fe304c946cd9e1ca284e6853c42646e60b6b39e0d3fb3c260abfc5c1b4ca3c3770f344118ca7c7f5c1ad1f123f8f369cd60afc3cdb3e9e81968c5c9fa7c8b014ffe0508dd4f0a2a976d5d1ca8fc9ad7a237d92cfe7b41413d934d6e142824b252699397e48e4bac4e91ebc10602720684bd0863773c548f9a2f9724245e47b129ecf65afd7252aac48c8a8d6fd3d888af592a01fb02dc71ed7538a700d3d16243e4621e0fcf9f8ed2b4e11c9fa9a95338bb1dac74a7d9bc4eb8cbf900b634a2a56469c00f5994e4f0934bdb947640e6d67e47d0b621aacd632bfd3c800bd7d93bd329f494a90e06ed51535831bd6e07ac1b4b11434ef3918fa9511813a002913f33f836454798b8d1787fea9a4c4743ba091ed192ed92f4d33e43a226bf9503e1a83a16dd340b3cbbf38af6db0d99201da8de529b4225f3d2fa2aad6621afc6c79ef3537720591edfc681ae6d00ede53ed724fc71b23b90d2e9b7158aaee98d626a4fe029107df2cb5f90147e07ebe423b1519d848af18af365c71bfd0665db46be493bbe99b79a188de0cf3594aef2299f0324075bdce9eb0b87bc29d62401ba4fd6ae48b1ba33261b5b845279becf38ee03e3dc5c45303321c5fac96fd02a3ad8c9e3b02127b320501333c9e6360440d1ad5e64a6239501502dde1a49c9abe33b66098458eee3d611bb06ffcd234a1b9aef4af5021cd61f0de6789f822ee116b5078aae8c129e8391d8987500d322b58edd1595dc570b57341f2df221b94a96ab7fbcf32a8ca9684196455694024623d7ed49f7d66e8dd453c0bae50e0d8b34377b22d0ece059e2c385dfc70b9089fcd27577c51f4d870b5738ee2b68c361a67809c105c7848b68860a829f29930857a9f9d40b14fd2384ac43bafdf43c0661103794c4bd07d1cfdd4681b6aeaefad53d4c1473359bcc5a83b09189352e5bb9a7498dd0effb89c35aad26954551f8b0621374b449bf515630bd3974dca982279733470fdd059aa9c3df403d8f22b38c4709c82d8f12b888e22990350490e16179caf406293cc9e65f116bafcbe96af132f679877061107a2f690a82a8cb46eea57a90abd23798c5937c6fe6b17be3f9bfa01ce117d2c268181b9095bf49f395fea07ca03838de0588c5e2db633e836d64488c1421e653ea52d810d096048c092d0da6e02fa6613890219f51a76148c8588c2487b171a28f17b7a299204874af0131725d793481333be5f08e86ca837a226850b0c1060891603bfecf9e55cddd22c0dbb28d495342d9cc3de8409f72e52a0115141cffe755c74f061c1a770428ccb0ae59536ee6fc074fbfc6cacb51a549d327527e20f8407477e60355863f1153f9ce95641198663c968874e7fdb29407bd771d94fdda8180cbb0358f5874738db705924b8cbe0cd5e1484aeb64542fe8f38667b7c34baf818c63b1e18440e9fba575254d063fd49f24ef26432f4eb323f3836972dca87473e3e9bb26dc3be236c3aae6bc8a6da567442309da0e8450e242fc9db836e2964f2c76a3b80a2c677979882dda7d7ebf62c93664018bcf4ec431fe6b403d49b3b36618b9c07c2d0d4569cb8d52223903debc72ec113955b206c34f1ae5300990ccfc0180f47d91afdb542b6312d12aeff7e19c645dc0b9fe6e3288e9539f6d5870f99882df187bfa6d24d179dfd1dac22212c8b5339f7171a3efc15b760fed8f68538bc5cbd845c2d1ab41f3a6c692820653eaef7930c02fbe6061d93805d73decdbb945572a7c44ed0241982a6e4d2d730898f82b3d9877cb7bca41cc6dcee67aa0c3d6db76f0b0a708ace0031113e48429de5d886c10e9200f68f32263a2fbf44a5992c2459fda7b8796ba796e3a0804fc25992ed2c9a5fe0580a6b809200ecde6caa0364b58be11564dcb9a616766dd7906db5636ee708b0204f38d309466d8d4a162965dd727e29f5a6c133e9b4ed5bafe803e479f9b2a7640c942c4a40b14ac7dc9828546052761a070f6404008f1ec3605836339c3da95a00b4fd81b2cabf88b51d2087d5b83e8c5b69bf96d8c72cbd278dad3bbb42b404b436f84ad688a22948adf60a81090f1e904291503c16e9f54b05fc76c881a5f95f0e732949e95d3f1bae2d3652a14fe0dda2d68879604657171856ef72637def2a96ac47d7b3fe86eb3198f5e0e626f06be86232305f2ae79ffcd2725e48208f9d8d63523f81915acc957563ab627cd6bc68c2a37d59fb0ed77a90aa9d085d6914a8ebada22a2c2d471b5163aeddd799d90fbb10ed6851ace2c4af504b7d572686700a59d6db46d5e42bb83f8e0c0ffe1dfa6582cc0b34c921ff6e85e83188d24906d5c08bb90069639e713051b3102b53e6f703e8210017878add5df68e6f2b108de279c5490e9eef5590185c4a1c744d4e00d244e1245a8805bd30407b1bc488db44870ccfd75a8af104df78efa2fb7ba31f048a263efdb3b63271fff4922bece9a71187108f65744a24f4947dc556b7440cb4fa45d296bb7f724588d1f245125b21ea063500029bd49650237f53899daf1312809552c81c5827341263cc807a29fe84746170cdfa1ff3838399a5645319bcaff674bb70efccdd88b3d3bb2f2d98111413585dc5d5bd5168f43b3f55e58972a5b2b9b3733febf02f931bd436648cb617c3794841aab961fe41277ab07812e1d3bc4ff6f4350a3e615bfba08c3b9480ef57904d3a16f7e916345202e3f93d11f7a7305170cb8c4eb9ac88ace8bbd1f377bdd5855d3162d6723d4435e84ce529b8f276a8927915ac759a0d04e5ca4a9d3da6291f0333b475df527e99fe38f7a4082662e8125936640c26dd1d17cf284ce6e2b17777a05aa0574f7793a6a062cc6f7263f7ab126b4528a17becfdec49ac0f7d8705aa1704af97fb861faa8a466161b2b5c08a5bacc79fe8500b913d65c8d3c52d1fd52d2ab2c9f52196e712455619c1cd3e0f391b274487944240e2ed8858dd0823c801094310024ae3fe4dd1cf5a2b6487b42cc5937bbafb193ee331d87e378258963d49b9da90899bbb4b88e79f78e866b0213f4719f67da7bcc2fce073c01e87c62ea3cdbcd589cfc41281f2f4c757c742d6d1e" diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index 879622b9..ad5f8cb6 100755 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -21,9 +21,9 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/crypto/sha3" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/FusionFoundation/efsn/crypto/sha3" + ch "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/storage/encryption" ) type hasherStore struct { diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index 22cf98d0..9fd4f052 100755 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/FusionFoundation/efsn/swarm/storage/encryption" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index bde62739..c1b5eaaf 100755 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -35,11 +35,11 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/rlp" + ch "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" ) diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index 75b5d6aa..c064ca41 100755 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "github.com/FusionFoundation/efsn/common" + ch "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index 04701ee6..3a8af158 100755 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/localstore_test.go b/swarm/storage/localstore_test.go index 814d270d..355a476e 100755 --- a/swarm/storage/localstore_test.go +++ b/swarm/storage/localstore_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + ch "github.com/FusionFoundation/efsn/swarm/chunk" ) var ( diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 6b370d2b..f873de2e 100755 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 43bfa24f..cb2c6569 100755 --- a/swarm/storage/mock/db/db.go +++ b/swarm/storage/mock/db/db.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage/mock" ) // GlobalStore contains the LevelDB database that is storing diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 782faaf3..6e1a442f 100755 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/FusionFoundation/efsn/swarm/storage/mock/test" ) // TestDBStore is running a test.MockStore tests diff --git a/swarm/storage/mock/mem/mem.go b/swarm/storage/mock/mem/mem.go index 8878309d..5b74c984 100755 --- a/swarm/storage/mock/mem/mem.go +++ b/swarm/storage/mock/mem/mem.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage/mock" ) // GlobalStore stores all chunk data and also keys and node addresses relations. diff --git a/swarm/storage/mock/mem/mem_test.go b/swarm/storage/mock/mem/mem_test.go index adcefaab..1c67ef3a 100755 --- a/swarm/storage/mock/mem/mem_test.go +++ b/swarm/storage/mock/mem/mem_test.go @@ -19,7 +19,7 @@ package mem import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/FusionFoundation/efsn/swarm/storage/mock/test" ) // TestGlobalStore is running test for a GlobalStore diff --git a/swarm/storage/mock/mock.go b/swarm/storage/mock/mock.go index 81340f92..65e56289 100755 --- a/swarm/storage/mock/mock.go +++ b/swarm/storage/mock/mock.go @@ -36,7 +36,7 @@ import ( "errors" "io" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) // ErrNotFound indicates that the chunk is not found. diff --git a/swarm/storage/mock/rpc/rpc.go b/swarm/storage/mock/rpc/rpc.go index 6e735f69..221e0a34 100755 --- a/swarm/storage/mock/rpc/rpc.go +++ b/swarm/storage/mock/rpc/rpc.go @@ -26,10 +26,10 @@ package rpc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage/mock" ) // GlobalStore is rpc.Client that connects to a centralized mock store. diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go index 52b634a4..14e949c9 100755 --- a/swarm/storage/mock/rpc/rpc_test.go +++ b/swarm/storage/mock/rpc/rpc_test.go @@ -19,9 +19,9 @@ package rpc import ( "testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/storage/mock/mem" + "github.com/FusionFoundation/efsn/swarm/storage/mock/test" ) // TestDBStore is running test for a GlobalStore diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 02da3af5..9bf30d7d 100755 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -25,9 +25,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/mru/handler.go b/swarm/storage/mru/handler.go index 18c667f1..37ac5bce 100755 --- a/swarm/storage/mru/handler.go +++ b/swarm/storage/mru/handler.go @@ -25,9 +25,9 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/storage" ) type Handler struct { diff --git a/swarm/storage/mru/lookup.go b/swarm/storage/mru/lookup.go index b52cd5b4..4fbf7d3f 100755 --- a/swarm/storage/mru/lookup.go +++ b/swarm/storage/mru/lookup.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "hash" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) // LookupParams is used to specify constraints when performing an update lookup diff --git a/swarm/storage/mru/lookup_test.go b/swarm/storage/mru/lookup_test.go index b66b200a..f5bed8c2 100755 --- a/swarm/storage/mru/lookup_test.go +++ b/swarm/storage/mru/lookup_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common/hexutil" ) func getTestUpdateLookup() *UpdateLookup { diff --git a/swarm/storage/mru/metadata.go b/swarm/storage/mru/metadata.go index 50911489..47517f7e 100755 --- a/swarm/storage/mru/metadata.go +++ b/swarm/storage/mru/metadata.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "hash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/swarm/storage" ) // ResourceMetadata encapsulates the immutable information about a mutable resource :) diff --git a/swarm/storage/mru/metadata_test.go b/swarm/storage/mru/metadata_test.go index abbac6e3..7c026e60 100755 --- a/swarm/storage/mru/metadata_test.go +++ b/swarm/storage/mru/metadata_test.go @@ -18,7 +18,7 @@ package mru import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common/hexutil" ) func compareByteSliceToExpectedHex(t *testing.T, variableName string, actualValue []byte, expectedHex string) { diff --git a/swarm/storage/mru/request.go b/swarm/storage/mru/request.go index af2ccf5c..49b1a976 100755 --- a/swarm/storage/mru/request.go +++ b/swarm/storage/mru/request.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/swarm/storage" ) // updateRequestJSON represents a JSON-serialized UpdateRequest diff --git a/swarm/storage/mru/resource.go b/swarm/storage/mru/resource.go index aa83ff62..703016e7 100755 --- a/swarm/storage/mru/resource.go +++ b/swarm/storage/mru/resource.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/storage/mru/resource_sign.go b/swarm/storage/mru/resource_sign.go index a9f7cb62..76b2b4fd 100755 --- a/swarm/storage/mru/resource_sign.go +++ b/swarm/storage/mru/resource_sign.go @@ -19,8 +19,8 @@ package mru import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) const signatureLength = 65 diff --git a/swarm/storage/mru/resource_test.go b/swarm/storage/mru/resource_test.go index 0fb465bb..338bc2a4 100755 --- a/swarm/storage/mru/resource_test.go +++ b/swarm/storage/mru/resource_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/multihash" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/contracts/ens" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/multihash" + "github.com/FusionFoundation/efsn/swarm/storage" ) var ( diff --git a/swarm/storage/mru/signedupdate.go b/swarm/storage/mru/signedupdate.go index 41a5a5e6..c7a6d90a 100755 --- a/swarm/storage/mru/signedupdate.go +++ b/swarm/storage/mru/signedupdate.go @@ -20,9 +20,9 @@ import ( "bytes" "hash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/swarm/storage" ) // SignedResourceUpdate represents a resource update with all the necessary information to prove ownership of the resource diff --git a/swarm/storage/mru/testutil.go b/swarm/storage/mru/testutil.go index a30baaa1..a99f6819 100755 --- a/swarm/storage/mru/testutil.go +++ b/swarm/storage/mru/testutil.go @@ -22,9 +22,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) const ( diff --git a/swarm/storage/mru/update.go b/swarm/storage/mru/update.go index d1bd37dd..d1cbad32 100755 --- a/swarm/storage/mru/update.go +++ b/swarm/storage/mru/update.go @@ -20,9 +20,9 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/multihash" + "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/multihash" ) // resourceUpdate encapsulates the information sent as part of a resource update diff --git a/swarm/storage/mru/updateheader.go b/swarm/storage/mru/updateheader.go index f0039eaf..068623ff 100755 --- a/swarm/storage/mru/updateheader.go +++ b/swarm/storage/mru/updateheader.go @@ -17,7 +17,7 @@ package mru import ( - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage" ) // updateHeader models the non-payload components of a Resource Update diff --git a/swarm/storage/mru/updateheader_test.go b/swarm/storage/mru/updateheader_test.go index b1f50598..96189068 100755 --- a/swarm/storage/mru/updateheader_test.go +++ b/swarm/storage/mru/updateheader_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/FusionFoundation/efsn/common/hexutil" ) const serializedUpdateHeaderMultihashHex = "0x4f000000da070000fb0ed7efa696bdb0b54cd75554cc3117ffc891454317df7dd6fefad978e2f2fbf74a10ce8f26ffc8bfaa07c3031a34b2c61f517955e7deb1592daccf96c69cf001" diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 80ac6f19..d26b986f 100755 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/swarm/log" lru "github.com/hashicorp/golang-lru" ) diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index f08968f0..a534aaea 100755 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/discover" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/FusionFoundation/efsn/p2p/discover" + ch "github.com/FusionFoundation/efsn/swarm/chunk" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) var sourcePeerID = discover.MustHexID("2dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439") diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index f74eef06..9d75e71b 100755 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -25,8 +25,8 @@ import ( "sync" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" + ch "github.com/FusionFoundation/efsn/swarm/chunk" + "github.com/FusionFoundation/efsn/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 8c70f458..02f6e2fe 100755 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -27,10 +27,10 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/swarm/bmt" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/swarm/bmt" + ch "github.com/FusionFoundation/efsn/swarm/chunk" ) const MaxPO = 16 diff --git a/swarm/swarm.go b/swarm/swarm.go index 13aa1125..708465fe 100755 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -29,29 +29,29 @@ import ( "time" "unicode" - "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/ethclient" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mru" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/FusionFoundation/efsn/accounts/abi/bind" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/contracts/chequebook" + "github.com/FusionFoundation/efsn/contracts/ens" + "github.com/FusionFoundation/efsn/ethclient" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/protocols" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/api" + httpapi "github.com/FusionFoundation/efsn/swarm/api/http" + "github.com/FusionFoundation/efsn/swarm/fuse" + "github.com/FusionFoundation/efsn/swarm/log" + "github.com/FusionFoundation/efsn/swarm/network" + "github.com/FusionFoundation/efsn/swarm/network/stream" + "github.com/FusionFoundation/efsn/swarm/pss" + "github.com/FusionFoundation/efsn/swarm/state" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mock" + "github.com/FusionFoundation/efsn/swarm/storage/mru" + "github.com/FusionFoundation/efsn/swarm/tracing" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index c6569e37..c7840c4a 100755 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rpc" + "github.com/FusionFoundation/efsn/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index 07482303..6b2f2bcc 100755 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mru" + "github.com/FusionFoundation/efsn/swarm/api" + "github.com/FusionFoundation/efsn/swarm/storage" + "github.com/FusionFoundation/efsn/swarm/storage/mru" ) type TestServer interface { diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go index b84cfb31..3ddab60b 100755 --- a/swarm/tracing/tracing.go +++ b/swarm/tracing/tracing.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/FusionFoundation/efsn/log" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" jaegerlog "github.com/uber/jaeger-client-go/log" diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 427a9495..754ab769 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 20294cc9..81b9259f 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -21,8 +21,8 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf..c3d6d009 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/consensus/ethash" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/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 5cfd4bd0..9f23c19c 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce9..eba8ac74 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2f..6c5c5483 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf..418edd99 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/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d..9afdbd3c 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf4..716150bb 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index f0a4943c..6476dfa4 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/FusionFoundation/efsn/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 90a74448..cfc6ed95 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/FusionFoundation/efsn/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a64..1613b6f5 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/FusionFoundation/efsn/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 91c9a9f4..03353f25 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/FusionFoundation/efsn/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 5d2251e5..2b7eac05 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,18 +23,18 @@ 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 42ad8187..05e56ab0 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/FusionFoundation/efsn/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 8c3dac08..fa974672 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core/types" + "github.com/FusionFoundation/efsn/params" + "github.com/FusionFoundation/efsn/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225..f9fb4acf 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/FusionFoundation/efsn/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index cb81c5b9..ce96944e 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -22,15 +22,15 @@ 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/core" + "github.com/FusionFoundation/efsn/core/state" + "github.com/FusionFoundation/efsn/core/vm" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index d0691b63..d4b7b799 100644 --- a/trie/database.go +++ b/trie/database.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" + "github.com/FusionFoundation/efsn/rlp" ) var ( diff --git a/trie/errors.go b/trie/errors.go index 567b8007..98853468 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/FusionFoundation/efsn/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 7b1d7793..748ba949 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,9 +20,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto/sha3" + "github.com/FusionFoundation/efsn/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 00b890eb..14db4144 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 2a510b1c..a63b79eb 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 1fafb7a5..9ec74c90 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 6cb8f4d5..4b1a7034 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/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 996f8747..6cf95798 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 6a50cfd5..08da48a8 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/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 d16d9996..1d084032 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 67dff5a8..0f96b157 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/prque" + "github.com/FusionFoundation/efsn/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index c76779e5..c372163f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index e920ccd2..98ef5cb4 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -21,10 +21,10 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index f8e5fd12..eda9eb0a 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/ethdb" + "github.com/FusionFoundation/efsn/rlp" ) func init() { diff --git a/vendor/vendor.json b/vendor/vendor.json index 6e561046..fa0725ec 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -922,5 +922,5 @@ "revisionTime": "2017-08-11T01:42:03Z" } ], - "rootPath": "github.com/ethereum/go-ethereum" + "rootPath": "github.com/FusionFoundation/efsn" } diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index af9418d9..24ce5ba4 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/rlp" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index edb817cc..67ac24f3 100644 --- a/whisper/mailserver/server_test.go +++ b/whisper/mailserver/server_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index a814154e..3d730c93 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/whisperv6" + "github.com/FusionFoundation/efsn" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/rpc" + whisper "github.com/FusionFoundation/efsn/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 2ce46422..dde8a780 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rpc" ) var ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56..ccddbaa2 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/FusionFoundation/efsn/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9..3d3205b1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/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 9550a7e3..62002e21 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 33138fb1..8fb0b97e 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389a..2e936f6e 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d..b795060d 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64a..72bb1ec9 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 35711d72..baefcb7d 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/log" ) // MessageParams 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 2edf945d..299712c7 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/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 2bb5677c..9bc2b55e 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -21,10 +21,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 256a670a..eb237242 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -24,11 +24,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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4eda1db..37fb6c7e 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 46554582..f46db074 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -27,11 +27,11 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/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 a7bd17e4..a4567308 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/FusionFoundation/efsn/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index e1dab7b2..611a183f 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/rpc" ) // List of errors diff --git a/whisper/whisperv6/api_test.go b/whisper/whisperv6/api_test.go index cdbc7fab..bf418c4c 100644 --- a/whisper/whisperv6/api_test.go +++ b/whisper/whisperv6/api_test.go @@ -23,7 +23,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" + "github.com/FusionFoundation/efsn/common" ) func TestMultipleTopicCopyInNewMessageFilter(t *testing.T) { diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179d..bd0d1d7c 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/FusionFoundation/efsn/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8..3322bde1 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/math" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/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 410b250a..cbaeee81 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/FusionFoundation/efsn/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 6a5b7967..84c872ab 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 5ce99d9f..d973b4ab 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6d..6e3c2d2c 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df..d5c488e9 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279a..82687e53 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/FusionFoundation/efsn/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 2d4e8624..01bd4759 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/crypto/ecies" + "github.com/FusionFoundation/efsn/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 0a5c1c85..625ced84 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/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 621d5120..cce38e44 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -23,10 +23,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index fe31922c..4cabb1fa 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,13 +28,13 @@ import ( "net" - "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/ethereum/go-ethereum/rlp" + "github.com/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/p2p/discover" + "github.com/FusionFoundation/efsn/p2p/nat" + "github.com/FusionFoundation/efsn/rlp" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283..117cd5d6 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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index eb713f84..503efcf6 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -27,12 +27,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "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/FusionFoundation/efsn/common" + "github.com/FusionFoundation/efsn/crypto" + "github.com/FusionFoundation/efsn/log" + "github.com/FusionFoundation/efsn/p2p" + "github.com/FusionFoundation/efsn/rlp" + "github.com/FusionFoundation/efsn/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 895bb2b9..65c3a68d 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/FusionFoundation/efsn/common" "golang.org/x/crypto/pbkdf2" )