availproject · QEDK · Apr 28, 2025 · Feb 26, 2025 · Apr 7, 2025 · Apr 7, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
+[submodule "lib/openzeppelin-contracts-upgradeable"]
+	path = lib/openzeppelin-contracts-upgradeable
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/murky"]
 	path = lib/murky
 	url = https://github.com/dmfxyz/murky
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/openzeppelin/openzeppelin-contracts-upgradeable
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Avail Project
+   Copyright 2025 Avail Project
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/foundry.toml b/foundry.toml
@@ -5,7 +5,7 @@ libs = ["lib"]
 optimizer = true
 optimizer_runs = 999999
 via_ir = true
-solc_version = "0.8.25"
+solc_version = "0.8.29"
 evm_version = "cancun"
 
 [profile.intense.fuzz]
@@ -17,5 +17,4 @@ mainnet = "https://ethereum-rpc.publicnode.com"
 base = "https://base-rpc.publicnode.com"
 sepolia = "https://ethereum-sepolia.publicnode.com"
 goerli = "https://ethereum-goerli.publicnode.com"
-
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,3 @@
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 ds-test/=lib/forge-std/lib/ds-test/src/
 erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/
 forge-std/=lib/forge-std/src/

diff --git a/script/DeployAvailWormhole.s.sol b/script/DeployAvailWormhole.s.sol
@@ -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();
+        avail.initialize(admin);
         vm.stopBroadcast();
     }
 }
diff --git a/src/AvailWormhole.sol b/src/AvailWormhole.sol
@@ -22,11 +22,10 @@ contract AvailWormhole is AccessControlDefaultAdminRulesUpgradeable, ERC20Permit
         _disableInitializers();
     }
 
-    function initialize() external reinitializer(2) {
+    function initialize(address governance) external initializer {
         __ERC20Permit_init("Avail (Wormhole)");
         __ERC20_init("Avail (Wormhole)", "AVAIL");
-        // We don't need to reset the owner during reinit
-        // __AccessControlDefaultAdminRules_init(0, governance);
+        __AccessControlDefaultAdminRules_init(0, governance);
     }
 
     function mint(address account, uint256 amount) external onlyRole(MINTER_ROLE) {
+1 −1		README.md
+2 −0		foundry.toml
+1 −1		package.json
+24 −0		src/StdChains.sol
+14 −2		src/StdCheats.sol
+0 −17		src/StdUtils.sol
+163 −67		src/Vm.sol
+0 −234		src/mocks/MockERC20.sol
+0 −231		src/mocks/MockERC721.sol
+0 −4		test/StdAssertions.t.sol
+5 −6		test/StdChains.t.sol
+20 −3		test/StdStorage.t.sol
+2 −2		test/Vm.t.sol
+0 −441		test/mocks/MockERC20.t.sol
+0 −721		test/mocks/MockERC721.t.sol