From 592f21f5b97e5b1e714f194ae90ab83e6547cf41 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 14 Aug 2019 01:37:25 -0400 Subject: finish a full chain example (with p2p network) --- cmd/geth/config.go | 6 +++--- cmd/geth/consolecmd.go | 2 +- cmd/geth/main.go | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'cmd/geth') diff --git a/cmd/geth/config.go b/cmd/geth/config.go index e33b367..d7484ab 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -28,8 +28,8 @@ import ( "github.com/Determinant/coreth/cmd/utils" "github.com/ethereum/go-ethereum/dashboard" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/node" + "github.com/Determinant/coreth/eth" + "github.com/Determinant/coreth/node" "github.com/ethereum/go-ethereum/params" whisper "github.com/ethereum/go-ethereum/whisper/whisperv6" "github.com/naoina/toml" @@ -109,7 +109,7 @@ func defaultNodeConfig() node.Config { func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) { // Load defaults. cfg := gethConfig{ - Eth: eth.DefaultConfig, + Eth: eth.MyDefaultConfig(), Shh: whisper.DefaultConfig, Node: defaultNodeConfig(), Dashboard: dashboard.DefaultConfig, diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 0c0881b..3cf9192 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -26,7 +26,7 @@ import ( "github.com/Determinant/coreth/cmd/utils" "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/node" + "github.com/Determinant/coreth/node" "github.com/ethereum/go-ethereum/rpc" "gopkg.in/urfave/cli.v1" ) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index a8ddd44..56b838d 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -31,14 +31,14 @@ import ( "github.com/Determinant/coreth/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/eth" + "github.com/Determinant/coreth/eth" "github.com/ethereum/go-ethereum/eth/downloader" "github.com/ethereum/go-ethereum/ethclient" "github.com/Determinant/coreth/internal/debug" "github.com/ethereum/go-ethereum/les" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/Determinant/coreth/node" cli "gopkg.in/urfave/cli.v1" ) @@ -380,6 +380,11 @@ func startNode(ctx *cli.Context, stack *node.Node) { if err := stack.Service(ðereum); err != nil { utils.Fatalf("Ethereum service not running: %v", err) } + etherBase := &common.Address { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + } + ethereum.SetEtherbase(*etherBase) // Set the gas price to the limits from the CLI and start mining gasprice := utils.GlobalBig(ctx, utils.MinerLegacyGasPriceFlag.Name) if ctx.IsSet(utils.MinerGasPriceFlag.Name) { -- cgit v1.2.3-70-g09d2