Put ngt functions after regular ones

makerdao · Dec 20, 2023 · 233c8cc · 233c8cc
1 parent 8354769
commit 233c8cc
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/LockstakeEngine.sol b/src/LockstakeEngine.sol
@@ -231,19 +231,19 @@ contract LockstakeEngine is Multicall {
         emit Nope(urn, usr);
     }
 
+    function lock(address urn, uint256 wad) external urnAuth(urn) {
+        mkr.transferFrom(msg.sender, address(this), wad);
+        _lock(urn, wad);
+        emit Lock(urn, wad);
+    }
+
     function lockNgt(address urn, uint256 ngtWad) external urnAuth(urn) {
         ngt.transferFrom(msg.sender, address(this), ngtWad);
         mkrNgt.ngtToMkr(address(this), ngtWad);
         _lock(urn, ngtWad / mkrNgtRate);
         emit LockNgt(urn, ngtWad);
     }
 
-    function lock(address urn, uint256 wad) external urnAuth(urn) {
-        mkr.transferFrom(msg.sender, address(this), wad);
-        _lock(urn, wad);
-        emit Lock(urn, wad);
-    }
-
     function _lock(address urn, uint256 wad) internal {
         require(wad <= uint256(type(int256).max), "LockstakeEngine/wad-overflow");
         address delegate_ = urnDelegates[urn];
@@ -258,19 +258,19 @@ contract LockstakeEngine is Multicall {
         stkMkr.mint(urn, wad);
     }
 
+    function free(address urn, address to, uint256 wad) external urnAuth(urn) {
+        uint256 freed = _free(urn, wad);
+        mkr.transfer(to, freed);
+        emit Free(urn, to, wad, wad - freed);
+    }
+
     function freeNgt(address urn, address to, uint256 ngtWad) external urnAuth(urn) {
         uint256 wad = ngtWad / mkrNgtRate;
         uint256 freed = _free(urn, wad);
         mkrNgt.mkrToNgt(to, freed);
         emit FreeNgt(urn, to, ngtWad, wad - freed);
     }
 
-    function free(address urn, address to, uint256 wad) external urnAuth(urn) {
-        uint256 freed = _free(urn, wad);
-        mkr.transfer(to, freed);
-        emit Free(urn, to, wad, wad - freed);
-    }
-
     function _free(address urn, uint256 wad) internal returns (uint256 freed) {
         require(wad <= uint256(type(int256).max), "LockstakeEngine/wad-overflow");
         stkMkr.burn(urn, wad);