more TS dao renaming

packages/nouns-contracts/src/index.ts

@@ -9,6 +9,6 @@ export { NounsToken__factory as NounsTokenFactory } from '../typechain/factories
 export { NounsAuctionHouse__factory as NounsAuctionHouseFactory } from '../typechain/factories/contracts/NounsAuctionHouse__factory';
 export { NounsDescriptor__factory as NounsDescriptorFactory } from '../typechain/factories/contracts/NounsDescriptor__factory';
 export { NounsSeeder__factory as NounsSeederFactory } from '../typechain/factories/contracts/NounsSeeder__factory';
-export { NounsDAOLogicV3__factory as NounsDaoLogicV3Factory } from '../typechain/factories/contracts/governance/NounsDAOLogicV3__factory';
+export { NounsDAOLogicV4__factory as NounsDaoLogicFactory } from '../typechain/factories/contracts/governance/NounsDAOLogicV4__factory';
 export { NounsDAOData__factory as NounsDaoDataFactory } from '../typechain/factories/contracts/governance/data/NounsDAOData.sol/NounsDAOData__factory';
 export { NounsDAOExecutorV2__factory as NounsDaoExecutorV2Factory } from '../typechain/factories/contracts/governance/NounsDAOExecutorV2__factory';

packages/nouns-contracts/test/governance/quorumConfig.test.ts

@@ -16,7 +16,7 @@ import {
   NounsToken,
   NounsDescriptorV2__factory as NounsDescriptorV2Factory,
   INounsDAOLogicV3,
-  NounsDAOLogicV3__factory,
+  NounsDAOLogicV4__factory,
 } from '../../typechain';
 import { parseUnits } from 'ethers/lib/utils';
 import { DynamicQuorumParams } from '../types';
@@ -107,7 +107,7 @@ describe('NounsDAO#_setDynamicQuorumParams', () => {
     expect(actualParams.maxQuorumVotesBPS).to.equal(2222);
     expect(actualParams.quorumCoefficient).to.equal(quorumCoefficient);
 
-    let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+    let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
 
     await expect(tx).to.emit(govWithEvents, 'MinQuorumVotesBPSSet').withArgs(200, 222);
     await expect(tx).to.emit(govWithEvents, 'MaxQuorumVotesBPSSet').withArgs(2000, 2222);
@@ -201,7 +201,7 @@ describe('NounsDAO#_setDynamicQuorumParams', () => {
         const params = await gov.getDynamicQuorumParamsAt(await blockNumber());
 
         expect(params.minQuorumVotesBPS).to.equal(222);
-        let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+        let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
         await expect(tx).to.emit(govWithEvents, 'MinQuorumVotesBPSSet').withArgs(200, 222);
       });
 
@@ -238,7 +238,7 @@ describe('NounsDAO#_setDynamicQuorumParams', () => {
         const params = await gov.getDynamicQuorumParamsAt(await blockNumber());
 
         expect(params.maxQuorumVotesBPS).to.equal(3333);
-        let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+        let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
         await expect(tx).to.emit(govWithEvents, 'MaxQuorumVotesBPSSet').withArgs(3000, 3333);
       });
 
@@ -267,7 +267,7 @@ describe('NounsDAO#_setDynamicQuorumParams', () => {
         const params = await gov.getDynamicQuorumParamsAt(await blockNumber());
 
         expect(params.quorumCoefficient).to.equal(111);
-        let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+        let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
         await expect(tx).to.emit(govWithEvents, 'QuorumCoefficientSet').withArgs(1, 111);
       });
 

packages/nouns-contracts/test/governance/voteRefund.test.ts

@@ -4,7 +4,7 @@ import { solidity } from 'ethereum-waffle';
 import { BigNumber, ContractReceipt } from 'ethers';
 import { ethers } from 'hardhat';
 import {
-  NounsDAOLogicV3__factory,
+  NounsDAOLogicV4__factory,
   NounsDAOLogicV4,
   NounsDescriptorV2__factory,
   NounsToken,
@@ -86,7 +86,7 @@ describe('V3 Vote Refund', () => {
       expect(r.gasUsed).to.be.gt(0);
       expect(balanceDiff).to.be.closeTo(BigNumber.from(0), REFUND_ERROR_MARGIN);
       expectRefundEvent(r, user, await txCostInEth(r));
-      let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+      let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
       await expect(tx)
         .to.emit(govWithEvents, 'VoteCast')
         .withArgs(user.address, BigNumber.from(1), 1, 2, '');
@@ -190,7 +190,7 @@ describe('V3 Vote Refund', () => {
       expect(balanceDiff).to.be.closeTo(BigNumber.from(0), REFUND_ERROR_MARGIN);
 
       expectRefundEvent(r, user, await txCostInEth(r));
-      let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+      let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
       await expect(tx)
         .to.emit(govWithEvents, 'VoteCast')
         .withArgs(user.address, BigNumber.from(1), 1, 2, 'some reason');
@@ -253,7 +253,7 @@ describe('V3 Vote Refund', () => {
       expect(balanceDiff).to.be.closeTo(await expectedGasUsedCappedDiff(r), REFUND_ERROR_MARGIN);
 
       expectRefundEvent(r, user, MAX_REFUND_GAS_USED.mul(await latestBasePlusMaxPriority()));
-      let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+      let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
       await expect(tx)
         .to.emit(govWithEvents, 'VoteCast')
         .withArgs(user.address, BigNumber.from(1), 1, 2, LONG_REASON);
@@ -278,7 +278,7 @@ describe('V3 Vote Refund', () => {
       expect(balanceDiff).to.be.closeTo(await expectedBaseFeeCappedDiff(r), REFUND_ERROR_MARGIN);
 
       expectRefundEvent(r, user, r.gasUsed.mul(MAX_REFUND_BASE_FEE.add(MAX_PRIORITY_FEE_CAP)));
-      let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+      let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
       await expect(tx)
         .to.emit(govWithEvents, 'VoteCast')
         .withArgs(user.address, BigNumber.from(1), 1, 2, 'some reason');
@@ -358,7 +358,7 @@ describe('V3 Vote Refund', () => {
       expect(balanceDiff).to.be.closeTo(BigNumber.from(0), REFUND_ERROR_MARGIN);
 
       expectRefundEvent(r, user, await txCostInEth(r));
-      let govWithEvents = NounsDAOLogicV3__factory.connect(gov.address, gov.signer);
+      let govWithEvents = NounsDAOLogicV4__factory.connect(gov.address, gov.signer);
       await expect(tx)
         .to.emit(govWithEvents, 'VoteCast')
         .withArgs(voter.address, BigNumber.from(2), 1, 1, 'some reason');
@@ -401,7 +401,7 @@ describe('V3 Vote Refund', () => {
     // Not using expect emit because it doesn't support the `closeTo` matcher
     // Using longer event parsing because r.events doesn't work when using the Voter contract
     // to simulate multisig usage; events are returned undefined
-    const daoInterface = NounsDAOLogicV3__factory.createInterface();
+    const daoInterface = NounsDAOLogicV4__factory.createInterface();
     const eventId = ethers.utils.id('RefundableVote(address,uint256,bool)');
     const filtered = r.logs.filter(l => l.topics[0] === eventId);
     const parsed = filtered.map(e => {

packages/nouns-contracts/test/utils.ts

@@ -26,7 +26,7 @@ import {
   Inflator__factory,
   NounsDAOStorageV2,
   NounsDAOLogicV4,
-  NounsDAOLogicV3__factory as NounsDaoLogicV3Factory,
+  NounsDAOLogicV4__factory as NounsDaoLogicFactory,
   NounsDAOProxyV3__factory as NounsDaoProxyV3Factory,
   NounsDAOForkEscrow__factory as NounsDAOForkEscrowFactory,
   INounsDAOLogicV3__factory,
@@ -558,7 +558,7 @@ export const deployGovernorV3 = async (deployer: SignerWithAddress): Promise<Nou
     await ethers.getContractFactory('NounsDAOV3DynamicQuorum', deployer)
   ).deploy();
 
-  return await new NounsDaoLogicV3Factory(
+  return await new NounsDaoLogicFactory(
     {
       'contracts/governance/NounsDAOV3Proposals.sol:NounsDAOV3Proposals':
         NounsDAOV3Proposals.address,

packages/nouns-sdk/src/contract/contracts.ts

@@ -3,7 +3,7 @@ import {
   NounsAuctionHouseFactory,
   NounsDescriptorFactory,
   NounsSeederFactory,
-  NounsDaoLogicV3Factory,
+  NounsDaoLogicFactory,
 } from '@nouns/contracts';
 import type { Signer } from 'ethers';
 import type { Provider } from '@ethersproject/providers';
@@ -40,7 +40,7 @@ export const getContractsForChainOrThrow = (
       addresses.nounsSeeder,
       signerOrProvider as Signer | Provider,
     ),
-    nounsDaoContract: NounsDaoLogicV3Factory.connect(
+    nounsDaoContract: NounsDaoLogicFactory.connect(
       addresses.nounsDAOProxy,
       signerOrProvider as Signer | Provider,
     ),

packages/nouns-sdk/src/contract/index.ts

@@ -12,6 +12,6 @@ export {
   NounsAuctionHouseFactory,
   NounsDescriptorFactory,
   NounsSeederFactory,
-  NounsDaoLogicV3Factory,
+  NounsDaoLogicFactory,
   NounsDaoExecutorV2Factory,
 } from '@nouns/contracts';

packages/nouns-sdk/src/contract/types.ts

@@ -3,7 +3,7 @@ import {
   NounsAuctionHouseFactory,
   NounsDescriptorFactory,
   NounsSeederFactory,
-  NounsDaoLogicV3Factory,
+  NounsDaoLogicFactory,
 } from '@nouns/contracts';
 
 export interface ContractAddresses {
@@ -29,7 +29,7 @@ export interface Contracts {
   nounsAuctionHouseContract: ReturnType<typeof NounsAuctionHouseFactory.connect>;
   nounsDescriptorContract: ReturnType<typeof NounsDescriptorFactory.connect>;
   nounsSeederContract: ReturnType<typeof NounsSeederFactory.connect>;
-  nounsDaoContract: ReturnType<typeof NounsDaoLogicV3Factory.connect>;
+  nounsDaoContract: ReturnType<typeof NounsDaoLogicFactory.connect>;
 }
 
 export enum ChainId {

packages/nouns-webapp/src/wrappers/nounsDao.ts

@@ -1,4 +1,4 @@
-import { NounsDAOV3ABI, NounsDaoLogicV3Factory } from '@nouns/sdk';
+import { NounsDAOV3ABI, NounsDaoLogicFactory } from '@nouns/sdk';
 import {
   ChainId,
   useBlockNumber,
@@ -262,7 +262,7 @@ export interface ForkSubgraphEntity {
 }
 
 const abi = new utils.Interface(NounsDAOV3ABI);
-const nounsDaoContract = NounsDaoLogicV3Factory.connect(config.addresses.nounsDAOProxy, undefined!);
+const nounsDaoContract = NounsDaoLogicFactory.connect(config.addresses.nounsDAOProxy, undefined!);
 
 // Start the log search at the mainnet deployment block to speed up log queries
 const fromBlock = CHAIN_ID === ChainId.Mainnet ? 12985453 : 0;