From 2e8827b8fe3bb1269587b44db8f7535e96dd2c56 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 10:14:03 -0500
Subject: [PATCH 01/18] Use named import - WIP

---
 packages/core/src/governor.ts | 10 +++++++++-
 packages/core/src/options.ts  |  3 ++-
 packages/core/src/print.ts    |  5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index cd0226f8..88a2a705 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -250,6 +250,11 @@ function addCounting(c: ContractBuilder) {
 function addVotes(c: ContractBuilder) {
   const tokenArg = '_token';
 
+  c.addParent({
+    name: 'IVotes',
+    path: `@openzeppelin/contracts/governance/utils/IVotes.sol`,
+    transpiled: false,
+  });
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
@@ -313,6 +318,7 @@ const timelockModules = {
   openzeppelin: {
     timelockType: {
       name: 'TimelockController',
+      path: `@openzeppelin/contracts/governance/TimelockController.sol`,
     },
     timelockParent: {
       name: 'GovernorTimelockControl',
@@ -322,6 +328,7 @@ const timelockModules = {
   compound: {
     timelockType: {
       name: 'ICompoundTimelock',
+      path: `@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol`,
       transpiled: false,
     },
     timelockParent: {
@@ -359,8 +366,9 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
   const timelockArg = '_timelock';
   const { timelockType, timelockParent } = timelockModules[timelock];
 
+  c.addParent(timelockType);
   c.addConstructorArgument({
-    type: timelockType,
+    type: timelockType.name,
     name: timelockArg,
   });
 
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index 0e7735fe..0442ebce 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -16,10 +16,11 @@ const upgradeableImport = (p: ParentContract): ParentContract => {
   // Use path.posix to get forward slashes
   return {
     ...p,
+    name: upgradeableName(p.name), // Contract name
     path: path.posix.format({
       ext,
       dir: dir.replace(/^@openzeppelin\/contracts/, '@openzeppelin/contracts-upgradeable'),
-      name: upgradeableName(name),
+      name: upgradeableName(name), // Solidity file name
     }),
   }
 };
diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 5a5490bd..3cb1f1c8 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -27,7 +27,10 @@ export function printContract(contract: Contract, opts?: Options): string {
         `pragma solidity ^${SOLIDITY_VERSION};`,
       ],
 
-      contract.imports.map(p => `import "${helpers.transformImport(p).path}";`),
+      contract.imports.map(p => {
+        const parent = helpers.transformImport(p);
+        return `import {${parent.name}} from "${parent.path}";`
+      }),
 
       [
         ...printNatspecTags(contract.natspecTags),

From be9b16ee3c8c7f2da078264dfaf8e518fba84e19 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 10:33:54 -0500
Subject: [PATCH 02/18] Improvements WIP

---
 packages/core/src/contract.ts   | 21 ++++++++++++++-------
 packages/core/src/erc20.ts      | 10 ++++++++++
 packages/core/src/governor.ts   |  4 ++--
 packages/core/src/options.ts    |  6 +++---
 packages/core/src/stablecoin.ts | 11 ++++++++++-
 5 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/packages/core/src/contract.ts b/packages/core/src/contract.ts
index e866c6e7..e7142d54 100644
--- a/packages/core/src/contract.ts
+++ b/packages/core/src/contract.ts
@@ -5,7 +5,7 @@ export interface Contract {
   license: string;
   parents: Parent[];
   natspecTags: NatspecTag[];
-  imports: ParentContract[];
+  imports: ImportContract[];
   functions: ContractFunction[];
   constructorCode: string[];
   constructorArgs: FunctionArgument[];
@@ -16,11 +16,12 @@ export interface Contract {
 export type Value = string | number | { lit: string } | { note: string, value: Value };
 
 export interface Parent {
-  contract: ParentContract;
+  contract: ImportContract;
   params: Value[];
+  importOnly?: boolean;
 }
 
-export interface ParentContract extends ReferencedContract {
+export interface ImportContract extends ReferencedContract {
   path: string;
 }
 
@@ -30,7 +31,7 @@ export interface ReferencedContract {
 }
 
 export interface Using {
-  library: ParentContract;
+  library: ImportContract;
   usingFor: string;
 }
 
@@ -93,7 +94,7 @@ export class ContractBuilder implements Contract {
   }
 
   get parents(): Parent[] {
-    return [...this.parentMap.values()].sort((a, b) => {
+    return [...this.parentMap.values()].filter(p => !p.importOnly).sort((a, b) => {
       if (a.contract.name === 'Initializable') {
         return -1;
       } else if (b.contract.name === 'Initializable') {
@@ -104,7 +105,7 @@ export class ContractBuilder implements Contract {
     });
   }
 
-  get imports(): ParentContract[] {
+  get imports(): ImportContract[] {
     return [
       ...[...this.parentMap.values()].map(p => p.contract),
       ...this.using.map(u => u.library),
@@ -119,12 +120,18 @@ export class ContractBuilder implements Contract {
     return [...this.variableSet];
   }
 
-  addParent(contract: ParentContract, params: Value[] = []): boolean {
+  addParent(contract: ImportContract, params: Value[] = []): boolean {
     const present = this.parentMap.has(contract.name);
     this.parentMap.set(contract.name, { contract, params });
     return !present;
   }
 
+  addImportOnly(contract: ImportContract): boolean {
+    const present = this.parentMap.has(contract.name);
+    this.parentMap.set(contract.name, { contract, params: [], importOnly: true });
+    return !present;
+  }
+
   addOverride(parent: ReferencedContract, baseFn: BaseFunction, mutability?: FunctionMutability) {
     const fn = this.addFunction(baseFn);
     fn.override.add(parent);
diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index 83237dc5..0bef7afa 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -168,6 +168,11 @@ function addPermit(c: ContractBuilder, name: string) {
     path: '@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol',
   };
   c.addParent(ERC20Permit, [name]);
+
+  c.addImportOnly({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  })
   c.addOverride(ERC20Permit, functions.nonces);
 
 }
@@ -183,6 +188,11 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   };
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
+
+  c.addImportOnly({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  })
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index 88a2a705..18ecae0f 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -250,7 +250,7 @@ function addCounting(c: ContractBuilder) {
 function addVotes(c: ContractBuilder) {
   const tokenArg = '_token';
 
-  c.addParent({
+  c.addImportOnly({
     name: 'IVotes',
     path: `@openzeppelin/contracts/governance/utils/IVotes.sol`,
     transpiled: false,
@@ -366,7 +366,7 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
   const timelockArg = '_timelock';
   const { timelockType, timelockParent } = timelockModules[timelock];
 
-  c.addParent(timelockType);
+  c.addImportOnly(timelockType);
   c.addConstructorArgument({
     type: timelockType.name,
     name: timelockArg,
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index 0442ebce..b86fe6c4 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-import type { Contract, ReferencedContract, ParentContract } from './contract';
+import type { Contract, ReferencedContract, ImportContract } from './contract';
 import { inferTranspiled } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
@@ -11,7 +11,7 @@ const upgradeableName = (n: string) => {
   }
 }
 
-const upgradeableImport = (p: ParentContract): ParentContract => {
+const upgradeableImport = (p: ImportContract): ImportContract => {
   const { dir, ext, name } = path.parse(p.path);
   // Use path.posix to get forward slashes
   return {
@@ -26,7 +26,7 @@ const upgradeableImport = (p: ParentContract): ParentContract => {
 };
 
 export interface Options {
-  transformImport?: (parent: ParentContract) => ParentContract;
+  transformImport?: (parent: ImportContract) => ImportContract;
 }
 
 export interface Helpers extends Required<Options> {
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index 0db75b89..e99f10fc 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -251,8 +251,12 @@ function addPermit(c: ContractBuilder, name: string) {
     path: '@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol',
   };
   c.addParent(ERC20Permit, [name]);
-  c.addOverride(ERC20Permit, functions.nonces);
 
+  c.addImportOnly({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  })
+  c.addOverride(ERC20Permit, functions.nonces);
 }
 
 function addVotes(c: ContractBuilder, clockMode: ClockMode) {
@@ -266,6 +270,11 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   };
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
+
+  c.addImportOnly({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  })
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);

From 95952cfbe4854f7d072a4617a14a0f316666dfad Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 10:36:37 -0500
Subject: [PATCH 03/18] Fixes

---
 packages/core/src/governor.ts   | 2 +-
 packages/core/src/stablecoin.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index 18ecae0f..4591cdfd 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -368,7 +368,7 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
 
   c.addImportOnly(timelockType);
   c.addConstructorArgument({
-    type: timelockType.name,
+    type: timelockType,
     name: timelockArg,
   });
 
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index e99f10fc..1207bd06 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -235,6 +235,10 @@ function addCustodian(c: ContractBuilder, access: Access) {
       break;
     }
     case 'managed': {
+      c.addImportOnly({
+        name: 'AuthorityUtils',
+        path: `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`,
+      });
       const logic = [
         `(bool immediate,) = AuthorityUtils.canCallWithDelay(authority(), user, address(this), bytes4(_msgData()[0:4]));`,
         `return immediate;`

From 84583c98306c9cf23da77139f1e10e669d8dda37 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 10:44:11 -0500
Subject: [PATCH 04/18] Update snapshots

---
 packages/core/src/contract.test.ts.md      |  14 +-
 packages/core/src/contract.test.ts.snap    | Bin 965 -> 974 bytes
 packages/core/src/custom.test.ts.md        |  24 +--
 packages/core/src/custom.test.ts.snap      | Bin 802 -> 826 bytes
 packages/core/src/erc1155.test.ts.md       |  78 ++++----
 packages/core/src/erc1155.test.ts.snap     | Bin 1715 -> 1788 bytes
 packages/core/src/erc20.test.ts.md         | 162 ++++++++-------
 packages/core/src/erc20.test.ts.snap       | Bin 1843 -> 1950 bytes
 packages/core/src/erc721.test.ts.md        | 126 ++++++------
 packages/core/src/erc721.test.ts.snap      | Bin 2039 -> 2137 bytes
 packages/core/src/governor.test.ts.md      | 220 ++++++++++++---------
 packages/core/src/governor.test.ts.snap    | Bin 1959 -> 2079 bytes
 packages/core/src/stablecoin.test.ts.md    | 134 +++++++------
 packages/core/src/stablecoin.test.ts.snap  | Bin 1600 -> 1678 bytes
 packages/core/src/zip-foundry.test.ts.md   |  48 ++---
 packages/core/src/zip-foundry.test.ts.snap | Bin 3378 -> 3472 bytes
 packages/core/src/zip-hardhat.test.ts.md   |  29 +--
 packages/core/src/zip-hardhat.test.ts.snap | Bin 2221 -> 2284 bytes
 18 files changed, 455 insertions(+), 380 deletions(-)

diff --git a/packages/core/src/contract.test.ts.md b/packages/core/src/contract.test.ts.md
index f4d77b57..40be15d7 100644
--- a/packages/core/src/contract.test.ts.md
+++ b/packages/core/src/contract.test.ts.md
@@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "./Bar.sol";␊
+    import {Bar} from "./Bar.sol";␊
     ␊
     contract Foo is Bar {␊
     }␊
@@ -38,8 +38,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "./Bar.sol";␊
-    import "./Quux.sol";␊
+    import {Bar} from "./Bar.sol";␊
+    import {Quux} from "./Quux.sol";␊
     ␊
     contract Foo is Bar, Quux {␊
     }␊
@@ -53,7 +53,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "./Bar.sol";␊
+    import {Bar} from "./Bar.sol";␊
     ␊
     contract Foo is Bar {␊
         constructor() Bar("param1", "param2") {}␊
@@ -68,8 +68,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "./Bar.sol";␊
-    import "./Quux.sol";␊
+    import {Bar} from "./Bar.sol";␊
+    import {Quux} from "./Quux.sol";␊
     ␊
     contract Foo is Bar, Quux {␊
         constructor() Bar("param1", "param2") {}␊
@@ -183,7 +183,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "./Bar.sol";␊
+    import {Bar} from "./Bar.sol";␊
     ␊
     contract Foo is Bar {␊
         constructor() Bar("param1", "param2") {␊
diff --git a/packages/core/src/contract.test.ts.snap b/packages/core/src/contract.test.ts.snap
index b1ffc2d928db0f289212e65aff1fdd7d1b559f2f..3b63457a1e0771dd73b607938f19353e13794965 100644
GIT binary patch
literal 974
zcmV;<12OzTRzV<BZeeh9Xm4~Nb~6eC0G)i6I1YQY6o+@b&qX1?a^`F5#c&>e4zW<@
zOGpz8$RCRc00000000B+SG#W$F&Ixkyt1+J68aPgl#28&jQ}AkB$NUY5|2VVv<$7B
zyYCv)JNvMGeNZ~Uz`zC)JC6~G0WpD?*gCN?@i(x5U_!oL(m1&U`cRWf+>+Qn+rQuM
z``zcyFTJYIomu(p6)LKH<PK*_5Jy3kNa{!`83|>LEBWxH>k>sKp6t%-%jhS&Cv!0S
zz_wv*^wPxOHR>RfIC#}Xrl?0zoQLaI$8)v~BRmL+qE#PZo~jz$43XWzFhrj+7)kb%
zFm=W%S*2Vk$V@;$a-X_XEy7gEI%k#3!?|1o+7-@WDYu+UFwZpx;^hg1L}(Cg(BCyf
z-}O4Pjo4`ra-m?ULc}t7f(MYd><ST<<bJ-D8<kKYqM72tVUwep=LyS{2z@nZuJjSj
z`tYqNT38#`tu8tgLBC+AaWXyPtF4d-5}-nnBF#5LnlF7MO$P@6063gUB_c<0Q5ewu
zg?!9$C|`utf93oDEG;()RPJaO;LKkH&hW2dO=kBRYW?gZwKiv@4T^fi6jf`;=THdh
z;!a4D3rE{cQOBPa{pUvXA7^_<LC4FsVZ4Umao^|jl+Az_F-K9(BoMI{2nho3MO2^*
z)kPRfmbP;78uckKT}6)z9Otvh#sy*0Ls1~ED^SYVO+~1;6fZ(VnJS+-3nbtXQv>l@
z`k_prV8m~9)KL^J-ySKKiV**dCCaYOTWY*4qY#Ca3S||7-a6TGIG)vP#uM$qbgAcI
zoCmvvbyvm+>-Ya*U4K|_sv3&XIG=7sP+LfFz511;Sr}-*=?bGALd!Dk4m#9&hz8t^
z<KCXkJ{z8Sznup`if8^os`(nS8(fW&NTO?I@e`eB17U9Ggg%+wV~Fr$r-`t|?m2GC
z*mRtN!_yAL6+^y{J(kZr{@3VF2b8HoAZILz%tcXzp%S1LBSnK#-8F~})$ukmnLS`A
z^1F}9tIZdq8xyppLTPwB-BCR(<~R01ZjH^757|YwwrAqM)V#Idkm*<d%T&))>(OgH
zsVk+9pCf{js-I%A7lwLId#s)=SzwO%5yAyHT^{aU-Pc*AT!cRuwBGa^tvH-Y=z@@u
zK=<bF@*2xG6FwG?#87024kbP~HKJEez4|{j7(eP2;|dWKa=-arCd|N5=J9s)pA7VG
ww-dc>+i=l|q~gJOiB2S_S{&4vHRO87MO+|3=%eNEp#28=2N<o%m1YzG05o~eXaE2J

literal 965
zcmV;$13LUcRzV<BZeeh9Xm4~Nb~6eC00QzZ%Vz{J`D85aCg4t!Gj7i`Q?D0o7=VR|
z#1|Q`o*#<{00000000B+SG{l3Kon1kDo{2yzJ#74fl`s$X+#lfg@jr_ssyyq4lP5g
zi~ZajweQT`xgQh;7#P@!gv3Z$7?4<C0<nNtm>AgMKd4xcSP-)7q`BA$v{X$i;U)3e
z_wM)c{O;YVQ*pU9Cm%gSMU{)(;!Fu*DX0)hElDLKzN~U3@2%Q4QDpMrzRdnicxAgY
z2eWrf6UN6bO!i);7BY#wBQ`Qc9g1QAu8d6NOcRE==MzOMF2Vv;RT%Y=-9X<*mogZR
z*OM^aZ<LHu&KG3XBOtj;ZK{@Fx@4R+%H_dat`6-I=dhf+n~O2e*B?aT3HU^WAQI4@
zH$v}vlG#D*)bqJekT=XBA`Hphd@~^`VTg!EUW<oyVrqfM)KYADuW@_TX>J>1*MeZN
z4dEh$FKDz+ru(^m=MzCZR47t3_@Zg>vC|r~@D~8U;!G+LSc;26PdHx4N5uN_MOgn=
z&iBCb-3C?4Et3H_bC-ZK{If!9nnK??t<dJPWQ*b*(Zvh3;`1m3wQ(<0xW%JM^K1B%
zE>C42Yc@Z~c8)^mmubR86~W=I%NHn{1t(yZqMS(}V#5dt0&fLWpbeEJ7>`36xhO_$
z3d~f{;Q}Z49I^>Pm~>DSh;0j$5*)$3BGm2_FG4_>D)*lO;_-l~o+ws$QKnEZ;?@Uh
zC<+&^50^_th<?UnW!L8|*I$-_kHScWvJN3!I$m-xn$?($Cz58`)NwE>a&2tw%4oKJ
z|8MK&Z5>rr6k}1{+zwNlNboTFrTDhcQ-{+QMiN3(m}CYWYTh9|Zb!Z+i`fS)XI}4Q
z#ZSqZzmRI7itH*^V<eDh>s9<jE80Mq-MXMpWxF*Ie(W_7wmEx_>oPWMr(p544e^sE
z-`ft$r*Hoo^k+QERKb(8hD2tgC_-NeFcc$2gH!D_h!U#xLE@Jt$Xch{sDE!Xw<cm!
zS5nXG^ep<SiS~K-e}vnUTJgtgBimRr&bicDbwHEp=kAxOR-HDZ*JjF9O7A{T1SJ(W
zCCQ#@>aBEGy|7JzdEy2L=iqdCuzg2gW0i7ld!x~MvD;`xb}A7zfsA<JX#OUzvV0@q
zW6_fciuBQ<#09HL!pNy7)fJ8L{Z26+B4UW#Zaj+#-8jk|o<#pnL;rFo(VM0T=dD00
n?hQz^0zuVMZ-_aBTpKu#i^TI?G%W5VPo2L3Mr-Q16%+sfmFUNY

diff --git a/packages/core/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md
index 46903daa..a3291ee1 100644
--- a/packages/core/src/custom.test.ts.md
+++ b/packages/core/src/custom.test.ts.md
@@ -24,8 +24,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/utils/Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyContract is Pausable, Ownable {␊
         constructor(address initialOwner) Ownable(initialOwner) {}␊
@@ -48,7 +48,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyContract is Initializable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -66,9 +66,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -109,7 +109,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyContract is Ownable {␊
         constructor(address initialOwner) Ownable(initialOwner) {}␊
@@ -124,7 +124,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyContract is AccessControl {␊
         constructor(address defaultAdmin) {␊
@@ -141,7 +141,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyContract is AccessManaged {␊
         constructor(address initialAuthority) AccessManaged(initialAuthority) {}␊
@@ -156,9 +156,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap
index 0c0eba376395f6eb6b1ad7d85eb8b58a3a875c5f..5f5f25e19fd8eb888e75bd01d29daa78bb273ae0 100644
GIT binary patch
literal 826
zcmV-A1I7G7RzV<BZeeh9Xm4~Nb~6eC0LeCuST316l`0(e|AblD_R1G`0kGtHrR-a#
ziL<I`J|Bw+00000000B+R^3V)K@>KXQrNrp2~NFAz+^=z6mw(H76PUbHK2tWCc7ue
z(Ak+`X4aSlFG{a^+c&T;*Ei^O$^N;si8Yqi(BfXse&_f5=FGY7_n7cL>M!5WP{XkA
zh1!UKYEGmc3Zp+=`#v$`^y~WCv$fe*db;-f$>%lKh2z8h)9L~BkZY_qedLDrDXJZ4
zHBTJZg*_2SVrY*cjHnqxTOxmtQX-=q_5?SIct*qdtJ+p=%aMu<0s>kv>Qgg@^R3$J
z+V*zcal8Zyt#N7vQ|HP_QXWbYYSLpkm-Jcbhn4mB(gS8q11Xe&>0y%H74($|U}INE
z<dejqo7Se?&`_q`6kXGTZPYU-?Gazb2k|`A+D*`jkA?lC8q!dkkl<nJ004M`YokKX
z2vsJ&uTX2CoEl14d&E&yQheDyonASSeLv)$p@PGV7c5smhCN0-5S)!8XcA}kbrVcI
zIw?8``7$mtRO%#C#we5nMSP5kGm3C6iJB2UFBD@51y>=IX539WS%T?mt}<6DaXC)(
zV>!7)02VgssO!408_$3pF-gPdYREO|W0f!_MtOzIDW;OA#;1|OvOuWx0-9u=rZALx
zo}YDQ@$+H*f8wWb$vZcu_laWP{hX6RluqaH_%}o33n{p{kJPe(le6E1g2RW`qdj|Q
zhPh=3-T+iOo^p}8Nr~MV%pR2W9I8-sjJ_qKE(y(0C^|{|mL<k<)C?rU0J$MEY$Xdp
zxk1GV%MP*;dUJAtN>Lx9gK2(z#*%`FQ^6qVp8qc`2N#7JL`=(q7vQB;!;4kC0Dt3^
z|6^}^)>2bwsS*qqjO@~>)zIcD8rq05-HQ`lvaOcQ9nH0{zi6?KeG)R$@B_-NfizHr
zn<K%ny#MBHqjPZ5ZS1$2@483rgEyPD+1#^Ply*Qk87#P+XQiga#LnuNXvHZm$wXX`
zaxL4X7)h{qi@p($R5PyFmgV{X`73Z)Ev_tamzEuvkNeEyKJ&QGJlH<-6T?nsE#(jZ
E054dV(EtDd

literal 802
zcmV+-1Ks>VRzV<BZeeh9Xm4~Nb~6eC0PT4SlvSN;St)kKSR>;T5&k)x^is+#n^Q~M
zBS!wo$sdad00000000B+R!wUgF%Y$DN?~v9rB@MXu_5+`kV1(sF-`)8xHd@)Ne?md
z?${R9N<z}cu}u!8r(XLH(qGem(7#i>Us>%sjZ;c+AbVNRz8THDdHbZB;ec}Ii~9Z(
zG|?1>j;}QLh+<f%G1uzrjq75K&wi8&uL_H&__FZ&#kYcOqm%CbS@noGz!X$lE-+1o
z1mrGiw@xkFMosPstjT}^nh-rk9Rch!2mzEZ)Z|P{>}Z89KGe2qTb7V`<YA;ZB`(oZ
zbg@<YSliyNTb2_+QF|Ikp}BQ!MJ0~~_7xsb$Q6BF{B2bItN4gj6Hjod(Z(JZz-Cbb
zJMKl<z9v-J-Kh4O;&h{aZxD7IP|EI1SSn~KK}4ZA_a=()Xl@~dki(hM(swkMW$d~V
zltP3NO)%|D7|2SDFPp3LYb%H!`pnUUGqfNc$`vI10VNLNj7|e+w9n${N0@rBl1<>V
zRZ=9VI7u@4i7!SHyAU*|C1y%sxtM5P34KEe-8E7|HPwVIB)^(Q+GvIBli3QhHn0(S
zwr!)m@PFRrvv?a-^_jv$sA5X_BrS%VI4bEWxFir$vJptNWFjIx5#JXoKZ??OV-#;o
zPjnOy$z}exz1uJUkSkqRuh%`vXIn`mi7TYyH&G_x<15KD2$Ep#aH?B?j6Ec^Q$K34
zzkr!;R!^ZaO^4_^D(YijkGUkXn75=b29uU2D0sj$USKQ97KCY#4AW#G@wwZTOOTSd
z5G>5o9v5l{1vBLoMeMmx>4?6}^uWWhEV1b~Mh~SmvgwDNz5ngRO*qsU4kf3s#9fO`
zgTb9OWUvvunqeRJ@MvKF!lnyD>{H!vJ;DsL8A;6aF{e=8KR9gkj!yfH{dVh9|G0B>
zuxW<n4zsLmJ<RZE$)9&#+%ZUhw}zyLwabY7cG$^E<VV>1rQ8UeQBNyoWI6vmE$pjm
g_RbIzva0VrUnrh06weom6)qHi0Eh%_-|P<n0C8@8SpWb4

diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md
index 7ff0f6e7..fe69331b 100644
--- a/packages/core/src/erc1155.test.ts.md
+++ b/packages/core/src/erc1155.test.ts.md
@@ -12,8 +12,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable {␊
         constructor(address initialOwner)␊
@@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -72,8 +72,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -95,7 +95,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155 {␊
         constructor()␊
@@ -112,9 +112,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊
         constructor(address initialOwner)␊
@@ -136,9 +136,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊
         constructor(address initialOwner)␊
@@ -177,8 +177,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable {␊
         constructor(address initialOwner)␊
@@ -214,8 +214,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -267,8 +267,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -304,9 +304,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Supply {␊
         constructor(address initialOwner)␊
@@ -337,11 +337,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -420,12 +420,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -513,12 +513,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessManagedUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap
index f91628267f99fa8652ff3eec9f986fe00802f12a..1b52fa93e3998992b00dec6a09454835631f3128 100644
GIT binary patch
literal 1788
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

literal 1715
zcmV;k22A-uRzV<BZeeh9Xm4~Nb~6eC04>y%`+yDTXKk;dd&FIO;||=<_>C)R8-OO@
zAT=0WEFX&q00000000B+TT62rMG$u4xRMfFfGdYVC%KTdvB54J7gdp8Aj*z~EL8<4
zq8javq`|v0n|VZ*T|U5p6CC*g$sMY=!@uAk@FzG@`+iE6ZCRF-)kWT&nVz1Rue-nQ
zkzco4I#o~juWyjRLPw|tIaV<z(Bxez_>ZqO4GQ?p{ruv>!v*VeZ)xGZ`ybp_6mVSK
zeZF#lRYW*isc47@+{TDK0f&`(PEo)PHB2aQOGluGMHd{Ih<uAo6X}?M9ZCd)s^H+o
zdg*cLan5A0V?e;Ejx{X$;Kk$8XQj2Zty~TpCS?NTpHdT%GgpA3dIA(dPY_Y|YCEf|
z>+9ZkiBmnlb?I2Bs)%#ts7GK+NA94U*A5Q*bxSzF9Jq3e!0ijpa{vIKQo;q3s-Ua@
zHH{(80VY^rs2}wRV#{_f>*ES2<hw$c{E4D;pg=v?FPWG?0ZXb*rKVuB&6TeWwYu3o
zWn^cyzFw|ZjhAa2?xXVIYTw*{zPU}xytku$xxM+-&JPD=B_B-UDpyFVaDI`qzuS_i
z0#gDw5{+7=zy-sk0}NzP)&~UjB*V+Vlr0^rfD*lL%Wzj~eVXn-x9gVOaFM&nxezjJ
z2!W3QqdMYAC@uaSfzls~^97}{{blP!^^pJ-8R2ept1l4$WX(GV8)c9P(5O|K$9whq
zUaeU>I@klBgA=5x@MLX$qmYj^=9jl}12L+hHk7(3YX&A0#Apac9R`W0Q5_X__x8(;
zgL<>Pdsum9t6q%i=V9!60Ji6d?alJ#fVRIB1=PC;w5hJso;8g(I|q;<Kwlxou!cBb
z=%vIAX`s~y$1d<nafPL6L5Np~K&%Z_RIrcvQ-Hk}6)iXmX9fP_D~x*ngEwy>9Ylc;
zhJ<8<gF=gXug_zRmRg9FlFEg(N?1AdtlWSEc9515GWH^NzA<MZ!&x_T?fuZ%g)7**
zJL2*%QkJ4i85aEshmwezg>+@E6;v3qnpNR1ew3(U5(=bg0m}l1WH<@9dyNR-_V3LI
z;D(_k1s;?1)}aIFwj{H;MT({W6xnz_XO<o%hgX{roeD&_6)(J3+wL}Ag=-c;Y;Z<C
z2e^r@2_;WQ>4T3VD1HAyhSI?(t-9NIEtGnLGnA$<N?*8zR8$x)$L*6YK$1~J_`PnA
z*Ea3IjQqoGGinrp_atZ$NKC}q`o?$Pdz*+gp7Qn;)FtA<QP~WXKz#`BjX^F>aUE{!
zDd;F>DP+&@PM35d1|}lii7fsSaUvIUmb_+lkTDy%g(QDJpsG?ygb#dxwcu}PIBj-H
z=&500ZeT{}D;3YIok_jPtVulKw!FcbZbPAV3)e7QM?N2$_KqUHq59$@`UkmzXRm{c
zPD_79?DqGi`Lf&TDmo35by#_pE+^D5a^WfnGKL*0W~7i68x>l4(ObyfRlFwVy5eh3
z?CZ?9v5{6Xl1s~Kj>Bq>Eac}0mK_)WjClGtbH>oJvg0Jmj+66*fmSo={)Vf6H5x}P
zccAxy1>qA+Iw`jOTg0}1o-^AXZwcqv-py+jaGar8W_Q~cf>Tg9agKT{Ws}nn+fvto
zG&>Ax$d1#3LBdVQEUQddbM8E1&3bNnta&B0h;++t1RX}R*NDipwC!dRM=j{y?kwK@
z#LZ?g89nVQQed4c701l+*=2R9NJk&uAw^<*HPSM8lM+`ip|%O8&DC<_I8{!lVXUdQ
zqA1|0D!HJ>6ME(y4_}dl!!}xhmir5bhU7J6*r96J-dF#O5aWZY+Su=NNy=}Rwb|ej
zKp=>PSxZQ(rhBwatLv>qtx&$-jG)h%GSVKy;NTt}68#?ID@BCRRCG6ZrfL=`7b5X>
zE#K^ZWvICHyOyk?GFKIqyCZEQhOC>Axk(j|MvBW5C@IMVWtGxQxj%UKVT7yx_fE!D
zGp;%cSG}&RMx%P1)NERqZxO`wn^P)0bWPPSYUSPZ6@{B-o>B+TuF7vE$qstNpg)~7
zJk~LS$YOAi8E4Np`*d>lfNw+R^5@J8K>nHt>QxL=M+PDST78FcX&<g(O9%#d1T|7g
z&hmyVZ%EG@PM3$(x*fhh@QV7;zma6(pGR+9GLd?Voh22sm{cSWZ`?`6H1X!d?-5cM
z@LjWC_e7j26ADj?4X4J1Tm6|vjQOPtx*B^-mvM)bG5fj5ZIHv5S|H<tH~(LX{{gOH
J?bTXB004M?KYjoJ

diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index b56d1af6..8b108526 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -12,8 +12,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -28,9 +29,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -45,10 +47,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,10 +87,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -127,10 +131,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
         constructor(address initialAuthority)␊
@@ -166,11 +171,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -206,8 +212,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {␊
@@ -224,8 +231,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -240,9 +248,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,9 +274,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, AccessControl, ERC20Permit {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -294,8 +304,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -310,9 +321,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -345,9 +357,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -380,9 +393,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -424,9 +438,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -441,14 +456,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -516,15 +532,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -601,15 +618,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index bbe1473fa465b31257b543de0aa089525970ee69..ce8bfa71e7fb13ef60db3af824f4bdfe9105364b 100644
GIT binary patch
literal 1950
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

literal 1843
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

diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md
index f0cedb01..4c986927 100644
--- a/packages/core/src/erc721.test.ts.md
+++ b/packages/core/src/erc721.test.ts.md
@@ -12,7 +12,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721 {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -27,7 +27,7 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721 {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -46,8 +46,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721Enumerable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -88,8 +88,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -124,9 +124,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, Ownable {␊
         constructor(address initialOwner)␊
@@ -172,9 +172,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, Ownable {␊
         uint256 private _nextTokenId;␊
@@ -220,8 +220,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721Burnable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -236,9 +236,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
+    import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, ERC721Burnable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -273,9 +273,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721Pausable, Ownable {␊
         constructor(address initialOwner)␊
@@ -311,8 +311,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, Ownable {␊
         constructor(address initialOwner)␊
@@ -334,8 +334,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC721, AccessControl {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -370,8 +370,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC721, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -393,8 +393,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, Ownable {␊
         uint256 private _nextTokenId;␊
@@ -419,9 +419,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -453,9 +453,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -487,9 +487,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -530,14 +530,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
+    import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -603,15 +603,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
+    import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -684,15 +684,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
+    import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, AccessManagedUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap
index 64c00819812840d152aebc1a4196c6fd7df3b370..fd6cdcf75d0493996322ceb4064c8eff671f2446 100644
GIT binary patch
literal 2137
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
PXd(U&>%Cc%KUn|(;baGd

literal 2039
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
VGX|Y8=(AwZ{{c*tb4Tq{006hh-<|*f

diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index f60ee3ff..6e56da73 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -12,11 +12,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -109,11 +111,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -202,10 +206,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -292,10 +298,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -382,12 +390,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -496,12 +506,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -598,11 +610,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -691,11 +705,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -784,10 +800,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -874,12 +892,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -988,11 +1008,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1081,11 +1103,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1178,11 +1202,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1271,11 +1297,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
+    import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1364,12 +1392,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1478,11 +1508,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1571,12 +1603,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1685,11 +1719,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/governance/Governor.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index fd365374cbb406d83757a910dfbad9db55d745d6..9bc66e9ab4ff824c7d4f598ae7d31292b09d5d17 100644
GIT binary patch
literal 2079
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
JJcoPm002NT>1zN0

literal 1959
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

diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md
index 497e82c6..906d21f5 100644
--- a/packages/core/src/stablecoin.test.ts.md
+++ b/packages/core/src/stablecoin.test.ts.md
@@ -12,8 +12,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -28,9 +29,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -45,10 +47,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,10 +87,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -127,10 +131,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
         constructor(address initialAuthority)␊
@@ -166,11 +171,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+    import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -206,8 +212,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {␊
@@ -224,8 +231,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -240,9 +248,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,9 +274,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/access/AccessControl.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, AccessControl, ERC20Permit {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -294,8 +304,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -310,10 +321,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Custodian, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -345,10 +357,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Allowlist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -391,10 +404,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
-    import "@openzeppelin/contracts/access/Ownable.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Blocklist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -437,9 +451,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -472,9 +487,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -507,9 +523,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -551,9 +568,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap
index 59942f98fd6f06eb0f6dae48a8fd08579f889349..f5935d03e92feca19da0d19d9140835cecd9810a 100644
GIT binary patch
literal 1678
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
Y*%yh-j>$;k6+DptA7mMFB)>!e0FT=+l>h($

literal 1600
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

diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 39860ec1..281a63fb 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -122,13 +122,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import "@openzeppelin/contracts/access/AccessControl.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+      import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+      import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+      import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+      import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -329,11 +330,12 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+      import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+      import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20PermitUpgradeable, AccessControlUpgradeable, UUPSUpgradeable {␊
           bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
@@ -519,10 +521,10 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -685,8 +687,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-      import "@openzeppelin/contracts/access/Ownable.sol";␊
+      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+      import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
       ␊
       contract MyToken is ERC1155, Ownable {␊
           constructor(address initialOwner)␊
@@ -851,9 +853,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -1165,8 +1167,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       ␊
       contract MyContract is Initializable, AccessManagedUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index 91dcca5c29ae35d338ea800236128a040fec3d13..5b63161281dec5decf6b71154364c3a9a5b8b992 100644
GIT binary patch
literal 3472
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

literal 3378
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
ILUMip074Ul2><{9

diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index 86654825..da2efc99 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -13,13 +13,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import "@openzeppelin/contracts/access/AccessControl.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
-      import "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+      import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+      import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+      import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+      import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -147,10 +148,10 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -252,8 +253,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-      import "@openzeppelin/contracts/access/Ownable.sol";␊
+      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+      import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
       ␊
       contract MyToken is ERC1155, Ownable {␊
           constructor(address initialOwner)␊
@@ -423,7 +424,7 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       ␊
       contract MyContract is Initializable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index 8ba480e971cb25943acb227259c7b6fb54f6540c..5bb901c65f06b93252c1987581a8879731a7406d 100644
GIT binary patch
literal 2284
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
GGXMZs272iL

literal 2221
zcmV;e2vYY!RzV<BZeeh9Xm4~Nb~6eC0CkwCDDQmm3;BfS`C;HLaJ1-p(*{m<Dqh!3
zF2Mk1@*j%`00000000B+Sx;{p#}%KIY}sXl8bNX{21HRT4Qfd-kP}Ez5m~YkA(kcR
zPtrC>l;Q3pIq~kyW@c6rE$~nj{S-YV2vDFvuk9!3xhT-0x1!&nK#pxOv$M<Pl9o(W
zv6YwvBywlo|9$h`Z)U#iv_tMck-zy06jdR74#ICWaVH5wDjA7ok1P4BFN1(6@{1q+
zc^=(D`s3Vo7T!e&-A4%h{uV-iy^YXMD+qO8L+A}>;dSTcx)7xAIN7f|ckUpkf}ESk
zc@4ec%%L}(dF0%DeeT0sjRxM|-Te9DBkBW_u(%ZfQ?x@ttl;gfgG!@;H+U2iMcX0Z
z6RLW6CkFOQh+_yT!yB9_L3}0gr^{Z`YgS@Gx)H&Whcuw7k3VgC?|7}&YNbM>m<xrg
z@9`MeQ!Ak1X960EKLOTwu(#1_rvE+3!|Li(d~m9ONy?c_2ks|=k#-1IAZnK+atcwz
z_d&|Wy7@9u;^9?T0V1O63Iu(~704@)^Drc`w@q1QQzc`=+x-L0hpEJdvW`byiG9q%
zTE`=y%4Utb_Q9BJf9GoPSp{Q^+kFM{trm`xc1V5fb0!sG3h%BT?myT&+S_^b0I%UE
z;QQoBYx$mAElgBvtLMtt-g<m6QAS}x%P>L=mq>iYg-e1!fRs3Z4oO0_9z>MYaW)#0
zM1mMTN0ccLH6ulTjGu0GyN^vAt94x6KKP(oB1j`tAWP@Za;l@QAWZG?5ZuiN57!SL
z9UQH1Zf`v{X4gk-vvDYK6(Uu)Mi&XS*={7eo&*+Xe_G9E6W_&4O?>w*4#1}o38h<`
zEW8lHdKQ6{aFE8clQ3UV&Qi^8Eqgnhh5fR5wW8aWezLHHO)D<vm@LplA$yaG*KtCb
zYAxTxB;pBE<9Z5?kLWRiv;fOEqOQ@v2R*<Y9)|pcvTm+lVj=+ZV-SJ{AhCci5-K3T
z?LOYOrPwQ(e3ZliQIK2R5j+}ZW6_6W5+*RrJM)$p3G;zWuUlN_!-YLuyye`KNesfv
z3`q^pic^J?Bh5JTLFQKT6INU_X_)iJV+tqFFf%JHkBz*c1OX}$Ok&r1U$!}&x29WT
zQX?{Z2Nm0A9VctFZ#uTdp5gb22zo>vN)Q{Ib!Zn4Oz3g7m(J+I+o9cJU1mI@eupP4
zAUXyOOSz~x58M1ym)(jfJUHcDnV@CO_>lGG73<M42wluqa5e4I)w&s$pcG|Yxsp51
zV?`tSRO5nSEWlLqU<E6YK-~@x(jVq)P_GPDD-}33j@Vjbja<#cG?#_xzN2MV8Hu2}
zk_Ti_k|++rm{zq0SB=F@Zz&xOK>C8l%Fd*N5uxUZvH(uK&t*EA63S}kM^%AT1#Q?o
zSF8h7lBgaRL!n^`l=Q&%)<LHIcoSk>{+LgpAo>{%RWqk>$%gylH$28+3Cu*xTe{~h
z8JjDEEU5EYP`$Z4_dxYP$a2Ez^dYj({6aY+l(}hLO7kkic@K&1Y<;|j$qAv#O7yy*
zN));y*@k2~qb^-Ln>#CbA5>OkK;jM;SoHwssDX%X5&=^Zw;|*wxdGHPV;^$OC4F81
zamf4bXs^wBY@xHH+?hB}KRx7P({O9WZfdXA%0uu%-gQ6Abm3G91XywWle3bjE~xd?
zF}F7OthQPiR5X762(SR3M-i|9s~**zU+D^}g|q?dC8U2Q60ms<4IA2H5dD)L2+&dp
z3veuW3?l5~9$`TU7=++LdX@BTc|K8o&vngc4X^zye|_2yGiv8_7-GRS-16X*stq3K
zxGt?$2DRa;ypbi)2ZaPWjloxW0{J~chjr?_{7M&S8-{67A7-1)G!0`8AT44h+|@cR
z<)xeT$}7ssOi(dv@EUf@V)kj5fzT-C<K`!xP2bgmfHcuAU|pKXn&##OtgQlTf%nQ*
z#dEI<Y;(XZ(d(M+)@q*O9(<9Iu!u;t0-ag<&u(=E2><QY5>Dc-AOYw#Fuvve;p(I<
z?>F-ZJ-CU`e-{vX{|D1<dB2*!K3m?!g7?Es*4wQm`*k>+e!iXBh`?Cz(|#jSG?a}k
zMinI?eR@e*b~n3oVjBL{*>!lhyFV^%;vRCu1p_KaBUH!Z*41%Ifvp~mMgza+CsOff
zg+I-#lZy$HqyvjY!|UQsZfs{a0@(v<fNpM}S+bMCE6r(g0BeVK41_EYh-}MH&~%h~
zeWa--><kM#tRowYlypQ#k*XA)l=>OAAEi);KFuPWyTIUNOCvO0CJcNzZ?C|@zOiEr
zmZvy-B7A=L+lJ4R^Eac*^24U)cOGW{?v;hv7ni4tn8tEK)4%niu>8F;mak_W^m~Hp
zGjA+#+10(mEg4bA9~TSSCzpoxM*6FX>Hp<Shw0DHvulp-i`g;-x<3zRUph};G|-Mf
z_)AO6%eYM>^~W*x?LSSz*zO!cJM##AeFLGtFHDQE|K?mDj6KBFIttnMbeA|5OI>io
zq2=Zvw3x`H+kg=;Ry@qt0^Dj(saUQw8c{zHv~fm*LE*^XN_WR)oR#641a-K#<w_;=
zL2(3;UP25`5<y2!qtjJU0GXE2lFkk_XNQ{C@KE!|uhgOD*#2#Hh&e6b`OB1mX9jbo
z$;ba2)g*$t%@I^HsSi%TH(`2=^DKC?@Y_l7<{t>5|2PQk&m**Xb6R-wYxDx)O#y7=
z3;1l-jc48XI(6fJIxnjmXG69WPTg5&-Skr3bn}Y4>Bg{GzNCg)N~BBW(eq`}_+6N7
zVdvh3-F7E6vacP4{ym4#A8sJ@$Eo+}yVq!+KGoIL#I9JrBYN?7J+qsO+0Di5=3+8L
v_@)dIUc$}AbAyHFJl&n$JX``g9DQpy58oXSF;#v|iz@yH{obaBRx$tpL~uGJ


From 417f60a537d115c0884592994ba23dc2406ba832 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 11:38:44 -0500
Subject: [PATCH 05/18] Remove unnecessary import

---
 packages/core/src/erc20.test.ts.md         |  24 ++++++---------------
 packages/core/src/erc20.test.ts.snap       | Bin 1950 -> 1945 bytes
 packages/core/src/erc20.ts                 |   4 ----
 packages/core/src/stablecoin.test.ts.md    |  21 +++---------------
 packages/core/src/stablecoin.test.ts.snap  | Bin 1678 -> 1659 bytes
 packages/core/src/stablecoin.ts            |   4 ----
 packages/core/src/zip-foundry.test.ts.md   |   3 +--
 packages/core/src/zip-foundry.test.ts.snap | Bin 3472 -> 3459 bytes
 packages/core/src/zip-hardhat.test.ts.md   |   2 +-
 packages/core/src/zip-hardhat.test.ts.snap | Bin 2284 -> 2282 bytes
 10 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index 8b108526..c7503cd3 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -14,7 +14,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -32,7 +31,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -51,7 +49,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -91,7 +88,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -135,7 +131,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
         constructor(address initialAuthority)␊
@@ -176,7 +171,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -214,7 +208,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {␊
@@ -233,7 +226,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -251,7 +243,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -277,7 +268,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, AccessControl, ERC20Permit {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -306,7 +296,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -323,8 +312,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -359,8 +348,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -395,8 +384,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -440,7 +429,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20FlashMint {␊
@@ -461,8 +449,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
@@ -537,8 +525,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
@@ -623,8 +611,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index ce8bfa71e7fb13ef60db3af824f4bdfe9105364b..afd5648a657b5a7634592299041565645c11a8f4 100644
GIT binary patch
literal 1945
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

literal 1950
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

diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index 0bef7afa..daf805a4 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -169,10 +169,6 @@ function addPermit(c: ContractBuilder, name: string) {
   };
   c.addParent(ERC20Permit, [name]);
 
-  c.addImportOnly({
-    name: 'Nonces',
-    path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
   c.addOverride(ERC20Permit, functions.nonces);
 
 }
diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md
index 906d21f5..20ad0158 100644
--- a/packages/core/src/stablecoin.test.ts.md
+++ b/packages/core/src/stablecoin.test.ts.md
@@ -14,7 +14,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -32,7 +31,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -51,7 +49,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -91,7 +88,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -135,7 +131,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
         constructor(address initialAuthority)␊
@@ -176,7 +171,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -214,7 +208,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {␊
@@ -233,7 +226,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -251,7 +243,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -277,7 +268,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, AccessControl, ERC20Permit {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -306,7 +296,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -325,7 +314,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Custodian, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -361,7 +349,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Allowlist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -408,7 +395,6 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Blocklist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -453,8 +439,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -489,8 +475,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -525,8 +511,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Votes {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
@@ -570,7 +556,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20FlashMint {␊
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap
index f5935d03e92feca19da0d19d9140835cecd9810a..bbc71162a2e38b6d0e81c0e160232629952ce6f8 100644
GIT binary patch
literal 1659
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
F007P?GxPue

literal 1678
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
Y*%yh-j>$;k6+DptA7mMFB)>!e0FT=+l>h($

diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index 1207bd06..b9b1fc76 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -256,10 +256,6 @@ function addPermit(c: ContractBuilder, name: string) {
   };
   c.addParent(ERC20Permit, [name]);
 
-  c.addImportOnly({
-    name: 'Nonces',
-    path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
   c.addOverride(ERC20Permit, functions.nonces);
 }
 
diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 281a63fb..137cc5de 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -127,8 +127,8 @@ Generated by [AVA](https://avajs.dev).
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
       import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
       import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
@@ -332,7 +332,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-      import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
       import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index 5b63161281dec5decf6b71154364c3a9a5b8b992..52265f82a4b318ece87b34b09d40d5d607a59902 100644
GIT binary patch
literal 3459
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

literal 3472
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

diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index da2efc99..29e5004b 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -18,8 +18,8 @@ Generated by [AVA](https://avajs.dev).
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
       import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+      import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
       import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index 5bb901c65f06b93252c1987581a8879731a7406d..8628e95395044f6c5b0946de712aeb914a4f9d47 100644
GIT binary patch
delta 1907
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

delta 1909
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


From cec9ba3863403ca97c7f5966f0cfd4537eaee3ef Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 11:48:21 -0500
Subject: [PATCH 06/18] Update changelog

---
 packages/core/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 47f2fec1..06733459 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Use named imports. ([#411](https://github.com/OpenZeppelin/contracts-wizard/pull/411))
+
 ## 0.4.5 (2024-11-18)
 
 - Add `stablecoin` and `realWorldAsset` contract types. ([#404](https://github.com/OpenZeppelin/contracts-wizard/pull/404))

From 908f20d7bf517b4b5c28d0db1f58d372045455d2 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 11:50:56 -0500
Subject: [PATCH 07/18] Revert whitespace

---
 packages/core/src/erc20.ts      | 1 -
 packages/core/src/stablecoin.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index daf805a4..cdf83045 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -168,7 +168,6 @@ function addPermit(c: ContractBuilder, name: string) {
     path: '@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol',
   };
   c.addParent(ERC20Permit, [name]);
-
   c.addOverride(ERC20Permit, functions.nonces);
 
 }
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index b9b1fc76..ab4348ae 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -255,8 +255,8 @@ function addPermit(c: ContractBuilder, name: string) {
     path: '@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol',
   };
   c.addParent(ERC20Permit, [name]);
-
   c.addOverride(ERC20Permit, functions.nonces);
+
 }
 
 function addVotes(c: ContractBuilder, clockMode: ClockMode) {

From 462634db82c5542cb259dd1ac79e47f569d7e49c Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 11:53:01 -0500
Subject: [PATCH 08/18] Rename var

---
 packages/core/src/print.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 3cb1f1c8..27d7a7db 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -28,8 +28,8 @@ export function printContract(contract: Contract, opts?: Options): string {
       ],
 
       contract.imports.map(p => {
-        const parent = helpers.transformImport(p);
-        return `import {${parent.name}} from "${parent.path}";`
+        const importContract = helpers.transformImport(p);
+        return `import {${importContract.name}} from "${importContract.path}";`
       }),
 
       [

From f7b2c6877bca2d34081c1bc81374e61fadd1ba5a Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 14:48:04 -0500
Subject: [PATCH 09/18] Import from same file - WIP

---
 packages/core/src/contract.ts           |  29 ++++------
 packages/core/src/erc20.ts              |   5 +-
 packages/core/src/governor.test.ts.md   |  72 ++++++++++++------------
 packages/core/src/governor.test.ts.snap | Bin 2079 -> 2059 bytes
 packages/core/src/governor.ts           |  12 ++--
 packages/core/src/options.ts            |   6 +-
 packages/core/src/stablecoin.ts         |  10 +---
 7 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/packages/core/src/contract.ts b/packages/core/src/contract.ts
index e7142d54..c1ef0749 100644
--- a/packages/core/src/contract.ts
+++ b/packages/core/src/contract.ts
@@ -5,7 +5,7 @@ export interface Contract {
   license: string;
   parents: Parent[];
   natspecTags: NatspecTag[];
-  imports: ImportContract[];
+  imports: ParentContract[];
   functions: ContractFunction[];
   constructorCode: string[];
   constructorArgs: FunctionArgument[];
@@ -16,12 +16,11 @@ export interface Contract {
 export type Value = string | number | { lit: string } | { note: string, value: Value };
 
 export interface Parent {
-  contract: ImportContract;
+  contract: ParentContract;
   params: Value[];
-  importOnly?: boolean;
 }
 
-export interface ImportContract extends ReferencedContract {
+export interface ParentContract extends ReferencedContract {
   path: string;
 }
 
@@ -31,7 +30,7 @@ export interface ReferencedContract {
 }
 
 export interface Using {
-  library: ImportContract;
+  library: ParentContract;
   usingFor: string;
 }
 
@@ -79,7 +78,6 @@ export class ContractBuilder implements Contract {
   license: string = 'MIT';
   upgradeable = false;
 
-  readonly using: Using[] = [];
   readonly natspecTags: NatspecTag[] = [];
 
   readonly constructorArgs: FunctionArgument[] = [];
@@ -87,6 +85,7 @@ export class ContractBuilder implements Contract {
   readonly variableSet: Set<string> = new Set();
 
   private parentMap: Map<string, Parent> = new Map<string, Parent>();
+  private importFromMap: Map<string, string> = new Map<string, string>();
   private functionMap: Map<string, ContractFunction> = new Map();
 
   constructor(name: string) {
@@ -94,7 +93,7 @@ export class ContractBuilder implements Contract {
   }
 
   get parents(): Parent[] {
-    return [...this.parentMap.values()].filter(p => !p.importOnly).sort((a, b) => {
+    return [...this.parentMap.values()].sort((a, b) => {
       if (a.contract.name === 'Initializable') {
         return -1;
       } else if (b.contract.name === 'Initializable') {
@@ -105,11 +104,8 @@ export class ContractBuilder implements Contract {
     });
   }
 
-  get imports(): ImportContract[] {
-    return [
-      ...[...this.parentMap.values()].map(p => p.contract),
-      ...this.using.map(u => u.library),
-    ];
+  get imports(): ParentContract[] {
+    return [...this.importFromMap.entries()].map(([name, path]) => ({ name, path }));
   }
 
   get functions(): ContractFunction[] {
@@ -120,16 +116,15 @@ export class ContractBuilder implements Contract {
     return [...this.variableSet];
   }
 
-  addParent(contract: ImportContract, params: Value[] = []): boolean {
+  addParent(contract: ParentContract, params: Value[] = []): boolean {
     const present = this.parentMap.has(contract.name);
     this.parentMap.set(contract.name, { contract, params });
+    this.addImportFrom(contract.name, contract.path);
     return !present;
   }
 
-  addImportOnly(contract: ImportContract): boolean {
-    const present = this.parentMap.has(contract.name);
-    this.parentMap.set(contract.name, { contract, params: [], importOnly: true });
-    return !present;
+  addImportFrom(importName: string, from: string) {
+    this.importFromMap.set(importName, from);
   }
 
   addOverride(parent: ReferencedContract, baseFn: BaseFunction, mutability?: FunctionMutability) {
diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index cdf83045..a7c9205c 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -184,10 +184,7 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportOnly({
-    name: 'Nonces',
-    path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
+  c.addImportFrom('Nonces', '@openzeppelin/contracts/utils/Nonces.sol');
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index 6e56da73..74298f0c 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -14,10 +14,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -113,10 +113,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -208,9 +208,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
@@ -300,9 +300,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
@@ -393,10 +393,10 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -509,10 +509,10 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -612,10 +612,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -707,10 +707,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -802,9 +802,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
@@ -895,10 +895,10 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1010,10 +1010,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1105,10 +1105,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1204,10 +1204,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1299,10 +1299,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
+    import {ICompoundTimelock} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
@@ -1395,10 +1395,10 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1510,10 +1510,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1606,10 +1606,10 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
@@ -1721,10 +1721,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index 9bc66e9ab4ff824c7d4f598ae7d31292b09d5d17..7ec1674c4ee66e8f8447a13ef4b952b41347dffc 100644
GIT binary patch
literal 2059
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

literal 2079
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
JJcoPm002NT>1zN0

diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index 4591cdfd..d2fb2dd1 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -250,11 +250,7 @@ function addCounting(c: ContractBuilder) {
 function addVotes(c: ContractBuilder) {
   const tokenArg = '_token';
 
-  c.addImportOnly({
-    name: 'IVotes',
-    path: `@openzeppelin/contracts/governance/utils/IVotes.sol`,
-    transpiled: false,
-  });
+  c.addImportFrom('IVotes', `@openzeppelin/contracts/governance/extensions/GovernorVotes.sol`);
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
@@ -318,7 +314,7 @@ const timelockModules = {
   openzeppelin: {
     timelockType: {
       name: 'TimelockController',
-      path: `@openzeppelin/contracts/governance/TimelockController.sol`,
+      path: `@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol`,
     },
     timelockParent: {
       name: 'GovernorTimelockControl',
@@ -328,7 +324,7 @@ const timelockModules = {
   compound: {
     timelockType: {
       name: 'ICompoundTimelock',
-      path: `@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol`,
+      path: `@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol`,
       transpiled: false,
     },
     timelockParent: {
@@ -366,7 +362,7 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
   const timelockArg = '_timelock';
   const { timelockType, timelockParent } = timelockModules[timelock];
 
-  c.addImportOnly(timelockType);
+  c.addImportFrom(timelockType.name, timelockType.path);
   c.addConstructorArgument({
     type: timelockType,
     name: timelockArg,
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index b86fe6c4..0442ebce 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-import type { Contract, ReferencedContract, ImportContract } from './contract';
+import type { Contract, ReferencedContract, ParentContract } from './contract';
 import { inferTranspiled } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
@@ -11,7 +11,7 @@ const upgradeableName = (n: string) => {
   }
 }
 
-const upgradeableImport = (p: ImportContract): ImportContract => {
+const upgradeableImport = (p: ParentContract): ParentContract => {
   const { dir, ext, name } = path.parse(p.path);
   // Use path.posix to get forward slashes
   return {
@@ -26,7 +26,7 @@ const upgradeableImport = (p: ImportContract): ImportContract => {
 };
 
 export interface Options {
-  transformImport?: (parent: ImportContract) => ImportContract;
+  transformImport?: (parent: ParentContract) => ParentContract;
 }
 
 export interface Helpers extends Required<Options> {
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index ab4348ae..e09fc940 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -235,10 +235,7 @@ function addCustodian(c: ContractBuilder, access: Access) {
       break;
     }
     case 'managed': {
-      c.addImportOnly({
-        name: 'AuthorityUtils',
-        path: `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`,
-      });
+      c.addImportFrom('AuthorityUtils', `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`);
       const logic = [
         `(bool immediate,) = AuthorityUtils.canCallWithDelay(authority(), user, address(this), bytes4(_msgData()[0:4]));`,
         `return immediate;`
@@ -271,10 +268,7 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportOnly({
-    name: 'Nonces',
-    path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
+  c.addImportFrom('Nonces', '@openzeppelin/contracts/utils/Nonces.sol');
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);

From 874b21f04a1fd45d35d51000cff4e68a2fb5385f Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 14:54:13 -0500
Subject: [PATCH 10/18] Use separate transpilation flag for import name and
 path

---
 packages/core/src/governor.test.ts      |   5 ++
 packages/core/src/governor.test.ts.md   | 114 ++++++++++++++++++++++++
 packages/core/src/governor.test.ts.snap | Bin 2059 -> 2463 bytes
 packages/core/src/infer-transpiled.ts   |   6 +-
 packages/core/src/options.ts            |   8 +-
 5 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/governor.test.ts b/packages/core/src/governor.test.ts
index c3d936c7..ee34b0a4 100644
--- a/packages/core/src/governor.test.ts
+++ b/packages/core/src/governor.test.ts
@@ -131,6 +131,11 @@ testGovernor('governor with timestamp clock mode, non-updatable settings', {
   settings: false,
 });
 
+testGovernor('governor with erc20votes, upgradable', {
+  votes: 'erc20votes',
+  upgradeable: 'uups',
+});
+
 testAPIEquivalence('API default');
 
 testAPIEquivalence('API basic', { name: 'CustomGovernor', delay: '2 weeks', period: '2 week' });
diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index 74298f0c..ecfdc8be 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -1805,3 +1805,117 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     `
+
+## governor with erc20votes, upgradable
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts ^5.0.0␊
+    pragma solidity ^0.8.22;␊
+    ␊
+    import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
+    import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
+    import {IVotes} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
+    import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
+    import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
+    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
+    import {GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    ␊
+    contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        constructor() {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(IVotes _token, TimelockControllerUpgradeable _timelock, address initialOwner)␊
+            initializer public␊
+        {␊
+            __Governor_init("MyGovernor");␊
+            __GovernorCountingSimple_init();␊
+            __GovernorVotes_init(_token);␊
+            __GovernorVotesQuorumFraction_init(4);␊
+            __GovernorTimelockControl_init(_timelock);␊
+            __Ownable_init(initialOwner);␊
+            __UUPSUpgradeable_init();␊
+        }␊
+    ␊
+        function votingDelay() public pure override returns (uint256) {␊
+            return 50400; // 1 week␊
+        }␊
+    ␊
+        function votingPeriod() public pure override returns (uint256) {␊
+            return 50400; // 1 week␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            onlyOwner␊
+            override␊
+        {}␊
+    ␊
+        // The following functions are overrides required by Solidity.␊
+    ␊
+        function quorum(uint256 blockNumber)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorVotesQuorumFractionUpgradeable)␊
+            returns (uint256)␊
+        {␊
+            return super.quorum(blockNumber);␊
+        }␊
+    ␊
+        function state(uint256 proposalId)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (ProposalState)␊
+        {␊
+            return super.state(proposalId);␊
+        }␊
+    ␊
+        function proposalNeedsQueuing(uint256 proposalId)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (bool)␊
+        {␊
+            return super.proposalNeedsQueuing(proposalId);␊
+        }␊
+    ␊
+        function _queueOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (uint48)␊
+        {␊
+            return super._queueOperations(proposalId, targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _executeOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+        {␊
+            super._executeOperations(proposalId, targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _cancel(address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (uint256)␊
+        {␊
+            return super._cancel(targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _executor()␊
+            internal␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (address)␊
+        {␊
+            return super._executor();␊
+        }␊
+    }␊
+    `
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index 7ec1674c4ee66e8f8447a13ef4b952b41347dffc..da4aaf4d3327b53bd9e403c85745eb789e3d4420 100644
GIT binary patch
literal 2463
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

literal 2059
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

diff --git a/packages/core/src/infer-transpiled.ts b/packages/core/src/infer-transpiled.ts
index 52eeba67..64d64741 100644
--- a/packages/core/src/infer-transpiled.ts
+++ b/packages/core/src/infer-transpiled.ts
@@ -1,5 +1,9 @@
 import type { ReferencedContract } from "./contract";
 
 export function inferTranspiled(c: ReferencedContract): boolean {
-  return c.transpiled ?? !/^I[A-Z]/.test(c.name);
+  return c.transpiled ?? inferTranspiledName(c.name);
+}
+
+export function inferTranspiledName(name: string): boolean {
+  return !/^I[A-Z]/.test(name);
 }
\ No newline at end of file
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index 0442ebce..f1482953 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -1,10 +1,10 @@
 import path from 'path';
 
 import type { Contract, ReferencedContract, ParentContract } from './contract';
-import { inferTranspiled } from './infer-transpiled';
+import { inferTranspiledName } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
-  if (n === 'Initializable') {
+  if (n === 'Initializable' || !inferTranspiledName(n)) {
     return n;
   } else {
     return n.replace(/(Upgradeable)?(?=\.|$)/, 'Upgradeable');
@@ -36,12 +36,12 @@ export interface Helpers extends Required<Options> {
 
 export function withHelpers(contract: Contract, opts: Options = {}): Helpers {
   const contractUpgradeable = contract.upgradeable;
-  const transformName = (n: ReferencedContract) => contractUpgradeable && inferTranspiled(n) ? upgradeableName(n.name) : n.name;
+  const transformName = (n: ReferencedContract) => contractUpgradeable ? upgradeableName(n.name) : n.name;
   return {
     upgradeable: contractUpgradeable,
     transformName,
     transformImport: p1 => {
-      const p2 = contractUpgradeable && inferTranspiled(p1) ? upgradeableImport(p1) : p1;
+      const p2 = contractUpgradeable ? upgradeableImport(p1) : p1;
       return opts.transformImport?.(p2) ?? p2;
     },
   };

From f342d53383c7e2bccfc182b14176b775bec8d0b2 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 15:22:03 -0500
Subject: [PATCH 11/18] Combine imports with same path

---
 packages/core/src/governor.test.ts.md   | 114 ++++++++----------------
 packages/core/src/governor.test.ts.snap | Bin 2463 -> 2433 bytes
 packages/core/src/print.ts              |  29 ++++--
 3 files changed, 62 insertions(+), 81 deletions(-)

diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index ecfdc8be..7a47daeb 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -14,11 +14,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -113,11 +111,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -208,10 +204,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -300,10 +294,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -393,11 +385,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -509,11 +499,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -612,11 +600,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -707,11 +693,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -802,10 +786,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -895,11 +877,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1010,11 +990,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1105,11 +1083,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1204,11 +1180,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1299,11 +1273,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {ICompoundTimelock} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
-    import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
+    import {ICompoundTimelock, GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1395,11 +1367,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1510,11 +1480,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1606,11 +1574,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1721,11 +1687,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1816,11 +1780,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
     import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
-    import {IVotes} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
-    import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
+    import {IVotes, GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
-    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
-    import {GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
+    import {TimelockControllerUpgradeable, GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index da4aaf4d3327b53bd9e403c85745eb789e3d4420..d9efb0e44579948b981fd64924a87acf578a82e8 100644
GIT binary patch
literal 2433
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

literal 2463
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

diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 27d7a7db..24d39ffe 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -1,6 +1,6 @@
 import 'array.prototype.flatmap/auto';
 
-import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag } from './contract';
+import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag, ParentContract } from './contract';
 import { Options, Helpers, withHelpers } from './options';
 
 import { formatLines, spaceBetween, Lines } from './utils/format-lines';
@@ -27,10 +27,7 @@ export function printContract(contract: Contract, opts?: Options): string {
         `pragma solidity ^${SOLIDITY_VERSION};`,
       ],
 
-      contract.imports.map(p => {
-        const importContract = helpers.transformImport(p);
-        return `import {${importContract.name}} from "${importContract.path}";`
-      }),
+      printImports(contract.imports, helpers),
 
       [
         ...printNatspecTags(contract.natspecTags),
@@ -249,3 +246,25 @@ function printArgument(arg: FunctionArgument, { transformName }: Helpers): strin
 function printNatspecTags(tags: NatspecTag[]): string[] {
   return tags.map(({ key, value }) => `/// ${key} ${value}`);
 }
+
+function printImports(imports: ParentContract[], helpers: Helpers): string[] {
+  // Combine imports by path
+  const pathMap = new Map<string, ParentContract[]>();
+  for (const imp of imports) {
+    const path = imp.path;
+    if (!pathMap.has(path)) {
+      pathMap.set(path, []);
+    }
+    pathMap.get(path)!.push(imp);
+  }
+
+  const lines: string[] = [];
+  for (const [_, contracts] of pathMap) {
+    const names = contracts.map(c => helpers.transformImport(c));
+    if (names.length > 0) {
+      // All contracts in each group should have the same path
+      lines.push(`import {${names.map(n => n.name).join(', ')}} from "${names[0]!.path}";`);
+    }
+  }
+  return lines;
+}
\ No newline at end of file

From babc2a576cd4cd0bf948f2147d5da7d8a8411b99 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 15:26:27 -0500
Subject: [PATCH 12/18] Simplify infer transpiled

---
 packages/core/src/contract.ts              | 1 -
 packages/core/src/governor.ts              | 2 --
 packages/core/src/infer-transpiled.test.ts | 9 ++-------
 packages/core/src/infer-transpiled.ts      | 8 +-------
 packages/core/src/options.ts               | 4 ++--
 packages/core/src/print.ts                 | 2 +-
 6 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/contract.ts b/packages/core/src/contract.ts
index c1ef0749..4648feb9 100644
--- a/packages/core/src/contract.ts
+++ b/packages/core/src/contract.ts
@@ -26,7 +26,6 @@ export interface ParentContract extends ReferencedContract {
 
 export interface ReferencedContract {
   name: string;
-  transpiled?: boolean;
 }
 
 export interface Using {
diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index d2fb2dd1..861a1704 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -254,7 +254,6 @@ function addVotes(c: ContractBuilder) {
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
-      transpiled: false,
     },
     name: tokenArg,
   });
@@ -325,7 +324,6 @@ const timelockModules = {
     timelockType: {
       name: 'ICompoundTimelock',
       path: `@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol`,
-      transpiled: false,
     },
     timelockParent: {
       name: 'GovernorTimelockCompound',
diff --git a/packages/core/src/infer-transpiled.test.ts b/packages/core/src/infer-transpiled.test.ts
index c6ead414..85f557ea 100644
--- a/packages/core/src/infer-transpiled.test.ts
+++ b/packages/core/src/infer-transpiled.test.ts
@@ -2,11 +2,6 @@ import test from 'ava';
 import { inferTranspiled } from './infer-transpiled';
 
 test('infer transpiled', t => {
-  t.true(inferTranspiled({ name: 'Foo' }));
-  t.true(inferTranspiled({ name: 'Foo', transpiled: true }));
-  t.false(inferTranspiled({ name: 'Foo', transpiled: false }));
-
-  t.false(inferTranspiled({ name: 'IFoo' }));
-  t.true(inferTranspiled({ name: 'IFoo', transpiled: true }));
-  t.false(inferTranspiled({ name: 'IFoo', transpiled: false }));
+  t.true(inferTranspiled('Foo'));
+  t.false(inferTranspiled('IFoo'));
 });
\ No newline at end of file
diff --git a/packages/core/src/infer-transpiled.ts b/packages/core/src/infer-transpiled.ts
index 64d64741..cc316e77 100644
--- a/packages/core/src/infer-transpiled.ts
+++ b/packages/core/src/infer-transpiled.ts
@@ -1,9 +1,3 @@
-import type { ReferencedContract } from "./contract";
-
-export function inferTranspiled(c: ReferencedContract): boolean {
-  return c.transpiled ?? inferTranspiledName(c.name);
-}
-
-export function inferTranspiledName(name: string): boolean {
+export function inferTranspiled(name: string): boolean {
   return !/^I[A-Z]/.test(name);
 }
\ No newline at end of file
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index f1482953..6c319fae 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -1,10 +1,10 @@
 import path from 'path';
 
 import type { Contract, ReferencedContract, ParentContract } from './contract';
-import { inferTranspiledName } from './infer-transpiled';
+import { inferTranspiled } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
-  if (n === 'Initializable' || !inferTranspiledName(n)) {
+  if (n === 'Initializable' || !inferTranspiled(n)) {
     return n;
   } else {
     return n.replace(/(Upgradeable)?(?=\.|$)/, 'Upgradeable');
diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 24d39ffe..7b95e4b5 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -131,7 +131,7 @@ function sortedFunctions(contract: Contract): SortedFunctions {
 }
 
 function printParentConstructor({ contract, params }: Parent, helpers: Helpers): [] | [string] {
-  const useTranspiled = helpers.upgradeable && inferTranspiled(contract);
+  const useTranspiled = helpers.upgradeable && inferTranspiled(contract.name);
   const fn = useTranspiled ? `__${contract.name}_init` : contract.name;
   if (useTranspiled || params.length > 0) {
     return [

From f3fa0d872e89ab703ba5937033e85ca116013d5b Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 15:45:08 -0500
Subject: [PATCH 13/18] Refactor

---
 packages/core/src/contract.ts   | 18 +++++++++---------
 packages/core/src/erc20.ts      |  5 ++++-
 packages/core/src/governor.ts   |  7 +++++--
 packages/core/src/options.ts    |  6 +++---
 packages/core/src/print.ts      |  6 +++---
 packages/core/src/stablecoin.ts | 10 ++++++++--
 6 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/contract.ts b/packages/core/src/contract.ts
index 4648feb9..f670b533 100644
--- a/packages/core/src/contract.ts
+++ b/packages/core/src/contract.ts
@@ -5,7 +5,7 @@ export interface Contract {
   license: string;
   parents: Parent[];
   natspecTags: NatspecTag[];
-  imports: ParentContract[];
+  imports: ImportContract[];
   functions: ContractFunction[];
   constructorCode: string[];
   constructorArgs: FunctionArgument[];
@@ -16,11 +16,11 @@ export interface Contract {
 export type Value = string | number | { lit: string } | { note: string, value: Value };
 
 export interface Parent {
-  contract: ParentContract;
+  contract: ImportContract;
   params: Value[];
 }
 
-export interface ParentContract extends ReferencedContract {
+export interface ImportContract extends ReferencedContract {
   path: string;
 }
 
@@ -29,7 +29,7 @@ export interface ReferencedContract {
 }
 
 export interface Using {
-  library: ParentContract;
+  library: ImportContract;
   usingFor: string;
 }
 
@@ -103,7 +103,7 @@ export class ContractBuilder implements Contract {
     });
   }
 
-  get imports(): ParentContract[] {
+  get imports(): ImportContract[] {
     return [...this.importFromMap.entries()].map(([name, path]) => ({ name, path }));
   }
 
@@ -115,15 +115,15 @@ export class ContractBuilder implements Contract {
     return [...this.variableSet];
   }
 
-  addParent(contract: ParentContract, params: Value[] = []): boolean {
+  addParent(contract: ImportContract, params: Value[] = []): boolean {
     const present = this.parentMap.has(contract.name);
     this.parentMap.set(contract.name, { contract, params });
-    this.addImportFrom(contract.name, contract.path);
+    this.addImportFrom(contract);
     return !present;
   }
 
-  addImportFrom(importName: string, from: string) {
-    this.importFromMap.set(importName, from);
+  addImportFrom(contract: ImportContract) {
+    this.importFromMap.set(contract.name, contract.path);
   }
 
   addOverride(parent: ReferencedContract, baseFn: BaseFunction, mutability?: FunctionMutability) {
diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index a7c9205c..b46e0185 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -184,7 +184,10 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportFrom('Nonces', '@openzeppelin/contracts/utils/Nonces.sol');
+  c.addImportFrom({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  });
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index 861a1704..63339b88 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -250,7 +250,10 @@ function addCounting(c: ContractBuilder) {
 function addVotes(c: ContractBuilder) {
   const tokenArg = '_token';
 
-  c.addImportFrom('IVotes', `@openzeppelin/contracts/governance/extensions/GovernorVotes.sol`);
+  c.addImportFrom({
+    name: 'IVotes',
+    path: `@openzeppelin/contracts/governance/extensions/GovernorVotes.sol`,
+  });
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
@@ -360,7 +363,7 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
   const timelockArg = '_timelock';
   const { timelockType, timelockParent } = timelockModules[timelock];
 
-  c.addImportFrom(timelockType.name, timelockType.path);
+  c.addImportFrom(timelockType);
   c.addConstructorArgument({
     type: timelockType,
     name: timelockArg,
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index 6c319fae..2c7b5f13 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-import type { Contract, ReferencedContract, ParentContract } from './contract';
+import type { Contract, ReferencedContract, ImportContract } from './contract';
 import { inferTranspiled } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
@@ -11,7 +11,7 @@ const upgradeableName = (n: string) => {
   }
 }
 
-const upgradeableImport = (p: ParentContract): ParentContract => {
+const upgradeableImport = (p: ImportContract): ImportContract => {
   const { dir, ext, name } = path.parse(p.path);
   // Use path.posix to get forward slashes
   return {
@@ -26,7 +26,7 @@ const upgradeableImport = (p: ParentContract): ParentContract => {
 };
 
 export interface Options {
-  transformImport?: (parent: ParentContract) => ParentContract;
+  transformImport?: (parent: ImportContract) => ImportContract;
 }
 
 export interface Helpers extends Required<Options> {
diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 7b95e4b5..9af50809 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -1,6 +1,6 @@
 import 'array.prototype.flatmap/auto';
 
-import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag, ParentContract } from './contract';
+import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag, ImportContract } from './contract';
 import { Options, Helpers, withHelpers } from './options';
 
 import { formatLines, spaceBetween, Lines } from './utils/format-lines';
@@ -247,9 +247,9 @@ function printNatspecTags(tags: NatspecTag[]): string[] {
   return tags.map(({ key, value }) => `/// ${key} ${value}`);
 }
 
-function printImports(imports: ParentContract[], helpers: Helpers): string[] {
+function printImports(imports: ImportContract[], helpers: Helpers): string[] {
   // Combine imports by path
-  const pathMap = new Map<string, ParentContract[]>();
+  const pathMap = new Map<string, ImportContract[]>();
   for (const imp of imports) {
     const path = imp.path;
     if (!pathMap.has(path)) {
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index e09fc940..adcad9f7 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -235,7 +235,10 @@ function addCustodian(c: ContractBuilder, access: Access) {
       break;
     }
     case 'managed': {
-      c.addImportFrom('AuthorityUtils', `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`);
+      c.addImportFrom({
+        name: 'AuthorityUtils',
+        path: `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`,
+      });
       const logic = [
         `(bool immediate,) = AuthorityUtils.canCallWithDelay(authority(), user, address(this), bytes4(_msgData()[0:4]));`,
         `return immediate;`
@@ -268,7 +271,10 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportFrom('Nonces', '@openzeppelin/contracts/utils/Nonces.sol');
+  c.addImportFrom({
+    name: 'Nonces',
+    path: '@openzeppelin/contracts/utils/Nonces.sol',
+  });
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);

From 1659f5026b71d80ea7037719892704134aae7148 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Tue, 19 Nov 2024 16:25:19 -0500
Subject: [PATCH 14/18] Sort imports by name

---
 packages/core/src/custom.test.ts.md        |   2 +-
 packages/core/src/custom.test.ts.snap      | Bin 826 -> 827 bytes
 packages/core/src/erc1155.test.ts.md       |  26 +++----
 packages/core/src/erc1155.test.ts.snap     | Bin 1788 -> 1784 bytes
 packages/core/src/erc20.test.ts.md         |  32 ++++----
 packages/core/src/erc20.test.ts.snap       | Bin 1945 -> 1960 bytes
 packages/core/src/erc721.test.ts.md        |  30 ++++----
 packages/core/src/erc721.test.ts.snap      | Bin 2137 -> 2140 bytes
 packages/core/src/governor.test.ts.md      |  84 ++++++++++-----------
 packages/core/src/governor.test.ts.snap    | Bin 2433 -> 2428 bytes
 packages/core/src/print.ts                 |   7 ++
 packages/core/src/stablecoin.test.ts.md    |  20 ++---
 packages/core/src/stablecoin.test.ts.snap  | Bin 1659 -> 1670 bytes
 packages/core/src/zip-foundry.test.ts.md   |  10 +--
 packages/core/src/zip-foundry.test.ts.snap | Bin 3459 -> 3459 bytes
 packages/core/src/zip-hardhat.test.ts.md   |   4 +-
 packages/core/src/zip-hardhat.test.ts.snap | Bin 2282 -> 2285 bytes
 17 files changed, 111 insertions(+), 104 deletions(-)

diff --git a/packages/core/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md
index a3291ee1..24d1c542 100644
--- a/packages/core/src/custom.test.ts.md
+++ b/packages/core/src/custom.test.ts.md
@@ -24,8 +24,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
     ␊
     contract MyContract is Pausable, Ownable {␊
         constructor(address initialOwner) Ownable(initialOwner) {}␊
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap
index 5f5f25e19fd8eb888e75bd01d29daa78bb273ae0..a1cf4e67d979c887d4540d92334ae4a828e1dc5c 100644
GIT binary patch
delta 769
zcmV+c1OEKF2D=6_K~_N^Q*L2!b7*gLAa*kf0|4_i@p@9;`9+6|kd$KvRX<`=o4X)K
za{7=Y@e6%uaVU{8NPkT%MX|V-v)}ps&U|yO`#mPS&-&XBG}JKcd!aTWpqdk@hr;MD
z*S=2-IsLxA_F`@Jm7cG?eD-zCb>aAM|Fn8QJ>(jzO&__TeTr%aTFn#3bzx5gk{H@!
z2qS8S(3Z$QqLj!ehdsfKBA(H3{-(B7+j68LgMfe*jQZ4!;eULq_O`aYU3VNWfkJDX
zTEW!0a*~vXl7yP{7|tbqR{CXS{j+qBS<^rYWnkJK@mX?L&{raWja?y;PZED_TAFr=
z=b_eag05-7HtLy=!=%DxPC`SOc2jiXWMTiPh7`65Nl=(N005rg+NjVoLY0Z{E7Te&
zr-l;N9&uEa6n|f~Pp4N-WZw_DXQ<#X;|0qVkYSHe4+Ll92%5y1ecc38k4}mXLcWTN
z43#>`CSw%Jfg(Oe#TiAomPE}6pC1%s4GKQQpfuxd(#Z-;S96uQQi;oP!oB5W$pBc`
zq@%9u!fvbqJ7SWC(bbS^(#I-cOpNjqGB+`mJT*RzCVwmogi0@<N#<z^L#gNaS!WhM
zpVt2;ehNy_xiP&<6k9-YP6|;vox|h543RIS;N~u)mI+SIeiI4~?|&X`?V%aw77@Gw
zs8pVEk-ABV-5Jal%6bk}C^|;pl2Mn0W+)V$q<za0<2Y&tl3{?{kQug;g`nJ^;)G=f
znS|b)Tz{Za)W_&xnwQUbq#)u{Fi5)RKc?m2qELf~X<6_BytZn1_1IR0+iu=Jd)u>?
znnFvJV7NfCOQ%*tn-9^@MwIDZoal;ewQQC&*TVjx#Xj~)$V|fzD7OS@pa?fdf?;|8
z-TOx8;H2BwZ#6%3kJ<<CHf^)HXR|ok0pVn@;6`?ym6{e4I}gW1D^77mCgOsWYuT>E
zNP=BH^o>|j&A4J)mgoQHufS!sxU$4uT2(Ng_L--B=4qd~w|(X}iO5y?<q!Y>1T1`~

delta 768
zcmV+b1ONQH2D%0^K~_N^Q*L2!b7*gLAa*kf0|3c3jaV+3JC!ON_Wy)g+4jm8cLA{E
zdZp}JrirtvXg-lLNPjh!*3jZ!&VJ|j`{vBK?)RARKI$*u&``s$?}gfkfND;p9txvB
zUHd*U<n-(M+OxIUS9-ek{K@Av*M;N5{nP3J^^j|<HhtuV_9?0zXf;n9*M&V1NMdM@
zA&jUQLR%t#k5VF|9QFh^ig-rD`K#JiZOf603<3gLFzQn?hJW*|+Uwf(cHMEj1PZNj
zY6Vm0%1KflN)l?)V>p-eS?PzB_4m>PW=#Vrl!57ClHC>bl?Y&CS4iZO#G#wkrrpp`
zrri`>(}Hc(Gbim4U&aUVJk;7v(20+Q{i7PvP@9n8Vd?+?c!F!ALeB_QCcdvwYoMGO
zN?3cuQB_iW*?&HrUOAC{KjfaFg2Rj#ELT8=Jw`ncoQ)%B5@+^x6HGliDLM%GGA=Sy
z>LgRfD3k+5e2j`Sif}E7nh`!P6k`bmS0R*U+)X-Jg6V3mGFK{bIZpIrIk`gs7B=aq
z>$<QT&ww2<NyF%B$TjI>l`tkod4<d=rjn<|r;)<4K!2$80-9u=rZALxo}YDQ@$+H*
zf8wWb$vZcu_laWP{hX6RluqaH_%}o33n{p{kJPe(le6E1g2RW`qdj|QhPh=3-T+iO
zo^p}8Nr~MV%pR2W9I8-sjJ_qKE(y(0C^|{|mL<k<)C?rU0J$MEY$Xdpxk1GV%MP*;
zdUJAtN`Fxwql0OFe8!T3h*QBJ>7M^DEe98c8bnOXf*0VWRl|!_ya0dWmH%UJd)87@
zXsHqm7mV!EsnyWtDjM2|GTn<4U9zo~%^l6Pu)k=rk9`s{)9?ezt${R9gqtJ5u)P1~
zZKHE=(rxUwn(w+t?SnU)w%OdXS(J7_I2kOsokeG*rp3h0>X>N7DK5!GT##}t+oc#u
yuy>2T5sy?euGp64`TzMVa9J&`EOD2X9hi^%%;P@uxX(P;KJyd9PG&9T5C8yyC4VRY

diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md
index fe69331b..1e1a7a79 100644
--- a/packages/core/src/erc1155.test.ts.md
+++ b/packages/core/src/erc1155.test.ts.md
@@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -72,8 +72,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -113,8 +113,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊
         constructor(address initialOwner)␊
@@ -137,8 +137,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊
         constructor(address initialOwner)␊
@@ -214,8 +214,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -267,8 +267,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -305,8 +305,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Supply {␊
         constructor(address initialOwner)␊
@@ -337,10 +337,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
@@ -420,10 +420,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
@@ -513,10 +513,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap
index 1b52fa93e3998992b00dec6a09454835631f3128..609422e60bd334f6beea165981e3fefea2aa38ce 100644
GIT binary patch
delta 1752
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

delta 1756
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

diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index c7503cd3..2fcc8e59 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, AccessControl, ERC20Permit {␊
@@ -428,8 +428,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -444,15 +444,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -520,15 +520,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -606,15 +606,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index afd5648a657b5a7634592299041565645c11a8f4..47f0669a62f4cd700bc2f73327bfa0ec3211e159 100644
GIT binary patch
literal 1960
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

literal 1945
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

diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md
index 4c986927..0e4a6e4a 100644
--- a/packages/core/src/erc721.test.ts.md
+++ b/packages/core/src/erc721.test.ts.md
@@ -237,8 +237,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
     import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, ERC721Burnable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -334,8 +334,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, AccessControl {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -370,8 +370,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -419,8 +419,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -453,8 +453,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -487,8 +487,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -530,14 +530,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -603,14 +603,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
@@ -684,12 +684,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap
index fd6cdcf75d0493996322ceb4064c8eff671f2446..130d22e5752dfb28647944c927148056e3e26fbc 100644
GIT binary patch
literal 2140
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
SZz0a3h4>FScmdcySpWcvXc}7p

literal 2137
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
PXd(U&>%Cc%KUn|(;baGd

diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index 7a47daeb..a01112d1 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -14,9 +14,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -111,9 +111,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -204,8 +204,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -294,8 +294,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -383,11 +383,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -499,9 +499,9 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -600,9 +600,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -693,9 +693,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -786,8 +786,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -875,11 +875,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -990,9 +990,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1083,9 +1083,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1180,9 +1180,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1273,9 +1273,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockCompound, ICompoundTimelock} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {ICompoundTimelock, GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1365,11 +1365,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1480,9 +1480,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1572,11 +1572,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1687,9 +1687,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes, GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
+    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {TimelockController, GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1780,9 +1780,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
     import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
-    import {IVotes, GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
+    import {GovernorTimelockControlUpgradeable, TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
+    import {GovernorVotesUpgradeable, IVotes} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
-    import {TimelockControllerUpgradeable, GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index d9efb0e44579948b981fd64924a87acf578a82e8..07dc72ae0de31a73db04bbd6e8133a9e965c90bc 100644
GIT binary patch
delta 2415
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

delta 2421
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

diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 9af50809..267e803f 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -248,6 +248,13 @@ function printNatspecTags(tags: NatspecTag[]): string[] {
 }
 
 function printImports(imports: ImportContract[], helpers: Helpers): string[] {
+  // Sort imports by name
+  imports.sort((a, b) => {
+    if (a.name < b.name) return -1;
+    if (a.name > b.name) return 1;
+    return 0;
+  });
+
   // Combine imports by path
   const pathMap = new Map<string, ImportContract[]>();
   for (const imp of imports) {
diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md
index 20ad0158..da4c4d4d 100644
--- a/packages/core/src/stablecoin.test.ts.md
+++ b/packages/core/src/stablecoin.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, AccessControl, ERC20Permit {␊
@@ -312,8 +312,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Custodian, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -347,8 +347,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Allowlist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -393,8 +393,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Blocklist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -555,8 +555,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap
index bbc71162a2e38b6d0e81c0e160232629952ce6f8..d7bbd19526a90570609e5035851fa5285a0ff5db 100644
GIT binary patch
delta 1582
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

delta 1571
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
VnVfP);x#;s{vUuG+qm#R0039z3<>}M

diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 137cc5de..21cd19cf 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -122,14 +122,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -330,9 +330,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
@@ -521,8 +521,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -853,8 +853,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index 52265f82a4b318ece87b34b09d40d5d607a59902..5a941ec662850faa8440ef0625e5069a89cc273a 100644
GIT binary patch
literal 3459
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

literal 3459
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

diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index 29e5004b..2b89bb88 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -13,14 +13,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index 8628e95395044f6c5b0946de712aeb914a4f9d47..d90eca646e921c755fb64e85ec9b5a479f614102 100644
GIT binary patch
delta 2199
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
ZhZWx*W)Lw`e$7fX{s)=K47ji}003@DN9h0n

delta 2222
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


From 438d888b95a54e4cc8a62a80b4c854cb3ccc25e8 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 20 Nov 2024 08:37:45 -0500
Subject: [PATCH 15/18] Revert to import from different files

---
 packages/core/src/contract.ts              |  18 +-
 packages/core/src/custom.test.ts.md        |   2 +-
 packages/core/src/custom.test.ts.snap      | Bin 827 -> 826 bytes
 packages/core/src/erc1155.test.ts.md       |  26 +--
 packages/core/src/erc1155.test.ts.snap     | Bin 1784 -> 1788 bytes
 packages/core/src/erc20.test.ts.md         |  32 +--
 packages/core/src/erc20.test.ts.snap       | Bin 1960 -> 1945 bytes
 packages/core/src/erc20.ts                 |   4 +-
 packages/core/src/erc721.test.ts.md        |  30 +--
 packages/core/src/erc721.test.ts.snap      | Bin 2140 -> 2137 bytes
 packages/core/src/governor.test.ts.md      | 228 +++++++--------------
 packages/core/src/governor.test.ts.snap    | Bin 2428 -> 2079 bytes
 packages/core/src/governor.ts              |  13 +-
 packages/core/src/infer-transpiled.test.ts |   9 +-
 packages/core/src/infer-transpiled.ts      |   6 +-
 packages/core/src/options.ts               |   6 +-
 packages/core/src/print.ts                 |  38 +---
 packages/core/src/stablecoin.test.ts.md    |  20 +-
 packages/core/src/stablecoin.test.ts.snap  | Bin 1670 -> 1659 bytes
 packages/core/src/stablecoin.ts            |   6 +-
 packages/core/src/zip-foundry.test.ts.md   |  10 +-
 packages/core/src/zip-foundry.test.ts.snap | Bin 3459 -> 3459 bytes
 packages/core/src/zip-hardhat.test.ts.md   |   4 +-
 packages/core/src/zip-hardhat.test.ts.snap | Bin 2285 -> 2282 bytes
 24 files changed, 183 insertions(+), 269 deletions(-)

diff --git a/packages/core/src/contract.ts b/packages/core/src/contract.ts
index f670b533..e7142d54 100644
--- a/packages/core/src/contract.ts
+++ b/packages/core/src/contract.ts
@@ -18,6 +18,7 @@ export type Value = string | number | { lit: string } | { note: string, value: V
 export interface Parent {
   contract: ImportContract;
   params: Value[];
+  importOnly?: boolean;
 }
 
 export interface ImportContract extends ReferencedContract {
@@ -26,6 +27,7 @@ export interface ImportContract extends ReferencedContract {
 
 export interface ReferencedContract {
   name: string;
+  transpiled?: boolean;
 }
 
 export interface Using {
@@ -77,6 +79,7 @@ export class ContractBuilder implements Contract {
   license: string = 'MIT';
   upgradeable = false;
 
+  readonly using: Using[] = [];
   readonly natspecTags: NatspecTag[] = [];
 
   readonly constructorArgs: FunctionArgument[] = [];
@@ -84,7 +87,6 @@ export class ContractBuilder implements Contract {
   readonly variableSet: Set<string> = new Set();
 
   private parentMap: Map<string, Parent> = new Map<string, Parent>();
-  private importFromMap: Map<string, string> = new Map<string, string>();
   private functionMap: Map<string, ContractFunction> = new Map();
 
   constructor(name: string) {
@@ -92,7 +94,7 @@ export class ContractBuilder implements Contract {
   }
 
   get parents(): Parent[] {
-    return [...this.parentMap.values()].sort((a, b) => {
+    return [...this.parentMap.values()].filter(p => !p.importOnly).sort((a, b) => {
       if (a.contract.name === 'Initializable') {
         return -1;
       } else if (b.contract.name === 'Initializable') {
@@ -104,7 +106,10 @@ export class ContractBuilder implements Contract {
   }
 
   get imports(): ImportContract[] {
-    return [...this.importFromMap.entries()].map(([name, path]) => ({ name, path }));
+    return [
+      ...[...this.parentMap.values()].map(p => p.contract),
+      ...this.using.map(u => u.library),
+    ];
   }
 
   get functions(): ContractFunction[] {
@@ -118,12 +123,13 @@ export class ContractBuilder implements Contract {
   addParent(contract: ImportContract, params: Value[] = []): boolean {
     const present = this.parentMap.has(contract.name);
     this.parentMap.set(contract.name, { contract, params });
-    this.addImportFrom(contract);
     return !present;
   }
 
-  addImportFrom(contract: ImportContract) {
-    this.importFromMap.set(contract.name, contract.path);
+  addImportOnly(contract: ImportContract): boolean {
+    const present = this.parentMap.has(contract.name);
+    this.parentMap.set(contract.name, { contract, params: [], importOnly: true });
+    return !present;
   }
 
   addOverride(parent: ReferencedContract, baseFn: BaseFunction, mutability?: FunctionMutability) {
diff --git a/packages/core/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md
index 24d1c542..a3291ee1 100644
--- a/packages/core/src/custom.test.ts.md
+++ b/packages/core/src/custom.test.ts.md
@@ -24,8 +24,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyContract is Pausable, Ownable {␊
         constructor(address initialOwner) Ownable(initialOwner) {}␊
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap
index a1cf4e67d979c887d4540d92334ae4a828e1dc5c..5f5f25e19fd8eb888e75bd01d29daa78bb273ae0 100644
GIT binary patch
delta 768
zcmV+b1ONQH2D%0^K~_N^Q*L2!b7*gLAa*kf0|3c3jaV+3JC!ON_Wy)g+4jm8cLA{E
zdZp}JrirtvXg-lLNPjh!*3jZ!&VJ|j`{vBK?)RARKI$*u&``s$?}gfkfND;p9txvB
zUHd*U<n-(M+OxIUS9-ek{K@Av*M;N5{nP3J^^j|<HhtuV_9?0zXf;n9*M&V1NMdM@
zA&jUQLR%t#k5VF|9QFh^ig-rD`K#JiZOf603<3gLFzQn?hJW*|+Uwf(cHMEj1PZNj
zY6Vm0%1KflN)l?)V>p-eS?PzB_4m>PW=#Vrl!57ClHC>bl?Y&CS4iZO#G#wkrrpp`
zrri`>(}Hc(Gbim4U&aUVJk;7v(20+Q{i7PvP@9n8Vd?+?c!F!ALeB_QCcdvwYoMGO
zN?3cuQB_iW*?&HrUOAC{KjfaFg2Rj#ELT8=Jw`ncoQ)%B5@+^x6HGliDLM%GGA=Sy
z>LgRfD3k+5e2j`Sif}E7nh`!P6k`bmS0R*U+)X-Jg6V3mGFK{bIZpIrIk`gs7B=aq
z>$<QT&ww2<NyF%B$TjI>l`tkod4<d=rjn<|r;)<4K!2$80-9u=rZALxo}YDQ@$+H*
zf8wWb$vZcu_laWP{hX6RluqaH_%}o33n{p{kJPe(le6E1g2RW`qdj|QhPh=3-T+iO
zo^p}8Nr~MV%pR2W9I8-sjJ_qKE(y(0C^|{|mL<k<)C?rU0J$MEY$Xdpxk1GV%MP*;
zdUJAtN`Fxwql0OFe8!T3h*QBJ>7M^DEe98c8bnOXf*0VWRl|!_ya0dWmH%UJd)87@
zXsHqm7mV!EsnyWtDjM2|GTn<4U9zo~%^l6Pu)k=rk9`s{)9?ezt${R9gqtJ5u)P1~
zZKHE=(rxUwn(w+t?SnU)w%OdXS(J7_I2kOsokeG*rp3h0>X>N7DK5!GT##}t+oc#u
yuy>2T5sy?euGp64`TzMVa9J&`EOD2X9hi^%%;P@uxX(P;KJyd9PG&9T5C8yyC4VRY

delta 769
zcmV+c1OEKF2D=6_K~_N^Q*L2!b7*gLAa*kf0|4_i@p@9;`9+6|kd$KvRX<`=o4X)K
za{7=Y@e6%uaVU{8NPkT%MX|V-v)}ps&U|yO`#mPS&-&XBG}JKcd!aTWpqdk@hr;MD
z*S=2-IsLxA_F`@Jm7cG?eD-zCb>aAM|Fn8QJ>(jzO&__TeTr%aTFn#3bzx5gk{H@!
z2qS8S(3Z$QqLj!ehdsfKBA(H3{-(B7+j68LgMfe*jQZ4!;eULq_O`aYU3VNWfkJDX
zTEW!0a*~vXl7yP{7|tbqR{CXS{j+qBS<^rYWnkJK@mX?L&{raWja?y;PZED_TAFr=
z=b_eag05-7HtLy=!=%DxPC`SOc2jiXWMTiPh7`65Nl=(N005rg+NjVoLY0Z{E7Te&
zr-l;N9&uEa6n|f~Pp4N-WZw_DXQ<#X;|0qVkYSHe4+Ll92%5y1ecc38k4}mXLcWTN
z43#>`CSw%Jfg(Oe#TiAomPE}6pC1%s4GKQQpfuxd(#Z-;S96uQQi;oP!oB5W$pBc`
zq@%9u!fvbqJ7SWC(bbS^(#I-cOpNjqGB+`mJT*RzCVwmogi0@<N#<z^L#gNaS!WhM
zpVt2;ehNy_xiP&<6k9-YP6|;vox|h543RIS;N~u)mI+SIeiI4~?|&X`?V%aw77@Gw
zs8pVEk-ABV-5Jal%6bk}C^|;pl2Mn0W+)V$q<za0<2Y&tl3{?{kQug;g`nJ^;)G=f
znS|b)Tz{Za)W_&xnwQUbq#)u{Fi5)RKc?m2qELf~X<6_BytZn1_1IR0+iu=Jd)u>?
znnFvJV7NfCOQ%*tn-9^@MwIDZoal;ewQQC&*TVjx#Xj~)$V|fzD7OS@pa?fdf?;|8
z-TOx8;H2BwZ#6%3kJ<<CHf^)HXR|ok0pVn@;6`?ym6{e4I}gW1D^77mCgOsWYuT>E
zNP=BH^o>|j&A4J)mgoQHufS!sxU$4uT2(Ng_L--B=4qd~w|(X}iO5y?<q!Y>1T1`~

diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md
index 1e1a7a79..fe69331b 100644
--- a/packages/core/src/erc1155.test.ts.md
+++ b/packages/core/src/erc1155.test.ts.md
@@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -72,8 +72,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -113,8 +113,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊
         constructor(address initialOwner)␊
@@ -137,8 +137,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊
         constructor(address initialOwner)␊
@@ -214,8 +214,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -267,8 +267,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -305,8 +305,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Supply {␊
         constructor(address initialOwner)␊
@@ -337,10 +337,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
@@ -420,10 +420,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
@@ -513,10 +513,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap
index 609422e60bd334f6beea165981e3fefea2aa38ce..1b52fa93e3998992b00dec6a09454835631f3128 100644
GIT binary patch
delta 1756
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

delta 1752
zcmV;}1}FLa4fqW*K~_N^Q*L2!b7*gLAa*kf0|3Bmr4qlVeK8c?{H@DYKcACGO2~U*
zZazwpwB%nL9ZQiiB7f2dsm`UvC~1siqf$hz@$T3jvOBY#nXThQLE;DW7x2_RA>MdG
z`~k!(NW8-@0qte>?n@HK8;A9a<DJ=a+4<(2@0{7Z>9lpK9`e_3k-$Pns0}$*F(=UE
zJu3M3Z!`@G_|>gP3pd`mVSjGkx$*w3m0OAe4r<%amUpp=2!BV*RSgk=I~cKtV6WOJ
zC<@r3h6x33>j?C*=z)C`k>|)Xk&X%2qC_yL3JzYZmG77D7fc4b1_YeySi@ofUfeH#
zQeIu%C={?^QYOI3PJL@-Wo_*gbQm?j;v;Gza_q@dR4Gpp^birnn=HS}oa&1kzNq~^
zfo&a)69rWjaXhYgvppFFIS%#)4O<t$9C&I<z?%zB3IG70Qo;qZR6$u0Y8peF15B{M
zP~Yzp#Fm^{_Qw-YT<i&9@`sa;0T_Sv-Vq~PD~+{Eqh`EZ<?u18?5zyU$IsR`Nrm^f
zw9huzKi~Rxx1uZtN<8C=NfS;^3(j}PBC5cY0FFenUM+ILFzEsV8I%nGL4AwiC16@@
z9jky6ec;IOytO|q??!LxhBI(lI4yVpGaP_{4*{b(;z^(_{1XA%p9>iPt>S+yyK^Je
zC&WnPo*3Gu0Nl}_izxRNqdgFaf3zys%0VI|0yOK@*1=Aru~To=_jh-|r{EB&Dm+|W
zdr(}A4K6Ni6o%qhLmg=8qM{j?%n-*RsC5}6qE2;G+}?RyY3?>!mF>OiQ^)jD)IN#B
z^MTya5qmaE<3aCyDGF%x5a@qUU8j9pjnvKoWC+k#h%u}o4j6iAVTLr&9)JT6oaMN|
zmT5zZSBXHZ165RXmic3V<%OyitcB}=|ML|_egB8lTTBO0AcP@dF~UKyP37g2*r06|
zV&$Z9VXG36fXYZ<Kmxl+OG!F75(}PZk#yXrvgevOVJvVRVoK!RY+`?cr+j=ms#u~&
z85V;Xr=*CP#dKrNm7Ex|hgIP_KS_2n2?dsEgU<$##c&doH?;^Tn>Xi^35^0z3R-3v
z;6v-tYg^2rEGfa^m&iK&IOmMiySnN5dp42iNFc)PoT9|!%$oO>K+J%g2oDK0Jri0y
z9oo0Qj6nOz?P~$;n&*G-MWHR_WCm?%Ko0E`y6X$K;f;!;<#=<_1z2Pf5&o>pBi${B
z5g>nYZGe@4{3U1!SeS^_wFh5+BOfBxc*@mRP`3~dmdc^W1nMJ5c?@!K{_PTPX`pME
zZIGkiQ<sc91|}js@+|xmi9A1KQGMrap6e0<Y@GSe1F9;ui12^61;ASHH#FQar<#>!
z*oYij%=$*fn*y#<smxX)g*)<wTe=B_+AE%8Tf6f4)U0<6@wc%rK4O1RvdG;$yr*{O
z@5rwH<4)dF%eJRBO4eTWX}X-yz{GvIAWa!gvYC@UUF@!q=OyV#b`8Cmg}1oxiRU^u
zp>85iCJK9bOLc!#OO=Ik!O*Vi!e5bW@LP5#EO}S;T6a}v7cB#;<}yT%HvepNklG<b
z9{?M|hnRFz_W$pZ{r~Hn*LdF51IO))_Lf{JnRS+2^?6Zw*~h3?prhk1^;G&fM;~-7
zT?dxgWl%#-`WFlmZbD{n<U{~?_q|8}__vUCIoJ#=AG3eSmP1aaR*4}|>2czmx>6(2
zSY`4MWGYIBAM%W~L$(hu$&M89F*~Ym(7?xMRc$hQG*B#ob*@B&jEb+3iT;iYSr=pG
zk&)p(CC;`&V>4_J)GEz`R5_u6sWurDMFEdgiwkNzq{ni3__9Sf?4V_6N91s}N**4E
zW4wl)=jwm25n_DU2>|xzjA?E-M*wVivm+41!rUulRm)r2mOb@S5^1Qj(TbqYRT&wN
zVQ}~ii9~<K^qMXqG?lyuJXhVBl*6OAUrQG|iyA2|{ah;V9bK#5QFc6X!jyFpemSc)
z*+hAH2F)`o!J;k8OgT-t_j80kzrB~!=bS#zDSdyI3YyK@!8yGPtB8rYVjR5$V)k8A
z(mv9s+LL-^JKdx3(A<;%;J0V;|FRqiX2hU>H4BE=#0Vlw!9wQMMP6N8&FUhk44`}1
zb}SQ+?-N1&s$uHLKtw=$?kLvp!!^7Uf*T~2j<n(P3Ma2{(kq;!rBMe3Ze=p`wSl{@
zBV}CAcXzXXZQx>MPwLwQdHIu<KUb{$Ng{LF<<C`O_=z`FQn-57Jl$InS7pNBS@HJN
u40fq6@WeQ3x}dZ1+;kZklH2@6qRXJMF|$C<Trd8=JpTduuzGj7MF0Rg*;4ob

diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index 2fcc8e59..c7503cd3 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, AccessControl, ERC20Permit {␊
@@ -428,8 +428,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -444,15 +444,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -520,15 +520,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -606,15 +606,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index 47f0669a62f4cd700bc2f73327bfa0ec3211e159..afd5648a657b5a7634592299041565645c11a8f4 100644
GIT binary patch
literal 1945
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

literal 1960
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

diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index b46e0185..cdf83045 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -184,10 +184,10 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportFrom({
+  c.addImportOnly({
     name: 'Nonces',
     path: '@openzeppelin/contracts/utils/Nonces.sol',
-  });
+  })
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md
index 0e4a6e4a..4c986927 100644
--- a/packages/core/src/erc721.test.ts.md
+++ b/packages/core/src/erc721.test.ts.md
@@ -237,8 +237,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
     import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
+    import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, ERC721Burnable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -334,8 +334,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
     contract MyToken is ERC721, AccessControl {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -370,8 +370,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
     contract MyToken is ERC721, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -419,8 +419,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -453,8 +453,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -487,8 +487,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -530,14 +530,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -603,14 +603,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
@@ -684,12 +684,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap
index 130d22e5752dfb28647944c927148056e3e26fbc..fd6cdcf75d0493996322ceb4064c8eff671f2446 100644
GIT binary patch
literal 2137
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
PXd(U&>%Cc%KUn|(;baGd

literal 2140
zcmV-i2&4BwRzV<BZeeh9Xm4~Nb~6eC03u8fyoAe%fdyT$7OqUUy}LP$x8G+gBN@x4
z{a%`o%O8sf00000000B+Tf1)~MHs(a4uK2>^hk^>3P-WM7enCgqLc6?Ibn!N$T<io
zu*SRNc*yR|-pp(g-{}g(pFlx@D4?J~NK`Zw&>$fsprqj+fe!6^XLs!Q5hr%oG*PlM
z-($Y-_q}%Zt8T}n`Vs%^Yb3BR5$ZsWb<7F0d5;SI$ybH}1^i&?`Q>X*Uvqz!p1StJ
z^`#|E0}uAL-mmOn9TAQy4FeH@yBM)MpxI~@G!1N0%Z37XOaxA_=z(1ukq?n=BNG#_
zNr_-k7aV-FUcFhpS+E&Av>@Qr#0D09@X^ict!k~dQ7B-`rc8jx+xwfZ*VdkZE~6GG
zzCmq79tGqyJtU_IdW4APuMK`xIW>zLg+jOpH2W=g6~G+$E5PFd008KeaKRj1P*z$A
z9+is0>S7rbo2|EtE8y{y!jnR9V7(6H2sjKY&g>WI%zpU4pP9G3>kwUFN<iB^xP$#h
zX$4>+5F^k8w!;vh$A~d(Ai$7t7~!DA1;gYJSjeKRzY_3ufBY4o*b~C$cQow~3UmVd
zRT~p1U{yD%V`$j!a_wD9-@DyAWn^=$wO()SSr2O*-beN3THn6^{_T6D&QCUtH}Bnk
zYxCosx>nrqcqHunF(QtI80?rRYv~)SlBHj~v4EDA>1;>Zjztlj3Pd=jgllO!XFF6G
zr1wnbVwwh8Jp{VcH0g=!IHAvR02BVj0YeWR%#Z;(eefVS*=pKN9ov8cm7rlT#5oYO
z3>-{EZT&UisopTkAbbcN(OZeUGj!|dA0g+`AbnR-p3OnX*ME}neD2tYRYMtF*<zVo
zSwc5X>4b^S5aj3{G$GMr<)E%phX`N8wc0Ik3{3}3uTd;_AaF*2kg?BDEjD*-*F|~5
zm7)uERO<8v;;;H*x&LSwv8=Y!F|i)~d5qD?REFqKY7VtRR=lKKnSgTSFbue$3?3>X
z%Cas+l-BaXN0fv8#sgp5=^{!@XY_~?@0o*$;;H8*zEl{Q%5`H66|O7i&tX0s$rj3V
zNk|;3&Uqv8*uq43>1GuS1?7!zBv5|7_-TG-pbXjUo{&+B2&n6bb1hgs39!o`*sMT!
znBFkK0z-56gdi6C)gbgo3j)HW?DkAi%V8HaF%iSd1qqL?%MHW|C1&5_mvZ-Z#3+&T
z1JCxKBhgA>x$JS00G-FRs~p!(UseY;unN5T%R)pzQxWF=l)~K4d6=8uFc)IYX80Hi
z1lk0h`p9n>8-;m`gxSCsfG7@h3Exk}5pY-1Zgq7d4~Ka;96cQNIu0Z1`OVU&Qp6LB
zIH{BA+zWJ_F5ZPyMvqkCj>!kA$Dx_ds>YZ9l8pB2;<v~%G1@$K;Zu7{9<Hx`xVE9g
z)!};iTM7AJEI#u00$ryAWk}^>i_?(ne01Qh*PznSy0RUtQKQHqqmYPJ&8~pFfHx1J
z>1OucAx3l9ie}M#{TT_(|1NUzH8ZHq1GGjNZVgAxkTxyhD|TXR!KjJ2A_M#;`OJ@(
zkpb$S5xtGn9MR&^9%Uw&$*cM@kQfIh@v4JYYN5qEr-DR)X5*dK_I`VRcV`>i1xHBN
z;Zbe<wNf$hptv$*x?rF#bWBk<EKK4MWqDC)SX~!8${~Y9>{An!wzlur4|ZDZ`c|{?
zj>ozz(NA{y@velV<&g1!qG?>GPSal**}>00Ma;0`lN{y($~~3<y#)z8M1~?&tVysh
zUcWThH+>ODguSm2)1<u@5C4Gi*-51Ch#qBF^v6gf5{r_W&~zz<A-84HMWn$PIVJgy
zZ|Ly*`j+Hk>zCnT3s#LR(hT|n2F?kuL&sDo%a`vYC;ReJ8ra6(>ua^Me8Umg<eJX<
zwxEX$+P%K!Z#?JdCDVD&J+|q3VUNT}O{}L**b#Z##v4cZ1f&OR3w#^RJAtcm5iOz2
zq<7FFFmn&gU=?^brio*95X+&RLpz7|!bAIE2yKBa#09i$#jS{+Bw&AkDYqhWU|$HZ
zBQMt7P#=$i-IiJLeS+)BuijF8nBYGsc?qK$`Br8iz^U28L{tpyO=Bx=(OEGuL7pHL
z0xeXr@F_BM$dN4I=FaZs+wJD=)^;rAq+d~3)IfJ5DT@m|+0H}VfKYe(V%ITE;Mj)@
z8p!M71cQXzkh$S26ZQ&!NMY}%!li}1gIMG<!b~Nh-QZ}Lpr?LSJ{dnnygZ9j_!|5?
zI1aoHaF!79#}6|RLrH$<yU>}4p&&juo6SUmH02cghCkN8kH+O{GkV$&yj>!q9tusU
zn>;JZs-aBVk~q<2f_QKC`y0hWh2^3_lw!HU?Zdi3u{v#(AkJ!<2HwyeE~s^fJ_-+l
zR~+Kbe=5*ThRKpcQGz5Ul|g!sP6IJM=p{6c)~Ls2i3Kc7`w32MU#qseDqH<*WERE;
z?{85o36Ec~ATWaeL=rPgCNztRk7t~$%xfx%J%dR^=ISEAMZGg!sM_pY5U<ATqE~w3
z9*tW6IseRZR3$IqZKIPZf*r?J4C<f#TdID4e>Sgv^XfORe)H;g_$eM7>^+!}MN*Lz
znX6S|mqALsyyi|XnfsdCf10vmUX`bcM(AIHc@zRA;!4m-!?I2PE{eN$SivZL37o91
zq`MD!FOc^Fc`q>DXVNbzn}K2X5TAQmY773kjJ80!Z#P{%qr9Ftq(;melDr|w8<O*B
zNUl<=FerZf?;3{q+VfmB4U&DN)*%*nq1p%ajqvgM2Q`iJY#=7Mw?2ywA{HZWA@UX?
SZz0a3h4>FScmdcySpWcvXc}7p

diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index a01112d1..6e56da73 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -14,9 +14,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -111,9 +113,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -204,8 +208,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -294,8 +300,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -383,11 +391,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -499,9 +509,11 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -600,9 +612,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -693,9 +707,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -786,8 +802,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -875,11 +893,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -990,9 +1010,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1083,9 +1105,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1180,9 +1204,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1273,9 +1299,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockCompound, ICompoundTimelock} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
+    import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1365,11 +1393,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1480,9 +1510,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1572,11 +1604,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1687,9 +1721,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {GovernorTimelockControl, TimelockController} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
-    import {GovernorVotes, IVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1769,115 +1805,3 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     `
-
-## governor with erc20votes, upgradable
-
-> Snapshot 1
-
-    `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.22;␊
-    ␊
-    import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
-    import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
-    import {GovernorTimelockControlUpgradeable, TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
-    import {GovernorVotesUpgradeable, IVotes} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
-    import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
-    ␊
-    contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
-        constructor() {␊
-            _disableInitializers();␊
-        }␊
-    ␊
-        function initialize(IVotes _token, TimelockControllerUpgradeable _timelock, address initialOwner)␊
-            initializer public␊
-        {␊
-            __Governor_init("MyGovernor");␊
-            __GovernorCountingSimple_init();␊
-            __GovernorVotes_init(_token);␊
-            __GovernorVotesQuorumFraction_init(4);␊
-            __GovernorTimelockControl_init(_timelock);␊
-            __Ownable_init(initialOwner);␊
-            __UUPSUpgradeable_init();␊
-        }␊
-    ␊
-        function votingDelay() public pure override returns (uint256) {␊
-            return 50400; // 1 week␊
-        }␊
-    ␊
-        function votingPeriod() public pure override returns (uint256) {␊
-            return 50400; // 1 week␊
-        }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            onlyOwner␊
-            override␊
-        {}␊
-    ␊
-        // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(GovernorUpgradeable, GovernorVotesQuorumFractionUpgradeable)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
-    ␊
-        function state(uint256 proposalId)␊
-            public␊
-            view␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-            returns (ProposalState)␊
-        {␊
-            return super.state(proposalId);␊
-        }␊
-    ␊
-        function proposalNeedsQueuing(uint256 proposalId)␊
-            public␊
-            view␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-            returns (bool)␊
-        {␊
-            return super.proposalNeedsQueuing(proposalId);␊
-        }␊
-    ␊
-        function _queueOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
-            internal␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-            returns (uint48)␊
-        {␊
-            return super._queueOperations(proposalId, targets, values, calldatas, descriptionHash);␊
-        }␊
-    ␊
-        function _executeOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
-            internal␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-        {␊
-            super._executeOperations(proposalId, targets, values, calldatas, descriptionHash);␊
-        }␊
-    ␊
-        function _cancel(address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
-            internal␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-            returns (uint256)␊
-        {␊
-            return super._cancel(targets, values, calldatas, descriptionHash);␊
-        }␊
-    ␊
-        function _executor()␊
-            internal␊
-            view␊
-            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
-            returns (address)␊
-        {␊
-            return super._executor();␊
-        }␊
-    }␊
-    `
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index 07dc72ae0de31a73db04bbd6e8133a9e965c90bc..9bc66e9ab4ff824c7d4f598ae7d31292b09d5d17 100644
GIT binary patch
literal 2079
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
JJcoPm002NT>1zN0

literal 2428
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

diff --git a/packages/core/src/governor.ts b/packages/core/src/governor.ts
index 63339b88..4591cdfd 100644
--- a/packages/core/src/governor.ts
+++ b/packages/core/src/governor.ts
@@ -250,13 +250,15 @@ function addCounting(c: ContractBuilder) {
 function addVotes(c: ContractBuilder) {
   const tokenArg = '_token';
 
-  c.addImportFrom({
+  c.addImportOnly({
     name: 'IVotes',
-    path: `@openzeppelin/contracts/governance/extensions/GovernorVotes.sol`,
+    path: `@openzeppelin/contracts/governance/utils/IVotes.sol`,
+    transpiled: false,
   });
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
+      transpiled: false,
     },
     name: tokenArg,
   });
@@ -316,7 +318,7 @@ const timelockModules = {
   openzeppelin: {
     timelockType: {
       name: 'TimelockController',
-      path: `@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol`,
+      path: `@openzeppelin/contracts/governance/TimelockController.sol`,
     },
     timelockParent: {
       name: 'GovernorTimelockControl',
@@ -326,7 +328,8 @@ const timelockModules = {
   compound: {
     timelockType: {
       name: 'ICompoundTimelock',
-      path: `@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol`,
+      path: `@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol`,
+      transpiled: false,
     },
     timelockParent: {
       name: 'GovernorTimelockCompound',
@@ -363,7 +366,7 @@ function addTimelock(c: ContractBuilder, { timelock }: Required<GovernorOptions>
   const timelockArg = '_timelock';
   const { timelockType, timelockParent } = timelockModules[timelock];
 
-  c.addImportFrom(timelockType);
+  c.addImportOnly(timelockType);
   c.addConstructorArgument({
     type: timelockType,
     name: timelockArg,
diff --git a/packages/core/src/infer-transpiled.test.ts b/packages/core/src/infer-transpiled.test.ts
index 85f557ea..c6ead414 100644
--- a/packages/core/src/infer-transpiled.test.ts
+++ b/packages/core/src/infer-transpiled.test.ts
@@ -2,6 +2,11 @@ import test from 'ava';
 import { inferTranspiled } from './infer-transpiled';
 
 test('infer transpiled', t => {
-  t.true(inferTranspiled('Foo'));
-  t.false(inferTranspiled('IFoo'));
+  t.true(inferTranspiled({ name: 'Foo' }));
+  t.true(inferTranspiled({ name: 'Foo', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', transpiled: false }));
+
+  t.false(inferTranspiled({ name: 'IFoo' }));
+  t.true(inferTranspiled({ name: 'IFoo', transpiled: true }));
+  t.false(inferTranspiled({ name: 'IFoo', transpiled: false }));
 });
\ No newline at end of file
diff --git a/packages/core/src/infer-transpiled.ts b/packages/core/src/infer-transpiled.ts
index cc316e77..52eeba67 100644
--- a/packages/core/src/infer-transpiled.ts
+++ b/packages/core/src/infer-transpiled.ts
@@ -1,3 +1,5 @@
-export function inferTranspiled(name: string): boolean {
-  return !/^I[A-Z]/.test(name);
+import type { ReferencedContract } from "./contract";
+
+export function inferTranspiled(c: ReferencedContract): boolean {
+  return c.transpiled ?? !/^I[A-Z]/.test(c.name);
 }
\ No newline at end of file
diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts
index 2c7b5f13..b86fe6c4 100644
--- a/packages/core/src/options.ts
+++ b/packages/core/src/options.ts
@@ -4,7 +4,7 @@ import type { Contract, ReferencedContract, ImportContract } from './contract';
 import { inferTranspiled } from './infer-transpiled';
 
 const upgradeableName = (n: string) => {
-  if (n === 'Initializable' || !inferTranspiled(n)) {
+  if (n === 'Initializable') {
     return n;
   } else {
     return n.replace(/(Upgradeable)?(?=\.|$)/, 'Upgradeable');
@@ -36,12 +36,12 @@ export interface Helpers extends Required<Options> {
 
 export function withHelpers(contract: Contract, opts: Options = {}): Helpers {
   const contractUpgradeable = contract.upgradeable;
-  const transformName = (n: ReferencedContract) => contractUpgradeable ? upgradeableName(n.name) : n.name;
+  const transformName = (n: ReferencedContract) => contractUpgradeable && inferTranspiled(n) ? upgradeableName(n.name) : n.name;
   return {
     upgradeable: contractUpgradeable,
     transformName,
     transformImport: p1 => {
-      const p2 = contractUpgradeable ? upgradeableImport(p1) : p1;
+      const p2 = contractUpgradeable && inferTranspiled(p1) ? upgradeableImport(p1) : p1;
       return opts.transformImport?.(p2) ?? p2;
     },
   };
diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 267e803f..27d7a7db 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -1,6 +1,6 @@
 import 'array.prototype.flatmap/auto';
 
-import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag, ImportContract } from './contract';
+import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag } from './contract';
 import { Options, Helpers, withHelpers } from './options';
 
 import { formatLines, spaceBetween, Lines } from './utils/format-lines';
@@ -27,7 +27,10 @@ export function printContract(contract: Contract, opts?: Options): string {
         `pragma solidity ^${SOLIDITY_VERSION};`,
       ],
 
-      printImports(contract.imports, helpers),
+      contract.imports.map(p => {
+        const importContract = helpers.transformImport(p);
+        return `import {${importContract.name}} from "${importContract.path}";`
+      }),
 
       [
         ...printNatspecTags(contract.natspecTags),
@@ -131,7 +134,7 @@ function sortedFunctions(contract: Contract): SortedFunctions {
 }
 
 function printParentConstructor({ contract, params }: Parent, helpers: Helpers): [] | [string] {
-  const useTranspiled = helpers.upgradeable && inferTranspiled(contract.name);
+  const useTranspiled = helpers.upgradeable && inferTranspiled(contract);
   const fn = useTranspiled ? `__${contract.name}_init` : contract.name;
   if (useTranspiled || params.length > 0) {
     return [
@@ -246,32 +249,3 @@ function printArgument(arg: FunctionArgument, { transformName }: Helpers): strin
 function printNatspecTags(tags: NatspecTag[]): string[] {
   return tags.map(({ key, value }) => `/// ${key} ${value}`);
 }
-
-function printImports(imports: ImportContract[], helpers: Helpers): string[] {
-  // Sort imports by name
-  imports.sort((a, b) => {
-    if (a.name < b.name) return -1;
-    if (a.name > b.name) return 1;
-    return 0;
-  });
-
-  // Combine imports by path
-  const pathMap = new Map<string, ImportContract[]>();
-  for (const imp of imports) {
-    const path = imp.path;
-    if (!pathMap.has(path)) {
-      pathMap.set(path, []);
-    }
-    pathMap.get(path)!.push(imp);
-  }
-
-  const lines: string[] = [];
-  for (const [_, contracts] of pathMap) {
-    const names = contracts.map(c => helpers.transformImport(c));
-    if (names.length > 0) {
-      // All contracts in each group should have the same path
-      lines.push(`import {${names.map(n => n.name).join(', ')}} from "${names[0]!.path}";`);
-    }
-  }
-  return lines;
-}
\ No newline at end of file
diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md
index da4c4d4d..20ad0158 100644
--- a/packages/core/src/stablecoin.test.ts.md
+++ b/packages/core/src/stablecoin.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, AccessControl, ERC20Permit {␊
@@ -312,8 +312,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Custodian, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -347,8 +347,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Allowlist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -393,8 +393,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Blocklist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -555,8 +555,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap
index d7bbd19526a90570609e5035851fa5285a0ff5db..bbc71162a2e38b6d0e81c0e160232629952ce6f8 100644
GIT binary patch
delta 1571
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
VnVfP);x#;s{vUuG+qm#R0039z3<>}M

delta 1582
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

diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index adcad9f7..ab4348ae 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -235,7 +235,7 @@ function addCustodian(c: ContractBuilder, access: Access) {
       break;
     }
     case 'managed': {
-      c.addImportFrom({
+      c.addImportOnly({
         name: 'AuthorityUtils',
         path: `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`,
       });
@@ -271,10 +271,10 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addParent(ERC20Votes);
   c.addOverride(ERC20Votes, functions._update);
 
-  c.addImportFrom({
+  c.addImportOnly({
     name: 'Nonces',
     path: '@openzeppelin/contracts/utils/Nonces.sol',
-  });
+  })
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 21cd19cf..137cc5de 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -122,14 +122,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -330,9 +330,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
@@ -521,8 +521,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -853,8 +853,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index 5a941ec662850faa8440ef0625e5069a89cc273a..52265f82a4b318ece87b34b09d40d5d607a59902 100644
GIT binary patch
literal 3459
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

literal 3459
zcmV-}4Se!JRzV<BZeeh9Xm4~Nb~6eC0GN?eEKACVUYQ@XbTK=G(YF27^A%&}6EJqJ
z@5uzx>>rB=00000000B+T+MGBw-ukY<HViBO#`>5et=%L#md;7krX&CWXp(bDTNTr
zR`ro4b`ph};qEe;A;%;~^4jpB=%L3Rdg;fZAOAps{sRSyqNnzpbN_{2dMZ$GNY2j8
z&hF~_%cFy|OFq8$`1tt9_amu4wl@RnZSi0H2?;C$^d(~6^dxA<L4Y}d5${sLfA&Y;
zhXQ``t;vhl8<za3U9P=;$Fi(@mSt^RvaD;DE$huUE$hxz%eq>7{hivSImTeGRx_X8
ze*0~!W?QvOR_!h8YVCsc&Duq)cIll9Z(h27&5b#8H!*P$*#?`CcWwJRxZg$I7Qk)L
z!2)0oFyR6Q0rG9!2G_t&7kk~L?uU1Q>!WR##6e(-E+RGn$m>#2m$e=ZLr8o;r~qvm
z6W;-gic`{9RteSvumdr1>ayuGEWniA#yKTEkWE={s3L93I%tF{s(yqrMnGO6u!<1q
z3K8)c*WILa%jqD|R-_K^x*a40CY=@+kO}0wS~n;#B?FyVMIw$;K@p>0B2TDJJOQn?
zR8lb(Gz{wCvwRO02^JUz_&Fw>A`{1P>b4EQb#M=QTX6(_il0N~1A)RQfC2%ApdTV2
zD1h4(`v42Di6kSsjo1#uLL`#HZLqR1H@~#tguedNqR*YsSIkot5a2M30yNMWpa%jI
zEI_N(rp!a2)grVdO`nuKjWH62pR)a<2$9Dqico+FxKD{-&=WkvY>>>Q5hBm^mzHPR
zyubai^NI6#xX2Y0(rpA{LJ;zipLQU%R2v6Kie@3;%yaM4m<YriP6J)&F&v40dA~*=
z-Y*yZ^3<Y611=~-Lxw0j2+H)u_H(`u7z$w&VbYPB;<k35eyJm#3F$xpXcsb0R0ntO
zf;^oxGfuti{j6Qx)UNJqfH#NOJVRB+K2drZu{LF4;ujdIsjr5|1}YBtK5+DBGj1WM
zXC=-gL_5lCG!{`T>e<0n9hj#CIdvNa9HnIiF9k4=#_kzy@N?ulbva3OaIDo#bo}#$
z>tHqS>dV^I?X@oEDN7%PlyJeIKpa3BM6s7Pi8%ru<j4VwN$(H`J6Lo91jclrg9wt1
zeX!XBPjVANIm%}Z6NZ!poUCaakB06<6Trj?<+K5!3q{JlnS?c{ombWQC<<tg=LsF#
zzMjs@OrWuC83>=GQ8*LkKqtmN>Z`ZMC^=z7W}=(uqBNq|UwrX}E!QN#W%zV>Hz|>A
z)({tl+;l+EtGFR;krK}*-5n(VgvP*w1aKV2$vlMGG9e;D4hD+}G0l|yX0k%GNp)CQ
z>aEc&M08k4WG9AOr2+P_=xI91Z@k$=EGWY;;4atATWRx&WROD{NHCF8D>0^%dhi9~
z!Czf)U9h@5|8eU9_7LHywdf-va2q2w1C|!o?1;fm2!W9SKA&`c<V;WBwrw0nlnL-+
zHIe!fv>6TcQrhCecU8IUYW;Rf>`}sLfCi~`MS)yf%#h2Nn;J18w9`4F%av5Q6VRVt
z$PgA2FY!i>#Cp`208zXdU=O@_X=iI$Ofq#zV02xu_Gtdmj9i{&gkgwt#Pu9PU>h<F
zHv`1MCJN|IGl{4mCNfA#50Nx&8U%Dl4k|~9oEgRWM)GGnbP~tE$0+nY$VFq~c2c2*
z0Uxzt9EdqT#01QOJ5rHcnIY^VhVJIuMlj}xnO6GS2>KAq<;l?NZzc5F)@r5`4}n=g
z(2gl?WYueGu}#fR_s$G=Ks$}PS=9C1LcZLJ{D9Y+Ms~vpn$XP?tI=q{Xg6FNfS2~m
z)YC5-PygQKah~qF;64o_DDY;0R0uBLdVtSwI+M=iE~dtu=ONCMhBPovJZuq#39*}N
zQ<x45EBB`-$MF$z4BUiN{Vrp2FJ?qK?p~OoX95w9DdBF8M;ZSQ0?4~dn23W2NSTyL
zScWk_Xb%jJQvQgA_(19_4rRPQq5|=Quud2hI6tJs8_zWsIN+|L9Tr1n^i0GwL2jV+
zS7Ws%$oZ<NO?s`rBzo%4>1gWEy4e$mzdLQ>t&9i)5&@Ry)>ju+HdY=zSOBwN3wa*g
zn!fp7qn@d#>-j#6$I{}%wNf6L3dtjlMS{hipsZ0Ab(@8F+APG&iG+*%N&4BSFZDoT
z$9fagm)1V47YLMvGGwa$MM|~NVUUOw8lcAf!UuEf57sv3=9d;9CTcfxx@kKUT4gL{
z;%}Bvs@({A$Ki<hvOm+4lat^En3@DPZU7&7ID`RjOq4Uvn6MDkUn+a1>uDmnzoJqS
z^or_DWV@~D%bCSwuk6wm<qQ)mn2{8;31Upd^v(AG3}u=&C@0hLoScM_WS|@7#K{dr
zZWCbSa{w7iGHix@!~sK3W6abR-)sn-g323l<U@f{t>skjdt<f_+c1bx-|v!9A}~k`
zjNC?cp7$qqfASW6lgANaj!{G@AO$Od<(4K%v`Mw5J0v@4l$q17+ZgQ(QPYGL6}|c#
z7!olf95i(Ai#n@%t-4l5DPi>OZx~)P8-{<^4!$*(ImqBvSC$@lpDUTjIGy~JT{W>=
zd#%|q-L^;Ve@E>!w?jwPG^QqoY$^@G^u&-|q#<}$6YO`pnBS$##O)yrGm${LjOh#K
zh>3-#>5kDM38{?4X}G<uH;EcmeX3B^IF5J|Fd86U0<Qk63|#&24a@qjZCSs(Vp(&0
z23P<4dIhdl;Oc1vSCgSwk2(zcXkSQcD^`u=YBCCS-92kPK!!1|K-^;lakIne?i=eJ
zqd-o`Zk5>ux-6~9Rj`l|3}mOeowHhLO}mZ3ED$V4!)YKFV`(;H9QYd&jvGsgo(Tpw
z6o?IG!IMwx(w|@lJ%BwLi%;vH4YobgK>A-RApL9u>1M$>NkBcX!wCcH8y8PEux=K2
zLqBq@bq#fe&L1W^ug#m{?dkVXh(4pwdSEu)oH=UttgkPxF3YNhPI~LvfoSSNxQQJ^
zJnEzSFbEokq#vJ~ppc9il_pe5JuwviH@RG*Um3=qXm^wV|L-rIG{C>!-<OO*VRKuU
zGTcAIstiBgr=)?CfiYqf-f{@S%8~Km($i&XuR;^|(-?P-NiqDbFR$*iUs(|aHly(L
zoHiO@%QVe_=ehD>e$fO4>0@B^_2nP0%*~gA;<>667I$42yzj+a&~S!6PZxt$OgL<#
z7L;)_i=7W(={b<p#|gC9&tn-M2F&*3(HJ;BjZPVyGi9H}6*GElBzE4Age5@z?INKX
zkRo}GE;m4mGFM+1rj+9F;QrkBWrB9Oc{gAzx|HGPNNbf^nV_9Txe1qxquMo&0FVtT
zo)g}0V31p7|5AjtcL<jcc8#!}(1z#aVA{;?Vi-_+DmD`%HxWmS{0hXpThmh-`lUO`
zDd!;gd-d<5z~7%-u`KjX1^!mxZw3BV;BN)~R^V?1{#M{`1^&Le;P15x{Cy?BUme>X
z$*V*L#LbnRB#@g`<P5;KwbxDnzFk<ke`|W`paAEs=_z-B({Ur3k5uw{FbsN-$tlE5
z^LB26L8XU5qo)bc%uUY{+_H#S-kP4;4QQ#2p-6Kwb^}QsEnJxBu@`{wK?M-*2Oumg
zOGEE*p4<v_l9*qJm^U?b^QOul2Eo3se>mzH{qJnc`omk*Gx`ebJ0D<Q^^E>(fN<3_
z`U(I#wE)m7|BSv<J)=L5Sk0Jc?j`Bfu|I47&)8RLM+2M49rUgrFiT?dw;Z<E<=c2o
zJ?7oA6qCXN+5yYn_~ynh`$ShVXw*&62zxQZ?hEX{%sk}P+#7>DUKA5(IayW~8(c8y
zyderH>q$R~8P2^iRc@F``*lN2I^wC~uV1;RiepmT-A>rSRCAr-U1pjw!;MLqX_om(
zA?JMd9g}nl1__TKLqv?aaPoN6g_GclWqtLH>cUBtgPxBZw7PIo<+{~{lj_1rb>XDK
z8>$N@`@tXXR2NPv5MzHAPS*Mf$@o*htgLf<7v<xz)9L6ym4jYJ$zm<%_BzTgZ;BLb
zP<B=19NY|%z0_AjhCva#y&ZD=&{b4j@i_h~9w!|0_jvo`Xdt;j&GuopK;E*3-2(ak
zWy|{C*DUK-c6AG+Lg3B^0$1GvIUC5>dA<emmkO0R+o;U3qcJ9YouZ2%|2Tw`*rUA&
zVvLsGzxGWzu!S{MhYY3+#X9;D2aj=0P2(u9Ta-cqKevt%5-71gcu|%;JwD!p|9$&T
zNd}a5Z0||X7`GVAAXaIJL>H4z38E+0_#Ta!3g;3xD;(W_TPF&+llu@7*g<~D$^FG)
zC-=a%tbbmytdFXb`zmiZCwW74a$n^q)yaKza(`So;@_$q@oeXaCw6k5&lOMA;r(x3
zjl=uXl6ao&Q+!P~r`}|XUZH)z{7`QK<VI;v2SaJgva_L7+v1&oG6W!#=AGQlfSs|&
zl}GkZhL=>zd9V|8mA5i?7|Y|jCQu4-44&Z+Q}gtm+V@?0+{t~eZ@ClsK93Ox=f6FJ
l2j`~*KicCVdP&IL<3ChAHIa2(I6Wlj?EmLb4B5AU002<4jFJEV

diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index 2b89bb88..29e5004b 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -13,14 +13,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index d90eca646e921c755fb64e85ec9b5a479f614102..8628e95395044f6c5b0946de712aeb914a4f9d47 100644
GIT binary patch
delta 2222
zcmV;f2vPU#5$X{#K~_N^Q*L2!b7*gLAa*kf0|58QO5t2@2wuEYtPdxAgSSWVdM<=$
zuJ_7t&e`aYF2#{DB!34|6j+vQRET96mej8xR%Xe!yAzW$%*;^ITG&HT^w>Y3?I}fp
z{0+VK+Cxu8Z$<xt9$KKsqL|^3%jMFNR{oGvuK-&j`R4aN_~yOe<9yTWhTMNDfAxD%
zRE6*r2*1<Dy(A2&WF(dYuH-Mi2?C<X&#wRaGI|H;pV~t0+J7eqp}Pnnv4GHT-bLu2
zb%eYhAoPCi+IzLDYeJA=t(N_D{rYuOtE1XgRQo=9zjg_IP`iw3SKqtz;ezMkoktr#
zU3@@&U=kKL17M2wD2QdewYgjOJiN}Mm?+u}0UuH|z}qpfpF<o&NEu$|ObOyEiJ#nb
z+itra3(}7WmVZ2?0aZi%r0ss}b~-EdI*np36h6N9c)ime;hx|TZrtH9uxA#{^D{J0
z@u$E%Bbxs2N**>=CPD5df{|_rvw*>o0wyVE(wo4j!hb{(`J(t4MhSn-_d!Y%JszHh
zPmHiPv8K{q5D`@`WUWD{!u~N=AYTO90F;m)a^|0ontv!7N-veIGVOjy<Y0@k7xFv@
zu^Q^xGQ2h1)$1^o*hseUMB>=X>^-;e#B0i)nz-5v6AAlwt`;BHF~+z%R3Ja<;5g}q
z)W<$&QW2)`qqV)Adyn@YZ$G$)SMgKuee$$(^On;nJZLmmPQ=*Se7IYQQFx#+42W4J
z5?^uQkbfW$ASDi<N0Lyj1rcQ}oZXE{B0-F=Bgzzrra{p^#!siQHN+;4jTUZf?S9rM
z38WD!h^5bubE*BlAWS{xAvhcN?yv1V*xg^-*xGz(%x+ECX5&y=Rftr}8eJ6BW;>DW
zyAoKS{pqyZZF~bSwegJ`H~^nUB$Q6G8oUs~R(}?ORB)8WvzIVmQO;7$PBVKuoQ1=(
zdCj8RR=yf6VY9;JE2;ra6tXv|cnc?#sm{$?m_$5bYFbah@d-T!NCVh~6Y4w<?+yU>
zco_0S%KEu}iHQKr4?qYSfW!j6PN;wYcZYb#wiLHy@_rHrL_uz~t^wn0Ec$Rj!UV>7
zXMf%jBVm3c)9V!X`FLZGH*YyNWfFsMGec4XwBl4@b)=c8XSvn<kQFyg8s_}+fWqN(
z%*;wlS|7&<0#qWH#E$j8Y;*eDnr@9rjmYdB)h%DB)iT2HK`pDi_(wzp1ETgMh;`0-
zw2!m$J4m1C!rP<$akXyTVLYOKk0&f3I)4V9m0VPuhh2W8%WmBi9-OXSuF$e-e8~94
zvi0Zygf8aGxRLUWM$6ompcG|&xtu%BV?`tSO!J#@EWlLqU>PfsK+E19rGJ=TqgH*i
zQm@02am3adYvf8Erb}6v?$$JRgOLat%XvT+C5hq?jA;#PaKl*Kc9+t-0Z3oaSby0k
z>CK2xb46JINA6cLy_*WkM&?IDfm8);*j(4G0}Ya>0T*M?FeQBY#@6O;ru|?8VqN~2
zPoV()oQA3wr?k(8`}8+FwZaOR2OW3mmb+wZu8*>yUe1E*UdnS1)BuDmC!9_nB8SW`
zlrut^lh&m)uQI-RpXkmu#H*Mb5`U^JqT2^mlF%K=HYC#-b?MsP*j~mvpt2$Z68E^k
zY5+KA4Mg;l2$+(%3n4$u4WOnO`;coc>2m{!Lq2pSdu`TZ3!Nohox!>K>OL16X0=xA
zr1om9JOnr7edo(e7fzKxfEC9-JT5`?L9L~ZInB|R&6WD7uIGTC02bi$D1QPLU^Sq+
z^DA9JHAok*-a`7%L;^Oi!Ly+~05LoqfB=m`Sb$@}V-VpG4+slFz#s${(yga&%k_!!
z2aaRzHu37G`Rmhun7j6w4nr)srduu?QMJwk9oMCm`lvbHl~=L^`mB&ZM=|&+PauCl
zXn|FpkYDKr?ZP-MTH|c9nSZ8f%r2xw%!Iqq!lk@)vR?U;vN8iIW({7&P8nv0_8ADx
zVm@zw;o9_FDFCF2cFNMF%B5*;p0c!4SXx;7(ssp}_XV~&;FRQb&32kiS8*4<PDof}
zq*{T_Ed9@p>;i;;yR(FoxGzWmdJjyG?%(@u)#$!=1))D&Md-;p2!DP1?yRGG?aIZB
z?zcNjdt+ZunYb1UVHr<fw>wMT6jEuh+hkNx64Gb0YKa9u8rqR@0;Hs1`_T0KbNXT@
z@@bHgmc6}4JLgnUbfg4x(ug|Yv*E0hac<#hqg%M7z!oRZ^Y9%%k%~vl{8?t5TuhiG
zJy;}~y%z_?sljn#B9qJp8-Hm(^?F}RRScem0dC(0BNd&{QIsl$CzXDV?fWUyqR+Aj
z=Pocf+|&e6S0TfWP8vm6I5c)lvHq0CSF-a@UNt+<MJMt%lgskMrsj8^#ee(OviQ@>
z(`k#Qaze|0^twicTjf!ql{M)9lc6E=#`2;^x>q<QBU<?LVnO@j+*(tEL4P|(hJVy%
z8yQZ{vp0NrC}ztH!^255{@i)`x_NvA!e3gtc@uYur2aI8U-)Ykg};9Zq3AL~f4YLu
zzpu?o;r~^;7z(fbJo8bB7S4WGQ|L3EURmi=lfVZbf0zcN!g+&5ccw9p%VbW1+Izg|
zNG0@F>Ifpe!5ADSf=+x2PxnlLg4%^vbpAzk{zdf-{G$5dTlGbCYPy?$L7kNj{bfcv
zG$%o`<l_r-o<vZmJ;8aZ`d|h73Db`}&m%wAepf|){)Q0xZw;ZH%Lr{;ot6Cj61_(9
zQy?4pe+E9DcjI|Cev`WK-)k4ujk8;}6wcgP=iT&N-E`w6chmK8v%H{&T1upI<<Z$P
zY5E|}wy+Zq;ucn`8rdIf2rbwt{?9W{@o*7S{3|;it8A6!W2M)BJTyP-m>+h`4?C)P
w!+*-W;Q|gj&dear_(6DnSaA+MvH!{rE519-5MrkMnw4t&51Y401+X&!09AujnE(I)

delta 2199
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
ZhZWx*W)Lw`e$7fX{s)=K47ji}003@DN9h0n


From b479a9c9eb1edb5fe574eaa99c009f2ed4db9a53 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 20 Nov 2024 08:57:42 -0500
Subject: [PATCH 16/18] Sort imports by name, update snapshots

---
 packages/core/src/custom.test.ts.md        |   2 +-
 packages/core/src/custom.test.ts.snap      | Bin 826 -> 827 bytes
 packages/core/src/erc1155.test.ts.md       |  26 +--
 packages/core/src/erc1155.test.ts.snap     | Bin 1788 -> 1784 bytes
 packages/core/src/erc20.test.ts.md         |  32 ++--
 packages/core/src/erc20.test.ts.snap       | Bin 1945 -> 1960 bytes
 packages/core/src/erc721.test.ts.md        |  30 ++--
 packages/core/src/erc721.test.ts.snap      | Bin 2137 -> 2140 bytes
 packages/core/src/governor.test.ts.md      | 194 ++++++++++++++++-----
 packages/core/src/governor.test.ts.snap    | Bin 2079 -> 2462 bytes
 packages/core/src/print.ts                 |  24 ++-
 packages/core/src/stablecoin.test.ts.md    |  20 +--
 packages/core/src/stablecoin.test.ts.snap  | Bin 1659 -> 1670 bytes
 packages/core/src/zip-foundry.test.ts.md   |  10 +-
 packages/core/src/zip-foundry.test.ts.snap | Bin 3459 -> 3459 bytes
 packages/core/src/zip-hardhat.test.ts.md   |   4 +-
 packages/core/src/zip-hardhat.test.ts.snap | Bin 2282 -> 2285 bytes
 17 files changed, 235 insertions(+), 107 deletions(-)

diff --git a/packages/core/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md
index a3291ee1..24d1c542 100644
--- a/packages/core/src/custom.test.ts.md
+++ b/packages/core/src/custom.test.ts.md
@@ -24,8 +24,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊
     ␊
     contract MyContract is Pausable, Ownable {␊
         constructor(address initialOwner) Ownable(initialOwner) {}␊
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap
index 5f5f25e19fd8eb888e75bd01d29daa78bb273ae0..a1cf4e67d979c887d4540d92334ae4a828e1dc5c 100644
GIT binary patch
delta 769
zcmV+c1OEKF2D=6_K~_N^Q*L2!b7*gLAa*kf0|4_i@p@9;`9+6|kd$KvRX<`=o4X)K
za{7=Y@e6%uaVU{8NPkT%MX|V-v)}ps&U|yO`#mPS&-&XBG}JKcd!aTWpqdk@hr;MD
z*S=2-IsLxA_F`@Jm7cG?eD-zCb>aAM|Fn8QJ>(jzO&__TeTr%aTFn#3bzx5gk{H@!
z2qS8S(3Z$QqLj!ehdsfKBA(H3{-(B7+j68LgMfe*jQZ4!;eULq_O`aYU3VNWfkJDX
zTEW!0a*~vXl7yP{7|tbqR{CXS{j+qBS<^rYWnkJK@mX?L&{raWja?y;PZED_TAFr=
z=b_eag05-7HtLy=!=%DxPC`SOc2jiXWMTiPh7`65Nl=(N005rg+NjVoLY0Z{E7Te&
zr-l;N9&uEa6n|f~Pp4N-WZw_DXQ<#X;|0qVkYSHe4+Ll92%5y1ecc38k4}mXLcWTN
z43#>`CSw%Jfg(Oe#TiAomPE}6pC1%s4GKQQpfuxd(#Z-;S96uQQi;oP!oB5W$pBc`
zq@%9u!fvbqJ7SWC(bbS^(#I-cOpNjqGB+`mJT*RzCVwmogi0@<N#<z^L#gNaS!WhM
zpVt2;ehNy_xiP&<6k9-YP6|;vox|h543RIS;N~u)mI+SIeiI4~?|&X`?V%aw77@Gw
zs8pVEk-ABV-5Jal%6bk}C^|;pl2Mn0W+)V$q<za0<2Y&tl3{?{kQug;g`nJ^;)G=f
znS|b)Tz{Za)W_&xnwQUbq#)u{Fi5)RKc?m2qELf~X<6_BytZn1_1IR0+iu=Jd)u>?
znnFvJV7NfCOQ%*tn-9^@MwIDZoal;ewQQC&*TVjx#Xj~)$V|fzD7OS@pa?fdf?;|8
z-TOx8;H2BwZ#6%3kJ<<CHf^)HXR|ok0pVn@;6`?ym6{e4I}gW1D^77mCgOsWYuT>E
zNP=BH^o>|j&A4J)mgoQHufS!sxU$4uT2(Ng_L--B=4qd~w|(X}iO5y?<q!Y>1T1`~

delta 768
zcmV+b1ONQH2D%0^K~_N^Q*L2!b7*gLAa*kf0|3c3jaV+3JC!ON_Wy)g+4jm8cLA{E
zdZp}JrirtvXg-lLNPjh!*3jZ!&VJ|j`{vBK?)RARKI$*u&``s$?}gfkfND;p9txvB
zUHd*U<n-(M+OxIUS9-ek{K@Av*M;N5{nP3J^^j|<HhtuV_9?0zXf;n9*M&V1NMdM@
zA&jUQLR%t#k5VF|9QFh^ig-rD`K#JiZOf603<3gLFzQn?hJW*|+Uwf(cHMEj1PZNj
zY6Vm0%1KflN)l?)V>p-eS?PzB_4m>PW=#Vrl!57ClHC>bl?Y&CS4iZO#G#wkrrpp`
zrri`>(}Hc(Gbim4U&aUVJk;7v(20+Q{i7PvP@9n8Vd?+?c!F!ALeB_QCcdvwYoMGO
zN?3cuQB_iW*?&HrUOAC{KjfaFg2Rj#ELT8=Jw`ncoQ)%B5@+^x6HGliDLM%GGA=Sy
z>LgRfD3k+5e2j`Sif}E7nh`!P6k`bmS0R*U+)X-Jg6V3mGFK{bIZpIrIk`gs7B=aq
z>$<QT&ww2<NyF%B$TjI>l`tkod4<d=rjn<|r;)<4K!2$80-9u=rZALxo}YDQ@$+H*
zf8wWb$vZcu_laWP{hX6RluqaH_%}o33n{p{kJPe(le6E1g2RW`qdj|QhPh=3-T+iO
zo^p}8Nr~MV%pR2W9I8-sjJ_qKE(y(0C^|{|mL<k<)C?rU0J$MEY$Xdpxk1GV%MP*;
zdUJAtN`Fxwql0OFe8!T3h*QBJ>7M^DEe98c8bnOXf*0VWRl|!_ya0dWmH%UJd)87@
zXsHqm7mV!EsnyWtDjM2|GTn<4U9zo~%^l6Pu)k=rk9`s{)9?ezt${R9gqtJ5u)P1~
zZKHE=(rxUwn(w+t?SnU)w%OdXS(J7_I2kOsokeG*rp3h0>X>N7DK5!GT##}t+oc#u
yuy>2T5sy?euGp64`TzMVa9J&`EOD2X9hi^%%;P@uxX(P;KJyd9PG&9T5C8yyC4VRY

diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md
index fe69331b..1e1a7a79 100644
--- a/packages/core/src/erc1155.test.ts.md
+++ b/packages/core/src/erc1155.test.ts.md
@@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -72,8 +72,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -113,8 +113,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊
         constructor(address initialOwner)␊
@@ -137,8 +137,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊
         constructor(address initialOwner)␊
@@ -214,8 +214,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessControl {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -267,8 +267,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -305,8 +305,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Supply {␊
         constructor(address initialOwner)␊
@@ -337,10 +337,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
@@ -420,10 +420,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
@@ -513,10 +513,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
+    import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
+    import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap
index 1b52fa93e3998992b00dec6a09454835631f3128..609422e60bd334f6beea165981e3fefea2aa38ce 100644
GIT binary patch
delta 1752
zcmV;}1}FLa4fqW*K~_N^Q*L2!b7*gLAa*kf0|3Bmr4qlVeK8c?{H@DYKcACGO2~U*
zZazwpwB%nL9ZQiiB7f2dsm`UvC~1siqf$hz@$T3jvOBY#nXThQLE;DW7x2_RA>MdG
z`~k!(NW8-@0qte>?n@HK8;A9a<DJ=a+4<(2@0{7Z>9lpK9`e_3k-$Pns0}$*F(=UE
zJu3M3Z!`@G_|>gP3pd`mVSjGkx$*w3m0OAe4r<%amUpp=2!BV*RSgk=I~cKtV6WOJ
zC<@r3h6x33>j?C*=z)C`k>|)Xk&X%2qC_yL3JzYZmG77D7fc4b1_YeySi@ofUfeH#
zQeIu%C={?^QYOI3PJL@-Wo_*gbQm?j;v;Gza_q@dR4Gpp^birnn=HS}oa&1kzNq~^
zfo&a)69rWjaXhYgvppFFIS%#)4O<t$9C&I<z?%zB3IG70Qo;qZR6$u0Y8peF15B{M
zP~Yzp#Fm^{_Qw-YT<i&9@`sa;0T_Sv-Vq~PD~+{Eqh`EZ<?u18?5zyU$IsR`Nrm^f
zw9huzKi~Rxx1uZtN<8C=NfS;^3(j}PBC5cY0FFenUM+ILFzEsV8I%nGL4AwiC16@@
z9jky6ec;IOytO|q??!LxhBI(lI4yVpGaP_{4*{b(;z^(_{1XA%p9>iPt>S+yyK^Je
zC&WnPo*3Gu0Nl}_izxRNqdgFaf3zys%0VI|0yOK@*1=Aru~To=_jh-|r{EB&Dm+|W
zdr(}A4K6Ni6o%qhLmg=8qM{j?%n-*RsC5}6qE2;G+}?RyY3?>!mF>OiQ^)jD)IN#B
z^MTya5qmaE<3aCyDGF%x5a@qUU8j9pjnvKoWC+k#h%u}o4j6iAVTLr&9)JT6oaMN|
zmT5zZSBXHZ165RXmic3V<%OyitcB}=|ML|_egB8lTTBO0AcP@dF~UKyP37g2*r06|
zV&$Z9VXG36fXYZ<Kmxl+OG!F75(}PZk#yXrvgevOVJvVRVoK!RY+`?cr+j=ms#u~&
z85V;Xr=*CP#dKrNm7Ex|hgIP_KS_2n2?dsEgU<$##c&doH?;^Tn>Xi^35^0z3R-3v
z;6v-tYg^2rEGfa^m&iK&IOmMiySnN5dp42iNFc)PoT9|!%$oO>K+J%g2oDK0Jri0y
z9oo0Qj6nOz?P~$;n&*G-MWHR_WCm?%Ko0E`y6X$K;f;!;<#=<_1z2Pf5&o>pBi${B
z5g>nYZGe@4{3U1!SeS^_wFh5+BOfBxc*@mRP`3~dmdc^W1nMJ5c?@!K{_PTPX`pME
zZIGkiQ<sc91|}js@+|xmi9A1KQGMrap6e0<Y@GSe1F9;ui12^61;ASHH#FQar<#>!
z*oYij%=$*fn*y#<smxX)g*)<wTe=B_+AE%8Tf6f4)U0<6@wc%rK4O1RvdG;$yr*{O
z@5rwH<4)dF%eJRBO4eTWX}X-yz{GvIAWa!gvYC@UUF@!q=OyV#b`8Cmg}1oxiRU^u
zp>85iCJK9bOLc!#OO=Ik!O*Vi!e5bW@LP5#EO}S;T6a}v7cB#;<}yT%HvepNklG<b
z9{?M|hnRFz_W$pZ{r~Hn*LdF51IO))_Lf{JnRS+2^?6Zw*~h3?prhk1^;G&fM;~-7
zT?dxgWl%#-`WFlmZbD{n<U{~?_q|8}__vUCIoJ#=AG3eSmP1aaR*4}|>2czmx>6(2
zSY`4MWGYIBAM%W~L$(hu$&M89F*~Ym(7?xMRc$hQG*B#ob*@B&jEb+3iT;iYSr=pG
zk&)p(CC;`&V>4_J)GEz`R5_u6sWurDMFEdgiwkNzq{ni3__9Sf?4V_6N91s}N**4E
zW4wl)=jwm25n_DU2>|xzjA?E-M*wVivm+41!rUulRm)r2mOb@S5^1Qj(TbqYRT&wN
zVQ}~ii9~<K^qMXqG?lyuJXhVBl*6OAUrQG|iyA2|{ah;V9bK#5QFc6X!jyFpemSc)
z*+hAH2F)`o!J;k8OgT-t_j80kzrB~!=bS#zDSdyI3YyK@!8yGPtB8rYVjR5$V)k8A
z(mv9s+LL-^JKdx3(A<;%;J0V;|FRqiX2hU>H4BE=#0Vlw!9wQMMP6N8&FUhk44`}1
zb}SQ+?-N1&s$uHLKtw=$?kLvp!!^7Uf*T~2j<n(P3Ma2{(kq;!rBMe3Ze=p`wSl{@
zBV}CAcXzXXZQx>MPwLwQdHIu<KUb{$Ng{LF<<C`O_=z`FQn-57Jl$InS7pNBS@HJN
u40fq6@WeQ3x}dZ1+;kZklH2@6qRXJMF|$C<Trd8=JpTduuzGj7MF0Rg*;4ob

delta 1756
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

diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index c7503cd3..2fcc8e59 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, AccessControl, ERC20Permit {␊
@@ -428,8 +428,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {}␊
@@ -444,15 +444,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -520,15 +520,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -606,15 +606,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
+    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index afd5648a657b5a7634592299041565645c11a8f4..47f0669a62f4cd700bc2f73327bfa0ec3211e159 100644
GIT binary patch
literal 1960
zcmV;Z2Uqw(RzV<BZeeh9Xm4~Nb~6eC01r2*uNl{8##;!jD2HFOJxqX<x~vg;QHm*Y
zr^?%B1|N$E00000000B+Tu*P?HWY8t76V-LFkqLV7(jRzyR|JhTZ^JWhh|AS1dW>@
ze}-*`1++vbL?lursU%L8L(jYI8+6}cz;3$?*lobR!R`Zg*=@jpK@#<c67ASd;@FLR
zXd#n)?@{mZ$M<`r^S0BrskzU8_z?*#Y_#8o9Gd_!bFPUwfiB;pg1>odSx~^QXTHCA
z<GmaHXXf^e_h-MGF$}P|zVuan6`P1~R9~?W5x9d9dkR`BTP4E)i_~$Uz-=3WLoD{d
znv2Lc$aRs830R~=FlY)6zJ1haHku`u!CeOePHk*q(FNZ&8&4W@bMvJVc3jE?I9c9U
zoNJzf4x<hzKc_At$5NVMM$!yH_YpCIuHnB8PVMr%Dr6lo2a91up(B9^$CPj*B|*wA
zMPop#yX6l8n1i5O4WxR5lM(;`n3QnAJX26ssfO*9vK&~hfpTl>Wx1Ljm$X*F$!Y1d
zBt1p~UxBvA2yEL(<FtPjr~NhEPWxQW^E_^gWK2R(M7E40MqKD|eT>|iRbu3yn^PSl
z>vEpw@}iV6h8T%tuN@8)+0Zl*=Z5S(F!;#%)PNj#R=`2aVu*8q2^JXIYlj4}YS7F7
z^a#edT`H;c8J!E+p!wvq6#U=uh$%27LC~T~6}Vp8#wMV|?grAN$^K_Y_L&d9$qMku
zAR^*kiV(v9TYCs}sBP0jOm<_b96*KuJwS|M3vs~EYY#JIfp!;c${25C4B7Eq3knp!
zS>Mey5IqT610E(~?$Kj#0BsK?uL~1_7=d>DMWnZ)^RRr6acAzih&3YRp;BL2s3e+h
zj1@;8s$dZ=ZbogyHMsGcf*U{Ix&qu-2-ZU|klF(-9%YPfiC;$?8UjO<_oqXWc2^+&
z$y~JL0$_nefc1s#&E<`qjkVQf@C@uD(}eqTj~-XbsfKcOzSI+rEYyLXEfy>XlVtG(
zYj+5E>IXmxChRgu#0IrdWoh}v!uIOc&cae_<yBy0O|e8Sqs*w(oNAGYdW_N_R8~Uu
ze1O+iTmgO&_}$Zip92ZpMV1EsY6|>)ban983QZgk{=x|{Lm6AZ;D|6N-`|i4)q*GX
zD8r&VIBF^CDrd+UExlrh3x-XBtkK~{FQdR1i7|&NVeiMvUMuj@z6yAmBIZ6_Ff$g`
zm#r=oB(NZXgJ2YuX%It>uUC`$%>1fg(@)b~Rh;5da1y<~t11rPZE!>^#A@JSv)Kgq
z!NVrFe;-)L#16E1rJ8p)Q``+`2NcEs$@O@?u<LtGpF+&OQJltR3#W~53!bt~Hoy<v
zP6Qq55z&9^3<mpyWaplB#VA($))j9)Rl@ecRh&mma9weH*fnyYueI`OOIzqmHH=W`
z3(}E^EA*x2REtd1=b^)_v8?F)X5VkU*>X=0=3eaP)3BTGhb}vyLW_yND<1o0%Fk#o
zXDbg{zVu(<c|->SGLm0WVxBG46WHcP*mt;Kk`ICE3ks~MW3R#FN29K)og{ETY$jEc
zq7Y-_#{-NGd)O7ZCUj^bfg#~B!a+q&H*0g)E=`xlghuqti-J`T9)RFJ7V(@mVg&{i
z7*JrqHNb#F6#@iy5EsyKHAez}Dgf}ubRP*605B#1h!=(F?=DFd+z<OW+|`Kw^hq@z
z%wa<%*rOV8nC8mmoZ5Ssh`NP?VsxFLBT=_8L4hH40v%L$@DZ|1$dPK`;_BMs%bnKR
z(sE*@>!m;{vC=<fB)h;t4rN`9v1Nx^=vi!Kd1{OL*AWus2}H++e9z~)8V38H0)>B1
zH-mlQPqc-}xzI2cGC3SsKE#$?G-p04%RupL8+h(6gBA+Pi-JMIUC59wcJ5?O*6&<(
zeQ`Un{0tA(Q<Kz|9aExoVKAbmTo9k3COUb(0Cl}C0i0n$9CDXnf=+h7I|-Lyf<|=j
zReu@!vx0jjVV9shD>tKiB|Hnk$HVG$89nOC{7n&}%>zfASUNq-&q0f;iY*dSQ$sVi
zJ@PG@V9C_>HDj_4PG=+euXRh}f-VF1lQGmegJBrpx#@91ou~9Tatg0|gu@Q1Lq8Wx
zZ%vx5Dpi7)*=_6_#CWgkCphji&_(9n=N*Y4md@8wR_z4d*zr5&chvc8zbItF{`vMO
za5U{o`1Bkf1X0GCe77K`ddY|*EADV{CpW#XXant)in+d5D!{16LKAuadwhph)5FLH
zgjOw3P9B3(Y|d>+ms9S(*CSu|JXdq*b@u}$QNMk+NYsl&y-3uHME&X$^+?6`_WI_C
z3evO4h<OLuKn-N(I6?HFpN#GGFE$pIv{IC&sizsqvoyIN9vR}1bjXDAyF*Pf9hC^L
zC4o`!m|i?4;UF;lY2I-Jw6Si24p$u4Mh+qZ`hENHkH{Fs6Ul%muMd}F!KJPfm-@I5
zm+Jki<vX7#oXWVm!w>mW*7I>H?T?uYZdGurf?E~bYLd8B9-1znTTK!b$^F3s4XL<7
uLLuD~w&!e}K!PzO1DLSC{4jJ@t`|PeR6Mbu$iA;}_WeI)T-fq7RR91xF{tAJ

literal 1945
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

diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md
index 4c986927..0e4a6e4a 100644
--- a/packages/core/src/erc721.test.ts.md
+++ b/packages/core/src/erc721.test.ts.md
@@ -237,8 +237,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
-    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
     import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
+    import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, ERC721Burnable {␊
         constructor() ERC721("MyToken", "MTK") {}␊
@@ -334,8 +334,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, AccessControl {␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
@@ -370,8 +370,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, AccessManaged {␊
         constructor(address initialAuthority)␊
@@ -419,8 +419,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -453,8 +453,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -487,8 +487,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
@@ -530,14 +530,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -603,14 +603,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
@@ -684,12 +684,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
-    import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap
index fd6cdcf75d0493996322ceb4064c8eff671f2446..130d22e5752dfb28647944c927148056e3e26fbc 100644
GIT binary patch
literal 2140
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
SZz0a3h4>FScmdcySpWcvXc}7p

literal 2137
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
PXd(U&>%Cc%KUn|(;baGd

diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index 6e56da73..be68eb77 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -14,11 +14,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -113,11 +113,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -208,10 +208,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -300,10 +300,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -391,13 +391,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -509,11 +509,11 @@ Generated by [AVA](https://avajs.dev).
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -612,11 +612,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -707,11 +707,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -802,10 +802,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -893,13 +893,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1010,11 +1010,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1105,11 +1105,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1204,11 +1204,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1299,11 +1299,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
-    import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1393,13 +1393,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1510,11 +1510,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1604,13 +1604,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
-    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1721,11 +1721,11 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
-    import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1805,3 +1805,117 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     `
+
+## governor with erc20votes, upgradable
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts ^5.0.0␊
+    pragma solidity ^0.8.22;␊
+    ␊
+    import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
+    import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
+    import {GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
+    import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
+    import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    ␊
+    contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        constructor() {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(IVotes _token, TimelockControllerUpgradeable _timelock, address initialOwner)␊
+            initializer public␊
+        {␊
+            __Governor_init("MyGovernor");␊
+            __GovernorCountingSimple_init();␊
+            __GovernorVotes_init(_token);␊
+            __GovernorVotesQuorumFraction_init(4);␊
+            __GovernorTimelockControl_init(_timelock);␊
+            __Ownable_init(initialOwner);␊
+            __UUPSUpgradeable_init();␊
+        }␊
+    ␊
+        function votingDelay() public pure override returns (uint256) {␊
+            return 50400; // 1 week␊
+        }␊
+    ␊
+        function votingPeriod() public pure override returns (uint256) {␊
+            return 50400; // 1 week␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            onlyOwner␊
+            override␊
+        {}␊
+    ␊
+        // The following functions are overrides required by Solidity.␊
+    ␊
+        function quorum(uint256 blockNumber)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorVotesQuorumFractionUpgradeable)␊
+            returns (uint256)␊
+        {␊
+            return super.quorum(blockNumber);␊
+        }␊
+    ␊
+        function state(uint256 proposalId)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (ProposalState)␊
+        {␊
+            return super.state(proposalId);␊
+        }␊
+    ␊
+        function proposalNeedsQueuing(uint256 proposalId)␊
+            public␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (bool)␊
+        {␊
+            return super.proposalNeedsQueuing(proposalId);␊
+        }␊
+    ␊
+        function _queueOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (uint48)␊
+        {␊
+            return super._queueOperations(proposalId, targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _executeOperations(uint256 proposalId, address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+        {␊
+            super._executeOperations(proposalId, targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _cancel(address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash)␊
+            internal␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (uint256)␊
+        {␊
+            return super._cancel(targets, values, calldatas, descriptionHash);␊
+        }␊
+    ␊
+        function _executor()␊
+            internal␊
+            view␊
+            override(GovernorUpgradeable, GovernorTimelockControlUpgradeable)␊
+            returns (address)␊
+        {␊
+            return super._executor();␊
+        }␊
+    }␊
+    `
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index 9bc66e9ab4ff824c7d4f598ae7d31292b09d5d17..0cb4d9b5107c75adae9c2f1bffd6a8768968df72 100644
GIT binary patch
literal 2462
zcmV;P31Rj@RzV<BZeeh9Xm4~Nb~6eC0J|K6#HG;HMvaQSe9O3A{~c&&g#v9WKPP0K
z{A-T}zaNVT00000000B+oy%|B#vRAq7DWNYHsD(ew8+2>&~>m9S6fRFtV;kJX$3T~
zQ`toyXatHJNduEJG-oJzZ5U`yIpz?cEqY5)wCK5iO%J{I(7z!l_?TS|AN%62m%IAz
zMP73FdvQ3N&-`Y8{`&0H6V7w_)nBP%%A+sIxwxbu7a_S~>VgEJ2!ymfqAo%zFNEhZ
z$?ZU12qi!N+I4MZ|K`@M@7(y_jrjAe@7}oc?Qd>c7CC<M=-1o7U=HPyZXdanD|W_c
z_<($T^mNOz$V1@=wqmCqP4zquDE}=D0_rhN9ty5P+fkBywzt#U>1_p}eeT;t3Xi!=
z4ajG`or9fz|8Q%I`GE)(dHu7@>Nn&p6h688p$I5{l?k*QEznB6v$;bpeaVg#-rd8J
zq=zEnit+Pf<_8{~K`wo%D3?rdX;sUrQTUYkG`<&!_rhzYu^_BQ<*$UIvYDbp#5nPv
zMk0*-k78L&@C7I{1r}5v&FWI5m?y2HDmMx-^yn<Tt9)@LeM>hd9}l!&gh`_R-6hq%
zW^_EUweZyp%IIXl4Dx!55JDWmr3xcQiLjHpPEM3~PI;G<?ItHGJ9aO*IR0qyox39^
z?v_s{qC2VRnzN?io%`ix1&cZbb6&sMO8%ZjJP|=IMI5w8)UyYjdnAZXJ?4-g3Mq*N
zhRmfTq$&!zB%O$H)!*B{m&GOir02+9?|!d$NGyx&k}FD|C+DkGJ)t2J?y`01k@%?|
zh#M%}rMm}*c`cSjo?cLLCOl7EF@8Q&D~X+xElEgUL@cB(IUSJWY&hO2So$KlrCL2n
zUNE0T{wWPdH#fC>`1O*}tKk=|ty6v^D!R<Qf^#{?)BaI(UPb{8cQPaM#vNA1T`F7A
zp)>j}9J!5sDfH_KKb~aDj$;$XdXpNNGp^bf-QW{SUHNH5BgW5H<Jzgvhig2lG<Bkb
zCoduz(Z>M|?WFfsIM*e%>xNXy-~FEW)ED7^C_6l-N_I)sdUWQ}_M&*KJsl{TyTGwM
zFP{47Ge7MUmr5sOL9F%Xw!9d*%(#l*3EpDj7F&4#U~J?{G06KqbX9wnbEW7)O^E4B
z>O^Y8f;@_47R0ib3l5_bPZPY(n#F16aaQ}eu#P9f&KQ3dH$r7MX1sGFleEomwlqn-
zYm$@`NhSRBZAjuNOc|tZ{?h=dzW}5FQUED{)LMhoZm)On)<|lsGC&R>2avNS^GZMt
zAg48*5s*^{IX|j|9G5!Gw>?=#oOk|bAkKf@0peV5#JPr?(PorDvSrfjzCqGufBb}X
zF`1qH<t27N37~{_P0T<EpoG?RMo>Z>C4Aqcgx)wn_^$y7{{|oc5C8}SfN%`};Vs|+
z-~ey{H~<{X8)U!%;J|dQDI8pyY#^zM-{KWyaJ#TO>Ndz=9x^!20^CfMma_5qfh|}I
zAs^jeHfd9q_NkK)1F_!EfPuVkbxGB+_-7ZZ-P^U$8NY#cO{c;-m~*~94O^<;izXhn
z!d`7mwZYh820mO7A6Be6toVVcun1@iv<2F(zB2-CYtS|-psf<2eO~dqpWC)Uw!Z|~
z&PTRsd>evoDg;~$u5FUh%ev7zV(l9L)~GFMLj2MQ7`O=-c#^iDi=CoM6~@m*b|N?P
z8zMs%ynGLzW!jnzzVl93wbN71SGyx?L8Ks35b5eWBZzd$otQLq`n}6|7En=*;vWW;
z{u$LMuK7+(AS0?#fDl25AVd%%*amC^wgKC;iEVyRVw(^8yMP<O4d4cF1GoX)0B!&`
zfE&OK;HD*Unt7bPzHsxCTDT#?X9^WHfI6tCfr=Vy#|lfWsIiBN8eoNjYhVSiLYsmN
zRsbuQ&NXI*UOg-5@*0z%;dUWEf}bRz*ang?YXU_mwh<TG=&d%lgHjtPwSgoPz!9Z3
z)*CaxykOqebVe|59rOOsWZr;=4&^F)v19)ql43y57Uknw44Shu;y!YE*#8GK+dMP_
z-+*uC3NrWxd}BJd=>30Z+55`&CZf)*TL$WU1JnWP0Cj*m^PtWiP-pD+#YdD2pK&`G
z#OL2r*z5I{x2+IB1)u^@X|DiO>kwoB6@bcgt}#&k*aWKll#%Eu4Dv>RDZmt9YB?~4
zx)I150ds&k>p8Oo<^XeA(;0y|b(r(6i8+q&0}*j|9OC@TK%Bn;aT+2{8u3LjPAcvC
zK#ulUM_`h|OUhjlTDqfKB>_vIs8w-J_AE~Xol*?i!#Sy403CqNTLYc6%WWp<)cOY0
znKN);oh3yXurqIWTzlH7^{z4QY@4`~yl;5&zUh)Eh<%S4MOVS7sC)5u1AhL5x)-Q>
zvDtjJK}n>Iu6yx8UzfOW?Lk)IqIZxU>nDUElcOkmfwC7Udx0ET%X4HXd$D@RKza}9
zy*9>a=0~^nz`L~c-tHLQ<$`Zd!@M^O%!`B{_A~-Vv8QpZ_cZQiskdZAoPySx{8;NC
zOY~(Jp4Wy<A8>6Ga1G1@=9w$VU>-1!>0D#x**BRdo=!+*`vGy1txdjg>6FR7FAebd
z1Co76_JOX}gswI^*_R~wWLFafvU<qsA*%;WY&|9-tJiL*0O5jgThkdqxOIg4U>d@m
zI=%NtgL1z>dJpM604UOX>z&?90C^f<n_ET3-YCQfPTM$61MC2H<_a=k2e4y0*BEx*
zEB$ZP{oZ9dhl+yp&~{_KDPzqY*T9-*cUFis&k{RnZ0LkJ=yo(}T17iKNmGGObIlWZ
zXtGI#PO=o6>UE5xo28gilsr9NEzg`<Jxc_zBhD1FJ@#r=e}YiF9B9dTAq54GuXucP
z&ZyarL#4FJLMC!#^V>95W<me6XHSmj)R+%sLCgf4HNrj`?sEd_K)13<@sSuyB9-mx
zpYJXy-@+~_xSPFsEXyJvI+0Yue;{7zSjp{(OZ$v&+cCD~@w$ZDc@8{rnT%x*V?{$*
zmpx#^Hj{}xZ}yOuhciJf>hTrNgWyO(n5T`LwI@21CvjU7{SPaenYT5)sIp<=PkKIE
zE2wQ{-stq2`<2ZLVbS9C+Cl!3?DnTkjOgTB6*`3B&t_K>8qNIdNL`4Kz0!}0o}3X*
zua4ro>{G66b2Xqm)#ctG32$kBXe{Wodnsg&v1rW}NM;;G*MHfhxx-jYS!6V^#PT*n
ckA;_ocHFgEj%n`l+>12-2OzwYWgr3p0HDXF;{X5v

literal 2079
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
JJcoPm002NT>1zN0

diff --git a/packages/core/src/print.ts b/packages/core/src/print.ts
index 27d7a7db..cf184919 100644
--- a/packages/core/src/print.ts
+++ b/packages/core/src/print.ts
@@ -1,6 +1,6 @@
 import 'array.prototype.flatmap/auto';
 
-import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag } from './contract';
+import type { Contract, Parent, ContractFunction, FunctionArgument, Value, NatspecTag, ImportContract } from './contract';
 import { Options, Helpers, withHelpers } from './options';
 
 import { formatLines, spaceBetween, Lines } from './utils/format-lines';
@@ -27,10 +27,7 @@ export function printContract(contract: Contract, opts?: Options): string {
         `pragma solidity ^${SOLIDITY_VERSION};`,
       ],
 
-      contract.imports.map(p => {
-        const importContract = helpers.transformImport(p);
-        return `import {${importContract.name}} from "${importContract.path}";`
-      }),
+      printImports(contract.imports, helpers),
 
       [
         ...printNatspecTags(contract.natspecTags),
@@ -249,3 +246,20 @@ function printArgument(arg: FunctionArgument, { transformName }: Helpers): strin
 function printNatspecTags(tags: NatspecTag[]): string[] {
   return tags.map(({ key, value }) => `/// ${key} ${value}`);
 }
+
+function printImports(imports: ImportContract[], helpers: Helpers): string[] {
+  // Sort imports by name
+  imports.sort((a, b) => {
+    if (a.name < b.name) return -1;
+    if (a.name > b.name) return 1;
+    return 0;
+  });
+
+  const lines: string[] = [];
+  imports.map(p => {
+    const importContract = helpers.transformImport(p);
+    lines.push(`import {${importContract.name}} from "${importContract.path}";`);
+  });
+
+  return lines;
+}
\ No newline at end of file
diff --git a/packages/core/src/stablecoin.test.ts.md b/packages/core/src/stablecoin.test.ts.md
index 20ad0158..da4c4d4d 100644
--- a/packages/core/src/stablecoin.test.ts.md
+++ b/packages/core/src/stablecoin.test.ts.md
@@ -47,8 +47,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -84,9 +84,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessControl, ERC20Permit {␊
@@ -127,9 +127,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
+    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, AccessManaged, ERC20Permit {␊
@@ -169,8 +169,8 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -241,8 +241,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -265,8 +265,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
     pragma solidity ^0.8.22;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, AccessControl, ERC20Permit {␊
@@ -312,8 +312,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Custodian} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Custodian, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -347,8 +347,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Allowlist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Allowlist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -393,8 +393,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Blocklist} from "@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Blocklist, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -555,8 +555,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20FlashMint {␊
         constructor() ERC20("MyStablecoin", "MST") ERC20Permit("MyStablecoin") {}␊
diff --git a/packages/core/src/stablecoin.test.ts.snap b/packages/core/src/stablecoin.test.ts.snap
index bbc71162a2e38b6d0e81c0e160232629952ce6f8..d7bbd19526a90570609e5035851fa5285a0ff5db 100644
GIT binary patch
delta 1582
zcmV+}2GRNZ42BIdK~_N^Q*L2!b7*gLAa*kf0|0nM^;2mR%Ch!(J%_SeXU2W;Ia+X3
zfv7EdhQ(TQsY;PDS18?NH)#{6yN6beXTI~^yf+`uJo{Cz>u_sN{`3nfsvPvXL{bZ+
zB3+TO8GpZ-+c)ma{xH*Q!shzYSM^nDA(L2Nv5_g-qbMFjXJxC@Y{DXUJ)&sWK{%jl
z7uGyv-=OEALm4b`rUbE+gl``-T8&o86J*CFAh|<rs`~J4tMRBYH#c7@QP<-_!O`-@
z;#}((dV;%9{+xTrzKhhFR;<=kd=FVuHx2)7NPq5>=d&W~C|s(>k-|fTOj6EdGo=t|
zm*PIq>2I1z1S&zdtwE{_9F+h7EY747zNNURRKxp~a=Lf92IbD?R=Jw)JkX>HN5`e(
zQWQm*#1Fc@V8O-7K+e9K3FN=U4&;-_&+~*b*0?f>5*u_0dE*gZ=I70=JDI$hy;bPE
zS$~iGJXd5RjW>`tvG&@*nX;W&7E0NST8{^*$f+7cy-!O*V%q|x1j?wQ#92FFD5|<u
z@Eet&rcpFfWrRe28tXPk$0hxL&u5mRJj`LNRKfGR4z++Yr>`X=<AdLJ)Mj4)Wl+Fp
zXOS?iG9t|;Z0#cSxa05x%65#Z1R@alK7R^9ZImGJg--?A(Cx!!l=6)ML$-a-CJN0Q
z2T`v<e5H5|e9F|^gNLwB93PW8qfDV-#4&$}$F1bWI+{n*So$7{Mm%^pXfRkfNbIiR
z$Ki)L00|eo;10?hmi(Dv$#0jzlD1wWx+8baxS%q9@|OME$fj|*l9|Ljx^(*r<$tGh
z@#534Axyz~`}yYb#`ebA>M|_A9$FUJn|tuEQcm3{SLaJZ5oKeK_>OAZE@jCw(yMq}
zWSt77gcCc0Ftx!QtSl`*Z9iY#+HNm(R-S2dYZ;rOr8Uqi<y|c{HlJHL)EZQ%o)3Z}
z<)%Q4fe1r^=n_VD(9S{Pd<KcN%YQ>+Cp7VlNDLhk%}n1Z8qb5qXcEWVc(r}C%LP^a
zF-evgvvP{qIksT}r4rOqXituye2po0V(#3{sQ`>R(tV#{&WmCn>0Wy&pjhmAb4SL(
za>eunIXyv+2QHP~F9~#m!E^RVGk;`w^=q+9m)EBTon&+nxr!@y8WNd}qJIYWTdfw{
zgZnMGcMoi|s7oAKsh&)MgOe!$ya%o6n~0)h!H|k_5Xm8LB7V#S^5yI_kZ<_$UDyY-
z=1ksGjJVuqYV>1QcMdv5jYk(W<NO_2(7d^lN#(~krv=SRWZc9R#?H#Kt=tM@>c#{W
zM!lc8!WG7pceU8q{C({>>wj)g`s7Ao)Eaz|-Vf+mnC=7$xD!b4>@8m^Zc~!;b;+#{
zGLd|**p-OI*wJBXuIn?Z`t?NjYymdH*JT5e^{T)dl5HxD8^%2Ss>Yn8VV~lGIYxs(
z<qIaE(&gMqvoXA(JHx^P@W8SHmk7+XTwslW1b#bI<~$Q_w=yL8_<wexNz#rTy=amc
z;cG<_<5hu4qI3JXL@|JoQ74+D&xp6fHkFfTXS$t~FA|DOdQ66*0b7aZ3BI2gt3jPu
zE4`=$mNB^o0qy}^s+RYWsf%_YHYzg47!eJgj60IA`s?5!d~Ia-`cbj@`XqMrqWNls
zuN7a7R|V#)&h0T7n1A#c!B?M6BAxD4Y`U7{C@x)3b76A2dMUc@bCp{|{3}D&-!G$v
zcx9^@8SO8F2|SOq78p=|#+h}xs;{Ucn_=4t3N6uv9{<9NE`=k8o`#E{1=I1!vLZ1i
z#ILywj^RV>ih~r!H&HNW^~l{po1-IpXnJH!XvFAu3z`J*Nq_iEV!qo&G3COP3sWw<
zg<QCs!v#fMl!~}sPR0D63>E$^cEx;3h0CFWSt(ZV1WG<v8&awc()_bWdBtjdqoSW<
z4U@Ge&N7layOgPVP*dtUSZ8>s>JDY74XHEYV%?>OXj?>L*1*NpwZ$*CJ8MhJiItw8
zB3EK%@QpCr0Y?{IF8VpfmR)Y+g0Zq(*b~>=$jNk>s^<{78@x%*`L^i&3?Bb0_N(Ei
gfukMD&P7Nga>ZUgM;FGt*YGm>e<6AmI`BXM0Ke-PrvLx|

delta 1571
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
VnVfP);x#;s{vUuG+qm#R0039z3<>}M

diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 137cc5de..21cd19cf 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -122,14 +122,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -330,9 +330,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-      import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
@@ -521,8 +521,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -853,8 +853,8 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.22;␊
       ␊
       import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index 52265f82a4b318ece87b34b09d40d5d607a59902..5a941ec662850faa8440ef0625e5069a89cc273a 100644
GIT binary patch
literal 3459
zcmV-}4Se!JRzV<BZeeh9Xm4~Nb~6eC0GN?eEKACVUYQ@XbTK=G(YF27^A%&}6EJqJ
z@5uzx>>rB=00000000B+T+MGBw-ukY<HViBO#`>5et=%L#md;7krX&CWXp(bDTNTr
zR`ro4b`ph};qEe;A;%;~^4jpB=%L3Rdg;fZAOAps{sRSyqNnzpbN_{2dMZ$GNY2j8
z&hF~_%cFy|OFq8$`1tt9_amu4wl@RnZSi0H2?;C$^d(~6^dxA<L4Y}d5${sLfA&Y;
zhXQ``t;vhl8<za3U9P=;$Fi(@mSt^RvaD;DE$huUE$hxz%eq>7{hivSImTeGRx_X8
ze*0~!W?QvOR_!h8YVCsc&Duq)cIll9Z(h27&5b#8H!*P$*#?`CcWwJRxZg$I7Qk)L
z!2)0oFyR6Q0rG9!2G_t&7kk~L?uU1Q>!WR##6e(-E+RGn$m>#2m$e=ZLr8o;r~qvm
z6W;-gic`{9RteSvumdr1>ayuGEWniA#yKTEkWE={s3L93I%tF{s(yqrMnGO6u!<1q
z3K8)c*WILa%jqD|R-_K^x*a40CY=@+kO}0wS~n;#B?FyVMIw$;K@p>0B2TDJJOQn?
zR8lb(Gz{wCvwRO02^JUz_&Fw>A`{1P>b4EQb#M=QTX6(_il0N~1A)RQfC2%ApdTV2
zD1h4(`v42Di6kSsjo1#uLL`#HZLqR1H@~#tguedNqR*YsSIkot5a2M30yNMWpa%jI
zEI_N(rp!a2)grVdO`nuKjWH62pR)a<2$9Dqico+FxKD{-&=WkvY>>>Q5hBm^mzHPR
zyubai^NI6#xX2Y0(rpA{LJ;zipLQU%R2v6Kie@3;%yaM4m<YriP6J)&F&v40dA~*=
z-Y*yZ^3<Y611=~-Lxw0j2+H)u_H(`u7z$w&VbYPB;<k35eyJm#3F$xpXcsb0R0ntO
zf;^oxGfuti{j6Qx)UNJqfH#NOJVRB+K2drZu{LF4;ujdIsjr5|1}YBtK5+DBGj1WM
zXC=-gL_5lCG!{`T>e<0n9hj#CIdvNa9HnIiF9k4=#_kzy@N?ulbva3OaIDo#bo}#$
z>tHqS>dV^I?X@oEDN7%PlyJeIKpa3BM6s7Pi8%ru<j4VwN$(H`J6Lo91jclrg9wt1
zeX!XBPjVANIm%}Z6NZ!poUCaakB06<6Trj?<+K5!3q{JlnS?c{ombWQC<<tg=LsF#
zzMjs@OrWuC83>=GQ8*LkKqtmN>Z`ZMC^=z7W}=(uqBNq|UwrX}E!QN#W%zV>Hz|>A
z)({tl+;l+EtGFR;krK}*-5n(VgvP*w1aKV2$vlMGG9e;D4hD+}G0l|yX0k%GNp)CQ
z>aEc&M08k4WG9AOr2+P_=xI91Z@k$=EGWY;;4atATWRx&WROD{NHCF8D>0^%dhi9~
z!Czf)U9h@5|8eU9_7LHywdf-va2q2w1C|!o?1;fm2!W9SKA&`c<V;WBwrw0nlnL-+
zHIe!fv>6TcQrhCecU8IUYW;Rf>`}sLfCi~`MS)yf%#h2Nn;J18w9`4F%av5Q6VRVt
z$PgA2FY!i>#Cp`208zXdU=O@_X=iI$Ofq#zV02xu_Gtdmj9i{&gkgwt#Pu9PU>h<F
zHv`1MCJN|IGl{4mCNfA#50Nx&8U%Dl4k|~9oEgRWM)GGnbP~tE$0+nY$VFq~c2c2*
z0Uxzt9EdqT#01QOJ5rHcnIY^VhVJIuMlj}xnO6GS2>KAq<;l?NZzc5F)@r5`4}n=g
z(2gl?WYueGu}#fR_s$G=Ks$}PS=9C1LcZLJ{D9Y+Ms~vpn$XP?tI=q{Xg6FNfS2~m
z)YC5-PygQKah~qF;64o_DDY;0R0uBLdVtSwI+M=iE~dtu=ONCMhBPovJZuq#39*}N
zQ<x45EBB`-$MF$z4BUiN{Vrp2FJ?qK?p~OoX95w9DdBF8M;ZSQ0?4~dn23W2NSTyL
zScWk_Xb%jJQvQgA_(19_4rRPQq5|=Quud2hI6tJs8_zWsIN+|L9Tr1n^i0GwL2jV+
zS7Ws%$oZ<NO?s`rBzo%4>1gWEy4e$mzdLQ>t&9i)5&@Ry)>ju+HdY=zSOBwN3wa*g
zn!fp7qn@d#>-j#6$I{}%wNf6L3dtjlMS{hipsZ0Ab(@8F+APG&iG+*%N&4BSFZDoT
z$9fagm)1V47YLMvGGwa$MM|~NVUUOw8lcAf!UuEf57sv3=9d;9CTcfxx@kKUT4gL{
z;%}Bvs@({A$Ki<hvOm+4lat^En3@DPZU7&7ID`RjOq4Uvn6MDkUn+a1>uDmnzoJqS
z^or_DWV@~D%bCSwuk6wm<qQ)mn2{8;31Upd^v(AG3}u=&C@0hLoScM_WS|@7#K{dr
zZWCbSa{w7iGHix@!~sK3W6abR-)sn-g323l<U@f{t>skjdt<f_+c1bx-|v!9A}~k`
zjNC?cp7$qqfASW6lgANaj!{G@AO$Od<(4K%v`Mw5J0v@4l$q17+ZgQ(QPYGL6}|c#
z7!olf95i(Ai#n@%t-4l5DPi>OZx~)P8-{<^4!$*(ImqBvSC$@lpDUTjIGy~JT{W>=
zd#%|q-L^;Ve@E>!w?jwPG^QqoY$^@G^u&-|q#<}$6YO`pnBS$##O)yrGm${LjOh#K
zh>3-#>5kDM38{?4X}G<uH;EcmeX3B^IF5J|Fd86U0<Qk63|#&24a@qjZCSs(Vp(&0
z23P<4dIhdl;Oc1vSCgSwk2(zcXkSQcD^`u=YBCCS-92kPK!!1|K-^;lakIne?i=eJ
zqd-o`Zk5>ux-6~9Rj`l|3}mOeowHhLO}mZ3ED$V4!)YKFV`(;H9QYd&jvGsgo(Tpw
z6o?IG!IMwx(w|@lJ%BwLi%;vH4YobgK>A-RApL9u>1M$>NkBcX!wCcH8y8PEux=K2
zLqBq@bq#fe&L1W^ug#m{?dkVXh(4pwdSEu)oH=UttgkPxF3YNhPI~LvfoSSNxQQJ^
zJnEzSFbEokq#vJ~ppc9il_pe5JuwviH@RG*Um3=qXm^wV|L-rIG{C>!-<OO*VRKuU
zGTcAIstiBgr=)?CfiYqf-f{@S%8~Km($i&XuR;^|(-?P-NiqDbFR$*iUs(|aHly(L
zoHiO@%QVe_=ehD>e$fO4>0@B^_2nP0%*~gA;<>667I$42yzj+a&~S!6PZxt$OgL<#
z7L;)_i=7W(={b<p#|gC9&tn-M2F&*3(HJ;BjZPVyGi9H}6*GElBzE4Age5@z?INKX
zkRo}GE;m4mGFM+1rj+9F;QrkBWrB9Oc{gAzx|HGPNNbf^nV_9Txe1qxquMo&0FVtT
zo)g}0V31p7|5AjtcL<jcc8#!}(1z#aVA{;?Vi-_+DmD`%HxWmS{0hXpThmh-`lUO`
zDd!;gd-d<5z~7%-u`KjX1^!mxZw3BV;BN)~R^V?1{#M{`1^&Le;P15x{Cy?BUme>X
z$*V*L#LbnRB#@g`<P5;KwbxDnzFk<ke`|W`paAEs=_z-B({Ur3k5uw{FbsN-$tlE5
z^LB26L8XU5qo)bc%uUY{+_H#S-kP4;4QQ#2p-6Kwb^}QsEnJxBu@`{wK?M-*2Oumg
zOGEE*p4<v_l9*qJm^U?b^QOul2Eo3se>mzH{qJnc`omk*Gx`ebJ0D<Q^^E>(fN<3_
z`U(I#wE)m7|BSv<J)=L5Sk0Jc?j`Bfu|I47&)8RLM+2M49rUgrFiT?dw;Z<E<=c2o
zJ?7oA6qCXN+5yYn_~ynh`$ShVXw*&62zxQZ?hEX{%sk}P+#7>DUKA5(IayW~8(c8y
zyderH>q$R~8P2^iRc@F``*lN2I^wC~uV1;RiepmT-A>rSRCAr-U1pjw!;MLqX_om(
zA?JMd9g}nl1__TKLqv?aaPoN6g_GclWqtLH>cUBtgPxBZw7PIo<+{~{lj_1rb>XDK
z8>$N@`@tXXR2NPv5MzHAPS*Mf$@o*htgLf<7v<xz)9L6ym4jYJ$zm<%_BzTgZ;BLb
zP<B=19NY|%z0_AjhCva#y&ZD=&{b4j@i_h~9w!|0_jvo`Xdt;j&GuopK;E*3-2(ak
zWy|{C*DUK-c6AG+Lg3B^0$1GvIUC5>dA<emmkO0R+o;U3qcJ9YouZ2%|2Tw`*rUA&
zVvLsGzxGWzu!S{MhYY3+#X9;D2aj=0P2(u9Ta-cqKevt%5-71gcu|%;JwD!p|9$&T
zNd}a5Z0||X7`GVAAXaIJL>H4z38E+0_#Ta!3g;3xD;(W_TPF&+llu@7*g<~D$^FG)
zC-=a%tbbmytdFXb`zmiZCwW74a$n^q)yaKza(`So;@_$q@oeXaCw6k5&lOMA;r(x3
zjl=uXl6ao&Q+!P~r`}|XUZH)z{7`QK<VI;v2SaJgva_L7+v1&oG6W!#=AGQlfSs|&
zl}GkZhL=>zd9V|8mA5i?7|Y|jCQu4-44&Z+Q}gtm+V@?0+{t~eZ@ClsK93Ox=f6FJ
l2j`~*KicCVdP&IL<3ChAHIa2(I6Wlj?EmLb4B5AU002<4jFJEV

literal 3459
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

diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index 29e5004b..2b89bb88 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -13,14 +13,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.22;␊
       ␊
+      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
+      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
-      import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
       import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
       import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
       import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
-      import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
       ␊
       contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, AccessControl, ERC20Permit, ERC20Votes, ERC20FlashMint {␊
           bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index 8628e95395044f6c5b0946de712aeb914a4f9d47..d90eca646e921c755fb64e85ec9b5a479f614102 100644
GIT binary patch
delta 2199
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
ZhZWx*W)Lw`e$7fX{s)=K47ji}003@DN9h0n

delta 2222
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


From d6edcf9628601e754c92e918c62f1008f92063a9 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 20 Nov 2024 08:59:39 -0500
Subject: [PATCH 17/18] Semicolon

---
 packages/core/src/erc20.ts      | 2 +-
 packages/core/src/stablecoin.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/erc20.ts b/packages/core/src/erc20.ts
index cdf83045..2a5e1afe 100644
--- a/packages/core/src/erc20.ts
+++ b/packages/core/src/erc20.ts
@@ -187,7 +187,7 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addImportOnly({
     name: 'Nonces',
     path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
+  });
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);
diff --git a/packages/core/src/stablecoin.ts b/packages/core/src/stablecoin.ts
index ab4348ae..1f6537e9 100644
--- a/packages/core/src/stablecoin.ts
+++ b/packages/core/src/stablecoin.ts
@@ -274,7 +274,7 @@ function addVotes(c: ContractBuilder, clockMode: ClockMode) {
   c.addImportOnly({
     name: 'Nonces',
     path: '@openzeppelin/contracts/utils/Nonces.sol',
-  })
+  });
   c.addOverride({
     name: 'Nonces',
   }, functions.nonces);

From 703c249032e435c1c4509d3e245c5ff429b523d4 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 20 Nov 2024 09:21:08 -0500
Subject: [PATCH 18/18] Bump version

---
 packages/core/CHANGELOG.md | 2 +-
 packages/core/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 06733459..1d70d94a 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.4.6 (2024-11-20)
 
 - Use named imports. ([#411](https://github.com/OpenZeppelin/contracts-wizard/pull/411))
 
diff --git a/packages/core/package.json b/packages/core/package.json
index 079494cd..7a04a2e0 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",