chore(netconf): rename homer to aeneid

cmd/utils/flags.go

@@ -628,9 +628,9 @@ var (
 		Usage:    "odyssey test network: pre-configured proof-of-stake test network",
 		Category: flags.MiscCategory,
 	}
-	HomerFlag = &cli.BoolFlag{
-		Name:     "homer",
-		Usage:    "homer network: pre-configured proof-of-stake network",
+	AeneidFlag = &cli.BoolFlag{
+		Name:     "aeneid",
+		Usage:    "aeneid network: pre-configured proof-of-stake network",
 		Category: flags.MiscCategory,
 	}
 	StoryFlag = &cli.BoolFlag{
@@ -1026,7 +1026,7 @@ var (
 		HoleskyFlag,
 		IliadFlag,
 		OdysseyFlag,
-		HomerFlag,
+		AeneidFlag,
 		LocalFlag,
 	}
 	// NetworkFlags is the flag group of all built-in supported networks.
@@ -1063,8 +1063,8 @@ func MakeDataDir(ctx *cli.Context) string {
 		if ctx.Bool(OdysseyFlag.Name) {
 			return filepath.Join(path, "odyssey")
 		}
-		if ctx.Bool(HomerFlag.Name) {
-			return filepath.Join(path, "homer")
+		if ctx.Bool(AeneidFlag.Name) {
+			return filepath.Join(path, "aeneid")
 		}
 		if ctx.Bool(StoryFlag.Name) {
 			return filepath.Join(path, "story")
@@ -1138,8 +1138,8 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
 			urls = params.IliadBootnodes
 		case ctx.Bool(OdysseyFlag.Name):
 			urls = params.OdysseyBootnodes
-		case ctx.Bool(HomerFlag.Name):
-			urls = params.HomerBootnodes
+		case ctx.Bool(AeneidFlag.Name):
+			urls = params.AeneidBootnodes
 		case ctx.Bool(StoryFlag.Name):
 			urls = params.StoryBootnodes
 		case ctx.Bool(LocalFlag.Name):
@@ -1579,8 +1579,8 @@ func SetDataDir(ctx *cli.Context, cfg *node.Config) {
 		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "iliad")
 	case ctx.Bool(OdysseyFlag.Name) && cfg.DataDir == node.DefaultDataDir():
 		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "odyssey")
-	case ctx.Bool(HomerFlag.Name) && cfg.DataDir == node.DefaultDataDir():
-		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "homer")
+	case ctx.Bool(AeneidFlag.Name) && cfg.DataDir == node.DefaultDataDir():
+		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "aeneid")
 	case ctx.Bool(StoryFlag.Name) && cfg.DataDir == node.DefaultDataDir():
 		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "story")
 	case ctx.Bool(LocalFlag.Name) && cfg.DataDir == node.DefaultDataDir():
@@ -1740,7 +1740,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, GoerliFlag, SepoliaFlag, HoleskyFlag, IliadFlag, OdysseyFlag, HomerFlag, StoryFlag, LocalFlag)
+	CheckExclusive(ctx, MainnetFlag, DeveloperFlag, GoerliFlag, SepoliaFlag, HoleskyFlag, IliadFlag, OdysseyFlag, AeneidFlag, StoryFlag, LocalFlag)
 	CheckExclusive(ctx, DeveloperFlag, ExternalSignerFlag) // Can't use both ephemeral unlocked and external signer
 
 	// Set configurations from CLI flags
@@ -1930,12 +1930,12 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		cfg.Genesis = core.DefaultOdysseyGenesisBlock()
 		SetDNSDiscoveryDefaults(cfg, params.OdysseyGenesisHash)
 		cfg.Miner.GasPrice = big.NewInt(params.GWei * 16)
-	case ctx.Bool(HomerFlag.Name):
+	case ctx.Bool(AeneidFlag.Name):
 		if !ctx.IsSet(NetworkIdFlag.Name) {
 			cfg.NetworkId = 1315
 		}
-		cfg.Genesis = core.DefaultHomerGenesisBlock()
-		SetDNSDiscoveryDefaults(cfg, params.HomerGenesisHash)
+		cfg.Genesis = core.DefaultAeneidGenesisBlock()
+		SetDNSDiscoveryDefaults(cfg, params.AeneidGenesisHash)
 		cfg.Miner.GasPrice = big.NewInt(params.GWei * 4)
 		cfg.Miner.GasCeil = 36_000_000
 		cfg.TxPool.NoLocals = true
@@ -2299,8 +2299,8 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
 		genesis = core.DefaultIliadGenesisBlock()
 	case ctx.Bool(OdysseyFlag.Name):
 		genesis = core.DefaultOdysseyGenesisBlock()
-	case ctx.Bool(HomerFlag.Name):
-		genesis = core.DefaultHomerGenesisBlock()
+	case ctx.Bool(AeneidFlag.Name):
+		genesis = core.DefaultAeneidGenesisBlock()
 	case ctx.Bool(StoryFlag.Name):
 		genesis = core.DefaultStoryGenesisBlock()
 	case ctx.Bool(LocalFlag.Name):

core/genesis.go

@@ -608,15 +608,15 @@ func DefaultOdysseyGenesisBlock() *Genesis {
 	}
 }
 
-// DefaultHomerGenesisBlock returns the homer network genesis block.
-func DefaultHomerGenesisBlock() *Genesis {
+// DefaultAeneidGenesisBlock returns the aeneid network genesis block.
+func DefaultAeneidGenesisBlock() *Genesis {
 	return &Genesis{
-		Config:     params.HomerChainConfig,
+		Config:     params.AeneidChainConfig,
 		Difficulty: big.NewInt(0x20000),
 		GasLimit:   0x7A1200,
 		Nonce:      0x42,
 		Timestamp:  0,
-		Alloc:      decodePrealloc(homerAllocData),
+		Alloc:      decodePrealloc(aeneidAllocData),
 		ExtraData:  hexutil.MustDecode("0x5468652054696d65732032372f4465632f32303233205468652054696d65732053756573204f70656e414920616e64204d6963726f736f6674204f76657220412e492e20557365206f6620436f70797269676874656420576f726b"),
 	}
 }

params/bootnodes.go

@@ -66,9 +66,9 @@ var OdysseyBootnodes = []string{
 	"enode://298bc05889e120e50e7a344e31adb72901caaff9e747b3e8f57c5786e6167452857cbd0ff7d5e0f849a8dfd26efcc3da1795e28d7cb05d120e97a89e79ec4b18@b2.odyssey-testnet.storyrpc.io:30303",
 }
 
-// HomerBootnodes are the enode URLs of the P2P bootstrap nodes running on the
-// Homer dev network.
-var HomerBootnodes = []string{
+// AeneidBootnodes are the enode URLs of the P2P bootstrap nodes running on the
+// Aeneid testnet network.
+var AeneidBootnodes = []string{
 	// Upstream bootnodes
 	"enode://a7e893eb4b07bd9b0c0659730c066564dff0f5fa98c08a7df9f380b84e64fbea16165ee5cce6c3414d64bea8cacc1ac200540c50607a7bf170b9d5504f81bbf8@b1-b.odyssey-devnet.storyrpc.io:30303",
 }

params/config.go

@@ -32,7 +32,7 @@ var (
 	GoerliGenesisHash  = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
 	IliadGenesisHash   = common.HexToHash("0xf5ebc6f0982e8bf7fd532b3f959f84d12b3dedd2827af8d31f5389447bedafc6")
 	OdysseyGenesisHash = common.HexToHash("0xf5ebc6f0982e8bf7fd532b3f959f84d12b3dedd2827af8d31f5389447bedafc6")
-	HomerGenesisHash   = common.HexToHash("0xc8e87a91599b58c05b8f2925a7e8ef6ba0fa3c22f1496f635a0e81517f26106c")
+	AeneidGenesisHash  = common.HexToHash("0xc8e87a91599b58c05b8f2925a7e8ef6ba0fa3c22f1496f635a0e81517f26106c")
 	StoryGenesisHash   = common.HexToHash("0x29b83a77e1705524a60557a9494150635360ccd9d1f68278883d2d9e6d4cc6b2")
 	LocalGenesisHash   = common.HexToHash("0x012f42d887b0d126ad3ce1b43069c24d5ba9af51ce0d8a2873b0bdbf8a07b312")
 )
@@ -189,7 +189,7 @@ var (
 		Enable4844:                    false,
 	}
 
-	HomerChainConfig = &ChainConfig{
+	AeneidChainConfig = &ChainConfig{
 		ChainID:                       big.NewInt(1315),
 		HomesteadBlock:                big.NewInt(0),
 		EIP150Block:                   big.NewInt(0),
@@ -879,7 +879,7 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, headNumber *big.Int,
 // BaseFeeChangeDenominator bounds the amount the base fee can change between blocks.
 func (c *ChainConfig) BaseFeeChangeDenominator() uint64 {
 	if c.IsStory() {
-		return DefaultBaseFeeChangeDenomStoryHomer
+		return DefaultBaseFeeChangeDenomStory
 	}
 
 	return DefaultBaseFeeChangeDenominator
@@ -898,8 +898,9 @@ func (c *ChainConfig) Is4844Enabled() bool {
 func (c *ChainConfig) IsStory() bool {
 	chainId := c.ChainID.Uint64()
 	return chainId == IDStoryMainnet ||
-		chainId == IDStoryIliad ||
+		chainId == IDStoryAeneid ||
 		chainId == IDStoryOdyssey ||
+		chainId == IDStoryIliad ||
 		chainId == IDStoryLocal
 }
 

params/story_params.go

@@ -4,15 +4,18 @@ const (
 	// Story Chain IDs
 	IDStoryMainnet uint64 = 1514
 
-	// Testnet.
+	// Iliad Testnet.
 	IDStoryIliad uint64 = 1513
 
 	// Odyssey Testnet.
 	IDStoryOdyssey uint64 = 1516
 
+	// Aeneid Testnet.
+	IDStoryAeneid uint64 = 1315
+
 	// Local Testet.
 	IDStoryLocal uint64 = 1511
 
 	// Story protocol params
-	DefaultBaseFeeChangeDenomStoryHomer = 24 // EIP1559 denominator for Story Homer
+	DefaultBaseFeeChangeDenomStory = 24 // EIP1559 denominator for Story
 )