diff --git a/contractmgr/contract_manager.go b/contractmgr/contract_manager.go index 89c4f61fad3341cfe475a428d364ca7727d3c413..a26a7ac3db5e03ce3a3f334dd002ff3cee0ca84d 100644 --- a/contractmgr/contract_manager.go +++ b/contractmgr/contract_manager.go @@ -9,7 +9,6 @@ package contractmgr import ( "bytes" - "chainmaker.org/chainmaker/pb-go/v2/config" "encoding/json" "errors" "fmt" @@ -19,6 +18,8 @@ import ( "path/filepath" "strings" + "chainmaker.org/chainmaker/pb-go/v2/config" + "github.com/google/uuid" "chainmaker.org/chainmaker/pb-go/v2/accesscontrol" @@ -29,8 +30,8 @@ import ( "chainmaker.org/chainmaker/vm-native/v2/common" ) -const( - ZXAddrPrefix = "ZX" +const ( + zxlAddrPrefix = "ZX" ) var ( @@ -108,6 +109,7 @@ func registerContractManagerMethods(log protocol.Logger) map[string]common.Contr // return addr //} +//addZXPrefixForContractAddr add zxl address prefix for contract func addZXPrefixForContractAddr(txSimContext protocol.TxSimContext, contract *commonPb.Contract) *commonPb.Contract { cfg, _ := txSimContext.GetBlockchainStore().GetLastChainConfig() @@ -116,17 +118,18 @@ func addZXPrefixForContractAddr(txSimContext protocol.TxSimContext, contract *co return contract } - contract.Address = ZXAddrPrefix + contract.Address + contract.Address = zxlAddrPrefix + contract.Address return contract } -func truncateZXPrefixForContractAddr(contract *commonPb.Contract) *commonPb.Contract { - if contract.Address[0:2] == ZXAddrPrefix { - contract.Address = contract.Address[2:] - } - - return contract -} +//truncateZXPrefixForContractAddr delete zxl address prefix +//func truncateZXPrefixForContractAddr(contract *commonPb.Contract) *commonPb.Contract { +// if contract.Address[0:2] == zxlAddrPrefix { +// contract.Address = contract.Address[2:] +// } +// +// return contract +//} func putContract(context protocol.TxSimContext, contract *commonPb.Contract) error { cdata, err := contract.Marshal() @@ -299,7 +302,6 @@ func (r *ContractManagerRuntime) fetchDisabledContractList(txSimContext protocol for _, c := range contracts { if c.Status == commonPb.ContractStatus_FROZEN { disabledContractList = append(disabledContractList, c.Name) - c = addZXPrefixForContractAddr(txSimContext, c) } } return disabledContractList, err @@ -335,7 +337,7 @@ func (r *ContractManagerRuntime) getAllContracts(txSimContext protocol.TxSimCont contract.RuntimeType = commonPb.RuntimeType_DOCKER_GO } - contract = addZXPrefixForContractAddr(txSimContext, contract) + addZXPrefixForContractAddr(txSimContext, contract) } r.log.Debugf("getAllContracts result: %+v", contracts) return json.Marshal(contracts)