From 871bc54d818fe0806e6da1238e0e1f876c76ca34 Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 17:22:16 +0100
Subject: [PATCH 1/6] Multiply quorum percentage by 10000 to get it into proper
 format during Safe deployment, adjust quorum displaying accordingly

---
 src/components/Proposals/ProposalSummary.tsx  |  5 ++++-
 .../governance/useERC20LinearStrategy.ts      | 20 ++++++++++++-------
 src/models/AzoriusTxBuilder.ts                |  2 +-
 src/types/fractal.ts                          |  1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/components/Proposals/ProposalSummary.tsx b/src/components/Proposals/ProposalSummary.tsx
index 3357332046..854805b0cf 100644
--- a/src/components/Proposals/ProposalSummary.tsx
+++ b/src/components/Proposals/ProposalSummary.tsx
@@ -87,7 +87,10 @@ export default function ProposalSummary({
 
   const strategyQuorum =
     votesToken && isERC20
-      ? votingStrategy.quorumPercentage!.value.toNumber()
+      ? votingStrategy
+          .quorumPercentage!.value.mul(100)
+          .div(votingStrategy.quorumDenominator?.value || 1000000)
+          .toNumber()
       : isERC721
       ? votingStrategy.quorumThreshold!.value.toNumber()
       : 1;
diff --git a/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts b/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
index ac79bd084d..2941fe72d7 100644
--- a/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
+++ b/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
@@ -28,12 +28,15 @@ export const useERC20LinearStrategy = () => {
     if (!ozLinearVotingContract || !azoriusContract) {
       return {};
     }
-    const [votingPeriodBlocks, quorumNumerator, timeLockPeriod] = await Promise.all([
-      ozLinearVotingContract.asSigner.votingPeriod(),
-      ozLinearVotingContract.asSigner.quorumNumerator(),
-      azoriusContract.asSigner.timelockPeriod(),
-    ]);
+    const [votingPeriodBlocks, quorumNumerator, quorumDenominator, timeLockPeriod] =
+      await Promise.all([
+        ozLinearVotingContract.asSigner.votingPeriod(),
+        ozLinearVotingContract.asSigner.quorumNumerator(),
+        ozLinearVotingContract.asSigner.QUORUM_DENOMINATOR(),
+        azoriusContract.asSigner.timelockPeriod(),
+      ]);
 
+    const quorumPercentage = quorumNumerator.mul(100).div(quorumDenominator);
     const votingPeriodValue = await blocksToSeconds(votingPeriodBlocks, provider);
     const timeLockPeriodValue = await blocksToSeconds(timeLockPeriod, provider);
     const votingData = {
@@ -42,8 +45,11 @@ export const useERC20LinearStrategy = () => {
         formatted: getTimeDuration(votingPeriodValue),
       },
       quorumPercentage: {
-        value: quorumNumerator,
-        formatted: quorumNumerator.toString() + '%',
+        value: quorumPercentage,
+        formatted: quorumPercentage.toString() + '%',
+      },
+      quorumDenominator: {
+        value: quorumDenominator,
       },
       timeLockPeriod: {
         value: BigNumber.from(timeLockPeriodValue),
diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
index 59dd244c4e..82c19eb08a 100644
--- a/src/models/AzoriusTxBuilder.ts
+++ b/src/models/AzoriusTxBuilder.ts
@@ -384,7 +384,7 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
           '0x0000000000000000000000000000000000000001', // Azorius module
           azoriusGovernanceDaoData.votingPeriod,
           BigNumber.from(1), // proposer weight, how much is needed to create a proposal.
-          azoriusGovernanceDaoData.quorumPercentage, // quorom numerator, denominator is 1,000,000, so quorum percentage is 50%
+          azoriusGovernanceDaoData.quorumPercentage.mul(10000), // quorom numerator, denominator is 1,000,000, so quorum percentage is quorumNumerator * 100 / quorumDenominator
           BigNumber.from(500000), // basis numerator, denominator is 1,000,000, so basis percentage is 50% (simple majority)
         ]
       );
diff --git a/src/types/fractal.ts b/src/types/fractal.ts
index 63a996aebd..8bb8cf946b 100644
--- a/src/types/fractal.ts
+++ b/src/types/fractal.ts
@@ -308,6 +308,7 @@ export interface VotingStrategyAzorius extends VotingStrategy {
 export interface VotingStrategy<Type = BNFormattedPair> {
   votingPeriod?: Type;
   quorumPercentage?: Type;
+  quorumDenominator?: Type;
   quorumThreshold?: Type;
   timeLockPeriod?: Type;
 }

From d19d8dff781f7673432c67bcfbe82bd2c7bdadc9 Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 17:28:26 +0100
Subject: [PATCH 2/6] Do not divide by quorum denominator

---
 src/components/Proposals/ProposalSummary.tsx               | 7 +++----
 src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/Proposals/ProposalSummary.tsx b/src/components/Proposals/ProposalSummary.tsx
index 854805b0cf..f9256b1b4b 100644
--- a/src/components/Proposals/ProposalSummary.tsx
+++ b/src/components/Proposals/ProposalSummary.tsx
@@ -87,10 +87,7 @@ export default function ProposalSummary({
 
   const strategyQuorum =
     votesToken && isERC20
-      ? votingStrategy
-          .quorumPercentage!.value.mul(100)
-          .div(votingStrategy.quorumDenominator?.value || 1000000)
-          .toNumber()
+      ? votingStrategy.quorumPercentage!.value.toNumber()
       : isERC721
       ? votingStrategy.quorumThreshold!.value.toNumber()
       : 1;
@@ -107,6 +104,8 @@ export default function ProposalSummary({
         .mul(strategyQuorum)
         .toString();
 
+  console.log(strategyQuorum, reachedQuorum, totalQuorum);
+
   const ShowVotingPowerButton = (
     <Button
       pr={0}
diff --git a/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts b/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
index 2941fe72d7..b57fce3cd3 100644
--- a/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
+++ b/src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
@@ -48,9 +48,6 @@ export const useERC20LinearStrategy = () => {
         value: quorumPercentage,
         formatted: quorumPercentage.toString() + '%',
       },
-      quorumDenominator: {
-        value: quorumDenominator,
-      },
       timeLockPeriod: {
         value: BigNumber.from(timeLockPeriodValue),
         formatted: getTimeDuration(timeLockPeriodValue),

From cb1cbf057c2923d47f6ece0e743685e11341424b Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 17:29:41 +0100
Subject: [PATCH 3/6] More cleanup

---
 src/types/fractal.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types/fractal.ts b/src/types/fractal.ts
index 8bb8cf946b..63a996aebd 100644
--- a/src/types/fractal.ts
+++ b/src/types/fractal.ts
@@ -308,7 +308,6 @@ export interface VotingStrategyAzorius extends VotingStrategy {
 export interface VotingStrategy<Type = BNFormattedPair> {
   votingPeriod?: Type;
   quorumPercentage?: Type;
-  quorumDenominator?: Type;
   quorumThreshold?: Type;
   timeLockPeriod?: Type;
 }

From 4cb3f1b25282ac7d47acdcc62424afbb282320bc Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 17:30:34 +0100
Subject: [PATCH 4/6] Remove log

---
 src/components/Proposals/ProposalSummary.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/Proposals/ProposalSummary.tsx b/src/components/Proposals/ProposalSummary.tsx
index f9256b1b4b..3357332046 100644
--- a/src/components/Proposals/ProposalSummary.tsx
+++ b/src/components/Proposals/ProposalSummary.tsx
@@ -104,8 +104,6 @@ export default function ProposalSummary({
         .mul(strategyQuorum)
         .toString();
 
-  console.log(strategyQuorum, reachedQuorum, totalQuorum);
-
   const ShowVotingPowerButton = (
     <Button
       pr={0}

From 5ecbffca22b39b04124e6f0e3f2a96e4b84a007f Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 18:28:46 +0100
Subject: [PATCH 5/6] Fetch QUORUM_DENOMINATOR from voting strategy master copy

---
 src/models/AzoriusTxBuilder.ts | 29 +++++++++++++++++++++--------
 src/models/DaoTxBuilder.ts     |  2 +-
 src/models/TxBuilderFactory.ts |  7 +++++--
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
index 82c19eb08a..69a49e9f55 100644
--- a/src/models/AzoriusTxBuilder.ts
+++ b/src/models/AzoriusTxBuilder.ts
@@ -90,22 +90,33 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
         }
       }
     }
+  }
+
+  public async init() {
+    await this.setPredictedAddresses();
+  }
 
-    this.setPredictedStrategyAddress();
+  private async setPredictedAddresses() {
+    await this.setPredictedStrategyAddress();
     this.setPredictedAzoriusAddress();
     this.setContracts();
 
-    if (daoData.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
-      daoData = daoData as AzoriusERC20DAO;
+    if (
+      (this.daoData as AzoriusERC20DAO | AzoriusERC721DAO).votingStrategyType ===
+      VotingStrategyType.LINEAR_ERC20
+    ) {
+      const azoriusDAOData = this.daoData as AzoriusERC20DAO;
       if (
-        parentTokenAddress &&
-        daoData.parentAllocationAmount &&
-        !daoData.parentAllocationAmount.isZero()
+        this.parentTokenAddress &&
+        azoriusDAOData.parentAllocationAmount &&
+        !azoriusDAOData.parentAllocationAmount.isZero()
       ) {
         this.setEncodedSetupTokenClaimData();
         this.setPredictedTokenClaimAddress();
       }
     }
+
+    return this;
   }
 
   public buildRemoveOwners(owners: string[]): SafeTransaction[] {
@@ -373,9 +384,11 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
     );
   }
 
-  private setPredictedStrategyAddress() {
+  private async setPredictedStrategyAddress() {
     const azoriusGovernanceDaoData = this.daoData as AzoriusGovernanceDAO;
     if (azoriusGovernanceDaoData.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
+      const quorumDenominator =
+        await this.azoriusContracts!.linearVotingMasterCopyContract.QUORUM_DENOMINATOR();
       const encodedStrategyInitParams = defaultAbiCoder.encode(
         ['address', 'address', 'address', 'uint32', 'uint256', 'uint256', 'uint256'],
         [
@@ -384,7 +397,7 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
           '0x0000000000000000000000000000000000000001', // Azorius module
           azoriusGovernanceDaoData.votingPeriod,
           BigNumber.from(1), // proposer weight, how much is needed to create a proposal.
-          azoriusGovernanceDaoData.quorumPercentage.mul(10000), // quorom numerator, denominator is 1,000,000, so quorum percentage is quorumNumerator * 100 / quorumDenominator
+          azoriusGovernanceDaoData.quorumPercentage.mul(quorumDenominator.div(100)), // quorom numerator, denominator is 1,000,000, so quorum percentage is quorumNumerator * 100 / quorumDenominator
           BigNumber.from(500000), // basis numerator, denominator is 1,000,000, so basis percentage is 50% (simple majority)
         ]
       );
diff --git a/src/models/DaoTxBuilder.ts b/src/models/DaoTxBuilder.ts
index 7d67ff2b83..90663b03db 100644
--- a/src/models/DaoTxBuilder.ts
+++ b/src/models/DaoTxBuilder.ts
@@ -75,7 +75,7 @@ export class DaoTxBuilder extends BaseTxBuilder {
     shouldSetSnapshot: boolean = true,
     existingSafe?: { owners: string[] }
   ): Promise<string> {
-    const azoriusTxBuilder = this.txBuilderFactory.createAzoriusTxBuilder();
+    const azoriusTxBuilder = await this.txBuilderFactory.createAzoriusTxBuilder();
 
     // transactions that must be called by safe
     this.internalTxs = [];
diff --git a/src/models/TxBuilderFactory.ts b/src/models/TxBuilderFactory.ts
index 20208239a1..49787f15b2 100644
--- a/src/models/TxBuilderFactory.ts
+++ b/src/models/TxBuilderFactory.ts
@@ -118,8 +118,8 @@ export class TxBuilderFactory extends BaseTxBuilder {
     );
   }
 
-  public createAzoriusTxBuilder(): AzoriusTxBuilder {
-    return new AzoriusTxBuilder(
+  public async createAzoriusTxBuilder(): Promise<AzoriusTxBuilder> {
+    const azoriusTxBuilder = new AzoriusTxBuilder(
       this.signerOrProvider,
       this.baseContracts,
       this.azoriusContracts!,
@@ -129,5 +129,8 @@ export class TxBuilderFactory extends BaseTxBuilder {
       this.parentAddress,
       this.parentTokenAddress
     );
+
+    await azoriusTxBuilder.init();
+    return azoriusTxBuilder;
   }
 }

From 82e166283a67c34fec51bcb2cb98bf499fbdd2cd Mon Sep 17 00:00:00 2001
From: Kirill Klimenko <klimenkomud@gmail.com>
Date: Fri, 9 Feb 2024 18:30:51 +0100
Subject: [PATCH 6/6] Move content of setPredictedAddresses of AzoriusTxBuilder
 directly into init function

---
 src/models/AzoriusTxBuilder.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
index 69a49e9f55..331007d059 100644
--- a/src/models/AzoriusTxBuilder.ts
+++ b/src/models/AzoriusTxBuilder.ts
@@ -93,10 +93,6 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
   }
 
   public async init() {
-    await this.setPredictedAddresses();
-  }
-
-  private async setPredictedAddresses() {
     await this.setPredictedStrategyAddress();
     this.setPredictedAzoriusAddress();
     this.setContracts();
@@ -115,8 +111,6 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
         this.setPredictedTokenClaimAddress();
       }
     }
-
-    return this;
   }
 
   public buildRemoveOwners(owners: string[]): SafeTransaction[] {