diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index b9444f9f0d94..6154e4c03654 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index e6bb0c3b5286..84a95bf6943d 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -22,10 +22,10 @@ import ( "io" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" ) // NewTransactor is a utility method to easily create a transaction signer from diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index ca60cc1b4320..687a34edb44f 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 6f46fc1495ab..5a18c0dcd450 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -24,22 +24,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/filters" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) // This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index c37bdf11d53a..71fef537d5ce 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index 8adff8b59b5f..8b32a340228f 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -5,10 +5,10 @@ import ( "math/big" "testing" - 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" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 5ee30d0249a2..f7b7b0a09e25 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -29,7 +29,7 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index 46e0b38d0027..912d424142f4 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) var bindTests = []struct { diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 02d0258e0cbb..a6a41234d7b0 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/ethersocial/go-ethersocial/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -68,12 +68,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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/topics.go b/accounts/abi/bind/topics.go index 600dfcda9739..31c9bb819401 100644 --- a/accounts/abi/bind/topics.go +++ b/accounts/abi/bind/topics.go @@ -22,9 +22,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) // makeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index d129993ca12f..7ccd28df18f6 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" ) // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 8f4092971f2f..ff25c48ace25 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind/backends" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 9392c1990c3e..3c828d10e183 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index e735cceb8884..f58e0916339f 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/accounts/abi/method.go b/accounts/abi/method.go index 2d8d3d658992..aef60e16ffc2 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/crypto" ) // Method represents a callable given a `Name` and whether the method is a constant. diff --git a/accounts/abi/numbers.go b/accounts/abi/numbers.go index 4d706846dacd..a686fb30833c 100644 --- a/accounts/abi/numbers.go +++ b/accounts/abi/numbers.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) var ( diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 36c58265bd4b..5a013e84979c 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -20,8 +20,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 10cd3a396274..1b2685a8c184 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) func TestPack(t *testing.T) { diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 7ef47330dc52..09322405bf58 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 8406b09c801d..61494b105c25 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index ff88be3d3084..0f15c3c0f42a 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index cb1eae281587..a92b1b08284c 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -20,10 +20,10 @@ package accounts import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" ) // Account represents an Ethereum account located at a specific location defined diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 8f660e282f57..d13801ed2acd 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" ) // Minimum amount of time between cache reloads. This limit applies if the platform does diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index fe9233c046e7..b3f0d9622743 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -29,8 +29,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" ) var ( diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 73ff6ae9ee6f..be77faa607ce 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -25,7 +25,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 84d8df0c5aab..6f2fbb85d025 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" "github.com/pborman/uuid" ) diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 2918047ccd4b..f2a3601d721a 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 6fb0a7808870..d86fdef72758 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/event" ) var testSigData = make([]byte, 32) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index a0b6cf5385d2..4c49d3b2c735 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -38,9 +38,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 630682cebdb1..0f21871591a6 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce169..728710cebc18 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 32852a0add31..63579b6ac96a 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 03055245f5e7..2f391d3b3f8d 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/crypto" "github.com/pborman/uuid" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 2f774cc941fa..50111e5c484e 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,9 +19,9 @@ package keystore import ( "math/big" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/core/types" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index bbcfb99257ad..8524755a0166 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -21,7 +21,7 @@ package keystore import ( "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" "github.com/rjeczalik/notify" ) diff --git a/accounts/manager.go b/accounts/manager.go index 96ca298fc5df..45303c1fcefd 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,7 +21,7 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/ethersocial/go-ethersocial/event" ) // Manager is an overarching account manager that can communicate with various diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index 640320bc9143..d36b6f44a68f 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" "github.com/karalabe/hid" ) diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index c30903b5b769..7aaf0dfb78d5 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,12 +28,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index a9d2e9959eb7..92f1f632b748 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,12 +27,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/usbwallet/internal/trezor" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" "github.com/golang/protobuf/proto" ) diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 6cef6e0fb02a..e8033f84aa75 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,11 +25,11 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" "github.com/karalabe/hid" ) diff --git a/build/ci.go b/build/ci.go index 4ee76ced5186..1d376ba86a61 100644 --- a/build/ci.go +++ b/build/ci.go @@ -58,9 +58,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" - sv "github.com/ethereum/go-ethereum/swarm/version" + "github.com/ethersocial/go-ethersocial/internal/build" + "github.com/ethersocial/go-ethersocial/params" + sv "github.com/ethersocial/go-ethersocial/swarm/version" ) var ( diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index d19164b18dc0..f39923c9e8e9 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common/compiler" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index fdbba4a090e5..16338df74f5b 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,14 +24,14 @@ import ( "net" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/discover" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index 519d63b3c1ba..97b85035aa6b 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,17 +35,17 @@ import ( "runtime" "strings" - "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/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/signer/core" + "github.com/ethersocial/go-ethersocial/signer/rules" + "github.com/ethersocial/go-ethersocial/signer/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index d1ae2ae0d89b..097be516e9c0 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index fe9a0c15192e..7e6f7a97b027 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,9 +23,9 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/crypto" "github.com/pborman/uuid" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index ba03d4d93692..20b6c913839a 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index c434da0c05e2..f3d0a6be210b 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethersocial/go-ethersocial/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 5caea69ff653..619c02f0dd2f 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 6006f6b5bb70..4b4a4a8d0692 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/ethersocial/go-ethersocial/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 6f60ebaf1beb..69aafa10bc01 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c019a2fe70b7..db8f0a3d3f83 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/ethersocial/go-ethersocial/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 69f611e39b11..cb271a0aac01 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/ethersocial/go-ethersocial/core/asm" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 753ca62264ef..9fb7baa266f1 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/ethersocial/go-ethersocial/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a59cb1fb8430..e03632d0b897 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethersocial/go-ethersocial/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 54b67ce1019f..ebe31a28defd 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( "runtime/pprof" "time" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/cmd/evm/internal/compiler" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/core/vm/runtime" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index b3c69d9b9dbb..82abd87e6cdb 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/tests" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 7628bc8fe25e..8ff841d3c77c 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethclient" + "github.com/ethersocial/go-ethersocial/ethstats" + "github.com/ethersocial/go-ethersocial/les" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/params" "golang.org/x/net/websocket" ) diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 071be85397da..1703ac11b6a1 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go index f88e724c65ae..7ff4e33e2f45 100644 --- a/cmd/geth/bugcmd.go +++ b/cmd/geth/bugcmd.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/cmd/internal/browser" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/cmd/internal/browser" + "github.com/ethersocial/go-ethersocial/params" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethersocial/go-ethersocial/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index c23ebff38ba7..3f0e187089ad 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/trie" "github.com/syndtr/goleveldb/leveldb/util" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index f1e2811966b0..415d90ae90aa 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -27,12 +27,12 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/dashboard" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/params" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" "github.com/naoina/toml" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 930b496ae115..432c66d3967e 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 34ba877020c0..65be8480d5db 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/params" ) const ( diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index 1f11154f7572..a2e3f2137305 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 7b5e70b4680a..78f46f1cfe0b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -28,16 +28,16 @@ import ( "time" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/ethclient" + "github.com/ethersocial/go-ethersocial/internal/debug" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/node" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index f62e254786d5..355714b9bbd5 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/params" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index e4ba96a7a681..ec5aa2614f2a 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -25,9 +25,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/gizak/termui" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index da82facac36e..b9aabfd3311f 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/ethersocial/go-ethersocial/internal/cmdtest" ) func tmpdir(t *testing.T) string { diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 8245485fda25..cb04d9e0354b 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -24,8 +24,8 @@ import ( "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/internal/debug" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/internal/debug" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index f2c1bf970350..b3f3eb5b15a1 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index ae7675cd9bc9..031273a9a567 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - math2 "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/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + math2 "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/params" ) // alethGenesisSpec represents the genesis specification format used by the diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go index 83e738360572..adfbb255f18e 100644 --- a/cmd/puppeth/genesis_test.go +++ b/cmd/puppeth/genesis_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/core" + "github.com/ethersocial/go-ethersocial/core" ) // Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet. diff --git a/cmd/puppeth/module.go b/cmd/puppeth/module.go index b6a029a01a48..88a30d8059de 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 9a77587b4a85..357c8625798b 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index 58ecb83951e0..d1a6be8b6f0c 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/ethersocial/go-ethersocial/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 219225198099..e12489027021 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/ethersocial/go-ethersocial/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 017eae1a439a..ab1566bd4450 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" ) // faucetDockerfile is the Dockerfile required to build a faucet container to diff --git a/cmd/puppeth/module_nginx.go b/cmd/puppeth/module_nginx.go index 1b1ae61ff598..2a4bb156e196 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/ethersocial/go-ethersocial/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 5d9ef46523e0..479478b29090 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 ff9f2d3743e1..0368ad1f75c0 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/ethersocial/go-ethersocial/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index c3de5f936024..04a255f443d4 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index c507596065ba..a576e8c436fe 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/ethersocial/go-ethersocial/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 83536506c4cb..bac1144be3d9 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 8a8370845b69..9e2c6c350b26 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/ethersocial/go-ethersocial/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 58ff3efbe986..bb1bbf87ef7c 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/ethersocial/go-ethersocial/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 b1322dab5cdf..edfb3a9e4ea7 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/ethersocial/go-ethersocial/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 5eeaa995e0e7..f7c3ea98ca4d 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/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/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 6aed09f141f7..81d685f7986e 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/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 75fb04b76f70..25644451f9e3 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/ethersocial/go-ethersocial/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 99ca11bb1776..aaf3fd8fed9c 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/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/log" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index 83b10cf375cb..b97b6db9ab55 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/ethersocial/go-ethersocial/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 8397b7fd57ff..8933e061b777 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/ethersocial/go-ethersocial/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 df0bc10dbfa7..46c9e81b8a56 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/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 194e4d1840a7..4f673d4eacfd 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/ethersocial/go-ethersocial/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 d0f993c5b88d..8c616fbfccfb 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/ethersocial/go-ethersocial/rlp" ) var ( diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go index 072541b6595f..f4cd5f78ec5c 100644 --- a/cmd/swarm/access.go +++ b/cmd/swarm/access.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index 967ef274248f..7a0d2a3b4898 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarmapi "github.com/ethersocial/go-ethersocial/swarm/api/client" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 98d4dee7b906..010d4e9a89d2 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" "github.com/naoina/toml" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" + bzzapi "github.com/ethersocial/go-ethersocial/swarm/api" ) var ( diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 18be316e5fd0..77df8373835e 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -27,10 +27,10 @@ import ( "time" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm" + "github.com/ethersocial/go-ethersocial/swarm/api" ) func TestConfigDump(t *testing.T) { diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 7916beffceb3..65e715f2211d 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index fcbefa020666..ccc33c9909b9 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/explore.go b/cmd/swarm/explore.go index 5b5b8bf41f39..315aecc4964e 100644 --- a/cmd/swarm/explore.go +++ b/cmd/swarm/explore.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index e8671eea797a..ec77d3cdd04c 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/swarm" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/swarm" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/feeds.go b/cmd/swarm/feeds.go index 6cd971a92c17..1a2095df1a3f 100644 --- a/cmd/swarm/feeds.go +++ b/cmd/swarm/feeds.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" - "github.com/ethereum/go-ethereum/cmd/utils" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/cmd/utils" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/feeds_test.go b/cmd/swarm/feeds_test.go index 4c40f62a8292..c5ec20d0e37e 100644 --- a/cmd/swarm/feeds_test.go +++ b/cmd/swarm/feeds_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" + swarmhttp "github.com/ethersocial/go-ethersocial/swarm/api/http" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) func TestCLIFeedUpdate(t *testing.T) { diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index edeeddff84e1..5f5c738de997 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/fuse" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 5f58d6c0d8e9..33d905ac5f13 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/log" ) type testFile struct { diff --git a/cmd/swarm/global-store/global_store.go b/cmd/swarm/global-store/global_store.go index a55756e1c432..297c64300b00 100644 --- a/cmd/swarm/global-store/global_store.go +++ b/cmd/swarm/global-store/global_store.go @@ -21,11 +21,11 @@ import ( "net/http" "os" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/storage/mock/db" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/db" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/mem" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/global_store_test.go b/cmd/swarm/global-store/global_store_test.go index 85f361ed4fdc..a8c870d0f7fb 100644 --- a/cmd/swarm/global-store/global_store_test.go +++ b/cmd/swarm/global-store/global_store_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - mockRPC "github.com/ethereum/go-ethereum/swarm/storage/mock/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rpc" + mockRPC "github.com/ethersocial/go-ethersocial/swarm/storage/mock/rpc" ) // TestHTTP_InMemory tests in-memory global store that exposes diff --git a/cmd/swarm/global-store/main.go b/cmd/swarm/global-store/main.go index 51df0099acad..a0856b07e7f5 100644 --- a/cmd/swarm/global-store/main.go +++ b/cmd/swarm/global-store/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/global-store/run_test.go b/cmd/swarm/global-store/run_test.go index d7ef626e5596..879bffa1a9f4 100644 --- a/cmd/swarm/global-store/run_test.go +++ b/cmd/swarm/global-store/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/ethersocial/go-ethersocial/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 471feb53d6e5..7782c67baa32 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 5d35154a57b9..fcae021fc047 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/ethersocial/go-ethersocial/cmd/utils" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 3053ea1b3b1d..a033c76770d9 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -29,24 +29,24 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm" - bzzapi "github.com/ethereum/go-ethereum/swarm/api" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockrpc "github.com/ethereum/go-ethereum/swarm/storage/mock/rpc" - "github.com/ethereum/go-ethereum/swarm/tracing" - sv "github.com/ethereum/go-ethereum/swarm/version" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/internal/debug" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm" + bzzapi "github.com/ethersocial/go-ethersocial/swarm/api" + swarmmetrics "github.com/ethersocial/go-ethersocial/swarm/metrics" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" + mockrpc "github.com/ethersocial/go-ethersocial/swarm/storage/mock/rpc" + "github.com/ethersocial/go-ethersocial/swarm/tracing" + sv "github.com/ethersocial/go-ethersocial/swarm/version" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index 312c72fa2103..7396e796f541 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest_test.go b/cmd/swarm/manifest_test.go index 01d982aa7a3e..14ef3f678664 100644 --- a/cmd/swarm/manifest_test.go +++ b/cmd/swarm/manifest_test.go @@ -24,9 +24,9 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" + swarmhttp "github.com/ethersocial/go-ethersocial/swarm/api/http" ) // TestManifestChange tests manifest add, update and remove diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 4a6a56d9b8b4..fad337e5978f 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -33,15 +33,15 @@ 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/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/internal/cmdtest" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarmhttp "github.com/ethersocial/go-ethersocial/swarm/api/http" ) var loglevel = flag.Int("loglevel", 3, "verbosity of logs") diff --git a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go index 6b3fed0c7e03..13972ea8790d 100644 --- a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go @@ -12,12 +12,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 43d2c1ff51df..970e8d079be5 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -21,13 +21,13 @@ import ( "os" "sort" - "github.com/ethereum/go-ethereum/cmd/utils" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/ethersocial/go-ethersocial/cmd/utils" + gethmetrics "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/metrics/influxdb" + swarmmetrics "github.com/ethersocial/go-ethersocial/swarm/metrics" + "github.com/ethersocial/go-ethersocial/swarm/tracing" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/sliding_window.go b/cmd/swarm/swarm-smoke/sliding_window.go index d313bbc37a54..2704b3f97d87 100644 --- a/cmd/swarm/swarm-smoke/sliding_window.go +++ b/cmd/swarm/swarm-smoke/sliding_window.go @@ -22,9 +22,9 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index 90230df253cf..63e806fe2c6f 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -26,12 +26,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/swarm-smoke/upload_speed.go b/cmd/swarm/swarm-smoke/upload_speed.go index 20bf7b86ca25..1bac253a2d0a 100644 --- a/cmd/swarm/swarm-smoke/upload_speed.go +++ b/cmd/swarm/swarm-smoke/upload_speed.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/util.go b/cmd/swarm/swarm-smoke/util.go index 87abb44b0b20..b9cd0f9b64f0 100644 --- a/cmd/swarm/swarm-smoke/util.go +++ b/cmd/swarm/swarm-smoke/util.go @@ -32,11 +32,11 @@ import ( "strings" "time" - "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/api/client" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/api/client" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" "github.com/pborman/uuid" cli "gopkg.in/urfave/cli.v1" diff --git a/cmd/swarm/swarm-snapshot/create.go b/cmd/swarm/swarm-snapshot/create.go index 127fde8ae245..a56e648674fb 100644 --- a/cmd/swarm/swarm-snapshot/create.go +++ b/cmd/swarm/swarm-snapshot/create.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create_test.go b/cmd/swarm/swarm-snapshot/create_test.go index c9445168d8c0..4a6487d1573b 100644 --- a/cmd/swarm/swarm-snapshot/create_test.go +++ b/cmd/swarm/swarm-snapshot/create_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations" ) // TestSnapshotCreate is a high level e2e test that tests for snapshot generation. diff --git a/cmd/swarm/swarm-snapshot/main.go b/cmd/swarm/swarm-snapshot/main.go index 184727e4d724..df9b70f7adb0 100644 --- a/cmd/swarm/swarm-snapshot/main.go +++ b/cmd/swarm/swarm-snapshot/main.go @@ -19,8 +19,8 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/run_test.go b/cmd/swarm/swarm-snapshot/run_test.go index d9a041597e70..dac20a9c9110 100644 --- a/cmd/swarm/swarm-snapshot/run_test.go +++ b/cmd/swarm/swarm-snapshot/run_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/internal/cmdtest" + "github.com/ethersocial/go-ethersocial/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 992f2d6e976f..30fbd7438c0d 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/log" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" + "github.com/ethersocial/go-ethersocial/log" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethersocial/go-ethersocial/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 616486e37c8f..d27a6090eee8 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,9 +30,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + swarmapi "github.com/ethersocial/go-ethersocial/swarm/api/client" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "github.com/mattn/go-colorable" ) diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index f23aa5775b4e..c1f343cd545b 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/internal/debug" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index e5bf8724c17a..0797fa67a894 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/ethersocial/go-ethersocial/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index cd9754793acc..92accfba613e 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,35 +28,35 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/fdlimit" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/clique" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/dashboard" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/ethstats" + "github.com/ethersocial/go-ethersocial/les" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/metrics/influxdb" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/p2p/netutil" + "github.com/ethersocial/go-ethersocial/params" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 30a9750b93fd..ea95fb5ce035 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/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/whisper/mailserver" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/console" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/whisper/mailserver" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index 13a13011dcb8..285430f67bab 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/ethersocial/go-ethersocial/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d918686..7406c9fe1390 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/ethersocial/go-ethersocial/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index be9810dc8cf5..be2df8de1958 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/ethersocial/go-ethersocial/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/types.go b/common/types.go index 0f4892d28758..be21dda7b206 100644 --- a/common/types.go +++ b/common/types.go @@ -26,7 +26,7 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 6bcf987af55e..9c6711e2508d 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 c79c30caed65..d7a495a4e36a 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -25,19 +25,19 @@ 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/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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" lru "github.com/hashicorp/golang-lru" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 54d4555f3b6a..d48a7aeb5ad1 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,10 +21,10 @@ import ( "encoding/json" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" lru "github.com/hashicorp/golang-lru" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 41dae1426fec..687934b2e5a1 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -22,13 +22,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // testerAccountPool is a pool to maintain currently active tester accounts, diff --git a/consensus/consensus.go b/consensus/consensus.go index 487b07be7725..777c27a4c602 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index d6c871092ed3..6b702a5b79a6 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,10 +27,10 @@ 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/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index c58479e2896c..1a2a42f13d82 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index 4d8eed416116..15fc363f55da 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -19,9 +19,9 @@ package ethash import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index 10412d09165d..40c17725089f 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,14 +25,14 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 438a99dd66c2..822d8780ed0e 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/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" ) type diffTest struct { diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 78892e1da85d..67ed88315b52 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,12 +34,12 @@ import ( "unsafe" mmap "github.com/edsrzf/mmap-go" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/hashicorp/golang-lru/simplelru" ) diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 90cb6470f735..f104957c444b 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" ) // Tests that ethash works correctly in test mode. diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 3a0919ca9947..1668fc0a6ac4 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "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/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 436359af7c16..f9a0f7808224 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 9b22bd7a52ab..b0dc019d6b3e 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/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/consensus/misc/forks.go b/consensus/misc/forks.go index 4a5e7c37e03c..373e1596fbe8 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" ) // VerifyForkHashes verifies that blocks conforming to network hard-forks do have diff --git a/console/bridge.go b/console/bridge.go index b0b4d37985f8..a474064f2dc6 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/ethersocial/go-ethersocial/accounts/usbwallet" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/robertkrimen/otto" ) diff --git a/console/console.go b/console/console.go index 3c397f800614..748740e9dce8 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/ethersocial/go-ethersocial/internal/jsre" + "github.com/ethersocial/go-ethersocial/internal/web3ext" + "github.com/ethersocial/go-ethersocial/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 26465ca6f450..f045423b7953 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/internal/jsre" + "github.com/ethersocial/go-ethersocial/node" ) const ( diff --git a/contracts/chequebook/api.go b/contracts/chequebook/api.go index fb7080308b65..6dbfbf1fd195 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/ethersocial/go-ethersocial/common" ) const Version = "1.0" diff --git a/contracts/chequebook/cheque.go b/contracts/chequebook/cheque.go index 53eb093a6196..9610e8523456 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/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/contracts/chequebook/contract" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/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 4bd2e176b14f..62423b73ea9c 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/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind/backends" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/chequebook/contract" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/crypto" ) var ( diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go index 00ae2c3c77f2..898909b3c106 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 ddfe8d151274..1a0b0ab25b99 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/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind/backends" + "github.com/ethersocial/go-ethersocial/contracts/chequebook/contract" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/crypto" ) var ( diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go index 8827071afc07..77c287104f84 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 a08380adfca5..91fddc189aa1 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/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 c567d5884a79..db76cb769b94 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 b1841ab17daf..e24a29b3e496 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/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/ens/contract" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" ) var ( diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index cd64fbf15f83..c70fb31914e2 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -20,12 +20,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens/contract" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind/backends" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/ens/contract" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/crypto" ) var ( diff --git a/core/asm/asm.go b/core/asm/asm.go index 4257198cc779..dcad38633e99 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/ethersocial/go-ethersocial/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index c7a544070136..40533fc24b02 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -22,8 +22,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index 53cba051709d..9944aa63ac7b 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index 3b9496fece0c..d33d5265378b 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/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 9319a7835dba..92bad0e9b568 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/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 0d2d71b4d82d..6274a7917ef7 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -27,22 +27,22 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" "github.com/hashicorp/golang-lru" ) diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index cfa32c5aab14..57894fe8c9a4 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 504ad0eaf74e..c9532f1a3a5e 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // So we can deterministically seed different blockchains diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf295..f9570a07d900 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/ethersocial/go-ethersocial/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 ae07481ada50..ba20634c668c 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/ethersocial/go-ethersocial/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index f9bcef96e0b5..64b897a0f509 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/ethersocial/go-ethersocial/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 3ec0d5ae94e5..1f41fd38607d 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/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/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 91143e525e7f..248c981179ae 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/ethersocial/go-ethersocial/common" ) const testSectionSize = 4096 diff --git a/core/chain_indexer.go b/core/chain_indexer.go index 1adde1fcb424..fd8c3cdac782 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -24,12 +24,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/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 a029dec62658..7850ad949500 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index 0b5a3d1843a9..5b4d7c431409 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 64b64fd6a355..dde35e83dfed 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/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) func ExampleGenerateChain() { diff --git a/core/dao_test.go b/core/dao_test.go index 966139bce302..a8c31edef1de 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/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/events.go b/core/events.go index 710bdb589485..00ca2a17a806 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index d303c40a4074..00453403da46 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/gen_genesis.go b/core/gen_genesis.go index bb8ea1d6a239..1fcc11ec6b0e 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index 64fb9b9248f9..4f8df2c4f5d4 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index ce285b2504a3..d50b478c50fd 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,16 +25,16 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 60e482088c1d..c7be36d0d051 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -22,12 +22,12 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) func TestDefaultGenesisBlock(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index d2093113c0e2..698e0797ec86 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" "github.com/hashicorp/golang-lru" ) diff --git a/core/helper_test.go b/core/helper_test.go index 051384d8547b..069534a1ef59 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -19,9 +19,9 @@ package core import ( "container/list" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" ) // Implement our EthTest Manager diff --git a/core/mkalloc.go b/core/mkalloc.go index 565e8c5826d4..ec09a588d541 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/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 491a125c6519..04564fa7080f 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -21,10 +21,10 @@ import ( "encoding/binary" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index fcc36dc2b4c5..a65f84629051 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4ff7e5bd35d3..f0798234ff68 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index d9c10e1490fa..ff97b7c72dd2 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 82e4bf04558e..a3f1619117aa 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -19,10 +19,10 @@ package rawdb import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index 8a9921ef40d2..b09a61cfa6a4 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -20,8 +20,8 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/state/database.go b/core/state/database.go index f6ea144b9b1e..fb95d17683a6 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/trie" lru "github.com/hashicorp/golang-lru" ) diff --git a/core/state/dump.go b/core/state/dump.go index 072dbbf05300..dde0228b8698 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) type DumpAccount struct { diff --git a/core/state/iterator.go b/core/state/iterator.go index 6a5c73d3d13c..0301bc4c009f 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/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 9e46c851cdcb..e3201178601d 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 a03ca57dbc64..6e07b5d68550 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/ethersocial/go-ethersocial/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/managed_state.go b/core/state/managed_state.go index 1390ef4a00af..e4f4564a3cc3 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/ethersocial/go-ethersocial/common" ) type account struct { diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go index 3d9c4e867603..8b39c28bb419 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/ethdb" ) var addr = common.BytesToAddress([]byte("test")) diff --git a/core/state/state_object.go b/core/state/state_object.go index f41ab0409221..24aefa05e3f3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index a09273f3b1fb..6ebf884f9dbe 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" checker "gopkg.in/check.v1" ) diff --git a/core/state/statedb.go b/core/state/statedb.go index 2230b10ef06e..aa5c98947f0e 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -23,12 +23,12 @@ import ( "math/big" "sort" - "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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) type revision struct { diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index cbd5bc75e75f..f339950dbb6c 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" ) // Tests that updating a state trie does not leak any database writes prior to diff --git a/core/state/sync.go b/core/state/sync.go index c566e790739a..c6f34190c9cb 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index 31774016082a..43c45c3448a6 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/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 503a35d16ad8..a962726b47c5 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_transition.go b/core/state_transition.go index fda081b7d113..c98c34cfbd3b 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/core/tx_cacher.go b/core/tx_cacher.go index b1e5d676a2b1..8c90db4867f0 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/core/types" ) // senderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/tx_journal.go b/core/tx_journal.go index 41b5156d4ad2..f80709f36c47 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/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 57abc5148643..c43076578b0b 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 d579f501afa8..86f92c85523e 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/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 552d3692b381..72a152bc05f5 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/params" ) const ( diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 6d3bd7a5a5c5..3ec0505d2203 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" ) // testTxPoolConfig is a transaction pool configuration without stateful disk diff --git a/core/types.go b/core/types.go index d0bbaf0aa77b..e38c90e3dcf8 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/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 57905d8c7aa2..79b212901b69 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,9 +26,9 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/block_test.go b/core/types/block_test.go index a35fbc25b1ed..43c9bed79a30 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index d045c9e6678e..aca78863bbe8 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/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index a28ac0e7afba..926b1658ac82 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/ethersocial/go-ethersocial/core/state" ) func TestBloom9(t *testing.T) { diff --git a/core/types/derive_sha.go b/core/types/derive_sha.go index 00c42c5bc622..42b1a24ee79e 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) type DerivableList interface { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 59a1c9c439b4..b3dee8ccd4b5 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 1b5ae3c653ba..cbad28183f05 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 5c807a4ccbe1..88f231adc512 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_tx_json.go b/core/types/gen_tx_json.go index c27da67096eb..80c65981b98c 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*txdataMarshaling)(nil) diff --git a/core/types/log.go b/core/types/log.go index 717cd2e5a026..4fa88ee560e3 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -19,9 +19,9 @@ package types import ( "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/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 0e56acfe4aa3..4bbb2693eb89 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 3d1fc95aabce..f8f38578bf4b 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/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 ba3d5de91de1..b3d301817d32 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -23,10 +23,10 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/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 63132048ee72..b2448cf4c7af 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 689fc38a9b66..c5405502c967 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index f38d8e7177c4..0b68a0f085cb 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index fd2d744d87f4..c089f1418589 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 17de38decba2..cbb5fd318764 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) // calculates the memory size required for a step diff --git a/core/vm/contract.go b/core/vm/contract.go index 20baa6e751bc..41d540f64bcb 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/ethersocial/go-ethersocial/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 20b741f8f144..86e9bb4c63df 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/bn256" + "github.com/ethersocial/go-ethersocial/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 96083337c922..eb4321992ea6 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/ethersocial/go-ethersocial/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/evm.go b/core/vm/evm.go index ba4d1e9eb8c5..cc999b268045 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/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 bba7058c7e23..8aec8a29d2c9 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/ethersocial/go-ethersocial/params" ) // Gas costs diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 9203e10a70b2..4c1c8a1035f0 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/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 726012e59ecf..407326a0724a 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*structLogMarshaling)(nil) diff --git a/core/vm/instructions.go b/core/vm/instructions.go index 5195e716b295..269a5e11d9f3 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -21,10 +21,10 @@ 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/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" "golang.org/x/crypto/sha3" ) diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 8a48d765dd68..e4b8e765516c 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_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/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/params" ) type twoOperandTest struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index fc15082f18ed..6636df5fca90 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 952d96dd4d18..b5263d18da78 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -21,9 +21,9 @@ import ( "hash" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/params" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index deedf70cdb7d..75acbafce5e9 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/ethersocial/go-ethersocial/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 1733bf270013..644f0d01d438 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/types" ) // Storage represents a contract's storage. diff --git a/core/vm/logger_json.go b/core/vm/logger_json.go index ff379a4efdba..0a64da61594e 100644 --- a/core/vm/logger_json.go +++ b/core/vm/logger_json.go @@ -22,8 +22,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) type JSONLogger struct { diff --git a/core/vm/logger_test.go b/core/vm/logger_test.go index 2ea7535a794d..f6d812a45e01 100644 --- a/core/vm/logger_test.go +++ b/core/vm/logger_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/params" ) type dummyContractRef struct { diff --git a/core/vm/memory.go b/core/vm/memory.go index 7e6f0eb940dc..e7a9042f961e 100644 --- a/core/vm/memory.go +++ b/core/vm/memory.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/math" + "github.com/ethersocial/go-ethersocial/common/math" ) // Memory implements a simple memory model for the ethereum virtual machine. diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index 8fa6c90ca7d4..f2a023bffcab 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/ethersocial/go-ethersocial/common/math" ) func memorySha3(stack *Stack) *big.Int { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 31c9b9cf9da0..97b1e57ca447 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index cda49a34b4a7..06e69e56886a 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/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 b7d0ddc384ea..c634cfd44c9e 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index bac06e524bd2..70e1a3aba76d 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -21,12 +21,12 @@ 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/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) func TestDefaults(t *testing.T) { diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index a4b1cfcd896e..805ed3af5779 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/ethersocial/go-ethersocial/params" ) func makeStackFunc(pop, push int) stackValidationFunc { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 5c081493b0fb..ac6eaaf98181 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" +import "github.com/ethersocial/go-ethersocial/crypto/bn256/cloudflare" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/bn256/bn256_fuzz.go b/crypto/bn256/bn256_fuzz.go index 6aa142117045..16e3de72f817 100644 --- a/crypto/bn256/bn256_fuzz.go +++ b/crypto/bn256/bn256_fuzz.go @@ -10,8 +10,8 @@ import ( "bytes" "math/big" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/ethersocial/go-ethersocial/crypto/bn256/cloudflare" + google "github.com/ethersocial/go-ethersocial/crypto/bn256/google" ) // FuzzAdd fuzzez bn256 addition between the Google and Cloudflare libraries. diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index 47df49d41763..81d60659ef75 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import "github.com/ethereum/go-ethereum/crypto/bn256/google" +import "github.com/ethersocial/go-ethersocial/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index 4567fafc729c..5a3061892350 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -28,9 +28,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 177c19c0cfca..9c568799fd08 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,8 +26,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index f33f204d5b7f..daf62264202d 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/ethersocial/go-ethersocial/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 6312daf5a1c1..3f7488b90ee4 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/ethersocial/go-ethersocial/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 340bfc221eae..9b964744cf89 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/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/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 aecff76bfbda..f439401b2bdc 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var ( diff --git a/dashboard/cpu.go b/dashboard/cpu.go index c89879028d5e..9e72cb44a368 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/ethersocial/go-ethersocial/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go index 3ba92ac73eb0..03a334f5b48b 100644 --- a/dashboard/dashboard.go +++ b/dashboard/dashboard.go @@ -35,11 +35,11 @@ import ( "io" "github.com/elastic/gosigar" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/mohae/deepcopy" "golang.org/x/net/websocket" ) diff --git a/dashboard/log.go b/dashboard/log.go index 5d852d60a4db..1468abc5246e 100644 --- a/dashboard/log.go +++ b/dashboard/log.go @@ -26,7 +26,7 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" "github.com/mohae/deepcopy" "github.com/rjeczalik/notify" ) diff --git a/eth/api.go b/eth/api.go index 816b9cd33548..4df4c7783364 100644 --- a/eth/api.go +++ b/eth/api.go @@ -28,17 +28,17 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/trie" ) // PublicEthereumAPI provides an API to access Ethereum full node-related diff --git a/eth/api_backend.go b/eth/api_backend.go index a48815e0db22..4696f5f9fa78 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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) // EthAPIBackend implements ethapi.Backend for full nodes diff --git a/eth/api_test.go b/eth/api_test.go index 47b062a40c46..b648941be1e7 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/ethdb" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/eth/api_tracer.go b/eth/api_tracer.go index a3a0b4e1ecea..61eaf3cf0863 100644 --- a/eth/api_tracer.go +++ b/eth/api_tracer.go @@ -28,19 +28,19 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/tracers" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/trie" ) const ( diff --git a/eth/backend.go b/eth/backend.go index 2a9d56c5c144..2871244178a6 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,30 +25,30 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/clique" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/filters" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/miner" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" ) type LesServer interface { diff --git a/eth/bloombits.go b/eth/bloombits.go index c7bb561402ef..76f5c4913de1 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -20,13 +20,13 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" ) const ( diff --git a/eth/config.go b/eth/config.go index 7c041d1af73c..51e71da766fb 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/params" ) // DefaultConfig contains default settings for use on the Ethereum main net. diff --git a/eth/downloader/api.go b/eth/downloader/api.go index 57ff3d71afa8..a4733eba3856 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/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 4db689f73b9c..9c83bf5c3c3b 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,15 +25,15 @@ import ( "sync/atomic" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index 1a42965d39bc..a78dede8aae0 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/trie" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/trie" ) // Reduce some of the parameters to make the tester faster. diff --git a/eth/downloader/fakepeer.go b/eth/downloader/fakepeer.go index 59832facaaa3..d6931cecfea6 100644 --- a/eth/downloader/fakepeer.go +++ b/eth/downloader/fakepeer.go @@ -19,11 +19,11 @@ package downloader import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 d4eb33794628..cfd4556c75e4 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/ethersocial/go-ethersocial/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 60f86d0e14cf..275c74d264b6 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 7c339538110a..a30ef4c24b28 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" ) var ( diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 0675a91cdc0f..7769d515a55c 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -22,12 +22,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/trie" "golang.org/x/crypto/sha3" ) diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 0b5a2142576f..48fdb095b646 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "sync" - "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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // Test chain parameters. diff --git a/eth/downloader/types.go b/eth/downloader/types.go index ff70bfa0e3cc..c0e6d07a6032 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/ethersocial/go-ethersocial/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 f0b5e8064bc2..e22d0e329ead 100644 --- a/eth/fetcher/fetcher.go +++ b/eth/fetcher/fetcher.go @@ -22,11 +22,11 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/eth/fetcher/fetcher_test.go b/eth/fetcher/fetcher_test.go index 3d4f0d1e592b..1e481d4f5abc 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/eth/fetcher/metrics.go b/eth/fetcher/metrics.go index d68d12f000f7..02fee0d86c93 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/ethersocial/go-ethersocial/metrics" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 5ed80a887563..bf97f43930ac 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 02229a7549a7..3b790cee2b1d 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index c5f681e024b9..19e365fc36ad 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -23,14 +23,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/node" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 071613ad7a15..860c77763c11 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,13 +21,13 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/rpc" ) type Backend interface { diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index 70139c1a96ec..4e7789784011 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,14 +25,14 @@ import ( "sync" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/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 e71080b1ab5e..e53d805eb53c 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + ethereum "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 396a03d611c6..9d319e1c978b 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 3b8db78a1cc7..3428d0b38593 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) var maxPrice = big.NewInt(500 * params.GWei) diff --git a/eth/gen_config.go b/eth/gen_config.go index 2777aa9e83fb..1b71c4a89105 100644 --- a/eth/gen_config.go +++ b/eth/gen_config.go @@ -6,12 +6,12 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/gasprice" ) var _ = (*configMarshaling)(nil) diff --git a/eth/handler.go b/eth/handler.go index b42612a56625..5151daf3c419 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/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/fetcher" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) const ( diff --git a/eth/handler_test.go b/eth/handler_test.go index 9fffd9581198..5849aa324127 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -24,18 +24,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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/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 b18a02baf955..2b67948ade64 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/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/eth/metrics.go b/eth/metrics.go index 0533a2a8757c..ccd195525156 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/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" ) var ( diff --git a/eth/peer.go b/eth/peer.go index b5f4508559f8..da6e86656c51 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -24,10 +24,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" ) var ( diff --git a/eth/protocol.go b/eth/protocol.go index 497ba4c597ed..3181443226b4 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocol_test.go b/eth/protocol_test.go index aa43dfa9204e..d84a8b3c510d 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" ) func init() { diff --git a/eth/sync.go b/eth/sync.go index bfcfb6716ec7..30d50e41fae9 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/enode" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index e4c99ff5873f..73c75bcafc67 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/enode" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) // 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 9d6701868c72..7bc8694c0172 100644 --- a/eth/tracers/tracer.go +++ b/eth/tracers/tracer.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" duktape "gopkg.in/olebedev/go-duktape.v3" ) diff --git a/eth/tracers/tracer_test.go b/eth/tracers/tracer_test.go index a45a121159d8..52cfb2fb8e4f 100644 --- a/eth/tracers/tracer_test.go +++ b/eth/tracers/tracer_test.go @@ -24,10 +24,10 @@ import ( "testing" "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/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/params" ) type account struct{} diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 4e1ef23ad2f8..8a2c64635e48 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/ethersocial/go-ethersocial/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 b435b1694bd8..b123ace08ed0 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -27,17 +27,17 @@ 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/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/tests" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index f3163e19b37c..4ec043dfceb0 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index 3e8bf974c23d..c453c95436c5 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/signer.go b/ethclient/signer.go index 74a93f1e2fd6..a57dccdc0abc 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 6c62d6a386ff..2fb91a8e292f 100644 --- a/ethdb/database.go +++ b/ethdb/database.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/database_js_test.go b/ethdb/database_js_test.go index b4c12ae0bc57..55d847036bd5 100644 --- a/ethdb/database_js_test.go +++ b/ethdb/database_js_test.go @@ -19,7 +19,7 @@ package ethdb_test import ( - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/ethdb" ) var _ ethdb.Database = ðdb.LDBDatabase{} diff --git a/ethdb/database_test.go b/ethdb/database_test.go index 382fedbf9eff..f8dd0490ce01 100644 --- a/ethdb/database_test.go +++ b/ethdb/database_test.go @@ -27,7 +27,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/ethdb" ) func newTestLDB() (*ethdb.LDBDatabase, func()) { diff --git a/ethdb/memory_database.go b/ethdb/memory_database.go index 727f2f7ca35d..f01010defaa7 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/ethersocial/go-ethersocial/common" ) /* diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 9f3d7237e9b8..ee2ba1a3c14c 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/les" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" "golang.org/x/net/websocket" ) diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df546..539f84589a89 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/ethersocial/go-ethersocial/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeacba..f6206170cfcb 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/ethersocial/go-ethersocial/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 5c76b55d98e8..326e65f139b6 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/ethersocial/go-ethersocial/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index d03f465075bf..56e761cbdaf3 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/ethersocial/go-ethersocial/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 be783440629c..78ac69431d32 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 86a4218f6a57..d241eb6c369b 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -34,7 +34,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) // Handler is the global debugging handler. diff --git a/internal/debug/flags.go b/internal/debug/flags.go index 46c8fe9f80de..d3b5995563c7 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -24,9 +24,9 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/metrics/exp" "github.com/fjl/memsize/memsizeui" colorable "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index cab5deaafd6c..5994d5f88257 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/ethersocial/go-ethersocial/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688ccc..0b7a3f181b4e 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/ethersocial/go-ethersocial/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 73b629bd9c2b..f7aadc6e71c9 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,22 +26,22 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index e23ee03b1555..aab51fac4b19 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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/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 9c7ad16d182d..684cd7b408a1 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/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index 4c7664f1ccbd..d269ae30f632 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/internal/jsre/deps" "github.com/robertkrimen/otto" ) diff --git a/les/api_backend.go b/les/api_backend.go index 753139623526..6c1c40dcdfa8 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -20,22 +20,22 @@ import ( "context" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" ) type LesApiBackend struct { diff --git a/les/backend.go b/les/backend.go index d0db71019e90..ae98e1121a08 100644 --- a/les/backend.go +++ b/les/backend.go @@ -22,27 +22,27 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - rpc "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/bloombits" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/eth/filters" + "github.com/ethersocial/go-ethersocial/eth/gasprice" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/params" + rpc "github.com/ethersocial/go-ethersocial/rpc" ) type LightEthereum struct { diff --git a/les/bloombits.go b/les/bloombits.go index aea0fcd5f480..a53fe8fd2b7e 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/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/light" ) const ( diff --git a/les/commons.go b/les/commons.go index 21fb25714afc..6ec86c19384e 100644 --- a/les/commons.go +++ b/les/commons.go @@ -20,14 +20,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" ) // lesCommons contains fields needed by both server and client. diff --git a/les/fetcher.go b/les/fetcher.go index 2615f69df946..90174bf6a9cd 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -22,13 +22,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/les/flowcontrol/control.go b/les/flowcontrol/control.go index 8ef4ba511fc4..bfe69c98c571 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/ethersocial/go-ethersocial/common/mclock" ) const fcTimeConst = time.Millisecond diff --git a/les/flowcontrol/manager.go b/les/flowcontrol/manager.go index 28cc6f0fe763..7e99e867146a 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/ethersocial/go-ethersocial/common/mclock" ) const rcConst = 1000000 diff --git a/les/freeclient.go b/les/freeclient.go index 5ee607be8fb7..ec159055c252 100644 --- a/les/freeclient.go +++ b/les/freeclient.go @@ -23,11 +23,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" ) // freeClientPool implements a client database that limits the connection time diff --git a/les/freeclient_test.go b/les/freeclient_test.go index e95abc7aad01..dc55a78b3f10 100644 --- a/les/freeclient_test.go +++ b/les/freeclient_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/ethdb" ) func TestFreeClientPoolL10C100(t *testing.T) { diff --git a/les/handler.go b/les/handler.go index 19ccbcd2b602..609d19b3dfcc 100644 --- a/les/handler.go +++ b/les/handler.go @@ -26,23 +26,23 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) const ( diff --git a/les/handler_test.go b/les/handler_test.go index 43be7f41b11d..25e69b285f59 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -23,19 +23,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/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 b46d41f174c8..38e598048587 100644 --- a/les/helper_test.go +++ b/les/helper_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/les/flowcontrol" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/les/metrics.go b/les/metrics.go index c282a62a1aed..10d05b845b8a 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/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" ) var ( diff --git a/les/odr.go b/les/odr.go index 9def05a67608..63d448f1a272 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/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" ) // LesOdr implements light.OdrBackend diff --git a/les/odr_requests.go b/les/odr_requests.go index 0f2e5dd9ecd4..6851036ba939 100644 --- a/les/odr_requests.go +++ b/les/odr_requests.go @@ -23,15 +23,15 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) var ( diff --git a/les/odr_test.go b/les/odr_test.go index ac81fbcf02fd..35678b009edc 100644 --- a/les/odr_test.go +++ b/les/odr_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/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 678384f0eb46..0df8fd5b2f4e 100644 --- a/les/peer.go +++ b/les/peer.go @@ -24,13 +24,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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/les/flowcontrol" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" ) var ( diff --git a/les/protocol.go b/les/protocol.go index 0b24f5aedb64..e28d8ac637ae 100644 --- a/les/protocol.go +++ b/les/protocol.go @@ -24,12 +24,12 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rlp" ) // Constants to match up protocol versions and messages diff --git a/les/request_test.go b/les/request_test.go index c9c18519828c..8aaa99aeec7e 100644 --- a/les/request_test.go +++ b/les/request_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/light" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/light" ) var testBankSecureTrieKey = secAddr(testBankAddress) diff --git a/les/retrieve.go b/les/retrieve.go index d77cfea74e07..847da4daa722 100644 --- a/les/retrieve.go +++ b/les/retrieve.go @@ -26,8 +26,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/light" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/light" ) var ( diff --git a/les/server.go b/les/server.go index 2fa0456d695d..c08f72da71c5 100644 --- a/les/server.go +++ b/les/server.go @@ -23,19 +23,19 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/les/flowcontrol" - "github.com/ethereum/go-ethereum/light" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/les/flowcontrol" + "github.com/ethersocial/go-ethersocial/light" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) type LesServer struct { diff --git a/les/serverpool.go b/les/serverpool.go index 52b54b371fec..b9f3edbaa548 100644 --- a/les/serverpool.go +++ b/les/serverpool.go @@ -28,14 +28,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/discv5" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rlp" ) const ( diff --git a/les/sync.go b/les/sync.go index 1ac645585203..025eb264ca6f 100644 --- a/les/sync.go +++ b/les/sync.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/light" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/light" ) // syncer is responsible for periodically synchronising with the network, both diff --git a/les/txrelay.go b/les/txrelay.go index 7a02cc837e67..d17b5e3a8008 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) type ltrInfo struct { diff --git a/light/lightchain.go b/light/lightchain.go index 8e2734c2d943..48c34ad2b47a 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -24,17 +24,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/hashicorp/golang-lru" ) diff --git a/light/lightchain_test.go b/light/lightchain_test.go index d45c0656d928..e7e1f1420ebd 100644 --- a/light/lightchain_test.go +++ b/light/lightchain_test.go @@ -21,13 +21,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // So we can deterministically seed different blockchains diff --git a/light/nodeset.go b/light/nodeset.go index 6f25219c1305..902e8e247a23 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/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 900be05440cc..ee5187b6d9b7 100644 --- a/light/odr.go +++ b/light/odr.go @@ -23,11 +23,11 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 3da7b3055e3d..a3ddeccd9f1b 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -24,19 +24,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) var ( diff --git a/light/odr_util.go b/light/odr_util.go index 073f0d64296b..9956c16733a0 100644 --- a/light/odr_util.go +++ b/light/odr_util.go @@ -20,12 +20,12 @@ import ( "bytes" "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) var sha3_nil = crypto.Keccak256Hash(nil) diff --git a/light/postprocess.go b/light/postprocess.go index dd1b74a7bebe..c52b50feebdc 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -24,16 +24,16 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/trie" ) // IndexerConfig includes a set of configs for chain indexers. diff --git a/light/trie.go b/light/trie.go index ab4e18b43eec..cf1a46fac0a5 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/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 5b5fce31d9a5..527922b81de2 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/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/trie" ) func TestNodeIterator(t *testing.T) { diff --git a/light/txpool.go b/light/txpool.go index 767a797bdcec..822a56cb4fd5 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -22,16 +22,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/rawdb" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) const ( diff --git a/light/txpool_test.go b/light/txpool_test.go index ce77573efd81..41634933f849 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) type testTxRelay struct { diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 325a193c77a6..28d739f652be 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/ethersocial/go-ethersocial/metrics" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index c4ef927234d5..0c06dae8343c 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -5,8 +5,8 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" "github.com/influxdata/influxdb/client" ) diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index 2138e01ae88b..ba45b92a0c60 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/ethersocial/go-ethersocial/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 2a2b804e7c96..650a22b80784 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/miner/miner.go b/miner/miner.go index 5218c12107d3..7989959f5e09 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -22,15 +22,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" ) // Backend wraps all methods required for mining. diff --git a/miner/stress_clique.go b/miner/stress_clique.go index 7e19975aec2f..a57dc7c8ac1d 100644 --- a/miner/stress_clique.go +++ b/miner/stress_clique.go @@ -28,19 +28,19 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/fdlimit" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" ) func main() { diff --git a/miner/stress_ethash.go b/miner/stress_ethash.go index 044ca9a21834..ab4469c90c20 100644 --- a/miner/stress_ethash.go +++ b/miner/stress_ethash.go @@ -28,20 +28,20 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/fdlimit" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/params" ) func main() { diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index 3a176e8bd6f6..d1ae97b47315 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" ) // chainRetriever is used by the unconfirmed block set to verify whether a previously diff --git a/miner/unconfirmed_test.go b/miner/unconfirmed_test.go index 42e77f3e648c..e511ca01504f 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" ) // noopChainRetriever is an implementation of headerRetriever that always diff --git a/miner/worker.go b/miner/worker.go index 48473796bc38..ac8602795a2f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -25,15 +25,15 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/misc" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/params" ) const ( diff --git a/miner/worker_test.go b/miner/worker_test.go index 7c8f167a12d7..485d8c0ec5c9 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -21,17 +21,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/clique" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/mobile/accounts.go b/mobile/accounts.go index 4d979bffff5d..0270786f48d5 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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) const ( diff --git a/mobile/android_test.go b/mobile/android_test.go index 3d3bd66d0899..29fa5d19d344 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/ethersocial/go-ethersocial/internal/build" ) // androidTestClass is a Java class to do some lightweight tests against the Android diff --git a/mobile/big.go b/mobile/big.go index 86ea93245aab..1a661247ca03 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/ethersocial/go-ethersocial/common" ) // A BigInt represents a signed multi-precision integer. diff --git a/mobile/bind.go b/mobile/bind.go index d6e621a258fd..d9a838094e52 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/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 047d8e1f65c7..2de06c0ab3ef 100644 --- a/mobile/common.go +++ b/mobile/common.go @@ -24,7 +24,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) // Hash represents the 32 byte Keccak256 hash of arbitrary data. diff --git a/mobile/discover.go b/mobile/discover.go index 451265c2a155..dc1d020e16a3 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/ethersocial/go-ethersocial/p2p/discv5" ) // Enode represents a host on the network. diff --git a/mobile/ethclient.go b/mobile/ethclient.go index 662125c4adeb..36c85eca9c18 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/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/ethclient" ) // EthereumClient provides access to the Ethereum APIs. diff --git a/mobile/ethereum.go b/mobile/ethereum.go index 59da85239744..9745cdcb8ab2 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/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common" ) // Subscription represents an event subscription where events are diff --git a/mobile/geth.go b/mobile/geth.go index e3e2e905da37..1f773d0e45eb 100644 --- a/mobile/geth.go +++ b/mobile/geth.go @@ -24,18 +24,18 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/les" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/params" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/eth" + "github.com/ethersocial/go-ethersocial/eth/downloader" + "github.com/ethersocial/go-ethersocial/ethclient" + "github.com/ethersocial/go-ethersocial/ethstats" + "github.com/ethersocial/go-ethersocial/internal/debug" + "github.com/ethersocial/go-ethersocial/les" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/params" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) // NodeConfig represents the collection of configuration values to fine tune the Geth diff --git a/mobile/init.go b/mobile/init.go index 2025d85edc92..337686463b43 100644 --- a/mobile/init.go +++ b/mobile/init.go @@ -22,7 +22,7 @@ import ( "os" "runtime" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) func init() { diff --git a/mobile/interface.go b/mobile/interface.go index ac0c26088a7b..f830c70c01a6 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/ethersocial/go-ethersocial/common" ) // Interface represents a wrapped version of Go's interface{}, with the capacity diff --git a/mobile/logger.go b/mobile/logger.go index 7078c4fd2c83..b7bd6048f07b 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/ethersocial/go-ethersocial/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 a80d9fff2e15..238494d1de24 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/ethersocial/go-ethersocial/p2p" ) // NodeInfo represents pi short summary of the information known about the host. diff --git a/mobile/params.go b/mobile/params.go index 45fe870ee3dc..9cd49d80c93d 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/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/params" ) // MainnetGenesis returns the JSON spec to use for the main Ethereum network. It diff --git a/mobile/shhclient.go b/mobile/shhclient.go index a069c9bd4042..033be52de5a5 100644 --- a/mobile/shhclient.go +++ b/mobile/shhclient.go @@ -19,8 +19,8 @@ package geth import ( - "github.com/ethereum/go-ethereum/whisper/shhclient" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/whisper/shhclient" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) // WhisperClient provides access to the Ethereum APIs. diff --git a/mobile/types.go b/mobile/types.go index 443d07ea9329..1747a5f19b86 100644 --- a/mobile/types.go +++ b/mobile/types.go @@ -23,10 +23,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/rlp" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) // A Nonce is a 64-bit hash which proves (combined with the mix-hash) that diff --git a/mobile/vm.go b/mobile/vm.go index 72093e3d5b90..d2136a11b889 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/ethersocial/go-ethersocial/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 6e36e505d12f..c39e2af14e97 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/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" ) // PrivateAdminAPI is the collection of administrative API methods exposed only diff --git a/node/config.go b/node/config.go index 59c3afef062e..8fdfde62ce22 100644 --- a/node/config.go +++ b/node/config.go @@ -26,15 +26,15 @@ import ( "strings" "sync" - "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/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/accounts/usbwallet" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index b81d3d612025..ee1fd636d60d 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/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index 81e83d625638..08ceb11c2568 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/rpc" ) const ( diff --git a/node/node.go b/node/node.go index c35a509723c2..4d209e9a8b9e 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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/internal/debug" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/prometheus/prometheus/util/flock" ) diff --git a/node/node_example_test.go b/node/node_example_test.go index ee06f4065c37..1a502b5f2d3d 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/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/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 f833cd688037..62bb17d2bdd2 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/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" ) var ( diff --git a/node/service.go b/node/service.go index 6a96d9b1e15d..40abb51e222f 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/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" ) // ServiceContext is a collection of service independent options inherited from diff --git a/node/utils_test.go b/node/utils_test.go index 9801b1ed4565..ec85d0af8895 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/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" ) // NoopService is a trivial implementation of the Service interface. diff --git a/p2p/dial.go b/p2p/dial.go index 075a0f93680a..1610aa80bfe8 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -23,9 +23,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index f41ab77524d9..753c0ff3f4c6 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -24,9 +24,9 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) func init() { diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 8d4af166bba4..26323f4dc56f 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -23,10 +23,10 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/secp256k1" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/secp256k1" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 1bb52399fbc5..2ace062d5c6f 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/ethersocial/go-ethersocial/log" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index ef0c08afce8b..c1f18a14147c 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,11 +33,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/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index b5622e3a2718..3e5561c7c854 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index e61c9e6fc559..56484d752446 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -24,8 +24,8 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go index df9a3065fa09..d769fba82303 100644 --- a/p2p/discover/udp.go +++ b/p2p/discover/udp.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/netutil" + "github.com/ethersocial/go-ethersocial/rlp" ) // Errors diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index aceba06e655e..754754e6a2aa 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -35,10 +35,10 @@ 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/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rlp" ) func init() { diff --git a/p2p/discv5/database.go b/p2p/discv5/database.go index 3c2d5744c383..e3524e6c2760 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/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/discv5/metrics.go b/p2p/discv5/metrics.go index cb11d7eacf07..2cbeeb31e73b 100644 --- a/p2p/discv5/metrics.go +++ b/p2p/discv5/metrics.go @@ -1,6 +1,6 @@ package discv5 -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/ethersocial/go-ethersocial/metrics" var ( ingressTrafficMeter = metrics.NewRegisteredMeter("discv5/InboundTraffic", nil) diff --git a/p2p/discv5/net.go b/p2p/discv5/net.go index de7d8de6aa40..130684c2bc88 100644 --- a/p2p/discv5/net.go +++ b/p2p/discv5/net.go @@ -24,12 +24,12 @@ 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/log" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/netutil" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/discv5/net_test.go b/p2p/discv5/net_test.go index 1a8137673d38..ede9cb64dcab 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) func TestNetwork_Lookup(t *testing.T) { diff --git a/p2p/discv5/node.go b/p2p/discv5/node.go index 57ecd9a571ad..49a6ecbbb2a3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) // Node represents a host on the network. diff --git a/p2p/discv5/node_test.go b/p2p/discv5/node_test.go index 20b37c2c6b0a..0d7b28fd0fa8 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) func ExampleNewNode() { diff --git a/p2p/discv5/ntp.go b/p2p/discv5/ntp.go index 4fb5f657ae0a..a8d923fd068a 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/ethersocial/go-ethersocial/log" ) const ( diff --git a/p2p/discv5/sim_test.go b/p2p/discv5/sim_test.go index 924f0c1e3a7d..8d2b009d7a51 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/ethersocial/go-ethersocial/common" ) // In this test, nodes try to randomly resolve each other. diff --git a/p2p/discv5/table.go b/p2p/discv5/table.go index 4f4b2426f411..b9ffad94bedd 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/ethersocial/go-ethersocial/common" ) const ( diff --git a/p2p/discv5/table_test.go b/p2p/discv5/table_test.go index a29943dab9b3..789a57de29a4 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) type nullTransport struct{} diff --git a/p2p/discv5/ticket.go b/p2p/discv5/ticket.go index ae4b18e7cd45..9f1b4c6f9c4c 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/p2p/discv5/topic.go b/p2p/discv5/topic.go index 609a41297f85..de367b311704 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/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/p2p/discv5/topic_test.go b/p2p/discv5/topic_test.go index ba79993f29e9..123aa47c2919 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" ) func TestTopicRadius(t *testing.T) { diff --git a/p2p/discv5/udp.go b/p2p/discv5/udp.go index ff5ed983bab0..f697129c3d90 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/p2p/netutil" + "github.com/ethersocial/go-ethersocial/rlp" ) const Version = 4 diff --git a/p2p/discv5/udp_test.go b/p2p/discv5/udp_test.go index c628485bf97a..6607d79ae9aa 100644 --- a/p2p/discv5/udp_test.go +++ b/p2p/discv5/udp_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) func init() { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index c1834f06995c..885b19683e5b 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f61..a13985650f2f 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index 623f8eae1847..8653ea02b5d6 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index f5e3496d6306..39923871c1ed 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -19,8 +19,8 @@ package enode import ( "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enr" ) func newLocalNodeForTesting() (*LocalNode, *DB) { diff --git a/p2p/enode/node.go b/p2p/enode/node.go index b454ab2554d5..d3d9efe01cfa 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,7 +26,7 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/enr" ) // Node represents a host on the network. diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index 861a70bd64e9..2f9fd1bc8788 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 9353b155c1cd..933f20011c97 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 50e9485d04c4..bf3f399dc3d4 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p/enr" ) var incompleteNodeURL = regexp.MustCompile("(?i)^(?:enode://)?([0-9a-f]+)$") diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 444820c15857..f37b9c70795d 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/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 7431664a19cb..b0fc06fd7513 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 347990ab64fb..d4734bba11a5 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index ac12666e4178..2c48a55b25a4 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/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index 8df82bb074c3..473c9935e5d3 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -25,11 +25,11 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enode" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" ) const ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 8fad921c48d2..b85c56fdab31 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/ethersocial/go-ethersocial/log" "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index b9cbd5e1caa9..a0357cabea01 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ethersocial/go-ethersocial/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index a9a2998a6528..560f692368f6 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/ethersocial/go-ethersocial/common/mclock" ) const ( diff --git a/p2p/peer.go b/p2p/peer.go index af019d07a897..120bec2ff0a1 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -25,12 +25,12 @@ 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/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/rlp" ) var ( diff --git a/p2p/protocol.go b/p2p/protocol.go index 9438ab8e47dd..05d92e464629 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,8 @@ package p2p import ( "fmt" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/protocols/accounting.go b/p2p/protocols/accounting.go index 558247254aee..e84bb0958e26 100644 --- a/p2p/protocols/accounting.go +++ b/p2p/protocols/accounting.go @@ -19,7 +19,7 @@ package protocols import ( "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/metrics" ) // define some metrics diff --git a/p2p/protocols/accounting_simulation_test.go b/p2p/protocols/accounting_simulation_test.go index e90a1d81d255..9868c4c6ee6e 100644 --- a/p2p/protocols/accounting_simulation_test.go +++ b/p2p/protocols/accounting_simulation_test.go @@ -31,14 +31,14 @@ import ( "github.com/mattn/go-colorable" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rpc" + + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) const ( diff --git a/p2p/protocols/accounting_test.go b/p2p/protocols/accounting_test.go index 3810ae2c9b55..77a8c960e5d6 100644 --- a/p2p/protocols/accounting_test.go +++ b/p2p/protocols/accounting_test.go @@ -19,9 +19,9 @@ package protocols import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rlp" ) //dummy Balance implementation diff --git a/p2p/protocols/protocol.go b/p2p/protocols/protocol.go index bf879b9851a8..01e3e3cf879b 100644 --- a/p2p/protocols/protocol.go +++ b/p2p/protocols/protocol.go @@ -38,12 +38,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/tracing" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go index 4bc1e547ee2e..6e1520f627b5 100644 --- a/p2p/protocols/protocol_test.go +++ b/p2p/protocols/protocol_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/rlp" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" ) // handshake message type diff --git a/p2p/protocols/reporter.go b/p2p/protocols/reporter.go index 215d4fe31b96..6f69f3e091f3 100644 --- a/p2p/protocols/reporter.go +++ b/p2p/protocols/reporter.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/p2p/protocols/reporter_test.go b/p2p/protocols/reporter_test.go index c5c025d20e9f..828c8ce41694 100644 --- a/p2p/protocols/reporter_test.go +++ b/p2p/protocols/reporter_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) //TestReporter tests that the metrics being collected for p2p accounting diff --git a/p2p/rlpx.go b/p2p/rlpx.go index 67cc1d9bf316..713072e7efa1 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -35,11 +35,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "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/rlp" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/crypto/secp256k1" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/golang/snappy" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx_test.go b/p2p/rlpx_test.go index 5d89818020aa..143c03a5cdc7 100644 --- a/p2p/rlpx_test.go +++ b/p2p/rlpx_test.go @@ -32,10 +32,10 @@ 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/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/p2p/simulations/pipes" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/server.go b/p2p/server.go index 566f01ffc5dd..7086f1255741 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -28,18 +28,18 @@ import ( "sync/atomic" "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/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/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/mclock" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/discover" + "github.com/ethersocial/go-ethersocial/p2p/discv5" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/p2p/netutil" + "github.com/ethersocial/go-ethersocial/rlp" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index f665c142453a..21f323097a8a 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/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" "golang.org/x/crypto/sha3" ) diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 9b588db1be21..d9dcd62194a7 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/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" "golang.org/x/net/websocket" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index eada9579ed0a..6b07437072ba 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -23,13 +23,13 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/pipes" + "github.com/ethersocial/go-ethersocial/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index e1e092f6e14d..59af30723822 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/ethersocial/go-ethersocial/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 6681726e40b6..384704f73abb 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -26,11 +26,11 @@ import ( "strconv" "github.com/docker/docker/pkg/reexec" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" ) // Node represents a node in a simulation network which is created by a diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c133..858e23904422 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 32d18347d83a..069e14ec0c43 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index cde2f3a677e2..ba2908dbcae8 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/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/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 1f44cc66753a..1dbb8da6aabb 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/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/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 ed43c0ed76a2..e8022f0374bd 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "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/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rpc" "github.com/mattn/go-colorable" ) diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 8ce777a0103f..09b6f44b298a 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) //a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 069040257ed0..6194f61acaea 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/enode" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 2049a5108e23..4813773924da 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -26,11 +26,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/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/event" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 8b644ffb0fc6..04a40e13ee7d 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index ae62c42b9c2d..d2e4f37b0087 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index beeb414e41b3..ae5a9a0f2068 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -3,10 +3,10 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enr" + "github.com/ethersocial/go-ethersocial/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/testing/peerpool.go b/p2p/testing/peerpool.go index 01ccce67eb80..cdb204c789b0 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/enode" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) type TestPeer interface { diff --git a/p2p/testing/protocolsession.go b/p2p/testing/protocolsession.go index 476c2a9840c5..d80b67c59d31 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/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) var errTimedOut = errors.New("timed out") diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go index cbd8ce6fe5ba..b52daf97de31 100644 --- a/p2p/testing/protocoltester.go +++ b/p2p/testing/protocoltester.go @@ -31,14 +31,14 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "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/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" ) // ProtocolTester is the tester environment used for unit testing protocol diff --git a/params/config.go b/params/config.go index 956ba7f7f837..9ffb4885ade2 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/ethersocial/go-ethersocial/common" ) // Genesis hashes to enforce below configs on. diff --git a/params/dao.go b/params/dao.go index da3c8dfc992b..3a7fade7429c 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/ethersocial/go-ethersocial/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/params/version.go b/params/version.go index e3815aaf0d12..ed7a236f7467 100644 --- a/params/version.go +++ b/params/version.go @@ -21,9 +21,9 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 8 // Minor version component of the current release - VersionPatch = 23 // Patch version component of the current release + VersionMajor = 0 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 12 // Patch version component of the current release VersionMeta = "stable" // Version metadata to append to the version string ) diff --git a/rpc/client.go b/rpc/client.go index 6254c95ffd96..872e5a9c9f5d 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/ethersocial/go-ethersocial/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 3bb8717b8061..510c0878d708 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/ethersocial/go-ethersocial/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index a8195c0af8de..6d49031f6f94 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/ethersocial/go-ethersocial/log" ) func TestClientRequest(t *testing.T) { diff --git a/rpc/endpoints.go b/rpc/endpoints.go index 8ca6d4eb0c6d..0c59a3a5b684 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -19,7 +19,7 @@ package rpc import ( "net" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) // StartHTTPEndpoint starts the HTTP RPC endpoint, configured with cors/vhosts/modules diff --git a/rpc/http.go b/rpc/http.go index 674166fb3af5..b60d0c3bf931 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,7 +31,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" "github.com/rs/cors" ) diff --git a/rpc/ipc.go b/rpc/ipc.go index 4cce1cf74b5d..5a8942049e52 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index 707b47fd77a9..374e76e4dad2 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -25,7 +25,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) /* diff --git a/rpc/json.go b/rpc/json.go index a523eeb8efb6..6004642c3cd7 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) const ( diff --git a/rpc/server.go b/rpc/server.go index 214e1d3ed9b9..2ba7afb569ef 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -26,7 +26,7 @@ import ( "sync/atomic" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) const MetadataApi = "rpc" diff --git a/rpc/types.go b/rpc/types.go index 4252c3602762..c5c81fa382de 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -24,7 +24,7 @@ import ( "sync" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 68b6d3c54f6a..acdd0361df99 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/ethersocial/go-ethersocial/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index eae8320e5677..58384b7047a2 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -31,7 +31,7 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" "golang.org/x/net/websocket" ) diff --git a/signer/core/abihelper.go b/signer/core/abihelper.go index 0fef24939549..3180056f6d25 100644 --- a/signer/core/abihelper.go +++ b/signer/core/abihelper.go @@ -22,8 +22,8 @@ import ( "io/ioutil" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/common" "bytes" "os" diff --git a/signer/core/abihelper_test.go b/signer/core/abihelper_test.go index 878210be1f21..5cb106be0f42 100644 --- a/signer/core/abihelper_test.go +++ b/signer/core/abihelper_test.go @@ -25,8 +25,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/accounts/abi" + "github.com/ethersocial/go-ethersocial/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/core/api.go b/signer/core/api.go index e9a3357855b8..adcc53ec2d62 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -25,15 +25,15 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/accounts/usbwallet" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" ) // numberOfAccountsToDerive For hardware wallets, the number of accounts to derive diff --git a/signer/core/api_test.go b/signer/core/api_test.go index a8aa23896e6c..f8a49b3f7b5a 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -28,13 +28,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/accounts/keystore" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/rlp" ) //Used for testing diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index 1f9c90918594..b2c8b955e1c5 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" ) type AuditLogger struct { diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 940f1f43aadb..a2534aba9ef4 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,9 +25,9 @@ import ( "sync" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index 64032386fcf1..9526c1a5f046 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -21,9 +21,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rpc" ) type StdIOUI struct { diff --git a/signer/core/types.go b/signer/core/types.go index 128055774858..97bb9620443c 100644 --- a/signer/core/types.go +++ b/signer/core/types.go @@ -23,10 +23,10 @@ import ( "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" ) type Accounts []Account diff --git a/signer/core/validation.go b/signer/core/validation.go index 7c3ec4274142..3b365c4f313f 100644 --- a/signer/core/validation.go +++ b/signer/core/validation.go @@ -23,7 +23,7 @@ import ( "math/big" "regexp" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) // The validation package contains validation checks for transactions diff --git a/signer/core/validation_test.go b/signer/core/validation_test.go index 155b25e92c6c..d558dfaf960f 100644 --- a/signer/core/validation_test.go +++ b/signer/core/validation_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) func hexAddr(a string) common.Address { return common.BytesToAddress(common.FromHex(a)) } diff --git a/signer/rules/rules.go b/signer/rules/rules.go index 07c34db2202a..32b8fe583762 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -22,12 +22,12 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/rules/deps" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/signer/core" + "github.com/ethersocial/go-ethersocial/signer/rules/deps" + "github.com/ethersocial/go-ethersocial/signer/storage" "github.com/robertkrimen/otto" ) diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index 0b520a15bfcd..cbb166c45b78 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,13 +22,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/ethersocial/go-ethersocial/accounts" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/internal/ethapi" + "github.com/ethersocial/go-ethersocial/signer/core" + "github.com/ethersocial/go-ethersocial/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 900831867914..ca343bef2004 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -26,7 +26,7 @@ import ( "io/ioutil" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index a421a8449d7d..95d4a09617df 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,8 +23,8 @@ import ( "io/ioutil" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" "github.com/mattn/go-colorable" ) diff --git a/swarm/api/act.go b/swarm/api/act.go index 9566720b0331..d293f4e0de21 100644 --- a/swarm/api/act.go +++ b/swarm/api/act.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/sctx" + "github.com/ethersocial/go-ethersocial/swarm/storage" "golang.org/x/crypto/scrypt" "golang.org/x/crypto/sha3" cli "gopkg.in/urfave/cli.v1" diff --git a/swarm/api/api.go b/swarm/api/api.go index c6ca1b57742e..e39bf3114fae 100644 --- a/swarm/api/api.go +++ b/swarm/api/api.go @@ -37,15 +37,15 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/ens" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/api/api_test.go b/swarm/api/api_test.go index eb896f32aab7..2b0193ceac8f 100644 --- a/swarm/api/api_test.go +++ b/swarm/api/api_test.go @@ -28,11 +28,11 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/sctx" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) func init() { diff --git a/swarm/api/client/client.go b/swarm/api/client/client.go index 5e293cca72a2..410958be2f4e 100644 --- a/swarm/api/client/client.go +++ b/swarm/api/client/client.go @@ -37,11 +37,11 @@ import ( "strings" "time" - "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/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" "github.com/pborman/uuid" ) diff --git a/swarm/api/client/client_test.go b/swarm/api/client/client_test.go index 39f6e4797db4..c4e53bde258e 100644 --- a/swarm/api/client/client_test.go +++ b/swarm/api/client/client_test.go @@ -25,14 +25,14 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/api" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" + + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarmhttp "github.com/ethersocial/go-ethersocial/swarm/api/http" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" ) func serverFunc(api *api.API) swarmhttp.TestServer { diff --git a/swarm/api/config.go b/swarm/api/config.go index b8de16f5f01f..d390abff8b1a 100644 --- a/swarm/api/config.go +++ b/swarm/api/config.go @@ -23,16 +23,16 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/services/swap" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/ens" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pss" + "github.com/ethersocial/go-ethersocial/swarm/services/swap" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index bd7e1d870500..fce89aa3a1bb 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) func TestConfig(t *testing.T) { diff --git a/swarm/api/encrypt.go b/swarm/api/encrypt.go index 0d516b3d574a..1d38078eff16 100644 --- a/swarm/api/encrypt.go +++ b/swarm/api/encrypt.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "errors" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/ethersocial/go-ethersocial/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/api/filesystem.go b/swarm/api/filesystem.go index 266ef71bec38..9d47d422fc73 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/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const maxParallelFiles = 5 diff --git a/swarm/api/filesystem_test.go b/swarm/api/filesystem_test.go index 02f5bff6583d..c5bfecdda32b 100644 --- a/swarm/api/filesystem_test.go +++ b/swarm/api/filesystem_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) var testDownloadDir, _ = ioutil.TempDir(os.TempDir(), "bzz-test") diff --git a/swarm/api/http/middleware.go b/swarm/api/http/middleware.go index 320da3046293..41c6284ff87c 100644 --- a/swarm/api/http/middleware.go +++ b/swarm/api/http/middleware.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/sctx" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/sctx" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" "github.com/pborman/uuid" ) diff --git a/swarm/api/http/response.go b/swarm/api/http/response.go index d4e81d7f67ea..ab5679a658d0 100644 --- a/swarm/api/http/response.go +++ b/swarm/api/http/response.go @@ -24,9 +24,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/api" ) var ( diff --git a/swarm/api/http/roundtripper.go b/swarm/api/http/roundtripper.go index be8ea39856eb..bd25f15a283c 100644 --- a/swarm/api/http/roundtripper.go +++ b/swarm/api/http/roundtripper.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) /* @@ -29,8 +29,8 @@ see https://github.com/ethereum/go-ethereum/issues/2040 Usage: import ( - "github.com/ethereum/go-ethereum/common/httpclient" - "github.com/ethereum/go-ethereum/swarm/api/http" + "github.com/ethersocial/go-ethersocial/common/httpclient" + "github.com/ethersocial/go-ethersocial/swarm/api/http" ) client := httpclient.New() // for (private) swarm proxy running locally diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index b8dafab0b79d..c311e9ad6555 100644 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -3,8 +3,8 @@ package http import ( "context" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/sctx" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/sctx" ) type uriKey struct{} diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go index 3c6735a73e80..34be6ff10675 100644 --- a/swarm/api/http/server.go +++ b/swarm/api/http/server.go @@ -35,12 +35,12 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" "github.com/rs/cors" ) diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go index e82762ce0585..0855f25c212c 100644 --- a/swarm/api/http/server_test.go +++ b/swarm/api/http/server_test.go @@ -37,17 +37,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" - - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" + + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/api" + swarm "github.com/ethersocial/go-ethersocial/swarm/api/client" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) func init() { diff --git a/swarm/api/http/templates.go b/swarm/api/http/templates.go index 986f5f8873d3..e26eeaec6a0d 100644 --- a/swarm/api/http/templates.go +++ b/swarm/api/http/templates.go @@ -22,7 +22,7 @@ import ( "html/template" "path" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/api" ) type htmlListData struct { diff --git a/swarm/api/http/test_server.go b/swarm/api/http/test_server.go index 9245c9c5b8db..6390a8566056 100644 --- a/swarm/api/http/test_server.go +++ b/swarm/api/http/test_server.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" ) type TestServer interface { diff --git a/swarm/api/inspector.go b/swarm/api/inspector.go index 6706b32e6529..4752eb87635d 100644 --- a/swarm/api/inspector.go +++ b/swarm/api/inspector.go @@ -19,8 +19,8 @@ package api import ( "context" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) type Inspector struct { diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go index 890ed88bd4a6..8cbe01a2dee3 100644 --- a/swarm/api/manifest.go +++ b/swarm/api/manifest.go @@ -27,11 +27,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/api/manifest_test.go b/swarm/api/manifest_test.go index 1c8e53c43308..3c4ac81bbf38 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/ethersocial/go-ethersocial/swarm/storage" ) func manifest(paths ...string) (manifestReader storage.LazySectionReader) { diff --git a/swarm/api/storage.go b/swarm/api/storage.go index 254375b7770e..a75ba8439ba6 100644 --- a/swarm/api/storage.go +++ b/swarm/api/storage.go @@ -20,7 +20,7 @@ import ( "context" "path" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) type Response struct { diff --git a/swarm/api/uri.go b/swarm/api/uri.go index 09cfa450202e..b3fd192563a6 100644 --- a/swarm/api/uri.go +++ b/swarm/api/uri.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) //matches hex swarm hashes diff --git a/swarm/api/uri_test.go b/swarm/api/uri_test.go index a03874c433ca..617d1a5c74e2 100644 --- a/swarm/api/uri_test.go +++ b/swarm/api/uri_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) func TestParseURI(t *testing.T) { diff --git a/swarm/bmt/bmt_test.go b/swarm/bmt/bmt_test.go index ab712d08c2da..069fabf2f6fc 100644 --- a/swarm/bmt/bmt_test.go +++ b/swarm/bmt/bmt_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go index 7f66451f1035..52c0639d37c7 100644 --- a/swarm/fuse/fuse_dir.go +++ b/swarm/fuse/fuse_dir.go @@ -25,7 +25,7 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" "golang.org/x/net/context" ) diff --git a/swarm/fuse/fuse_file.go b/swarm/fuse/fuse_file.go index ca04f737e2a7..02441897412f 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/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" "golang.org/x/net/context" ) diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go index c7aa983b7dce..7b72baa29f98 100644 --- a/swarm/fuse/swarmfs.go +++ b/swarm/fuse/swarmfs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/api" ) const ( diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 460e31c4e9af..bfe42b1d6134 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -29,10 +29,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/testutil" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index 9ff55cc324f7..fdab29e10ed7 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -30,9 +30,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/log" ) var ( diff --git a/swarm/fuse/swarmfs_util.go b/swarm/fuse/swarmfs_util.go index 4f2e1416b615..4a9f3db28d17 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/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) func externalUnmount(mountPoint string) error { diff --git a/swarm/log/log.go b/swarm/log/log.go index ce372632e81d..5c2720421a49 100644 --- a/swarm/log/log.go +++ b/swarm/log/log.go @@ -1,8 +1,8 @@ package log import ( - l "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + l "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" ) const ( diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go index d348dc3e4d45..22fc0651580b 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" - gethmetrics "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/cmd/utils" + gethmetrics "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/metrics/influxdb" + "github.com/ethersocial/go-ethersocial/swarm/log" cli "gopkg.in/urfave/cli.v1" ) diff --git a/swarm/network/discovery.go b/swarm/network/discovery.go index 4c503047a5b4..e81d6c0c8936 100644 --- a/swarm/network/discovery.go +++ b/swarm/network/discovery.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/ethersocial/go-ethersocial/swarm/pot" ) // discovery bzz extension for requesting and relaying node address records diff --git a/swarm/network/discovery_test.go b/swarm/network/discovery_test.go index dd3299c0f1d6..cced4e21262c 100644 --- a/swarm/network/discovery_test.go +++ b/swarm/network/discovery_test.go @@ -19,7 +19,7 @@ package network import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" ) /*** diff --git a/swarm/network/fetcher.go b/swarm/network/fetcher.go index 6b21751669e3..92d43c4a9082 100644 --- a/swarm/network/fetcher.go +++ b/swarm/network/fetcher.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/network/fetcher_test.go b/swarm/network/fetcher_test.go index 4e464f10f356..df047144dd51 100644 --- a/swarm/network/fetcher_test.go +++ b/swarm/network/fetcher_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/enode" ) var requestedPeerID = enode.HexID("3431c3939e1ee2a6345e976a8234f9870152d64879f30bc272a074f6859e75e8") diff --git a/swarm/network/hive.go b/swarm/network/hive.go index a0b6b988abe2..ef0642aa73c2 100644 --- a/swarm/network/hive.go +++ b/swarm/network/hive.go @@ -21,11 +21,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/state" ) /* diff --git a/swarm/network/hive_test.go b/swarm/network/hive_test.go index fea4347ead43..b41eaab1bde2 100644 --- a/swarm/network/hive_test.go +++ b/swarm/network/hive_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/state" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" + "github.com/ethersocial/go-ethersocial/swarm/state" ) func newHiveTester(t *testing.T, params *HiveParams, n int, store state.Store) (*bzzTester, *Hive) { diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go index 146f39106769..a6e3b4a2f2f3 100644 --- a/swarm/network/kademlia.go +++ b/swarm/network/kademlia.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pot" - sv "github.com/ethereum/go-ethereum/swarm/version" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/pot" + sv "github.com/ethersocial/go-ethersocial/swarm/version" ) /* diff --git a/swarm/network/kademlia_test.go b/swarm/network/kademlia_test.go index b4663eee5ef8..43e923a8bcf8 100644 --- a/swarm/network/kademlia_test.go +++ b/swarm/network/kademlia_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/pot" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/swarm/pot" ) func init() { diff --git a/swarm/network/networkid_test.go b/swarm/network/networkid_test.go index 9d47cf9f6a35..abc0555842c1 100644 --- a/swarm/network/networkid_test.go +++ b/swarm/network/networkid_test.go @@ -26,13 +26,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rpc" ) var ( diff --git a/swarm/network/priorityqueue/priorityqueue.go b/swarm/network/priorityqueue/priorityqueue.go index 5385026054ac..d162d2eddd4d 100644 --- a/swarm/network/priorityqueue/priorityqueue.go +++ b/swarm/network/priorityqueue/priorityqueue.go @@ -29,7 +29,7 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" ) var ( diff --git a/swarm/network/protocol.go b/swarm/network/protocol.go index 6567355bf711..f45e72b153af 100644 --- a/swarm/network/protocol.go +++ b/swarm/network/protocol.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/state" ) const ( diff --git a/swarm/network/protocol_test.go b/swarm/network/protocol_test.go index 64ce7ba4ab7f..c0683f8d8e53 100644 --- a/swarm/network/protocol_test.go +++ b/swarm/network/protocol_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" ) const ( diff --git a/swarm/network/simulation/bucket.go b/swarm/network/simulation/bucket.go index 49a1f43091cd..ddf6c31d480a 100644 --- a/swarm/network/simulation/bucket.go +++ b/swarm/network/simulation/bucket.go @@ -16,7 +16,7 @@ package simulation -import "github.com/ethereum/go-ethereum/p2p/enode" +import "github.com/ethersocial/go-ethersocial/p2p/enode" // BucketKey is the type that should be used for keys in simulation buckets. type BucketKey string diff --git a/swarm/network/simulation/bucket_test.go b/swarm/network/simulation/bucket_test.go index 2273d35a2986..18e13febb7a8 100644 --- a/swarm/network/simulation/bucket_test.go +++ b/swarm/network/simulation/bucket_test.go @@ -20,8 +20,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) // TestServiceBucket tests all bucket functionality using subtests. diff --git a/swarm/network/simulation/events.go b/swarm/network/simulation/events.go index d73c3af4eeab..5bf47d94ad73 100644 --- a/swarm/network/simulation/events.go +++ b/swarm/network/simulation/events.go @@ -20,8 +20,8 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" ) // PeerEvent is the type of the channel returned by Simulation.PeerEvents. diff --git a/swarm/network/simulation/example_test.go b/swarm/network/simulation/example_test.go index 9d1492979563..2715b36e59d7 100644 --- a/swarm/network/simulation/example_test.go +++ b/swarm/network/simulation/example_test.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" ) // Every node can have a Kademlia associated using the node bucket under diff --git a/swarm/network/simulation/http.go b/swarm/network/simulation/http.go index 69ae3baec289..faf62ef1d1a7 100644 --- a/swarm/network/simulation/http.go +++ b/swarm/network/simulation/http.go @@ -20,8 +20,8 @@ import ( "fmt" "net/http" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/simulations" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/simulations" ) // Package defaults. diff --git a/swarm/network/simulation/http_test.go b/swarm/network/simulation/http_test.go index dffd03a03279..2c9e085c75d3 100644 --- a/swarm/network/simulation/http_test.go +++ b/swarm/network/simulation/http_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) func TestSimulationWithHTTPServer(t *testing.T) { diff --git a/swarm/network/simulation/kademlia.go b/swarm/network/simulation/kademlia.go index c58d402b0942..b681cf6789eb 100644 --- a/swarm/network/simulation/kademlia.go +++ b/swarm/network/simulation/kademlia.go @@ -21,10 +21,10 @@ import ( "encoding/hex" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/network" ) // BucketKeyKademlia is the key to be used for storing the kademlia diff --git a/swarm/network/simulation/kademlia_test.go b/swarm/network/simulation/kademlia_test.go index 36b244d3d0c4..e16e6985bb4f 100644 --- a/swarm/network/simulation/kademlia_test.go +++ b/swarm/network/simulation/kademlia_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" ) func TestWaitTillHealthy(t *testing.T) { diff --git a/swarm/network/simulation/node.go b/swarm/network/simulation/node.go index 24afe51a4151..2aa4a5a07847 100644 --- a/swarm/network/simulation/node.go +++ b/swarm/network/simulation/node.go @@ -24,10 +24,10 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) // NodeIDs returns NodeIDs for all nodes in the network. diff --git a/swarm/network/simulation/node_test.go b/swarm/network/simulation/node_test.go index bae5afb26081..a04c7f70dd2b 100644 --- a/swarm/network/simulation/node_test.go +++ b/swarm/network/simulation/node_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" ) func TestUpDownNodeIDs(t *testing.T) { diff --git a/swarm/network/simulation/service.go b/swarm/network/simulation/service.go index 0ac8149a94be..368400674385 100644 --- a/swarm/network/simulation/service.go +++ b/swarm/network/simulation/service.go @@ -17,9 +17,9 @@ package simulation import ( - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" ) // Service returns a single Service by name on a particular node diff --git a/swarm/network/simulation/simulation.go b/swarm/network/simulation/simulation.go index e18d19a67c22..845dfb31cc67 100644 --- a/swarm/network/simulation/simulation.go +++ b/swarm/network/simulation/simulation.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" ) // Common errors that are returned by functions in this package. diff --git a/swarm/network/simulation/simulation_test.go b/swarm/network/simulation/simulation_test.go index 1d0338f593fe..8f754d85ed89 100644 --- a/swarm/network/simulation/simulation_test.go +++ b/swarm/network/simulation/simulation_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index 5227de3bb584..024f700474b2 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay.go b/swarm/network/simulations/overlay.go index 63938809e4f3..72b682d106ef 100644 --- a/swarm/network/simulations/overlay.go +++ b/swarm/network/simulations/overlay.go @@ -27,13 +27,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/simulations/overlay_test.go b/swarm/network/simulations/overlay_test.go index 41ed5ed265bd..cd828f1b8ba8 100644 --- a/swarm/network/simulations/overlay_test.go +++ b/swarm/network/simulations/overlay_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/swarm/log" ) var ( diff --git a/swarm/network/stream/common_test.go b/swarm/network/stream/common_test.go index afd08d275498..7e5920423058 100644 --- a/swarm/network/stream/common_test.go +++ b/swarm/network/stream/common_test.go @@ -30,16 +30,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + mockmem "github.com/ethersocial/go-ethersocial/swarm/storage/mock/mem" + "github.com/ethersocial/go-ethersocial/swarm/testutil" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index fae6994f0c01..e51753d61456 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -21,12 +21,12 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go index 49e4a423a746..4a4d4b2b2618 100644 --- a/swarm/network/stream/delivery_test.go +++ b/swarm/network/stream/delivery_test.go @@ -25,19 +25,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + pq "github.com/ethersocial/go-ethersocial/swarm/network/priorityqueue" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) //Tests initializing a retrieve request diff --git a/swarm/network/stream/intervals/dbstore_test.go b/swarm/network/stream/intervals/dbstore_test.go index 6716e593ab00..a85999eee662 100644 --- a/swarm/network/stream/intervals/dbstore_test.go +++ b/swarm/network/stream/intervals/dbstore_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/state" ) // TestDBStore tests basic functionality of DBStore. diff --git a/swarm/network/stream/intervals/store_test.go b/swarm/network/stream/intervals/store_test.go index a36814b71741..3bb6f34de46a 100644 --- a/swarm/network/stream/intervals/store_test.go +++ b/swarm/network/stream/intervals/store_test.go @@ -19,7 +19,7 @@ package intervals import ( "testing" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/state" ) // TestInmemoryStore tests basic functionality of InmemoryStore. diff --git a/swarm/network/stream/intervals_test.go b/swarm/network/stream/intervals_test.go index 009a941ef45f..c93c0ab3b878 100644 --- a/swarm/network/stream/intervals_test.go +++ b/swarm/network/stream/intervals_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) func TestIntervalsLive(t *testing.T) { diff --git a/swarm/network/stream/lightnode_test.go b/swarm/network/stream/lightnode_test.go index 501660fab4b9..978d2b4a2506 100644 --- a/swarm/network/stream/lightnode_test.go +++ b/swarm/network/stream/lightnode_test.go @@ -18,7 +18,7 @@ package stream import ( "testing" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" ) // This test checks the default behavior of the server, that is diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index de4e8a3bb4a1..f6c8dd3036c5 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - bv "github.com/ethereum/go-ethereum/swarm/network/bitvector" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" + bv "github.com/ethersocial/go-ethersocial/swarm/network/bitvector" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/peer.go b/swarm/network/stream/peer.go index 68da8f44ad41..6fb2d6c30f12 100644 --- a/swarm/network/stream/peer.go +++ b/swarm/network/stream/peer.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - pq "github.com/ethereum/go-ethereum/swarm/network/priorityqueue" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/spancontext" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/swarm/log" + pq "github.com/ethersocial/go-ethersocial/swarm/network/priorityqueue" + "github.com/ethersocial/go-ethersocial/swarm/network/stream/intervals" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" opentracing "github.com/opentracing/opentracing-go" ) diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go index afb023ae295d..ed75d7b05824 100644 --- a/swarm/network/stream/snapshot_retrieval_test.go +++ b/swarm/network/stream/snapshot_retrieval_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) //constants for random file generation diff --git a/swarm/network/stream/snapshot_sync_test.go b/swarm/network/stream/snapshot_sync_test.go index b45d0aed5080..385fe5289095 100644 --- a/swarm/network/stream/snapshot_sync_test.go +++ b/swarm/network/stream/snapshot_sync_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - mockmem "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/pot" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" + mockmem "github.com/ethersocial/go-ethersocial/swarm/storage/mock/mem" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) const MaxTimeout = 600 diff --git a/swarm/network/stream/stream.go b/swarm/network/stream/stream.go index cb5912185002..c7959a0417ef 100644 --- a/swarm/network/stream/stream.go +++ b/swarm/network/stream/stream.go @@ -25,16 +25,16 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream/intervals" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/stream/intervals" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/network/stream/streamer_test.go b/swarm/network/stream/streamer_test.go index e92ee378343f..f931346259ea 100644 --- a/swarm/network/stream/streamer_test.go +++ b/swarm/network/stream/streamer_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - p2ptest "github.com/ethereum/go-ethereum/p2p/testing" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + p2ptest "github.com/ethersocial/go-ethersocial/p2p/testing" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" "golang.org/x/crypto/sha3" ) diff --git a/swarm/network/stream/syncer.go b/swarm/network/stream/syncer.go index 4fb8b9342b7c..b5b13e6be05a 100644 --- a/swarm/network/stream/syncer.go +++ b/swarm/network/stream/syncer.go @@ -21,9 +21,9 @@ import ( "strconv" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/network/stream/syncer_test.go b/swarm/network/stream/syncer_test.go index be0752a9d02e..65d3abe1a862 100644 --- a/swarm/network/stream/syncer_test.go +++ b/swarm/network/stream/syncer_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) const dataChunkCount = 200 diff --git a/swarm/network/stream/visualized_snapshot_sync_sim_test.go b/swarm/network/stream/visualized_snapshot_sync_sim_test.go index cf4405ec1a31..6c8aca03accb 100644 --- a/swarm/network/stream/visualized_snapshot_sync_sim_test.go +++ b/swarm/network/stream/visualized_snapshot_sync_sim_test.go @@ -28,17 +28,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) /* diff --git a/swarm/network_test.go b/swarm/network_test.go index 71d4b8f16a1a..563d112e810c 100644 --- a/swarm/network_test.go +++ b/swarm/network_test.go @@ -28,14 +28,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/api" - "github.com/ethereum/go-ethereum/swarm/network/simulation" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/api" + "github.com/ethersocial/go-ethersocial/swarm/network/simulation" + "github.com/ethersocial/go-ethersocial/swarm/storage" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/pot/address.go b/swarm/pot/address.go index 91cada2e8873..b00ed6df8d87 100644 --- a/swarm/pot/address.go +++ b/swarm/pot/address.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) var ( diff --git a/swarm/pot/pot_test.go b/swarm/pot/pot_test.go index 83d604919fc5..c395a7a08f05 100644 --- a/swarm/pot/pot_test.go +++ b/swarm/pot/pot_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) const ( diff --git a/swarm/pss/api.go b/swarm/pss/api.go index 4556d7b7c4a4..0d4c6ee3b6da 100644 --- a/swarm/pss/api.go +++ b/swarm/pss/api.go @@ -21,11 +21,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" ) // Wrapper for receiving pss messages when using the pss API diff --git a/swarm/pss/client/client.go b/swarm/pss/client/client.go index 5ee387aa7918..39cff0e3b275 100644 --- a/swarm/pss/client/client.go +++ b/swarm/pss/client/client.go @@ -25,14 +25,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/pss" ) const ( diff --git a/swarm/pss/client/client_test.go b/swarm/pss/client/client_test.go index 1c6f2e522dc2..6f748a846006 100644 --- a/swarm/pss/client/client_test.go +++ b/swarm/pss/client/client_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pss" + "github.com/ethersocial/go-ethersocial/swarm/state" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) type protoCtrl struct { diff --git a/swarm/pss/forwarding_test.go b/swarm/pss/forwarding_test.go index 746d4dc40451..e49971d927f3 100644 --- a/swarm/pss/forwarding_test.go +++ b/swarm/pss/forwarding_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pot" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) type testCase struct { diff --git a/swarm/pss/handshake.go b/swarm/pss/handshake.go index bb67b51563f2..bcbda239bbc6 100644 --- a/swarm/pss/handshake.go +++ b/swarm/pss/handshake.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" ) const ( diff --git a/swarm/pss/handshake_test.go b/swarm/pss/handshake_test.go index 895163f301bf..aad7394a6d1f 100644 --- a/swarm/pss/handshake_test.go +++ b/swarm/pss/handshake_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) // asymmetrical key exchange between two directly connected peers diff --git a/swarm/pss/keystore.go b/swarm/pss/keystore.go index 510d21bcfdc6..4efbb96d6372 100644 --- a/swarm/pss/keystore.go +++ b/swarm/pss/keystore.go @@ -22,11 +22,11 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) type KeyStore struct { diff --git a/swarm/pss/notify/notify.go b/swarm/pss/notify/notify.go index e9d40dc321e1..f661350d3662 100644 --- a/swarm/pss/notify/notify.go +++ b/swarm/pss/notify/notify.go @@ -5,12 +5,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/pss" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/pss" ) const ( diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go index bd9b2a4c1bc4..823170bd71f5 100644 --- a/swarm/pss/notify/notify_test.go +++ b/swarm/pss/notify/notify_test.go @@ -9,17 +9,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pss" + "github.com/ethersocial/go-ethersocial/swarm/state" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) var ( diff --git a/swarm/pss/ping.go b/swarm/pss/ping.go index ff635f40a444..97413e165a0b 100644 --- a/swarm/pss/ping.go +++ b/swarm/pss/ping.go @@ -23,9 +23,9 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/swarm/log" ) // Generic ping protocol implementation for diff --git a/swarm/pss/protocol.go b/swarm/pss/protocol.go index 7f186f615325..1c2e79486953 100644 --- a/swarm/pss/protocol.go +++ b/swarm/pss/protocol.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/log" ) const ( diff --git a/swarm/pss/protocol_test.go b/swarm/pss/protocol_test.go index 520c48a2024c..5b2e86590851 100644 --- a/swarm/pss/protocol_test.go +++ b/swarm/pss/protocol_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/log" ) type protoCtrl struct { diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go index 183aab04d2c4..0c04a8073160 100644 --- a/swarm/pss/pss.go +++ b/swarm/pss/pss.go @@ -27,18 +27,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pot" + "github.com/ethersocial/go-ethersocial/swarm/storage" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" "golang.org/x/crypto/sha3" ) diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go index 675b4cfcd649..05f2ee7c5b3b 100644 --- a/swarm/pss/pss_test.go +++ b/swarm/pss/pss_test.go @@ -34,23 +34,23 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/pot" - "github.com/ethereum/go-ethereum/swarm/state" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/metrics/influxdb" + "github.com/ethersocial/go-ethersocial/node" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/p2p/simulations" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/pot" + "github.com/ethersocial/go-ethersocial/swarm/state" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) var ( diff --git a/swarm/pss/types.go b/swarm/pss/types.go index 2ce1f5cfb06e..f7ffb8137d21 100644 --- a/swarm/pss/types.go +++ b/swarm/pss/types.go @@ -21,12 +21,12 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/storage" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/storage" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) const ( diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index 91fa54fcf034..df4e9c876dc1 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -27,14 +27,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/chequebook/contract" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/services/swap/swap" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/chequebook" + "github.com/ethersocial/go-ethersocial/contracts/chequebook/contract" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/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 0afca9ab30a8..20b23268987a 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/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/services/swap/swap/swap_test.go b/swarm/services/swap/swap/swap_test.go index d0e34f8a54cb..793a59ac6d9d 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/ethersocial/go-ethersocial/common" ) type testInPayment struct { diff --git a/swarm/shed/db.go b/swarm/shed/db.go index d4e5d1b2313b..e28f1b9d5c46 100644 --- a/swarm/shed/db.go +++ b/swarm/shed/db.go @@ -29,8 +29,8 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/shed/example_store_test.go b/swarm/shed/example_store_test.go index 9a83855e70c1..30dbdfa95372 100644 --- a/swarm/shed/example_store_test.go +++ b/swarm/shed/example_store_test.go @@ -26,8 +26,8 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/shed/field_struct.go b/swarm/shed/field_struct.go index 90daee7fc4f7..3c287c4b1d62 100644 --- a/swarm/shed/field_struct.go +++ b/swarm/shed/field_struct.go @@ -17,7 +17,7 @@ package shed import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/rlp" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/chunker.go b/swarm/storage/chunker.go index 0fa5026dcd65..d7a1f9187ab0 100644 --- a/swarm/storage/chunker.go +++ b/swarm/storage/chunker.go @@ -24,10 +24,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/metrics" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/spancontext" + "github.com/ethersocial/go-ethersocial/metrics" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" olog "github.com/opentracing/opentracing-go/log" ) diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go index 9a1259444354..9ed32629d119 100644 --- a/swarm/storage/chunker_test.go +++ b/swarm/storage/chunker_test.go @@ -24,7 +24,7 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/common_test.go b/swarm/storage/common_test.go index 6955ee8279c6..401bc5f05f1f 100644 --- a/swarm/storage/common_test.go +++ b/swarm/storage/common_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/ethersocial/go-ethersocial/log" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" "github.com/mattn/go-colorable" ) diff --git a/swarm/storage/database.go b/swarm/storage/database.go index 12367b905108..a1df38159d68 100644 --- a/swarm/storage/database.go +++ b/swarm/storage/database.go @@ -20,7 +20,7 @@ package storage // no need for queueing/caching import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/ethersocial/go-ethersocial/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/swarm/storage/encryption/encryption_test.go b/swarm/storage/encryption/encryption_test.go index 3b4f8a4e3693..6c6018f02415 100644 --- a/swarm/storage/encryption/encryption_test.go +++ b/swarm/storage/encryption/encryption_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/feed/binaryserializer.go b/swarm/storage/feed/binaryserializer.go index 4e4f67a094cb..a73ca1e7afc7 100644 --- a/swarm/storage/feed/binaryserializer.go +++ b/swarm/storage/feed/binaryserializer.go @@ -16,7 +16,7 @@ package feed -import "github.com/ethereum/go-ethereum/common/hexutil" +import "github.com/ethersocial/go-ethersocial/common/hexutil" type binarySerializer interface { binaryPut(serializedData []byte) error diff --git a/swarm/storage/feed/binaryserializer_test.go b/swarm/storage/feed/binaryserializer_test.go index 37828d1c9422..5757789e6337 100644 --- a/swarm/storage/feed/binaryserializer_test.go +++ b/swarm/storage/feed/binaryserializer_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) // KV mocks a key value store diff --git a/swarm/storage/feed/cacheentry.go b/swarm/storage/feed/cacheentry.go index be42008e99c1..96314766910c 100644 --- a/swarm/storage/feed/cacheentry.go +++ b/swarm/storage/feed/cacheentry.go @@ -21,7 +21,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/storage/feed/feed.go b/swarm/storage/feed/feed.go index b6ea665a6fce..28aa1a2f1072 100644 --- a/swarm/storage/feed/feed.go +++ b/swarm/storage/feed/feed.go @@ -20,9 +20,9 @@ import ( "hash" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // Feed represents a particular user's stream of updates on a topic diff --git a/swarm/storage/feed/handler.go b/swarm/storage/feed/handler.go index 063d3e92a3c5..c9de534d0edc 100644 --- a/swarm/storage/feed/handler.go +++ b/swarm/storage/feed/handler.go @@ -24,10 +24,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) type Handler struct { diff --git a/swarm/storage/feed/handler_test.go b/swarm/storage/feed/handler_test.go index 2f8a52453549..c642f5e5fb2c 100644 --- a/swarm/storage/feed/handler_test.go +++ b/swarm/storage/feed/handler_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) var ( diff --git a/swarm/storage/feed/id.go b/swarm/storage/feed/id.go index 7e17743c117e..067498c99e8c 100644 --- a/swarm/storage/feed/id.go +++ b/swarm/storage/feed/id.go @@ -21,10 +21,10 @@ import ( "hash" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // ID uniquely identifies an update on the network. diff --git a/swarm/storage/feed/id_test.go b/swarm/storage/feed/id_test.go index e561ff9b46d1..10a602dc9b71 100644 --- a/swarm/storage/feed/id_test.go +++ b/swarm/storage/feed/id_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) func getTestID() *ID { diff --git a/swarm/storage/feed/lookup/epoch_test.go b/swarm/storage/feed/lookup/epoch_test.go index 0629f3d1dfcd..713e07c25f3b 100644 --- a/swarm/storage/feed/lookup/epoch_test.go +++ b/swarm/storage/feed/lookup/epoch_test.go @@ -3,7 +3,7 @@ package lookup_test import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) func TestMarshallers(t *testing.T) { diff --git a/swarm/storage/feed/lookup/lookup_test.go b/swarm/storage/feed/lookup/lookup_test.go index d71e81e95f2a..be803b6c2b32 100644 --- a/swarm/storage/feed/lookup/lookup_test.go +++ b/swarm/storage/feed/lookup/lookup_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) type Data struct { diff --git a/swarm/storage/feed/query.go b/swarm/storage/feed/query.go index 8be78a95204c..d312baa99339 100644 --- a/swarm/storage/feed/query.go +++ b/swarm/storage/feed/query.go @@ -20,8 +20,8 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) // Query is used to specify constraints when performing an update lookup diff --git a/swarm/storage/feed/request.go b/swarm/storage/feed/request.go index dd91a7cf4597..8be35d52be24 100644 --- a/swarm/storage/feed/request.go +++ b/swarm/storage/feed/request.go @@ -21,10 +21,10 @@ import ( "encoding/json" "hash" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) // Request represents a request to sign or signed feed update message diff --git a/swarm/storage/feed/request_test.go b/swarm/storage/feed/request_test.go index c30158fddf17..bb57e33ada3b 100644 --- a/swarm/storage/feed/request_test.go +++ b/swarm/storage/feed/request_test.go @@ -24,9 +24,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed/lookup" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed/lookup" ) func areEqualJSON(s1, s2 string) (bool, error) { diff --git a/swarm/storage/feed/sign.go b/swarm/storage/feed/sign.go index 5f0ea0b33c90..77fee6de33df 100644 --- a/swarm/storage/feed/sign.go +++ b/swarm/storage/feed/sign.go @@ -19,8 +19,8 @@ package feed import ( "crypto/ecdsa" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) const signatureLength = 65 diff --git a/swarm/storage/feed/testutil.go b/swarm/storage/feed/testutil.go index caa39d9ffc2e..e9d9bcf59ce2 100644 --- a/swarm/storage/feed/testutil.go +++ b/swarm/storage/feed/testutil.go @@ -22,8 +22,8 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) const ( diff --git a/swarm/storage/feed/topic.go b/swarm/storage/feed/topic.go index 43a7b4ba4c33..c09153688fcc 100644 --- a/swarm/storage/feed/topic.go +++ b/swarm/storage/feed/topic.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/common/bitutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TopicLength establishes the max length of a topic string diff --git a/swarm/storage/feed/topic_test.go b/swarm/storage/feed/topic_test.go index 0403204f7f0e..7a766aa27a2f 100644 --- a/swarm/storage/feed/topic_test.go +++ b/swarm/storage/feed/topic_test.go @@ -3,7 +3,7 @@ package feed import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) func TestTopic(t *testing.T) { diff --git a/swarm/storage/feed/update.go b/swarm/storage/feed/update.go index 21c004ca422d..4c3136e792bb 100644 --- a/swarm/storage/feed/update.go +++ b/swarm/storage/feed/update.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/chunk" ) // ProtocolVersion defines the current version of the protocol that will be included in each update message diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go index 06c4be1d78bb..4ba6f6de6cb4 100644 --- a/swarm/storage/filestore_test.go +++ b/swarm/storage/filestore_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/testutil" + "github.com/ethersocial/go-ethersocial/swarm/testutil" ) const testDataSize = 0x0001000 diff --git a/swarm/storage/hasherstore.go b/swarm/storage/hasherstore.go index 23b52ee0d8b4..877619686627 100644 --- a/swarm/storage/hasherstore.go +++ b/swarm/storage/hasherstore.go @@ -21,8 +21,8 @@ import ( "fmt" "sync/atomic" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/storage/encryption" "golang.org/x/crypto/sha3" ) diff --git a/swarm/storage/hasherstore_test.go b/swarm/storage/hasherstore_test.go index 22cf98d0e882..7d98feecab4b 100644 --- a/swarm/storage/hasherstore_test.go +++ b/swarm/storage/hasherstore_test.go @@ -21,9 +21,9 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/encryption" + "github.com/ethersocial/go-ethersocial/swarm/storage/encryption" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) func TestHasherStore(t *testing.T) { diff --git a/swarm/storage/ldbstore.go b/swarm/storage/ldbstore.go index 9e4d63841044..a2bab8aa1519 100644 --- a/swarm/storage/ldbstore.go +++ b/swarm/storage/ldbstore.go @@ -34,10 +34,10 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go index 45ae09b2cbbd..3104bb8e1b53 100644 --- a/swarm/storage/ldbstore_test.go +++ b/swarm/storage/ldbstore_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" + "github.com/ethersocial/go-ethersocial/common" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/mem" ldberrors "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/swarm/storage/localstore.go b/swarm/storage/localstore.go index eefb7565a59d..f8ad6208c8af 100644 --- a/swarm/storage/localstore.go +++ b/swarm/storage/localstore.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) type LocalStoreParams struct { diff --git a/swarm/storage/localstore/gc.go b/swarm/storage/localstore/gc.go index 7718d1e589a4..9030bf5620b1 100644 --- a/swarm/storage/localstore/gc.go +++ b/swarm/storage/localstore/gc.go @@ -92,8 +92,8 @@ package localstore import ( "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/shed" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/localstore/gc_test.go b/swarm/storage/localstore/gc_test.go index eb039a554a11..1b72e9d8174f 100644 --- a/swarm/storage/localstore/gc_test.go +++ b/swarm/storage/localstore/gc_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TestDB_collectGarbageWorker tests garbage collection runs diff --git a/swarm/storage/localstore/index_test.go b/swarm/storage/localstore/index_test.go index d9abf440f1e5..86329fe8b324 100644 --- a/swarm/storage/localstore/index_test.go +++ b/swarm/storage/localstore/index_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TestDB_pullIndex validates the ordering of keys in pull index. diff --git a/swarm/storage/localstore/localstore.go b/swarm/storage/localstore/localstore.go index 7a9fb54f553d..a44cf4fee074 100644 --- a/swarm/storage/localstore/localstore.go +++ b/swarm/storage/localstore/localstore.go @@ -23,10 +23,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) var ( diff --git a/swarm/storage/localstore/localstore_test.go b/swarm/storage/localstore/localstore_test.go index c7309d3cd887..0d5e69678257 100644 --- a/swarm/storage/localstore/localstore_test.go +++ b/swarm/storage/localstore/localstore_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/localstore/mode_get.go b/swarm/storage/localstore/mode_get.go index 3a69f6e9d4e2..8078869440cf 100644 --- a/swarm/storage/localstore/mode_get.go +++ b/swarm/storage/localstore/mode_get.go @@ -17,9 +17,9 @@ package localstore import ( - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/localstore/mode_put.go b/swarm/storage/localstore/mode_put.go index 1a5a3d1b10c9..45917efae16e 100644 --- a/swarm/storage/localstore/mode_put.go +++ b/swarm/storage/localstore/mode_put.go @@ -17,8 +17,8 @@ package localstore import ( - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/localstore/mode_put_test.go b/swarm/storage/localstore/mode_put_test.go index ffe6a4cb4e55..174787d79f49 100644 --- a/swarm/storage/localstore/mode_put_test.go +++ b/swarm/storage/localstore/mode_put_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TestModePutRequest validates ModePutRequest index values on the provided DB. diff --git a/swarm/storage/localstore/mode_set.go b/swarm/storage/localstore/mode_set.go index a522f4447c92..a7057dbeefed 100644 --- a/swarm/storage/localstore/mode_set.go +++ b/swarm/storage/localstore/mode_set.go @@ -17,7 +17,7 @@ package localstore import ( - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/swarm/storage/localstore/retrieval_index_test.go b/swarm/storage/localstore/retrieval_index_test.go index 9f5b452c5cdb..b34c1af2a9f1 100644 --- a/swarm/storage/localstore/retrieval_index_test.go +++ b/swarm/storage/localstore/retrieval_index_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // BenchmarkRetrievalIndexes uploads a number of chunks in order to measure diff --git a/swarm/storage/localstore/subscription_pull.go b/swarm/storage/localstore/subscription_pull.go index a18f0915d938..8b900292815a 100644 --- a/swarm/storage/localstore/subscription_pull.go +++ b/swarm/storage/localstore/subscription_pull.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // SubscribePull returns a channel that provides chunk addresses and stored times from pull syncing index. diff --git a/swarm/storage/localstore/subscription_pull_test.go b/swarm/storage/localstore/subscription_pull_test.go index 5c99e0dec285..dc6304d68e61 100644 --- a/swarm/storage/localstore/subscription_pull_test.go +++ b/swarm/storage/localstore/subscription_pull_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TestDB_SubscribePull uploads some chunks before and after diff --git a/swarm/storage/localstore/subscription_push.go b/swarm/storage/localstore/subscription_push.go index b13f293998f6..3636243c052f 100644 --- a/swarm/storage/localstore/subscription_push.go +++ b/swarm/storage/localstore/subscription_push.go @@ -20,9 +20,9 @@ import ( "context" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/shed" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/swarm/shed" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // SubscribePush returns a channel that provides storage chunks with ordering from push syncing index. diff --git a/swarm/storage/localstore/subscription_push_test.go b/swarm/storage/localstore/subscription_push_test.go index 73e7c25f72de..85a365888f21 100644 --- a/swarm/storage/localstore/subscription_push_test.go +++ b/swarm/storage/localstore/subscription_push_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage" ) // TestDB_SubscribePush uploads some chunks before and after diff --git a/swarm/storage/localstore_test.go b/swarm/storage/localstore_test.go index ec69951c4fa1..4ea6eea46c0f 100644 --- a/swarm/storage/localstore_test.go +++ b/swarm/storage/localstore_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" ) var ( diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go index 8aaf486a7bf4..c34de3a56d84 100644 --- a/swarm/storage/memstore_test.go +++ b/swarm/storage/memstore_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/log" ) func newTestMemStore() *MemStore { diff --git a/swarm/storage/mock/db/db.go b/swarm/storage/mock/db/db.go index 73ae199e8b0c..cd7ccbcdcef9 100644 --- a/swarm/storage/mock/db/db.go +++ b/swarm/storage/mock/db/db.go @@ -27,8 +27,8 @@ import ( "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) // GlobalStore contains the LevelDB database that is storing diff --git a/swarm/storage/mock/db/db_test.go b/swarm/storage/mock/db/db_test.go index 782faaf35c86..00db64746464 100644 --- a/swarm/storage/mock/db/db_test.go +++ b/swarm/storage/mock/db/db_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/test" ) // TestDBStore is running a test.MockStore tests diff --git a/swarm/storage/mock/mem/mem.go b/swarm/storage/mock/mem/mem.go index 3a0a2beb8d50..9287338a39d9 100644 --- a/swarm/storage/mock/mem/mem.go +++ b/swarm/storage/mock/mem/mem.go @@ -27,8 +27,8 @@ import ( "io/ioutil" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) // GlobalStore stores all chunk data and also keys and node addresses relations. diff --git a/swarm/storage/mock/mem/mem_test.go b/swarm/storage/mock/mem/mem_test.go index adcefaabb41d..6bad0847089e 100644 --- a/swarm/storage/mock/mem/mem_test.go +++ b/swarm/storage/mock/mem/mem_test.go @@ -19,7 +19,7 @@ package mem import ( "testing" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/test" ) // TestGlobalStore is running test for a GlobalStore diff --git a/swarm/storage/mock/mock.go b/swarm/storage/mock/mock.go index 626ba3fe1b67..720c2902603b 100644 --- a/swarm/storage/mock/mock.go +++ b/swarm/storage/mock/mock.go @@ -36,7 +36,7 @@ import ( "errors" "io" - "github.com/ethereum/go-ethereum/common" + "github.com/ethersocial/go-ethersocial/common" ) // ErrNotFound indicates that the chunk is not found. diff --git a/swarm/storage/mock/rpc/rpc.go b/swarm/storage/mock/rpc/rpc.go index 8cd6c83a7a40..7869e065e03e 100644 --- a/swarm/storage/mock/rpc/rpc.go +++ b/swarm/storage/mock/rpc/rpc.go @@ -26,10 +26,10 @@ package rpc import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) // GlobalStore is rpc.Client that connects to a centralized mock store. diff --git a/swarm/storage/mock/rpc/rpc_test.go b/swarm/storage/mock/rpc/rpc_test.go index f62340edecbf..ffa5c4a8be87 100644 --- a/swarm/storage/mock/rpc/rpc_test.go +++ b/swarm/storage/mock/rpc/rpc_test.go @@ -19,9 +19,9 @@ package rpc import ( "testing" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/storage/mock/mem" - "github.com/ethereum/go-ethereum/swarm/storage/mock/test" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/mem" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock/test" ) // TestDBStore is running test for a GlobalStore diff --git a/swarm/storage/mock/test/test.go b/swarm/storage/mock/test/test.go index 69828b144f35..b41e5637193b 100644 --- a/swarm/storage/mock/test/test.go +++ b/swarm/storage/mock/test/test.go @@ -25,9 +25,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" ) // MockStore creates NodeStore instances from provided GlobalStorer, diff --git a/swarm/storage/netstore.go b/swarm/storage/netstore.go index 202af2bf58a9..f29d0708e7c8 100644 --- a/swarm/storage/netstore.go +++ b/swarm/storage/netstore.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/swarm/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/swarm/log" lru "github.com/hashicorp/golang-lru" ) diff --git a/swarm/storage/netstore_test.go b/swarm/storage/netstore_test.go index 88ec6c28f446..e41e9e62cc51 100644 --- a/swarm/storage/netstore_test.go +++ b/swarm/storage/netstore_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/p2p/enode" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" ) var sourcePeerID = enode.HexID("99d8594b52298567d2ca3f4c441a5ba0140ee9245e26460d01102a52773c73b9") diff --git a/swarm/storage/pyramid.go b/swarm/storage/pyramid.go index ed0f843b937e..edd67d87c724 100644 --- a/swarm/storage/pyramid.go +++ b/swarm/storage/pyramid.go @@ -25,8 +25,8 @@ import ( "sync" "time" - ch "github.com/ethereum/go-ethereum/swarm/chunk" - "github.com/ethereum/go-ethereum/swarm/log" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" + "github.com/ethersocial/go-ethersocial/swarm/log" ) /* diff --git a/swarm/storage/types.go b/swarm/storage/types.go index 7ec21328e2bb..3b9d0c0d8863 100644 --- a/swarm/storage/types.go +++ b/swarm/storage/types.go @@ -25,9 +25,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/swarm/bmt" - ch "github.com/ethereum/go-ethereum/swarm/chunk" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/swarm/bmt" + ch "github.com/ethersocial/go-ethersocial/swarm/chunk" "golang.org/x/crypto/sha3" ) diff --git a/swarm/swap/swap.go b/swarm/swap/swap.go index 5d636dc205fb..9a389a75fea0 100644 --- a/swarm/swap/swap.go +++ b/swarm/swap/swap.go @@ -22,10 +22,10 @@ import ( "strconv" "sync" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/state" ) // SwAP Swarm Accounting Protocol diff --git a/swarm/swap/swap_test.go b/swarm/swap/swap_test.go index f2e3ba168a4f..474fd067f680 100644 --- a/swarm/swap/swap_test.go +++ b/swarm/swap/swap_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/swarm/state" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/p2p/simulations/adapters" + "github.com/ethersocial/go-ethersocial/swarm/state" colorable "github.com/mattn/go-colorable" ) diff --git a/swarm/swarm.go b/swarm/swarm.go index 3ab98b3ab55a..d25520f14351 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -29,30 +29,30 @@ import ( "time" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/contracts/chequebook" - "github.com/ethereum/go-ethereum/contracts/ens" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/protocols" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" - httpapi "github.com/ethereum/go-ethereum/swarm/api/http" - "github.com/ethereum/go-ethereum/swarm/fuse" - "github.com/ethereum/go-ethereum/swarm/log" - "github.com/ethereum/go-ethereum/swarm/network" - "github.com/ethereum/go-ethereum/swarm/network/stream" - "github.com/ethereum/go-ethereum/swarm/pss" - "github.com/ethereum/go-ethereum/swarm/state" - "github.com/ethereum/go-ethereum/swarm/storage" - "github.com/ethereum/go-ethereum/swarm/storage/feed" - "github.com/ethereum/go-ethereum/swarm/storage/mock" - "github.com/ethereum/go-ethereum/swarm/swap" - "github.com/ethereum/go-ethereum/swarm/tracing" + "github.com/ethersocial/go-ethersocial/accounts/abi/bind" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/contracts/chequebook" + "github.com/ethersocial/go-ethersocial/contracts/ens" + "github.com/ethersocial/go-ethersocial/ethclient" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/protocols" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/api" + httpapi "github.com/ethersocial/go-ethersocial/swarm/api/http" + "github.com/ethersocial/go-ethersocial/swarm/fuse" + "github.com/ethersocial/go-ethersocial/swarm/log" + "github.com/ethersocial/go-ethersocial/swarm/network" + "github.com/ethersocial/go-ethersocial/swarm/network/stream" + "github.com/ethersocial/go-ethersocial/swarm/pss" + "github.com/ethersocial/go-ethersocial/swarm/state" + "github.com/ethersocial/go-ethersocial/swarm/storage" + "github.com/ethersocial/go-ethersocial/swarm/storage/feed" + "github.com/ethersocial/go-ethersocial/swarm/storage/mock" + "github.com/ethersocial/go-ethersocial/swarm/swap" + "github.com/ethersocial/go-ethersocial/swarm/tracing" ) var ( diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go index d85eb9118577..0365ea40d4a2 100644 --- a/swarm/swarm_test.go +++ b/swarm/swarm_test.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/swarm/api" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rpc" + "github.com/ethersocial/go-ethersocial/swarm/api" ) // TestNewSwarm validates Swarm fields in repsect to the provided configuration. diff --git a/swarm/tracing/tracing.go b/swarm/tracing/tracing.go index f95fa41b8f43..c7e162f66df1 100644 --- a/swarm/tracing/tracing.go +++ b/swarm/tracing/tracing.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/ethersocial/go-ethersocial/log" jaeger "github.com/uber/jaeger-client-go" jaegercfg "github.com/uber/jaeger-client-go/config" cli "gopkg.in/urfave/cli.v1" diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 9fa69bf4ed7e..7f6ce31bcf35 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -24,18 +24,18 @@ 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" - "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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index fde9db3ad4d3..58196c948b7a 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,8 +20,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 00d699cf759f..ac5f86def0d5 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/consensus/ethash" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/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 5cfd4bd0aec0..88ba66d784c3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 88f36ce99957..e520c8589c47 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index 1d4baf2fd79c..672422aa3698 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 451ffcbf43a1..09bbc6a1b97b 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/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/gen_tttransaction.go b/tests/gen_tttransaction.go index 2948842d972a..57160803f3ce 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*ttTransactionMarshaling)(nil) diff --git a/tests/gen_vmexec.go b/tests/gen_vmexec.go index a5f01cf45695..3eccf389e6b3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" ) var _ = (*vmExecMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 188cdffe9d73..66a53c502ed4 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/ethersocial/go-ethersocial/params" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 053cbd6fcd39..02d4bf4b0412 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/ethersocial/go-ethersocial/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 9069ec55a15d..420b65af262d 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/ethersocial/go-ethersocial/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index 8b69da91f263..6acf90ab76fa 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/ethersocial/go-ethersocial/cmd/utils" + "github.com/ethersocial/go-ethersocial/core/vm" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 436284196d9b..6dd33cc13293 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -23,17 +23,17 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 42ad81877e97..7b33ff1df566 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/ethersocial/go-ethersocial/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 8c3dac088c22..ab20e47374c3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core/types" + "github.com/ethersocial/go-ethersocial/params" + "github.com/ethersocial/go-ethersocial/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/tests/vm_test.go b/tests/vm_test.go index 441483dffa4c..2df10991ecdb 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/ethersocial/go-ethersocial/core/vm" ) func TestVM(t *testing.T) { diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index cb81c5b94e39..bdf1d2e89918 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/core" + "github.com/ethersocial/go-ethersocial/core/state" + "github.com/ethersocial/go-ethersocial/core/vm" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/params" ) // VMTest checks EVM execution without block or transaction context. diff --git a/trie/database.go b/trie/database.go index 739a98addbd1..cce45d53b10d 100644 --- a/trie/database.go +++ b/trie/database.go @@ -23,11 +23,11 @@ import ( "time" "github.com/allegro/bigcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" + "github.com/ethersocial/go-ethersocial/rlp" ) var ( diff --git a/trie/errors.go b/trie/errors.go index 567b80078c06..6636732c57aa 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/ethersocial/go-ethersocial/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/trie/hasher.go b/trie/hasher.go index 9d6756b6f4e8..507b3289acb7 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -20,8 +20,8 @@ import ( "hash" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index 77f168166522..f443c3259799 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/rlp" ) // Iterator is a key-value trie iterator that traverses a Trie. diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 4f633b195fa9..0bca83578c07 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/ethdb" ) func TestIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 1fafb7a53825..db61fec8e303 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 f90ecd7d88be..a8c198290f4c 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/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 996f87478143..12fcd0e1d2cf 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" ) func init() { diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 6a50cfd5a65f..2eafac917ab7 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/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 d16d999684a3..18500541b6c5 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" ) func newEmptySecure() *SecureTrie { diff --git a/trie/sync.go b/trie/sync.go index 67dff5a8b6bc..0c2b4d78f672 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/prque" + "github.com/ethersocial/go-ethersocial/ethdb" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index c76779e5c73d..35c8fd0bd0c4 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/ethdb" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/trie.go b/trie/trie.go index af424d4ac676..3bbc6f6c571b 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/metrics" ) var ( diff --git a/trie/trie_test.go b/trie/trie_test.go index 4d84aa96cf45..835311302aeb 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/ethdb" + "github.com/ethersocial/go-ethersocial/rlp" ) func init() { diff --git a/whisper/mailserver/mailserver.go b/whisper/mailserver/mailserver.go index d7af4baae3f9..6dd478823d83 100644 --- a/whisper/mailserver/mailserver.go +++ b/whisper/mailserver/mailserver.go @@ -21,11 +21,11 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/rlp" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/whisper/mailserver/server_test.go b/whisper/mailserver/server_test.go index edb817cc75ab..825bd216a1ba 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) const powRequirement = 0.00001 diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go index a814154e4795..41118b66bea0 100644 --- a/whisper/shhclient/client.go +++ b/whisper/shhclient/client.go @@ -19,10 +19,10 @@ package shhclient import ( "context" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" - whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" + "github.com/ethersocial/go-ethersocial" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/rpc" + whisper "github.com/ethersocial/go-ethersocial/whisper/whisperv6" ) // Client defines typed wrappers for the Whisper v6 RPC API. diff --git a/whisper/whisperv5/api.go b/whisper/whisperv5/api.go index 7d963df8d58a..b95c3eeb46a1 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/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" ) var ( diff --git a/whisper/whisperv5/benchmarks_test.go b/whisper/whisperv5/benchmarks_test.go index dcfbcb56d847..69568e331dcd 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/ethersocial/go-ethersocial/crypto" ) func BenchmarkDeriveKeyMaterial(b *testing.B) { diff --git a/whisper/whisperv5/envelope.go b/whisper/whisperv5/envelope.go index 169cbba9dde6..7f308c04138e 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/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 9550a7e3893d..d4c02260b0a2 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" ) type Filter struct { diff --git a/whisper/whisperv5/filter_test.go b/whisper/whisperv5/filter_test.go index 33138fb1a4ec..c43d9299c6fd 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) var seed int64 diff --git a/whisper/whisperv5/gen_criteria_json.go b/whisper/whisperv5/gen_criteria_json.go index 1c0e389ad9bb..1b39bcb29330 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv5/gen_message_json.go b/whisper/whisperv5/gen_message_json.go index b4c4274d0715..0e72ea98d7c3 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv5/gen_newmessage_json.go b/whisper/whisperv5/gen_newmessage_json.go index 97ffb64ad381..0b073d971435 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv5/message.go b/whisper/whisperv5/message.go index 35711d724bf7..169e3d9a96d0 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/log" ) // MessageParams specifies the exact way a message should be wrapped into an Envelope. diff --git a/whisper/whisperv5/message_test.go b/whisper/whisperv5/message_test.go index 2edf945df018..1d5c6150320b 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/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv5/peer.go b/whisper/whisperv5/peer.go index 2bb5677c7c97..f2d63c28fe71 100644 --- a/whisper/whisperv5/peer.go +++ b/whisper/whisperv5/peer.go @@ -21,10 +21,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go index 244953207084..a2024a3803fb 100644 --- a/whisper/whisperv5/peer_test.go +++ b/whisper/whisperv5/peer_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" ) var keys = []string{ diff --git a/whisper/whisperv5/topic.go b/whisper/whisperv5/topic.go index c4eda1db42f9..8d0dae2e481d 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv5/whisper.go b/whisper/whisperv5/whisper.go index 4655458214f9..0c7399980c8e 100644 --- a/whisper/whisperv5/whisper.go +++ b/whisper/whisperv5/whisper.go @@ -27,11 +27,11 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/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 a7bd17e4d8f2..40af03931738 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/ethersocial/go-ethersocial/common" ) func TestWhisperBasic(t *testing.T) { diff --git a/whisper/whisperv6/api.go b/whisper/whisperv6/api.go index 7609a03c28e4..c2e7cf381079 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/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/rpc" ) // List of errors diff --git a/whisper/whisperv6/benchmarks_test.go b/whisper/whisperv6/benchmarks_test.go index 0473179da5a5..02d6e60db586 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/ethersocial/go-ethersocial/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/whisper/whisperv6/envelope.go b/whisper/whisperv6/envelope.go index c42d1fa8ac7c..e09beb0a7c50 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/math" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/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 410b250a3f3b..fec3d3891a14 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/ethersocial/go-ethersocial/crypto" ) func TestEnvelopeOpenAcceptsOnlyOneKeyTypeInFilter(t *testing.T) { diff --git a/whisper/whisperv6/filter.go b/whisper/whisperv6/filter.go index 6a5b79674b5c..aa8c28a873c3 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" ) // Filter represents a Whisper message filter diff --git a/whisper/whisperv6/filter_test.go b/whisper/whisperv6/filter_test.go index 5ce99d9f6ce9..b6da48774342 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" ) var seed int64 diff --git a/whisper/whisperv6/gen_criteria_json.go b/whisper/whisperv6/gen_criteria_json.go index 1a428d6df730..29108d0baded 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*criteriaOverride)(nil) diff --git a/whisper/whisperv6/gen_message_json.go b/whisper/whisperv6/gen_message_json.go index 6218f5df6ed9..2669353c6717 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*messageOverride)(nil) diff --git a/whisper/whisperv6/gen_newmessage_json.go b/whisper/whisperv6/gen_newmessage_json.go index 75a1279ae3ac..345d71f7b2ef 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/ethersocial/go-ethersocial/common/hexutil" ) var _ = (*newMessageOverride)(nil) diff --git a/whisper/whisperv6/message.go b/whisper/whisperv6/message.go index 2d4e86244109..a75d4fac8201 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/crypto/ecies" + "github.com/ethersocial/go-ethersocial/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 0a5c1c85333a..8cd5e522c9ba 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/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/rlp" ) func generateMessageParams() (*MessageParams, error) { diff --git a/whisper/whisperv6/peer.go b/whisper/whisperv6/peer.go index 621d5120818a..b5259589c7f7 100644 --- a/whisper/whisperv6/peer.go +++ b/whisper/whisperv6/peer.go @@ -23,10 +23,10 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" ) // Peer represents a whisper protocol peer connection. diff --git a/whisper/whisperv6/peer_test.go b/whisper/whisperv6/peer_test.go index c5b044e1a638..59b80bcc78c8 100644 --- a/whisper/whisperv6/peer_test.go +++ b/whisper/whisperv6/peer_test.go @@ -28,13 +28,13 @@ import ( "net" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rlp" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/p2p/enode" + "github.com/ethersocial/go-ethersocial/p2p/nat" + "github.com/ethersocial/go-ethersocial/rlp" ) var keys = []string{ diff --git a/whisper/whisperv6/topic.go b/whisper/whisperv6/topic.go index 4dd8f283c357..b3e5a8116823 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/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/common/hexutil" ) // TopicType represents a cryptographically secure, probabilistic partial diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index eb713f84ee5c..5a8668e84444 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -27,12 +27,12 @@ import ( "time" mapset "github.com/deckarep/golang-set" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/ethersocial/go-ethersocial/common" + "github.com/ethersocial/go-ethersocial/crypto" + "github.com/ethersocial/go-ethersocial/log" + "github.com/ethersocial/go-ethersocial/p2p" + "github.com/ethersocial/go-ethersocial/rlp" + "github.com/ethersocial/go-ethersocial/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 895bb2b969f9..fe5d70af059e 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/ethersocial/go-ethersocial/common" "golang.org/x/crypto/pbkdf2" )