Use solmate owned (Uniswap#520)

* Use solmate owned * Add onlyOwner test --------- Co-authored-by: Sara Reynolds <[email protected]>
saucepoint · Mar 28, 2024 · b230769 · b230769
1 parent 444ffe3
commit b230769
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 101 deletions.
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-265799
+265795
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-140642
+140638
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-145959
+145955
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
@@ -1 +1 @@
-101654
+101564
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
@@ -1 +1 @@
-128667
+128619
diff --git a/.forge-snapshots/erc20 collect protocol fees.snap b/.forge-snapshots/erc20 collect protocol fees.snap
@@ -1 +1 @@
-24938
+24961
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-51819
+51797
diff --git a/.forge-snapshots/native collect protocol fees.snap b/.forge-snapshots/native collect protocol fees.snap
@@ -1 +1 @@
-36611
+36634
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-23026
+23071
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-56574
+56486
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-148760
+148672
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-150224
+150136
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
@@ -1 +1 @@
-133409
+133341
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
@@ -1 +1 @@
-147285
+147217
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
@@ -1 +1 @@
-72868
+72800
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-60871
+60803
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -1 +1 @@
-80985
+80875
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -1 +1 @@
-76940
+76830
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
@@ -1 +1 @@
-139268
+139223
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
@@ -1 +1 @@
-156077
+156032
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
@@ -1 +1 @@
-90176
+90108
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
@@ -1 +1 @@
-60849
+60781
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
@@ -1 +1 @@
-141181
+141091
diff --git a/src/Owned.sol b/src/Owned.sol
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
@@ -10,7 +10,6 @@ import {Currency, CurrencyLibrary} from "./types/Currency.sol";
 import {PoolKey} from "./types/PoolKey.sol";
 import {TickMath} from "./libraries/TickMath.sol";
 import {NoDelegateCall} from "./NoDelegateCall.sol";
-import {Owned} from "./Owned.sol";
 import {IHooks} from "./interfaces/IHooks.sol";
 import {IPoolManager} from "./interfaces/IPoolManager.sol";
 import {IUnlockCallback} from "./interfaces/callback/IUnlockCallback.sol";

diff --git a/src/ProtocolFees.sol b/src/ProtocolFees.sol
@@ -6,7 +6,7 @@ import {IProtocolFeeController} from "./interfaces/IProtocolFeeController.sol";
 import {IProtocolFees} from "./interfaces/IProtocolFees.sol";
 import {Pool} from "./libraries/Pool.sol";
 import {PoolKey} from "./types/PoolKey.sol";
-import {Owned} from "./Owned.sol";
+import {Owned} from "solmate/auth/Owned.sol";
 
 abstract contract ProtocolFees is IProtocolFees, Owned {
     using CurrencyLibrary for Currency;
@@ -19,7 +19,7 @@ abstract contract ProtocolFees is IProtocolFees, Owned {
 
     uint256 private immutable controllerGasLimit;
 
-    constructor(uint256 _controllerGasLimit) {
+    constructor(uint256 _controllerGasLimit) Owned(msg.sender) {
         controllerGasLimit = _controllerGasLimit;
     }
 

diff --git a/src/interfaces/IProtocolFees.sol b/src/interfaces/IProtocolFees.sol
@@ -10,6 +10,8 @@ interface IProtocolFees {
     error ProtocolFeeControllerCallFailedOrInvalidResult();
     /// @notice Thrown when a pool does not have a dynamic fee.
     error FeeNotDynamic();
+    /// @notice Thrown when collectProtocolFees is not called by the controller.
+    error InvalidCaller();
 
     event ProtocolFeeControllerUpdated(address protocolFeeController);
 

diff --git a/test/Owned.t.sol b/test/Owned.t.sol
diff --git a/test/PoolManager.t.sol b/test/PoolManager.t.sol
@@ -8,7 +8,6 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
 import {IProtocolFeeController} from "../src/interfaces/IProtocolFeeController.sol";
 import {PoolManager} from "../src/PoolManager.sol";
-import {Owned} from "../src/Owned.sol";
 import {TickMath} from "../src/libraries/TickMath.sol";
 import {Pool} from "../src/libraries/Pool.sol";
 import {Deployers} from "./utils/Deployers.sol";
@@ -69,7 +68,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         snapSize("poolManager bytecode size", address(manager));
     }
 
-    function test_feeControllerSet() public {
+    function test_setProtocolFeeController_succeeds() public {
         deployFreshManager();
         assertEq(address(manager.protocolFeeController()), address(0));
         vm.expectEmit(false, false, false, true, address(manager));
@@ -78,6 +77,16 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
         assertEq(address(manager.protocolFeeController()), address(feeController));
     }
 
+    function test_setProtocolFeeController_failsIfNotOwner() public {
+        deployFreshManager();
+        assertEq(address(manager.protocolFeeController()), address(0));
+
+        vm.prank(address(1)); // not the owner address
+        vm.expectRevert("UNAUTHORIZED");
+        manager.setProtocolFeeController(feeController);
+        assertEq(address(manager.protocolFeeController()), address(0));
+    }
+
     function test_addLiquidity_failsIfNotInitialized() public {
         vm.expectRevert(Pool.PoolNotInitialized.selector);
         modifyLiquidityRouter.modifyLiquidity(uninitializedKey, LIQ_PARAMS, ZERO_BYTES);
@@ -984,7 +993,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot {
     }
 
     function test_collectProtocolFees_revertsIfCallerIsNotController() public {
-        vm.expectRevert(Owned.InvalidCaller.selector);
+        vm.expectRevert(IProtocolFees.InvalidCaller.selector);
         manager.collectProtocolFees(address(1), currency0, 0);
     }