diff options
Diffstat (limited to 'cmd')
108 files changed, 585 insertions, 585 deletions
diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index fcfbcadd6..29d80311a 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/accounts/abi/bind" - "github.com/dexon-foundation/dexon/common/compiler" + "github.com/tangerine-network/go-tangerine/accounts/abi/bind" + "github.com/tangerine-network/go-tangerine/common/compiler" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 118f57753..1de94bd5b 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,14 +24,14 @@ import ( "net" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p/discover" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p/discover" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index fa5c8cb97..535b3ab21 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,17 +35,17 @@ import ( "runtime" "strings" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/signer/core" - "github.com/dexon-foundation/dexon/signer/rules" - "github.com/dexon-foundation/dexon/signer/storage" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/signer/core" + "github.com/tangerine-network/go-tangerine/signer/rules" + "github.com/tangerine-network/go-tangerine/signer/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/changepassphrase.go b/cmd/ethkey/changepassphrase.go index 4e47f2324..7c5bf3dd4 100644 --- a/cmd/ethkey/changepassphrase.go +++ b/cmd/ethkey/changepassphrase.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index aa4a51138..23fd77618 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -23,10 +23,10 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 3fe2dbe3f..21584ec6f 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index f87303808..0ed85600e 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 9bbfd68f3..55f301d63 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,10 +21,10 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index f7b03249e..0b7e78dc9 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 99f5e923d..c3e06304e 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,9 +22,9 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index e56dcb877..fe6635bc3 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/cmd/evm/internal/compiler" + "github.com/tangerine-network/go-tangerine/cmd/evm/internal/compiler" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 16c3832c9..5933a3b99 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/core/asm" + "github.com/tangerine-network/go-tangerine/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 a90007a03..ab46b784b 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/dexon-foundation/dexon/core/asm" + "github.com/tangerine-network/go-tangerine/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 82d7b7600..749a1cd4e 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,7 +22,7 @@ import ( "math/big" "os" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 114b9fd60..087f868c0 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,16 +27,16 @@ import ( "runtime/pprof" "time" - "github.com/dexon-foundation/dexon/cmd/evm/internal/compiler" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/core/vm/runtime" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/evm/internal/compiler" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/core/vm/runtime" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/params" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index b76dc3ca4..200d6da5c 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -23,10 +23,10 @@ import ( "io/ioutil" "os" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/tests" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/tests" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index 238d6884d..061bb8e62 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -41,23 +41,23 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/ethstats" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/ethstats" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/params" "golang.org/x/net/websocket" ) @@ -215,7 +215,7 @@ type faucet struct { func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network uint64, stats string, ks *keystore.KeyStore, index []byte) (*faucet, error) { // Assemble the raw devp2p protocol stack stack, err := node.New(&node.Config{ - Name: "gdex", + Name: "gtan", Version: params.VersionWithMeta, DataDir: filepath.Join(os.Getenv("HOME"), ".faucet"), P2P: p2p.Config{ @@ -449,7 +449,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { case *noauthFlag: username, avatar, address, err = authNoAuth(msg.URL) default: - err = errors.New("Something funky happened, please open an issue at https://github.com/dexon-foundation/dexon/issues") + err = errors.New("Something funky happened, please open an issue at https://github.com/tangerine-network/go-tangerine/issues") } if err != nil { if err = sendError(conn, err); err != nil { diff --git a/cmd/govtool/main.go b/cmd/govtool/main.go index 1425b9faf..68e3452c1 100644 --- a/cmd/govtool/main.go +++ b/cmd/govtool/main.go @@ -6,11 +6,11 @@ import ( "math/big" "os" - coreTypes "github.com/dexon-foundation/dexon-consensus/core/types" - dkgTypes "github.com/dexon-foundation/dexon-consensus/core/types/dkg" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/rlp" + coreTypes "github.com/byzantine-lab/dexon-consensus/core/types" + dkgTypes "github.com/byzantine-lab/dexon-consensus/core/types/dkg" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/rlp" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/gdex/accountcmd.go b/cmd/gtan/accountcmd.go index d910831d7..aa112297c 100644 --- a/cmd/gdex/accountcmd.go +++ b/cmd/gtan/accountcmd.go @@ -20,12 +20,12 @@ import ( "fmt" "io/ioutil" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" "gopkg.in/urfave/cli.v1" ) @@ -36,7 +36,7 @@ var ( ArgsUsage: "", Category: "ACCOUNT COMMANDS", Description: ` - gdex wallet import /path/to/my/presale.wallet + gtan wallet import /path/to/my/presale.wallet will prompt for your password and imports your ether presale account. It can be used non-interactively with the --password option taking a @@ -56,7 +56,7 @@ passwordfile as argument containing the wallet password in plaintext.`, utils.LightKDFFlag, }, Description: ` - gdex wallet [options] /path/to/my/presale.wallet + gtan wallet [options] /path/to/my/presale.wallet will prompt for your password and imports your ether presale account. It can be used non-interactively with the --password option taking a @@ -112,7 +112,7 @@ Print a short summary of all accounts`, utils.LightKDFFlag, }, Description: ` - gdex account new + gtan account new Creates a new account and prints the address. @@ -137,7 +137,7 @@ password to file or expose in any other way. utils.LightKDFFlag, }, Description: ` - gdex account update <address> + gtan account update <address> Update an existing account. @@ -149,7 +149,7 @@ format to the newest format or change the password for an account. For non-interactive use the passphrase can be specified with the --password flag: - gdex account update [options] <address> + gtan account update [options] <address> Since only one password can be given, only format update can be performed, changing your password is only possible interactively. @@ -167,7 +167,7 @@ changing your password is only possible interactively. }, ArgsUsage: "<keyFile>", Description: ` - gdex account import <keyfile> + gtan account import <keyfile> Imports an unencrypted private key from <keyfile> and creates a new account. Prints the address. @@ -180,7 +180,7 @@ You must remember this passphrase to unlock your account in the future. For non-interactive use the passphrase can be specified with the -password flag: - gdex account import [options] <keyfile> + gtan account import [options] <keyfile> Note: As you can directly copy your encrypted accounts to another ethereum instance, diff --git a/cmd/gdex/accountcmd_test.go b/cmd/gtan/accountcmd_test.go index 38e21eaca..e0964b078 100644 --- a/cmd/gdex/accountcmd_test.go +++ b/cmd/gtan/accountcmd_test.go @@ -43,22 +43,22 @@ func tmpDatadirWithKeystore(t *testing.T) string { } func TestAccountListEmpty(t *testing.T) { - gdex := runGeth(t, "account", "list") - gdex.ExpectExit() + gtan := runGeth(t, "account", "list") + gtan.ExpectExit() } func TestAccountList(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, "account", "list", "--datadir", datadir) - defer gdex.ExpectExit() + gtan := runGeth(t, "account", "list", "--datadir", datadir) + defer gtan.ExpectExit() if runtime.GOOS == "windows" { - gdex.Expect(` + gtan.Expect(` Account #0: {7ef5a6135f1fd6a02593eedc869c6d41d934aef8} keystore://{{.Datadir}}\keystore\UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8 Account #1: {f466859ead1932d743d622cb74fc058882e8648a} keystore://{{.Datadir}}\keystore\aaa Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}\keystore\zzz `) } else { - gdex.Expect(` + gtan.Expect(` Account #0: {7ef5a6135f1fd6a02593eedc869c6d41d934aef8} keystore://{{.Datadir}}/keystore/UTC--2016-03-22T12-57-55.920751759Z--7ef5a6135f1fd6a02593eedc869c6d41d934aef8 Account #1: {f466859ead1932d743d622cb74fc058882e8648a} keystore://{{.Datadir}}/keystore/aaa Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}/keystore/zzz @@ -67,21 +67,21 @@ Account #2: {289d485d9771714cce91d3393d764e1311907acc} keystore://{{.Datadir}}/k } func TestAccountNew(t *testing.T) { - gdex := runGeth(t, "account", "new", "--lightkdf") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "account", "new", "--lightkdf") + defer gtan.ExpectExit() + gtan.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} Repeat passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectRegexp(`Address: \{[0-9a-f]{40}\}\n`) + gtan.ExpectRegexp(`Address: \{[0-9a-f]{40}\}\n`) } func TestAccountNewBadRepeat(t *testing.T) { - gdex := runGeth(t, "account", "new", "--lightkdf") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "account", "new", "--lightkdf") + defer gtan.ExpectExit() + gtan.Expect(` Your new account is locked with a password. Please give a password. Do not forget this password. !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "something"}} @@ -92,11 +92,11 @@ Fatal: Passphrases do not match func TestAccountUpdate(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, "account", "update", + gtan := runGeth(t, "account", "update", "--datadir", datadir, "--lightkdf", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} @@ -107,24 +107,24 @@ Repeat passphrase: {{.InputLine "foobar2"}} } func TestWalletImport(t *testing.T) { - gdex := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") + defer gtan.ExpectExit() + gtan.Expect(` !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foo"}} Address: {d4584b5f6229b7be90727b0fc8c6b91bb427821f} `) - files, err := ioutil.ReadDir(filepath.Join(gdex.Datadir, "keystore")) + files, err := ioutil.ReadDir(filepath.Join(gtan.Datadir, "keystore")) if len(files) != 1 { t.Errorf("expected one key file in keystore directory, found %d files (error: %v)", len(files), err) } } func TestWalletImportBadPassword(t *testing.T) { - gdex := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") - defer gdex.ExpectExit() - gdex.Expect(` + gtan := runGeth(t, "wallet", "import", "--lightkdf", "testdata/guswallet.json") + defer gtan.ExpectExit() + gtan.Expect(` !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong"}} Fatal: could not decrypt key with given passphrase @@ -133,23 +133,23 @@ Fatal: could not decrypt key with given passphrase func TestUnlockFlag(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a", "js", "testdata/empty.js") - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", "=0xf466859eAD1932D743d622CB74FC058882E8648A", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -157,11 +157,11 @@ Passphrase: {{.InputLine "foobar"}} func TestUnlockFlagWrongPassword(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong1"}} @@ -173,21 +173,21 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/dexon-foundation/dexon/issues/1785 +// https://github.com/tangerine-network/go-tangerine/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "0,2", "js", "testdata/empty.js") - gdex.Expect(` + gtan.Expect(` Unlocking account 0 | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} Unlocking account 2 | Attempt 1/3 Passphrase: {{.InputLine "foobar"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", @@ -195,7 +195,7 @@ Passphrase: {{.InputLine "foobar"}} "=0x289d485D9771714CCe91D3393D764E1311907ACc", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -203,11 +203,11 @@ Passphrase: {{.InputLine "foobar"}} func TestUnlockFlagPasswordFile(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--password", "testdata/passwords.txt", "--unlock", "0,2", "js", "testdata/empty.js") - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", @@ -215,7 +215,7 @@ func TestUnlockFlagPasswordFile(t *testing.T) { "=0x289d485D9771714CCe91D3393D764E1311907ACc", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -223,29 +223,29 @@ func TestUnlockFlagPasswordFile(t *testing.T) { func TestUnlockFlagPasswordFileWrongPassword(t *testing.T) { datadir := tmpDatadirWithKeystore(t) - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--password", "testdata/wrong-passwords.txt", "--unlock", "0,2") - defer gdex.ExpectExit() - gdex.Expect(` + defer gtan.ExpectExit() + gtan.Expect(` Fatal: Failed to unlock account 0 (could not decrypt key with given passphrase) `) } func TestUnlockFlagAmbiguous(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") - gdex := runGeth(t, + gtan := runGeth(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a", "js", "testdata/empty.js") - defer gdex.ExpectExit() + defer gtan.ExpectExit() // Helper for the expect template, returns absolute keystore path. - gdex.SetTemplateFunc("keypath", func(file string) string { + gtan.SetTemplateFunc("keypath", func(file string) string { abs, _ := filepath.Abs(filepath.Join(store, file)) return abs }) - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "foobar"}} @@ -257,14 +257,14 @@ Your passphrase unlocked keystore://{{keypath "1"}} In order to avoid this warning, you need to remove the following duplicate key files: keystore://{{keypath "2"}} `) - gdex.ExpectExit() + gtan.ExpectExit() wantMessages := []string{ "Unlocked account", "=0xf466859eAD1932D743d622CB74FC058882E8648A", } for _, m := range wantMessages { - if !strings.Contains(gdex.StderrText(), m) { + if !strings.Contains(gtan.StderrText(), m) { t.Errorf("stderr text does not contain %q", m) } } @@ -272,17 +272,17 @@ In order to avoid this warning, you need to remove the following duplicate key f func TestUnlockFlagAmbiguousWrongPassword(t *testing.T) { store := filepath.Join("..", "..", "accounts", "keystore", "testdata", "dupes") - gdex := runGeth(t, + gtan := runGeth(t, "--keystore", store, "--nat", "none", "--nodiscover", "--maxpeers", "0", "--port", "0", "--unlock", "f466859ead1932d743d622cb74fc058882e8648a") - defer gdex.ExpectExit() + defer gtan.ExpectExit() // Helper for the expect template, returns absolute keystore path. - gdex.SetTemplateFunc("keypath", func(file string) string { + gtan.SetTemplateFunc("keypath", func(file string) string { abs, _ := filepath.Abs(filepath.Join(store, file)) return abs }) - gdex.Expect(` + gtan.Expect(` Unlocking account f466859ead1932d743d622cb74fc058882e8648a | Attempt 1/3 !! Unsupported terminal, password will be echoed. Passphrase: {{.InputLine "wrong"}} @@ -292,5 +292,5 @@ Multiple key files exist for address f466859ead1932d743d622cb74fc058882e8648a: Testing your passphrase against all of them... Fatal: None of the listed files could be unlocked. `) - gdex.ExpectExit() + gtan.ExpectExit() } diff --git a/cmd/gdex/bugcmd.go b/cmd/gtan/bugcmd.go index 00c2f17e7..214a47de4 100644 --- a/cmd/gdex/bugcmd.go +++ b/cmd/gtan/bugcmd.go @@ -26,22 +26,22 @@ import ( "runtime" "strings" - "github.com/dexon-foundation/dexon/cmd/internal/browser" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/internal/browser" + "github.com/tangerine-network/go-tangerine/params" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" cli "gopkg.in/urfave/cli.v1" ) var bugCommand = cli.Command{ Action: utils.MigrateFlags(reportBug), Name: "bug", - Usage: "opens a window to report a bug on the gdex repo", + Usage: "opens a window to report a bug on the gtan repo", ArgsUsage: " ", Category: "MISCELLANEOUS COMMANDS", } -const issueURL = "https://github.com/dexon-foundation/dexon/issues/new" +const issueURL = "https://github.com/tangerine-network/go-tangerine/issues/new" // reportBug reports a bug by opening a new URL to the go-ethereum GH issue // tracker and setting default values as the issue body. diff --git a/cmd/gdex/chaincmd.go b/cmd/gtan/chaincmd.go index 470bb791a..a84fc9d94 100644 --- a/cmd/gdex/chaincmd.go +++ b/cmd/gtan/chaincmd.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/eth/downloader" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/event" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/trie" "github.com/syndtr/goleveldb/leveldb/util" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/eth/downloader" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/event" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/trie" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/gdex/config.go b/cmd/gtan/config.go index 71024c40e..d748cda94 100644 --- a/cmd/gdex/config.go +++ b/cmd/gtan/config.go @@ -26,13 +26,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/dashboard" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/params" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" "github.com/naoina/toml" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/dashboard" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/params" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" ) var ( @@ -102,7 +102,7 @@ func defaultNodeConfig() node.Config { cfg.Version = params.VersionWithCommit(gitCommit) cfg.HTTPModules = append(cfg.HTTPModules, "eth", "shh") cfg.WSModules = append(cfg.WSModules, "eth", "shh") - cfg.IPCPath = "gdex.ipc" + cfg.IPCPath = "gtan.ipc" return cfg } diff --git a/cmd/gdex/consolecmd.go b/cmd/gtan/consolecmd.go index bc447fefd..750570094 100644 --- a/cmd/gdex/consolecmd.go +++ b/cmd/gtan/consolecmd.go @@ -24,10 +24,10 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) @@ -43,7 +43,7 @@ var ( Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console.`, +See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console.`, } attachCommand = cli.Command{ @@ -56,8 +56,8 @@ See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console.`, Description: ` The Geth console is an interactive shell for the JavaScript runtime environment which exposes a node admin interface as well as the Ðapp JavaScript API. -See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console. -This command allows to open a console on a running gdex node.`, +See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console. +This command allows to open a console on a running gtan node.`, } javascriptCommand = cli.Command{ @@ -69,11 +69,11 @@ This command allows to open a console on a running gdex node.`, Category: "CONSOLE COMMANDS", Description: ` The JavaScript VM exposes a node admin interface as well as the Ðapp -JavaScript API. See https://github.com/dexon-foundation/dexon/wiki/JavaScript-Console`, +JavaScript API. See https://github.com/tangerine-network/go-tangerine/wiki/JavaScript-Console`, } ) -// localConsole starts a new gdex node, attaching a JavaScript console to it at the +// localConsole starts a new gtan node, attaching a JavaScript console to it at the // same time. func localConsole(ctx *cli.Context) error { // Create and start the node based on the CLI flags @@ -84,7 +84,7 @@ func localConsole(ctx *cli.Context) error { // Attach to the newly started node and start the JavaScript console client, err := node.Attach() if err != nil { - utils.Fatalf("Failed to attach to the inproc gdex: %v", err) + utils.Fatalf("Failed to attach to the inproc gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), @@ -111,10 +111,10 @@ func localConsole(ctx *cli.Context) error { return nil } -// remoteConsole will connect to a remote gdex instance, attaching a JavaScript +// remoteConsole will connect to a remote gtan instance, attaching a JavaScript // console to it. func remoteConsole(ctx *cli.Context) error { - // Attach to a remotely running gdex instance and start the JavaScript console + // Attach to a remotely running gtan instance and start the JavaScript console endpoint := ctx.Args().First() if endpoint == "" { path := node.DefaultDataDir() @@ -130,11 +130,11 @@ func remoteConsole(ctx *cli.Context) error { path = filepath.Join(path, "yilan") } } - endpoint = fmt.Sprintf("%s/gdex.ipc", path) + endpoint = fmt.Sprintf("%s/gtan.ipc", path) } client, err := dialRPC(endpoint) if err != nil { - utils.Fatalf("Unable to attach to remote gdex: %v", err) + utils.Fatalf("Unable to attach to remote gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), @@ -163,19 +163,19 @@ func remoteConsole(ctx *cli.Context) error { // dialRPC returns a RPC client which connects to the given endpoint. // The check for empty endpoint implements the defaulting logic -// for "gdex attach" and "gdex monitor" with no argument. +// for "gtan attach" and "gtan monitor" with no argument. func dialRPC(endpoint string) (*rpc.Client, error) { if endpoint == "" { endpoint = node.DefaultIPCEndpoint(clientIdentifier) } else if strings.HasPrefix(endpoint, "rpc:") || strings.HasPrefix(endpoint, "ipc:") { - // Backwards compatibility with gdex < 1.5 which required + // Backwards compatibility with gtan < 1.5 which required // these prefixes. endpoint = endpoint[4:] } return rpc.Dial(endpoint) } -// ephemeralConsole starts a new gdex node, attaches an ephemeral JavaScript +// ephemeralConsole starts a new gtan node, attaches an ephemeral JavaScript // console to it, executes each of the files specified as arguments and tears // everything down. func ephemeralConsole(ctx *cli.Context) error { @@ -187,7 +187,7 @@ func ephemeralConsole(ctx *cli.Context) error { // Attach to the newly started node and start the JavaScript console client, err := node.Attach() if err != nil { - utils.Fatalf("Failed to attach to the inproc gdex: %v", err) + utils.Fatalf("Failed to attach to the inproc gtan: %v", err) } config := console.Config{ DataDir: utils.MakeDataDir(ctx), diff --git a/cmd/gdex/consolecmd_test.go b/cmd/gtan/consolecmd_test.go index c1174f9e6..4cbb1c00d 100644 --- a/cmd/gdex/consolecmd_test.go +++ b/cmd/gtan/consolecmd_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/params" ) const ( @@ -40,32 +40,32 @@ const ( func TestConsoleWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" - // Start a gdex console, make sure it's cleaned up and terminate the console - gdex := runGeth(t, + // Start a gtan console, make sure it's cleaned up and terminate the console + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--shh", "console") // Gather all the infos the welcome message needs to contain - gdex.SetTemplateFunc("goos", func() string { return runtime.GOOS }) - gdex.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) - gdex.SetTemplateFunc("gover", runtime.Version) - gdex.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) - gdex.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) - gdex.SetTemplateFunc("apis", func() string { return ipcAPIs }) + gtan.SetTemplateFunc("goos", func() string { return runtime.GOOS }) + gtan.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) + gtan.SetTemplateFunc("gover", runtime.Version) + gtan.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) + gtan.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) + gtan.SetTemplateFunc("apis", func() string { return ipcAPIs }) // Verify the actual welcome message to the required template - gdex.Expect(` + gtan.Expect(` Welcome to the Geth JavaScript console! -instance: gdex/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} +instance: gtan/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} at block: 0 ({{dextime}}) datadir: {{.Datadir}} modules: {{apis}} > {{.InputLine "exit"}} `) - gdex.ExpectExit() + gtan.ExpectExit() } // Tests that a console can be attached to a running node via various means. @@ -74,56 +74,56 @@ func TestIPCAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" var ipc string if runtime.GOOS == "windows" { - ipc = `\\.\pipe\gdex` + strconv.Itoa(trulyRandInt(100000, 999999)) + ipc = `\\.\pipe\gtan` + strconv.Itoa(trulyRandInt(100000, 999999)) } else { ws := tmpdir(t) defer os.RemoveAll(ws) - ipc = filepath.Join(ws, "gdex.ipc") + ipc = filepath.Join(ws, "gtan.ipc") } // Note: we need --shh because testAttachWelcome checks for default // list of ipc modules and shh is included there. - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--shh", "--ipcpath", ipc) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "ipc:"+ipc, ipcAPIs) + testAttachWelcome(t, gtan, "ipc:"+ipc, ipcAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } func TestHTTPAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" port := strconv.Itoa(trulyRandInt(1024, 65536)) // Yeah, sometimes this will fail, sorry :P - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--rpc", "--rpcport", port) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "http://localhost:"+port, httpAPIs) + testAttachWelcome(t, gtan, "http://localhost:"+port, httpAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } func TestWSAttachWelcome(t *testing.T) { coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" port := strconv.Itoa(trulyRandInt(1024, 65536)) // Yeah, sometimes this will fail, sorry :P - gdex := runGeth(t, + gtan := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--ws", "--wsport", port) time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open - testAttachWelcome(t, gdex, "ws://localhost:"+port, httpAPIs) + testAttachWelcome(t, gtan, "ws://localhost:"+port, httpAPIs) - gdex.Interrupt() - gdex.ExpectExit() + gtan.Interrupt() + gtan.ExpectExit() } -func testAttachWelcome(t *testing.T, gdex *testgdex, endpoint, apis string) { - // Attach to a running gdex note and terminate immediately +func testAttachWelcome(t *testing.T, gtan *testgtan, endpoint, apis string) { + // Attach to a running gtan note and terminate immediately attach := runGeth(t, "attach", endpoint) defer attach.ExpectExit() attach.CloseStdin() @@ -133,17 +133,17 @@ func testAttachWelcome(t *testing.T, gdex *testgdex, endpoint, apis string) { attach.SetTemplateFunc("goarch", func() string { return runtime.GOARCH }) attach.SetTemplateFunc("gover", runtime.Version) attach.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta }) - attach.SetTemplateFunc("etherbase", func() string { return gdex.Etherbase }) + attach.SetTemplateFunc("etherbase", func() string { return gtan.Etherbase }) attach.SetTemplateFunc("dextime", func() string { return time.Unix(int64(params.MainnetChainConfig.DMoment), 0).Format(time.RFC1123) }) attach.SetTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") }) - attach.SetTemplateFunc("datadir", func() string { return gdex.Datadir }) + attach.SetTemplateFunc("datadir", func() string { return gtan.Datadir }) attach.SetTemplateFunc("apis", func() string { return apis }) // Verify the actual welcome message to the required template attach.Expect(` Welcome to the Geth JavaScript console! -instance: gdex/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} +instance: gtan/v{{gethver}}/{{goos}}-{{goarch}}/{{gover}} at block: 0 ({{dextime}}){{if ipc}} datadir: {{datadir}}{{end}} modules: {{apis}} diff --git a/cmd/gdex/dao_test.go b/cmd/gtan/dao_test.go index 1e8cfc487..ba62a91de 100644 --- a/cmd/gdex/dao_test.go +++ b/cmd/gtan/dao_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/params" ) // Genesis block for nodes which don't care about the DAO fork (i.e. not configured) @@ -116,11 +116,11 @@ func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBloc } else { // Force chain initialization args := []string{"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--datadir", datadir} - gdex := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...) - gdex.WaitExit() + gtan := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...) + gtan.WaitExit() } // Retrieve the DAO config flag from the database - path := filepath.Join(datadir, "gdex", "chaindata") + path := filepath.Join(datadir, "gtan", "chaindata") db, err := ethdb.NewLDBDatabase(path, 0, 0) if err != nil { t.Fatalf("test %d: failed to open test database: %v", test, err) diff --git a/cmd/gdex/genesis_test.go b/cmd/gtan/genesis_test.go index 9187a68bf..8056559b5 100644 --- a/cmd/gdex/genesis_test.go +++ b/cmd/gtan/genesis_test.go @@ -107,11 +107,11 @@ func TestCustomGenesis(t *testing.T) { runGeth(t, "--datadir", datadir, "init", json).WaitExit() // Query the custom genesis block - gdex := runGeth(t, + gtan := runGeth(t, "--datadir", datadir, "--maxpeers", "0", "--port", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--exec", tt.query, "console") - gdex.ExpectRegexp(tt.result) - gdex.ExpectExit() + gtan.ExpectRegexp(tt.result) + gtan.ExpectExit() } } diff --git a/cmd/gdex/main.go b/cmd/gtan/main.go index 3c9e598a5..311c81187 100644 --- a/cmd/gdex/main.go +++ b/cmd/gtan/main.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. -// gdex is the official command-line client for Ethereum. +// gtan is the official command-line client for Ethereum. package main import ( @@ -27,23 +27,23 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/ethclient" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/node" "github.com/elastic/gosigar" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/ethclient" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/node" cli "gopkg.in/urfave/cli.v1" ) const ( - clientIdentifier = "gdex" // Client identifier to advertise over the network + clientIdentifier = "gtan" // Client identifier to advertise over the network ) var ( @@ -178,7 +178,7 @@ var ( func init() { // Initialize the CLI app and start Geth - app.Action = gdex + app.Action = gtan app.HideVersion = true // we have a command to print the version app.Copyright = "Copyright 2013-2018 The go-ethereum Authors" app.Commands = []cli.Command{ @@ -265,10 +265,10 @@ func main() { } } -// gdex is the main entry point into the system if no special subcommand is ran. +// gtan is the main entry point into the system if no special subcommand is ran. // It creates a default node based on the command line arguments and runs it in // blocking mode, waiting for it to be shut down. -func gdex(ctx *cli.Context) error { +func gtan(ctx *cli.Context) error { if args := ctx.Args(); len(args) > 0 { return fmt.Errorf("invalid command: %q", args[0]) } @@ -368,9 +368,9 @@ func startNode(ctx *cli.Context, stack *node.Node) { if ctx.GlobalString(utils.SyncModeFlag.Name) == "light" { utils.Fatalf("Light clients do not support proposing") } - var dexon *dex.Dexon + var dexon *dex.Tangerine if err := stack.Service(&dexon); err != nil { - utils.Fatalf("Dexon service not running: %v", err) + utils.Fatalf("Tangerine service not running: %v", err) } } } diff --git a/cmd/gdex/misccmd.go b/cmd/gtan/misccmd.go index 4109832a5..c5190555a 100644 --- a/cmd/gdex/misccmd.go +++ b/cmd/gtan/misccmd.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/params" "gopkg.in/urfave/cli.v1" ) @@ -80,7 +80,7 @@ The output of this command is supposed to be machine-readable. func makecache(ctx *cli.Context) error { args := ctx.Args() if len(args) != 2 { - utils.Fatalf(`Usage: gdex makecache <block number> <outputdir>`) + utils.Fatalf(`Usage: gtan makecache <block number> <outputdir>`) } block, err := strconv.ParseUint(args[0], 0, 64) if err != nil { @@ -95,7 +95,7 @@ func makecache(ctx *cli.Context) error { func makedag(ctx *cli.Context) error { args := ctx.Args() if len(args) != 2 { - utils.Fatalf(`Usage: gdex makedag <block number> <outputdir>`) + utils.Fatalf(`Usage: gtan makedag <block number> <outputdir>`) } block, err := strconv.ParseUint(args[0], 0, 64) if err != nil { @@ -134,6 +134,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with gdex. If not, see <http://www.gnu.org/licenses/>.`) +along with gtan. If not, see <http://www.gnu.org/licenses/>.`) return nil } diff --git a/cmd/gdex/monitorcmd.go b/cmd/gtan/monitorcmd.go index 1038fe3a2..1ef1f7888 100644 --- a/cmd/gdex/monitorcmd.go +++ b/cmd/gtan/monitorcmd.go @@ -25,10 +25,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rpc" "github.com/gizak/termui" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) @@ -76,7 +76,7 @@ func monitor(ctx *cli.Context) error { // Attach to an Ethereum node over IPC or RPC endpoint := ctx.String(monitorCommandAttachFlag.Name) if client, err = dialRPC(endpoint); err != nil { - utils.Fatalf("Unable to attach to gdex node: %v", err) + utils.Fatalf("Unable to attach to gtan node: %v", err) } defer client.Close() @@ -93,7 +93,7 @@ func monitor(ctx *cli.Context) error { if len(list) > 0 { utils.Fatalf("No metrics specified.\n\nAvailable:\n - %s", strings.Join(list, "\n - ")) } else { - utils.Fatalf("No metrics collected by gdex (--%s).\n", utils.MetricsEnabledFlag.Name) + utils.Fatalf("No metrics collected by gtan (--%s).\n", utils.MetricsEnabledFlag.Name) } } sort.Strings(monitored) @@ -158,7 +158,7 @@ func monitor(ctx *cli.Context) error { return nil } -// retrieveMetrics contacts the attached gdex node and retrieves the entire set +// retrieveMetrics contacts the attached gtan node and retrieves the entire set // of collected system metrics. func retrieveMetrics(client *rpc.Client) (map[string]interface{}, error) { var metrics map[string]interface{} diff --git a/cmd/gdex/run_test.go b/cmd/gtan/run_test.go index a53a914d2..513b9b293 100644 --- a/cmd/gdex/run_test.go +++ b/cmd/gtan/run_test.go @@ -22,19 +22,19 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func tmpdir(t *testing.T) string { - dir, err := ioutil.TempDir("", "gdex-test") + dir, err := ioutil.TempDir("", "gtan-test") if err != nil { t.Fatal(err) } return dir } -type testgdex struct { +type testgtan struct { *cmdtest.TestCmd // template variables for expect @@ -43,8 +43,8 @@ type testgdex struct { } func init() { - // Run the app if we've been exec'd as "gdex-test" in runGeth. - reexec.Register("gdex-test", func() { + // Run the app if we've been exec'd as "gtan-test" in runGeth. + reexec.Register("gtan-test", func() { if err := app.Run(os.Args); err != nil { fmt.Fprintln(os.Stderr, err) os.Exit(1) @@ -61,10 +61,10 @@ func TestMain(m *testing.M) { os.Exit(m.Run()) } -// spawns gdex with the given command line args. If the args don't set --datadir, the +// spawns gtan with the given command line args. If the args don't set --datadir, the // child g gets a temporary data directory. -func runGeth(t *testing.T, args ...string) *testgdex { - tt := &testgdex{} +func runGeth(t *testing.T, args ...string) *testgtan { + tt := &testgtan{} tt.TestCmd = cmdtest.NewTestCmd(t, tt) for i, arg := range args { switch { @@ -90,9 +90,9 @@ func runGeth(t *testing.T, args ...string) *testgdex { }() } - // Boot "gdex". This actually runs the test binary but the TestMain + // Boot "gtan". This actually runs the test binary but the TestMain // function will prevent any tests from running. - tt.Run("gdex-test", args...) + tt.Run("gtan-test", args...) return tt } diff --git a/cmd/gdex/testdata/empty.js b/cmd/gtan/testdata/empty.js index 8b1378917..8b1378917 100644 --- a/cmd/gdex/testdata/empty.js +++ b/cmd/gtan/testdata/empty.js diff --git a/cmd/gdex/testdata/guswallet.json b/cmd/gtan/testdata/guswallet.json index e8ea4f332..e8ea4f332 100644 --- a/cmd/gdex/testdata/guswallet.json +++ b/cmd/gtan/testdata/guswallet.json diff --git a/cmd/gdex/testdata/passwords.txt b/cmd/gtan/testdata/passwords.txt index 96f98c7f4..96f98c7f4 100644 --- a/cmd/gdex/testdata/passwords.txt +++ b/cmd/gtan/testdata/passwords.txt diff --git a/cmd/gdex/testdata/wrong-passwords.txt b/cmd/gtan/testdata/wrong-passwords.txt index 7d1e338bb..7d1e338bb 100644 --- a/cmd/gdex/testdata/wrong-passwords.txt +++ b/cmd/gtan/testdata/wrong-passwords.txt diff --git a/cmd/gdex/usage.go b/cmd/gtan/usage.go index 093115b93..117aa17a8 100644 --- a/cmd/gdex/usage.go +++ b/cmd/gtan/usage.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>. -// Contains the gdex command usage template and generator. +// Contains the gtan command usage template and generator. package main @@ -24,8 +24,8 @@ import ( "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/internal/debug" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/internal/debug" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/nodekey/main.go b/cmd/nodekey/main.go index 81aef039f..668ddf3b1 100644 --- a/cmd/nodekey/main.go +++ b/cmd/nodekey/main.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/crypto" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index f4fdff6d5..7eba5c50c 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -45,12 +45,12 @@ import ( "strings" "text/tabwriter" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/rpc" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go index 9cde461b2..8cfadc841 100644 --- a/cmd/puppeth/genesis.go +++ b/cmd/puppeth/genesis.go @@ -23,12 +23,12 @@ import ( "math/big" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - math2 "github.com/dexon-foundation/dexon/common/math" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + math2 "github.com/tangerine-network/go-tangerine/common/math" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/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 552bf99c2..0d028c899 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/dexon-foundation/dexon/core" + "github.com/tangerine-network/go-tangerine/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 8a9757aa8..1009ff07a 100644 --- a/cmd/puppeth/module.go +++ b/cmd/puppeth/module.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) var ( diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go index 933150e53..6e508db2a 100644 --- a/cmd/puppeth/module_dashboard.go +++ b/cmd/puppeth/module_dashboard.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // dashboardContent is the actual dashboard HTML content to serve up when users @@ -84,7 +84,7 @@ var dashboardContent = ` {{if .FaucetPage}}<li id="faucet_menu"><a onclick="load('#faucet')"><i class="fa fa-bath"></i> Crypto Faucet</a></li>{{end}} <li id="connect_menu"><a><i class="fa fa-plug"></i> Connect Yourself</a> <ul id="connect_list" class="nav child_menu"> - <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#gdex')">Go Ethereum: Geth</a></li> + <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#gtan')">Go Ethereum: Geth</a></li> <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#mist')">Go Ethereum: Wallet & Mist</a></li> <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#mobile')">Go Ethereum: Android & iOS</a></li>{{if .Ethash}} <li><a onclick="$('#connect_menu').removeClass('active'); $('#connect_list').toggle(); load('#other')">Other Ethereum Clients</a></li>{{end}} @@ -97,7 +97,7 @@ var dashboardContent = ` </div> </div> <div class="right_col" role="main" style="padding: 0 !important"> - <div id="gdex" hidden style="padding: 16px;"> + <div id="gtan" hidden style="padding: 16px;"> <div class="page-title"> <div class="title_left"> <h3>Connect Yourself – Go Ethereum: Geth</h3> @@ -116,11 +116,11 @@ var dashboardContent = ` <p>Initial processing required to execute all transactions may require non-negligible time and disk capacity required to store all past state may be non-insignificant. High end machines with SSD storage, modern CPUs and 8GB+ RAM are recommended.</p> <br/> <p>To run an archive node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=1024 --syncmode=full{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=1024 --syncmode=full{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -135,11 +135,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is more bandwidth intensive, but is light on the CPU and has significantly reduced disk requirements. Mid range machines with HDD storage, decent CPUs and 4GB+ RAM should be enough.</p> <br/> <p>To run a full node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=512{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=512{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -157,11 +157,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is light, as it only verifies the validity of the headers; similarly required disk capacity is small, tallying around 500 bytes per header. Low end machines with arbitrary storage, weak CPUs and 512MB+ RAM should cope well.</p> <br/> <p>To run a light node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -176,11 +176,11 @@ var dashboardContent = ` <p>Initial processing required to synchronize is light, as it only verifies the validity of the headers; similarly required disk capacity is small, tallying around 500 bytes per header. Embedded machines with arbitrary storage, low power CPUs and 128MB+ RAM may work.</p> <br/> <p>To run an embedded node, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and start Geth with: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> - <pre>gdex --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=16 --ethash.cachesinmem=1 --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --networkid={{.NetworkID}} --datadir=$HOME/.{{.Network}} --cache=16 --ethash.cachesinmem=1 --syncmode=light{{if .Ethstats}} --ethstats='{{.Ethstats}}'{{end}} --bootnodes={{.BootnodesFlat}}</pre> </p> <br/> - <p>You can download Geth from <a href="https://gdex.ethereum.org/downloads/" target="about:blank">https://gdex.ethereum.org/downloads/</a>.</p> + <p>You can download Geth from <a href="https://gtan.ethereum.org/downloads/" target="about:blank">https://gtan.ethereum.org/downloads/</a>.</p> </div> </div> </div> @@ -205,10 +205,10 @@ var dashboardContent = ` <p>Under the hood the wallet is backed by a go-ethereum full node, meaning that a mid range machine is assumed. Similarly, synchronization is based on <strong>fast-sync</strong>, which will download all blockchain data from the network and make it available to the wallet. Light nodes cannot currently fully back the wallet, but it's a target actively pursued.</p> <br/> <p>To connect with the Ethereum Wallet, you'll need to initialize your private network first via Geth as the wallet does not currently support calling Geth directly. To initialize your local chain, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and run: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> </p> <p>With your local chain initialized, you can start the Ethereum Wallet: - <pre>ethereumwallet --rpc $HOME/.{{.Network}}/gdex.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> + <pre>ethereumwallet --rpc $HOME/.{{.Network}}/gtan.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> <p> <br/> <p>You can download the Ethereum Wallet from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p> @@ -226,10 +226,10 @@ var dashboardContent = ` <p>Under the hood the browser is backed by a go-ethereum full node, meaning that a mid range machine is assumed. Similarly, synchronization is based on <strong>fast-sync</strong>, which will download all blockchain data from the network and make it available to the wallet. Light nodes cannot currently fully back the wallet, but it's a target actively pursued.</p> <br/> <p>To connect with the Mist browser, you'll need to initialize your private network first via Geth as Mist does not currently support calling Geth directly. To initialize your local chain, download <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> and run: - <pre>gdex --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> + <pre>gtan --datadir=$HOME/.{{.Network}} init {{.GethGenesis}}</pre> </p> <p>With your local chain initialized, you can start Mist: - <pre>mist --rpc $HOME/.{{.Network}}/gdex.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> + <pre>mist --rpc $HOME/.{{.Network}}/gtan.ipc --node-networkid={{.NetworkID}} --node-datadir=$HOME/.{{.Network}}{{if .Ethstats}} --node-ethstats='{{.Ethstats}}'{{end}} --node-bootnodes={{.BootnodesFlat}}</pre> <p> <br/> <p>You can download the Mist browser from <a href="https://github.com/ethereum/mist/releases" target="about:blank">https://github.com/ethereum/mist/releases</a>.</p> @@ -256,10 +256,10 @@ var dashboardContent = ` <p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for Java based Android projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from Android too.</p> <p>Under the hood the Android library is backed by a go-ethereum light node, meaning that given a not-too-old Android device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p> <br/> - <p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/dexon-foundation/dexon/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction – Android archive</a>. + <p>The stable Android archives are distributed via Maven Central, and the develop snapshots via the Sonatype repositories. Before proceeding, please ensure you have a recent version configured in your Android project. You can find details in <a href="https://github.com/tangerine-network/go-tangerine/wiki/Mobile:-Introduction#android-archive" target="about:blank">Mobile: Introduction – Android archive</a>. <p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your Android project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p> - <p>Inside your Java code you can now import the gdex archive and connect to Ethereum: - <pre>import org.ethereum.gdex.*;</pre> + <p>Inside your Java code you can now import the gtan archive and connect to Ethereum: + <pre>import org.ethereum.gtan.*;</pre> <pre> Enodes bootnodes = new Enodes();{{range .Bootnodes}} bootnodes.append(new Enode("{{.}}"));{{end}} @@ -287,9 +287,9 @@ node.start(); <p>Starting with the 1.5 release of go-ethereum, we've transitioned away from shipping only full blown Ethereum clients and started focusing on releasing the code as reusable packages initially for Go projects, then later for ObjC/Swift based iOS projects too. Mobile support is still evolving, hence is bound to change often and hard, but the Ethereum network can nonetheless be accessed from iOS too.</p> <p>Under the hood the iOS library is backed by a go-ethereum light node, meaning that given a not-too-old Apple device, you should be able to join the network without significant issues. Certain functionality is not yet available and rough edges are bound to appear here and there, please report issues if you find any.</p> <br/> - <p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/dexon-foundation/dexon/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction – iOS framework</a>. + <p>Both stable and develop builds of the iOS framework are available via CocoaPods. Before proceeding, please ensure you have a recent version configured in your iOS project. You can find details in <a href="https://github.com/tangerine-network/go-tangerine/wiki/Mobile:-Introduction#ios-framework" target="about:blank">Mobile: Introduction – iOS framework</a>. <p>Before connecting to the Ethereum network, download the <a href="/{{.GethGenesis}}"><code>{{.GethGenesis}}</code></a> genesis json file and either store it in your iOS project as a resource file you can access, or save it as a string in a variable. You're going to need to to initialize your client.</p> - <p>Inside your Swift code you can now import the gdex framework and connect to Ethereum (ObjC should be analogous): + <p>Inside your Swift code you can now import the gtan framework and connect to Ethereum (ObjC should be analogous): <pre>import Geth</pre> <pre> var error: NSError? @@ -419,7 +419,7 @@ try! node?.start(); <p>Puppeth is a tool to aid you in creating a new Ethereum network down to the genesis block, bootnodes, signers, ethstats server, crypto faucet, wallet browsers, block explorer, dashboard and more; without the hassle that it would normally entail to manually configure all these services one by one.</p> <p>Puppeth uses ssh to dial in to remote servers, and builds its network components out of docker containers using docker-compose. The user is guided through the process via a command line wizard that does the heavy lifting and topology configuration automatically behind the scenes.</p> <br/> - <p>Puppeth is distributed as part of the <a href="https://gdex.ethereum.org/downloads/" target="about:blank">Geth & Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/dexon-foundation/dexon/cmd/puppeth</pre></p> + <p>Puppeth is distributed as part of the <a href="https://gtan.ethereum.org/downloads/" target="about:blank">Geth & Tools</a> bundles, but can also be installed separately via:<pre>go get github.com/tangerine-network/go-tangerine/cmd/puppeth</pre></p> <br/> <p><em>Copyright 2017. The go-ethereum Authors.</em></p> </div> @@ -445,7 +445,7 @@ try! node?.start(); window.location.hash = hash; // Fade out all possible pages (yes, ugly, no, don't care) - $("#gdex").fadeOut(300) + $("#gtan").fadeOut(300) $("#mist").fadeOut(300) $("#mobile").fadeOut(300) $("#other").fadeOut(300) diff --git a/cmd/puppeth/module_ethstats.go b/cmd/puppeth/module_ethstats.go index deb5b4de2..a98345372 100644 --- a/cmd/puppeth/module_ethstats.go +++ b/cmd/puppeth/module_ethstats.go @@ -25,7 +25,7 @@ import ( "strings" "text/template" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 45a7dab02..e636e9640 100644 --- a/cmd/puppeth/module_explorer.go +++ b/cmd/puppeth/module_explorer.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 500ae51da..0970112f1 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -26,8 +26,8 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/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 301933342..cfbc4b8aa 100644 --- a/cmd/puppeth/module_nginx.go +++ b/cmd/puppeth/module_nginx.go @@ -24,7 +24,7 @@ import ( "path/filepath" "strconv" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 64f7e52e4..1312e1fdf 100644 --- a/cmd/puppeth/module_node.go +++ b/cmd/puppeth/module_node.go @@ -26,8 +26,8 @@ import ( "strings" "text/template" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" ) // nodeDockerfile is the Dockerfile required to run an Ethereum node. @@ -40,11 +40,11 @@ ADD genesis.json /genesis.json ADD signer.pass /signer.pass {{end}} RUN \ - echo 'gdex --cache 512 init /genesis.json' > gdex.sh && \{{if .Unlock}} - echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> gdex.sh && \{{end}} - echo $'exec gdex --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> gdex.sh + echo 'gtan --cache 512 init /genesis.json' > gtan.sh && \{{if .Unlock}} + echo 'mkdir -p /root/.ethereum/keystore/ && cp /signer.json /root/.ethereum/keystore/' >> gtan.sh && \{{end}} + echo $'exec gtan --networkid {{.NetworkID}} --cache 512 --port {{.Port}} --nat extip:{{.IP}} --maxpeers {{.Peers}} {{.LightFlag}} --ethstats \'{{.Ethstats}}\' {{if .Bootnodes}}--bootnodes {{.Bootnodes}}{{end}} {{if .Etherbase}}--miner.etherbase {{.Etherbase}} --mine --miner.threads 1{{end}} {{if .Unlock}}--unlock 0 --password /signer.pass --mine{{end}} --miner.gastarget {{.GasTarget}} --miner.gaslimit {{.GasLimit}} --miner.gasprice {{.GasPrice}}' >> gtan.sh -ENTRYPOINT ["/bin/sh", "gdex.sh"] +ENTRYPOINT ["/bin/sh", "gtan.sh"] ` // nodeComposefile is the docker-compose.yml file required to deploy and maintain @@ -229,7 +229,7 @@ func checkNode(client *sshClient, network string, boot bool) (*nodeInfos, error) // Container available, retrieve its node ID and its genesis json var out []byte - if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 gdex --exec admin.nodeInfo.id --cache=16 attach", network, kind)); err != nil { + if out, err = client.Run(fmt.Sprintf("docker exec %s_%s_1 gtan --exec admin.nodeInfo.id --cache=16 attach", network, kind)); err != nil { return nil, ErrServiceUnreachable } enode := bytes.Trim(bytes.TrimSpace(out), "\"") diff --git a/cmd/puppeth/module_wallet.go b/cmd/puppeth/module_wallet.go index 0539c19e4..8dab8e350 100644 --- a/cmd/puppeth/module_wallet.go +++ b/cmd/puppeth/module_wallet.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // walletDockerfile is the Dockerfile required to run a web wallet. @@ -36,8 +36,8 @@ ADD genesis.json /genesis.json RUN \ echo 'node server.js &' > wallet.sh && \ - echo 'gdex --cache 512 init /genesis.json' >> wallet.sh && \ - echo $'exec gdex --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh + echo 'gtan --cache 512 init /genesis.json' >> wallet.sh && \ + echo $'exec gtan --networkid {{.NetworkID}} --port {{.NodePort}} --bootnodes {{.Bootnodes}} --ethstats \'{{.Ethstats}}\' --cache=512 --rpc --rpcaddr=0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*"' >> wallet.sh RUN \ sed -i 's/PuppethNetworkID/{{.NetworkID}}/g' dist/js/etherwallet-master.js && \ diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go index efcdba8b3..cfd68163b 100644 --- a/cmd/puppeth/puppeth.go +++ b/cmd/puppeth/puppeth.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go index b26ea0856..bf297f9ed 100644 --- a/cmd/puppeth/ssh.go +++ b/cmd/puppeth/ssh.go @@ -28,7 +28,7 @@ import ( "path/filepath" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 69fa52c14..f2c834e5e 100644 --- a/cmd/puppeth/wizard.go +++ b/cmd/puppeth/wizard.go @@ -31,9 +31,9 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/puppeth/wizard_dashboard.go b/cmd/puppeth/wizard_dashboard.go index 15126ddf0..91601616e 100644 --- a/cmd/puppeth/wizard_dashboard.go +++ b/cmd/puppeth/wizard_dashboard.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 5eb333188..9baf62b0e 100644 --- a/cmd/puppeth/wizard_ethstats.go +++ b/cmd/puppeth/wizard_ethstats.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 0818e9d5b..7388e57f3 100644 --- a/cmd/puppeth/wizard_explorer.go +++ b/cmd/puppeth/wizard_explorer.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 0ef0eef74..00df36cf8 100644 --- a/cmd/puppeth/wizard_faucet.go +++ b/cmd/puppeth/wizard_faucet.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/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 9f80d1ee8..7934e2b89 100644 --- a/cmd/puppeth/wizard_genesis.go +++ b/cmd/puppeth/wizard_genesis.go @@ -29,10 +29,10 @@ import ( "path/filepath" "time" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/params" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/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 f421c97f9..fb2e807a2 100644 --- a/cmd/puppeth/wizard_intro.go +++ b/cmd/puppeth/wizard_intro.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/log" ) // makeWizard creates and returns a new puppeth wizard. diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go index 6909070a3..a26ddffd8 100644 --- a/cmd/puppeth/wizard_netstats.go +++ b/cmd/puppeth/wizard_netstats.go @@ -23,9 +23,9 @@ import ( "strings" "sync" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/log" "github.com/olekukonko/tablewriter" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/log" ) // networkStats verifies the status of network components and generates a protip diff --git a/cmd/puppeth/wizard_network.go b/cmd/puppeth/wizard_network.go index df8fb872a..0e15a1845 100644 --- a/cmd/puppeth/wizard_network.go +++ b/cmd/puppeth/wizard_network.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 7bf3f2336..4c1afccb4 100644 --- a/cmd/puppeth/wizard_nginx.go +++ b/cmd/puppeth/wizard_nginx.go @@ -19,7 +19,7 @@ package main import ( "fmt" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 0412deaf6..a904f26d5 100644 --- a/cmd/puppeth/wizard_node.go +++ b/cmd/puppeth/wizard_node.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/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 6bf25cee9..0976088f0 100644 --- a/cmd/puppeth/wizard_wallet.go +++ b/cmd/puppeth/wizard_wallet.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 639fa6d45..27a922260 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/rlp" ) var ( diff --git a/cmd/swarm/access.go b/cmd/swarm/access.go index a1cefa271..5bd064bcd 100644 --- a/cmd/swarm/access.go +++ b/cmd/swarm/access.go @@ -23,9 +23,9 @@ import ( "io/ioutil" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index 498d668cd..863404c6b 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -31,12 +31,12 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/crypto/ecies" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarmapi "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/crypto/ecies" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarmapi "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/testutil" "golang.org/x/crypto/sha3" ) diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 39f26a7e1..966d828f6 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -29,13 +29,13 @@ import ( cli "gopkg.in/urfave/cli.v1" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" "github.com/naoina/toml" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" - bzzapi "github.com/dexon-foundation/dexon/swarm/api" + bzzapi "github.com/tangerine-network/go-tangerine/swarm/api" ) var ( @@ -97,7 +97,7 @@ var tomlSettings = toml.Config{ MissingField: func(rt reflect.Type, field string) error { link := "" if unicode.IsUpper(rune(rt.Name()[0])) && rt.PkgPath() != "main" { - link = fmt.Sprintf(", check github.com/dexon-foundation/dexon/swarm/api/config.go for available fields") + link = fmt.Sprintf(", check github.com/tangerine-network/go-tangerine/swarm/api/config.go for available fields") } return fmt.Errorf("field '%s' is not defined in %s%s", field, rt.String(), link) }, @@ -127,7 +127,7 @@ func initSwarmNode(config *bzzapi.Config, stack *node.Node, ctx *cli.Context) { //at this point, all vars should be set in the Config //get the account for the provided swarm account prvkey := getAccount(config.BzzAccount, ctx, stack) - //set the resolved config path (gdex --datadir) + //set the resolved config path (gtan --datadir) config.Path = expandPath(stack.InstanceDir()) //finally, initialize the configuration config.Init(prvkey) diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 17abb7c78..05d48087a 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/api" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/api" ) func TestConfigDump(t *testing.T) { @@ -473,7 +473,7 @@ func TestConfigValidate(t *testing.T) { }{ { cfg: &api.Config{EnsAPIs: []string{ - "/data/testnet/gdex.ipc", + "/data/testnet/gtan.ipc", }}, }, { @@ -488,7 +488,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "test:/data/testnet/gdex.ipc", + "test:/data/testnet/gtan.ipc", }}, }, { @@ -498,7 +498,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc", + "314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gtan.ipc", }}, }, { @@ -513,7 +513,7 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gdex.ipc", + "test:314159265dD8dbb310642f98f50C066173C1259b@/data/testnet/gtan.ipc", }}, }, { @@ -546,9 +546,9 @@ func TestConfigValidate(t *testing.T) { }, { cfg: &api.Config{EnsAPIs: []string{ - "@/data/testnet/gdex.ipc", + "@/data/testnet/gtan.ipc", }}, - err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/gdex.ipc\": missing contract address", + err: "invalid format [tld:][contract-addr@]url for ENS API endpoint configuration \"@/data/testnet/gtan.ipc\": missing contract address", }, } { err := validateConfig(c.cfg) diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go index 6445883ad..a8bcb38e1 100644 --- a/cmd/swarm/db.go +++ b/cmd/swarm/db.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/download.go b/cmd/swarm/download.go index 63f1131d6..67bdf0eb4 100644 --- a/cmd/swarm/download.go +++ b/cmd/swarm/download.go @@ -21,10 +21,10 @@ import ( "path/filepath" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/explore.go b/cmd/swarm/explore.go index 2280cade8..dc70a3d2c 100644 --- a/cmd/swarm/explore.go +++ b/cmd/swarm/explore.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index 21bd9d4b0..89286f51f 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) // TestCLISwarmExportImport perform the following test: diff --git a/cmd/swarm/feeds.go b/cmd/swarm/feeds.go index 9b6f67a45..ea589b331 100644 --- a/cmd/swarm/feeds.go +++ b/cmd/swarm/feeds.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" - "github.com/dexon-foundation/dexon/cmd/utils" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/cmd/utils" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/feeds_test.go b/cmd/swarm/feeds_test.go index 672cbade7..b4fdce759 100644 --- a/cmd/swarm/feeds_test.go +++ b/cmd/swarm/feeds_test.go @@ -23,15 +23,15 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/storage/feed/lookup" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed/lookup" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func TestCLIFeedUpdate(t *testing.T) { diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index ba68ed7b7..7917cc738 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -23,10 +23,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/fuse" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/fuse" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 096178ebf..8636c2b96 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/log" ) type testFile struct { diff --git a/cmd/swarm/global-store/global_store.go b/cmd/swarm/global-store/global_store.go index 1210e0c3c..5ff1a8647 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/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - "github.com/dexon-foundation/dexon/swarm/storage/mock/db" - "github.com/dexon-foundation/dexon/swarm/storage/mock/mem" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock/db" + "github.com/tangerine-network/go-tangerine/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 519c44627..5690686eb 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/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/rpc" - mockRPC "github.com/dexon-foundation/dexon/swarm/storage/mock/rpc" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/rpc" + mockRPC "github.com/tangerine-network/go-tangerine/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 82c6a5c3b..2926cc09a 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/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/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 095fe9e65..15f3d6bef 100644 --- a/cmd/swarm/global-store/run_test.go +++ b/cmd/swarm/global-store/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go index 7e7fa279e..b2f536118 100644 --- a/cmd/swarm/hash.go +++ b/cmd/swarm/hash.go @@ -22,8 +22,8 @@ import ( "fmt" "os" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/storage" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/storage" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go index 8ac9b7bd3..fbf93b541 100644 --- a/cmd/swarm/list.go +++ b/cmd/swarm/list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/dexon-foundation/dexon/cmd/utils" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 23d0a22e1..f806242d7 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -29,24 +29,24 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - bzzapi "github.com/dexon-foundation/dexon/swarm/api" - swarmmetrics "github.com/dexon-foundation/dexon/swarm/metrics" - "github.com/dexon-foundation/dexon/swarm/storage/mock" - mockrpc "github.com/dexon-foundation/dexon/swarm/storage/mock/rpc" - "github.com/dexon-foundation/dexon/swarm/tracing" - sv "github.com/dexon-foundation/dexon/swarm/version" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + bzzapi "github.com/tangerine-network/go-tangerine/swarm/api" + swarmmetrics "github.com/tangerine-network/go-tangerine/swarm/metrics" + "github.com/tangerine-network/go-tangerine/swarm/storage/mock" + mockrpc "github.com/tangerine-network/go-tangerine/swarm/storage/mock/rpc" + "github.com/tangerine-network/go-tangerine/swarm/tracing" + sv "github.com/tangerine-network/go-tangerine/swarm/version" cli "gopkg.in/urfave/cli.v1" ) @@ -91,7 +91,7 @@ var defaultSubcommandHelp = cli.Command{ var defaultNodeConfig = node.DefaultConfig -// This init function sets defaults so cmd/swarm can run alongside gdex. +// This init function sets defaults so cmd/swarm can run alongside gtan. func init() { sv.GitCommit = gitCommit defaultNodeConfig.Name = clientIdentifier @@ -275,9 +275,9 @@ func bzzd(ctx *cli.Context) error { //pss operates on ws cfg.WSModules = append(cfg.WSModules, "pss") - //gdex only supports --datadir via command line + //gtan only supports --datadir via command line //in order to be consistent within swarm, if we pass --datadir via environment variable - //or via config file, we get the same directory for gdex and swarm + //or via config file, we get the same directory for gtan and swarm if _, err := os.Stat(bzzconfig.Path); err == nil { cfg.DataDir = bzzconfig.Path } diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go index ad918b813..4cda941fc 100644 --- a/cmd/swarm/manifest.go +++ b/cmd/swarm/manifest.go @@ -22,9 +22,9 @@ import ( "os" "strings" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/manifest_test.go b/cmd/swarm/manifest_test.go index 55a0e596d..00a152255 100644 --- a/cmd/swarm/manifest_test.go +++ b/cmd/swarm/manifest_test.go @@ -24,9 +24,9 @@ import ( "runtime" "testing" - "github.com/dexon-foundation/dexon/swarm/api" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" + swarmhttp "github.com/tangerine-network/go-tangerine/swarm/api/http" ) // TestManifestChange tests manifest add, update and remove diff --git a/cmd/swarm/mimegen/generator.go b/cmd/swarm/mimegen/generator.go index c290351cc..c7daea735 100644 --- a/cmd/swarm/mimegen/generator.go +++ b/cmd/swarm/mimegen/generator.go @@ -101,7 +101,7 @@ func main() { } } -var tpl = `// Code generated by github.com/dexon-foundation/dexon/cmd/swarm/mimegen. DO NOT EDIT. +var tpl = `// Code generated by github.com/tangerine-network/go-tangerine/cmd/swarm/mimegen. DO NOT EDIT. package {{ .PackageName }} diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index c509ae307..d160859c4 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -32,16 +32,16 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/internal/cmdtest" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm" - "github.com/dexon-foundation/dexon/swarm/api" - swarmhttp "github.com/dexon-foundation/dexon/swarm/api/http" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm" + "github.com/tangerine-network/go-tangerine/swarm/api" + swarmhttp "github.com/tangerine-network/go-tangerine/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 66e36b71a..b6c4049b9 100644 --- a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/common/hexutil" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/storage/feed" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/common/hexutil" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/storage/feed" + "github.com/tangerine-network/go-tangerine/swarm/testutil" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-smoke/main.go b/cmd/swarm/swarm-smoke/main.go index 343c9c3bf..a70d08d5b 100644 --- a/cmd/swarm/swarm-smoke/main.go +++ b/cmd/swarm/swarm-smoke/main.go @@ -21,13 +21,13 @@ import ( "os" "sort" - "github.com/dexon-foundation/dexon/cmd/utils" - gethmetrics "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - swarmmetrics "github.com/dexon-foundation/dexon/swarm/metrics" - "github.com/dexon-foundation/dexon/swarm/tracing" + "github.com/tangerine-network/go-tangerine/cmd/utils" + gethmetrics "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + swarmmetrics "github.com/tangerine-network/go-tangerine/swarm/metrics" + "github.com/tangerine-network/go-tangerine/swarm/tracing" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/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 3b17952d4..a6412eb3c 100644 --- a/cmd/swarm/swarm-smoke/sliding_window.go +++ b/cmd/swarm/swarm-smoke/sliding_window.go @@ -22,10 +22,10 @@ import ( "math/rand" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/testutil" 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 1ea9f2b67..3e41aa460 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -26,13 +26,13 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/rpc" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/storage" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/rpc" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/storage" + "github.com/tangerine-network/go-tangerine/swarm/testutil" 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 b44374d4e..723655503 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/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/testutil" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/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 588af39c7..9d9b151a9 100644 --- a/cmd/swarm/swarm-smoke/util.go +++ b/cmd/swarm/swarm-smoke/util.go @@ -32,13 +32,13 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/swarm/api" - "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/spancontext" opentracing "github.com/opentracing/opentracing-go" "github.com/pborman/uuid" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/swarm/api" + "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/spancontext" cli "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/swarm-snapshot/create.go b/cmd/swarm/swarm-snapshot/create.go index 2e4dc084d..a56672f79 100644 --- a/cmd/swarm/swarm-snapshot/create.go +++ b/cmd/swarm/swarm-snapshot/create.go @@ -29,12 +29,12 @@ import ( "sync" "time" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p/simulations" - "github.com/dexon-foundation/dexon/p2p/simulations/adapters" - "github.com/dexon-foundation/dexon/swarm/network" - "github.com/dexon-foundation/dexon/swarm/network/simulation" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p/simulations" + "github.com/tangerine-network/go-tangerine/p2p/simulations/adapters" + "github.com/tangerine-network/go-tangerine/swarm/network" + "github.com/tangerine-network/go-tangerine/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 5ade096c3..f28d4846b 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/dexon-foundation/dexon/p2p/simulations" + "github.com/tangerine-network/go-tangerine/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 11e4174d0..55b834efb 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/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/log" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/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 e02f06682..69e0d89a0 100644 --- a/cmd/swarm/swarm-snapshot/run_test.go +++ b/cmd/swarm/swarm-snapshot/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/dexon-foundation/dexon/internal/cmdtest" "github.com/docker/docker/pkg/reexec" + "github.com/tangerine-network/go-tangerine/internal/cmdtest" ) func init() { diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 8603d58f3..fd62bf2b0 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/dexon-foundation/dexon/log" - swarm "github.com/dexon-foundation/dexon/swarm/api/client" + "github.com/tangerine-network/go-tangerine/log" + swarm "github.com/tangerine-network/go-tangerine/swarm/api/client" - "github.com/dexon-foundation/dexon/cmd/utils" + "github.com/tangerine-network/go-tangerine/cmd/utils" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 6cdc53037..5ee48cc53 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -30,10 +30,10 @@ import ( "testing" "time" - "github.com/dexon-foundation/dexon/log" - swarmapi "github.com/dexon-foundation/dexon/swarm/api/client" - "github.com/dexon-foundation/dexon/swarm/testutil" "github.com/mattn/go-colorable" + "github.com/tangerine-network/go-tangerine/log" + swarmapi "github.com/tangerine-network/go-tangerine/swarm/api/client" + "github.com/tangerine-network/go-tangerine/swarm/testutil" ) func init() { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 839d470e3..3abdcadbe 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -27,16 +27,16 @@ import ( "strings" "syscall" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/rawdb" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/internal/debug" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/rlp" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/rawdb" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/internal/debug" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/rlp" ) const ( diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index c29736c2d..d433531fa 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "github.com/dexon-foundation/dexon/common/math" + "github.com/tangerine-network/go-tangerine/common/math" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 6ac26d1fe..544f328b8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,36 +28,36 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts" - "github.com/dexon-foundation/dexon/accounts/keystore" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/common/fdlimit" - "github.com/dexon-foundation/dexon/consensus" - "github.com/dexon-foundation/dexon/consensus/clique" - "github.com/dexon-foundation/dexon/consensus/ethash" - "github.com/dexon-foundation/dexon/core" - "github.com/dexon-foundation/dexon/core/state" - "github.com/dexon-foundation/dexon/core/vm" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/dashboard" - "github.com/dexon-foundation/dexon/dex" - "github.com/dexon-foundation/dexon/dex/downloader" - "github.com/dexon-foundation/dexon/eth" - "github.com/dexon-foundation/dexon/eth/gasprice" - "github.com/dexon-foundation/dexon/ethdb" - "github.com/dexon-foundation/dexon/ethstats" - "github.com/dexon-foundation/dexon/les" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/metrics" - "github.com/dexon-foundation/dexon/metrics/influxdb" - "github.com/dexon-foundation/dexon/node" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/discv5" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/p2p/netutil" - "github.com/dexon-foundation/dexon/params" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/accounts" + "github.com/tangerine-network/go-tangerine/accounts/keystore" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/common/fdlimit" + "github.com/tangerine-network/go-tangerine/consensus" + "github.com/tangerine-network/go-tangerine/consensus/clique" + "github.com/tangerine-network/go-tangerine/consensus/ethash" + "github.com/tangerine-network/go-tangerine/core" + "github.com/tangerine-network/go-tangerine/core/state" + "github.com/tangerine-network/go-tangerine/core/vm" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/dashboard" + "github.com/tangerine-network/go-tangerine/dex" + "github.com/tangerine-network/go-tangerine/dex/downloader" + "github.com/tangerine-network/go-tangerine/eth" + "github.com/tangerine-network/go-tangerine/eth/gasprice" + "github.com/tangerine-network/go-tangerine/ethdb" + "github.com/tangerine-network/go-tangerine/ethstats" + "github.com/tangerine-network/go-tangerine/les" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/metrics" + "github.com/tangerine-network/go-tangerine/metrics/influxdb" + "github.com/tangerine-network/go-tangerine/node" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/discv5" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/p2p/netutil" + "github.com/tangerine-network/go-tangerine/params" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" cli "gopkg.in/urfave/cli.v1" ) @@ -616,7 +616,7 @@ var ( MetricsInfluxDBDatabaseFlag = cli.StringFlag{ Name: "metrics.influxdb.database", Usage: "InfluxDB database name to push reported metrics to", - Value: "gdex", + Value: "gtan", } MetricsInfluxDBUsernameFlag = cli.StringFlag{ Name: "metrics.influxdb.username", @@ -902,7 +902,7 @@ func MakeAddress(ks *keystore.KeyStore, account string) (accounts.Account, error log.Warn("-------------------------------------------------------------------") log.Warn("Referring to accounts by order in the keystore folder is dangerous!") log.Warn("This functionality is deprecated and will be removed in the future!") - log.Warn("Please use explicit addresses! (can search via `gdex account list`)") + log.Warn("Please use explicit addresses! (can search via `gtan account list`)") log.Warn("-------------------------------------------------------------------") accs := ks.Accounts() @@ -1351,7 +1351,7 @@ func SetDashboardConfig(ctx *cli.Context, cfg *dashboard.Config) { cfg.Refresh = ctx.GlobalDuration(DashboardRefreshFlag.Name) } -// RegisterDexService adds an Dexon client to the stack. +// RegisterDexService adds an Tangerine client to the stack. func RegisterDexService(stack *node.Node, cfg *dex.Config) { var err error if cfg.SyncMode == downloader.LightSync { @@ -1423,7 +1423,7 @@ func SetupMetrics(ctx *cli.Context) { log.Info("Enabling metrics export to InfluxDB") - go influxdb.InfluxDBWithTags(metrics.DefaultRegistry, 10*time.Second, endpoint, database, username, password, "gdex.", tagsMap) + go influxdb.InfluxDBWithTags(metrics.DefaultRegistry, 10*time.Second, endpoint, database, username, password, "gtan.", tagsMap) } } } @@ -1545,11 +1545,11 @@ func MakeConsolePreloads(ctx *cli.Context) []string { // This is a temporary function used for migrating old command/flags to the // new format. // -// e.g. gdex account new --keystore /tmp/mykeystore --lightkdf +// e.g. gtan account new --keystore /tmp/mykeystore --lightkdf // // is equivalent after calling this method with: // -// gdex --keystore /tmp/mykeystore --lightkdf account new +// gtan --keystore /tmp/mykeystore --lightkdf account new // // This allows the use of the existing configuration functionality. // When all flags are migrated this function can be removed and the existing diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go index 0cebacffd..9ee89ad0b 100644 --- a/cmd/wnode/main.go +++ b/cmd/wnode/main.go @@ -35,16 +35,16 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/cmd/utils" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/console" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/log" - "github.com/dexon-foundation/dexon/p2p" - "github.com/dexon-foundation/dexon/p2p/enode" - "github.com/dexon-foundation/dexon/p2p/nat" - "github.com/dexon-foundation/dexon/whisper/mailserver" - whisper "github.com/dexon-foundation/dexon/whisper/whisperv6" + "github.com/tangerine-network/go-tangerine/cmd/utils" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/console" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/log" + "github.com/tangerine-network/go-tangerine/p2p" + "github.com/tangerine-network/go-tangerine/p2p/enode" + "github.com/tangerine-network/go-tangerine/p2p/nat" + "github.com/tangerine-network/go-tangerine/whisper/mailserver" + whisper "github.com/tangerine-network/go-tangerine/whisper/whisperv6" "golang.org/x/crypto/pbkdf2" ) diff --git a/cmd/zoo/client/client.go b/cmd/zoo/client/client.go index 9b65e778b..468035b5d 100644 --- a/cmd/zoo/client/client.go +++ b/cmd/zoo/client/client.go @@ -27,11 +27,11 @@ import ( "math/big" "time" - dexon "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/crypto" - "github.com/dexon-foundation/dexon/ethclient" + dexon "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/core/types" + "github.com/tangerine-network/go-tangerine/crypto" + "github.com/tangerine-network/go-tangerine/ethclient" ) type Client struct { diff --git a/cmd/zoo/main.go b/cmd/zoo/main.go index cd33d4cee..907fa37d2 100644 --- a/cmd/zoo/main.go +++ b/cmd/zoo/main.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/dexon-foundation/dexon/cmd/zoo/monkey" - "github.com/dexon-foundation/dexon/cmd/zoo/utils" + "github.com/tangerine-network/go-tangerine/cmd/zoo/monkey" + "github.com/tangerine-network/go-tangerine/cmd/zoo/utils" ) var key = flag.String("key", "", "private key path") diff --git a/cmd/zoo/monkey/feeder.go b/cmd/zoo/monkey/feeder.go index 99df83b98..59ecfbf0b 100644 --- a/cmd/zoo/monkey/feeder.go +++ b/cmd/zoo/monkey/feeder.go @@ -26,10 +26,10 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/common" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/common" + "github.com/tangerine-network/go-tangerine/crypto" ) var bananaABI abi.ABI diff --git a/cmd/zoo/monkey/gambler.go b/cmd/zoo/monkey/gambler.go index 9c9098c42..c8539b249 100644 --- a/cmd/zoo/monkey/gambler.go +++ b/cmd/zoo/monkey/gambler.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/dexon-foundation/dexon/accounts/abi" - "github.com/dexon-foundation/dexon/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/accounts/abi" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" ) var betContract = string("0x60806040523480156200001157600080fd5b5060405160208062000ee083398101806040528101908080519060200190929190505050336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a36200010b8162000112640100000000026401000000009004565b50620003f5565b60006200011e62000364565b6000620001396200029f640100000000026401000000009004565b15156200014557600080fd5b606484101515620001e4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f4578706563746174696f6e2073686f756c64206265206c657373207468616e2081526020017f3130302e0000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b836001819055506200021061271085620002f664010000000002620008c4179091906401000000009004565b925060008260006064811015156200022457fe5b602002018181525050600190505b606481101562000285576200025f8184620003386401000000000262000902179091906401000000009004565b82826064811015156200026e57fe5b602002018181525050808060010191505062000232565b8160029060646200029892919062000388565b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b60008060008414156200030d576000915062000331565b82840290508284828115156200031f57fe5b041415156200032d57600080fd5b8091505b5092915050565b6000806000831115156200034b57600080fd5b82848115156200035757fe5b0490508091505092915050565b610c8060405190810160405280606490602082028038833980820191505090505090565b8260648101928215620003ba579160200282015b82811115620003b95782518255916020019190600101906200039c565b5b509050620003c99190620003cd565b5090565b620003f291905b80821115620003ee576000816000905550600101620003d4565b5090565b90565b610adb80620004056000396000f3006080604052600436106100a4576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630c60e0c3146100a9578063379607f5146100d6578063715018a6146101035780637365870b1461011a5780638da5cb5b1461013a5780638f32d59b14610191578063e1152343146101c0578063ed88c68e14610201578063f2fde38b1461020b578063fc1c39dc1461024e575b600080fd5b3480156100b557600080fd5b506100d460048036038101908080359060200190929190505050610279565b005b3480156100e257600080fd5b50610101600480360381019080803590602001909291905050506103cb565b005b34801561010f57600080fd5b506101186104be565b005b61013860048036038101908080359060200190929190505050610590565b005b34801561014657600080fd5b5061014f610803565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34801561019d57600080fd5b506101a661082c565b604051808215151515815260200191505060405180910390f35b3480156101cc57600080fd5b506101eb60048036038101908080359060200190929190505050610883565b6040518082815260200191505060405180910390f35b61020961089d565b005b34801561021757600080fd5b5061024c600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061089f565b005b34801561025a57600080fd5b506102636108be565b6040518082815260200191505060405180910390f35b6000610283610a26565b600061028d61082c565b151561029857600080fd5b606484101515610336576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260248152602001807f4578706563746174696f6e2073686f756c64206265206c657373207468616e2081526020017f3130302e0000000000000000000000000000000000000000000000000000000081525060400191505060405180910390fd5b83600181905550610352612710856108c490919063ffffffff16565b9250600082600060648110151561036557fe5b602002018181525050600190505b60648110156103b35761038f818461090290919063ffffffff16565b828260648110151561039d57fe5b6020020181815250508080600101915050610373565b8160029060646103c4929190610a4a565b5050505050565b6103d361082c565b15156103de57600080fd5b3073ffffffffffffffffffffffffffffffffffffffff1631811115151561046d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601c8152602001807f4e6f20656e6f756768206f6620746f6b656e20746f20636c61696d2e0000000081525060200191505060405180910390fd5b610475610803565b73ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501580156104ba573d6000803e3d6000fd5b5050565b6104c661082c565b15156104d157600080fd5b600073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a360008060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550565b60008060018311151561060b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260188152602001807f5461726765742073686f756c64206265206269676765722e000000000000000081525060200191505060405180910390fd5b6001548311151515610685576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f5461726765742073686f756c6420626520736d616c6c65722e0000000000000081525060200191505060405180910390fd5b612710341115156106fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4d696e696d756d206265742069732031303030302e000000000000000000000081525060200191505060405180910390fd5b600160642f81151561070c57fe5b0601915060009050828210156107a05761075661271061074860026001870360648110151561073757fe5b0154346108c490919063ffffffff16565b61090290919063ffffffff16565b90503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f1935050505015801561079e573d6000803e3d6000fd5b505b3373ffffffffffffffffffffffffffffffffffffffff167f97371a3349bea11f577edf6e64350a3dfb9de665d1154c7e6d08eb0805aa043084348460405180848152602001838152602001828152602001935050505060405180910390a2505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614905090565b60028160648110151561089257fe5b016000915090505481565b565b6108a761082c565b15156108b257600080fd5b6108bb8161092c565b50565b60015481565b60008060008414156108d957600091506108fb565b82840290508284828115156108ea57fe5b041415156108f757600080fd5b8091505b5092915050565b60008060008311151561091457600080fd5b828481151561091f57fe5b0490508091505092915050565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561096857600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b610c8060405190810160405280606490602082028038833980820191505090505090565b8260648101928215610a79579160200282015b82811115610a78578251825591602001919060010190610a5d565b5b509050610a869190610a8a565b5090565b610aac91905b80821115610aa8576000816000905550600101610a90565b5090565b905600a165627a7a7230582087d19571ab3ae7207fb8f6182b6b891f2414f00e1904790341a82c957044b5330029") diff --git a/cmd/zoo/monkey/monkey.go b/cmd/zoo/monkey/monkey.go index c228f1814..da32b42cc 100644 --- a/cmd/zoo/monkey/monkey.go +++ b/cmd/zoo/monkey/monkey.go @@ -29,8 +29,8 @@ import ( "os" "time" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/crypto" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/crypto" ) var config *MonkeyConfig @@ -110,7 +110,7 @@ func New(ep string, source *ecdsa.PrivateKey, num int, timeout time.Duration) *M } func (m *Monkey) Distribute() { - fmt.Println("Distributing DEX to random accounts ...") + fmt.Println("Distributing coins to random accounts ...") address := crypto.PubkeyToAddress(m.source.PublicKey) nonce, err := m.PendingNonceAt(context.Background(), address) if err != nil { diff --git a/cmd/zoo/utils/shutdown.go b/cmd/zoo/utils/shutdown.go index 288f664f6..932dbac1f 100644 --- a/cmd/zoo/utils/shutdown.go +++ b/cmd/zoo/utils/shutdown.go @@ -27,9 +27,9 @@ import ( "math/big" "os" - "github.com/dexon-foundation/dexon" - "github.com/dexon-foundation/dexon/cmd/zoo/client" - "github.com/dexon-foundation/dexon/crypto" + ethereum "github.com/tangerine-network/go-tangerine" + "github.com/tangerine-network/go-tangerine/cmd/zoo/client" + "github.com/tangerine-network/go-tangerine/crypto" ) type ShutdownConfig struct { @@ -82,7 +82,7 @@ func Shutdown(config *ShutdownConfig) { panic(err) } - gasLimit, err := cl.EstimateGas(context.Background(), dexon.CallMsg{}) + gasLimit, err := cl.EstimateGas(context.Background(), ethereum.CallMsg{}) if err != nil { panic(err) } |