🔒 exa: require initialize call before initialize2

Author: itofarina

.gas-snapshot

@@ -100,26 +100,27 @@ DebtRollerTest:test_rollFixed_reverts_whenNotMarket() (gas: 49047)
 DebtRollerTest:test_rollFixed_rolls() (gas: 1100854)
 DebtRollerTest:test_rollFixed_rolls_partial() (gas: 1140051)
 EXATest:test_burn_burnsAndEmitsCrosschainBurn() (gas: 149890)
-EXATest:test_burn_reverts_whenCallerLacksBridgeRole() (gas: 69277)
+EXATest:test_burn_reverts_whenCallerLacksBridgeRole() (gas: 69255)
 EXATest:test_crosschainBurn_burnsAndEmitsCrosschainBurn() (gas: 149888)
 EXATest:test_crosschainBurn_reverts_whenCallerLacksBridgeRole() (gas: 69268)
-EXATest:test_crosschainMint_mintsAndEmitsCrosschainMint() (gas: 103234)
+EXATest:test_crosschainMint_mintsAndEmitsCrosschainMint() (gas: 103300)
 EXATest:test_crosschainMint_reverts_whenCallerLacksBridgeRole() (gas: 69277)
-EXATest:test_initialize2_grantsAdminRole() (gas: 30356)
-EXATest:test_initialize2_reverts_whenAdminIsZeroAddress() (gas: 5633722)
-EXATest:test_initialize2_reverts_whenCalledByNotProxyAdmin() (gas: 3392762)
-EXATest:test_initialize2_reverts_whenCalledTwice() (gas: 2290266)
-EXATest:test_initialize_reverts_whenCalledByNotProxyAdmin() (gas: 3284161)
-EXATest:test_initialize_reverts_whenCalledOnImplementation() (gas: 2261057)
+EXATest:test_initialize2_grantsAdminRole() (gas: 30379)
+EXATest:test_initialize2_reverts_whenAdminIsZeroAddress() (gas: 5661254)
+EXATest:test_initialize2_reverts_whenCalledBeforeInitialize() (gas: 3313044)
+EXATest:test_initialize2_reverts_whenCalledByNotProxyAdmin() (gas: 3406504)
+EXATest:test_initialize2_reverts_whenCalledTwice() (gas: 2304030)
+EXATest:test_initialize_reverts_whenCalledByNotProxyAdmin() (gas: 3297925)
+EXATest:test_initialize_reverts_whenCalledOnImplementation() (gas: 2274821)
 EXATest:test_initialize_reverts_whenCalledTwice() (gas: 38964)
 EXATest:test_initialize_setsNameSymbolAndSupply() (gas: 55624)
-EXATest:test_initialize_succeeds_whenProxyAlreadyDeployedAndUpgradedWithCall() (gas: 5654939)
-EXATest:test_initialize_totalSupplyIsZero_whenNotOptimism() (gas: 3396691)
+EXATest:test_initialize_succeeds_whenProxyAlreadyDeployedAndUpgradedWithCall() (gas: 5682459)
+EXATest:test_initialize_totalSupplyIsZero_whenNotOptimism() (gas: 3410455)
 EXATest:test_mint_mintsAndEmitsCrosschainMint() (gas: 103345)
 EXATest:test_mint_reverts_whenCallerLacksBridgeRole() (gas: 69342)
-EXATest:test_supportsInterface_returnsFalse_forInvalidInterface() (gas: 15813)
+EXATest:test_supportsInterface_returnsFalse_forInvalidInterface() (gas: 15791)
 EXATest:test_supportsInterface_returnsTrue_forIAccessControl() (gas: 15793)
-EXATest:test_supportsInterface_returnsTrue_forIERC165() (gas: 15815)
+EXATest:test_supportsInterface_returnsTrue_forIERC165() (gas: 15793)
 EXATest:test_supportsInterface_returnsTrue_forIERC7802() (gas: 15661)
 EscrowedEXATest:testCancelExternalStreams() (gas: 398267)
 EscrowedEXATest:testCancelExternalStreamsWithesEXACancel() (gas: 1137424)

contracts/periphery/EXA.sol

@@ -32,6 +32,7 @@ contract EXA is ERC20VotesUpgradeable, AccessControlUpgradeable, IERC7802 {
   function initialize2(address admin_) external reinitializer(2) {
     if (msg.sender != StorageSlotUpgradeable.getAddressSlot(ADMIN_SLOT).value) revert NotProxyAdmin();
     if (admin_ == address(0)) revert ZeroAddress();
+    if (bytes(symbol()).length == 0) revert NotInitialized();
 
     __AccessControl_init();
     _grantRole(DEFAULT_ADMIN_ROLE, admin_);
@@ -73,5 +74,6 @@ contract EXA is ERC20VotesUpgradeable, AccessControlUpgradeable, IERC7802 {
   }
 }
 
+error NotInitialized();
 error NotProxyAdmin();
 error ZeroAddress();

test/EXA.t.sol

@@ -11,7 +11,7 @@ import { IAccessControl } from "@openzeppelin/contracts/access/IAccessControl.so
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import { IERC7802 } from "@openzeppelin/contracts/interfaces/draft-IERC7802.sol";
 
-import { EXA, NotProxyAdmin, ZeroAddress } from "../contracts/periphery/EXA.sol";
+import { EXA, NotInitialized, NotProxyAdmin, ZeroAddress } from "../contracts/periphery/EXA.sol";
 
 contract EXATest is Test {
   EXA internal exa;
@@ -127,6 +127,17 @@ contract EXATest is Test {
     assertTrue(exa.hasRole(exa.DEFAULT_ADMIN_ROLE(), admin));
   }
 
+  function test_initialize2_reverts_whenCalledBeforeInitialize() external {
+    ProxyAdmin proxyAdmin_ = new ProxyAdmin();
+    address implementation = address(new EXA());
+    ITransparentUpgradeableProxy proxy_ = ITransparentUpgradeableProxy(
+      payable(address(new TransparentUpgradeableProxy(implementation, address(proxyAdmin_), "")))
+    );
+
+    vm.expectRevert(NotInitialized.selector);
+    proxyAdmin_.upgradeAndCall(proxy_, implementation, abi.encodeCall(EXA.initialize2, (admin)));
+  }
+
   function test_initialize2_reverts_whenCalledTwice() external {
     EXA implementation = new EXA();