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

Bips library #367

Merged
merged 4 commits into from
Oct 16, 2024
Merged

Bips library #367

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f56ab3c
update core and add bips library
dianakocsis Oct 16, 2024
ee593b8
format
dianakocsis Oct 16, 2024
791080f
tests
dianakocsis Oct 16, 2024
af2aeb6
format again
dianakocsis Oct 16, 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/PositionManager_burn_nonEmpty_native_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125574
125584
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
125021
125031
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
132427
132446
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
131874
131893
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
146282
146294
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_sameRange.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154848
154872
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154848
154872
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_collect_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
154169
154193
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decreaseLiquidity_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
111971
111980
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119729
119753
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
119050
119074
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135224
135243
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
128371
128380
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
132416
132440
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_decrease_take_take.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
120305
120329
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
159033
159057
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
157973
157997
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_increaseLiquidity_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
140860
140872
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
177340
177364
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
148016
148040
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_native.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
364721
364745
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
373244
373268
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
372467
372491
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickLower.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
317569
317617
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_onSameTickUpper.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
318239
318287
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_sameRange.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
243808
243856
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
418988
419060
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
323600
323648
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withClose.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
420122
420170
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_mint_withSettlePair.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
419180
419228
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_multicall_initialize_mint.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
463927
455975
2 changes: 1 addition & 1 deletion .forge-snapshots/PositionManager_permit_twice.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
44876
44852
2 changes: 1 addition & 1 deletion lib/v4-core
Open in desktop
Submodule v4-core updated 46 files
+1 −1 .forge-snapshots/add liquidity to already existing position with salt.snap
+1 −1 .forge-snapshots/addLiquidity CA fee.snap
+1 −1 .forge-snapshots/addLiquidity with empty hook.snap
+1 −1 .forge-snapshots/addLiquidity with native token.snap
+1 −1 .forge-snapshots/create new liquidity to a position with salt.snap
+1 −1 .forge-snapshots/donate gas with 1 token.snap
+1 −1 .forge-snapshots/donate gas with 2 tokens.snap
+1 −1 .forge-snapshots/erc20 collect protocol fees.snap
+1 −1 .forge-snapshots/initialize.snap
+1 −1 .forge-snapshots/poolManager bytecode size.snap
+1 −1 .forge-snapshots/removeLiquidity CA fee.snap
+1 −1 .forge-snapshots/removeLiquidity with empty hook.snap
+1 −1 .forge-snapshots/removeLiquidity with native token.snap
+1 −1 .forge-snapshots/simple addLiquidity second addition same range.snap
+1 −1 .forge-snapshots/simple addLiquidity.snap
+1 −1 .forge-snapshots/simple removeLiquidity some liquidity remains.snap
+1 −1 .forge-snapshots/simple removeLiquidity.snap
+1 −1 .forge-snapshots/simple swap with native.snap
+1 −1 .forge-snapshots/simple swap.snap
+1 −1 .forge-snapshots/swap CA custom curve + swap noop.snap
+1 −1 .forge-snapshots/swap CA fee on unspecified.snap
+1 −1 .forge-snapshots/swap against liquidity with native token.snap
+1 −1 .forge-snapshots/swap against liquidity.snap
+1 −1 .forge-snapshots/swap burn 6909 for input.snap
+1 −1 .forge-snapshots/swap burn native 6909 for input.snap
+1 −1 .forge-snapshots/swap mint native output as 6909.snap
+1 −1 .forge-snapshots/swap mint output as 6909.snap
+1 −1 .forge-snapshots/swap skips hook call if hook is caller.snap
+1 −1 .forge-snapshots/swap with hooks.snap
+1 −1 .forge-snapshots/swap with return dynamic fee.snap
+1 −0 .github/CODEOWNERS
+0 −89 .github/workflows/coverage.yml
+3 −4 src/PoolManager.sol
+0 −42 src/ProtocolFees.sol
+1 −2 src/interfaces/IProtocolFees.sol
+0 −17 src/libraries/BipsLibrary.sol
+2 −2 src/libraries/Hooks.sol
+4 −7 src/libraries/Pool.sol
+0 −39 src/test/ProtocolFeeControllerTest.sol
+0 −4 src/test/ProtocolFeesImplementation.sol
+1 −2 src/test/ProxyPoolManager.sol
+0 −121 test/PoolManagerInitialize.t.sol
+1 −46 test/ProtocolFeesImplementation.t.sol
+0 −51 test/libraries/BipsLibrary.t.sol
+13 −13 test/libraries/Pool.t.sol
+1 −15 test/utils/Deployers.sol
2 changes: 1 addition & 1 deletion src/V4Router.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";
import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol";
import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol";
import {BipsLibrary} from "@uniswap/v4-core/src/libraries/BipsLibrary.sol";

import {PathKey, PathKeyLibrary} from "./libraries/PathKey.sol";
import {CalldataDecoder} from "./libraries/CalldataDecoder.sol";
Expand All @@ -16,6 +15,7 @@ import {BaseActionsRouter} from "./base/BaseActionsRouter.sol";
import {DeltaResolver} from "./base/DeltaResolver.sol";
import {Actions} from "./libraries/Actions.sol";
import {ActionConstants} from "./libraries/ActionConstants.sol";
import {BipsLibrary} from "./libraries/BipsLibrary.sol";

/// @title UniswapV4Router
/// @notice Abstract contract that contains all internal logic needed for routing through Uniswap v4 pools
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/BipsLibrary.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// SPDX-License-Identifier: GPL-2.0-or-later
pragma solidity ^0.8.0;

/// @title For calculating a percentage of an amount, using bips
library BipsLibrary {
uint256 internal constant BPS_DENOMINATOR = 10_000;

/// @notice emitted when an invalid percentage is provided
error InvalidBips();

/// @param amount The total amount to calculate a percentage of
/// @param bips The percentage to calculate, in bips
function calculatePortion(uint256 amount, uint256 bips) internal pure returns (uint256) {
if (bips > BPS_DENOMINATOR) revert InvalidBips();
return (amount * bips) / BPS_DENOMINATOR;
}
}
2 changes: 1 addition & 1 deletion test/router/Payments.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ pragma solidity ^0.8.19;

import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
import {BipsLibrary} from "@uniswap/v4-core/src/libraries/BipsLibrary.sol";

import {IV4Router} from "../../src/interfaces/IV4Router.sol";
import {RoutingTestHelpers} from "../shared/RoutingTestHelpers.sol";
import {Plan, Planner} from "../shared/Planner.sol";
import {Actions} from "../../src/libraries/Actions.sol";
import {ActionConstants} from "../../src/libraries/ActionConstants.sol";
import {BipsLibrary} from "../../src/libraries/BipsLibrary.sol";

contract PaymentsTests is RoutingTestHelpers, GasSnapshot {
using CurrencyLibrary for Currency;
Expand Down
Loading