Skip to content

Commit

Permalink
Jenkinsfile,README.md,cmd/clef,cmd/devp2p,cmd/echainspec,cmd/faucet,c…
Browse files Browse the repository at this point in the history
…md/geth,cmd/utils,core/forkid,core,docs/getting-started,docs,tests/regression/shasums,tests/regression/simulated: drop kotti support
  • Loading branch information
ziogaschr committed Jul 3, 2023
1 parent b97a4e6 commit bcd0423
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 295 deletions.
26 changes: 3 additions & 23 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ pipeline {
stages {
stage('Notify Github of Pending Jobs') {
steps {
githubNotify context: 'Kotti Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'PENDING', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}"
githubNotify context: 'Mordor Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'PENDING', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}"
githubNotify context: 'Goerli Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'PENDING', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}"
// githubNotify context: 'Classic Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'PENDING', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}"
Expand All @@ -19,25 +18,6 @@ pipeline {
}
stage("Run Regression Tests") {
parallel {
stage('Kotti') {
agent { label "aws-slave-m5-xlarge" }
steps {
sh "curl -L -O https://go.dev/dl/go1.20.3.linux-amd64.tar.gz"
sh "sudo rm -rf /usr/bin/go && sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.3.linux-amd64.tar.gz"
sh "sudo cp /usr/local/go/bin/go /usr/bin/go"
sh "sudo cp /usr/local/go/bin/gofmt /usr/bin/gofmt"
sh "go version"
sh "make geth && ./build/bin/geth version"
sh "rm -rf ${GETH_DATADIR}-kotti"
sh "shasum -a 256 -c ./tests/regression/shasums/kotti.0-2544960.rlp.gz.sha256"
sh "./build/bin/geth --kotti --cache=2048 --nocompaction --nousb --txlookuplimit=1 --datadir=${GETH_DATADIR}-kotti import ${GETH_EXPORTS}/kotti.0-2544960.rlp.gz"
}
post {
always { sh "rm -rf ${GETH_DATADIR}-kotti" }
success { githubNotify context: 'Kotti Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'SUCCESS', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}" }
unsuccessful { githubNotify context: 'Kotti Regression', description: "${GITHUB_NOTIFY_DESCRIPTION}", status: 'FAILURE', account: "${GITHUB_OWNER_NAME}", repo: "${GITHUB_REPO_NAME}", credentialsId: 'meowsbits-github-jenkins', sha: "${GIT_COMMIT}" }
}
}
stage('Mordor') {
agent { label "aws-slave-m5-xlarge" }
steps {
Expand Down Expand Up @@ -80,11 +60,11 @@ pipeline {
// Commented now because these take a looong time.
// One way of approaching a solution is to break each chain into a "stepladder" of imports, eg. 0-1150000, 1150000-1920000, 1920000-2500000, etc...
// This would allow further parallelization at the cost of duplicated base chaindata stores.
// Since the core focus of testing here is configuration (both user-facing and internal), and one of ugly limitations of our current testnets
// being that they DO NOT reflect the production environment well in this regard (which is a very vulnerable reagard)
// Since the core focus of testing here is configuration (both user-facing and internal), and one of ugly limitations of our current testnets
// being that they DO NOT reflect the production environment well in this regard (which is a very vulnerable reagard)
// another approach might be to condense the chain fork progressions of ETC and ETH into custom test-only chains, perhaps using retestest or a similar
// tool to make transactions and manage chain upgrades dynamically as a transactions are made.
//
//
// stage('Classic') {
// agent { label "aws-slave-m5-xlarge" }
// steps {
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Networks supported by the respective go-ethereum packaged `geth` program.
| | :zap: | Ropsten (Geth+Parity ETH PoW Testnet) | :heavy_check_mark: | :heavy_check_mark: |
| | :handshake: | Rinkeby (Geth-only ETH PoA Testnet) | :heavy_check_mark: | :heavy_check_mark: |
| | :handshake: | Goerli (Geth+Parity ETH PoA Testnet) | :heavy_check_mark: | :heavy_check_mark: |
| | :handshake: | Kotti (Geth+Parity ETC PoA Testnet) | :heavy_check_mark: | |
| | :handshake: | Kovan (Parity-only ETH PoA Testnet) | | |
| | | Tobalaba (EWF Testnet) | | |
| | | Ephemeral development PoA network | :heavy_check_mark: | :heavy_check_mark: |
Expand Down
4 changes: 2 additions & 2 deletions cmd/clef/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GLOBAL OPTIONS:
--loglevel value log level to emit to the screen (default: 4)
--keystore value Directory for the keystore (default: "$HOME/.ethereum/keystore")
--configdir value Directory for Clef configuration (default: "$HOME/.clef")
--chainid value Chain id to use for signing (1=mainnet, 2=Morden (disused), 3=ropsten, 4=rinkeby, 5=Goerli, 6=Kotti) (default: 1)
--chainid value Chain id to use for signing (1=mainnet, 2=Morden (disused), 3=ropsten, 4=rinkeby, 5=Goerli) (default: 1)
--lightkdf Reduce key-derivation RAM & CPU usage at some expense of KDF strength
--nousb Disables monitoring for and managing USB hardware wallets
--pcscdpath value Path to the smartcard daemon (pcscd) socket file (default: "/run/pcscd/pcscd.comm")
Expand Down Expand Up @@ -150,7 +150,7 @@ All hex encoded values must be prefixed with `0x`.

#### Create new password protected account

The signer will generate a new private key, encrypt it according to [web3 keystore spec](https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition) and store it in the keystore directory.
The signer will generate a new private key, encrypt it according to [web3 keystore spec](https://github.com/ethereum/wiki/wiki/Web3-Secret-Storage-Definition) and store it in the keystore directory.
The client is responsible for creating a backup of the keystore. If the keystore is lost there is no method of retrieving lost accounts.

#### Arguments
Expand Down
2 changes: 1 addition & 1 deletion cmd/clef/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var (
chainIdFlag = &cli.Int64Flag{
Name: "chainid",
Value: params.MainnetChainConfig.ChainID.Int64(),
Usage: "Chain id to use for signing (1=foundation, 61=classic, 3=Ropsten, 4=Rinkeby, 5=Goerli, 6=Kotti, 63=Mordor, 133519467574834=Yolo)",
Usage: "Chain id to use for signing (1=foundation, 61=classic, 3=Ropsten, 4=Rinkeby, 5=Goerli, 63=Mordor, 133519467574834=Yolo)",
}
rpcPortFlag = &cli.IntFlag{
Name: "http.port",
Expand Down
2 changes: 0 additions & 2 deletions cmd/devp2p/nodesetcmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ func ethFilter(args []string) (nodeFilter, error) {
filter = forkid.NewStaticFilter(params.SepoliaChainConfig, params.SepoliaGenesisHash)
case "classic":
filter = forkid.NewStaticFilter(params.ClassicChainConfig, params.MainnetGenesisHash)
case "kotti":
filter = forkid.NewStaticFilter(params.KottiChainConfig, params.KottiGenesisHash)
case "mordor":
filter = forkid.NewStaticFilter(params.MordorChainConfig, params.MordorGenesisHash)
case "mintme":
Expand Down
5 changes: 0 additions & 5 deletions cmd/echainspec/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ var chainspecFormats = func() []string {

var defaultChainspecValues = map[string]ctypes.Configurator{
"classic": params.DefaultClassicGenesisBlock(),
"kotti": params.DefaultKottiGenesisBlock(),
"mordor": params.DefaultMordorGenesisBlock(),

"foundation": params.DefaultGenesisBlock(),
Expand Down Expand Up @@ -196,10 +195,6 @@ EXAMPLES:
> {{.Name}} --default classic --outputf coregeth
Validate a default Kotti network chain configuration for block #3000000:
> {{.Name}} --default kotti validate 3000000
VERSION:
{{.Version}}
Expand Down
7 changes: 0 additions & 7 deletions cmd/faucet/faucet.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ var (
foundationFlag = flag.Bool("chain.foundation", false, "Configure genesis and bootnodes for foundation chain defaults")
classicFlag = flag.Bool("chain.classic", false, "Configure genesis and bootnodes for classic chain defaults")
mordorFlag = flag.Bool("chain.mordor", false, "Configure genesis and bootnodes for mordor chain defaults")
kottiFlag = flag.Bool("chain.kotti", false, "Configure genesis and bootnodes for kotti chain defaults")
testnetFlag = flag.Bool("chain.testnet", false, "Configure genesis and bootnodes for testnet chain defaults")
rinkebyFlag = flag.Bool("chain.rinkeby", false, "Configure genesis and bootnodes for rinkeby chain defaults")
goerliFlag = flag.Bool("chain.goerli", false, "Configure genesis and bootnodes for goerli chain defaults")
Expand Down Expand Up @@ -109,7 +108,6 @@ var chainFlags = []*bool{
foundationFlag,
classicFlag,
mordorFlag,
kottiFlag,
testnetFlag,
rinkebyFlag,
goerliFlag,
Expand Down Expand Up @@ -138,8 +136,6 @@ func faucetDirFromChainIndicators(chainID uint64, genesisHash common.Hash) strin
return filepath.Join(datadir, "rinkeby")
case params.GoerliGenesisHash:
return filepath.Join(datadir, "goerli")
case params.KottiGenesisHash:
return filepath.Join(datadir, "kotti")
case params.MordorGenesisHash:
return filepath.Join(datadir, "mordor")
case params.SepoliaGenesisHash:
Expand All @@ -158,7 +154,6 @@ func parseChainFlags() (gs *genesisT.Genesis, bs string, netid uint64) {
{*classicFlag, params.DefaultClassicGenesisBlock(), nil},
{*mordorFlag, params.DefaultMordorGenesisBlock(), nil},
{*rinkebyFlag, params.DefaultRinkebyGenesisBlock(), nil},
{*kottiFlag, params.DefaultKottiGenesisBlock(), nil},
{*goerliFlag, params.DefaultGoerliGenesisBlock(), nil},
{*sepoliaFlag, params.DefaultSepoliaGenesisBlock(), nil},
}
Expand Down Expand Up @@ -570,8 +565,6 @@ func (f *faucet) startStack(genesis *genesisT.Genesis, port int, enodes []*enode
} else {
utils.SetDNSDiscoveryDefaults(&cfg, core.GenesisToBlock(genesis, nil).Hash())
}
case params.KottiGenesisHash:
utils.SetDNSDiscoveryDefaults2(&cfg, params.KottiDNSNetwork1)
case params.MordorGenesisHash:
utils.SetDNSDiscoveryDefaults2(&cfg, params.MordorDNSNetwork1)
default:
Expand Down
1 change: 0 additions & 1 deletion cmd/geth/consolecmd_cg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ func TestConsoleCmdNetworkIdentities(t *testing.T) {
{[]string{"--rinkeby"}, 4, 4, params.RinkebyGenesisHash.Hex()},
{[]string{"--sepolia"}, 11155111, 11155111, params.SepoliaGenesisHash.Hex()},
{[]string{"--goerli"}, 5, 5, params.GoerliGenesisHash.Hex()},
{[]string{"--kotti"}, 6, 6, params.KottiGenesisHash.Hex()},
{[]string{"--mordor"}, 7, 63, params.MordorGenesisHash.Hex()},
{[]string{"--mintme"}, 37480, 24734, params.MintMeGenesisHash.Hex()},
{[]string{"--dev"}, 1337, 1337, "0x0"},
Expand Down
3 changes: 0 additions & 3 deletions cmd/geth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,6 @@ func checkMainnet(ctx *cli.Context) bool {
case ctx.IsSet(utils.MordorFlag.Name):
log.Info("Starting Geth on Mordor testnet...")

case ctx.IsSet(utils.KottiFlag.Name):
log.Info("Starting Geth on Kotti testnet...")

case ctx.IsSet(utils.MintMeFlag.Name):
log.Info("Starting Geth on MintMe.com Coin mainnet...")

Expand Down
18 changes: 1 addition & 17 deletions cmd/utils/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,6 @@ var (
Usage: "Rinkeby network: pre-configured proof-of-authority test network",
Category: flags.EthCategory,
}
KottiFlag = &cli.BoolFlag{
Name: "kotti",
Usage: "Kotti network: cross-client proof-of-authority test network",
Category: flags.EthCategory,
}
MordorFlag = &cli.BoolFlag{
Name: "mordor",
Usage: "Mordor network: Ethereum Classic's cross-client proof-of-work test network",
Expand Down Expand Up @@ -1086,7 +1081,6 @@ var (
GoerliFlag,
SepoliaFlag,
MordorFlag,
KottiFlag,
}
// NetworkFlags is the flag group of all built-in supported networks.
NetworkFlags = append([]cli.Flag{
Expand Down Expand Up @@ -1171,8 +1165,6 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
urls = params.SepoliaBootnodes
case ctx.Bool(RinkebyFlag.Name):
urls = params.RinkebyBootnodes
case ctx.Bool(KottiFlag.Name):
urls = params.KottiBootnodes
case ctx.Bool(GoerliFlag.Name):
urls = params.GoerliBootnodes
}
Expand Down Expand Up @@ -1208,8 +1200,6 @@ func setBootstrapNodesV5(ctx *cli.Context, cfg *p2p.Config) {
urls = params.MordorBootnodes
case ctx.Bool(RinkebyFlag.Name):
urls = params.RinkebyBootnodes
case ctx.Bool(KottiFlag.Name):
urls = params.KottiBootnodes
case ctx.Bool(GoerliFlag.Name):
urls = params.GoerliBootnodes
case ctx.Bool(MintMeFlag.Name):
Expand Down Expand Up @@ -1668,8 +1658,6 @@ func dataDirPathForCtxChainConfig(ctx *cli.Context, baseDataDirPath string) stri
return filepath.Join(baseDataDirPath, "mordor")
case ctx.Bool(RinkebyFlag.Name):
return filepath.Join(baseDataDirPath, "rinkeby")
case ctx.Bool(KottiFlag.Name):
return filepath.Join(baseDataDirPath, "kotti")
case ctx.Bool(GoerliFlag.Name):
return filepath.Join(baseDataDirPath, "goerli")
case ctx.Bool(SepoliaFlag.Name):
Expand Down Expand Up @@ -1926,7 +1914,7 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
// SetEthConfig applies eth-related command line flags to the config.
func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
// Avoid conflicting network flags
CheckExclusive(ctx, MainnetFlag, DeveloperFlag, DeveloperPoWFlag, RinkebyFlag, GoerliFlag, SepoliaFlag, ClassicFlag, KottiFlag, MordorFlag, MintMeFlag)
CheckExclusive(ctx, MainnetFlag, DeveloperFlag, DeveloperPoWFlag, RinkebyFlag, GoerliFlag, SepoliaFlag, ClassicFlag, MordorFlag, MintMeFlag)
CheckExclusive(ctx, LightServeFlag, SyncModeFlag, "light")
CheckExclusive(ctx, DeveloperFlag, DeveloperPoWFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer
if ctx.String(GCModeFlag.Name) == "archive" && ctx.Uint64(TxLookupLimitFlag.Name) != 0 {
Expand Down Expand Up @@ -2155,8 +2143,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
SetDNSDiscoveryDefaults(cfg, params.GoerliGenesisHash)
case ctx.Bool(ClassicFlag.Name):
SetDNSDiscoveryDefaults2(cfg, params.ClassicDNSNetwork1)
case ctx.Bool(KottiFlag.Name):
SetDNSDiscoveryDefaults2(cfg, params.KottiDNSNetwork1)
case ctx.Bool(MordorFlag.Name):
SetDNSDiscoveryDefaults2(cfg, params.MordorDNSNetwork1)
default:
Expand Down Expand Up @@ -2505,8 +2491,6 @@ func genesisForCtxChainConfig(ctx *cli.Context) *genesisT.Genesis {
genesis = params.DefaultSepoliaGenesisBlock()
case ctx.Bool(RinkebyFlag.Name):
genesis = params.DefaultRinkebyGenesisBlock()
case ctx.Bool(KottiFlag.Name):
genesis = params.DefaultKottiGenesisBlock()
case ctx.Bool(GoerliFlag.Name):
genesis = params.DefaultGoerliGenesisBlock()
case ctx.Bool(MintMeFlag.Name):
Expand Down
33 changes: 0 additions & 33 deletions core/forkid/forkid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,29 +186,6 @@ func TestCreation(t *testing.T) {
{14_525_001, 0, ID{Hash: checksumToBytes(0x7fd1bb25), Next: 0}},
},
},
{
"kotti",
params.KottiChainConfig,
params.KottiGenesisHash,
[]testcase{
{0, 0, ID{Hash: checksumToBytes(0x0550152e), Next: 716617}},
{716616, 0, ID{Hash: checksumToBytes(0x0550152e), Next: 716617}},
{716617, 0, ID{Hash: checksumToBytes(0xa3270822), Next: 1705549}},
{716618, 0, ID{Hash: checksumToBytes(0xa3270822), Next: 1705549}},
{1705548, 0, ID{Hash: checksumToBytes(0xa3270822), Next: 1705549}},
{1705549, 0, ID{Hash: checksumToBytes(0x8f3698e0), Next: 2200013}},
{1705550, 0, ID{Hash: checksumToBytes(0x8f3698e0), Next: 2200013}},
{2200012, 0, ID{Hash: checksumToBytes(0x8f3698e0), Next: 2200013}},
{2200013, 0, ID{Hash: checksumToBytes(0x6f402821), Next: 4_368_634}},
{2200014, 0, ID{Hash: checksumToBytes(0x6f402821), Next: 4_368_634}},
{4_368_633, 0, ID{Hash: checksumToBytes(0x6f402821), Next: 4_368_634}},
{4_368_634, 0, ID{Hash: checksumToBytes(0xf03e54e7), Next: 5_578_000}},
{4_368_635, 0, ID{Hash: checksumToBytes(0xf03e54e7), Next: 5_578_000}},
{5_577_999, 0, ID{Hash: checksumToBytes(0xf03e54e7), Next: 5_578_000}},
{5_578_000, 0, ID{Hash: checksumToBytes(0xc5459816), Next: 0}},
{5_578_001, 0, ID{Hash: checksumToBytes(0xc5459816), Next: 0}},
},
},
{
"mordor",
params.MordorChainConfig,
Expand Down Expand Up @@ -547,11 +524,6 @@ func TestGatherForks(t *testing.T) {
params.MordorChainConfig,
[]uint64{301_243, 999_983, 2_520_000, 3_985_893, 5_520_000},
},
{
"kotti",
params.KottiChainConfig,
[]uint64{716_617, 1_705_549, 2_200_013, 4_368_634, 5_578_000},
},
{
"mintme",
params.MintMeChainConfig,
Expand Down Expand Up @@ -609,11 +581,6 @@ func TestGenerateSpecificationCases(t *testing.T) {
params.ClassicChainConfig,
params.MainnetGenesisHash,
},
{
"Kotti",
params.KottiChainConfig,
params.KottiGenesisHash,
},
{
"Mordor",
params.MordorChainConfig,
Expand Down
4 changes: 0 additions & 4 deletions core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,6 @@ func configOrDefault(g *genesisT.Genesis, ghash common.Hash) ctypes.ChainConfigu
return params.RinkebyChainConfig
case ghash == params.GoerliGenesisHash:
return params.GoerliChainConfig
case ghash == params.KottiGenesisHash:
return params.KottiChainConfig
case ghash == params.MordorGenesisHash:
return params.MordorChainConfig
case ghash == params.SepoliaGenesisHash:
Expand Down Expand Up @@ -370,8 +368,6 @@ func CommitGenesisState(db ethdb.Database, hash common.Hash) error {
genesis = params.DefaultGoerliGenesisBlock()
case params.SepoliaGenesisHash:
genesis = params.DefaultSepoliaGenesisBlock()
case params.KottiGenesisHash:
genesis = params.DefaultKottiGenesisBlock()
case params.MordorGenesisHash:
genesis = params.DefaultMordorGenesisBlock()
case params.MintMeGenesisHash:
Expand Down
5 changes: 2 additions & 3 deletions docs/getting-started/run-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ particular use-case the user doesn't care about years-old historical data, so we
fast-sync quickly to the current state of the network. To do so:

```
$ geth [|--classic|--testnet|--rinkeby|--kotti|--goerli|--mordor] console
$ geth [|--classic|--testnet|--rinkeby|--goerli|--mordor] console
```

This command will:
Expand Down Expand Up @@ -133,11 +133,10 @@ ETHEREUM OPTIONS:
--keystore value Directory for the keystore (default = inside the datadir)
--nousb Disables monitoring for and managing USB hardware wallets
--pcscdpath value Path to the smartcard daemon (pcscd) socket file
--networkid value Explicitly set network id (integer)(For testnets: use --ropsten, --rinkeby, --goerli, --kotti, --mordor, --yolov2 instead) (default: 1)
--networkid value Explicitly set network id (integer)(For testnets: use --ropsten, --rinkeby, --goerli, --mordor, --yolov2 instead) (default: 1)
--classic Ethereum Classic network: pre-configured Ethereum Classic mainnet
--mordor Mordor network: Ethereum Classic's cross-client proof-of-work test network
--rinkeby Rinkeby network: pre-configured proof-of-authority test network
--kotti Kotti network: cross-client proof-of-authority test network
--goerli Görli network: pre-configured proof-of-authority test network
--rinkeby Rinkeby network: pre-configured proof-of-authority test network
--yolov2 YOLOv2 network: pre-configured proof-of-authority shortlived test network.
Expand Down
Loading

0 comments on commit bcd0423

Please sign in to comment.