Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.
Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive. +
The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in Mobile: Introduction – Android archive.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Java code you can now import the geth archive and connect to Ethereum:
import org.ethereum.geth.*;@@ -287,7 +287,7 @@ node.start();
Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.
Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.
Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework. +
Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in Mobile: Introduction – iOS framework.
Before connecting to the Ethereum network, download the {{.GethGenesis}} genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.
Inside your Swift code you can now import the geth framework and connect to Ethereum (ObjC should be analogous):
import Geth@@ -419,7 +419,7 @@ try! node?.start();
Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.
Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.
Puppeth is distributed as part of the Geth & Tools bundles, but can also be installed separately via:
go get github.com/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/ShyftNetwork/go-empyrean/cmd/puppeth
Copyright 2017. The go-ethereum Authors.
diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 20b7afe236..21766718e3 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/ShyftNetwork/go-empyrean/log" ) // ethstatsDockerfile is the Dockerfile required to build an ethstats backend diff --git a/cmd/puppeth/module_explorer.go b/cmd/puppeth/module_explorer.go index 427134153b..e8f952e5cd 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/ShyftNetwork/go-empyrean/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 976bf04d00..ca1164b26e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" ) // faucetDockerfile is the Dockerfile required to build an faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 35c0efc8ad..5a393cba3a 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/ShyftNetwork/go-empyrean/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 2609fd976e..6c26441fbe 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/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 5e5032bedf..1b601c6ef8 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/ShyftNetwork/go-empyrean/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index 26382dac13..f45661c443 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -22,7 +22,7 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index 158261ce05..48c933cbd5 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/ShyftNetwork/go-empyrean/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 b88a61de7d..84b7d7f0e5 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 5f781c4152..7290ff54e6 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/ShyftNetwork/go-empyrean/log" ) // deployDashboard queries the user for various input on deploying a web-service diff --git a/cmd/puppeth/wizard_ethstats.go b/cmd/puppeth/wizard_ethstats.go index fb2529c267..be9ce13621 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/ShyftNetwork/go-empyrean/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 413511c1c3..74dd29fe9f 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/ShyftNetwork/go-empyrean/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 9a429bc96d..5db981464c 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/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/log" ) // deployFaucet queries the user for various input on deploying a faucet, after diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go index f255ef6e65..04934abfe3 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/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 60aa0f7ffb..c0bf535e67 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/ShyftNetwork/go-empyrean/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 90bf7ae3c8..f11d2b6653 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/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index d780c550b1..584c61777e 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/ShyftNetwork/go-empyrean/log" ) // manageServers displays a list of servers the user can disconnect from, and an diff --git a/cmd/puppeth/wizard_nginx.go b/cmd/puppeth/wizard_nginx.go index 4eeae93a0b..016c7dcee5 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/ShyftNetwork/go-empyrean/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 a60948bc67..9c76eb740f 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/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/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 933cd9ae59..cae249df72 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/ShyftNetwork/go-empyrean/log" ) // deployWallet creates a new web wallet based on some user input. diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index d0f993c5b8..49d2cdcb22 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/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index adac772bab..feaaa3998b 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -28,13 +28,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/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/ShyftNetwork/go-empyrean/swarm/api" ) var ( @@ -84,7 +84,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/ethereum/go-ethereum/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/ShyftNetwork/go-empyrean/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 9bf584f50c..ff46c047df 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/swarm" + "github.com/ShyftNetwork/go-empyrean/swarm/api" "github.com/docker/docker/pkg/reexec" ) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index dfd2d069b9..f804124130 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 792e8d0d7a..b5fcdaee52 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 57b5517c6e..cbe0053da2 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/ShyftNetwork/go-empyrean/cmd/utils" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 360020b77b..1893faa19e 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -28,22 +28,22 @@ 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/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/swarm" + bzzapi "github.com/ShyftNetwork/go-empyrean/swarm/api" + swarmmetrics "github.com/ShyftNetwork/go-empyrean/swarm/metrics" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 41a69a5d05..c10382234f 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -24,9 +24,9 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 594cfa55cb..f76d280866 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -27,13 +27,13 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/internal/cmdtest" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/swarm" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9f4c525bb9..011d27b642 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/ShyftNetwork/go-empyrean/cmd/utils" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 186d18d8f5..5fb6ab2c7d 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,12 +27,12 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c1..c9757f5578 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/ShyftNetwork/go-empyrean/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index fa481522d4..c7c3135bff 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,34 +28,34 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/fdlimit" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/clique" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/dashboard" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/ethstats" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/params" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 988c50ce3d..1fb3c2147a 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/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/console" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/whisper/mailserver" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 9bd1de103a..db0c28557f 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/ShyftNetwork/go-empyrean/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/debug.go b/common/debug.go index 61acd8ce70..895cd9c4ba 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/ShyftNetwork/go-empyrean/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..448667bffc 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/ShyftNetwork/go-empyrean/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8c..51c19c7ca1 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/ShyftNetwork/go-empyrean/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/number/int.go b/common/number/int.go index 6dab2436de..40c68d62e9 100644 --- a/common/number/int.go +++ b/common/number/int.go @@ -19,7 +19,7 @@ package number import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) var tt256 = new(big.Int).Lsh(big.NewInt(1), 256) diff --git a/common/number/uint_test.go b/common/number/uint_test.go index 3ab9e4c344..424472b52d 100644 --- a/common/number/uint_test.go +++ b/common/number/uint_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func TestSet(t *testing.T) { diff --git a/common/types.go b/common/types.go index fdc67480c2..e14179f325 100644 --- a/common/types.go +++ b/common/types.go @@ -23,8 +23,8 @@ import ( "math/rand" "reflect" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" ) const ( diff --git a/compression/rle/read_write.go b/compression/rle/read_write.go index 0e7ad90aec..34bf381f40 100644 --- a/compression/rle/read_write.go +++ b/compression/rle/read_write.go @@ -21,7 +21,7 @@ import ( "bytes" "errors" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto" ) const ( diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b875eef012..b1688a8cc6 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 2bdad9092a..2065fc1b2e 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/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 9ebdb8df15..afd510959f 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -20,10 +20,10 @@ import ( "bytes" "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 8b51e6e094..50032aaba6 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,12 +22,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) type testerVote struct { diff --git a/consensus/consensus.go b/consensus/consensus.go index be5e661c12..1b8d1869d0 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -18,11 +18,11 @@ package consensus import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" "math/big" ) diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 905a7b1ea7..67a7e43601 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 841e39233f..2913b51432 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -25,9 +25,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests whether the dataset size calculator works correctly by cross checking the diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 4a71ac26b1..5bbf0b633d 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -24,13 +24,13 @@ import ( "runtime" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" set "gopkg.in/fatih/set.v0" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66..cbda22a354 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/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 1b3dcee302..8865859790 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -33,10 +33,10 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 31116da437..1848dc7e88 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests that ethash works correctly in test mode. @@ -44,7 +44,7 @@ func TestTestMode(t *testing.T) { } // This test checks that cache lru logic doesn't crash under load. -// It reproduces https://github.com/ethereum/go-ethereum/issues/14943 +// It reproduces https://github.com/ShyftNetwork/go-empyrean/issues/14943 func TestCacheFileEvict(t *testing.T) { tmpdir, err := ioutil.TempDir("", "ethash-test") if err != nil { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index b5e742d8bb..50584caeed 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -24,10 +24,10 @@ import ( "runtime" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // Seal implements consensus.Engine, attempting to find a nonce that satisfies diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52..1eeca5e270 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e0..ddbebce532 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b28cc438e2..105896b092 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/ShyftNetwork/go-empyrean/accounts/usbwallet" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index b280d4e65d..48114097f0 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/ShyftNetwork/go-empyrean/internal/jsre" + "github.com/ShyftNetwork/go-empyrean/internal/web3ext" + "github.com/ShyftNetwork/go-empyrean/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 2f334a1841..d80a4c255f 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/internal/jsre" + "github.com/ShyftNetwork/go-empyrean/node" ) const ( diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index b2b2365f31..15f489902a 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/ShyftNetwork/go-empyrean/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 92bd896e0a..88055f3e57 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/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/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 6b6b28e657..78e1966b86 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/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index e275ac9b8d..46d65b36f1 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // ChequebookABI is the input ABI used to generate the binding from. diff --git a/contracts/chequebook/gencode.go b/contracts/chequebook/gencode.go index 45f6d68f3e..4bcbef9204 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/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index cbf6cb05b3..b42c1935b6 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // ENSABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/fifsregistrar.go b/contracts/ens/contract/fifsregistrar.go index a08380adfc..5a2752d151 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/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // FIFSRegistrarABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go index c567d5884a..fb3a203cc8 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" ) // PublicResolverABI is the input ABI used to generate the binding from. diff --git a/contracts/ens/ens.go b/contracts/ens/ens.go index 06045a5cd8..322a200740 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/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/ens/contract" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 0016f47dbf..523723d63a 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/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind/backends" + "github.com/ShyftNetwork/go-empyrean/contracts/ens/contract" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index ce22f93f92..532badae3a 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/ShyftNetwork/go-empyrean/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 1b9025a549..912f4abf35 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index e23f0d19d1..71b20f2787 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 98958809b7..3927b81d0d 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/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index e334b3c3cd..8600308565 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/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 6042992d5b..36d7a0a120 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -30,20 +30,20 @@ import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" "github.com/hashicorp/golang-lru" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 748cdc5c71..18d87eae0f 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Test fork of length N starting from block i @@ -1196,7 +1196,7 @@ func TestEIP161AccountRemoval(t *testing.T) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/ShyftNetwork/go-empyrean/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { // Generate a canonical chain to act as the main dataset engine := ethash.NewFaker() diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..d8de7cb9db 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/ShyftNetwork/go-empyrean/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 540085450d..327a4a723a 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/ShyftNetwork/go-empyrean/core/types" ) // errSectionOutOfBounds is returned if the user tried to add more bloom filters diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0..052d85ee36 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/ShyftNetwork/go-empyrean/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index ce3031702f..95aeaa6176 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/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 7a5f78ef3a..64730df9ee 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/ShyftNetwork/go-empyrean/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/ShyftNetwork/go-empyrean/issues/15309. func TestMatcherShifted(t *testing.T) { // Block 0 always matches in the tests, skip ahead of first 8 blocks with the // start to get a potential zero byte in the matcher bitset. diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 158ed83245..45eb738930 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index 9fc09eda51..8b70843bd0 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 33846fe011..eeab691988 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // So we can deterministically seed different blockchains diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 93be43ddce..ed9311fa30 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/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index e0a3e3ff37..26ba123cad 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/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/database_util.go b/core/database_util.go index ca179f6fe1..256a2edd5d 100644 --- a/core/database_util.go +++ b/core/database_util.go @@ -24,13 +24,13 @@ import ( "math/big" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // DatabaseReader wraps the Get method of a backing data store. diff --git a/core/database_util_test.go b/core/database_util_test.go index ab4e45a478..27a901cf2f 100644 --- a/core/database_util_test.go +++ b/core/database_util_test.go @@ -21,11 +21,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/events.go b/core/events.go index 6f404f612b..5d68108b79 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // TxPreEvent is posted when a transaction enters the transaction pool. diff --git a/core/evm.go b/core/evm.go index 55db53927b..674063eb25 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a2..051eab24c0 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248..b7e2280ceb 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 9382442449..398b38d5f6 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -26,15 +26,15 @@ import ( "strings" _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" "database/sql" "strconv" "time" diff --git a/core/genesis_test.go b/core/genesis_test.go index bcdd2844e3..2383e9637c 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 73cd5d2c41..0357cad72c 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -25,12 +25,12 @@ import ( mrand "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" "github.com/hashicorp/golang-lru" "sync/atomic" ) diff --git a/core/helper_test.go b/core/helper_test.go index 698a2924cb..d1fc01c340 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -20,9 +20,9 @@ import ( "container/list" "fmt" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826..2c83ce196a 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/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/shyft_database_util.go b/core/shyft_database_util.go index 04f113c99b..46f194bdbf 100644 --- a/core/shyft_database_util.go +++ b/core/shyft_database_util.go @@ -10,10 +10,10 @@ import ( "log" _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - Rewards "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/shyfttracerinterface" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + Rewards "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/shyfttracerinterface" ) var IShyftTracer shyfttracerinterface.IShyftTracer diff --git a/core/state/database.go b/core/state/database.go index 36926ec69d..e94cd5e7e7 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 46e612850a..651edb429e 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,9 +20,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d1..ede060239e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) // NodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 9e46c851cd..00970b6511 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index a89bb3d13a..24bf944bc9 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/ShyftNetwork/go-empyrean/common" ) type journalEntry interface { diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00..437a705e4c 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/ShyftNetwork/go-empyrean/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 1cfdd3a890..d7449da31d 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index b2112bfaec..99b81c0b92 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index 6d42d63d82..c589f2785c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 776693e248..ffb21745dc 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index d9e3d9b797..a8ac582196 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/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/ShyftNetwork/go-empyrean/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" db, _ := ethdb.NewMemDatabase() diff --git a/core/state/sync.go b/core/state/sync.go index 28fcf6ae05..b28689572a 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 8f14a44e7a..485f882a85 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state_processor.go b/core/state_processor.go index 4dc58b9dea..87e3a33d08 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index b19bc12e42..9ff156a995 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,10 +21,10 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/tx_journal.go b/core/tx_journal.go index e872d7b530..1b3b799cdb 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/tx_list.go b/core/tx_list.go index 55fc42617d..67fdb9d7cd 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/tx_list_test.go b/core/tx_list_test.go index d579f501af..242c9110c1 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/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/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 089bd215ad..9aa3ea7c2c 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 1cf533aa65..c58221a9b1 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa7..f2fdc48954 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/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/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 8c0fff255a..686e931e26 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -27,10 +27,10 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1..f6d4651e83 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a76b6f33c5..789dfc0eb0 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/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7af..ed06cfd7f4 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/ShyftNetwork/go-empyrean/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc6..3931c65cc2 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 1b92cd9cf4..3ae7f7d187 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653..902f4b09ec 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index c297adebb6..e4f4d5d869 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096..9be629095d 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index be5de38da7..c917451142 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) //go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 0e56acfe4a..7dc02639ce 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index f945f6f6a2..7ea654cdca 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/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 a2710b2cc7..e75c5a4252 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,10 +24,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) //go:generate gencodec -type txdata -field-override txdataMarshaling -out gen_tx_json.go diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index dfc84fdac7..a916be52a8 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b..b12f817ca8 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index d1861b14cd..9b7177e956 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis.go b/core/vm/analysis.go index f9c4298d39..e777313c46 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/ShyftNetwork/go-empyrean/common" ) // destinations stores one map per contract (keyed by hash of code). diff --git a/core/vm/common.go b/core/vm/common.go index 17de38decb..21fa806c6f 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 66748e8215..400ecfa4d5 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/ShyftNetwork/go-empyrean/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 237450ea96..93fa171913 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256" + "github.com/ShyftNetwork/go-empyrean/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c9..0d75e20ba1 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/ShyftNetwork/go-empyrean/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index 46e7baff4c..b58d2902ed 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/gas.go b/core/vm/gas.go index dd64d5f178..aa5b055126 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/ShyftNetwork/go-empyrean/params" ) const ( diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 83adba428e..5080ea4c78 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) // memoryGasCosts calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gen_structlog.go b/core/vm/gen_structlog.go index ade3ca6318..12d686862e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 66e804fb7e..98c3f5d877 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 134363bb74..33c9b2a309 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 1ef91cf1d6..d5d8f3ee51 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 95490adfc4..2bf0dc8630 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/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 3389941353..9570391943 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/ShyftNetwork/go-empyrean/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 4c820d8b53..7bc2e64955 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" ) type Storage map[common.Hash]common.Hash diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 915f7177e7..e88f44a106 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" ) type dummyContractRef struct { diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index bec0235bcc..683e175dd5 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/ShyftNetwork/go-empyrean/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/noop.go b/core/vm/noop.go index b71ead0d77..6ff8620d57 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) func NoopCanTransfer(db StateDB, from common.Address, balance *big.Int) bool { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9d..2cdef16328 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index edbf541766..308bc815ae 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index b7d0ddc384..01b39cb22e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 2c4dc50265..fb8250e364 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/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd89..019cae39f6 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/ShyftNetwork/go-empyrean/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go index eb3acfb10d..61e09088d0 100644 --- a/core/vm/vm_jit.go +++ b/core/vm/vm_jit.go @@ -38,9 +38,9 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/params" ) type JitVm struct { diff --git a/crypto/bn256/bn256_amd64.go b/crypto/bn256/bn256_amd64.go index 35b4839c24..4f940d04c9 100644 --- a/crypto/bn256/bn256_amd64.go +++ b/crypto/bn256/bn256_amd64.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256/cloudflare" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/bn256/bn256_other.go b/crypto/bn256/bn256_other.go index 81977a0a81..257fee9e5d 100644 --- a/crypto/bn256/bn256_other.go +++ b/crypto/bn256/bn256_other.go @@ -22,7 +22,7 @@ package bn256 import ( "math/big" - "github.com/ethereum/go-ethereum/crypto/bn256/google" + "github.com/ShyftNetwork/go-empyrean/crypto/bn256/google" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/crypto.go b/crypto/crypto.go index 1c4d5a2e02..b5782b0e6e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 8350354623..52e736d4ee 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,7 +25,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index 9cd5c79f7e..53ea702a9e 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/ShyftNetwork/go-empyrean/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1..16ff59cd4f 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/ShyftNetwork/go-empyrean/crypto" ) var ( diff --git a/crypto/secp256k1/curve.go b/crypto/secp256k1/curve.go index df80481857..aff1de3a01 100644 --- a/crypto/secp256k1/curve.go +++ b/crypto/secp256k1/curve.go @@ -36,7 +36,7 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ShyftNetwork/go-empyrean/common/math" ) /* diff --git a/crypto/secp256k1/secp256_test.go b/crypto/secp256k1/secp256_test.go index f6582ecd54..2a9511ad55 100644 --- a/crypto/secp256k1/secp256_test.go +++ b/crypto/secp256k1/secp256_test.go @@ -24,8 +24,8 @@ import ( "encoding/hex" "testing" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/randentropy" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/randentropy" ) const TestCount = 1000 diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221e..485392308d 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/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index aecff76bfb..fb72e1a45b 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var ( diff --git a/dashboard/assets.go b/dashboard/assets.go index 521d134a6a..851fa5f662 100644 --- a/dashboard/assets.go +++ b/dashboard/assets.go @@ -31423,7 +31423,7 @@ var _bundleJs = []byte((((((((((`!function(modules) { }, _react2.default.createElement("span", { style: _common.styles.light }, "Commit "), _react2.default.createElement("a", { - href: "https://github.com/ethereum/go-ethereum/commit/" + general.commit, + href: "https://github.com/ShyftNetwork/go-empyrean/commit/" + general.commit, target: "_blank", style: { color: "inherit", diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d..04de0c7223 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/ShyftNetwork/go-empyrean/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 399fa34c08..2e15f6af4d 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -33,11 +33,11 @@ import ( "time" "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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/eth/api.go b/eth/api.go index a345b57e49..8cd2e066b5 100644 --- a/eth/api.go +++ b/eth/api.go @@ -25,17 +25,17 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/miner" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index ecd5488a24..4341e377c7 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -20,20 +20,20 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // EthApiBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 900a82bb6a..200622c772 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index e40bfe514c..983f5913a9 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/tracers" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 65d3909f43..5149c76050 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -24,29 +24,29 @@ import ( "runtime" "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/clique" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/filters" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/miner" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var BlockchainObject *core.BlockChain diff --git a/eth/bloombits.go b/eth/bloombits.go index c5597391c5..956952b2a3 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,13 +19,13 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) const ( diff --git a/eth/chaindb.go b/eth/chaindb.go index 7ff01a7e13..d8f36c1553 100644 --- a/eth/chaindb.go +++ b/eth/chaindb.go @@ -1,8 +1,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/node" "io/ioutil" "os" ) diff --git a/eth/config.go b/eth/config.go index dd7f42c7d9..fd443eadcb 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/db_upgrade.go b/eth/db_upgrade.go index d41afa17c0..c44389c23c 100644 --- a/eth/db_upgrade.go +++ b/eth/db_upgrade.go @@ -21,11 +21,11 @@ import ( "bytes" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var deduplicateData = []byte("dbUpgrade_20170714deduplicateData") diff --git a/eth/downloader/api.go b/eth/downloader/api.go index d496fa6a4d..e46fa84307 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/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 62842adbc6..efd5d572a0 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" - "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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index cb671a7df4..109e28b627 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index b45acff7d0..5ea2467f81 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,10 +19,10 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/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 d4eb337946..54fecad383 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/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index a4aa861146..9918bf5cfe 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 359cce54b5..0e91bfe8c6 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index ee6c7b4914..2f9a3fa511 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" - "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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/trie" ) // stateReq represents a batch of state fetch requests groupped together into diff --git a/eth/downloader/types.go b/eth/downloader/types.go index 3f30ea9dd1..ec3ea3a8a5 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/ShyftNetwork/go-empyrean/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 db554e1440..cafd3ddf7a 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 9d53b98b60..df7e39fd93 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f000..66b9a144eb 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/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 406c9442e0..fcc34f8817 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 4ae37f9779..a0293343d3 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 0a0929bc10..74af2478c8 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 5dfe60e772..92a62a4605 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -20,13 +20,13 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index f8097c7b95..f0f3c17882 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,12 +25,12 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/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 61761151a2..4088e7d105 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,16 +25,16 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 0018142c46..3d4dce58a2 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,14 +23,14 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 54325692c6..941faf33f3 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var maxPrice = big.NewInt(500 * params.Shannon) diff --git a/eth/gen_config.go b/eth/gen_config.go index 4f2e82d941..69d07a7dfa 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -5,12 +5,12 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index 3fae0cd00d..1cc207c26c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/fetcher" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index e336dfa285..c51f046486 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" ) // Tests that protocol versions and modes of operations are matched up properly. diff --git a/eth/helper_test.go b/eth/helper_test.go index 2b05cea801..f3a0b2e10e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a875..70578cff20 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/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 42ead53965..847faa3ab5 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" "gopkg.in/fatih/set.v0" ) diff --git a/eth/protocol.go b/eth/protocol.go index cd7db57f23..ebf64be5d8 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index b2f93d8dd1..fee3102aab 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/eth/shyft_tracer.go b/eth/shyft_tracer.go index 0db8e7a23b..550062c7b2 100644 --- a/eth/shyft_tracer.go +++ b/eth/shyft_tracer.go @@ -2,8 +2,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" "context" ) diff --git a/eth/sync.go b/eth/sync.go index e49e40087e..916897e841 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index 88c10c7f74..4dd91a1abc 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/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/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 c79ce7e411..934d210d9f 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,12 +25,12 @@ import ( "time" "unsafe" - "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/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index 117c376b81..9a8f3cae1f 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2..0dc8881b3c 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/ShyftNetwork/go-empyrean/eth/tracers/internal/tracers" ) // all contains all the built in JavaScript tracers by name. diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index bf8120228f..57d3dda6b3 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -25,15 +25,15 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethObjectInterface/eth_object.go b/ethObjectInterface/eth_object.go index 5e999762d3..5a757a421f 100644 --- a/ethObjectInterface/eth_object.go +++ b/ethObjectInterface/eth_object.go @@ -1,6 +1,6 @@ package ethObjectInterface -import "github.com/ethereum/go-ethereum/eth" +import "github.com/ShyftNetwork/go-empyrean/eth" //var ethObject *eth.Ethereum diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 87a912901a..0d732824f6 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 178eb2be98..58b92a7f78 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/ShyftNetwork/go-empyrean" // Verify that Client implements the ethereum interfaces. var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2f..a7543ec83e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/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 8c557e4820..80b3163bf3 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 5e4a3ca34a..fa02292e1d 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/ShyftNetwork/go-empyrean/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 8efd7bf845..c83636f5ad 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/ShyftNetwork/go-empyrean/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index ae7e252654..875281801a 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,17 +30,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..fcd685e745 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/ShyftNetwork/go-empyrean/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..d971de58c1 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/ShyftNetwork/go-empyrean/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5c76b55d98..079a227322 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/ShyftNetwork/go-empyrean/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075..b5e39dcc57 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/ShyftNetwork/go-empyrean/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/interfaces.go b/interfaces.go index 1ae1eba48a..59c0b71d51 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/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 048b7d7635..e04396d059 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -33,7 +33,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 1f181bf8b0..617c72bf1f 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/log/term" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics/exp" colorable "github.com/mattn/go-colorable" "gopkg.in/urfave/cli.v1" ) diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd..b232dce62f 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/ShyftNetwork/go-empyrean/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..2202da43e9 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/ShyftNetwork/go-empyrean/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 6525aa212c..a5373469c4 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -25,21 +25,21 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) @@ -421,7 +421,7 @@ func signHash(data []byte) []byte { // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/ShyftNetwork/go-empyrean/wiki/Management-APIs#personal_sign func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -448,7 +448,7 @@ func (s *PrivateAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr c // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/ShyftNetwork/go-empyrean/wiki/Management-APIs#personal_ecRecover func (s *PrivateAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != 65 { return common.Address{}, fmt.Errorf("signature must be 65 bytes long") diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index af95d7906f..bee44a8d99 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/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index 9c7ad16d18..7c65c6291e 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/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f05865eca6..2b3562791c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 3fc5c33a44..94f24e1d55 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,21 +20,21 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index 6a324cb04b..84e90fefae 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/bloombits" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/eth/filters" + "github.com/ShyftNetwork/go-empyrean/eth/gasprice" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/ethapi" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" + rpc "github.com/ShyftNetwork/go-empyrean/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index de233d7518..5559275bb7 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/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/light" ) const ( diff --git a/les/fetcher.go b/les/fetcher.go index e12a2c78a2..c732c8ebfd 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index d50eb809cc..f50480b3db 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/ShyftNetwork/go-empyrean/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe7..56966c10d0 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/ShyftNetwork/go-empyrean/common/mclock" ) const rcConst = 1000000 diff --git a/les/handler.go b/les/handler.go index 9627f392be..fefbfe62af 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,22 +26,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 9468032f67..9b35d387ee 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,18 +23,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/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 6d997a1a36..f8701b0bb9 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -25,20 +25,20 @@ 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" - "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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a1a..0425217d25 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/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index f8412aaad7..2bac65253b 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/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 34d759dd2a..cdde07d242 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index 88e121cda6..38d4545665 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/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 caf5680778..4c2f820a92 100644 --- a/les/peer.go +++ b/les/peer.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index e1c4625bce..df7d409383 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c13625de8e..bf62d93c38 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index e262a3cb47..5ca06c0da1 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) var ( diff --git a/les/server.go b/les/server.go index 28b87008a0..2549474319 100644 --- a/les/server.go +++ b/les/server.go @@ -23,17 +23,17 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/les/flowcontrol" + "github.com/ShyftNetwork/go-empyrean/light" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index a84c29c3ac..9886796746 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/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index c0e17f97d9..79fa0e382c 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/light" ) const ( diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e..ab4b503d0b 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 2784615d35..520412dc2c 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,16 +24,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index 0af7551d41..887c03a7c5 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c13..7e69370dd5 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // NodeSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/light/odr.go b/light/odr.go index e2c3d9c5a4..eeef171654 100644 --- a/light/odr.go +++ b/light/odr.go @@ -22,10 +22,10 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // NoOdr is the default context passed to an ODR capable function when the ODR diff --git a/light/odr_test.go b/light/odr_test.go index d3f9374fd8..3d6755acb7 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,18 +24,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index d56330e36b..73a6d7f12c 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,11 +20,11 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index 384a635f76..ca9d3f8289 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -22,15 +22,15 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/bitutil" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/trie" ) const ( diff --git a/light/trie.go b/light/trie.go index c07e99461c..f77a5a6fcb 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/trie" ) func NewState(ctx context.Context, head *types.Header, odr OdrBackend) *state.StateDB { diff --git a/light/trie_test.go b/light/trie_test.go index 0d6b2cc1d8..3334750f47 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/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index ca41490bdc..70e008d24c 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index 13d7d3cebb..f2d8d3b7b7 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) type testTxRelay struct { diff --git a/log/format.go b/log/format.go index 0b07abb2ac..ad918c5c73 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/ShyftNetwork/go-empyrean/", } // PrintOrigins sets or unsets log location (file:line) printing for terminal diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index c19d00a94d..038e253df1 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/ShyftNetwork/go-empyrean/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index d5cb4da66f..e7bda9404a 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -6,7 +6,7 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index f8c8c9ecb7..29e46f8c77 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/ShyftNetwork/go-empyrean/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index e24324814c..35e8bb3478 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/agent.go b/miner/agent.go index e3cebbd2e2..ecfb3367e5 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -21,8 +21,8 @@ import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/log" ) type CpuAgent struct { diff --git a/miner/miner.go b/miner/miner.go index fec0a40f5a..25ebfc311c 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -21,17 +21,17 @@ import ( "fmt" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" ) // Backend wraps all methods required for mining. diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 287e7530c3..9ef59b5f02 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -23,11 +23,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) type hashrate struct { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index d7d0fb0286..c08a251c6c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/log" ) // headerRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 456af1764a..8e965c719f 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // noopHeaderRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index fa331b53eb..3196f9323b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/consensus" + "github.com/ShyftNetwork/go-empyrean/consensus/misc" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/params" "gopkg.in/fatih/set.v0" ) diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff..9cf9b8a964 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/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d08..80526b1b92 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/ShyftNetwork/go-empyrean/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/ShyftNetwork/go-empyrean/mobile") if output, err := gobind.CombinedOutput(); err != nil { t.Logf("%s", output) t.Fatalf("failed to run gomobile bind: %v", err) diff --git a/mobile/big.go b/mobile/big.go index dd7b158786..6f3bad0e8f 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/ShyftNetwork/go-empyrean/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a258..6e476d2bff 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/ShyftNetwork/go-empyrean/accounts/abi" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" ) // Signer is an interaface defining the callback when a contract requires a diff --git a/mobile/common.go b/mobile/common.go index 047d8e1f65..debf5aaf82 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 9b3c93ccd9..11371a6d6a 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/ShyftNetwork/go-empyrean/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 66399c6b56..e313ec2b67 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/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 0eb1d90552..e4940401e4 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/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index 7e3b8f4915..f65112156b 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,17 +24,17 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/eth" + "github.com/ShyftNetwork/go-empyrean/eth/downloader" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/ethstats" + "github.com/ShyftNetwork/go-empyrean/les" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/params" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc..9f9574419a 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a..4742a8508d 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/ShyftNetwork/go-empyrean/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c..3508f325d6 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/ShyftNetwork/go-empyrean/log" ) // SetVerbosity sets the global verbosity level (between 0 and 6 - see logger/verbosity.go). diff --git a/mobile/p2p.go b/mobile/p2p.go index a80d9fff2e..2815a30c3c 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/ShyftNetwork/go-empyrean/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3..c4468ce9b3 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/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/types.go b/mobile/types.go index 4790afceff..dd7629cbb4 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b..06a640378e 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/ShyftNetwork/go-empyrean/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 a3b8bc0bb5..ec36c5242b 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/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index dda24583ee..1287db07fd 100644 --- a/node/config.go +++ b/node/config.go @@ -25,14 +25,14 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/accounts/keystore" + "github.com/ShyftNetwork/go-empyrean/accounts/usbwallet" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d6120..0a6acf3a99 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 8875605807..a34d56958c 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,8 +22,8 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" ) const ( diff --git a/node/node.go b/node/node.go index b02aecfad1..edff74ee4f 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/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/internal/debug" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c..9df888aaf3 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/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // SampleService is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 2880efa619..5db153daf2 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 55062a5004..0e040fa4c0 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/ShyftNetwork/go-empyrean/accounts" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 8eddce3ed7..91a1cdede3 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/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index d8feceb9f3..6d347c6a4b 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 2a7941fc65..069e0da964 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/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) func init() { diff --git a/p2p/discover/database.go b/p2p/discover/database.go index 6f98de9b42..4a7439d576 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/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 3b0c84115c..7f523d9345 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" ) const NodeIDBits = 512 diff --git a/p2p/discover/node_test.go b/p2p/discover/node_test.go index ed8db4dc65..f4d3fb0d68 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func ExampleNewNode() { diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fb..0e46c4c6a8 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/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 6509326e69..9e5177ede6 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,10 +33,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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 3ce48d2995..05fc949711 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index 524c6e4988..f4dbb4e4ad 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const Version = 4 diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index db9804f7bc..0835fe6cd6 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c3..e7db42a521 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index 52c677b623..c354c75676 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var ( diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 369282ca9c..691a8e5a4c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index fd88a55b15..57131d6e72 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index ce4ad9e4d4..9b5a50c0d6 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae..a8432ed516 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/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 543faecd48..4a649cac5d 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/ShyftNetwork/go-empyrean/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 2cf05009cb..774d889b32 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/ShyftNetwork/go-empyrean/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9..c4b1ee2f8a 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index b3d1ac4baf..dab6e1a672 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index e7a7f8e02a..bf2898086b 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/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29..56f57d8bcd 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index 6ce72d2c15..e85541de27 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index 7d31815947..c8ce5a92ef 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 2c3afb43e9..88afb2eb30 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -35,9 +35,9 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/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 ce7767d105..0ddfc1abaa 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 7591e6effb..4345ceae09 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 50b419970d..cfcc407423 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/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 4cbff90aca..a672d8b6c9 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/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index a254648c66..c2fc09d2e6 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/ShyftNetwork/go-empyrean/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/peer.go b/p2p/peer.go index 477d8c2190..ac182595c9 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,11 +24,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) const ( diff --git a/p2p/protocol.go b/p2p/protocol.go index ee747ba23d..0fc9d6c91c 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/ShyftNetwork/go-empyrean/p2p/discover" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index 9914c99587..a9204d7d3a 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -34,7 +34,7 @@ import ( "reflect" "sync" - "github.com/ethereum/go-ethereum/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p" ) // error codes used by this protocol scheme diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 053f537a62..1826836bbf 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/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + p2ptest "github.com/ShyftNetwork/go-empyrean/p2p/testing" ) // handshake message type diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 1889edac99..fb3f19472f 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/golang/snappy" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index bca4604021..26c882bf5d 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -31,11 +31,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func TestSharedSecret(t *testing.T) { diff --git a/p2p/server.go b/p2p/server.go index c41d1dc156..b7c011940c 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/mclock" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/discv5" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 10c36528eb..3b73b1391c 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) func init() { diff --git a/p2p/simulations/adapters/docker.go b/p2p/simulations/adapters/docker.go index 8ef5629fb5..747737059a 100644 --- a/p2p/simulations/adapters/docker.go +++ b/p2p/simulations/adapters/docker.go @@ -28,9 +28,9 @@ import ( "strings" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) // DockerAdapter is a NodeAdapter which runs simulation nodes inside Docker diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index a566fb27d8..677c9e6fc4 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -36,11 +36,11 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 48d7c17301..5c7ee266ab 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,12 +23,12 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 5b4b47fe2f..73aac1b4cc 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,11 +25,11 @@ import ( "os" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 6a0ead53a5..d1c8cae463 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 97dd742e88..11d012cdf0 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/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/julienschmidt/httprouter" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index 677a8fb147..88376270a7 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/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // testService implements the node.Service interface and provides protocols diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index c38e288552..a9fd8d44fa 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index de8ec0b337..756b4d45b8 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/ShyftNetwork/go-empyrean/p2p/discover" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index caf428ece1..24b40272c0 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/ShyftNetwork/go-empyrean/event" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) var dialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 2a062121be..c7577fa7c6 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/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) // TestNetworkSimulation creates a multi-node simulation network with each node diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 28886e924a..e9a3b699d8 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/ShyftNetwork/go-empyrean/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 45c6e61425..0ed27b1451 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 361285f06e..aa52abc2a0 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index a797412d60..39104537b1 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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations" + "github.com/ShyftNetwork/go-empyrean/p2p/simulations/adapters" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 2599d8c4e7..d67f6bfddf 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/ShyftNetwork/go-empyrean/common" ) var ( diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..68a4e6eaa7 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/ShyftNetwork/go-empyrean/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/rpc/client.go b/rpc/client.go index 8aa84ec982..11c00e8a86 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -32,7 +32,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 8276a9eadd..ae6fb0dafd 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/ShyftNetwork/go-empyrean/rpc" ) // In this example, our client whishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index 4f354d389e..650aaa6827 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/ShyftNetwork/go-empyrean/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/ipc.go b/rpc/ipc.go index 8de18a56fe..67de4edae1 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -21,7 +21,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // CreateIPCListener creates an listener, on Unix platforms this is a unix socket, on diff --git a/rpc/json.go b/rpc/json.go index 837011f51b..cc51a7189b 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 11373b504c..352e244a8e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -25,7 +25,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types.go b/rpc/types.go index f2375604ed..befa14fa09 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" "gopkg.in/fatih/set.v0" ) diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f..79a2bb98d5 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/ShyftNetwork/go-empyrean/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index a6e1cec28a..467d391598 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -29,7 +29,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" "golang.org/x/net/websocket" "gopkg.in/fatih/set.v0" ) diff --git a/shyftBlockExplorerApi/handler.go b/shyftBlockExplorerApi/handler.go index 830b8999f2..a6636f8e52 100644 --- a/shyftBlockExplorerApi/handler.go +++ b/shyftBlockExplorerApi/handler.go @@ -7,7 +7,7 @@ import ( _ "github.com/lib/pq" - "github.com/ethereum/go-ethereum/core" + "github.com/ShyftNetwork/go-empyrean/core" "github.com/gorilla/mux" "bytes" "io/ioutil" diff --git a/shyftDb/shyft_database_util_test.go b/shyftDb/shyft_database_util_test.go index b5f0409e31..bfbab5cb06 100644 --- a/shyftDb/shyft_database_util_test.go +++ b/shyftDb/shyft_database_util_test.go @@ -2,15 +2,15 @@ package shyftdb import ( "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/eth" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/eth" "math/big" //"time" "encoding/json" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" "strconv" ) diff --git a/shyfttracerinterface/tracer_interface.go b/shyfttracerinterface/tracer_interface.go index 43fd883788..9ba6e64b1c 100644 --- a/shyfttracerinterface/tracer_interface.go +++ b/shyfttracerinterface/tracer_interface.go @@ -1,7 +1,7 @@ package shyfttracerinterface import ( - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type IShyftTracer interface { diff --git a/swarm/api/api.go b/swarm/api/api.go index 0cf12fdbed..1b4e78a1f1 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -30,10 +30,10 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) var hashMatcher = regexp.MustCompile("^[0-9A-Fa-f]{64}") diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index 4ee26bd8ad..47fbfc9bff 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -24,9 +24,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) func testApi(t *testing.T, f func(*Api)) { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 8165d52d7e..278f556d1f 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -33,7 +33,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/api" ) var ( diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index c1d144e370..ee4c514f55 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,8 +25,8 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/testutil" ) // TestClientUploadDownloadRaw test uploading and downloading raw data to swarm diff --git a/swarm/api/config.go b/swarm/api/config.go index 6b224140a4..f74a2cbbe2 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -22,14 +22,14 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/ens" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/swarm/network" + "github.com/ShyftNetwork/go-empyrean/swarm/services/swap" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 5636b6dafb..cf42118632 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index f5dc90e2e5..09d330fe2f 100644 --- a/swarm/api/filesystem.go +++ b/swarm/api/filesystem.go @@ -26,9 +26,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 8a15e735dc..f2ca43e6c5 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/error.go b/swarm/api/http/error.go index 9a65412cf9..237bad9d03 100644 --- a/swarm/api/http/error.go +++ b/swarm/api/http/error.go @@ -28,9 +28,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/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/swarm/api" ) //templateMap holds a mapping of an HTTP error code to a template diff --git a/swarm/api/http/error_test.go b/swarm/api/http/error_test.go index dc545722e1..634c0cc134 100644 --- a/swarm/api/http/error_test.go +++ b/swarm/api/http/error_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/net/html" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ShyftNetwork/go-empyrean/swarm/testutil" ) func TestError(t *testing.T) { diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index 0194317716..9519c80e0d 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,17 +20,17 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) /* http roundtripper to register for bzz url scheme -see https://github.com/ethereum/go-ethereum/issues/2040 +see https://github.com/ShyftNetwork/go-empyrean/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/ShyftNetwork/go-empyrean/common/httpclient" + "github.com/ShyftNetwork/go-empyrean/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index b8e7436cf0..a5a28f9e3f 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,11 +35,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index b2efc0ea15..11d1e68ae6 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + swarm "github.com/ShyftNetwork/go-empyrean/swarm/api/client" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/swarm/testutil" ) func TestBzzGetPath(t *testing.T) { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index cd9d212897..b4db4d1edf 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -20,7 +20,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 685a300fca..470dfb93fa 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 7098ca16fd..e9ae881975 100644 --- a/swarm/api/manifest_test.go +++ b/swarm/api/manifest_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/testapi.go b/swarm/api/testapi.go index 6631196c17..85c9d6bf1e 100644 --- a/swarm/api/testapi.go +++ b/swarm/api/testapi.go @@ -17,7 +17,7 @@ package api import ( - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ShyftNetwork/go-empyrean/swarm/network" ) type Control struct { diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index c94a0773f5..7fbd383860 100644 --- a/swarm/fuse/fuse_file.go +++ b/swarm/fuse/fuse_file.go @@ -26,8 +26,8 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index 2493bdab19..0cf01b0316 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -17,7 +17,7 @@ package fuse import ( - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/api" "sync" "time" ) diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 42af36345f..75681d3227 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -27,8 +27,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) type fileInfo struct { diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 75742845a2..13faee4f33 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -29,9 +29,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/api" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 169b674876..1226a19edb 100644 --- a/swarm/fuse/swarmfs_util.go +++ b/swarm/fuse/swarmfs_util.go @@ -24,7 +24,7 @@ import ( "os/exec" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index 48b231b219..917c567d28 100644 --- 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" - "github.com/ethereum/go-ethereum/log" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/log" + gethmetrics "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics/influxdb" "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/depo.go b/swarm/network/depo.go index 5ffbf8be11..9cca75b1b0 100644 --- a/swarm/network/depo.go +++ b/swarm/network/depo.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) //metrics variables diff --git a/swarm/network/forwarding.go b/swarm/network/forwarding.go index 88a82a678c..85d8ca4b23 100644 --- a/swarm/network/forwarding.go +++ b/swarm/network/forwarding.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) const requesterCount = 3 diff --git a/swarm/network/hive.go b/swarm/network/hive.go index 8404ffcc2a..1f72dc55f6 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -22,13 +22,13 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/netutil" + "github.com/ShyftNetwork/go-empyrean/swarm/network/kademlia" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) // Hive is the logistic manager of the swarm diff --git a/swarm/network/kademlia/address.go b/swarm/network/kademlia/address.go index 4c38a846f9..35a91df2e2 100644 --- a/swarm/network/kademlia/address.go +++ b/swarm/network/kademlia/address.go @@ -21,7 +21,7 @@ import ( "math/rand" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type Address common.Hash diff --git a/swarm/network/kademlia/address_test.go b/swarm/network/kademlia/address_test.go index c062c8eafb..5e9241de9f 100644 --- a/swarm/network/kademlia/address_test.go +++ b/swarm/network/kademlia/address_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func (Address) Generate(rand *rand.Rand, size int) reflect.Value { diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go index b37ced5ba0..fb57a7676e 100644 --- a/swarm/network/kademlia/kaddb.go +++ b/swarm/network/kademlia/kaddb.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) type NodeData interface { diff --git a/swarm/network/kademlia/kademlia.go b/swarm/network/kademlia/kademlia.go index b5999b52d4..b68fc34327 100644 --- a/swarm/network/kademlia/kademlia.go +++ b/swarm/network/kademlia/kademlia.go @@ -23,8 +23,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" ) //metrics variables diff --git a/swarm/network/messages.go b/swarm/network/messages.go index d920def959..046cfeafb4 100644 --- a/swarm/network/messages.go +++ b/swarm/network/messages.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/swarm/network/kademlia" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/swarm/network/kademlia" + "github.com/ShyftNetwork/go-empyrean/swarm/services/swap" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) /* diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 1cbe00a973..4c5273c5e0 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -37,13 +37,13 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - bzzswap "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/p2p" + bzzswap "github.com/ShyftNetwork/go-empyrean/swarm/services/swap" + "github.com/ShyftNetwork/go-empyrean/swarm/services/swap/swap" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) //metrics variables diff --git a/swarm/network/syncdb.go b/swarm/network/syncdb.go index 88b4b68dd0..069b697cc6 100644 --- a/swarm/network/syncdb.go +++ b/swarm/network/syncdb.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/network/syncdb_test.go b/swarm/network/syncdb_test.go index be21d156f9..85bd92e7df 100644 --- a/swarm/network/syncdb_test.go +++ b/swarm/network/syncdb_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) func init() { diff --git a/swarm/network/syncer.go b/swarm/network/syncer.go index 6d729fcb9e..1db5a897af 100644 --- a/swarm/network/syncer.go +++ b/swarm/network/syncer.go @@ -22,8 +22,8 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) // syncer parameters (global, not peer specific) default values diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 1f9b22b904..22184d1c8a 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -26,14 +26,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook/contract" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/swarm/services/swap/swap" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap.go b/swarm/services/swap/swap/swap.go index a78f1f0e2a..516e3dd6b7 100644 --- a/swarm/services/swap/swap/swap.go +++ b/swarm/services/swap/swap/swap.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index 222e0770f3..43073acdf1 100644 --- a/swarm/services/swap/swap/swap_test.go +++ b/swarm/services/swap/swap/swap_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) type testInPayment struct { diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 2b397f8010..393fc3c13c 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) /* diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index c8bd12299a..826f834271 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" ) /* diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index cd4c2ef139..171c824dc9 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) type brokenLimitedReader struct { diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 2532490cc9..90834bb799 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -22,7 +22,7 @@ package storage import ( "fmt" - "github.com/ethereum/go-ethereum/compression/rle" + "github.com/ShyftNetwork/go-empyrean/compression/rle" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/dbstore.go b/swarm/storage/dbstore.go index 42a0e5a8a6..32e054040a 100644 --- a/swarm/storage/dbstore.go +++ b/swarm/storage/dbstore.go @@ -32,9 +32,9 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" ) diff --git a/swarm/storage/dbstore_test.go b/swarm/storage/dbstore_test.go index dd165b5768..3890c7be21 100644 --- a/swarm/storage/dbstore_test.go +++ b/swarm/storage/dbstore_test.go @@ -21,7 +21,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func initDbStore(t *testing.T) *DbStore { diff --git a/swarm/storage/dpa.go b/swarm/storage/dpa.go index 44a2669f12..a9a7cb2c98 100644 --- a/swarm/storage/dpa.go +++ b/swarm/storage/dpa.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) /* diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index ece0c86155..dcea891ab6 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -19,7 +19,7 @@ package storage import ( "encoding/binary" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/metrics" ) //metrics variables diff --git a/swarm/storage/memstore.go b/swarm/storage/memstore.go index d6be542203..6fcffbd595 100644 --- a/swarm/storage/memstore.go +++ b/swarm/storage/memstore.go @@ -22,8 +22,8 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" ) //metrics variables diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 5d4f17deb1..1c5ff22ec2 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index d35f1f9294..654f1ac87b 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -24,9 +24,9 @@ import ( "io" "sync" - "github.com/ethereum/go-ethereum/bmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/bmt" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" ) type Hasher func() hash.Hash diff --git a/swarm/swarm.go b/swarm/swarm.go index 0a120db1fa..89463a003a 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -27,24 +27,24 @@ 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/crypto" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/accounts/abi/bind" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/contracts/chequebook" + "github.com/ShyftNetwork/go-empyrean/contracts/ens" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethclient" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" + "github.com/ShyftNetwork/go-empyrean/node" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rpc" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + httpapi "github.com/ShyftNetwork/go-empyrean/swarm/api/http" + "github.com/ShyftNetwork/go-empyrean/swarm/fuse" + "github.com/ShyftNetwork/go-empyrean/swarm/network" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index 8b1ae28884..32ea2bbe1a 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -19,7 +19,7 @@ package swarm import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) func TestParseEnsAPIAddress(t *testing.T) { diff --git a/swarm/testutil/http.go b/swarm/testutil/http.go index f2922fab00..e30c959f11 100644 --- a/swarm/testutil/http.go +++ b/swarm/testutil/http.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ShyftNetwork/go-empyrean/swarm/api" + httpapi "github.com/ShyftNetwork/go-empyrean/swarm/api/http" + "github.com/ShyftNetwork/go-empyrean/swarm/storage" ) func NewTestSwarmServer(t *testing.T) *TestSwarmServer { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index beba484833..44be117413 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 6006373009..78e986685c 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf75..bd1198ecd6 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/consensus/ethash" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 5cfd4bd0ae..a7e9c234b9 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce999..c845f3b6fd 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd7..edd68ca871 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43..08c503df2d 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/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d97..1cd5d1f3e8 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf456..4b97cead36 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index ff8ee7da18..3fd2251587 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/ShyftNetwork/go-empyrean/params" ) // This table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index fbb214b08c..400347e607 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/ShyftNetwork/go-empyrean/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a6428..6f1cdf5cbe 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/ShyftNetwork/go-empyrean/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 9ca5f18303..e1022c58ee 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/ShyftNetwork/go-empyrean/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 3b761bd771..1c38ad3be9 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // StateTest checks transaction processing without block context. diff --git a/tests/transaction_test.go b/tests/transaction_test.go index c743996c2a..67b6c02466 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/ShyftNetwork/go-empyrean/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 2028d2a278..4c68145b53 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core/types" + "github.com/ShyftNetwork/go-empyrean/params" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index c9f5e225e9..b43328ecb5 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/ShyftNetwork/go-empyrean/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index b365167a69..499ba74a5a 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/core" + "github.com/ShyftNetwork/go-empyrean/core/state" + "github.com/ShyftNetwork/go-empyrean/core/vm" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index da36e72f98..e629eb0028 100644 --- a/trie/database.go +++ b/trie/database.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" ) // secureKeyPrefix is the database key prefix used to store trie node preimages. diff --git a/trie/errors.go b/trie/errors.go index 567b80078c..7bbf022069 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/ShyftNetwork/go-empyrean/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 2fc44787ac..09a716e127 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -21,9 +21,9 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/sha3" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto/sha3" + "github.com/ShyftNetwork/go-empyrean/rlp" ) type hasher struct { diff --git a/trie/iterator.go b/trie/iterator.go index 76146c0d64..9e0958dc3a 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,7 +21,7 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/ShyftNetwork/go-empyrean/common" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index dce1c78b5d..e39160e0a3 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index a7697fc0c6..c3bb71f306 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/proof.go b/trie/proof.go index 508e4a6cf4..b2b244facb 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index fff313d7fd..f6870ea04a 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 3881ee18a0..5948b35a8b 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" ) // SecureTrie wraps a trie with key hashing. In a secure trie, all diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index aedf5a1cde..c32db8d234 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index b573a9f732..8d8c49fe9b 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" "gopkg.in/karalabe/cookiejar.v2/collections/prque" ) diff --git a/trie/sync_test.go b/trie/sync_test.go index 4a720612b6..40a8199cca 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index 31a404e3a0..8e9a0227b8 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 9972226288..f8676e6a88 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/ethdb" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func init() { diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index 57e6505ad1..17bb6db042 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ShyftNetwork/go-empyrean/cmd/utils" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/rlp" + whisper "github.com/ShyftNetwork/go-empyrean/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 d5b993afb9..176b03304e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index 61b4775d95..00a119a779 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv5" + "github.com/ShyftNetwork/go-empyrean" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/rpc" + whisper "github.com/ShyftNetwork/go-empyrean/whisper/whisperv5" ) // Client defines typed wrappers for the Whisper v5 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index ee566625c9..ce402ec59a 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) const ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d8..fecb4f292d 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/ShyftNetwork/go-empyrean/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dd..dc987184ff 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/rlp" ) // Envelope represents a clear-text data packet to transmit through the Whisper diff --git a/whisper/whisperv5/filter.go b/whisper/whisperv5/filter.go index 3190334ebb..991efa5913 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 01034a3513..84fc4258d7 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9..240b68e902 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d07..d817804f23 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad3..c755547159 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index c27535cd1a..62e0fc835e 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/log" ) // Options specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 2edf945df0..9ae7a1eb3e 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/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 179c931795..5429eda7f9 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -20,10 +20,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index bae2adb6f5..961ddd34f4 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" ) var keys []string = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4ea67eefa..5a2aee1c99 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) // Topic represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 85849ccce4..cd40e530a2 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rpc" "github.com/syndtr/goleveldb/leveldb/errors" "golang.org/x/crypto/pbkdf2" "golang.org/x/sync/syncmap" diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go index 8af085292a..d275131277 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/ShyftNetwork/go-empyrean/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 96e2b17e7c..db48acea32 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/rpc" ) const ( diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5..2ac45bfbb5 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/ShyftNetwork/go-empyrean/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8ac..bdf16eda34 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/math" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/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 410b250a3f..3bd0dbcaef 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/ShyftNetwork/go-empyrean/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 2f170ddebe..22649013db 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 0bb7986c39..245eca41e9 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df7..4f4ee98bb8 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6e..40a17aa3c7 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3..4240ae126e 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/ShyftNetwork/go-empyrean/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index b8318cbe8f..5c8ae7f285 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/crypto/ecies" + "github.com/ShyftNetwork/go-empyrean/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 0a5c1c8533..e95e6c37d5 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/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 2bf1c905b2..e2839669db 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" set "gopkg.in/fatih/set.v0" ) diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index ec985ae65b..15227f03a7 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/p2p/discover" + "github.com/ShyftNetwork/go-empyrean/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c3..c4de229dcf 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/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index 880cced098..d26e05b8b6 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ShyftNetwork/go-empyrean/common" + "github.com/ShyftNetwork/go-empyrean/crypto" + "github.com/ShyftNetwork/go-empyrean/log" + "github.com/ShyftNetwork/go-empyrean/p2p" + "github.com/ShyftNetwork/go-empyrean/rlp" + "github.com/ShyftNetwork/go-empyrean/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 7fe256309e..9b53582652 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/ShyftNetwork/go-empyrean/common" "golang.org/x/crypto/pbkdf2" )