From 6e7f75a3f1d47d0af00374f8f96a6117413714ad Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 18 Nov 2019 16:42:45 +0800 Subject: [PATCH] add contract_destroy height --- common/config/config.go | 6 +++--- common/constants/constants.go | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common/config/config.go b/common/config/config.go index e46d38d945..fe93f56de7 100644 --- a/common/config/config.go +++ b/common/config/config.go @@ -130,9 +130,9 @@ func GetOpcodeUpdateCheckHeight(id uint32) uint32 { } var CONTRACT_DESTROY_ENABLE_HEIGHT = map[uint32]uint32{ - NETWORK_ID_MAIN_NET: constants.OPCODE_HEIGHT_UPDATE_FIRST_MAINNET, //Network main - NETWORK_ID_POLARIS_NET: constants.OPCODE_HEIGHT_UPDATE_FIRST_POLARIS, //Network polaris - NETWORK_ID_SOLO_NET: 0, //Network solo + NETWORK_ID_MAIN_NET: constants.CONTRACT_DESTROY_MAINNET, //Network main + NETWORK_ID_POLARIS_NET: constants.CONTRACT_DESTROY_POLARIS, //Network polaris + NETWORK_ID_SOLO_NET: 0, //Network solo } func GetContractDestroyCheckHeight(id uint32) uint32 { diff --git a/common/constants/constants.go b/common/constants/constants.go index dd00cd16f0..e58205111d 100644 --- a/common/constants/constants.go +++ b/common/constants/constants.go @@ -86,3 +86,8 @@ const STATE_HASH_HEIGHT_POLARIS = 850000 // neovm opcode update check height const OPCODE_HEIGHT_UPDATE_FIRST_MAINNET = 6300000 const OPCODE_HEIGHT_UPDATE_FIRST_POLARIS = 2100000 + +const ( + CONTRACT_DESTROY_MAINNET = 6300000 + CONTRACT_DESTROY_POLARIS = 6300000 +)