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

Full coverage with balance checks #72

Merged
merged 5 commits into from
Jun 15, 2023
Merged

Full coverage with balance checks #72

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc9e64f
BuyOrderIssuer full line coverage
jaketimothy Jun 14, 2023
24a8386
BuyOrderIssuer balance checks
jaketimothy Jun 14, 2023
ca83996
DirectBuyIssuer full coverage
jaketimothy Jun 14, 2023
c255bb8
SellOrderProcessor full coverage
jaketimothy Jun 14, 2023
f52a6f3
OrderProcessor full coverage
jaketimothy Jun 14, 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
OrderProcessor full coverage
  • Loading branch information
@jaketimothy
jaketimothy committed Jun 14, 2023
commit f52a6f3fd8af16ef70fee86c12c1c38218b3b94b
53 changes: 30 additions & 23 deletions .gas-snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,41 @@ BridgedERC20Test:testSetSymbol(string) (runs: 518, μ: 61557, ~: 68720)
BridgedERC20Test:testTransfer() (gas: 102095)
BridgedERC20Test:testTransferRestrictedFromReverts() (gas: 121429)
BridgedERC20Test:testTransferRestrictedToReverts() (gas: 123593)
BuyOrderIssuerTest:testCancelOrder(uint128,uint128,string) (runs: 518, μ: 370277, ~: 378781)
BuyOrderIssuerTest:testCancelOrderNotFoundReverts() (gas: 54716)
BuyOrderIssuerTest:testFillOrder(uint128,uint128,uint256) (runs: 518, μ: 335281, ~: 382396)
BuyOrderIssuerTest:testCancelOrder(uint128,uint128,string) (runs: 518, μ: 370916, ~: 378792)
BuyOrderIssuerTest:testCancelOrderNotFoundReverts() (gas: 54694)
BuyOrderIssuerTest:testFillOrder(uint128,uint128,uint256) (runs: 518, μ: 338614, ~: 382418)
BuyOrderIssuerTest:testFillorderNoOrderReverts() (gas: 54549)
BuyOrderIssuerTest:testFulfillOrder(uint128,uint256) (runs: 518, μ: 342501, ~: 344282)
BuyOrderIssuerTest:testGetInputValue(uint64,uint64,uint128) (runs: 518, μ: 628341, ~: 632845)
BuyOrderIssuerTest:testInitialize(address,address) (runs: 518, μ: 7012817, ~: 7012817)
BuyOrderIssuerTest:testNoFees(uint128) (runs: 518, μ: 20372, ~: 20372)
BuyOrderIssuerTest:testFulfillOrder(uint128,uint256) (runs: 518, μ: 342504, ~: 344288)
BuyOrderIssuerTest:testGetInputValue(uint64,uint64,uint128) (runs: 518, μ: 628977, ~: 632845)
BuyOrderIssuerTest:testInitialize(address,address) (runs: 518, μ: 7013243, ~: 7013243)
BuyOrderIssuerTest:testInitializeZeroOwnerReverts() (gas: 3449093)
BuyOrderIssuerTest:testInitializeZeroTreasuryReverts() (gas: 3523035)
BuyOrderIssuerTest:testNoFees(uint128) (runs: 518, μ: 20350, ~: 20350)
BuyOrderIssuerTest:testRequestCancel() (gas: 261898)
BuyOrderIssuerTest:testRequestCancelNotFoundReverts() (gas: 27809)
BuyOrderIssuerTest:testRequestCancelNotRequesterReverts() (gas: 255462)
BuyOrderIssuerTest:testRequestOrder(uint128) (runs: 518, μ: 212374, ~: 272336)
BuyOrderIssuerTest:testRequestOrderCollisionReverts() (gas: 257349)
BuyOrderIssuerTest:testRequestCancelNotFoundReverts() (gas: 27787)
BuyOrderIssuerTest:testRequestCancelNotRequesterReverts() (gas: 255440)
BuyOrderIssuerTest:testRequestOrder(uint128) (runs: 518, μ: 208947, ~: 272336)
BuyOrderIssuerTest:testRequestOrderCollisionReverts() (gas: 257327)
BuyOrderIssuerTest:testRequestOrderPausedReverts() (gas: 56734)
BuyOrderIssuerTest:testRequestOrderUnsupportedAssetReverts(address) (runs: 518, μ: 113191, ~: 113191)
BuyOrderIssuerTest:testRequestOrderUnsupportedPaymentReverts(address) (runs: 518, μ: 115548, ~: 115548)
BuyOrderIssuerTest:testRequestOrderWithPermit() (gas: 333166)
BuyOrderIssuerTest:testSetFees(address) (runs: 518, μ: 24656, ~: 24656)
BuyOrderIssuerTest:testRequestOrderUnsupportedAssetReverts(address) (runs: 518, μ: 113169, ~: 113169)
BuyOrderIssuerTest:testRequestOrderUnsupportedPaymentReverts(address) (runs: 518, μ: 115636, ~: 115636)
BuyOrderIssuerTest:testRequestOrderWithPermit() (gas: 333250)
BuyOrderIssuerTest:testRequestOrderWithPermitCollisionReverts() (gas: 299841)
BuyOrderIssuerTest:testSetFees(address) (runs: 518, μ: 24723, ~: 24723)
BuyOrderIssuerTest:testSetOrdersPaused(bool) (runs: 518, μ: 22686, ~: 21789)
BuyOrderIssuerTest:testSetTreasury(address) (runs: 518, μ: 24884, ~: 24884)
DirectBuyIssuerTest:testCancelOrder(uint128,uint128,string) (runs: 518, μ: 390855, ~: 399090)
DirectBuyIssuerTest:testFillOrder(uint128,uint128,uint128,uint256) (runs: 518, μ: 359132, ~: 346001)
DirectBuyIssuerTest:testReturnEscrow(uint128,uint256) (runs: 518, μ: 331911, ~: 327382)
DirectBuyIssuerTest:testTakeEscrow(uint128,uint256) (runs: 518, μ: 304428, ~: 289008)
BuyOrderIssuerTest:testSetTreasury(address) (runs: 518, μ: 25267, ~: 25267)
BuyOrderIssuerTest:testSetTreasuryZeroReverts() (gas: 15982)
DirectBuyIssuerTest:testCancelOrder(uint128,uint128,string) (runs: 518, μ: 389509, ~: 397094)
DirectBuyIssuerTest:testCancelOrderUnreturnedEscrowReverts(uint128,uint128) (runs: 518, μ: 323685, ~: 323685)
DirectBuyIssuerTest:testFillOrder(uint128,uint128,uint128,uint256) (runs: 518, μ: 356933, ~: 343592)
DirectBuyIssuerTest:testReturnEscrow(uint128,uint256) (runs: 518, μ: 329431, ~: 324973)
DirectBuyIssuerTest:testTakeEscrow(uint128,uint256) (runs: 518, μ: 301280, ~: 286699)
OrderFeesTest:testRecoverInputValueFromRemaining(uint64,uint128) (runs: 518, μ: 22551, ~: 22896)
OrderFeesTest:testSetFee(uint64,uint64,uint8,uint128) (runs: 518, μ: 589862, ~: 726435)
OrderFeesTest:testUSDC() (gas: 15635)
SellOrderProcessorTest:testCancelOrder(uint128,uint128,string) (runs: 518, μ: 389666, ~: 389693)
SellOrderProcessorTest:testFillOrder(uint128,uint128,uint256) (runs: 518, μ: 336501, ~: 325645)
SellOrderProcessorTest:testRequestOrder(uint128) (runs: 518, μ: 248541, ~: 254285)
SellOrderProcessorTest:testCancelOrder(uint128,uint128,uint128,string) (runs: 518, μ: 399734, ~: 423048)
SellOrderProcessorTest:testFillOrder(uint128,uint128,uint256) (runs: 518, μ: 339591, ~: 325645)
SellOrderProcessorTest:testFulfillOrder(uint128,uint256) (runs: 518, μ: 372815, ~: 385584)
SellOrderProcessorTest:testNoFees(uint128) (runs: 518, μ: 19436, ~: 19436)
SellOrderProcessorTest:testRequestOrder(uint128) (runs: 518, μ: 253696, ~: 259604)
TransferRestrictorTest:testRestrictUnrestrict(address) (runs: 518, μ: 36984, ~: 36977)
99 changes: 64 additions & 35 deletions test/BuyOrderIssuer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,49 +87,55 @@ contract BuyOrderIssuerTest is Test {
}

function testInitialize(address owner, address newTreasury) public {
vm.assume(owner != address(this));
vm.assume(owner != address(this) && owner != address(0));
vm.assume(newTreasury != address(0));

BuyOrderIssuer issuerImpl = new BuyOrderIssuer();
if (owner == address(0)) {
vm.expectRevert("AccessControl: 0 default admin");
BuyOrderIssuer newIssuer = BuyOrderIssuer(
address(
new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (owner, newTreasury, orderFees)))
)
);
assertEq(newIssuer.owner(), owner);

new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (owner, newTreasury, orderFees)));
} else if (newTreasury == address(0)) {
vm.expectRevert(OrderProcessor.ZeroAddress.selector);
// revert if already initialized
BuyOrderIssuer newImpl = new BuyOrderIssuer();
vm.expectRevert(
bytes.concat(
"AccessControl: account ",
bytes(Strings.toHexString(address(this))),
" is missing role 0x0000000000000000000000000000000000000000000000000000000000000000"
)
);
newIssuer.upgradeToAndCall(
address(newImpl), abi.encodeCall(newImpl.initialize, (owner, newTreasury, orderFees))
);
}

new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (owner, newTreasury, orderFees)));
} else {
BuyOrderIssuer newIssuer = BuyOrderIssuer(
address(
new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (owner, newTreasury, orderFees)))
)
);
assertEq(newIssuer.owner(), owner);
function testInitializeZeroOwnerReverts() public {
BuyOrderIssuer issuerImpl = new BuyOrderIssuer();
vm.expectRevert("AccessControl: 0 default admin");
new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (address(0), treasury, orderFees)));
}

BuyOrderIssuer newImpl = new BuyOrderIssuer();
vm.expectRevert(
bytes.concat(
"AccessControl: account ",
bytes(Strings.toHexString(address(this))),
" is missing role 0x0000000000000000000000000000000000000000000000000000000000000000"
)
);
newIssuer.upgradeToAndCall(
address(newImpl), abi.encodeCall(newImpl.initialize, (owner, newTreasury, orderFees))
);
}
function testInitializeZeroTreasuryReverts() public {
BuyOrderIssuer issuerImpl = new BuyOrderIssuer();
vm.expectRevert(OrderProcessor.ZeroAddress.selector);
new ERC1967Proxy(address(issuerImpl), abi.encodeCall(issuerImpl.initialize, (address(this), address(0), orderFees)));
}

function testSetTreasury(address account) public {
if (account == address(0)) {
vm.expectRevert(OrderProcessor.ZeroAddress.selector);
issuer.setTreasury(account);
} else {
vm.expectEmit(true, true, true, true);
emit TreasurySet(account);
issuer.setTreasury(account);
assertEq(issuer.treasury(), account);
}
vm.assume(account != address(0));

vm.expectEmit(true, true, true, true);
emit TreasurySet(account);
issuer.setTreasury(account);
assertEq(issuer.treasury(), account);
}

function testSetTreasuryZeroReverts() public {
vm.expectRevert(OrderProcessor.ZeroAddress.selector);
issuer.setTreasury(address(0));
}

function testSetFees(IOrderFees fees) public {
Expand Down Expand Up @@ -325,6 +331,29 @@ contract BuyOrderIssuerTest is Test {
assertEq(paymentToken.balanceOf(address(issuer)), issuerBalanceBefore + dummyOrder.quantityIn);
}

function testRequestOrderWithPermitCollisionReverts() public {
paymentToken.mint(user, dummyOrder.quantityIn);

SigUtils.Permit memory permit = SigUtils.Permit({
owner: user,
spender: address(issuer),
value: dummyOrder.quantityIn,
nonce: 0,
deadline: 30 days
});

bytes32 digest = sigUtils.getTypedDataHash(permit);

(uint8 v, bytes32 r, bytes32 s) = vm.sign(userPrivateKey, digest);

vm.prank(user);
issuer.requestOrderWithPermit(dummyOrder, salt, address(paymentToken), permit.value, permit.deadline, v, r, s);

vm.expectRevert(OrderProcessor.DuplicateOrder.selector);
vm.prank(user);
issuer.requestOrderWithPermit(dummyOrder, salt, address(paymentToken), permit.value, permit.deadline, v, r, s);
}

function testFillOrder(uint128 orderAmount, uint128 fillAmount, uint256 receivedAmount) public {
OrderProcessor.OrderRequest memory order = dummyOrder;
order.quantityIn = orderAmount;
Expand Down