diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index fbd0ba0be03a..e7f1ef2e0014 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -648,10 +648,12 @@ func callistoAccumulateRewards(config *params.ChainConfig, state *state.StateDB, blockReward := CLOMinerReward treasuryReward := CLOTreasuryReward stakeReward := CLOStakeReward + stakeAddress := CLOStakeAddress if config.IsCLOHF1(header.Number) { treasuryReward = CLOHF1TreasuryReward stakeReward = CLOHF1StakeReward + stakeAddress = CLOHF1StakeAddress } monetaryPolicyStep := big.NewInt(0) @@ -679,5 +681,5 @@ func callistoAccumulateRewards(config *params.ChainConfig, state *state.StateDB, state.AddBalance(header.Coinbase, reward) state.AddBalance(CLOTreasuryAddress, treasuryReward) - state.AddBalance(CLOHF1StakeAddress, stakeReward) + state.AddBalance(stakeAddress, stakeReward) } diff --git a/core/pirl_guard.go b/core/pirl_guard.go index fa081dbb594e..d3c5eddc4b08 100644 --- a/core/pirl_guard.go +++ b/core/pirl_guard.go @@ -52,6 +52,7 @@ func (bc *BlockChain) checkChainForAttack(blocks types.Blocks, activationBlock u } } } + p := make(PairList, len(timeMap)) index := 0 for k, v := range timeMap { diff --git a/params/bootnodes.go b/params/bootnodes.go index 2bbec76e46df..dcb078df2074 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -71,18 +71,14 @@ var DiscoveryV5Bootnodes = []string{ } var CallistoBootnodes = []string{ - "enode://9e2d9dc2639e02893aa17c80e6ba8e8803fd3166083b622a841fc852161112720281514436f7605c89041d5efa1738215185c4c4024ff812b0f500c403cc0ab1@206.189.47.198:30303", - "enode://149ba679e8851c3e0d030e0dc0336984b97c83ef649e68ec113dcf266449364cc1ec8ee27950f71b00c2182ef504894fa7bff19f6741978ced67e9e4b6536d2a@206.189.45.31:30303", - "enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303", - "enode://c21418c02f5ba480d64fbdf3dd7e1a276cbea441f9d55b8bb1c653fa3a05cc07e32a332f63df53f51d275dadc9b50925375a699dd39bdad991594326d6b8afab@199.247.3.3:30303", - "enode://40aa8ff2c3d98ffc12004cb6a3636e7c9b79400153667163cfc24123f2ee3ee693ac45775183f5f6a7e315a4884899ac32ef0616e26cdd23a7b00f80d07cdeae@45.32.126.82:30303", - "enode://3beb80913887d985a857076621baca66ea27b62ff159c5a41243d02a8614f537003c03ba1fe082b63a47e7f6f7ba1caf6bb14343560dbff6ba1e456e99e6119d@144.202.73.111:30303", - "enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303", - "enode://dcc091d6da928681e76993cffa047e434b0c0b1388c33330499cd006547de6641f8e5b885c2be12dee07f79d8bd86612cd1b16b4ab2536cbcdfceb278bf403f7@165.227.5.237:30303", - "enode://019faf0a35f3bcf6ac47c54d9d73917378f82acc6ae7197e0cdc037325e934cf12c7587bcbf0358abb2ab5b139780c97ed7d15ec2bd7784a5570e2cc58479bed@104.156.230.179:30303", - "enode://cd85a09fddddfed9ad6858ba1cffb7b6688e4197b85b722f79ccd8b97a7ee8d6d6ef173af91618c24032b5dbaff3265b63bb85dc768d58d830e9aa654cc51838@46.101.190.119:30303", - "enode://d34e34dc0d57694a71611d9bb3df73c928ef77feb05f1e6e3a6243d26b75034c09a6eab37872f7ce830890d87ca180a8d359fa0a649c2d12a05c853c52bae264@159.65.237.29:30303", - "enode://76043456c65ec826f8c2474c57f1cfc880208e036fa85a260c7754a652a6366369caf054afbbeacd7add4f23d9a1525c3cfce23e790e5be6cab68b672e68b770@54.39.105.95:30303", + "enode://b5aeced470962d34ae581f0a0b1e3645f46f4c9004d56eb41c450991da0ef92b87a3bf50a14ae624aecc106eb0604b881054c8e8e45639fdb33ea3d918f4f253@54.36.173.61:30303", // CLO-Mainnet-Node-01-WAW1 + "enode://f53153d299cf0201de5d7400785f405157c139c52a1caad00c554013c0a261cbcd94e72cd45439997c601df8071b4627c6521ed6739405b248f837d95b84c4a6@54.39.102.81:30303", // CLO-Mainnet-Node-02-BHS7 + "enode://b79a50393b16b76a6c94d7ddae80c44464c9e5ecc59fc2b7e83d0c248190de781e7e2aebeab8d466b3869677e6388e6fac8bd36f3925cbeebbe4cf0372a7eac1@207.148.31.238:30303", // CLO-Mainnet-Node-03-VNJ + "enode://3beb80913887d985a857076621baca66ea27b62ff159c5a41243d02a8614f537003c03ba1fe082b63a47e7f6f7ba1caf6bb14343560dbff6ba1e456e99e6119d@144.202.73.111:30303", // CLO-Mainnet-Node-04-DAL + "enode://eeb3b1680f651b291a19454345721b5196a2a689dcd280e5f66dc3207636366d4b25e84d205303c2f8aa0a38467dad9e6f2536e195a4760df56aeac428ebea0b@199.247.18.157:30303", // CLO-Mainnet-Node-05-FRA + "enode://c21418c02f5ba480d64fbdf3dd7e1a276cbea441f9d55b8bb1c653fa3a05cc07e32a332f63df53f51d275dadc9b50925375a699dd39bdad991594326d6b8afab@199.247.3.3:30303", // CLO-Mainnet-Node-06-FRA + "enode://40aa8ff2c3d98ffc12004cb6a3636e7c9b79400153667163cfc24123f2ee3ee693ac45775183f5f6a7e315a4884899ac32ef0616e26cdd23a7b00f80d07cdeae@45.32.126.82:30303", // CLO-Mainnet-Node-07-SIN + "enode://76043456c65ec826f8c2474c57f1cfc880208e036fa85a260c7754a652a6366369caf054afbbeacd7add4f23d9a1525c3cfce23e790e5be6cab68b672e68b770@54.39.105.95:30303", // CLO-Mainnet-Node-08-BHS7 } var CallistoTestnetBootnodes = []string{ diff --git a/params/config.go b/params/config.go index 14fcc712f9b5..5bc8a47af885 100644 --- a/params/config.go +++ b/params/config.go @@ -71,7 +71,7 @@ var ( EIP158Block: big.NewInt(10), ByzantiumBlock: big.NewInt(20), CLOHF1Block: big.NewInt(1400000), - CLOMPBlock: big.NewInt(2900000), + CLOMPBlock: big.NewInt(2900001), ConstantinopleBlock: big.NewInt(3100000), PetersburgBlock: big.NewInt(3100000), Ethash: new(EthashConfig), @@ -277,7 +277,7 @@ func (c *ChainConfig) String() string { default: engine = "unknown" } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v ConstantinopleFix: %v CLOHF1: %v Engine: %v}", + return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v ConstantinopleFix: %v CLOHF1: %v CLOMP: %v Engine: %v}", c.ChainID, c.HomesteadBlock, c.DAOForkBlock, @@ -289,6 +289,7 @@ func (c *ChainConfig) String() string { c.ConstantinopleBlock, c.PetersburgBlock, c.CLOHF1Block, + c.CLOMPBlock, engine, ) }