Skip to content

[FEAT][LOCKER] Add Unlocking Fee on unlock #45

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

Merged
merged 6 commits into from
Nov 17, 2025
Merged

[FEAT][LOCKER] Add Unlocking Fee on unlock #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01da06a
feat: adding unlocking fee to `FluidLocker::unlock` function
0xPilou Oct 30, 2025
2f0fc96
chore: fix interface change (new constructor param for FluidLocker)
0xPilou Oct 30, 2025
040b27c
chore: update ABIs
0xPilou Oct 31, 2025
0edf918
feat: update the fee transfer call
0xPilou Nov 3, 2025
5c96de4
chore: added comments
0xPilou Nov 4, 2025
e374726
chore: comments
0xPilou Nov 12, 2025
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
17 changes: 14 additions & 3 deletions packages/contracts/abis/interfaces/IFluidLocker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
],
"outputs": [
{
"name": "collectedWeth",
"name": "collectedEthx",
"type": "uint256",
"internalType": "uint256"
},
Expand Down Expand Up @@ -410,7 +410,13 @@
"internalType": "uint256"
}
],
"outputs": [],
"outputs": [
{
"name": "positionTokenId",
"type": "uint256",
"internalType": "uint256"
}
],
"stateMutability": "payable"
},
{
Expand Down Expand Up @@ -447,7 +453,7 @@
}
],
"outputs": [],
"stateMutability": "nonpayable"
"stateMutability": "payable"
},
{
"type": "function",
Expand Down Expand Up @@ -673,6 +679,11 @@
"name": "INSUFFICIENT_UNLOCK_AMOUNT",
"inputs": []
},
{
"type": "error",
"name": "INVALID_UNLOCKING_FEE",
"inputs": []
},
{
"type": "error",
"name": "INVALID_UNLOCK_PERIOD",
Expand Down
29 changes: 2 additions & 27 deletions packages/contracts/abis/interfaces/IFluidLockerFactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"internalType": "address"
}
],
"stateMutability": "payable"
"stateMutability": "nonpayable"
},
{
"type": "function",
Expand All @@ -29,7 +29,7 @@
"internalType": "address"
}
],
"stateMutability": "payable"
"stateMutability": "nonpayable"
},
{
"type": "function",
Expand Down Expand Up @@ -100,19 +100,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "setLockerCreationFee",
"inputs": [
{
"name": "newLockerCreationFee",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "upgradeTo",
Expand All @@ -131,13 +118,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "withdrawETH",
"inputs": [],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "event",
"name": "GovernorUpdated",
Expand Down Expand Up @@ -170,11 +150,6 @@
],
"anonymous": false
},
{
"type": "error",
"name": "INVALID_FEE",
"inputs": []
},
{
"type": "error",
"name": "LOCKER_CREATION_PAUSED",
Expand Down
48 changes: 45 additions & 3 deletions packages/contracts/abis/main/FluidLocker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
"name": "swapRouter",
"type": "address",
"internalType": "contract IV3SwapRouter"
},
{
"name": "daoTreasury",
"type": "address",
"internalType": "address"
}
],
"stateMutability": "nonpayable"
Expand Down Expand Up @@ -79,6 +84,19 @@
],
"stateMutability": "view"
},
{
"type": "function",
"name": "DAO_TREASURY",
"inputs": [],
"outputs": [
{
"name": "",
"type": "address",
"internalType": "address"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "EP_PROGRAM_MANAGER",
Expand Down Expand Up @@ -235,6 +253,19 @@
],
"stateMutability": "view"
},
{
"type": "function",
"name": "UNLOCKING_FEE",
"inputs": [],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "UNLOCK_AVAILABLE",
Expand Down Expand Up @@ -385,7 +416,7 @@
],
"outputs": [
{
"name": "collectedWeth",
"name": "collectedEthx",
"type": "uint256",
"internalType": "uint256"
},
Expand Down Expand Up @@ -749,7 +780,13 @@
"internalType": "uint256"
}
],
"outputs": [],
"outputs": [
{
"name": "positionTokenId",
"type": "uint256",
"internalType": "uint256"
}
],
"stateMutability": "payable"
},
{
Expand Down Expand Up @@ -818,7 +855,7 @@
}
],
"outputs": [],
"stateMutability": "nonpayable"
"stateMutability": "payable"
},
{
"type": "function",
Expand Down Expand Up @@ -1057,6 +1094,11 @@
"name": "INSUFFICIENT_UNLOCK_AMOUNT",
"inputs": []
},
{
"type": "error",
"name": "INVALID_UNLOCKING_FEE",
"inputs": []
},
{
"type": "error",
"name": "INVALID_UNLOCK_PERIOD",
Expand Down
42 changes: 2 additions & 40 deletions packages/contracts/abis/main/FluidLockerFactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"internalType": "address"
}
],
"stateMutability": "payable"
"stateMutability": "nonpayable"
},
{
"type": "function",
Expand All @@ -89,7 +89,7 @@
"internalType": "address"
}
],
"stateMutability": "payable"
"stateMutability": "nonpayable"
},
{
"type": "function",
Expand Down Expand Up @@ -173,19 +173,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "lockerCreationFee",
"inputs": [],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
],
"stateMutability": "view"
},
{
"type": "function",
"name": "setGovernor",
Expand All @@ -199,19 +186,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "setLockerCreationFee",
"inputs": [
{
"name": "newLockerCreationFee",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "upgradeTo",
Expand All @@ -230,13 +204,6 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "withdrawETH",
"inputs": [],
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "event",
"name": "GovernorUpdated",
Expand Down Expand Up @@ -327,11 +294,6 @@
"name": "FailedInnerCall",
"inputs": []
},
{
"type": "error",
"name": "INVALID_FEE",
"inputs": []
},
{
"type": "error",
"name": "InvalidInitialization",
Expand Down
3 changes: 2 additions & 1 deletion packages/contracts/script/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ function _deployLockerBeacon(
settings.unlockStatus,
settings.nonfungiblePositionManager,
settings.ethSupPool,
settings.swapRouter
settings.swapRouter,
settings.treasury
)
);
UpgradeableBeacon lockerBeacon = new UpgradeableBeacon(lockerLogicAddress);
Expand Down
7 changes: 5 additions & 2 deletions packages/contracts/script/upgrades/deploy-sip8.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ SUP_ADDRESS=0xFd62b398DD8a233ad37156690631fb9515059d6A \
FONTAINE_BEACON_ADDRESS=0xeBfA246A0BAd08A2A3ffB137ed75601AA41867dE \
UNLOCK_STATUS=false \
NONFUNGIBLE_POSITION_MANAGER_ADDRESS=0x27F971cb582BF9E50F397e4d29a5C7A34f11faA2 \
ETH_SUP_POOL_ADDRESS=0x0000000000000000000000000000000000000000 \
ETH_SUP_POOL_ADDRESS=0xCa2054E3E5A940473DD6dCC4a67ECdfdFa8c0b72 \
SWAP_ROUTER_ADDRESS=0x94cC0AaC535CCDB3C01d6787D6413C739ae12bc4 \
DAO_TREASURY_ADDRESS=0xe7143e87661418DEA122941e01Fdb3f9Acfd02aB \
forge script script/upgrades/deploy-sip8.s.sol:DeploySIP8_PART_II --ffi --rpc-url $BASE_SEPOLIA_RPC_URL --account TESTNET_DEPLOYER -vvv --broadcast --verify --etherscan-api-key $ETHERSCAN_API_KEY


Expand Down Expand Up @@ -167,6 +168,7 @@ contract DeploySIP8_PART_II is DeploySIP8 {
INonfungiblePositionManager(vm.envAddress("NONFUNGIBLE_POSITION_MANAGER_ADDRESS"));
IUniswapV3Pool ethSupPool = IUniswapV3Pool(vm.envAddress("ETH_SUP_POOL_ADDRESS"));
IV3SwapRouter swapRouter = IV3SwapRouter(vm.envAddress("SWAP_ROUTER_ADDRESS"));
address daoTreasury = vm.envAddress("DAO_TREASURY_ADDRESS");

// Start Deployment :
address deployer = _startBroadcast();
Expand All @@ -180,7 +182,8 @@ contract DeploySIP8_PART_II is DeploySIP8 {
isUnlockAvailable,
nonfungiblePositionManager,
ethSupPool,
swapRouter
swapRouter,
daoTreasury
)
);

Expand Down
4 changes: 3 additions & 1 deletion packages/contracts/script/upgrades/deploy-tte.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ contract DeployTTE_PART_II is DeployTTE {
INonfungiblePositionManager(vm.envAddress("NONFUNGIBLE_POSITION_MANAGER_ADDRESS"));
IUniswapV3Pool ethSupPool = IUniswapV3Pool(vm.envAddress("ETH_SUP_POOL_ADDRESS"));
IV3SwapRouter swapRouter = IV3SwapRouter(vm.envAddress("SWAP_ROUTER_ADDRESS"));
address daoTreasury = vm.envAddress("DAO_TREASURY_ADDRESS");

// Start Deployment :
address deployer = _startBroadcast();
Expand All @@ -173,7 +174,8 @@ contract DeployTTE_PART_II is DeployTTE {
isUnlockAvailable,
nonfungiblePositionManager,
ethSupPool,
swapRouter
swapRouter,
daoTreasury
)
);

Expand Down
Loading