From c5cac0731cf4e6647f670d288a65ab7844d4f33c Mon Sep 17 00:00:00 2001 From: Bui Quang Minh Date: Wed, 16 Aug 2023 16:03:25 +0700 Subject: [PATCH] devp2p: add IP filter and ronin mainnet/testnet filter for nodeset filter This commit adds IP or-filter, updates the ronin mainnet and testnet configuration that are used for nodeset filter. This also allows DNS sign to use password file instead of entering via prompt. --- cmd/devp2p/dnscmd.go | 30 ++++++++++++++++------ cmd/devp2p/nodesetcmd.go | 24 ++++++++++++++++++ params/config.go | 54 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 9 deletions(-) diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go index 85f28b8cb1..ac3a29fe60 100644 --- a/cmd/devp2p/dnscmd.go +++ b/cmd/devp2p/dnscmd.go @@ -23,6 +23,7 @@ import ( "io/ioutil" "os" "path/filepath" + "strings" "time" "github.com/ethereum/go-ethereum/accounts/keystore" @@ -151,10 +152,11 @@ func dnsSign(ctx *cli.Context) error { return fmt.Errorf("need tree definition directory and key file as arguments") } var ( - defdir = ctx.Args().Get(0) - keyfile = ctx.Args().Get(1) - def = loadTreeDefinition(defdir) - domain = directoryName(defdir) + defdir = ctx.Args().Get(0) + keyfile = ctx.Args().Get(1) + def = loadTreeDefinition(defdir) + domain = directoryName(defdir) + passwordfile string ) if def.Meta.URL != "" { d, _, err := dnsdisc.ParseURL(def.Meta.URL) @@ -176,7 +178,10 @@ func dnsSign(ctx *cli.Context) error { return err } - key := loadSigningKey(keyfile) + if ctx.NArg() == 3 { + passwordfile = ctx.Args().Get(2) + } + key := loadSigningKey(keyfile, passwordfile) url, err := t.Sign(key, domain) if err != nil { return fmt.Errorf("can't sign: %v", err) @@ -252,12 +257,23 @@ func dnsNukeRoute53(ctx *cli.Context) error { } // loadSigningKey loads a private key in Ethereum keystore format. -func loadSigningKey(keyfile string) *ecdsa.PrivateKey { +func loadSigningKey(keyfile, passwordfile string) *ecdsa.PrivateKey { keyjson, err := ioutil.ReadFile(keyfile) if err != nil { exit(fmt.Errorf("failed to read the keyfile at '%s': %v", keyfile, err)) } - password, _ := prompt.Stdin.PromptPassword("Please enter the password for '" + keyfile + "': ") + + var password string + if passwordfile != "" { + rawPassword, err := ioutil.ReadFile(passwordfile) + if err != nil { + exit(fmt.Errorf("failed to read the passwordfile at '%s': %v", passwordfile, err)) + } + password = strings.TrimRight(string(rawPassword), "\r\n") + } else { + password, _ = prompt.Stdin.PromptPassword("Please enter the password for '" + keyfile + "': ") + } + key, err := keystore.DecryptKey(keyjson, password) if err != nil { exit(fmt.Errorf("error decrypting key: %v", err)) diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go index d65d6314c8..dc559c1bfe 100644 --- a/cmd/devp2p/nodesetcmd.go +++ b/cmd/devp2p/nodesetcmd.go @@ -136,6 +136,7 @@ type nodeFilterC struct { var filterFlags = map[string]nodeFilterC{ "-limit": {1, trueFilter}, // needed to skip over -limit "-ip": {1, ipFilter}, + "-ip-list": {1, ipListFilter}, "-min-age": {1, minAgeFilter}, "-eth-network": {1, ethFilter}, "-les-server": {0, lesFilter}, @@ -212,6 +213,25 @@ func ipFilter(args []string) (nodeFilter, error) { return f, nil } +func ipListFilter(args []string) (nodeFilter, error) { + rawIpList := strings.Split(args[0], ",") + var ipList []net.IP + for _, rawIp := range rawIpList { + ip := net.ParseIP(rawIp) + ipList = append(ipList, ip) + } + + f := func(n nodeJSON) bool { + for _, ip := range ipList { + if ip.Equal(n.N.IP()) { + return true + } + } + return false + } + return f, nil +} + func minAgeFilter(args []string) (nodeFilter, error) { minage, err := time.ParseDuration(args[0]) if err != nil { @@ -237,6 +257,10 @@ func ethFilter(args []string) (nodeFilter, error) { filter = forkid.NewStaticFilter(params.RopstenChainConfig, params.RopstenGenesisHash) case "sepolia": filter = forkid.NewStaticFilter(params.SepoliaChainConfig, params.SepoliaGenesisHash) + case "ronin-mainnet": + filter = forkid.NewStaticFilter(params.RoninMainnetChainConfig, params.RoninMainnetGenesisHash) + case "ronin-testnet": + filter = forkid.NewStaticFilter(params.RoninTestnetChainConfig, params.RoninTestnetGenesisHash) default: return nil, fmt.Errorf("unknown network %q", args[0]) } diff --git a/params/config.go b/params/config.go index 7f30af65f3..b540ae49bb 100644 --- a/params/config.go +++ b/params/config.go @@ -34,6 +34,7 @@ var ( RinkebyGenesisHash = common.HexToHash("0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177") GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a") RoninMainnetGenesisHash = common.HexToHash("0x6e675ee97607f4e695188786c3c1853fb1562f1c075629eb5dbcff269422a1a4") + RoninTestnetGenesisHash = common.HexToHash("0x13e47595099383189b8b0d5f3b67aa161495e478bb3fea64f4cf85cdf69cac4d") ) // TrustedCheckpoints associates each known checkpoint with the genesis hash of @@ -235,6 +236,9 @@ var ( RoninMainnetBlacklistContract = common.HexToAddress("0x313b24994c93FA0471CB4D7aB796b07467041806") RoninMainnetFenixValidatorContractAddress = common.HexToAddress("0x7f13232Bdc3a010c3f749a1c25bF99f1C053CE70") + RoninMainnetRoninValidatorSetAddress = common.HexToAddress("0x617c5d73662282EA7FfD231E020eCa6D2B0D552f") + RoninMainnetSlashIndicatorAddress = common.HexToAddress("0xEBFFF2b32fA0dF9C5C8C5d5AAa7e8b51d5207bA3") + RoninMainnetStakingContractAddress = common.HexToAddress("0x545edb750eB8769C868429BE9586F5857A768758") RoninMainnetChainConfig = &ChainConfig{ ChainID: big.NewInt(2020), @@ -251,9 +255,55 @@ var ( BlacklistContractAddress: &RoninMainnetBlacklistContract, FenixValidatorContractAddress: &RoninMainnetFenixValidatorContractAddress, Consortium: &ConsortiumConfig{ - Period: 3, - Epoch: 600, + Period: 3, + Epoch: 600, + EpochV2: 200, }, + ConsortiumV2Contracts: &ConsortiumV2Contracts{ + RoninValidatorSet: RoninMainnetRoninValidatorSetAddress, + SlashIndicator: RoninMainnetSlashIndicatorAddress, + StakingContract: RoninMainnetStakingContractAddress, + }, + ConsortiumV2Block: big.NewInt(23155200), + PuffyBlock: big.NewInt(0), + BubaBlock: big.NewInt(0), + OlekBlock: big.NewInt(24935500), + } + + RoninTestnetBlacklistContract = common.HexToAddress("0xF53EED5210c9cF308abFe66bA7CF14884c95A8aC") + RoninTestnetFenixValidatorContractAddress = common.HexToAddress("0x1454cAAd1637b662432Bb795cD5773d21281eDAb") + RoninTestnetRoninValidatorSetAddress = common.HexToAddress("0x54B3AC74a90E64E8dDE60671b6fE8F8DDf18eC9d") + RoninTestnetSlashIndicatorAddress = common.HexToAddress("0xF7837778b6E180Df6696C8Fa986d62f8b6186752") + RoninTestnetStakingContractAddress = common.HexToAddress("0x9C245671791834daf3885533D24dce516B763B28") + + RoninTestnetChainConfig = &ChainConfig{ + ChainID: big.NewInt(2021), + HomesteadBlock: big.NewInt(0), + EIP150Block: big.NewInt(0), + EIP155Block: big.NewInt(0), + EIP158Block: big.NewInt(0), + ByzantiumBlock: big.NewInt(0), + ConstantinopleBlock: big.NewInt(0), + PetersburgBlock: big.NewInt(0), + IstanbulBlock: big.NewInt(0), + OdysseusBlock: big.NewInt(3315095), + FenixBlock: big.NewInt(6770400), + BlacklistContractAddress: &RoninTestnetBlacklistContract, + FenixValidatorContractAddress: &RoninTestnetFenixValidatorContractAddress, + Consortium: &ConsortiumConfig{ + Period: 3, + Epoch: 30, + EpochV2: 200, + }, + ConsortiumV2Contracts: &ConsortiumV2Contracts{ + RoninValidatorSet: RoninTestnetRoninValidatorSetAddress, + SlashIndicator: RoninTestnetSlashIndicatorAddress, + StakingContract: RoninTestnetStakingContractAddress, + }, + ConsortiumV2Block: big.NewInt(11706000), + PuffyBlock: big.NewInt(12254000), + BubaBlock: big.NewInt(14260600), + OlekBlock: big.NewInt(16849000), } // GoerliTrustedCheckpoint contains the light client trusted checkpoint for the Görli test network.