Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use solmate owned #520

Merged
merged 7 commits into from
Mar 28, 2024
Merged

Use solmate owned #520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
acce796
Use solmate owned
hensha256 Mar 20, 2024
c4fe1a3
Merge branch 'main' into use-solmate-owned
hensha256 Mar 22, 2024
b07b185
Merge branch 'main' into use-solmate-owned
hensha256 Mar 26, 2024
dfa80d7
Add onlyOwner test
hensha256 Mar 26, 2024
e7d5794
Merge branch 'main' into use-solmate-owned
hensha256 Mar 26, 2024
985ae1c
Merge branch 'main' into use-solmate-owned
hensha256 Mar 28, 2024
f36d50d
Merge branch 'main' into use-solmate-owned
snreynolds Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .forge-snapshots/addLiquidity with empty hook.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
311243
311195
2 changes: 1 addition & 1 deletion .forge-snapshots/addLiquidity with native token.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
191422
191374
2 changes: 1 addition & 1 deletion .forge-snapshots/addLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
191403
191355
2 changes: 1 addition & 1 deletion .forge-snapshots/donate gas with 1 token.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131137
130959
2 changes: 1 addition & 1 deletion .forge-snapshots/donate gas with 2 tokens.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
175960
175824
2 changes: 1 addition & 1 deletion .forge-snapshots/erc20 collect protocol fees.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24938
24961
2 changes: 1 addition & 1 deletion .forge-snapshots/initialize.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
51816
51794
2 changes: 1 addition & 1 deletion .forge-snapshots/native collect protocol fees.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
36611
36634
2 changes: 1 addition & 1 deletion .forge-snapshots/poolManager bytecode size.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22875
22920
2 changes: 1 addition & 1 deletion .forge-snapshots/removeLiquidity with empty hook.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98020
97888
2 changes: 1 addition & 1 deletion .forge-snapshots/removeLiquidity with native token.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
199393
199261
2 changes: 1 addition & 1 deletion .forge-snapshots/removeLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
195670
195538
2 changes: 1 addition & 1 deletion .forge-snapshots/simple swap with native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
186039
185883
2 changes: 1 addition & 1 deletion .forge-snapshots/simple swap.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
194579
194423
2 changes: 1 addition & 1 deletion .forge-snapshots/swap against liquidity with native token.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
116698
116542
2 changes: 1 addition & 1 deletion .forge-snapshots/swap against liquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
104165
104009
2 changes: 1 addition & 1 deletion .forge-snapshots/swap burn 6909 for input.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
124314
124116
2 changes: 1 addition & 1 deletion .forge-snapshots/swap burn native 6909 for input.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120267
120069
2 changes: 1 addition & 1 deletion .forge-snapshots/swap mint native output as 6909.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
188597
188464
2 changes: 1 addition & 1 deletion .forge-snapshots/swap mint output as 6909.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
205406
205273
2 changes: 1 addition & 1 deletion .forge-snapshots/swap with dynamic fee.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
137470
137314
2 changes: 1 addition & 1 deletion .forge-snapshots/swap with hooks.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
104143
103987
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it just makes no sense 😭

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wonder if running forge test --isolate before and after this change will still introduce a diff

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good q i'll try it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope sadly they all still change - different values ofc but they still all change by like <200 ish. Could be that thats an expected result but its definitely weird

2 changes: 1 addition & 1 deletion .forge-snapshots/update dynamic fee in before swap.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
188472
188294
29 changes: 0 additions & 29 deletions src/Owned.sol
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/PoolManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/ProtocolFees.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions src/interfaces/IProtocolFees.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
43 changes: 0 additions & 43 deletions test/Owned.t.sol
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions test/PoolManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -984,7 +983,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);
}

Expand Down
Loading