lint and changeset

Author: Amxx

.changeset/lovely-groups-run.md

@@ -0,0 +1,5 @@
+---
+'@openzeppelin/wizard': patch
+---
+
+Remove all initializers from non-upgradeable accounts.

packages/core/solidity/src/account.ts

@@ -5,12 +5,7 @@ import { printContract } from './print';
 import { defaults as commonDefaults, withCommonDefaults, type CommonOptions } from './common-options';
 import { upgradeableName } from './options';
 import { setInfo } from './set-info';
-import {
-  addSigner,
-  signerFunctions,
-  signers,
-  type SignerOptions,
-} from './signer';
+import { addSigner, signerFunctions, signers, type SignerOptions } from './signer';
 import { setUpgradeableAccount } from './set-upgradeable';
 
 export const defaults: Required<AccountOptions> = {

packages/core/solidity/src/options.ts

@@ -9,7 +9,7 @@ export function upgradeableName(n: string) {
   } else {
     return n.replace(/(Upgradeable)?(?=\.|$)/, 'Upgradeable');
   }
-};
+}
 
 export function upgradeableImport(p: ImportContract): ImportContract {
   const { dir, ext, name } = path.parse(p.path);
@@ -23,7 +23,7 @@ export function upgradeableImport(p: ImportContract): ImportContract {
       name: upgradeableName(name), // Solidity file name
     }),
   };
-};
+}
 
 export interface Options {
   transformImport?: (parent: ImportContract) => ImportContract;

packages/core/solidity/src/print.ts

@@ -85,41 +85,35 @@ function printConstructor(contract: Contract, helpers: Helpers): Lines[] {
     if (helpers.upgradeable) {
       const upgradeableParents = parentsWithInitializers.filter(p => inferTranspiled(p.contract));
       const nonUpgradeableParents = parentsWithInitializers.filter(p => !inferTranspiled(p.contract));
-
-      return spaceBetween(
-        // constructor
-        printFunction2(
-          [
-            nonUpgradeableParents.length > 0
+      const constructor = printFunction2(
+        [
+          nonUpgradeableParents.length > 0
             ? '/// @custom:oz-upgrades-unsafe-allow-reachable constructor'
             : '/// @custom:oz-upgrades-unsafe-allow constructor',
-          ],
-          'constructor',
-          [],
-          nonUpgradeableParents.flatMap(p => printParentConstructor(p, helpers)),
-          ['_disableInitializers();']
+        ],
+        'constructor',
+        [],
+        nonUpgradeableParents.flatMap(p => printParentConstructor(p, helpers)),
+        ['_disableInitializers();'],
+      );
+      const initializer = printFunction2(
+        [],
+        'function initialize',
+        contract.constructorArgs.map(a => printArgument(a, helpers)),
+        ['public', 'initializer'],
+        spaceBetween(
+          upgradeableParents.flatMap(p => printParentConstructor(p, helpers)).map(p => p + ';'),
+          contract.constructorCode,
         ),
-        // initializer
-        upgradeableParents.length > 0
-          ? printFunction2(
-            [],
-            'function initialize',
-            contract.constructorArgs.map(a => printArgument(a, helpers)),
-            [ 'public', 'initializer' ],
-            spaceBetween(
-              upgradeableParents.flatMap(p => printParentConstructor(p, helpers)).map(p => p + ';'),
-              contract.constructorCode,
-            )
-          )
-          : [],
       );
+      return spaceBetween(constructor, upgradeableParents.length > 0 ? initializer : []);
     } else {
       return printFunction2(
         [],
         'constructor',
         contract.constructorArgs.map(a => printArgument(a, helpers)),
         parentsWithInitializers.flatMap(p => printParentConstructor(p, helpers)),
-        contract.constructorCode
+        contract.constructorCode,
       );
     }
   } else if (!helpers.upgradeable) {

packages/core/solidity/src/set-upgradeable.ts

@@ -60,7 +60,7 @@ export function setUpgradeableGovernor(c: ContractBuilder, upgradeable: Upgradea
 
 export function setUpgradeableAccount(c: ContractBuilder, upgradeable: Upgradeable) {
   setUpgradeableBase(c, upgradeable, () => {
-      c.addModifier('onlyEntryPointOrSelf', functions._authorizeUpgrade);
+    c.addModifier('onlyEntryPointOrSelf', functions._authorizeUpgrade);
   });
 }