Skip to content

Commit c2b3cee

Browse files
committed
change to address
1 parent d29411b commit c2b3cee

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

src/EventContract.sol

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ pragma solidity ^0.8.23;
33

44
import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
55
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
6-
import "./MasterOwnerModifier.sol";
6+
7+
interface IMasterOwnerModifier {
8+
function isMasterOwner(address user) external view returns (bool);
9+
}
710

811
contract EventContract is ERC721Enumerable {
912
address public eventOwner;
1013
address public treasuryContract;
1114
IERC20 public usdcToken;
12-
MasterOwnerModifier public masterOwnerModifier;
15+
address public masterOwnerModifier;
1316

1417
string public eventName;
1518
bytes32[] public ticketTypes;
@@ -58,12 +61,12 @@ contract EventContract is ERC721Enumerable {
5861
}
5962

6063
modifier onlyMasterOwner() {
61-
if (!masterOwnerModifier.isMasterOwner(msg.sender)) revert NotMasterOwner();
64+
if (!IMasterOwnerModifier(masterOwnerModifier).isMasterOwner(msg.sender)) revert NotMasterOwner();
6265
_;
6366
}
6467

6568
modifier onlyVendorOrOwner() {
66-
if (msg.sender != eventOwner && !masterOwnerModifier.isMasterOwner(msg.sender)) revert NotMasterOrEventOwner();
69+
if (msg.sender != eventOwner && !IMasterOwnerModifier(masterOwnerModifier).isMasterOwner(msg.sender))
6770
_;
6871
}
6972

@@ -94,7 +97,7 @@ contract EventContract is ERC721Enumerable {
9497
eventOwner = _vendor;
9598
usdcToken = IERC20(_usdcToken);
9699
treasuryContract = _treasuryContract;
97-
masterOwnerModifier = MasterOwnerModifier(_ownerModifierAddress);
100+
masterOwnerModifier = _ownerModifierAddress;
98101
eventName = string(abi.encodePacked(_name));
99102
eventStart = _start;
100103
eventEnd = _end;

src/Master.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
pragma solidity ^0.8.23;
33

44
import "./EventContract.sol";
5-
import "./MasterOwnerModifier.sol";
5+
66

77

88
contract MasterContract {
99
address public immutable treasuryContract;
1010
address public immutable usdc_token;
11-
MasterOwnerModifier public immutable masterOwnerModifier;
11+
address public immutable masterOwnerModifier;
1212

1313
mapping(uint256 => address) public eventContracts;
1414
uint256 public eventCount;
@@ -24,11 +24,11 @@ contract MasterContract {
2424
constructor(address _treasuryContract, address _usdc_token, address _ownerModifierAddress) {
2525
treasuryContract = _treasuryContract;
2626
usdc_token = _usdc_token;
27-
masterOwnerModifier = MasterOwnerModifier(_ownerModifierAddress);
27+
masterOwnerModifier = _ownerModifierAddress;
2828
}
2929

3030
modifier onlyOwner() {
31-
require(masterOwnerModifier.isMasterOwner(msg.sender), "Caller is not an owner");
31+
require(IMasterOwnerModifier(masterOwnerModifier).isMasterOwner(msg.sender), "Caller is not an owner");
3232
_;
3333
}
3434

0 commit comments

Comments
 (0)