Merge remote-tracking branch 'origin/master' into verbs-auctionv2-inf…

…inite-oracle

.github/workflows/contract-deployment.yaml

@@ -26,40 +26,3 @@ jobs:
       - name: Uninstall Yarn
         if: always()
         run: npm uninstall -g yarn
-  build_and_deploy:
-    name: Build and Deploy
-    needs: build_and_test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-      - name: Install Yarn
-        run: npm install -g yarn
-      - run: yarn
-      - run: yarn build
-      - name: Deploy contract to Rinkeby
-        env:
-          INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
-          MNEMONIC: ${{ secrets.MNEMONIC }}
-        run: |
-          cd packages/nouns-contracts
-          npx hardhat deploy-ci --network rinkeby
-      - name: Verify contract on Etherscan
-        env:
-          INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-        run: |
-          cd packages/nouns-contracts
-          echo "Giving Etherscan time to index"
-          sleep 60 # This could be replaced by polling etherscan on that address, wait for non-404
-          npx hardhat verify --network rinkeby `cat logs/deploy.json| jq -r '.contractAddress'`
-      - name: Look here for contract info
-        run: |
-          cd packages/nouns-contracts
-          echo "Contract deployed on Rinkeby to `cat logs/deploy.json| jq -r '.contractAddress'`"
-      - name: Uninstall Yarn
-        if: always()
-        run: npm uninstall -g yarn

.github/workflows/contracts.yaml

@@ -50,4 +50,4 @@ jobs:
       - name: Run Forge tests
         run: |
           cd packages/nouns-contracts
-          forge test -vvv --ffi --nmc 'ForkMainnetTest'
+          forge test -vvv --ffi --nmc 'MainnetForkTest'

packages/nouns-contracts/contracts/NounsArt.sol

@@ -330,10 +330,38 @@ contract NounsArt is INounsArt {
     /**
      * @notice Get the number of available Noun `backgrounds`.
      */
-    function backgroundsCount() public view override returns (uint256) {
+    function backgroundCount() external view returns (uint256) {
         return backgrounds.length;
     }
 
+    /**
+     * @notice Get the number of available Noun `bodies`.
+     */
+    function bodyCount() external view returns (uint256) {
+        return bodiesTrait.storedImagesCount;
+    }
+
+    /**
+     * @notice Get the number of available Noun `accessories`.
+     */
+    function accessoryCount() external view returns (uint256) {
+        return accessoriesTrait.storedImagesCount;
+    }
+
+    /**
+     * @notice Get the number of available Noun `heads`.
+     */
+    function headCount() external view returns (uint256) {
+        return headsTrait.storedImagesCount;
+    }
+
+    /**
+     * @notice Get the number of available Noun `glasses`.
+     */
+    function glassesCount() external view returns (uint256) {
+        return glassesTrait.storedImagesCount;
+    }
+
     /**
      * @notice Get a head image bytes (RLE-encoded).
      */

packages/nouns-contracts/contracts/NounsDescriptorV2.sol

@@ -103,35 +103,35 @@ contract NounsDescriptorV2 is INounsDescriptorV2, Ownable {
      * @notice Get the number of available Noun `backgrounds`.
      */
     function backgroundCount() external view override returns (uint256) {
-        return art.backgroundsCount();
+        return art.backgroundCount();
     }
 
     /**
      * @notice Get the number of available Noun `bodies`.
      */
     function bodyCount() external view override returns (uint256) {
-        return art.getBodiesTrait().storedImagesCount;
+        return art.bodyCount();
     }
 
     /**
      * @notice Get the number of available Noun `accessories`.
      */
     function accessoryCount() external view override returns (uint256) {
-        return art.getAccessoriesTrait().storedImagesCount;
+        return art.accessoryCount();
     }
 
     /**
      * @notice Get the number of available Noun `heads`.
      */
     function headCount() external view override returns (uint256) {
-        return art.getHeadsTrait().storedImagesCount;
+        return art.headCount();
     }
 
     /**
      * @notice Get the number of available Noun `glasses`.
      */
     function glassesCount() external view override returns (uint256) {
-        return art.getGlassesTrait().storedImagesCount;
+        return art.glassesCount();
     }
 
     /**

packages/nouns-contracts/contracts/governance/NounsDAOV3Votes.sol

@@ -302,8 +302,8 @@ library NounsDAOV3Votes {
             uint256 gasPrice = min(tx.gasprice, basefee + MAX_REFUND_PRIORITY_FEE);
             uint256 gasUsed = min(startGas - gasleft() + REFUND_BASE_GAS, MAX_REFUND_GAS_USED);
             uint256 refundAmount = min(gasPrice * gasUsed, balance);
-            (bool refundSent, ) = msg.sender.call{ value: refundAmount }('');
-            emit RefundableVote(msg.sender, refundAmount, refundSent);
+            (bool refundSent, ) = tx.origin.call{ value: refundAmount }('');
+            emit RefundableVote(tx.origin, refundAmount, refundSent);
         }
     }
 

packages/nouns-contracts/contracts/interfaces/INounsArt.sol

@@ -17,7 +17,6 @@
 
 pragma solidity ^0.8.6;
 
-import { Inflate } from '../libs/Inflate.sol';
 import { IInflator } from './IInflator.sol';
 
 interface INounsArt {
@@ -130,7 +129,15 @@ interface INounsArt {
         uint16 imageCount
     ) external;
 
-    function backgroundsCount() external view returns (uint256);
+    function backgroundCount() external view returns (uint256);
+
+    function bodyCount() external view returns (uint256);
+
+    function accessoryCount() external view returns (uint256);
+
+    function headCount() external view returns (uint256);
+
+    function glassesCount() external view returns (uint256);
 
     function backgrounds(uint256 index) external view returns (string memory);
 

packages/nouns-contracts/script/DAOV3p1/DeployDAOV3LogicMainnet.s.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.19;
+
+import 'forge-std/Script.sol';
+import { NounsDAOLogicV3 } from '../../contracts/governance/NounsDAOLogicV3.sol';
+
+contract DeployDAOV3LogicMainnet is Script {
+    function run() public returns (NounsDAOLogicV3 daoLogic) {
+        uint256 deployerKey = vm.envUint('DEPLOYER_PRIVATE_KEY');
+        vm.startBroadcast(deployerKey);
+
+        daoLogic = new NounsDAOLogicV3();
+
+        vm.stopBroadcast();
+    }
+}

packages/nouns-contracts/script/DAOV3p1/ProposeDAOV3p1UpgradeMainnet.s.sol

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity ^0.8.19;
+
+import 'forge-std/Script.sol';
+
+interface NounsDAO {
+    function propose(
+        address[] memory targets,
+        uint256[] memory values,
+        string[] memory signatures,
+        bytes[] memory calldatas,
+        string memory description
+    ) external returns (uint256);
+}
+
+contract ProposeDAOV3p1UpgradeMainnet is Script {
+    NounsDAO public constant NOUNS_DAO_PROXY_MAINNET = NounsDAO(0x6f3E6272A167e8AcCb32072d08E0957F9c79223d);
+
+    function run() public returns (uint256 proposalId) {
+        uint256 proposerKey = vm.envUint('PROPOSER_KEY');
+        address daoV3Implementation = vm.envAddress('DAO_V3_IMPL');
+        string memory description = vm.readFile(vm.envString('PROPOSAL_DESCRIPTION_FILE'));
+
+        address[] memory targets = new address[](1);
+        uint256[] memory values = new uint256[](1);
+        string[] memory signatures = new string[](1);
+        bytes[] memory calldatas = new bytes[](1);
+
+        vm.startBroadcast(proposerKey);
+
+        targets[0] = address(NOUNS_DAO_PROXY_MAINNET);
+        values[0] = 0;
+        signatures[0] = '_setImplementation(address)';
+        calldatas[0] = abi.encode(daoV3Implementation);
+
+        proposalId = NOUNS_DAO_PROXY_MAINNET.propose(targets, values, signatures, calldatas, description);
+
+        vm.stopBroadcast();
+    }
+}

packages/nouns-contracts/script/DeployDAOV3DataContractsBase.s.sol

@@ -2,18 +2,21 @@
 pragma solidity ^0.8.15;
 
 import 'forge-std/Script.sol';
-import { NounsDAOLogicV1 } from '../contracts/governance/NounsDAOLogicV1.sol';
 import { NounsDAOData } from '../contracts/governance/data/NounsDAOData.sol';
 import { NounsDAODataProxy } from '../contracts/governance/data/NounsDAODataProxy.sol';
 
+interface NounsDAO {
+    function nouns() external view returns (address);
+}
+
 contract DeployDAOV3DataContractsBase is Script {
     uint256 public constant CREATE_CANDIDATE_COST = 0.01 ether;
 
-    NounsDAOLogicV1 public immutable daoProxy;
+    NounsDAO public immutable daoProxy;
     address public immutable timelockV2Proxy;
 
     constructor(address _daoProxy, address _timelockV2Proxy) {
-        daoProxy = NounsDAOLogicV1(payable(_daoProxy));
+        daoProxy = NounsDAO(_daoProxy);
         timelockV2Proxy = _timelockV2Proxy;
     }
 
@@ -22,7 +25,7 @@ contract DeployDAOV3DataContractsBase is Script {
 
         vm.startBroadcast(deployerKey);
 
-        NounsDAOData dataLogic = new NounsDAOData(address(daoProxy.nouns()), address(daoProxy));
+        NounsDAOData dataLogic = new NounsDAOData(daoProxy.nouns(), address(daoProxy));
 
         bytes memory initCallData = abi.encodeWithSignature(
             'initialize(address,uint256,uint256,address)',

packages/nouns-contracts/script/DeployDAOV3NewContractsBase.s.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.15;
 import 'forge-std/Script.sol';
 import { NounsDAOExecutorV2 } from '../contracts/governance/NounsDAOExecutorV2.sol';
 import { NounsDAOExecutorV2Test } from '../contracts/test/NounsDAOExecutorHarness.sol';
-import { NounsDAOLogicV1 } from '../contracts/governance/NounsDAOLogicV1.sol';
 import { NounsDAOLogicV3 } from '../contracts/governance/NounsDAOLogicV3.sol';
 import { NounsDAOExecutorProxy } from '../contracts/governance/NounsDAOExecutorProxy.sol';
 import { INounsDAOExecutor } from '../contracts/governance/NounsDAOInterfaces.sol';
@@ -15,14 +14,18 @@ import { NounsDAOLogicV1Fork } from '../contracts/governance/fork/newdao/governa
 import { ForkDAODeployer } from '../contracts/governance/fork/ForkDAODeployer.sol';
 import { ERC20Transferer } from '../contracts/utils/ERC20Transferer.sol';
 
+interface NounsDAO {
+    function nouns() external view returns (address);
+}
+
 contract DeployDAOV3NewContractsBase is Script {
     uint256 public constant DELAYED_GOV_DURATION = 30 days;
     uint256 public immutable forkDAOVotingPeriod;
     uint256 public immutable forkDAOVotingDelay;
     uint256 public constant FORK_DAO_PROPOSAL_THRESHOLD_BPS = 25; // 0.25%
     uint256 public constant FORK_DAO_QUORUM_VOTES_BPS = 1000; // 10%
 
-    NounsDAOLogicV1 public immutable daoProxy;
+    NounsDAO public immutable daoProxy;
     INounsDAOExecutor public immutable timelockV1;
     bool public immutable deployTimelockV2Harness; // should be true only for testnets
 
@@ -33,7 +36,7 @@ contract DeployDAOV3NewContractsBase is Script {
         uint256 _forkDAOVotingPeriod,
         uint256 _forkDAOVotingDelay
     ) {
-        daoProxy = NounsDAOLogicV1(payable(_daoProxy));
+        daoProxy = NounsDAO(_daoProxy);
         timelockV1 = INounsDAOExecutor(_timelockV1);
         deployTimelockV2Harness = _deployTimelockV2Harness;
         forkDAOVotingPeriod = _forkDAOVotingPeriod;

packages/nouns-contracts/script/ProposeDAOV3UpgradeMainnet.s.sol

@@ -2,14 +2,22 @@
 pragma solidity ^0.8.15;
 
 import 'forge-std/Script.sol';
-import { NounsDAOLogicV1 } from '../contracts/governance/NounsDAOLogicV1.sol';
 import { NounsDAOForkEscrow } from '../contracts/governance/fork/NounsDAOForkEscrow.sol';
 import { ForkDAODeployer } from '../contracts/governance/fork/ForkDAODeployer.sol';
 import { IERC20 } from '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 
+interface NounsDAO {
+    function propose(
+        address[] memory targets,
+        uint256[] memory values,
+        string[] memory signatures,
+        bytes[] memory calldatas,
+        string memory description
+    ) external returns (uint256);
+}
+
 contract ProposeDAOV3UpgradeMainnet is Script {
-    NounsDAOLogicV1 public constant NOUNS_DAO_PROXY_MAINNET =
-        NounsDAOLogicV1(0x6f3E6272A167e8AcCb32072d08E0957F9c79223d);
+    NounsDAO public constant NOUNS_DAO_PROXY_MAINNET = NounsDAO(0x6f3E6272A167e8AcCb32072d08E0957F9c79223d);
     address public constant NOUNS_TIMELOCK_V1_MAINNET = 0x0BC3807Ec262cB779b38D65b38158acC3bfedE10;
 
     uint256 public constant ETH_TO_SEND_TO_NEW_TIMELOCK = 2500 ether;
@@ -60,7 +68,7 @@ contract ProposeDAOV3UpgradeMainnet is Script {
     }
 
     function propose(
-        NounsDAOLogicV1 daoProxy,
+        NounsDAO daoProxy,
         address daoV3Implementation,
         address timelockV2,
         uint256 ethToSendToNewTimelock,