feat: add submit upgrade proposal

.semgrep/rules/sol-rules.yaml

@@ -129,6 +129,7 @@ rules:
         - packages/contracts-bedrock/src/governance/GovernanceToken.sol
         - packages/contracts-bedrock/src/governance/VotingModule.sol
         - packages/contracts-bedrock/src/governance/ApprovalVotingModule.sol
+        - packages/contracts-bedrock/src/governance/OptimisticModule.sol
 
   - id: sol-style-return-arg-fmt
     languages: [solidity]
@@ -155,6 +156,7 @@ rules:
       exclude:
         - packages/contracts-bedrock/test/safe-tools/CompatibilityFallbackHandler_1_3_0.sol
         - packages/contracts-bedrock/src/governance/ApprovalVotingModule.sol
+        - packages/contracts-bedrock/src/governance/OptimisticModule.sol
 
   - id: sol-style-malformed-require
     languages: [solidity]
@@ -255,6 +257,7 @@ rules:
         - packages/contracts-bedrock/src/dispute/SuperFaultDisputeGame.sol
         - packages/contracts-bedrock/src/governance/VotingModule.sol
         - packages/contracts-bedrock/src/governance/ApprovalVotingModule.sol
+        - packages/contracts-bedrock/src/governance/OptimisticModule.sol
         - packages/contracts-bedrock/src/cannon/libraries/MIPS64Instructions.sol
         - packages/contracts-bedrock/src/cannon/libraries/CannonErrors.sol
         - packages/contracts-bedrock/src/L2/SuperchainETHBridge.sol

packages/contracts-bedrock/interfaces/governance/IOptimismGovernor.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {VotingModule} from "src/governance/VotingModule.sol";
+import {IVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol";
 
 interface IOptimismGovernor {
     function propose(
@@ -21,6 +22,17 @@ interface IOptimismGovernor {
 
     function timelock() external view returns (address);
 
+    function PROPOSAL_TYPES_CONFIGURATOR() external view returns (address);
+
+    function token() external view returns (IVotesUpgradeable);
+
+    function getProposalType(uint256 proposalId) external view returns (uint8);
+
+    function proposalVotes(uint256 proposalId)
+        external
+        view
+        returns (uint256 againstVotes, uint256 forVotes, uint256 abstainVotes);
+
     /// @notice Returns the snapshot block number for a proposal, 0 if proposal doesn't exist
     /// @param proposalId The ID of the proposal
     /// @return The snapshot block number, or 0 if proposal doesn't exist

packages/contracts-bedrock/interfaces/governance/IProposalValidator.sol

@@ -24,6 +24,8 @@ interface IProposalValidator is ISemver {
     error ProposalValidator_AttestationRevoked();
     error ProposalValidator_InvalidAttestationSchema();
     error ProposalValidator_InvalidCriteriaValue();
+    error ProposalValidator_InvalidUpgradeProposalType();
+    error ProposalValidator_InvalidAgainstThreshold();
 
     struct ProposalData {
         address proposer;
@@ -83,10 +85,10 @@ interface IProposalValidator is ISemver {
         bytes encodedVotingModuleData
     );
 
-    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
-
     event Initialized(uint8 version);
 
+    event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
+
     function approveProposal(bytes32 _proposalHash, bytes32 _attestationUid) external;
 
     function moveToVote(
@@ -126,6 +128,13 @@ interface IProposalValidator is ISemver {
         ProposalType _proposalType
     ) external returns (bytes32 proposalHash_);
 
+    function submitUpgradeProposal(
+        uint248 _againstThreshold,
+        string memory _proposalDescription,
+        bytes32 _attestationUid,
+        ProposalType _proposalType
+    ) external returns (bytes32 proposalHash_);
+
     function initialize(
         address _owner,
         IProposalTypesConfigurator _proposalTypesConfigurator,
@@ -140,10 +149,10 @@ interface IProposalValidator is ISemver {
 
     function renounceOwnership() external;
 
-    function canApproveProposal(bytes32 _attestationUid, address _delegate) external view returns (bool canApprove_);
-
     function transferOwnership(address newOwner) external;
 
+    function canApproveProposal(bytes32 _attestationUid, address _delegate) external view returns (bool canApprove_);
+
     function distributionThreshold() external view returns (uint256);
 
     function VOTING_TOKEN() external view returns (IGovernanceToken);

packages/contracts-bedrock/snapshots/abi/OptimisticModule.json

@@ -0,0 +1,258 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_governor",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [],
+    "name": "COUNTING_MODE",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "PERCENT_DIVISOR",
+    "outputs": [
+      {
+        "internalType": "uint16",
+        "name": "",
+        "type": "uint16"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "PROPOSAL_DATA_ENCODING",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "VOTE_PARAMS_ENCODING",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint8",
+        "name": "",
+        "type": "uint8"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "_countVote",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "_formatExecuteParams",
+    "outputs": [
+      {
+        "internalType": "address[]",
+        "name": "",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "bytes[]",
+        "name": "",
+        "type": "bytes[]"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_proposalId",
+        "type": "uint256"
+      }
+    ],
+    "name": "_voteSucceeded",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "proposals",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "governor",
+        "type": "address"
+      },
+      {
+        "components": [
+          {
+            "internalType": "uint248",
+            "name": "againstThreshold",
+            "type": "uint248"
+          },
+          {
+            "internalType": "bool",
+            "name": "isRelativeToVotableSupply",
+            "type": "bool"
+          }
+        ],
+        "internalType": "struct ProposalSettings",
+        "name": "settings",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "_proposalId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_proposalData",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "_descriptionHash",
+        "type": "bytes32"
+      }
+    ],
+    "name": "propose",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "version",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "AlreadyVoted",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "ExistingProposal",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "InvalidParams",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NotGovernor",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OptimisticModule_NotOptimisticProposalType",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OptimisticModule_OptimisticModuleOnlySignal",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "OptimisticModule_WrongProposalId",
+    "type": "error"
+  }
+]