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

[SC-1219] upgrade to new fee flow #179

Merged
merged 12 commits into from
Dec 11, 2024
Merged

[SC-1219] upgrade to new fee flow #179

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
339b0ed
(wip) upgrade to new fee flow
ZumZoom Nov 19, 2024
43a774d
fix tests
ZumZoom Nov 21, 2024
131ac48
fix last test
ZumZoom Nov 21, 2024
0b3e2c2
remove excess calculation
SevenSwen Nov 21, 2024
f12ad70
use setNextBlockTimestamp in time-dependent tests
SevenSwen Nov 21, 2024
82f0a25
fix natspec
ZumZoom Nov 26, 2024
3cfbbdb
Update test/MeasureGas.js
galekseev Dec 3, 2024
b69b5a3
bump version
ZumZoom Dec 11, 2024
246648a
Merge branch 'master' into feature/new-fee-flow
ZumZoom Dec 11, 2024
e5aae6e
fix modifier
ZumZoom Dec 11, 2024
955f3a9
fix
ZumZoom Dec 11, 2024
5f11426
bump version
ZumZoom Dec 11, 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
133 changes: 0 additions & 133 deletions contracts/FeeBank.sol
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions contracts/FeeBankCharger.sol
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions contracts/Settlement.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { SimpleSettlement } from "./SimpleSettlement.sol";
contract Settlement is SimpleSettlement {
error InvalidPriorityFee();

constructor(address limitOrderProtocol, IERC20 feeToken, IERC20 accessToken, address weth, address owner)
SimpleSettlement(limitOrderProtocol, feeToken, accessToken, weth, owner)
constructor(address limitOrderProtocol, IERC20 accessToken, address weth, address owner)
SimpleSettlement(limitOrderProtocol, accessToken, weth, owner)
{}

function _postInteraction(
Expand Down
Loading
Loading