From 8dc1361ae797c27d6634a5d1d2c4482c538daadc Mon Sep 17 00:00:00 2001 From: Diego Nava Date: Tue, 10 Oct 2023 10:22:28 +0200 Subject: [PATCH 1/3] enable hip30 epoch for testnet --- core/state_processor.go | 4 +++- internal/params/config.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/state_processor.go b/core/state_processor.go index 544ac0bc2f..6ea9e244a6 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -568,10 +568,12 @@ func MayBalanceMigration( } } } + // for testing balance migration on testnet + isTestnet := nodeconfig.GetDefaultConfig().GetNetworkType() == nodeconfig.Testnet // for testing balance migration on devnet isDevnet := nodeconfig.GetDefaultConfig().GetNetworkType() == nodeconfig.Partner isLocalnet := nodeconfig.GetDefaultConfig().GetNetworkType() == nodeconfig.Localnet - if isDevnet || isLocalnet { + if isDevnet || isLocalnet || isTestnet { if config.IsOneEpochBeforeHIP30(header.Epoch()) { if myShard := chain.ShardID(); myShard != shard.BeaconChainShardID { parentRoot := chain.GetBlockByHash( diff --git a/internal/params/config.go b/internal/params/config.go index afdf92b5b2..439053a769 100644 --- a/internal/params/config.go +++ b/internal/params/config.go @@ -116,7 +116,7 @@ var ( LeaderRotationExternalBeaconLeaders: EpochTBD, FeeCollectEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 ValidatorCodeFixEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 - HIP30Epoch: EpochTBD, + HIP30Epoch: big.NewInt(2176), // 2023-10-10 10:00:00+00:00 BlockGas30MEpoch: EpochTBD, } // PangaeaChainConfig contains the chain parameters for the Pangaea network. From 70a8c85c3169bdc354bb2259b6ad7d56b61c0ff2 Mon Sep 17 00:00:00 2001 From: Diego Nava Date: Tue, 10 Oct 2023 11:18:25 +0200 Subject: [PATCH 2/3] fix date comment --- internal/params/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/params/config.go b/internal/params/config.go index 439053a769..99dc8a0c39 100644 --- a/internal/params/config.go +++ b/internal/params/config.go @@ -116,7 +116,7 @@ var ( LeaderRotationExternalBeaconLeaders: EpochTBD, FeeCollectEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 ValidatorCodeFixEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 - HIP30Epoch: big.NewInt(2176), // 2023-10-10 10:00:00+00:00 + HIP30Epoch: big.NewInt(2176), // 2023-10-12 10:00:00+00:00 BlockGas30MEpoch: EpochTBD, } // PangaeaChainConfig contains the chain parameters for the Pangaea network. From f05bd827f4e13bbc20cf38fc09c71353752c172a Mon Sep 17 00:00:00 2001 From: Diego Nava Date: Tue, 10 Oct 2023 13:18:48 +0200 Subject: [PATCH 3/3] set blockgas30M epoch --- internal/params/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/params/config.go b/internal/params/config.go index 99dc8a0c39..dd795183ef 100644 --- a/internal/params/config.go +++ b/internal/params/config.go @@ -117,7 +117,7 @@ var ( FeeCollectEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 ValidatorCodeFixEpoch: big.NewInt(1296), // 2023-04-28 07:14:20+00:00 HIP30Epoch: big.NewInt(2176), // 2023-10-12 10:00:00+00:00 - BlockGas30MEpoch: EpochTBD, + BlockGas30MEpoch: big.NewInt(2176), // 2023-10-12 10:00:00+00:00 } // PangaeaChainConfig contains the chain parameters for the Pangaea network. // All features except for CrossLink are enabled at launch.