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.

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

feat: merge wormhole contracts #6

Merged
merged 11 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 script/DeployAvailWormhole.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contract Deploy is Script {
address admin = vm.envAddress("ADMIN");
address impl = address(new AvailWormhole());
AvailWormhole avail = AvailWormhole(address(new TransparentUpgradeableProxy(impl, admin, "")));
avail.initialize(admin);
avail.initialize();
vm.stopBroadcast();
}
}
7 changes: 4 additions & 3 deletions src/AvailWormhole.sol
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ contract AvailWormhole is AccessControlDefaultAdminRulesUpgradeable, ERC20Permit
_disableInitializers();
}

function initialize(address governance) external initializer {
function initialize() external reinitializer(2) {
__ERC20Permit_init("Avail (Wormhole)");
__ERC20_init("Avail (Wormhole)", "AVAIL.W");
__AccessControlDefaultAdminRules_init(0, governance);
__ERC20_init("Avail (Wormhole)", "AVAIL");
// We don't need to reset the owner during reinit
// __AccessControlDefaultAdminRules_init(0, governance);
}

function mint(address account, uint256 amount) external onlyRole(MINTER_ROLE) {
Expand Down
Loading