From 84a66b9e54e4bbd7e9e0069f9d2fc5e986d55954 Mon Sep 17 00:00:00 2001
From: Hanane Bendisari <hanane.bendisari@gmail.com>
Date: Sat, 19 Apr 2025 00:51:46 -0400
Subject: [PATCH 1/5] fix: remove redundant quorum() override in Governor
 generator (#218)

---
 packages/core/solidity/src/governor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/solidity/src/governor.ts b/packages/core/solidity/src/governor.ts
index 2ffaa90e1..f96d0a9f3 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -113,7 +113,7 @@ function addBase(c: ContractBuilder, { name }: GovernorOptions) {
   c.addParent(Governor, [name]);
   c.addOverride(Governor, functions.votingDelay);
   c.addOverride(Governor, functions.votingPeriod);
-  c.addOverride(Governor, functions.quorum);
+  //c.addOverride(Governor, functions.quorum);
   c.addOverride(Governor, functions.state);
   c.addOverride(Governor, functions.propose);
   c.addOverride(Governor, functions.proposalNeedsQueuing);

From b690ee1da60855b68e6faa0c3fc90ac487c00992 Mon Sep 17 00:00:00 2001
From: Hanane Bendisari <hanane.bendisari@gmail.com>
Date: Tue, 22 Apr 2025 22:56:44 -0400
Subject: [PATCH 2/5] fix: restore quorum() override location

---
 packages/core/solidity/src/governor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/solidity/src/governor.ts b/packages/core/solidity/src/governor.ts
index f96d0a9f3..02465684f 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -308,6 +308,7 @@ function addQuorum(c: ContractBuilder, opts: Required<GovernorOptions>) {
         : `return ${opts.quorumAbsolute}e${opts.decimals};`;
 
     c.setFunctionBody([returnStatement], functions.quorum, 'pure');
+    c.addOverride({ name: 'Governor' }, functions.quorum);
   }
 }
 

From e1c83586d57001b0439a88a293146de99b8d62eb Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 23 Apr 2025 10:43:36 -0400
Subject: [PATCH 3/5] Remove commented code, update snapshots

---
 .../core/solidity/src/governor.test.ts.md     | 160 +-----------------
 .../core/solidity/src/governor.test.ts.snap   | Bin 2460 -> 2414 bytes
 packages/core/solidity/src/governor.ts        |   1 -
 3 files changed, 8 insertions(+), 153 deletions(-)

diff --git a/packages/core/solidity/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md
index b53ef7dec..1e991ec3f 100644
--- a/packages/core/solidity/src/governor.test.ts.md
+++ b/packages/core/solidity/src/governor.test.ts.md
@@ -41,15 +41,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -136,15 +127,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -228,11 +210,11 @@ Generated by [AVA](https://avajs.dev).
             return 50400; // 1 week␊
         }␊
     ␊
-        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
+        function proposalThreshold() public pure override returns (uint256) {␊
             return 1e6;␊
         }␊
     ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
+        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
             return 1e6;␊
         }␊
     ␊
@@ -320,11 +302,11 @@ Generated by [AVA](https://avajs.dev).
             return 50400; // 1 week␊
         }␊
     ␊
-        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
+        function proposalThreshold() public pure override returns (uint256) {␊
             return 1;␊
         }␊
     ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
+        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
             return 1;␊
         }␊
     ␊
@@ -427,15 +409,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return super.votingPeriod();␊
         }␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -532,15 +505,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -635,15 +599,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -730,15 +685,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -821,14 +767,14 @@ Generated by [AVA](https://avajs.dev).
         function votingPeriod() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
         }␊
-    ␊
-        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
-            return 5;␊
-        }␊
     ␊
         function proposalThreshold() public pure override returns (uint256) {␊
             return 1;␊
         }␊
+    ␊
+        function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
+            return 5;␊
+        }␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -929,15 +875,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return super.votingPeriod();␊
         }␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1033,15 +970,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1132,15 +1060,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1227,15 +1146,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1322,15 +1232,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1429,15 +1330,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return super.votingPeriod();␊
         }␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1533,15 +1425,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1640,15 +1523,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return super.votingPeriod();␊
         }␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1744,15 +1618,6 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function quorum(uint256 blockNumber)␊
-            public␊
-            view␊
-            override(Governor, GovernorVotesQuorumFraction)␊
-            returns (uint256)␊
-        {␊
-            return super.quorum(blockNumber);␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1858,15 +1723,6 @@ Generated by [AVA](https://avajs.dev).
         {}␊
     ␊
         // 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␊
diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
index 6eeccd8ef69a4395db5594c4979a994d7596cad5..05c3e933c6c9f360e23a3de1d3917de05f06560d 100644
GIT binary patch
literal 2414
zcmV-!36b_eRzV<BZeeh9Xm4~Nb~6eC0Ks)=FtF@!mu}?VMYz6oaefQ-hIYtX0yy57
zUP4msU>}PJ00000000B+olS2XNg2lj2q8I%wA?@fZ7I7FlhxQgo{h6seAtx|0hZWJ
zR!$HvVy$*}*)FBKs#8^M$B80=#5dSauzUn=9JvAFj94L#NF4YOs9$QPt6yfu(=&0;
z`0tD3?&{~QtE-=1KUI~lj*kN2Jy&1;foi4$`jVW8Gb*`|<eceK5=jvW<pxBbN~%sp
z;4{VDNSz9;e)pB{yW0Kbt&hKT<2yH!pKpBo#&^FtxaBzH;K`$3Z2pXSlq<Tq?^CYX
zF{APU`E>v3hU1WjB8*(kjslwLc^pyxD;h;KV4OS@Tuax}ihQxNHP{+#MAAJ8U7|$5
ze5NnR7lW<ct>JKQV}pf}kea;yNpAHUax6ti?tCI5%3tLI9nT1KGVfgOQO8`er9^ON
zuOjK8h`DC`<bZ`yKrbPezSNW}Cb)9yWi=>#%0imli`07&w9{A;)}Zp|LQ~aFQ7U4R
z_|Ib@<M79cEGGB@l-UAHs`oGJQmk2^oc%gCN-+%RWqMcj;#~TMX-+=9Fn$rHi1~M)
z)c2b4@zmDRpLS5jCrf6K*BgWo;t8&_j6E%6FLRw7YVn-%KB?MG4t0L)ZhCR@W5oCF
zjGeesJ)Mf~WuhC-+J^V;RhyM8>XpoS{bnQmeH`;t1UVB)&>qpiz3AN~QG66Ik3_Mg
zBoQc?Pl=>DmRylu%(x!z+`pU0CHcwDk)6T4!C;R#4%sH>ls-?-*Q<I$B@_O#b(xX)
zsTqh{DBPyoyL&|~jzgZFQgSSUK%6svGE%FETac}Yq%UG7sZWkB$U#0FZ<Q=n+SSx(
zAKAU{k8f>e_vp_vM$boo7+t;U15xS;cS~+5(tDCCJ4j5(`$yS%6-UX#m>O9yZf|1L
zKcm!FpT{(2{N!p}I}+w_gGaTdPId6`MNDJ*IHJ-`?{|%Jed7AQq)PqzHzcH?kQYR|
z@`P&DCwc4fnKL(tlhNtuLes(po*M*7vS7}9I3zw*o@7y?^{1{n9lOl9PDasSF>y;Q
zytg|sa+MeqeIL1MJS(_TcA+7}^d<FTy=Flk$1)FM)yoBk(Mw*eL2t$4ROyV#kUX(B
z=6)`$;|bZD;LqYlsQkuEc5ZBvvH8u0VUKrh_V8k*MMzRWA<0X>iXJ!rWueF4Zvs7l
z9zYME$10=8_F%C4*4SgBGGGC)V0|)H0xSR)bR|xe&Il}M!h#>xVu4RR7P^6|fr9^8
zQ1EX+!8M11YnYjLIr+v1{Uv<Rzh6JrzepKplvt$SQa+2rBPtiC43q#$Sf2!zfD%9n
zU5QhrGlCMDDB*iHB@8A3!hbD5_!@u!KmZ^R0Kysr!dt`xzyaU@Z~!=%H^_hkz=7>t
zTR1qg*+5a9yv1wC;C5*~(QS~yJY;Z?2e_RoBW3OJ1Cy2(LO!OytkX0m<5Mps2I72>
z0|WWM>65x+$<+R<oej0njNd}LwyCfQ=A5rj%a;20qK${0u-6z<Z!m~zg@~%=gTNJc
zu^Nj2gMdN6;MI3Vz+eLm#w8fkLb@k4YfEl_X|dq%!GiO#U>4t&D3}QW34#RM)WGs?
zw2C0O!s}VOQdmPN>bio{Vb+2!HmOruCcP*>QOK1>Np>DQD(6e|^5JUU1kX4<V}{os
zTMLE*!-3(hzB7X1W}NLur8gX$B}q`tY`?E9j{6&C`(5+det<0O5dfwFQ-P^4y$>`1
z8t7=8DxDED&_n~@uh76p!)@RIZ~!;}8~_dg2Y>^>0pLI<gA5!14%p7M#(^I-;s6mL
z)7TjRaDbfwurt8QW!I~|Gr$gZ1^_F76~GGf1{tgXR<NCG%?g8NRxsNHOoN8orHTR;
zieS?Klr2^Sim+)wvT48oTLxgu0BjkseyD{l1G=4<gAzfBo#~9A#3oAoflY}Kl^*3f
z|452CW+)>8);d(d>M)vJo~rJn3WhmmfEf@0hyX+YBIpVcl;)Tn=dWuwm<k8CKDOXs
za0_q%H~<^~4(5P^9l$|@u59#uM7anVchf<9{wZ>U!2na&fFM8+AjrHy27&-VZ0A}d
z$a^+|6q77sUizp_06%~qz>nqN2iCu%HUTgI7yt|a1^|Q3fWf;q7<eL#M9lq3Q1BlM
z3jP5oXbA;b#1};cnY8PJ1;%3&foTfQDEEbQOh<Pr0+zrXS49T-vpf|IDlzB|8Dw?=
z4LXem*-ctcHfZz>a4=`!KnF{TGVoyD?zr-N(CA%jK-jbaA>G`Cr<=R<NgO4<Ct1B&
z|6a4={ht;t{1q$SvEqHbiDZom6>GiX{iC5--0r&<`P%luZgy;#=Hx0piUsdj@QwxV
zYgmWDg7>RW%TYo?38{;5y7Z&lc|=@V32A!*A#%YtXQ9NKB}zn52{X+AaF}Vf(lgDr
z^YTtQBF?}!Z5EyE=EbBOT#MRPt(pYDsd{wHYe}F4P(l~uROyVMgeFS3Z&O0@0#@1$
zBjTkKPD0_+84F5(wou`ZC@7(z1Rhxt9$D*xQd&q-eUpQua)ineDo1MxR;V0xI}HaD
zf(bj*8Nq~2O!#0HCY-s1^cRZ@|AZ0}N=QI9l#o`tgp?xXEQm9=ikw!lX&J}{cmO<@
zH^{&P;DPO2Ydm<r^8alP2WMH<5l1J|^%Ekfg1|e!wLsv-J68w-&r&;SV(65tZ8IJ>
zt>c4&q?u5mz2>O|G2Nt6Cs~S3%{nIWz*0;pOP(D_mS;|*o+Tp7K4+S_0ef{>e<CSf
zUKq(mAteQm&v|lm&ZxPbN0oA_LZ*^e``a{8W=a3EXHO31)L0B;Nz4=gw8B0f?h68%
z(6F{i`H`3ijJ55WpYJ}Y-oid9xtqUv9LFJ_c(KwVd>~$#SgFmJEBBagx(VnMfwTgs
zMRGdynM!1jVnwBD`rgh)ZKgAB(d-dljxs?b>hU?JvP>8SJ+kz|Jv=m_JWLwdu)J5(
z%)YJJMYRo6f3ovAT{pI}Z*+Fez1rrbuo&@%wu_hKw?AuQMW@)R)FCW?)_Wh3apvd7
z`cz2v$~-D2IU}5&?<aRTq+F+I`V6V=_y7+s(s)~+K)U?#;F2TE>VHyb?=U_zEHaw-
g{O~qIkB<@y?YJxTsiM8hbAQ12Kf7PpAS(3$06e;V?f?J)

literal 2460
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
a@Uqa3yH?9F&0U^*k>>y0Uj*bJ0s#Qbu%r?I

diff --git a/packages/core/solidity/src/governor.ts b/packages/core/solidity/src/governor.ts
index 02465684f..cc86c14c6 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -113,7 +113,6 @@ function addBase(c: ContractBuilder, { name }: GovernorOptions) {
   c.addParent(Governor, [name]);
   c.addOverride(Governor, functions.votingDelay);
   c.addOverride(Governor, functions.votingPeriod);
-  //c.addOverride(Governor, functions.quorum);
   c.addOverride(Governor, functions.state);
   c.addOverride(Governor, functions.propose);
   c.addOverride(Governor, functions.proposalNeedsQueuing);

From 74e347d2f7ca20c2cc7aef646dc75e1288734201 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 23 Apr 2025 11:00:39 -0400
Subject: [PATCH 4/5] Update changelog

---
 packages/core/solidity/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/solidity/CHANGELOG.md b/packages/core/solidity/CHANGELOG.md
index 696074ed9..fa943c975 100644
--- a/packages/core/solidity/CHANGELOG.md
+++ b/packages/core/solidity/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Add `account` contract types for ERC-4337. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
+- Remove redundant `quorum()` override in Governor. ([#522](https://github.com/OpenZeppelin/contracts-wizard/pull/522))
 
 - **Potentially breaking changes**:
   - Update pragma versions to 0.8.27. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))

From b3d62ac625293476e6e9cefb774cb3868b5f4c3f Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 23 Apr 2025 11:26:46 -0400
Subject: [PATCH 5/5] Remove redundant votingDelay and votingPeriod overrides

---
 packages/core/solidity/CHANGELOG.md           |   2 +-
 .../core/solidity/src/governor.test.ts.md     | 104 +++---------------
 .../core/solidity/src/governor.test.ts.snap   | Bin 2414 -> 2385 bytes
 packages/core/solidity/src/governor.ts        |  17 +--
 4 files changed, 26 insertions(+), 97 deletions(-)

diff --git a/packages/core/solidity/CHANGELOG.md b/packages/core/solidity/CHANGELOG.md
index fa943c975..5534f0a6b 100644
--- a/packages/core/solidity/CHANGELOG.md
+++ b/packages/core/solidity/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Unreleased
 
 - Add `account` contract types for ERC-4337. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
-- Remove redundant `quorum()` override in Governor. ([#522](https://github.com/OpenZeppelin/contracts-wizard/pull/522))
+- Remove redundant overrides in Governor. ([#522](https://github.com/OpenZeppelin/contracts-wizard/pull/522))
 
 - **Potentially breaking changes**:
   - Update pragma versions to 0.8.27. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
diff --git a/packages/core/solidity/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md
index 9e345105e..d3f9d9ffa 100644
--- a/packages/core/solidity/src/governor.test.ts.md
+++ b/packages/core/solidity/src/governor.test.ts.md
@@ -27,6 +27,10 @@ Generated by [AVA](https://avajs.dev).
             GovernorVotesQuorumFraction(4)␊
             GovernorTimelockControl(_timelock)␊
         {}␊
+    ␊
+        function proposalThreshold() public pure override returns (uint256) {␊
+            return 1e18;␊
+        }␊
     ␊
         function votingDelay() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
@@ -35,10 +39,6 @@ Generated by [AVA](https://avajs.dev).
         function votingPeriod() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
         }␊
-    ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
-            return 1e18;␊
-        }␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -201,6 +201,10 @@ Generated by [AVA](https://avajs.dev).
             GovernorVotes(_token)␊
             GovernorTimelockControl(_timelock)␊
         {}␊
+    ␊
+        function proposalThreshold() public pure override returns (uint256) {␊
+            return 1e6;␊
+        }␊
     ␊
         function votingDelay() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
@@ -209,10 +213,6 @@ Generated by [AVA](https://avajs.dev).
         function votingPeriod() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
         }␊
-    ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
-            return 1e6;␊
-        }␊
     ␊
         function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
             return 1e6;␊
@@ -293,6 +293,10 @@ Generated by [AVA](https://avajs.dev).
             GovernorVotes(_token)␊
             GovernorTimelockControl(_timelock)␊
         {}␊
+    ␊
+        function proposalThreshold() public pure override returns (uint256) {␊
+            return 1;␊
+        }␊
     ␊
         function votingDelay() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
@@ -301,10 +305,6 @@ Generated by [AVA](https://avajs.dev).
         function votingPeriod() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
         }␊
-    ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
-            return 1;␊
-        }␊
     ␊
         function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
             return 1;␊
@@ -391,24 +391,6 @@ Generated by [AVA](https://avajs.dev).
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function votingDelay()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingDelay();␊
-        }␊
-    ␊
-        function votingPeriod()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingPeriod();␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -759,6 +741,10 @@ Generated by [AVA](https://avajs.dev).
             GovernorVotes(_token)␊
             GovernorTimelockControl(_timelock)␊
         {}␊
+    ␊
+        function proposalThreshold() public pure override returns (uint256) {␊
+            return 1;␊
+        }␊
     ␊
         function votingDelay() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
@@ -767,10 +753,6 @@ Generated by [AVA](https://avajs.dev).
         function votingPeriod() public pure override returns (uint256) {␊
             return 50400; // 1 week␊
         }␊
-    ␊
-        function proposalThreshold() public pure override returns (uint256) {␊
-            return 1;␊
-        }␊
     ␊
         function quorum(uint256 blockNumber) public pure override returns (uint256) {␊
             return 5;␊
@@ -857,24 +839,6 @@ Generated by [AVA](https://avajs.dev).
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function votingDelay()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingDelay();␊
-        }␊
-    ␊
-        function votingPeriod()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingPeriod();␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1312,24 +1276,6 @@ Generated by [AVA](https://avajs.dev).
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function votingDelay()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingDelay();␊
-        }␊
-    ␊
-        function votingPeriod()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingPeriod();␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
@@ -1505,24 +1451,6 @@ Generated by [AVA](https://avajs.dev).
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
-    ␊
-        function votingDelay()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingDelay();␊
-        }␊
-    ␊
-        function votingPeriod()␊
-            public␊
-            view␊
-            override(Governor, GovernorSettings)␊
-            returns (uint256)␊
-        {␊
-            return super.votingPeriod();␊
-        }␊
     ␊
         function state(uint256 proposalId)␊
             public␊
diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
index e67b4daa071cd6332a6713c221af29bf1148e618..1e58b118d444bd65f00d2e21e48bbe1adf1d6470 100644
GIT binary patch
literal 2385
zcmV-X39j}*RzV<BZeeh9Xm4~Nb~6eC0NGeqXcYH7j^xXt?PO18jCCTLGRZ9=lu0qO
zmdIa<dLN4j00000000B+o!f33#~H`n21Nl`0n)n`Xpw;vpmacKDb=zC>mmVcG!@Xq
zPGuK8AQ4u(BWdE@nf1)9B-${L0)2x#LHZVbgQUoH(4gpLfnM|>iaiX;*#k*&Noz^{
zbz^gP_B+k&?)RH-hWzUIC=lK=_2u8FW;&o3<V2iN$%Q26OrMfSibyCoAo^5Nbt(d%
zDegw<RA}{=uYBLt?jP6Rf8)lFZzO*|_|c7@{IIv~IOO2*!#`~NmU)yby0Pz5uGul8
z@;>=!|H+!;kOv}+T+NOGn(28IQT`_yMKoZXJP=$<*VBr8wzJvW?5#!8JqcZ+M8JHe
z`{c9U=I-Y9y}h+H7Dhs9^76yn>R04gijds;Ktz<k$OSr{5$I&zx!j|Uxnxs`;MQJA
z(gP85&G^Xy3!{KuLN2|~lq)8<a;jz3D15>~n)F5Ly$G6VEC{Pn`Fo+MYNjX^F;4s^
zv5;~2>qHh4d=AQNfd$q3mvt%DEKtsVl^cZ^2J|wct9)@Tea$o{AN7r2gehYF-zC+f
zW_UccweZmn%J5{t4Dxb~5JEh`m6oxmh3sUmlS3_@QQjqGyUC%>kKIl$PX3Je&aI&n
zx5}qe(Va|m%~{*<&Yg0zf<>KzIWJ$WrT-qsJQXo`WIZuYtj=u`#YX}2NEAy-60wr`
zlt`*$$rb6ujO*>4ySMY`B!AgCvPHLc_tJw!EoUO>nuj!S`wisp^zQU}d&F_b7CEQ%
z*%(!isbr#wFXMDM4ta7)$*~9manAV3K)E9Bh#EyCeI7GOeR9+%2l?Z8vtX~%uBOJ2
zL3ix?!>-L-7<@cq^nCEa=<1Yjh{8y?UGPwm&f{F!L1IEaK8kTrag^MQsgWbbRd=&#
z@G+&n`Xr_?<0n_++L17aYdoqnb)tiZ&tn?XM-i27+TRt<b&2cyk}CD*Pf18aA^SwT
z@`P&DC3)-NnKL(tlc&>BU(=BbJU0lEWWk*I)i&{|@+6BAt-o>A>Ck1yb@CJq<`cKX
z!aKWTBUg&SsP6+;jb|gS6kVtZF}<K(tXC|^!&v4)EPFZUFnY<0HRvo^oJxZ+c{-0B
zjk%w58+bx?#`rV8Csf`s<DDCtWNd!5X4vCxn?1Z(X%UhXP)PF9FQdoJe_819?M<Ku
z&;#fJ^tc-Im=6?e^?JLnjS9vp0~P=aRwrX6zye@FTjEq2jKG3AEcitw7WmX-p&O_Q
zDEOZR1^)&VTyrS6hM9SrlkcmY(7$^f=JN--o~Mj6NG#I1l#k=^h|2lJ5R?E)Se*ox
zfD%9nZHZH9FoF{5DB-6zCG^Gt!hbD5_#S`&KmZ^R078=70uP$v0pI{|05|{~%o=3C
z0pP%Pt|=Ux*=(SwPF}GUWU&6yB7*>18D=7bgFL{^R2eBNj~`gHG#BzQ<7JhWF&Upa
zX*y4w_wsC>yytXD)v;v9!qu*ZLdJhxGyVz=Z|aK~|1)Mh6&3+j04so%s~?Pjl^R%y
z3$UVvbWbYwKD_y*#VUV&6Ra{5t7P$Qh$@*7kP1kpNsT5SM#~5)OT6ErEmawS({%->
z!>k3JZ&IhUOh!?DVkB1@B-wfJsGKd)%O6*>CV0l_DKot8&{{AY7!C|~^@9-%H|1(H
zD!uLAS&{@*tVa9Z;<$fcHQF^_jRwfV9(FJlm<mjV<!7J)&_GM$R2qz+fjS!aS&0Vj
zZEpbwfCIn*-~ey{H~<^~4gd#Q8D!u9aKLu1F%JB)76*t3na0j_zyWryW9K?{uD|A;
z>pR%F4psmwfE8v9GFSnuU^~~C6?*loV79SOf`;|J1r48LQ#&@bqinGxP=rnG$)@%m
zwzSXVZ3Gm+miDDiuuIVb#eia3GZ;ZJbrkdS!mo-`=~1rpNj$89LYV_F(V_}Vi_zio
zS^r(Efx;Rnzzm20L;xZH5wwK}3TvQ_^VhW-OoW5=_boW+p_~CY02}}gW`Tnpz`@w{
zRSzi_A>(fP5O4Au<2@{`0)hZRfFQF583+Odv7Kv-An(`+GMZ!&^U_Cc0{8*^0Dde6
zKd?U=wF!U$zyM$XFaQ{|1`OV|!N3z?Bx3H5gM$B9Q1Bg~pdl1w5uX<oWYVq=78s9B
z1STmwqudwLF$3Kx30MGkTooDQ_wqzED8-;XWRTefG-x#%WSz8{Y*6bP;9$nUfescF
zW#GZA!*S{Ppw_#_fUsc$Li*(+JpJ;KE{UVW_av(y^E2ZY7A`O>VZx5=)h3b^DpaiW
zj_iBeX7jc0_Vc~hz1{5CcAAr`^e8rDU+PtaIzibZY{*{L{2C<=lsMWLr%T_utw)%J
zl{mJ>5DXW5V;YLN`A>^tzCqCgE1>`wSP8Y%E1|aX@<aMWTx6{y<Em6!4pz%t?Ev7E
zJ-X(#4p0Ipp^b4W4MtEx9VOhgDIs|QEA566@zMnmq44RH1rOIkh2Npzfr1BkWJ!2r
zr3)Tup+j{|4vxwO5`R=SP}!)67MKOh(we~tW~pPA`_nMX)FqCuEpGWcN*pM004Y%7
zSnd)>iag_fEwFKMBc~~R=@ZBXcmO<@HORmN;DPO2V?21b^m}^Sy|XOqh@%tf`Uw$~
zLEx<~ED(79))j)l)6`Cy7&;+q+lYrvtN36<(p0F>T=PVNm~2vEkSxTedL83<U?HXy
zB~K3|i!-NI&jOKUpEJ$efW5e^Kams{eIt2PNI}7)bDkWXF>0>oQKg)+kcs5gyqm_#
zEa-pw^zp%r8b<?J5HkS)t*{Rt_ag%8(6F*e@s=11jFs)`@9!=tcVU+l+|A!Sj^mII
zyjW=w-WM-Stkg!#m3vG#+yrz+fwTmuqvUkxGnL35#EME)H{Z?%Z6-7BsM!O)9Att<
z)T47wWsxvO^vJ>s_wdk!@-S&+!}4B5GrL=}iz*wY{$%HKx~^?ycXW2moyz8guo&@%
zwns0?yFY7UMQ5~CVL({^toHXX3^PAB)~7<U7v@$m$r<7Fd_U>skaC@-=~JY-!vj3%
zr}4I?K-xTcaLFgk@=qx=cNh~5^Nc2@A6{qZF)1<EfxA>w70q3qc>?4AQ)Vz0s_y^*
DWRQCD

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

diff --git a/packages/core/solidity/src/governor.ts b/packages/core/solidity/src/governor.ts
index cc86c14c6..a8d64f010 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -1,7 +1,7 @@
 import { supportsInterface } from './common-functions';
 import type { CommonOptions } from './common-options';
 import { withCommonDefaults, defaults as commonDefaults } from './common-options';
-import type { Contract } from './contract';
+import type { Contract, ImportContract } from './contract';
 import { ContractBuilder } from './contract';
 import { OptionsError } from './error';
 import { setAccessControl } from './set-access-control';
@@ -105,14 +105,13 @@ export function buildGovernor(opts: GovernorOptions): Contract {
   return c;
 }
 
+const Governor: ImportContract = {
+  name: 'Governor',
+  path: '@openzeppelin/contracts/governance/Governor.sol',
+};
+
 function addBase(c: ContractBuilder, { name }: GovernorOptions) {
-  const Governor = {
-    name: 'Governor',
-    path: '@openzeppelin/contracts/governance/Governor.sol',
-  };
   c.addParent(Governor, [name]);
-  c.addOverride(Governor, functions.votingDelay);
-  c.addOverride(Governor, functions.votingPeriod);
   c.addOverride(Governor, functions.state);
   c.addOverride(Governor, functions.propose);
   c.addOverride(Governor, functions.proposalNeedsQueuing);
@@ -220,6 +219,7 @@ function setVotingParameters(c: ContractBuilder, opts: Required<GovernorOptions>
   } else {
     c.setFunctionBody([`return ${delayBlocks.value}; // ${delayBlocks.note}`], functions.votingDelay);
   }
+  c.addOverride(Governor, functions.votingDelay);
 
   const periodBlocks = getVotingPeriod(opts);
   if ('lit' in periodBlocks) {
@@ -227,6 +227,7 @@ function setVotingParameters(c: ContractBuilder, opts: Required<GovernorOptions>
   } else {
     c.setFunctionBody([`return ${periodBlocks.value}; // ${periodBlocks.note}`], functions.votingPeriod);
   }
+  c.addOverride(Governor, functions.votingPeriod);
 }
 
 function setProposalThreshold(c: ContractBuilder, opts: Required<GovernorOptions>) {
@@ -307,7 +308,7 @@ function addQuorum(c: ContractBuilder, opts: Required<GovernorOptions>) {
         : `return ${opts.quorumAbsolute}e${opts.decimals};`;
 
     c.setFunctionBody([returnStatement], functions.quorum, 'pure');
-    c.addOverride({ name: 'Governor' }, functions.quorum);
+    c.addOverride(Governor, functions.quorum);
   }
 }