Fix call cost charging logic for System SCORE

icon-project · Jul 15, 2021 · f51b83f · f51b83f
1 parent d326bc6
commit f51b83f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/icon/icmodule/revision.go b/icon/icmodule/revision.go
@@ -56,6 +56,7 @@ const (
 	RevisionMultipleUnstakes       = Revision9
 	RevisionFixEmailValidation     = Revision9
 	RevisionDelegationSlotMaxTo100 = Revision9
+	RevisionSystemSCORE            = Revision9
 
 	RevisionFixInvalidUnstake = Revision11
 

diff --git a/icon/systemhandler.go b/icon/systemhandler.go
@@ -39,23 +39,14 @@ func allowExtraParams(method string) bool {
 	return yn
 }
 
-var methodsNotChargingContractCallStep = map[string]bool{
-	"setStake":                  true,
-	"setDelegation":             true,
-	"registerPRep":              true,
-	"unregisterPRep":            true,
-	"setPRep":                   true,
-	"setGovernanceVariables":    true,
-	"claimIScore":               true,
-	"estimateUnstakeLockPeriod": true,
-}
-
 func doNotChargeContractCallStep(method string, revision int) bool {
 	if revision >= icmodule.RevisionICON2 || revision < icmodule.RevisionIISS {
 		return false
 	}
-	yn, _ := methodsNotChargingContractCallStep[method]
-	return yn
+	if method == "" && revision < icmodule.RevisionSystemSCORE {
+		return false
+	}
+	return true
 }
 
 type CallHandler interface {
@@ -99,6 +90,8 @@ func (h *SystemCallHandler) ExecuteAsync(cc contract.CallContext) (err error) {
 			h.log.TSystemf("FRAME[%d] allow extra params", cc.FrameID())
 			h.AllowExtra()
 		}
+	}
+	if h.revision.Value() < icmodule.RevisionIISS {
 		defer func() {
 			if scoreresult.MethodNotFoundError.Equals(err) {
 				h.log.TSystemf(