diff --git a/cmd/puppeth/genesis.go b/cmd/puppeth/genesis.go
deleted file mode 100644
index ef1f977bf09f..000000000000
--- a/cmd/puppeth/genesis.go
+++ /dev/null
@@ -1,626 +0,0 @@
-// Copyright 2017 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 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 go-ethereum. If not, see .
-
-package main
-
-import (
- "errors"
- "math"
- "math/big"
- "strings"
-
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/hexutil"
- math2 "github.com/ethereum/go-ethereum/common/math"
- "github.com/ethereum/go-ethereum/consensus/ethash"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/params"
-)
-
-// alethGenesisSpec represents the genesis specification format used by the
-// C++ Ethereum implementation.
-type alethGenesisSpec struct {
- SealEngine string `json:"sealEngine"`
- Params struct {
- AccountStartNonce math2.HexOrDecimal64 `json:"accountStartNonce"`
- MaximumExtraDataSize hexutil.Uint64 `json:"maximumExtraDataSize"`
- HomesteadForkBlock *hexutil.Big `json:"homesteadForkBlock,omitempty"`
- DaoHardforkBlock math2.HexOrDecimal64 `json:"daoHardforkBlock"`
- EIP150ForkBlock *hexutil.Big `json:"EIP150ForkBlock,omitempty"`
- EIP158ForkBlock *hexutil.Big `json:"EIP158ForkBlock,omitempty"`
- ByzantiumForkBlock *hexutil.Big `json:"byzantiumForkBlock,omitempty"`
- ConstantinopleForkBlock *hexutil.Big `json:"constantinopleForkBlock,omitempty"`
- ConstantinopleFixForkBlock *hexutil.Big `json:"constantinopleFixForkBlock,omitempty"`
- IstanbulForkBlock *hexutil.Big `json:"istanbulForkBlock,omitempty"`
- MinGasLimit hexutil.Uint64 `json:"minGasLimit"`
- MaxGasLimit hexutil.Uint64 `json:"maxGasLimit"`
- TieBreakingGas bool `json:"tieBreakingGas"`
- GasLimitBoundDivisor math2.HexOrDecimal64 `json:"gasLimitBoundDivisor"`
- MinimumDifficulty *hexutil.Big `json:"minimumDifficulty"`
- DifficultyBoundDivisor *math2.HexOrDecimal256 `json:"difficultyBoundDivisor"`
- DurationLimit *math2.HexOrDecimal256 `json:"durationLimit"`
- BlockReward *hexutil.Big `json:"blockReward"`
- NetworkID hexutil.Uint64 `json:"networkID"`
- ChainID hexutil.Uint64 `json:"chainID"`
- AllowFutureBlocks bool `json:"allowFutureBlocks"`
- } `json:"params"`
-
- Genesis struct {
- Nonce types.BlockNonce `json:"nonce"`
- Difficulty *hexutil.Big `json:"difficulty"`
- MixHash common.Hash `json:"mixHash"`
- Author common.Address `json:"author"`
- Timestamp hexutil.Uint64 `json:"timestamp"`
- ParentHash common.Hash `json:"parentHash"`
- ExtraData hexutil.Bytes `json:"extraData"`
- GasLimit hexutil.Uint64 `json:"gasLimit"`
- } `json:"genesis"`
-
- Accounts map[common.UnprefixedAddress]*alethGenesisSpecAccount `json:"accounts"`
-}
-
-// alethGenesisSpecAccount is the prefunded genesis account and/or precompiled
-// contract definition.
-type alethGenesisSpecAccount struct {
- Balance *math2.HexOrDecimal256 `json:"balance,omitempty"`
- Nonce uint64 `json:"nonce,omitempty"`
- Precompiled *alethGenesisSpecBuiltin `json:"precompiled,omitempty"`
-}
-
-// alethGenesisSpecBuiltin is the precompiled contract definition.
-type alethGenesisSpecBuiltin struct {
- Name string `json:"name,omitempty"`
- StartingBlock *hexutil.Big `json:"startingBlock,omitempty"`
- Linear *alethGenesisSpecLinearPricing `json:"linear,omitempty"`
-}
-
-type alethGenesisSpecLinearPricing struct {
- Base uint64 `json:"base"`
- Word uint64 `json:"word"`
-}
-
-// newAlethGenesisSpec converts a go-ethereum genesis block into a Aleth-specific
-// chain specification format.
-func newAlethGenesisSpec(network string, genesis *core.Genesis) (*alethGenesisSpec, error) {
- // Only ethash is currently supported between go-ethereum and aleth
- if genesis.Config.Ethash == nil {
- return nil, errors.New("unsupported consensus engine")
- }
- // Reconstruct the chain spec in Aleth format
- spec := &alethGenesisSpec{
- SealEngine: "Ethash",
- }
- // Some defaults
- spec.Params.AccountStartNonce = 0
- spec.Params.TieBreakingGas = false
- spec.Params.AllowFutureBlocks = false
-
- // Dao hardfork block is a special one. The fork block is listed as 0 in the
- // config but aleth will sync with ETC clients up until the actual dao hard
- // fork block.
- spec.Params.DaoHardforkBlock = 0
-
- if num := genesis.Config.HomesteadBlock; num != nil {
- spec.Params.HomesteadForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.EIP150Block; num != nil {
- spec.Params.EIP150ForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.EIP158Block; num != nil {
- spec.Params.EIP158ForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.ByzantiumBlock; num != nil {
- spec.Params.ByzantiumForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.ConstantinopleBlock; num != nil {
- spec.Params.ConstantinopleForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.PetersburgBlock; num != nil {
- spec.Params.ConstantinopleFixForkBlock = (*hexutil.Big)(num)
- }
- if num := genesis.Config.IstanbulBlock; num != nil {
- spec.Params.IstanbulForkBlock = (*hexutil.Big)(num)
- }
- spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
- spec.Params.ChainID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
- spec.Params.MaximumExtraDataSize = (hexutil.Uint64)(params.MaximumExtraDataSize)
- spec.Params.MinGasLimit = (hexutil.Uint64)(params.MinGasLimit)
- spec.Params.MaxGasLimit = (hexutil.Uint64)(math.MaxInt64)
- spec.Params.MinimumDifficulty = (*hexutil.Big)(params.MinimumDifficulty)
- spec.Params.DifficultyBoundDivisor = (*math2.HexOrDecimal256)(params.DifficultyBoundDivisor)
- spec.Params.GasLimitBoundDivisor = (math2.HexOrDecimal64)(params.GasLimitBoundDivisor)
- spec.Params.DurationLimit = (*math2.HexOrDecimal256)(params.DurationLimit)
- spec.Params.BlockReward = (*hexutil.Big)(ethash.FrontierBlockReward)
-
- spec.Genesis.Nonce = types.EncodeNonce(genesis.Nonce)
- spec.Genesis.MixHash = genesis.Mixhash
- spec.Genesis.Difficulty = (*hexutil.Big)(genesis.Difficulty)
- spec.Genesis.Author = genesis.Coinbase
- spec.Genesis.Timestamp = (hexutil.Uint64)(genesis.Timestamp)
- spec.Genesis.ParentHash = genesis.ParentHash
- spec.Genesis.ExtraData = genesis.ExtraData
- spec.Genesis.GasLimit = (hexutil.Uint64)(genesis.GasLimit)
-
- for address, account := range genesis.Alloc {
- spec.setAccount(address, account)
- }
-
- spec.setPrecompile(1, &alethGenesisSpecBuiltin{Name: "ecrecover",
- Linear: &alethGenesisSpecLinearPricing{Base: 3000}})
- spec.setPrecompile(2, &alethGenesisSpecBuiltin{Name: "sha256",
- Linear: &alethGenesisSpecLinearPricing{Base: 60, Word: 12}})
- spec.setPrecompile(3, &alethGenesisSpecBuiltin{Name: "ripemd160",
- Linear: &alethGenesisSpecLinearPricing{Base: 600, Word: 120}})
- spec.setPrecompile(4, &alethGenesisSpecBuiltin{Name: "identity",
- Linear: &alethGenesisSpecLinearPricing{Base: 15, Word: 3}})
- if genesis.Config.ByzantiumBlock != nil {
- spec.setPrecompile(5, &alethGenesisSpecBuiltin{Name: "modexp",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock)})
- spec.setPrecompile(6, &alethGenesisSpecBuiltin{Name: "alt_bn128_G1_add",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Linear: &alethGenesisSpecLinearPricing{Base: 500}})
- spec.setPrecompile(7, &alethGenesisSpecBuiltin{Name: "alt_bn128_G1_mul",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Linear: &alethGenesisSpecLinearPricing{Base: 40000}})
- spec.setPrecompile(8, &alethGenesisSpecBuiltin{Name: "alt_bn128_pairing_product",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock)})
- }
- if genesis.Config.IstanbulBlock != nil {
- if genesis.Config.ByzantiumBlock == nil {
- return nil, errors.New("invalid genesis, istanbul fork is enabled while byzantium is not")
- }
- spec.setPrecompile(6, &alethGenesisSpecBuiltin{
- Name: "alt_bn128_G1_add",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- }) // Aleth hardcoded the gas policy
- spec.setPrecompile(7, &alethGenesisSpecBuiltin{
- Name: "alt_bn128_G1_mul",
- StartingBlock: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- }) // Aleth hardcoded the gas policy
- spec.setPrecompile(9, &alethGenesisSpecBuiltin{
- Name: "blake2_compression",
- StartingBlock: (*hexutil.Big)(genesis.Config.IstanbulBlock),
- })
- }
- return spec, nil
-}
-
-func (spec *alethGenesisSpec) setPrecompile(address byte, data *alethGenesisSpecBuiltin) {
- if spec.Accounts == nil {
- spec.Accounts = make(map[common.UnprefixedAddress]*alethGenesisSpecAccount)
- }
- addr := common.UnprefixedAddress(common.BytesToAddress([]byte{address}))
- if _, exist := spec.Accounts[addr]; !exist {
- spec.Accounts[addr] = &alethGenesisSpecAccount{}
- }
- spec.Accounts[addr].Precompiled = data
-}
-
-func (spec *alethGenesisSpec) setAccount(address common.Address, account core.GenesisAccount) {
- if spec.Accounts == nil {
- spec.Accounts = make(map[common.UnprefixedAddress]*alethGenesisSpecAccount)
- }
-
- a, exist := spec.Accounts[common.UnprefixedAddress(address)]
- if !exist {
- a = &alethGenesisSpecAccount{}
- spec.Accounts[common.UnprefixedAddress(address)] = a
- }
- a.Balance = (*math2.HexOrDecimal256)(account.Balance)
- a.Nonce = account.Nonce
-
-}
-
-// parityChainSpec is the chain specification format used by Parity.
-type parityChainSpec struct {
- Name string `json:"name"`
- Datadir string `json:"dataDir"`
- Engine struct {
- Ethash struct {
- Params struct {
- MinimumDifficulty *hexutil.Big `json:"minimumDifficulty"`
- DifficultyBoundDivisor *hexutil.Big `json:"difficultyBoundDivisor"`
- DurationLimit *hexutil.Big `json:"durationLimit"`
- BlockReward map[string]string `json:"blockReward"`
- DifficultyBombDelays map[string]string `json:"difficultyBombDelays"`
- HomesteadTransition hexutil.Uint64 `json:"homesteadTransition"`
- EIP100bTransition hexutil.Uint64 `json:"eip100bTransition"`
- } `json:"params"`
- } `json:"Ethash"`
- } `json:"engine"`
-
- Params struct {
- AccountStartNonce hexutil.Uint64 `json:"accountStartNonce"`
- MaximumExtraDataSize hexutil.Uint64 `json:"maximumExtraDataSize"`
- MinGasLimit hexutil.Uint64 `json:"minGasLimit"`
- GasLimitBoundDivisor math2.HexOrDecimal64 `json:"gasLimitBoundDivisor"`
- NetworkID hexutil.Uint64 `json:"networkID"`
- ChainID hexutil.Uint64 `json:"chainID"`
- MaxCodeSize hexutil.Uint64 `json:"maxCodeSize"`
- MaxCodeSizeTransition hexutil.Uint64 `json:"maxCodeSizeTransition"`
- EIP98Transition hexutil.Uint64 `json:"eip98Transition"`
- EIP150Transition hexutil.Uint64 `json:"eip150Transition"`
- EIP160Transition hexutil.Uint64 `json:"eip160Transition"`
- EIP161abcTransition hexutil.Uint64 `json:"eip161abcTransition"`
- EIP161dTransition hexutil.Uint64 `json:"eip161dTransition"`
- EIP155Transition hexutil.Uint64 `json:"eip155Transition"`
- EIP140Transition hexutil.Uint64 `json:"eip140Transition"`
- EIP211Transition hexutil.Uint64 `json:"eip211Transition"`
- EIP214Transition hexutil.Uint64 `json:"eip214Transition"`
- EIP658Transition hexutil.Uint64 `json:"eip658Transition"`
- EIP145Transition hexutil.Uint64 `json:"eip145Transition"`
- EIP1014Transition hexutil.Uint64 `json:"eip1014Transition"`
- EIP1052Transition hexutil.Uint64 `json:"eip1052Transition"`
- EIP1283Transition hexutil.Uint64 `json:"eip1283Transition"`
- EIP1283DisableTransition hexutil.Uint64 `json:"eip1283DisableTransition"`
- EIP1283ReenableTransition hexutil.Uint64 `json:"eip1283ReenableTransition"`
- EIP1344Transition hexutil.Uint64 `json:"eip1344Transition"`
- EIP1884Transition hexutil.Uint64 `json:"eip1884Transition"`
- EIP2028Transition hexutil.Uint64 `json:"eip2028Transition"`
- } `json:"params"`
-
- Genesis struct {
- Seal struct {
- Ethereum struct {
- Nonce types.BlockNonce `json:"nonce"`
- MixHash hexutil.Bytes `json:"mixHash"`
- } `json:"ethereum"`
- } `json:"seal"`
-
- Difficulty *hexutil.Big `json:"difficulty"`
- Author common.Address `json:"author"`
- Timestamp hexutil.Uint64 `json:"timestamp"`
- ParentHash common.Hash `json:"parentHash"`
- ExtraData hexutil.Bytes `json:"extraData"`
- GasLimit hexutil.Uint64 `json:"gasLimit"`
- } `json:"genesis"`
-
- Nodes []string `json:"nodes"`
- Accounts map[common.UnprefixedAddress]*parityChainSpecAccount `json:"accounts"`
-}
-
-// parityChainSpecAccount is the prefunded genesis account and/or precompiled
-// contract definition.
-type parityChainSpecAccount struct {
- Balance math2.HexOrDecimal256 `json:"balance"`
- Nonce math2.HexOrDecimal64 `json:"nonce,omitempty"`
- Builtin *parityChainSpecBuiltin `json:"builtin,omitempty"`
-}
-
-// parityChainSpecBuiltin is the precompiled contract definition.
-type parityChainSpecBuiltin struct {
- Name string `json:"name"` // Each builtin should has it own name
- Pricing interface{} `json:"pricing"` // Each builtin should has it own price strategy
- ActivateAt *hexutil.Big `json:"activate_at,omitempty"` // ActivateAt can't be omitted if empty, default means no fork
-}
-
-// parityChainSpecPricing represents the different pricing models that builtin
-// contracts might advertise using.
-type parityChainSpecPricing struct {
- Linear *parityChainSpecLinearPricing `json:"linear,omitempty"`
- ModExp *parityChainSpecModExpPricing `json:"modexp,omitempty"`
-
- // Before the https://github.com/paritytech/parity-ethereum/pull/11039,
- // Parity uses this format to config bn pairing price policy.
- AltBnPairing *parityChainSepcAltBnPairingPricing `json:"alt_bn128_pairing,omitempty"`
-
- // Blake2F is the price per round of Blake2 compression
- Blake2F *parityChainSpecBlakePricing `json:"blake2_f,omitempty"`
-}
-
-type parityChainSpecLinearPricing struct {
- Base uint64 `json:"base"`
- Word uint64 `json:"word"`
-}
-
-type parityChainSpecModExpPricing struct {
- Divisor uint64 `json:"divisor"`
-}
-
-// parityChainSpecAltBnConstOperationPricing defines the price
-// policy for bn const operation(used after istanbul)
-type parityChainSpecAltBnConstOperationPricing struct {
- Price uint64 `json:"price"`
-}
-
-// parityChainSepcAltBnPairingPricing defines the price policy
-// for bn pairing.
-type parityChainSepcAltBnPairingPricing struct {
- Base uint64 `json:"base"`
- Pair uint64 `json:"pair"`
-}
-
-// parityChainSpecBlakePricing defines the price policy for blake2 f
-// compression.
-type parityChainSpecBlakePricing struct {
- GasPerRound uint64 `json:"gas_per_round"`
-}
-
-type parityChainSpecAlternativePrice struct {
- AltBnConstOperationPrice *parityChainSpecAltBnConstOperationPricing `json:"alt_bn128_const_operations,omitempty"`
- AltBnPairingPrice *parityChainSepcAltBnPairingPricing `json:"alt_bn128_pairing,omitempty"`
-}
-
-// parityChainSpecVersionedPricing represents a single version price policy.
-type parityChainSpecVersionedPricing struct {
- Price *parityChainSpecAlternativePrice `json:"price,omitempty"`
- Info string `json:"info,omitempty"`
-}
-
-// newParityChainSpec converts a go-ethereum genesis block into a Parity specific
-// chain specification format.
-func newParityChainSpec(network string, genesis *core.Genesis, bootnodes []string) (*parityChainSpec, error) {
- // Only ethash is currently supported between go-ethereum and Parity
- if genesis.Config.Ethash == nil {
- return nil, errors.New("unsupported consensus engine")
- }
- // Reconstruct the chain spec in Parity's format
- spec := &parityChainSpec{
- Name: network,
- Nodes: bootnodes,
- Datadir: strings.ToLower(network),
- }
- spec.Engine.Ethash.Params.BlockReward = make(map[string]string)
- spec.Engine.Ethash.Params.DifficultyBombDelays = make(map[string]string)
- // Frontier
- spec.Engine.Ethash.Params.MinimumDifficulty = (*hexutil.Big)(params.MinimumDifficulty)
- spec.Engine.Ethash.Params.DifficultyBoundDivisor = (*hexutil.Big)(params.DifficultyBoundDivisor)
- spec.Engine.Ethash.Params.DurationLimit = (*hexutil.Big)(params.DurationLimit)
- spec.Engine.Ethash.Params.BlockReward["0x0"] = hexutil.EncodeBig(ethash.FrontierBlockReward)
-
- // Homestead
- spec.Engine.Ethash.Params.HomesteadTransition = hexutil.Uint64(genesis.Config.HomesteadBlock.Uint64())
-
- // Tangerine Whistle : 150
- // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-608.md
- spec.Params.EIP150Transition = hexutil.Uint64(genesis.Config.EIP150Block.Uint64())
-
- // Spurious Dragon: 155, 160, 161, 170
- // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-607.md
- spec.Params.EIP155Transition = hexutil.Uint64(genesis.Config.EIP155Block.Uint64())
- spec.Params.EIP160Transition = hexutil.Uint64(genesis.Config.EIP155Block.Uint64())
- spec.Params.EIP161abcTransition = hexutil.Uint64(genesis.Config.EIP158Block.Uint64())
- spec.Params.EIP161dTransition = hexutil.Uint64(genesis.Config.EIP158Block.Uint64())
-
- // Byzantium
- if num := genesis.Config.ByzantiumBlock; num != nil {
- spec.setByzantium(num)
- }
- // Constantinople
- if num := genesis.Config.ConstantinopleBlock; num != nil {
- spec.setConstantinople(num)
- }
- // ConstantinopleFix (remove eip-1283)
- if num := genesis.Config.PetersburgBlock; num != nil {
- spec.setConstantinopleFix(num)
- }
- // Istanbul
- if num := genesis.Config.IstanbulBlock; num != nil {
- spec.setIstanbul(num)
- }
- spec.Params.MaximumExtraDataSize = (hexutil.Uint64)(params.MaximumExtraDataSize)
- spec.Params.MinGasLimit = (hexutil.Uint64)(params.MinGasLimit)
- spec.Params.GasLimitBoundDivisor = (math2.HexOrDecimal64)(params.GasLimitBoundDivisor)
- spec.Params.NetworkID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
- spec.Params.ChainID = (hexutil.Uint64)(genesis.Config.ChainID.Uint64())
- spec.Params.MaxCodeSize = params.MaxCodeSize
- // geth has it set from zero
- spec.Params.MaxCodeSizeTransition = 0
-
- // Disable this one
- spec.Params.EIP98Transition = math.MaxInt64
-
- spec.Genesis.Seal.Ethereum.Nonce = types.EncodeNonce(genesis.Nonce)
- spec.Genesis.Seal.Ethereum.MixHash = genesis.Mixhash[:]
- spec.Genesis.Difficulty = (*hexutil.Big)(genesis.Difficulty)
- spec.Genesis.Author = genesis.Coinbase
- spec.Genesis.Timestamp = (hexutil.Uint64)(genesis.Timestamp)
- spec.Genesis.ParentHash = genesis.ParentHash
- spec.Genesis.ExtraData = genesis.ExtraData
- spec.Genesis.GasLimit = (hexutil.Uint64)(genesis.GasLimit)
-
- spec.Accounts = make(map[common.UnprefixedAddress]*parityChainSpecAccount)
- for address, account := range genesis.Alloc {
- bal := math2.HexOrDecimal256(*account.Balance)
-
- spec.Accounts[common.UnprefixedAddress(address)] = &parityChainSpecAccount{
- Balance: bal,
- Nonce: math2.HexOrDecimal64(account.Nonce),
- }
- }
- spec.setPrecompile(1, &parityChainSpecBuiltin{Name: "ecrecover",
- Pricing: &parityChainSpecPricing{Linear: &parityChainSpecLinearPricing{Base: 3000}}})
-
- spec.setPrecompile(2, &parityChainSpecBuiltin{
- Name: "sha256", Pricing: &parityChainSpecPricing{Linear: &parityChainSpecLinearPricing{Base: 60, Word: 12}},
- })
- spec.setPrecompile(3, &parityChainSpecBuiltin{
- Name: "ripemd160", Pricing: &parityChainSpecPricing{Linear: &parityChainSpecLinearPricing{Base: 600, Word: 120}},
- })
- spec.setPrecompile(4, &parityChainSpecBuiltin{
- Name: "identity", Pricing: &parityChainSpecPricing{Linear: &parityChainSpecLinearPricing{Base: 15, Word: 3}},
- })
- if genesis.Config.ByzantiumBlock != nil {
- spec.setPrecompile(5, &parityChainSpecBuiltin{
- Name: "modexp",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: &parityChainSpecPricing{
- ModExp: &parityChainSpecModExpPricing{Divisor: 20},
- },
- })
- spec.setPrecompile(6, &parityChainSpecBuiltin{
- Name: "alt_bn128_add",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: &parityChainSpecPricing{
- Linear: &parityChainSpecLinearPricing{Base: 500, Word: 0},
- },
- })
- spec.setPrecompile(7, &parityChainSpecBuiltin{
- Name: "alt_bn128_mul",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: &parityChainSpecPricing{
- Linear: &parityChainSpecLinearPricing{Base: 40000, Word: 0},
- },
- })
- spec.setPrecompile(8, &parityChainSpecBuiltin{
- Name: "alt_bn128_pairing",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: &parityChainSpecPricing{
- AltBnPairing: &parityChainSepcAltBnPairingPricing{Base: 100000, Pair: 80000},
- },
- })
- }
- if genesis.Config.IstanbulBlock != nil {
- if genesis.Config.ByzantiumBlock == nil {
- return nil, errors.New("invalid genesis, istanbul fork is enabled while byzantium is not")
- }
- spec.setPrecompile(6, &parityChainSpecBuiltin{
- Name: "alt_bn128_add",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: map[*hexutil.Big]*parityChainSpecVersionedPricing{
- (*hexutil.Big)(big.NewInt(0)): {
- Price: &parityChainSpecAlternativePrice{
- AltBnConstOperationPrice: &parityChainSpecAltBnConstOperationPricing{Price: 500},
- },
- },
- (*hexutil.Big)(genesis.Config.IstanbulBlock): {
- Price: &parityChainSpecAlternativePrice{
- AltBnConstOperationPrice: &parityChainSpecAltBnConstOperationPricing{Price: 150},
- },
- },
- },
- })
- spec.setPrecompile(7, &parityChainSpecBuiltin{
- Name: "alt_bn128_mul",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: map[*hexutil.Big]*parityChainSpecVersionedPricing{
- (*hexutil.Big)(big.NewInt(0)): {
- Price: &parityChainSpecAlternativePrice{
- AltBnConstOperationPrice: &parityChainSpecAltBnConstOperationPricing{Price: 40000},
- },
- },
- (*hexutil.Big)(genesis.Config.IstanbulBlock): {
- Price: &parityChainSpecAlternativePrice{
- AltBnConstOperationPrice: &parityChainSpecAltBnConstOperationPricing{Price: 6000},
- },
- },
- },
- })
- spec.setPrecompile(8, &parityChainSpecBuiltin{
- Name: "alt_bn128_pairing",
- ActivateAt: (*hexutil.Big)(genesis.Config.ByzantiumBlock),
- Pricing: map[*hexutil.Big]*parityChainSpecVersionedPricing{
- (*hexutil.Big)(big.NewInt(0)): {
- Price: &parityChainSpecAlternativePrice{
- AltBnPairingPrice: &parityChainSepcAltBnPairingPricing{Base: 100000, Pair: 80000},
- },
- },
- (*hexutil.Big)(genesis.Config.IstanbulBlock): {
- Price: &parityChainSpecAlternativePrice{
- AltBnPairingPrice: &parityChainSepcAltBnPairingPricing{Base: 45000, Pair: 34000},
- },
- },
- },
- })
- spec.setPrecompile(9, &parityChainSpecBuiltin{
- Name: "blake2_f",
- ActivateAt: (*hexutil.Big)(genesis.Config.IstanbulBlock),
- Pricing: &parityChainSpecPricing{
- Blake2F: &parityChainSpecBlakePricing{GasPerRound: 1},
- },
- })
- }
- return spec, nil
-}
-
-func (spec *parityChainSpec) setPrecompile(address byte, data *parityChainSpecBuiltin) {
- if spec.Accounts == nil {
- spec.Accounts = make(map[common.UnprefixedAddress]*parityChainSpecAccount)
- }
- a := common.UnprefixedAddress(common.BytesToAddress([]byte{address}))
- if _, exist := spec.Accounts[a]; !exist {
- spec.Accounts[a] = &parityChainSpecAccount{}
- }
- spec.Accounts[a].Builtin = data
-}
-
-func (spec *parityChainSpec) setByzantium(num *big.Int) {
- spec.Engine.Ethash.Params.BlockReward[hexutil.EncodeBig(num)] = hexutil.EncodeBig(ethash.ByzantiumBlockReward)
- spec.Engine.Ethash.Params.DifficultyBombDelays[hexutil.EncodeBig(num)] = hexutil.EncodeUint64(3000000)
- n := hexutil.Uint64(num.Uint64())
- spec.Engine.Ethash.Params.EIP100bTransition = n
- spec.Params.EIP140Transition = n
- spec.Params.EIP211Transition = n
- spec.Params.EIP214Transition = n
- spec.Params.EIP658Transition = n
-}
-
-func (spec *parityChainSpec) setConstantinople(num *big.Int) {
- spec.Engine.Ethash.Params.BlockReward[hexutil.EncodeBig(num)] = hexutil.EncodeBig(ethash.ConstantinopleBlockReward)
- spec.Engine.Ethash.Params.DifficultyBombDelays[hexutil.EncodeBig(num)] = hexutil.EncodeUint64(2000000)
- n := hexutil.Uint64(num.Uint64())
- spec.Params.EIP145Transition = n
- spec.Params.EIP1014Transition = n
- spec.Params.EIP1052Transition = n
- spec.Params.EIP1283Transition = n
-}
-
-func (spec *parityChainSpec) setConstantinopleFix(num *big.Int) {
- spec.Params.EIP1283DisableTransition = hexutil.Uint64(num.Uint64())
-}
-
-func (spec *parityChainSpec) setIstanbul(num *big.Int) {
- spec.Params.EIP1344Transition = hexutil.Uint64(num.Uint64())
- spec.Params.EIP1884Transition = hexutil.Uint64(num.Uint64())
- spec.Params.EIP2028Transition = hexutil.Uint64(num.Uint64())
- spec.Params.EIP1283ReenableTransition = hexutil.Uint64(num.Uint64())
-}
-
-// pyEthereumGenesisSpec represents the genesis specification format used by the
-// Python Ethereum implementation.
-type pyEthereumGenesisSpec struct {
- Nonce types.BlockNonce `json:"nonce"`
- Timestamp hexutil.Uint64 `json:"timestamp"`
- ExtraData hexutil.Bytes `json:"extraData"`
- GasLimit hexutil.Uint64 `json:"gasLimit"`
- Difficulty *hexutil.Big `json:"difficulty"`
- Mixhash common.Hash `json:"mixhash"`
- Coinbase common.Address `json:"coinbase"`
- Alloc core.GenesisAlloc `json:"alloc"`
- ParentHash common.Hash `json:"parentHash"`
-}
-
-// newPyEthereumGenesisSpec converts a go-ethereum genesis block into a Parity specific
-// chain specification format.
-func newPyEthereumGenesisSpec(network string, genesis *core.Genesis) (*pyEthereumGenesisSpec, error) {
- // Only ethash is currently supported between go-ethereum and pyethereum
- if genesis.Config.Ethash == nil {
- return nil, errors.New("unsupported consensus engine")
- }
- spec := &pyEthereumGenesisSpec{
- Nonce: types.EncodeNonce(genesis.Nonce),
- Timestamp: (hexutil.Uint64)(genesis.Timestamp),
- ExtraData: genesis.ExtraData,
- GasLimit: (hexutil.Uint64)(genesis.GasLimit),
- Difficulty: (*hexutil.Big)(genesis.Difficulty),
- Mixhash: genesis.Mixhash,
- Coinbase: genesis.Coinbase,
- Alloc: genesis.Alloc,
- ParentHash: genesis.ParentHash,
- }
- return spec, nil
-}
diff --git a/cmd/puppeth/genesis_test.go b/cmd/puppeth/genesis_test.go
deleted file mode 100644
index 605c1070a80c..000000000000
--- a/cmd/puppeth/genesis_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2018 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// 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 go-ethereum. If not, see .
-
-package main
-
-import (
- "bytes"
- "encoding/json"
- "os"
- "reflect"
- "strings"
- "testing"
-
- "github.com/davecgh/go-spew/spew"
- "github.com/ethereum/go-ethereum/core"
-)
-
-// Tests the go-ethereum to Aleth chainspec conversion for the Stureby testnet.
-func TestAlethSturebyConverter(t *testing.T) {
- blob, err := os.ReadFile("testdata/stureby_geth.json")
- if err != nil {
- t.Fatalf("could not read file: %v", err)
- }
- var genesis core.Genesis
- if err := json.Unmarshal(blob, &genesis); err != nil {
- t.Fatalf("failed parsing genesis: %v", err)
- }
- spec, err := newAlethGenesisSpec("stureby", &genesis)
- if err != nil {
- t.Fatalf("failed creating chainspec: %v", err)
- }
-
- expBlob, err := os.ReadFile("testdata/stureby_aleth.json")
- if err != nil {
- t.Fatalf("could not read file: %v", err)
- }
- expspec := &alethGenesisSpec{}
- if err := json.Unmarshal(expBlob, expspec); err != nil {
- t.Fatalf("failed parsing genesis: %v", err)
- }
- if !reflect.DeepEqual(expspec, spec) {
- t.Errorf("chainspec mismatch")
- c := spew.ConfigState{
- DisablePointerAddresses: true,
- SortKeys: true,
- }
- exp := strings.Split(c.Sdump(expspec), "\n")
- got := strings.Split(c.Sdump(spec), "\n")
- for i := 0; i < len(exp) && i < len(got); i++ {
- if exp[i] != got[i] {
- t.Logf("got: %v\nexp: %v\n", exp[i], got[i])
- }
- }
- }
-}
-
-// Tests the go-ethereum to Parity chainspec conversion for the Stureby testnet.
-func TestParitySturebyConverter(t *testing.T) {
- blob, err := os.ReadFile("testdata/stureby_geth.json")
- if err != nil {
- t.Fatalf("could not read file: %v", err)
- }
- var genesis core.Genesis
- if err := json.Unmarshal(blob, &genesis); err != nil {
- t.Fatalf("failed parsing genesis: %v", err)
- }
- spec, err := newParityChainSpec("stureby", &genesis, []string{})
- if err != nil {
- t.Fatalf("failed creating chainspec: %v", err)
- }
- enc, err := json.MarshalIndent(spec, "", " ")
- if err != nil {
- t.Fatalf("failed encoding chainspec: %v", err)
- }
- expBlob, err := os.ReadFile("testdata/stureby_parity.json")
- if err != nil {
- t.Fatalf("could not read file: %v", err)
- }
- if !bytes.Equal(expBlob, enc) {
- t.Fatalf("chainspec mismatch")
- }
-}
diff --git a/cmd/puppeth/module_dashboard.go b/cmd/puppeth/module_dashboard.go
index 35cfada66fd3..fbbbb66501a7 100644
--- a/cmd/puppeth/module_dashboard.go
+++ b/cmd/puppeth/module_dashboard.go
@@ -18,7 +18,6 @@ package main
import (
"bytes"
- "encoding/json"
"fmt"
"html/template"
"math/rand"
@@ -582,36 +581,6 @@ func deployDashboard(client *sshClient, network string, conf *config, config *da
// Marshal the genesis spec files for go-ethereum and all the other clients
genesis, _ := conf.Genesis.MarshalJSON()
files[filepath.Join(workdir, network+".json")] = genesis
-
- if conf.Genesis.Config.Ethash != nil {
- cppSpec, err := newAlethGenesisSpec(network, conf.Genesis)
- if err != nil {
- return nil, err
- }
- cppSpecJSON, _ := json.Marshal(cppSpec)
- files[filepath.Join(workdir, network+"-cpp.json")] = cppSpecJSON
-
- harmonySpecJSON, _ := conf.Genesis.MarshalJSON()
- files[filepath.Join(workdir, network+"-harmony.json")] = harmonySpecJSON
-
- paritySpec, err := newParityChainSpec(network, conf.Genesis, conf.bootnodes)
- if err != nil {
- return nil, err
- }
- paritySpecJSON, _ := json.Marshal(paritySpec)
- files[filepath.Join(workdir, network+"-parity.json")] = paritySpecJSON
-
- pyethSpec, err := newPyEthereumGenesisSpec(network, conf.Genesis)
- if err != nil {
- return nil, err
- }
- pyethSpecJSON, _ := json.Marshal(pyethSpec)
- files[filepath.Join(workdir, network+"-python.json")] = pyethSpecJSON
- } else {
- for _, client := range []string{"cpp", "harmony", "parity", "python"} {
- files[filepath.Join(workdir, network+"-"+client+".json")] = []byte{}
- }
- }
files[filepath.Join(workdir, "puppeth.png")] = dashboardMascot
// Upload the deployment files to the remote server (and clean up afterwards)
diff --git a/cmd/puppeth/wizard_genesis.go b/cmd/puppeth/wizard_genesis.go
index cb056ab13356..ac17bc7b271c 100644
--- a/cmd/puppeth/wizard_genesis.go
+++ b/cmd/puppeth/wizard_genesis.go
@@ -250,8 +250,8 @@ func (w *wizard) manageGenesis() {
case "2":
// Save whatever genesis configuration we currently have
fmt.Println()
- fmt.Printf("Which folder to save the genesis specs into? (default = current)\n")
- fmt.Printf(" Will create %s.json, %s-aleth.json, %s-harmony.json, %s-parity.json\n", w.network, w.network, w.network, w.network)
+ fmt.Printf("Which folder to save the genesis spec into? (default = current)\n")
+ fmt.Printf(" Will create %s.json\n", w.network)
folder := w.readDefaultString(".")
if err := os.MkdirAll(folder, 0755); err != nil {
@@ -268,21 +268,6 @@ func (w *wizard) manageGenesis() {
}
log.Info("Saved native genesis chain spec", "path", gethJson)
- // Export the genesis spec used by Aleth (formerly C++ Ethereum)
- if spec, err := newAlethGenesisSpec(w.network, w.conf.Genesis); err != nil {
- log.Error("Failed to create Aleth chain spec", "err", err)
- } else {
- saveGenesis(folder, w.network, "aleth", spec)
- }
- // Export the genesis spec used by Parity
- if spec, err := newParityChainSpec(w.network, w.conf.Genesis, []string{}); err != nil {
- log.Error("Failed to create Parity chain spec", "err", err)
- } else {
- saveGenesis(folder, w.network, "parity", spec)
- }
- // Export the genesis spec used by Harmony (formerly EthereumJ)
- saveGenesis(folder, w.network, "harmony", w.conf.Genesis)
-
case "3":
// Make sure we don't have any services running
if len(w.conf.servers()) > 0 {
@@ -298,15 +283,3 @@ func (w *wizard) manageGenesis() {
return
}
}
-
-// saveGenesis JSON encodes an arbitrary genesis spec into a pre-defined file.
-func saveGenesis(folder, network, client string, spec interface{}) {
- path := filepath.Join(folder, fmt.Sprintf("%s-%s.json", network, client))
-
- out, _ := json.MarshalIndent(spec, "", " ")
- if err := os.WriteFile(path, out, 0644); err != nil {
- log.Error("Failed to save genesis file", "client", client, "err", err)
- return
- }
- log.Info("Saved genesis chain spec", "client", client, "path", path)
-}