Merge branch 'develop' into reskin/refactor-root-reskin

decentdao · Apr 30, 2024 · d6d1c5b · d6d1c5b
2 parents 913c286 + 1985843
commit d6d1c5b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
@@ -25,7 +25,6 @@ import { generateContractByteCodeLinear, generateSalt } from './helpers/utils';
 
 export class AzoriusTxBuilder extends BaseTxBuilder {
   private readonly safeContract: GnosisSafeL2;
-  private readonly predictedSafeAddress: string;
 
   private encodedSetupTokenData: string | undefined;
   private encodedSetupERC20WrapperData: string | undefined;
@@ -54,7 +53,6 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
     azoriusContracts: AzoriusContracts,
     daoData: AzoriusERC20DAO | AzoriusERC721DAO,
     safeContract: GnosisSafeL2,
-    predictedSafeAddress: string,
     parentAddress?: string,
     parentTokenAddress?: string,
   ) {
@@ -68,7 +66,6 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
     );
 
     this.safeContract = safeContract;
-    this.predictedSafeAddress = predictedSafeAddress;
 
     this.tokenNonce = getRandomBytes();
     this.claimNonce = getRandomBytes();
@@ -349,8 +346,9 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
   private setEncodedSetupTokenClaimData() {
     const azoriusGovernanceDaoData = this.daoData as AzoriusERC20DAO;
     const encodedInitTokenData = defaultAbiCoder.encode(
-      ['address', 'address', 'address', 'uint256'],
+      ['uint32', 'address', 'address', 'address', 'uint256'],
       [
+        0, // deadlineBlock. We don't capture this in the UI. 0 means no deadline to claim.
         this.safeContract.address,
         this.parentTokenAddress,
         this.predictedTokenAddress,

diff --git a/src/models/FreezeGuardTxBuilder.ts b/src/models/FreezeGuardTxBuilder.ts
@@ -217,7 +217,7 @@ export class FreezeGuardTxBuilder extends BaseTxBuilder {
       'setUp',
       [
         ethers.utils.defaultAbiCoder.encode(
-          ['uint256', 'uint256', 'address', 'address', 'address'],
+          ['uint32', 'uint32', 'address', 'address', 'address'],
           [
             subDaoData.timelockPeriod, // Timelock Period
             subDaoData.executionPeriod, // Execution Period
@@ -231,19 +231,14 @@ export class FreezeGuardTxBuilder extends BaseTxBuilder {
   }
 
   private setFreezeGuardCallDataAzorius() {
-    const subDaoData = this.daoData as SubDAO;
-
     this.freezeGuardCallData = AzoriusFreezeGuard__factory.createInterface().encodeFunctionData(
       'setUp',
       [
         ethers.utils.defaultAbiCoder.encode(
-          ['address', 'address', 'address', 'address', 'uint256'],
+          ['address', 'address'],
           [
             this.parentAddress, // Owner -- Parent DAO
             this.freezeVotingAddress, // Freeze Voting
-            this.strategyAddress, // Base Strategy
-            this.azoriusAddress, // Azorius
-            subDaoData.executionPeriod, // Execution Period
           ],
         ),
       ],

diff --git a/src/models/TxBuilderFactory.ts b/src/models/TxBuilderFactory.ts
@@ -130,7 +130,6 @@ export class TxBuilderFactory extends BaseTxBuilder {
       this.azoriusContracts!,
       this.daoData as AzoriusERC20DAO,
       this.safeContract!,
-      this.predictedSafeAddress!,
       this.parentAddress,
       this.parentTokenAddress,
     );