cmd: properly initialize Olympic for all subcommands
This commit is contained in:
parent
27528ad3d2
commit
2547c9c9b7
@ -340,6 +340,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
|
|||||||
}
|
}
|
||||||
app.Before = func(ctx *cli.Context) error {
|
app.Before = func(ctx *cli.Context) error {
|
||||||
utils.SetupLogger(ctx)
|
utils.SetupLogger(ctx)
|
||||||
|
utils.SetupNetwork(ctx)
|
||||||
utils.SetupVM(ctx)
|
utils.SetupVM(ctx)
|
||||||
utils.SetupEth(ctx)
|
utils.SetupEth(ctx)
|
||||||
if ctx.GlobalBool(utils.PProfEanbledFlag.Name) {
|
if ctx.GlobalBool(utils.PProfEanbledFlag.Name) {
|
||||||
@ -391,9 +392,6 @@ func makeDefaultExtra() []byte {
|
|||||||
|
|
||||||
func run(ctx *cli.Context) {
|
func run(ctx *cli.Context) {
|
||||||
utils.CheckLegalese(utils.MustDataDir(ctx))
|
utils.CheckLegalese(utils.MustDataDir(ctx))
|
||||||
if ctx.GlobalBool(utils.OlympicFlag.Name) {
|
|
||||||
utils.InitOlympic()
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
|
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
|
||||||
cfg.ExtraData = makeExtra(ctx)
|
cfg.ExtraData = makeExtra(ctx)
|
||||||
|
@ -21,8 +21,6 @@ import (
|
|||||||
"bufio"
|
"bufio"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
|
||||||
"math/big"
|
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"regexp"
|
"regexp"
|
||||||
@ -34,7 +32,6 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/eth"
|
"github.com/ethereum/go-ethereum/eth"
|
||||||
"github.com/ethereum/go-ethereum/logger"
|
"github.com/ethereum/go-ethereum/logger"
|
||||||
"github.com/ethereum/go-ethereum/logger/glog"
|
"github.com/ethereum/go-ethereum/logger/glog"
|
||||||
"github.com/ethereum/go-ethereum/params"
|
|
||||||
"github.com/ethereum/go-ethereum/rlp"
|
"github.com/ethereum/go-ethereum/rlp"
|
||||||
"github.com/peterh/liner"
|
"github.com/peterh/liner"
|
||||||
)
|
)
|
||||||
@ -146,16 +143,6 @@ func StartEthereum(ethereum *eth.Ethereum) {
|
|||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
func InitOlympic() {
|
|
||||||
params.DurationLimit = big.NewInt(8)
|
|
||||||
params.GenesisGasLimit = big.NewInt(3141592)
|
|
||||||
params.MinGasLimit = big.NewInt(125000)
|
|
||||||
params.MaximumExtraDataSize = big.NewInt(1024)
|
|
||||||
NetworkIdFlag.Value = 0
|
|
||||||
core.BlockReward = big.NewInt(1.5e+18)
|
|
||||||
core.ExpDiffPeriod = big.NewInt(math.MaxInt64)
|
|
||||||
}
|
|
||||||
|
|
||||||
func FormatTransactionData(data string) []byte {
|
func FormatTransactionData(data string) []byte {
|
||||||
d := common.StringToByteFunc(data, func(s string) (ret []byte) {
|
d := common.StringToByteFunc(data, func(s string) (ret []byte) {
|
||||||
slice := regexp.MustCompile("\\n|\\s").Split(s, 1000000000)
|
slice := regexp.MustCompile("\\n|\\s").Split(s, 1000000000)
|
||||||
|
@ -20,6 +20,7 @@ import (
|
|||||||
"crypto/ecdsa"
|
"crypto/ecdsa"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
"math"
|
||||||
"math/big"
|
"math/big"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
@ -42,6 +43,7 @@ import (
|
|||||||
"github.com/ethereum/go-ethereum/logger/glog"
|
"github.com/ethereum/go-ethereum/logger/glog"
|
||||||
"github.com/ethereum/go-ethereum/metrics"
|
"github.com/ethereum/go-ethereum/metrics"
|
||||||
"github.com/ethereum/go-ethereum/p2p/nat"
|
"github.com/ethereum/go-ethereum/p2p/nat"
|
||||||
|
"github.com/ethereum/go-ethereum/params"
|
||||||
"github.com/ethereum/go-ethereum/rpc/api"
|
"github.com/ethereum/go-ethereum/rpc/api"
|
||||||
"github.com/ethereum/go-ethereum/rpc/codec"
|
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||||
"github.com/ethereum/go-ethereum/rpc/comms"
|
"github.com/ethereum/go-ethereum/rpc/comms"
|
||||||
@ -488,6 +490,20 @@ func SetupLogger(ctx *cli.Context) {
|
|||||||
glog.SetLogDir(ctx.GlobalString(LogFileFlag.Name))
|
glog.SetLogDir(ctx.GlobalString(LogFileFlag.Name))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetupNetwork configures the system for either the main net or some test network.
|
||||||
|
func SetupNetwork(ctx *cli.Context) {
|
||||||
|
switch {
|
||||||
|
case ctx.GlobalBool(OlympicFlag.Name):
|
||||||
|
params.DurationLimit = big.NewInt(8)
|
||||||
|
params.GenesisGasLimit = big.NewInt(3141592)
|
||||||
|
params.MinGasLimit = big.NewInt(125000)
|
||||||
|
params.MaximumExtraDataSize = big.NewInt(1024)
|
||||||
|
NetworkIdFlag.Value = 0
|
||||||
|
core.BlockReward = big.NewInt(1.5e+18)
|
||||||
|
core.ExpDiffPeriod = big.NewInt(math.MaxInt64)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// SetupVM configured the VM package's global settings
|
// SetupVM configured the VM package's global settings
|
||||||
func SetupVM(ctx *cli.Context) {
|
func SetupVM(ctx *cli.Context) {
|
||||||
vm.EnableJit = ctx.GlobalBool(VMEnableJitFlag.Name)
|
vm.EnableJit = ctx.GlobalBool(VMEnableJitFlag.Name)
|
||||||
@ -517,7 +533,6 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database
|
|||||||
Fatalf("Could not open database: %v", err)
|
Fatalf("Could not open database: %v", err)
|
||||||
}
|
}
|
||||||
if ctx.GlobalBool(OlympicFlag.Name) {
|
if ctx.GlobalBool(OlympicFlag.Name) {
|
||||||
InitOlympic()
|
|
||||||
_, err := core.WriteTestNetGenesisBlock(chainDb, 42)
|
_, err := core.WriteTestNetGenesisBlock(chainDb, 42)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Fatalln(err)
|
glog.Fatalln(err)
|
||||||
|
Loading…
Reference in New Issue
Block a user