Merge branch 'v2.4.0_qc_sync' into 'v2.4.0_qc' (merge request !295)

fix: replace version representation fix: replace version representation --bug=0

Merge branch 'v2.4.0_qc_sync' into 'v2.4.0_qc' (merge request !295)
fix: replace version representation fix: replace version representation --bug=0
16527cc8 · shaozhuguang · aacca6cf · fe021389 · 16527cc8 · 16527cc8
Commit 16527cc8 authored Mar 14, 2025 by shaozhuguang
5 changed files
--- a/chainconfigmgr/chain_config_consensus.go
+++ b/chainconfigmgr/chain_config_consensus.go
@@ -25,7 +25,7 @@ import (
 )

 var (
-	blockVersion2400 = utils.GetBlockVersion("v2.4.0")
+	blockVersion2400 = protocol.BlockVersion240
 )

 // ChainConsensusRuntime chain consensus config update

--- a/chainconfigmgr/chain_config_contract.go
+++ b/chainconfigmgr/chain_config_contract.go
@@ -209,7 +209,7 @@ func (c *ChainConfigContract) registerChainConfigContractMethodsForVM(log protoc
 	c.RegisterMethod(syscontract.ChainConfigFunction_MULTI_SIGN_ENABLE_MANUAL_RUN.String(),
 		common.WrapResultFunc(vmRuntime.EnableOrDisableMultiSignManualRun), 0, 0)

-	var startVersion, endVersion uint32 = utils.GetBlockVersion("v2.4.0"), 0
+	var startVersion, endVersion uint32 = protocol.BlockVersion240, 0
 	c.RegisterMethod(syscontract.ChainConfigFunction_VM_SUPPORT_LIST_ADD.String(),
 		common.WrapResultFunc(vmRuntime.VMSupportListAdd), startVersion, endVersion)
 }

--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	chainmaker.org/chainmaker/logger/v2 v2.3.5-0.20250311075614-ff90ca99cbc1
 	chainmaker.org/chainmaker/pb-go/v2 v2.3.7-0.20250305031636-a9cc6c55adf0
 	chainmaker.org/chainmaker/protocol/v2 v2.3.9-0.20250311075443-fd94f323bf28
-	chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250311075718-16223e6ae771
+	chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250314025122-dfc83b8bd7bc
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2

--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,9 @@ chainmaker.org/chainmaker/pb-go/v2 v2.3.7-0.20250305031636-a9cc6c55adf0 h1:zYhLj
 chainmaker.org/chainmaker/pb-go/v2 v2.3.7-0.20250305031636-a9cc6c55adf0/go.mod h1:GXGRIYS+d6bcgmmqKrW7nNBh3mIHE1EwTLv96811OtE=
 chainmaker.org/chainmaker/protocol/v2 v2.3.9-0.20250311075443-fd94f323bf28 h1:p++wbMJLXTYGjMBwzN+TGmMu6NlpUU6XSXCtJD1sT+g=
 chainmaker.org/chainmaker/protocol/v2 v2.3.9-0.20250311075443-fd94f323bf28/go.mod h1:iKwUeyj74TBlnoNY8+gvxcpxnXZb8ebXPmzAqDR5MIc=
-chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250311075718-16223e6ae771 h1:AxszYgVxlrPBeQGDU/oe4ONNVxNE6SyZbscNWTLk1+o=
 chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250311075718-16223e6ae771/go.mod h1:RPTDcGV6WcVXAz346qEMWCmkZs9kjTL6f3jFkq6xq6Y=
+chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250314025122-dfc83b8bd7bc h1:5JGhw9jVUuirP8Q9oRVuiTcQNE3LJiRADnTqLWf19TQ=
+chainmaker.org/chainmaker/utils/v2 v2.3.7-0.20250314025122-dfc83b8bd7bc/go.mod h1:RPTDcGV6WcVXAz346qEMWCmkZs9kjTL6f3jFkq6xq6Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

--- a/syncmgr/rule.go
+++ b/syncmgr/rule.go
@@ -14,7 +14,6 @@ import (
 	"chainmaker.org/chainmaker/pb-go/v2/sync"
 	"chainmaker.org/chainmaker/pb-go/v2/syscontract"
 	"chainmaker.org/chainmaker/protocol/v2"
-	"chainmaker.org/chainmaker/utils/v2"
 	"chainmaker.org/chainmaker/vm-native/v2/common"
 	"github.com/gogo/protobuf/proto"
 )
@@ -57,7 +56,7 @@ func NewSyncRuleContract(log protocol.Logger) *SyncRuleContract {
 func (c *SyncRuleContract) registerSyncRuleContractMethods() map[string]common.ContractFunc {
 	methodMap := make(map[string]common.ContractFunc, 64)
 	ruleRuntime := NewSyncRuleRuntime(c.log)
-	var startVersion, endVersion uint32 = utils.GetBlockVersion("v2.4.0"), 0
+	var startVersion, endVersion uint32 = protocol.BlockVersion240, 0
 	c.RegisterMethod(syscontract.SyncRuleFunction_ADD.String(),
 		common.WrapResultFunc(ruleRuntime.CreateOrReplaceRule), startVersion, endVersion)
 	c.RegisterMethod(syscontract.SyncRuleFunction_GET.String(),