Skip to content
This repository has been archived by the owner on Apr 30, 2024. It is now read-only.

Restore MockTokenManagementModule.sol for AccessController Testing #132

Closed
wants to merge 2 commits into from
Closed

Restore MockTokenManagementModule.sol for AccessController Testing #132

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
2fcd82a
recover MockTokenManagementModule.sol
kingster-will Feb 23, 2024
5cf0abb
recover AccessController.t.sol
kingster-will Feb 23, 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
59 changes: 36 additions & 23 deletions test/foundry/AccessController.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ pragma solidity ^0.8.23;
import { IIPAccount } from "../../contracts/interfaces/IIPAccount.sol";
import { AccessPermission } from "../../contracts/lib/AccessPermission.sol";
import { Errors } from "../../contracts/lib/Errors.sol";
import { TOKEN_WITHDRAWAL_MODULE_KEY } from "../../contracts/lib/modules/Module.sol";
import { TokenWithdrawalModule } from "../../contracts/modules/external/TokenWithdrawalModule.sol";

import { MockModule } from "./mocks/module/MockModule.sol";
import { MockOrchestratorModule } from "./mocks/module/MockOrchestratorModule.sol";
import { MockTokenManagementModule } from "./mocks/module/MockTokenManagementModule.sol";
import { MockERC1155 } from "./mocks/token/MockERC1155.sol";
import { MockERC20 } from "./mocks/token/MockERC20.sol";
import { BaseTest } from "./utils/BaseTest.t.sol";
Expand Down Expand Up @@ -1527,19 +1526,20 @@ contract AccessControllerTest is BaseTest {

address anotherAccount = vm.addr(3);

TokenWithdrawalModule tokenWithdrawalModule = new TokenWithdrawalModule(
MockTokenManagementModule tokenManagementModule = new MockTokenManagementModule(
address(accessController),
address(ipAccountRegistry)
address(ipAccountRegistry),
address(moduleRegistry)
);
moduleRegistry.registerModule(TOKEN_WITHDRAWAL_MODULE_KEY, address(tokenWithdrawalModule));
moduleRegistry.registerModule("MockTokenManagementModule", address(tokenManagementModule));
vm.prank(owner);
ipAccount.execute(
address(accessController),
0,
abi.encodeWithSignature(
"setPermission(address,address,address,bytes4,uint8)",
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mockNFT),
mockNFT.transferFrom.selector,
AccessPermission.ALLOW
Expand All @@ -1548,15 +1548,20 @@ contract AccessControllerTest is BaseTest {
assertEq(
accessController.getPermission(
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mockNFT),
mockNFT.transferFrom.selector
),
AccessPermission.ALLOW
);
vm.prank(owner);
tokenWithdrawalModule.withdrawERC721(payable(address(ipAccount)), address(mockNFT), tokenId);
assertEq(mockNFT.ownerOf(tokenId), owner);
tokenManagementModule.transferERC721Token(
payable(address(ipAccount)),
anotherAccount,
address(mockNFT),
tokenId
);
assertEq(mockNFT.ownerOf(tokenId), anotherAccount);
}

// ipAccount transfer ERC1155 to another account
Expand All @@ -1567,19 +1572,20 @@ contract AccessControllerTest is BaseTest {

address anotherAccount = vm.addr(3);

TokenWithdrawalModule tokenWithdrawalModule = new TokenWithdrawalModule(
MockTokenManagementModule tokenManagementModule = new MockTokenManagementModule(
address(accessController),
address(ipAccountRegistry)
address(ipAccountRegistry),
address(moduleRegistry)
);
moduleRegistry.registerModule(TOKEN_WITHDRAWAL_MODULE_KEY, address(tokenWithdrawalModule));
moduleRegistry.registerModule("MockTokenManagementModule", address(tokenManagementModule));
vm.prank(owner);
ipAccount.execute(
address(accessController),
0,
abi.encodeWithSignature(
"setPermission(address,address,address,bytes4,uint8)",
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mock1155),
mock1155.safeTransferFrom.selector,
AccessPermission.ALLOW
Expand All @@ -1588,15 +1594,21 @@ contract AccessControllerTest is BaseTest {
assertEq(
accessController.getPermission(
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mock1155),
mock1155.safeTransferFrom.selector
),
AccessPermission.ALLOW
);
vm.prank(owner);
tokenWithdrawalModule.withdrawERC1155(payable(address(ipAccount)), address(mock1155), tokenId, 1e18);
assertEq(mock1155.balanceOf(owner, tokenId), 1e18);
tokenManagementModule.transferERC1155Token(
payable(address(ipAccount)),
anotherAccount,
address(mock1155),
tokenId,
1e18
);
assertEq(mock1155.balanceOf(anotherAccount, tokenId), 1e18);
}
// ipAccount transfer ERC20 to another account
function test_AccessController_ERC20Transfer() public {
Expand All @@ -1605,19 +1617,20 @@ contract AccessControllerTest is BaseTest {

address anotherAccount = vm.addr(3);

TokenWithdrawalModule tokenWithdrawalModule = new TokenWithdrawalModule(
MockTokenManagementModule tokenManagementModule = new MockTokenManagementModule(
address(accessController),
address(ipAccountRegistry)
address(ipAccountRegistry),
address(moduleRegistry)
);
moduleRegistry.registerModule(TOKEN_WITHDRAWAL_MODULE_KEY, address(tokenWithdrawalModule));
moduleRegistry.registerModule("MockTokenManagementModule", address(tokenManagementModule));
vm.prank(owner);
ipAccount.execute(
address(accessController),
0,
abi.encodeWithSignature(
"setPermission(address,address,address,bytes4,uint8)",
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mock20),
mock20.transfer.selector,
AccessPermission.ALLOW
Expand All @@ -1626,14 +1639,14 @@ contract AccessControllerTest is BaseTest {
assertEq(
accessController.getPermission(
address(ipAccount),
address(tokenWithdrawalModule),
address(tokenManagementModule),
address(mock20),
mock20.transfer.selector
),
AccessPermission.ALLOW
);
vm.prank(owner);
tokenWithdrawalModule.withdrawERC20(payable(address(ipAccount)), address(mock20), 1e18);
assertEq(mock20.balanceOf(owner), 1e18);
tokenManagementModule.transferERC20Token(payable(address(ipAccount)), anotherAccount, address(mock20), 1e18);
assertEq(mock20.balanceOf(anotherAccount), 1e18);
}
}
84 changes: 84 additions & 0 deletions test/foundry/mocks/module/MockTokenManagementModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.23;

import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";

import { IIPAccount } from "../../../../contracts/interfaces/IIPAccount.sol";
import { IModule } from "../../../../contracts/interfaces/modules/base/IModule.sol";
import { IModuleRegistry } from "../../../../contracts/interfaces/registries/IModuleRegistry.sol";
import { IIPAccountRegistry } from "../../../../contracts/interfaces/registries/IIPAccountRegistry.sol";
import { IPAccountChecker } from "../../../../contracts/lib/registries/IPAccountChecker.sol";
import { BaseModule } from "../../../../contracts/modules/BaseModule.sol";
import { AccessControlled } from "../../../../contracts/access/AccessControlled.sol";

contract MockTokenManagementModule is BaseModule, AccessControlled {
jdubpark marked this conversation as resolved.
Show resolved Hide resolved
kingster-will marked this conversation as resolved.
Show resolved Hide resolved
using ERC165Checker for address;
using IPAccountChecker for IIPAccountRegistry;

IModuleRegistry public moduleRegistry;

constructor(
address _accessController,
address _ipAccountRegistry,
address _moduleRegistry
) AccessControlled(_accessController, _ipAccountRegistry) {
moduleRegistry = IModuleRegistry(_moduleRegistry);
}

function name() external pure returns (string memory) {
return "MockTokenManagementModule";
}

function transferERC721Token(
address payable ipAccount,
address to,
jdubpark marked this conversation as resolved.
Show resolved Hide resolved
address tokenContract,
uint256 tokenId
) external verifyPermission(ipAccount) {
IIPAccount(ipAccount).execute(
tokenContract,
0,
abi.encodeWithSignature("transferFrom(address,address,uint256)", ipAccount, to, tokenId)
);
}

// transfer ERC1155 token
function transferERC1155Token(
address payable ipAccount,
address to,
address tokenContract,
uint256 tokenId,
uint256 amount
) external verifyPermission(ipAccount) {
IIPAccount(ipAccount).execute(
tokenContract,
0,
abi.encodeWithSignature(
"safeTransferFrom(address,address,uint256,uint256,bytes)",
ipAccount,
to,
tokenId,
amount,
""
)
);
}

// transfer ERC20 token
function transferERC20Token(
address payable ipAccount,
address to,
address tokenContract,
uint256 amount
) external verifyPermission(ipAccount) {
IIPAccount(ipAccount).execute(
tokenContract,
0,
abi.encodeWithSignature("transfer(address,uint256)", to, amount)
);
}

function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
return interfaceId == type(IModule).interfaceId || super.supportsInterface(interfaceId);
}
}
Loading