Skip to content

Commit

Permalink
chore(netconf): rename homer to aeneid (#461)
Browse files Browse the repository at this point in the history
rename homer network to aeneid

issue: none
  • Loading branch information
0xHansLee authored Jan 29, 2025
1 parent f002d24 commit bd8af30
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 37 deletions.
4 changes: 2 additions & 2 deletions client/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ func InitFiles(ctx context.Context, initCfg InitConfig) error {
cfg = storycfg.IliadConfig
case network == netconf.Odyssey:
cfg = storycfg.OdysseyConfig
case network == netconf.Homer:
cfg = storycfg.HomerConfig
case network == netconf.Aeneid:
cfg = storycfg.AeneidConfig
case network == netconf.Story:
cfg = storycfg.StoryConfig
case network == netconf.Local:
Expand Down
6 changes: 3 additions & 3 deletions client/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ var (
Seeds: "",
SeedMode: false,
}
HomerConfig = Config{
AeneidConfig = Config{
HomeDir: DefaultHomeDir(),
Network: "homer",
Network: "aeneid",
EngineEndpoint: DefaultEngineEndpoint,
EngineJWTFile: DefaultJWTFile("homer"),
EngineJWTFile: DefaultJWTFile("aeneid"),
SnapshotInterval: defaultSnapshotInterval,
SnapshotKeepRecent: defaultSnapshotKeepRecent,
BackendType: string(defaultDBBackend),
Expand Down
2 changes: 1 addition & 1 deletion client/config/config.toml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# last modified the config file. Do not modify this.
version = "{{ .Version }}"

# Story network to participate in: story, odyssey, homer, or local.
# Story network to participate in: story, odyssey, aeneid, or local.
network = "{{ .Network }}"

#######################################################################
Expand Down
2 changes: 1 addition & 1 deletion client/config/testdata/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# last modified the config file. Do not modify this.
version = "v0.1.5"

# Story network to participate in: story, odyssey, homer, or local.
# Story network to participate in: story, odyssey, aeneid, or local.
network = ""

#######################################################################
Expand Down
10 changes: 5 additions & 5 deletions contracts/script/GenerateAlloc.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ contract GenerateAlloc is Script {
return "./iliad-alloc.json";
} else if (block.chainid == ChainIds.MININET) {
return "./mininet-alloc.json";
} else if (block.chainid == ChainIds.HOMER) {
return "./homer-alloc.json";
} else if (block.chainid == ChainIds.AENEID) {
return "./aeneid-alloc.json";
} else if (block.chainid == ChainIds.ODYSSEY_TESTNET) {
return "./odyssey-testnet-alloc.json";
} else if (block.chainid == ChainIds.LOCAL) {
Expand All @@ -98,7 +98,7 @@ contract GenerateAlloc is Script {
} else if (block.chainid == ChainIds.MININET) {
// Mininet
return 10 seconds;
} else if (block.chainid == ChainIds.HOMER) {
} else if (block.chainid == ChainIds.AENEID) {
// Odyssey devnet
return 10 seconds;
} else if (block.chainid == ChainIds.ODYSSEY_TESTNET) {
Expand Down Expand Up @@ -402,8 +402,8 @@ contract GenerateAlloc is Script {
// Allocation
if (block.chainid == ChainIds.STORY_MAINNET) {
// TBD
} else if (block.chainid == ChainIds.HOMER) {
// Homer alloc
} else if (block.chainid == ChainIds.AENEID) {
// Aeneid alloc
vm.deal(0x5687400189B13551137e330F7ae081142EdfD866, 200000000 ether);
vm.deal(0x56A26642ad963D3542DdAe4d8fdECC396153c2f6, 200000000 ether);
vm.deal(0x12cBb8F6F2F7d48bB22B6A1b12452381A45bEb7c, 100000000 ether);
Expand Down
2 changes: 1 addition & 1 deletion contracts/script/utils/ChainIds.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ library ChainIds {
uint256 public constant STORY_MAINNET = 1514;
uint256 public constant ILIAD = 1513;
uint256 public constant MININET = 1512;
uint256 public constant HOMER = 1315;
uint256 public constant AENEID = 1315;
uint256 public constant ODYSSEY_TESTNET = 1516;
uint256 public constant LOCAL = 1511;
uint256 public constant FOUNDRY = 31337;
Expand Down
8 changes: 1 addition & 7 deletions contracts/test/stake/IPTokenStaking.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pragma solidity 0.8.23;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { console2 } from "forge-std/console2.sol";

import { IPTokenStaking, IIPTokenStaking } from "../../src/protocol/IPTokenStaking.sol";
import { Test } from "../utils/Test.sol";
Expand Down Expand Up @@ -405,12 +404,7 @@ contract IPTokenStakingTest is Test {
vm.deal(delegatorAddr, feeAmount);
vm.prank(delegatorAddr);
vm.expectRevert("IPTokenStaking: Data length over max");
ipTokenStaking.unstake{ value: feeAmount }(
validatorCmpPubkey,
delegationId,
stakeAmount,
dataOverMaxLen
);
ipTokenStaking.unstake{ value: feeAmount }(validatorCmpPubkey, delegationId, stakeAmount, dataOverMaxLen);

vm.prank(delegatorAddr);
vm.expectRevert("IPTokenStaking: Data length over max");
Expand Down
10 changes: 5 additions & 5 deletions lib/evmchain/evmchain.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ const (
// Story Mainnet.
IDStory uint64 = 1514

// Local Testet.
// Local Devnet.
IDLocal uint64 = 1511

// Testnets.
// Iliad Testnets.
IDIliad uint64 = 1513

// Odyssey Testnets.
// Odyssey Testnet.
IDOdyssey uint64 = 1516

// Homer.
IDHomer uint64 = 1315
// Aeneid Testnet.
IDAeneid uint64 = 1315

storyEVMName = "story_evm"
storyEVMBlockPeriod = time.Second * 2
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/netconf/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import "github.com/spf13/pflag"

// BindFlag binds the network identifier flag.
func BindFlag(flags *pflag.FlagSet, network *ID) {
flags.StringVar((*string)(network), "network", string(*network), "Story network to participate in: story, odyssey, homer or local")
flags.StringVar((*string)(network), "network", string(*network), "Story network to participate in: story, odyssey, aeneid or local")
}
6 changes: 3 additions & 3 deletions lib/netconf/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ const (
// Odyssey is the official Story Protocol public testnet.
Odyssey ID = "odyssey"

// Homer is the official Story Protocol devnet.
Homer ID = "homer"
// Aeneid is the official Story Protocol testnet.
Aeneid ID = "aeneid"

// Story is the official Story Protocol mainnet.
Story ID = "story"
Expand All @@ -49,7 +49,7 @@ const (
var supported = map[ID]bool{
Iliad: true,
Odyssey: true,
Homer: true,
Aeneid: true,
Local: true,
Story: true,
}
Expand Down
16 changes: 8 additions & 8 deletions lib/netconf/static.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ var (

//nolint:gochecknoglobals // Static addresses
var (
//go:embed homer/genesis.json
homerConsensusGenesisJSON []byte
//go:embed aeneid/genesis.json
aeneidConsensusGenesisJSON []byte

//go:embed homer/seeds.txt
homerConsensusSeedsTXT []byte
//go:embed aeneid/seeds.txt
aeneidConsensusSeedsTXT []byte
)

//nolint:gochecknoglobals // Static addresses
Expand Down Expand Up @@ -109,11 +109,11 @@ var statics = map[ID]Static{
ConsensusGenesisJSON: odysseyConsensusGenesisJSON,
ConsensusSeedTXT: odysseyConsensusSeedsTXT,
},
Homer: {
Aeneid: {
Version: "v0.0.1",
StoryExecutionChainID: evmchain.IDHomer,
ConsensusGenesisJSON: homerConsensusGenesisJSON,
ConsensusSeedTXT: homerConsensusSeedsTXT,
StoryExecutionChainID: evmchain.IDAeneid,
ConsensusGenesisJSON: aeneidConsensusGenesisJSON,
ConsensusSeedTXT: aeneidConsensusSeedsTXT,
},
Story: {
Version: "v0.0.1",
Expand Down

0 comments on commit bd8af30

Please sign in to comment.