Skip to content

Cleanup escrow fees #117

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
reednaa merged 2 commits into from
Aug 12, 2025
Merged

Cleanup escrow fees #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ed3e64
Cleanup escrow fees
reednaa Aug 11, 2025
6f09b07
Merge branch 'main' into escrow-improvements
reednaa Aug 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
6 changes: 3 additions & 3 deletions snapshots/inputSettler.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"CompactFinaliseFor": "101978",
"CompactFinaliseSelf": "94961",
"CompactFinaliseTo": "94961",
"EscrowFinalise": "42401",
"EscrowFinalise": "44564",
"IntegrationCoinFill": "64331",
"IntegrationCompactFinaliseSelf": "85815",
"IntegrationWormholeReceiveMessage": "45670",
"IntegrationWormholeSubmit": "14037",
"broadcast": "14904",
"compactFinaliseSelfWithFee": "164791",
"depositAndRegisterFor": "128947",
"escrowFinaliseSelfWithFee": "106842",
"escrowFinaliseWithSignature": "49799",
"escrowFinaliseSelfWithFee": "106906",
"escrowFinaliseWithSignature": "51962",
"escrowOpen": "55155",
"escrowOpenFor3009Single": "89408",
"escrowOpenFor3009SingleArray": "99750",
Expand Down
5 changes: 3 additions & 2 deletions src/input/escrow/InputSettlerEscrowLIFI.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ contract InputSettlerEscrowLIFI is InputSettlerEscrow, GovernanceFee {
// revert and it will unmark it. This acts as a reentry check.
orderStatus[orderId] = newStatus;

uint256 fee = governanceFee;
address _owner = owner();
uint64 fee = _owner != address(0) ? governanceFee : 0;
// We have now ensured that this point can only be reached once. We can now process the asset delivery.
uint256 numInputs = inputs.length;
for (uint256 i; i < numInputs; ++i) {
Expand All @@ -228,7 +229,7 @@ contract InputSettlerEscrowLIFI is InputSettlerEscrow, GovernanceFee {

uint256 calculatedFee = _calcFee(amount, fee);
if (calculatedFee > 0) {
SafeTransferLib.safeTransfer(token, owner(), calculatedFee);
SafeTransferLib.safeTransfer(token, _owner, calculatedFee);
unchecked {
amount = amount - calculatedFee;
}
Expand Down