revert custom storage slot

Snowfork · Jan 9, 2025 · 4ec8b97 · 4ec8b97
1 parent 266a350
commit 4ec8b97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/contracts/src/Gateway.sol b/contracts/src/Gateway.sol
@@ -30,7 +30,6 @@ import {SafeNativeTransfer} from "./utils/SafeTransfer.sol";
 import {Call} from "./utils/Call.sol";
 import {Math} from "./utils/Math.sol";
 import {ScaleCodec} from "./utils/ScaleCodec.sol";
-import {ReentrantGuard} from "./utils/ReentrantGuard.sol";
 
 import {
     AgentExecuteParams,
@@ -109,11 +108,22 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         _;
     }
 
-    // Makes sure that a method is non reentrant.
     modifier nonreentrant() {
-        ReentrantGuard.checkAndSet();
+        assembly {
+            // Check if flag is set and if true revert because it means the function is currently executing.
+            if tload(0) { revert(0, 0) }
+
+            // Set the flag to mark the the function is currently executing.
+            tstore(0, 1)
+        }
+
+        // Execute the function here.
         _;
-        ReentrantGuard.clear();
+
+        assembly {
+            // Clear the flag as the function has completed execution.
+            tstore(0, 0)
+        }
     }
 
     constructor(

diff --git a/contracts/src/utils/ReentrantGuard.sol b/contracts/src/utils/ReentrantGuard.sol