diff options
Diffstat (limited to 'cmd/puppeth')
-rw-r--r-- | cmd/puppeth/genesis.go | 12 | ||||
-rw-r--r-- | cmd/puppeth/genesis_test.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/module.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/module_dashboard.go | 52 | ||||
-rw-r--r-- | cmd/puppeth/module_ethstats.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/module_explorer.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/module_faucet.go | 4 | ||||
-rw-r--r-- | cmd/puppeth/module_nginx.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/module_node.go | 14 | ||||
-rw-r--r-- | cmd/puppeth/module_wallet.go | 6 | ||||
-rw-r--r-- | cmd/puppeth/puppeth.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/ssh.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard.go | 6 | ||||
-rw-r--r-- | cmd/puppeth/wizard_dashboard.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_ethstats.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_explorer.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_faucet.go | 4 | ||||
-rw-r--r-- | cmd/puppeth/wizard_genesis.go | 8 | ||||
-rw-r--r-- | cmd/puppeth/wizard_intro.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_netstats.go | 4 | ||||
-rw-r--r-- | cmd/puppeth/wizard_network.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_nginx.go | 2 | ||||
-rw-r--r-- | cmd/puppeth/wizard_node.go | 6 | ||||
-rw-r--r-- | cmd/puppeth/wizard_wallet.go | 2 |
24 files changed, 72 insertions, 72 deletions
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. |