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

Jump to bottom

Chore/add tests and optimizations #38

Merged
merged 6 commits into from
Feb 6, 2023
Merged

Chore/add tests and optimizations #38

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
a3b0fb1
wip: add transfer test
AStox Feb 2, 2023
2a26720
move memberlist check from connectors to restricted token
AStox Feb 3, 2023
07da1ae
fix tests
AStox Feb 3, 2023
e38bbfb
revert restricted.sol changes
AStox Feb 3, 2023
61649da
revert unwanted changes to erc20 and memberlist
AStox Feb 6, 2023
b2065a7
fix test
AStox Feb 6, 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
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 27 files
+4 −7 .github/workflows/ci.yml
+4 −5 foundry.toml
+1 −1 package.json
+0 −33 src/Base.sol
+13 −0 src/Common.sol
+13 −0 src/Components.sol
+0 −92 src/InvariantTest.sol
+7 −19 src/Script.sol
+2 −118 src/StdAssertions.sol
+0 −223 src/StdChains.sol
+100 −97 src/StdCheats.sol
+2 −2 src/StdJson.sol
+2 −2 src/StdStorage.sol
+4 −113 src/StdUtils.sol
+6 −23 src/Test.sol
+165 −258 src/Vm.sol
+0 −8 src/console2.sol
+1 −2 src/interfaces/IERC1155.sol
+0 −1 src/interfaces/IERC165.sol
+0 −1 src/interfaces/IERC20.sol
+0 −1 src/interfaces/IERC4626.sol
+0 −1 src/interfaces/IERC721.sol
+0 −73 src/interfaces/IMulticall3.sol
+0 −236 test/StdAssertions.t.sol
+0 −147 test/StdChains.t.sol
+21 −59 test/StdCheats.t.sol
+17 −223 test/StdUtils.t.sol
7 changes: 4 additions & 3 deletions src/Connector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ contract CentrifugeConnector {

Tranche storage tranche = tranches[poolId][trancheId];
tranche.latestPrice = price;
tranche.lastPriceUpdate = block.timestamp;
tranche.tokenName = tokenName;
tranche.tokenSymbol = tokenSymbol;

Expand All @@ -132,7 +133,7 @@ contract CentrifugeConnector {
uint128 price
) public onlyRouter {
Tranche storage tranche = tranches[poolId][trancheId];
require(tranche.latestPrice > 0, "CentrifugeConnector/invalid-pool-or-tranche");
require(tranche.lastPriceUpdate > 0, "CentrifugeConnector/invalid-pool-or-tranche");
NunoAlexandre marked this conversation as resolved.
Show resolved Hide resolved
tranche.latestPrice = price;
tranche.lastPriceUpdate = block.timestamp;
}
Expand All @@ -144,7 +145,7 @@ contract CentrifugeConnector {
uint64 validUntil
) public onlyRouter {
Tranche storage tranche = tranches[poolId][trancheId];
require(tranche.latestPrice > 0, "CentrifugeConnector/invalid-pool-or-tranche");
require(tranche.lastPriceUpdate > 0, "CentrifugeConnector/invalid-pool-or-tranche");
hieronx marked this conversation as resolved.
Show resolved Hide resolved
RestrictedTokenLike token = RestrictedTokenLike(tranche.token);
MemberlistLike memberlist = MemberlistLike(token.memberlist());
memberlist.updateMember(user, validUntil);
Expand All @@ -157,8 +158,8 @@ contract CentrifugeConnector {
uint256 amount
) public onlyRouter {
RestrictedTokenLike token = RestrictedTokenLike(tranches[poolId][trancheId].token);
require(address(token) != address(0), "CentrifugeConnector/unknown-token");
require(token.hasMember(user), "CentrifugeConnector/not-a-member");

token.mint(user, amount);
}

Expand Down
42 changes: 42 additions & 0 deletions test/Connector.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import {ConnectorMessages} from "src/Messages.sol";
import "forge-std/Test.sol";
import "../src/Connector.sol";

interface ERC20Like {
function balanceOf(address) external view returns (uint);
}

contract ConnectorTest is Test {

CentrifugeConnector bridgedConnector;
Expand Down Expand Up @@ -176,6 +180,44 @@ contract ConnectorTest is Test {
bridgedConnector.updateTokenPrice(poolId, trancheId, price);
}

function testTransfer(uint64 poolId, string memory tokenName, string memory tokenSymbol, bytes16 trancheId, uint128 price, uint32 destinationDomain, address user, uint256 amount, uint64 validUntil) public {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 👌

vm.assume(validUntil > block.timestamp + 7 days);
// 0. Add Pool
homeConnector.addPool(poolId);

// 1. Add the tranche
homeConnector.addTranche(poolId, trancheId, tokenName, tokenSymbol, price);

// 2. Then deploy the tranche
bridgedConnector.deployTranche(poolId, trancheId);

// 3. Add member
homeConnector.updateMember(poolId, trancheId, user, validUntil);

// 4. Transfer some tokens
homeConnector.transfer(poolId, trancheId, user, amount);
(address token,,,,) = bridgedConnector.tranches(poolId, trancheId);
assertEq(ERC20Like(token).balanceOf(user), amount);
}

function testTransferWithoutMemberFails(uint64 poolId, string memory tokenName, string memory tokenSymbol, bytes16 trancheId, uint128 price, uint32 destinationDomain, address user, uint256 amount, uint64 validUntil) public {
vm.assume(validUntil > block.timestamp + 7 days);
// 0. Add Pool
homeConnector.addPool(poolId);

// 1. Add the tranche
homeConnector.addTranche(poolId, trancheId, tokenName, tokenSymbol, price);

// 2. Then deploy the tranche
bridgedConnector.deployTranche(poolId, trancheId);

// 3. Transfer some tokens and expect revert
vm.expectRevert(bytes("CentrifugeConnector/not-a-member"));
homeConnector.transfer(poolId, trancheId, user, amount);
(address token,,,,) = bridgedConnector.tranches(poolId, trancheId);
assertEq(ERC20Like(token).balanceOf(user), 0);
}

// helpers
function safeAdd(uint x, uint y) internal pure returns (uint z) {
require((z = x + y) >= x, "math-add-overflow");
Expand Down