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

Fees and Swap Refactor #10

Merged
merged 8 commits into from
Apr 29, 2023
Merged

Fees and Swap Refactor #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73c7581
add treasury to bridge
jaketimothy Apr 28, 2023
113a6df
add treasury to init
jaketimothy Apr 28, 2023
4bd5b8e
bridge fee data
jaketimothy Apr 28, 2023
3eb321b
single swap flow
jaketimothy Apr 29, 2023
476de39
forge install: prb-math
jaketimothy Apr 29, 2023
5cea59d
prb math for fee calcs
jaketimothy Apr 29, 2023
fc8d54a
tests passing
jaketimothy Apr 29, 2023
986fb7e
simplify action
jaketimothy Apr 29, 2023
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
Prev Previous commit
Next Next commit
add treasury to init
  • Loading branch information
@jaketimothy
jaketimothy committed Apr 28, 2023
commit 113a6dfd3ac20421c6fd2ba175fe9d0a721f4470
4 changes: 3 additions & 1 deletion src/Bridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@ contract Bridge is Initializable, OwnableRoles, UUPSUpgradeable {

bool public ordersPaused;

function initialize(address owner) external initializer {
function initialize(address owner, address treasury_) external initializer {
_initializeOwner(owner);

treasury = treasury_;
}

function operatorRole() external pure returns (uint256) {
Expand Down
15 changes: 8 additions & 7 deletions test/Bridge.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ contract BridgeTest is Test {

address constant user = address(1);
address constant bridgeOperator = address(3);
address constant treasury = address(4);

function setUp() public {
token = new MockBridgedERC20();
paymentToken = new MockERC20("Money", "$", 18);
Bridge bridgeImpl = new Bridge();
bridge =
Bridge(address(new ERC1967Proxy(address(bridgeImpl), abi.encodeCall(Bridge.initialize, (address(this))))));
Bridge(address(new ERC1967Proxy(address(bridgeImpl), abi.encodeCall(Bridge.initialize, (address(this), treasury)))));

token.grantRoles(address(this), token.minterRole());
token.grantRoles(address(bridge), token.minterRole());
Expand All @@ -45,19 +46,19 @@ contract BridgeTest is Test {
function testInitialize(address owner) public {
Bridge bridgeImpl = new Bridge();
Bridge newBridge =
Bridge(address(new ERC1967Proxy(address(bridgeImpl), abi.encodeCall(Bridge.initialize, (owner)))));
Bridge(address(new ERC1967Proxy(address(bridgeImpl), abi.encodeCall(Bridge.initialize, (owner, treasury)))));
assertEq(newBridge.owner(), owner);

Bridge newImpl = new Bridge();
vm.expectRevert(Ownable.Unauthorized.selector);
newBridge.upgradeToAndCall(address(newImpl), abi.encodeCall(Bridge.initialize, (owner)));
newBridge.upgradeToAndCall(address(newImpl), abi.encodeCall(Bridge.initialize, (owner, treasury)));
}

function testSetTreasury(address treasury) public {
function testSetTreasury(address account) public {
vm.expectEmit(true, true, true, true);
emit TreasurySet(treasury);
bridge.setTreasury(treasury);
assertEq(bridge.treasury(), treasury);
emit TreasurySet(account);
bridge.setTreasury(account);
assertEq(bridge.treasury(), account);
}

function testSetPaymentTokenEnabled(address account, bool enabled) public {
Expand Down