if block version is v2.2.0_alpha, keep no role&PK in contract.creator

36c34920 · Devin Zeng · 5a856ba9 · 36c34920
Commit 36c34920 authored Apr 19, 2022 by Devin Zeng 👽
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

contractmgr/contract_manager.go contractmgr/contract_manager.go +11 -7

No files found.
--- a/contractmgr/contract_manager.go
+++ b/contractmgr/contract_manager.go
@@ -436,13 +436,17 @@ func (r *ContractManagerRuntime) InstallContract(context protocol.TxSimContext,

 func (r *ContractManagerRuntime) getCreator(context protocol.TxSimContext) (*accesscontrol.MemberFull, error) {
 	sender := context.GetSender()
-	//if context.GetBlockVersion() == 220 { //兼容历史数据的问题
-	//	return &accesscontrol.MemberFull{
-	//		OrgId:      sender.GetOrgId(),
-	//		MemberType: sender.GetMemberType(),
-	//		MemberInfo: sender.GetMemberInfo(),
-	//	}, nil
-	//}
+	//兼容历史数据的问题
+	//在220也就是v2.2.0_alpha版中，仍然使用的sender的三个信息
+	//在后续版本2201也就是v2.2.0 正式版后，都是使用ac模块重新查询完整的MemberFull
+	//这里使用==220而不是<=220是因为v2.1或者更早的版本在v210文件夹的历史版本合约中
+	if context.GetBlockVersion() == 220 {
+		return &accesscontrol.MemberFull{
+			OrgId:      sender.GetOrgId(),
+			MemberType: sender.GetMemberType(),
+			MemberInfo: sender.GetMemberInfo(),
+		}, nil
+	}
 	ac, err := context.GetAccessControl()
 	if err != nil {
 		r.log.Warn(err)