dao: fix HH and TS renaming to V4

nounsDAO · Feb 6, 2024 · b13ed55 · b13ed55
1 parent e580373
commit b13ed55
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 19 deletions.
diff --git a/packages/nouns-contracts/src/index.ts b/packages/nouns-contracts/src/index.ts
@@ -2,7 +2,7 @@ export { default as NounsTokenABI } from '../abi/contracts/NounsToken.sol/NounsT
 export { default as NounsAuctionHouseABI } from '../abi/contracts/NounsAuctionHouse.sol/NounsAuctionHouse.json';
 export { default as NounsDescriptorABI } from '../abi/contracts/NounsDescriptor.sol/NounsDescriptor.json';
 export { default as NounsSeederABI } from '../abi/contracts/NounsSeeder.sol/NounsSeeder.json';
-export { default as NounsDAOV3ABI } from '../abi/contracts/governance/NounsDAOLogicV3.sol/NounsDAOLogicV3.json';
+export { default as NounsDAOV3ABI } from '../abi/contracts/governance/NounsDAOLogicV4.json';
 export { default as NounsDAODataABI } from '../abi/contracts/governance/data/NounsDAOData.sol/NounsDAOData.json';
 export { default as NounsDAOExecutorV2ABI } from '../abi/contracts/governance/NounsDAOExecutorV2.sol/NounsDAOExecutorV2.json';
 export { NounsToken__factory as NounsTokenFactory } from '../typechain/factories/contracts/NounsToken__factory';

diff --git a/packages/nouns-contracts/tasks/create-proposal.ts b/packages/nouns-contracts/tasks/create-proposal.ts
@@ -9,7 +9,7 @@ task('create-proposal', 'Create a governance proposal')
     types.string,
   )
   .setAction(async ({ nounsDaoProxy }, { ethers }) => {
-    const nounsDaoFactory = await ethers.getContractFactory('NounsDAOLogicV3');
+    const nounsDaoFactory = await ethers.getContractFactory('NounsDAOLogicV4');
     const nounsDao = nounsDaoFactory.attach(nounsDaoProxy);
 
     const [deployer] = await ethers.getSigners();

diff --git a/packages/nouns-contracts/tasks/deploy-local-dao-v3.ts b/packages/nouns-contracts/tasks/deploy-local-dao-v3.ts
@@ -139,7 +139,7 @@ task('deploy-local-dao-v3', 'Deploy contracts to hardhat')
       NounsDAOV3Proposals: {},
       NounsDAOV3Votes: {},
       NounsDAOV3Fork: {},
-      NounsDAOLogicV3: {
+      NounsDAOLogicV4: {
         libraries: () => ({
           NounsDAOV3Admin: contracts.NounsDAOV3Admin.instance?.address as string,
           NounsDAOV3DynamicQuorum: contracts.NounsDAOV3DynamicQuorum.instance?.address as string,
@@ -190,7 +190,7 @@ task('deploy-local-dao-v3', 'Deploy contracts to hardhat')
           () => contracts.ForkDAODeployer.instance?.address, // forkDAODeployer
           args.noundersdao || deployer.address, // vetoer
           () => contracts.NounsDAOExecutorProxy.instance?.address, // admin
-          () => contracts.NounsDAOLogicV3.instance?.address, // implementation
+          () => contracts.NounsDAOLogicV4.instance?.address, // implementation
           {
             votingPeriod: args.votingPeriod,
             votingDelay: args.votingDelay,

diff --git a/packages/nouns-contracts/tasks/deploy-short-times-dao-v3.ts b/packages/nouns-contracts/tasks/deploy-short-times-dao-v3.ts
@@ -192,7 +192,7 @@ task('deploy-short-times-dao-v3', 'Deploy all Nouns contracts with short gov tim
       NounsDAOV3Proposals: {},
       NounsDAOV3Votes: {},
       NounsDAOV3Fork: {},
-      NounsDAOLogicV3: {
+      NounsDAOLogicV4: {
         libraries: () => ({
           NounsDAOV3Admin: deployment.NounsDAOV3Admin.address,
           NounsDAOV3DynamicQuorum: deployment.NounsDAOV3DynamicQuorum.address,
@@ -242,7 +242,7 @@ task('deploy-short-times-dao-v3', 'Deploy all Nouns contracts with short gov tim
           () => deployment.ForkDAODeployer.address, // forkDAODeployer
           args.noundersdao || deployer.address, // vetoer
           () => deployment.NounsDAOExecutorProxy.address, // admin
-          () => deployment.NounsDAOLogicV3.address, // implementation
+          () => deployment.NounsDAOLogicV4.address, // implementation
           {
             votingPeriod: args.votingPeriod,
             votingDelay: args.votingDelay,
@@ -313,7 +313,7 @@ task('deploy-short-times-dao-v3', 'Deploy all Nouns contracts with short gov tim
         case 'NounsDAOExecutorV2':
           nameForFactory = 'NounsDAOExecutorV2Test';
           break;
-        case 'NounsDAOLogicV3':
+        case 'NounsDAOLogicV4':
           nameForFactory = 'NounsDAOLogicV3Harness';
           break;
         default:

diff --git a/packages/nouns-contracts/tasks/types/index.ts b/packages/nouns-contracts/tasks/types/index.ts
@@ -20,7 +20,7 @@ export type ContractNamesDAOV3 =
   | 'NounsAuctionHouse'
   | 'NounsAuctionHouseProxyAdmin'
   | 'NounsAuctionHouseProxy'
-  | 'NounsDAOLogicV3'
+  | 'NounsDAOLogicV4'
   | 'NounsDAOProxyV3'
   | 'NounsDAOV3Admin'
   | 'NounsDAOV3DynamicQuorum'

diff --git a/packages/nouns-contracts/tasks/update-configs-dao-v3.ts b/packages/nouns-contracts/tasks/update-configs-dao-v3.ts
@@ -27,7 +27,7 @@ task('update-configs-dao-v3', 'Write the deployed addresses to the SDK and subgr
         nounsAuctionHouseProxyAdmin: contracts.NounsAuctionHouseProxyAdmin.address,
         nounsDaoExecutor: contracts.NounsDAOExecutorProxy.address,
         nounsDAOProxy: contracts.NounsDAOProxyV3.address,
-        nounsDAOLogicV1: contracts.NounsDAOLogicV3.address,
+        nounsDAOLogicV1: contracts.NounsDAOLogicV4.address,
         nounsDAOData: contracts.NounsDAODataProxy.address,
       };
       writeFileSync(addressesPath, JSON.stringify(addresses, null, 2));

diff --git a/packages/nouns-contracts/tasks/upgrade-descriptor-via-proposal.ts b/packages/nouns-contracts/tasks/upgrade-descriptor-via-proposal.ts
@@ -10,7 +10,7 @@ task('upgrade-descriptor-via-proposal', 'Upgrade NounsToken to use Descriptor V2
     const signatures = ['setDescriptor(address)'];
     const calldatas = [ethers.utils.defaultAbiCoder.encode(['address'], [descriptor])];
 
-    const gov = (await ethers.getContractFactory('NounsDAOLogicV3')).attach(dao);
+    const gov = (await ethers.getContractFactory('NounsDAOLogicV4')).attach(dao);
     const propTx = await gov['propose(address[],uint256[],string[],bytes[],string)'](
       targets,
       values,

diff --git a/packages/nouns-contracts/test/governance/castVote.test.ts b/packages/nouns-contracts/test/governance/castVote.test.ts
@@ -21,7 +21,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import {
   NounsToken,
   NounsDescriptorV2__factory as NounsDescriptorV2Factory,
-  NounsDAOLogicV3,
+  NounsDAOLogicV4,
 } from '../../typechain';
 
 chai.use(solidity);

diff --git a/packages/nouns-contracts/test/governance/dynamicQuorum.test.ts b/packages/nouns-contracts/test/governance/dynamicQuorum.test.ts
@@ -2,15 +2,15 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import chai from 'chai';
 import { solidity } from 'ethereum-waffle';
 import { parseUnits } from 'ethers/lib/utils';
-import { NounsDAOLogicV3 } from '../../typechain';
+import { NounsDAOLogicV4 } from '../../typechain';
 import { deployGovernorV3, getSigners, TestSigners } from '../utils';
 
 chai.use(solidity);
 const { expect } = chai;
 
 let deployer: SignerWithAddress;
 let signers: TestSigners;
-let gov: NounsDAOLogicV3;
+let gov: NounsDAOLogicV4;
 
 describe('Dynamic Quorum', () => {
   before(async () => {

diff --git a/packages/nouns-contracts/test/governance/proxy.test.ts b/packages/nouns-contracts/test/governance/proxy.test.ts
@@ -14,7 +14,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import {
   NounsToken,
   NounsDescriptorV2__factory as NounsDescriptorV2Factory,
-  NounsDAOLogicV3,
+  NounsDAOLogicV4,
 } from '../../typechain';
 import { MAX_QUORUM_VOTES_BPS, MIN_QUORUM_VOTES_BPS } from '../constants';
 
@@ -24,7 +24,7 @@ const { expect } = chai;
 let token: NounsToken;
 let deployer: SignerWithAddress;
 let signers: TestSigners;
-let gov: NounsDAOLogicV3;
+let gov: NounsDAOLogicV4;
 
 async function setup() {
   token = await deployNounsToken(signers.deployer);

diff --git a/packages/nouns-contracts/test/governance/voteRefund.test.ts b/packages/nouns-contracts/test/governance/voteRefund.test.ts
@@ -5,7 +5,7 @@ import { BigNumber, ContractReceipt } from 'ethers';
 import { ethers } from 'hardhat';
 import {
   NounsDAOLogicV3__factory,
-  NounsDAOLogicV3,
+  NounsDAOLogicV4,
   NounsDescriptorV2__factory,
   NounsToken,
   Voter__factory,

diff --git a/packages/nouns-contracts/test/utils.ts b/packages/nouns-contracts/test/utils.ts
@@ -25,7 +25,7 @@ import {
   NounsDAOExecutor,
   Inflator__factory,
   NounsDAOStorageV2,
-  NounsDAOLogicV3,
+  NounsDAOLogicV4,
   NounsDAOLogicV3__factory as NounsDaoLogicV3Factory,
   NounsDAOProxyV3__factory as NounsDaoProxyV3Factory,
   NounsDAOForkEscrow__factory as NounsDAOForkEscrowFactory,
@@ -541,7 +541,7 @@ function dataToDescriptorInput(data: string[]): {
   };
 }
 
-export const deployGovernorV3 = async (deployer: SignerWithAddress): Promise<NounsDAOLogicV3> => {
+export const deployGovernorV3 = async (deployer: SignerWithAddress): Promise<NounsDAOLogicV4> => {
   const NounsDAOV3Proposals = await (
     await ethers.getContractFactory('NounsDAOV3Proposals', deployer)
   ).deploy();

diff --git a/packages/nouns-sdk/src/contract/types.ts b/packages/nouns-sdk/src/contract/types.ts
@@ -20,7 +20,7 @@ export interface ContractAddresses {
   nounsDAOProxy: string;
   nounsDAOLogicV1?: string;
   nounsDAOLogicV2?: string;
-  nounsDAOLogicV3?: string;
+  NounsDAOLogicV4?: string;
   nounsDAOData?: string;
 }