fix: userCalled check condition

gnoswap-labs · May 2, 2024 · d1d3959 · d1d3959
1 parent 0c5b383
commit d1d3959
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/_deploy/r/demo/gnoswap/common/allow_non_gnoswap_contracts.gno b/_deploy/r/demo/gnoswap/common/allow_non_gnoswap_contracts.gno
@@ -27,8 +27,8 @@ func MustCallFromAdmin() {
 }
 
 func DisallowCallFromUser() {
-	isOrigin := std.IsOriginCall()
-	if isOrigin {
+	prevRealmPath := std.PrevRealm().PkgPath()
+	if prevRealmPath == "" {
 		panic("must be called by realm, not user")
 	}
 }

diff --git a/router/router.gno b/router/router.gno
@@ -38,7 +38,10 @@ func SwapRoute(
 	_tokenAmountLimit string, // uint256
 ) (string, string) { // tokneIn, tokenOut
 	if common.GetLimitCaller() {
-		std.AssertOriginCall()
+		isUserCalled := std.PrevRealm().PkgPath() == ""
+		if !isUserCalled {
+			panic("[ROUTER] router.gno__SwapRoute() || only user can call this function")
+		}
 	}
 
 	amountSpecified := i256.MustFromDecimal(_amountSpecified)

diff --git a/staker/staker.gno b/staker/staker.gno
@@ -57,7 +57,10 @@ func CreateExternalIncentive(
 	endTimestamp int64,
 ) {
 	if common.GetLimitCaller() {
-		std.AssertOriginCall()
+		isUserCalled := std.PrevRealm().PkgPath() == ""
+		if !isUserCalled {
+			panic("[STAKER] staker.gno__CreateExternalIncentive() || only user can call this function")
+		}
 	}
 
 	rewardAmount := u256.MustFromDecimal(_rewardAmount)