Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove BuiltInFunctionOnMetaEnableEpoch and FixWaitingList #4936

Merged
merged 11 commits into from
Feb 6, 2023
Merged

Remove BuiltInFunctionOnMetaEnableEpoch and FixWaitingList #4936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13c5745
FIX: Remove BuiltInFunctionOnMetaEnableEpoch
mariusmihaic Jan 31, 2023
65da898
FIX: Remove WaitingListFixEnableEpoch
mariusmihaic Jan 31, 2023
031c20e
FIX: computeNodesConfigFromList using previous config
mariusmihaic Feb 2, 2023
53d8de1
FIX: Remove unused epochs
mariusmihaic Feb 2, 2023
15a3461
FIX: Probably merge commit error
mariusmihaic Feb 2, 2023
e8f4b0c
FIX: Remove IsBuiltInFunctionsFlagEnabledField from tests
mariusmihaic Feb 2, 2023
6914679
Merge branch 'feat/staking-v4' into EN-13754-remove-ls-flags-from-sta…
mariusmihaic Feb 2, 2023
cbf73b8
added extra log
gabi-vuls Feb 3, 2023
5cadb25
FIX: After review
mariusmihaic Feb 3, 2023
517cff1
Merge remote-tracking branch 'origin/EN-13754-remove-ls-flags-from-st…
mariusmihaic Feb 3, 2023
c1d9cfe
FIX: Remove debug line
mariusmihaic Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions cmd/node/config/enableEpochs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@
# ValidatorToDelegationEnableEpoch represents the epoch when the validator-to-delegation feature will be enabled
ValidatorToDelegationEnableEpoch = 1

# WaitingListFixEnableEpoch represents the epoch when the 6 epoch waiting list fix is enabled
WaitingListFixEnableEpoch = 1000000

# IncrementSCRNonceInMultiTransferEnableEpoch represents the epoch when the fix for preventing the generation of the same SCRs
# is enabled. The fix is done by adding an extra increment.
IncrementSCRNonceInMultiTransferEnableEpoch = 1
Expand All @@ -106,9 +103,6 @@
# ESDTTransferRoleEnableEpoch represents the epoch when esdt transfer role set is enabled
ESDTTransferRoleEnableEpoch = 1

# BuiltInFunctionOnMetaEnableEpoch represents the epoch when built in function processing on metachain is enabled
BuiltInFunctionOnMetaEnableEpoch = 1000000

# ComputeRewardCheckpointEnableEpoch represents the epoch when compute rewards checkpoint epoch is enabled
ComputeRewardCheckpointEnableEpoch = 1

Expand Down
6 changes: 0 additions & 6 deletions common/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,12 +493,6 @@ const (
// MetricESDTTransferRoleEnableEpoch represents the epoch when the ESDT transfer role feature is enabled
MetricESDTTransferRoleEnableEpoch = "erd_esdt_transfer_role_enable_epoch"

// MetricBuiltInFunctionOnMetaEnableEpoch represents the epoch when the builtin functions on metachain are enabled
MetricBuiltInFunctionOnMetaEnableEpoch = "erd_builtin_function_on_meta_enable_epoch"

// MetricWaitingListFixEnableEpoch represents the epoch when the waiting list fix is enabled
MetricWaitingListFixEnableEpoch = "erd_waiting_list_fix_enable_epoch"

// MetricMaxNodesChangeEnableEpoch holds configuration for changing the maximum number of nodes and the enabling epoch
MetricMaxNodesChangeEnableEpoch = "erd_max_nodes_change_enable_epoch"

Expand Down
12 changes: 5 additions & 7 deletions common/enablers/enableEpochsHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,10 @@ func (handler *enableEpochsHandler) EpochConfirmed(epoch uint32, _ uint64) {
handler.setFlagValue(epoch >= handler.enableEpochsConfig.SaveJailedAlwaysEnableEpoch, handler.saveJailedAlwaysFlag, "saveJailedAlwaysFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ReDelegateBelowMinCheckEnableEpoch, handler.reDelegateBelowMinCheckFlag, "reDelegateBelowMinCheckFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ValidatorToDelegationEnableEpoch, handler.validatorToDelegationFlag, "validatorToDelegationFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.WaitingListFixEnableEpoch, handler.waitingListFixFlag, "waitingListFixFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.IncrementSCRNonceInMultiTransferEnableEpoch, handler.incrementSCRNonceInMultiTransferFlag, "incrementSCRNonceInMultiTransferFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ESDTMultiTransferEnableEpoch, handler.esdtMultiTransferFlag, "esdtMultiTransferFlag")
handler.setFlagValue(epoch < handler.enableEpochsConfig.GlobalMintBurnDisableEpoch, handler.globalMintBurnFlag, "globalMintBurnFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ESDTTransferRoleEnableEpoch, handler.esdtTransferRoleFlag, "esdtTransferRoleFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.BuiltInFunctionOnMetaEnableEpoch, handler.builtInFunctionOnMetaFlag, "builtInFunctionOnMetaFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ComputeRewardCheckpointEnableEpoch, handler.computeRewardCheckpointFlag, "computeRewardCheckpointFlag")
handler.setFlagValue(epoch >= handler.enableEpochsConfig.SCRSizeInvariantCheckEnableEpoch, handler.scrSizeInvariantCheckFlag, "scrSizeInvariantCheckFlag")
handler.setFlagValue(epoch < handler.enableEpochsConfig.BackwardCompSaveKeyValueEnableEpoch, handler.backwardCompSaveKeyValueFlag, "backwardCompSaveKeyValueFlag")
Expand Down Expand Up @@ -155,11 +153,6 @@ func (handler *enableEpochsHandler) BalanceWaitingListsEnableEpoch() uint32 {
return handler.enableEpochsConfig.BalanceWaitingListsEnableEpoch
}

// WaitingListFixEnableEpoch returns the epoch for waiting list fix
func (handler *enableEpochsHandler) WaitingListFixEnableEpoch() uint32 {
return handler.enableEpochsConfig.WaitingListFixEnableEpoch
}

// MultiESDTTransferAsyncCallBackEnableEpoch returns the epoch when multi esdt transfer fix on callback becomes active
func (handler *enableEpochsHandler) MultiESDTTransferAsyncCallBackEnableEpoch() uint32 {
return handler.enableEpochsConfig.MultiESDTTransferFixOnCallBackOnEnableEpoch
Expand Down Expand Up @@ -225,6 +218,11 @@ func (handler *enableEpochsHandler) StakingV4EnableEpoch() uint32 {
return handler.enableEpochsConfig.StakingV4EnableEpoch
}

// StakingV4InitEpoch returns the epoch when stakingV4 phase1 becomes active
func (handler *enableEpochsHandler) StakingV4InitEpoch() uint32 {
return handler.enableEpochsConfig.StakingV4InitEnableEpoch
}

// IsInterfaceNil returns true if there is no value under the interface
func (handler *enableEpochsHandler) IsInterfaceNil() bool {
return handler == nil
Expand Down
9 changes: 0 additions & 9 deletions common/enablers/enableEpochsHandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@ func createEnableEpochsConfig() config.EnableEpochs {
SaveJailedAlwaysEnableEpoch: 27,
ValidatorToDelegationEnableEpoch: 28,
ReDelegateBelowMinCheckEnableEpoch: 29,
WaitingListFixEnableEpoch: 30,
IncrementSCRNonceInMultiTransferEnableEpoch: 31,
ScheduledMiniBlocksEnableEpoch: 32,
ESDTMultiTransferEnableEpoch: 33,
GlobalMintBurnDisableEpoch: 34,
ESDTTransferRoleEnableEpoch: 35,
BuiltInFunctionOnMetaEnableEpoch: 36,
ComputeRewardCheckpointEnableEpoch: 37,
SCRSizeInvariantCheckEnableEpoch: 38,
BackwardCompSaveKeyValueEnableEpoch: 39,
Expand Down Expand Up @@ -170,12 +168,10 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) {
assert.True(t, handler.IsSaveJailedAlwaysFlagEnabled())
assert.True(t, handler.IsReDelegateBelowMinCheckFlagEnabled())
assert.True(t, handler.IsValidatorToDelegationFlagEnabled())
assert.True(t, handler.IsWaitingListFixFlagEnabled())
assert.True(t, handler.IsIncrementSCRNonceInMultiTransferFlagEnabled())
assert.True(t, handler.IsESDTMultiTransferFlagEnabled())
assert.False(t, handler.IsGlobalMintBurnFlagEnabled())
assert.True(t, handler.IsESDTTransferRoleFlagEnabled())
assert.True(t, handler.IsBuiltInFunctionOnMetaFlagEnabled())
assert.True(t, handler.IsComputeRewardCheckpointFlagEnabled())
assert.True(t, handler.IsSCRSizeInvariantCheckFlagEnabled())
assert.False(t, handler.IsBackwardCompSaveKeyValueFlagEnabled())
Expand Down Expand Up @@ -232,7 +228,6 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) {
cfg.GovernanceEnableEpoch = epoch
cfg.CorrectLastUnjailedEnableEpoch = epoch
cfg.StakingV4InitEnableEpoch = epoch
cfg.BuiltInFunctionOnMetaEnableEpoch = epoch

handler, _ := NewEnableEpochsHandler(cfg, &epochNotifier.EpochNotifierStub{})
require.False(t, check.IfNil(handler))
Expand Down Expand Up @@ -275,12 +270,10 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) {
assert.True(t, handler.IsSaveJailedAlwaysFlagEnabled())
assert.True(t, handler.IsReDelegateBelowMinCheckFlagEnabled())
assert.True(t, handler.IsValidatorToDelegationFlagEnabled())
assert.True(t, handler.IsWaitingListFixFlagEnabled())
assert.True(t, handler.IsIncrementSCRNonceInMultiTransferFlagEnabled())
assert.True(t, handler.IsESDTMultiTransferFlagEnabled())
assert.False(t, handler.IsGlobalMintBurnFlagEnabled())
assert.True(t, handler.IsESDTTransferRoleFlagEnabled())
assert.True(t, handler.IsBuiltInFunctionOnMetaFlagEnabled())
assert.True(t, handler.IsComputeRewardCheckpointFlagEnabled())
assert.True(t, handler.IsSCRSizeInvariantCheckFlagEnabled())
assert.False(t, handler.IsBackwardCompSaveKeyValueFlagEnabled())
Expand Down Expand Up @@ -375,12 +368,10 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) {
assert.False(t, handler.IsSaveJailedAlwaysFlagEnabled())
assert.False(t, handler.IsReDelegateBelowMinCheckFlagEnabled())
assert.False(t, handler.IsValidatorToDelegationFlagEnabled())
assert.False(t, handler.IsWaitingListFixFlagEnabled())
assert.False(t, handler.IsIncrementSCRNonceInMultiTransferFlagEnabled())
assert.False(t, handler.IsESDTMultiTransferFlagEnabled())
assert.True(t, handler.IsGlobalMintBurnFlagEnabled())
assert.False(t, handler.IsESDTTransferRoleFlagEnabled())
assert.False(t, handler.IsBuiltInFunctionOnMetaFlagEnabled())
assert.False(t, handler.IsComputeRewardCheckpointFlagEnabled())
assert.False(t, handler.IsSCRSizeInvariantCheckFlagEnabled())
assert.True(t, handler.IsBackwardCompSaveKeyValueFlagEnabled())
Expand Down
20 changes: 3 additions & 17 deletions common/enablers/epochFlags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ type epochFlagsHolder struct {
saveJailedAlwaysFlag *atomic.Flag
reDelegateBelowMinCheckFlag *atomic.Flag
validatorToDelegationFlag *atomic.Flag
waitingListFixFlag *atomic.Flag
incrementSCRNonceInMultiTransferFlag *atomic.Flag
esdtMultiTransferFlag *atomic.Flag
globalMintBurnFlag *atomic.Flag
esdtTransferRoleFlag *atomic.Flag
builtInFunctionOnMetaFlag *atomic.Flag
computeRewardCheckpointFlag *atomic.Flag
scrSizeInvariantCheckFlag *atomic.Flag
backwardCompSaveKeyValueFlag *atomic.Flag
Expand Down Expand Up @@ -134,12 +132,10 @@ func newEpochFlagsHolder() *epochFlagsHolder {
saveJailedAlwaysFlag: &atomic.Flag{},
reDelegateBelowMinCheckFlag: &atomic.Flag{},
validatorToDelegationFlag: &atomic.Flag{},
waitingListFixFlag: &atomic.Flag{},
incrementSCRNonceInMultiTransferFlag: &atomic.Flag{},
esdtMultiTransferFlag: &atomic.Flag{},
globalMintBurnFlag: &atomic.Flag{},
esdtTransferRoleFlag: &atomic.Flag{},
builtInFunctionOnMetaFlag: &atomic.Flag{},
computeRewardCheckpointFlag: &atomic.Flag{},
scrSizeInvariantCheckFlag: &atomic.Flag{},
backwardCompSaveKeyValueFlag: &atomic.Flag{},
Expand Down Expand Up @@ -372,11 +368,6 @@ func (holder *epochFlagsHolder) IsValidatorToDelegationFlagEnabled() bool {
return holder.validatorToDelegationFlag.IsSet()
}

// IsWaitingListFixFlagEnabled returns true if waitingListFixFlag is enabled
func (holder *epochFlagsHolder) IsWaitingListFixFlagEnabled() bool {
return holder.waitingListFixFlag.IsSet()
}

// IsIncrementSCRNonceInMultiTransferFlagEnabled returns true if incrementSCRNonceInMultiTransferFlag is enabled
func (holder *epochFlagsHolder) IsIncrementSCRNonceInMultiTransferFlagEnabled() bool {
return holder.incrementSCRNonceInMultiTransferFlag.IsSet()
Expand All @@ -397,11 +388,6 @@ func (holder *epochFlagsHolder) IsESDTTransferRoleFlagEnabled() bool {
return holder.esdtTransferRoleFlag.IsSet()
}

// IsBuiltInFunctionOnMetaFlagEnabled returns true if builtInFunctionOnMetaFlag is enabled
func (holder *epochFlagsHolder) IsBuiltInFunctionOnMetaFlagEnabled() bool {
return holder.builtInFunctionOnMetaFlag.IsSet()
}

// IsComputeRewardCheckpointFlagEnabled returns true if computeRewardCheckpointFlag is enabled
func (holder *epochFlagsHolder) IsComputeRewardCheckpointFlagEnabled() bool {
return holder.computeRewardCheckpointFlag.IsSet()
Expand Down Expand Up @@ -613,10 +599,10 @@ func (holder *epochFlagsHolder) IsCheckTransferFlagEnabled() bool {
return holder.optimizeNFTStoreFlag.IsSet()
}

// IsTransferToMetaFlagEnabled returns true if builtInFunctionOnMetaFlag is enabled
// this is a duplicate for BuiltInFunctionOnMetaEnableEpoch needed for consistency into vm-common
// IsTransferToMetaFlagEnabled returns false
// This is used for consistency into vm-common
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should update and simplify on vm-common as well. We do not need this function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will add a task to delete it on vm-common as well then, but on a separate PR

func (holder *epochFlagsHolder) IsTransferToMetaFlagEnabled() bool {
return holder.builtInFunctionOnMetaFlag.IsSet()
return false
}

// IsESDTNFTImprovementV1FlagEnabled returns true if esdtMultiTransferFlag is enabled
Expand Down
4 changes: 1 addition & 3 deletions common/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@ type EnableEpochsHandler interface {
ScheduledMiniBlocksEnableEpoch() uint32
SwitchJailWaitingEnableEpoch() uint32
BalanceWaitingListsEnableEpoch() uint32
WaitingListFixEnableEpoch() uint32
MultiESDTTransferAsyncCallBackEnableEpoch() uint32
FixOOGReturnCodeEnableEpoch() uint32
RemoveNonUpdatedStorageEnableEpoch() uint32
Expand All @@ -244,6 +243,7 @@ type EnableEpochsHandler interface {
MiniBlockPartialExecutionEnableEpoch() uint32
RefactorPeersMiniBlocksEnableEpoch() uint32
StakingV4EnableEpoch() uint32
StakingV4InitEpoch() uint32
IsSCDeployFlagEnabled() bool
IsBuiltInFunctionsFlagEnabled() bool
IsRelayedTransactionsFlagEnabled() bool
Expand Down Expand Up @@ -280,12 +280,10 @@ type EnableEpochsHandler interface {
IsSaveJailedAlwaysFlagEnabled() bool
IsReDelegateBelowMinCheckFlagEnabled() bool
IsValidatorToDelegationFlagEnabled() bool
IsWaitingListFixFlagEnabled() bool
IsIncrementSCRNonceInMultiTransferFlagEnabled() bool
IsESDTMultiTransferFlagEnabled() bool
IsGlobalMintBurnFlagEnabled() bool
IsESDTTransferRoleFlagEnabled() bool
IsBuiltInFunctionOnMetaFlagEnabled() bool
IsComputeRewardCheckpointFlagEnabled() bool
IsSCRSizeInvariantCheckFlagEnabled() bool
IsBackwardCompSaveKeyValueFlagEnabled() bool
Expand Down
2 changes: 0 additions & 2 deletions config/epochConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,11 @@ type EnableEpochs struct {
SaveJailedAlwaysEnableEpoch uint32
ValidatorToDelegationEnableEpoch uint32
ReDelegateBelowMinCheckEnableEpoch uint32
WaitingListFixEnableEpoch uint32
IncrementSCRNonceInMultiTransferEnableEpoch uint32
ScheduledMiniBlocksEnableEpoch uint32
ESDTMultiTransferEnableEpoch uint32
GlobalMintBurnDisableEpoch uint32
ESDTTransferRoleEnableEpoch uint32
BuiltInFunctionOnMetaEnableEpoch uint32
ComputeRewardCheckpointEnableEpoch uint32
SCRSizeInvariantCheckEnableEpoch uint32
BackwardCompSaveKeyValueEnableEpoch uint32
Expand Down
8 changes: 0 additions & 8 deletions config/tomlConfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,9 +581,6 @@ func TestEnableEpochConfig(t *testing.T) {
# ValidatorToDelegationEnableEpoch represents the epoch when the validator-to-delegation feature will be enabled
ValidatorToDelegationEnableEpoch = 29

# WaitingListFixEnableEpoch represents the epoch when the 6 epoch waiting list fix is enabled
WaitingListFixEnableEpoch = 30

# IncrementSCRNonceInMultiTransferEnableEpoch represents the epoch when the fix for preventing the generation of the same SCRs
# is enabled. The fix is done by adding an extra increment.
IncrementSCRNonceInMultiTransferEnableEpoch = 31
Expand All @@ -597,9 +594,6 @@ func TestEnableEpochConfig(t *testing.T) {
# ESDTTransferRoleEnableEpoch represents the epoch when esdt transfer role set is enabled
ESDTTransferRoleEnableEpoch = 34

# BuiltInFunctionOnMetaEnableEpoch represents the epoch when built in function processing on metachain is enabled
BuiltInFunctionOnMetaEnableEpoch = 35

# ComputeRewardCheckpointEnableEpoch represents the epoch when compute rewards checkpoint epoch is enabled
ComputeRewardCheckpointEnableEpoch = 36

Expand Down Expand Up @@ -739,12 +733,10 @@ func TestEnableEpochConfig(t *testing.T) {
SaveJailedAlwaysEnableEpoch: 27,
ValidatorToDelegationEnableEpoch: 29,
ReDelegateBelowMinCheckEnableEpoch: 28,
WaitingListFixEnableEpoch: 30,
IncrementSCRNonceInMultiTransferEnableEpoch: 31,
ESDTMultiTransferEnableEpoch: 32,
GlobalMintBurnDisableEpoch: 33,
ESDTTransferRoleEnableEpoch: 34,
BuiltInFunctionOnMetaEnableEpoch: 35,
ComputeRewardCheckpointEnableEpoch: 36,
SCRSizeInvariantCheckEnableEpoch: 37,
BackwardCompSaveKeyValueEnableEpoch: 38,
Expand Down
35 changes: 0 additions & 35 deletions epochStart/metachain/systemSCs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ type ArgsNewEpochStartSystemSCProcessing struct {
type systemSCProcessor struct {
*legacySystemSCProcessor
auctionListSelector epochStart.AuctionListSelector

governanceEnableEpoch uint32
builtInOnMetaEnableEpoch uint32
stakingV4EnableEpoch uint32

enableEpochsHandler common.EnableEpochsHandler
}

Expand Down Expand Up @@ -213,36 +208,6 @@ func (s *systemSCProcessor) updateToGovernanceV2() error {
return nil
}

func (s *systemSCProcessor) initTokenOnMeta() ([]byte, error) {
vmInput := &vmcommon.ContractCallInput{
VMInput: vmcommon.VMInput{
CallerAddr: vm.ESDTSCAddress,
CallValue: big.NewInt(0),
Arguments: [][]byte{},
GasProvided: math.MaxUint64,
},
RecipientAddr: vm.ESDTSCAddress,
Function: "initDelegationESDTOnMeta",
}
vmOutput, errRun := s.systemVM.RunSmartContractCall(vmInput)
if errRun != nil {
return nil, fmt.Errorf("%w when setting up NFTs on metachain", errRun)
}
if vmOutput.ReturnCode != vmcommon.Ok {
return nil, fmt.Errorf("got return code %s, return message %s when setting up NFTs on metachain", vmOutput.ReturnCode, vmOutput.ReturnMessage)
}
if len(vmOutput.ReturnData) != 1 {
return nil, fmt.Errorf("invalid return data on initDelegationESDTOnMeta")
}

err := s.processSCOutputAccounts(vmOutput)
if err != nil {
return nil, err
}

return vmOutput.ReturnData[0], nil
}

// IsInterfaceNil returns true if underlying object is nil
func (s *systemSCProcessor) IsInterfaceNil() bool {
return s == nil
Expand Down
1 change: 0 additions & 1 deletion epochStart/metachain/systemSCs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,6 @@ func createFullArgumentsForSystemSCProcessing(enableEpochsConfig config.EnableEp
enableEpochsConfig.StakeLimitsEnableEpoch = 10
enableEpochsConfig.StakingV4InitEnableEpoch = 444
enableEpochsConfig.StakingV4EnableEpoch = 445
enableEpochsConfig.BuiltInFunctionOnMetaEnableEpoch = 400
epochsConfig := &config.EpochConfig{
EnableEpochs: enableEpochsConfig,
}
Expand Down
2 changes: 0 additions & 2 deletions genesis/process/shardGenesisBlockCreator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,10 @@ func createGenesisConfig() config.EnableEpochs {
SaveJailedAlwaysEnableEpoch: unreachableEpoch,
ValidatorToDelegationEnableEpoch: unreachableEpoch,
ReDelegateBelowMinCheckEnableEpoch: unreachableEpoch,
WaitingListFixEnableEpoch: unreachableEpoch,
IncrementSCRNonceInMultiTransferEnableEpoch: unreachableEpoch,
ESDTMultiTransferEnableEpoch: unreachableEpoch,
GlobalMintBurnDisableEpoch: unreachableEpoch,
ESDTTransferRoleEnableEpoch: unreachableEpoch,
BuiltInFunctionOnMetaEnableEpoch: unreachableEpoch,
ComputeRewardCheckpointEnableEpoch: unreachableEpoch,
SCRSizeInvariantCheckEnableEpoch: unreachableEpoch,
BackwardCompSaveKeyValueEnableEpoch: unreachableEpoch,
Expand Down
1 change: 0 additions & 1 deletion integrationTests/multiShard/smartContract/polynetworkbridge/bridge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ func TestBridgeSetupAndBurn(t *testing.T) {

enableEpochs := config.EnableEpochs{
GlobalMintBurnDisableEpoch: integrationTests.UnreachableEpoch,
BuiltInFunctionOnMetaEnableEpoch: integrationTests.UnreachableEpoch,
FixAsyncCallBackArgsListEnableEpoch: integrationTests.UnreachableEpoch,
}
nodes := integrationTests.CreateNodesWithEnableEpochs(
Expand Down
2 changes: 0 additions & 2 deletions integrationTests/multiShard/softfork/scDeploy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@ func TestScDeploy(t *testing.T) {
t.Skip("this is not a short test")
}

builtinEnableEpoch := uint32(0)
deployEnableEpoch := uint32(1)
relayedTxEnableEpoch := uint32(0)
penalizedTooMuchGasEnableEpoch := uint32(0)
roundsPerEpoch := uint64(10)

enableEpochs := integrationTests.CreateEnableEpochsConfig()
enableEpochs.BuiltInFunctionOnMetaEnableEpoch = builtinEnableEpoch
enableEpochs.SCDeployEnableEpoch = deployEnableEpoch
enableEpochs.RelayedTransactionsEnableEpoch = relayedTxEnableEpoch
enableEpochs.PenalizedTooMuchGasEnableEpoch = penalizedTooMuchGasEnableEpoch
Expand Down