Skip to content

fix: pp minors #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 24, 2025
Merged

fix: pp minors #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7458e0f
chore: use fixed variable for contract version
0xChin Jul 24, 2025
556a318
refactor: rename proposalHash to proposalId for governor consistency
0xChin Jul 24, 2025
18015f1
chore: move attestation schemas uids to initialize function
0xChin Jul 24, 2025
450955f
chore: specify target modules in submit functions
0xChin Jul 24, 2025
da3b2d2
refactor: proper naming for modules settings
0xChin Jul 24, 2025
542ec30
Merge branch 'fix/ir-findings' into fix/pp-minors
0xChin Jul 24, 2025
8a26921
fix: pre-pr
0xChin Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions packages/contracts-bedrock/interfaces/governance/IProposalValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ interface IProposalValidator is ISemver {
error ProposalValidator_AttestationCreatedAfterLastVotingCycle();

event ProposalSubmitted(
bytes32 indexed proposalHash,
uint256 indexed proposalId,
address indexed proposer,
string description,
ProposalType proposalType
);

event ProposalApproved(
bytes32 indexed proposalHash,
uint256 indexed proposalId,
address indexed approver
);

event ProposalMovedToVote(
bytes32 indexed proposalHash,
uint256 indexed proposalId,
address indexed executor
);

Expand All @@ -66,7 +66,7 @@ interface IProposalValidator is ISemver {
);

event ProposalVotingModuleData(
bytes32 indexed proposalHash,
uint256 indexed proposalId,
bytes encodedVotingModuleData
);

Expand Down Expand Up @@ -109,15 +109,15 @@ interface IProposalValidator is ISemver {
bytes32 _attestationUid,
ProposalType _proposalType,
uint256 _latestVotingCycle
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function submitCouncilMemberElectionsProposal(
uint128 _criteriaValue,
string[] memory _optionDescriptions,
string memory _proposalDescription,
bytes32 _attestationUid,
uint256 _votingCycle
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function submitFundingProposal(
uint128 _criteriaValue,
Expand All @@ -127,20 +127,20 @@ interface IProposalValidator is ISemver {
string memory _description,
ProposalType _proposalType,
uint256 _votingCycle
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function approveProposal(bytes32 _proposalHash, bytes32 _attestationUid) external;
function approveProposal(uint256 _proposalId, bytes32 _attestationUid) external;

function moveToVoteProtocolOrGovernorUpgradeProposal(
uint248 _againstThreshold,
string memory _proposalDescription
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function moveToVoteCouncilMemberElectionsProposal(
uint128 _criteriaValue,
string[] memory _optionsDescriptions,
string memory _proposalDescription
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function moveToVoteFundingProposal(
uint128 _criteriaValue,
Expand All @@ -149,7 +149,7 @@ interface IProposalValidator is ISemver {
uint256[] memory _optionsAmounts,
string memory _description,
ProposalType _proposalType
) external returns (bytes32 proposalHash_);
) external returns (uint256 proposalId_);

function setVotingCycleData(
uint256 _cycleNumber,
Expand All @@ -172,6 +172,8 @@ interface IProposalValidator is ISemver {
uint256 _duration,
uint256 _votingCycleDistributionLimit,
uint256 _proposalDistributionThreshold,
bytes32 _approvedProposerAttestationSchemaUid,
bytes32 _topDelegatesAttestationSchemaUid,
ProposalType[] memory _proposalTypes,
ProposalTypeData[] memory _proposalTypesData
) external;
Expand All @@ -188,9 +190,9 @@ interface IProposalValidator is ISemver {

function initVersion() external view returns (uint8);

function APPROVED_PROPOSER_ATTESTATION_SCHEMA_UID() external view returns (bytes32);
function approvedProposerAttestationSchemaUid() external view returns (bytes32);

function TOP_DELEGATES_ATTESTATION_SCHEMA_UID() external view returns (bytes32);
function topDelegatesAttestationSchemaUid() external view returns (bytes32);

function OPTIMISTIC_MODULE_PERCENT_DIVISOR() external view returns (uint256);

Expand All @@ -204,8 +206,6 @@ interface IProposalValidator is ISemver {
);

function __constructor__(
bytes32 _approvedProposerAttestationSchemaUid,
bytes32 _topDelegatesAttestationSchemaUid,
IOptimismGovernor _governor
) external;
}
134 changes: 67 additions & 67 deletions packages/contracts-bedrock/snapshots/abi/ProposalValidator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
[
{
"inputs": [
{
"internalType": "bytes32",
"name": "_approvedProposerAttestationSchemaUid",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "_topDelegatesAttestationSchemaUid",
"type": "bytes32"
},
{
"internalType": "contract IOptimismGovernor",
"name": "_governor",
Expand All @@ -20,19 +10,6 @@
"stateMutability": "nonpayable",
"type": "constructor"
},
{
"inputs": [],
"name": "APPROVED_PROPOSER_ATTESTATION_SCHEMA_UID",
"outputs": [
{
"internalType": "bytes32",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "GOVERNOR",
Expand Down Expand Up @@ -60,34 +37,34 @@
"type": "function"
},
{
"inputs": [],
"name": "TOP_DELEGATES_ATTESTATION_SCHEMA_UID",
"outputs": [
"inputs": [
{
"internalType": "uint256",
"name": "_proposalId",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "",
"name": "_attestationUid",
"type": "bytes32"
}
],
"stateMutability": "view",
"name": "approveProposal",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bytes32",
"name": "_proposalHash",
"type": "bytes32"
},
"inputs": [],
"name": "approvedProposerAttestationSchemaUid",
"outputs": [
{
"internalType": "bytes32",
"name": "_attestationUid",
"name": "",
"type": "bytes32"
}
],
"name": "approveProposal",
"outputs": [],
"stateMutability": "nonpayable",
"stateMutability": "view",
"type": "function"
},
{
Expand Down Expand Up @@ -135,6 +112,16 @@
"name": "_proposalDistributionThreshold",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "_approvedProposerAttestationSchemaUid",
"type": "bytes32"
},
{
"internalType": "bytes32",
"name": "_topDelegatesAttestationSchemaUid",
"type": "bytes32"
},
{
"internalType": "enum ProposalValidator.ProposalType[]",
"name": "_proposalTypes",
Expand Down Expand Up @@ -184,9 +171,9 @@
"name": "moveToVoteCouncilMemberElectionsProposal",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -228,9 +215,9 @@
"name": "moveToVoteFundingProposal",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
Expand All @@ -252,9 +239,9 @@
"name": "moveToVoteProtocolOrGovernorUpgradeProposal",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -419,9 +406,9 @@
"name": "submitCouncilMemberElectionsProposal",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -468,9 +455,9 @@
"name": "submitFundingProposal",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
Expand Down Expand Up @@ -505,14 +492,27 @@
}
],
"name": "submitUpgradeProposal",
"outputs": [
{
"internalType": "uint256",
"name": "proposalId_",
"type": "uint256"
}
],
"stateMutability": "nonpayable",
"type": "function"
},
{
"inputs": [],
"name": "topDelegatesAttestationSchemaUid",
"outputs": [
{
"internalType": "bytes32",
"name": "proposalHash_",
"name": "",
"type": "bytes32"
}
],
"stateMutability": "nonpayable",
"stateMutability": "view",
"type": "function"
},
{
Expand Down Expand Up @@ -612,9 +612,9 @@
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "proposalHash",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId",
"type": "uint256"
},
{
"indexed": true,
Expand Down Expand Up @@ -644,9 +644,9 @@
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "proposalHash",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId",
"type": "uint256"
},
{
"indexed": true,
Expand All @@ -663,9 +663,9 @@
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "proposalHash",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId",
"type": "uint256"
},
{
"indexed": true,
Expand Down Expand Up @@ -719,9 +719,9 @@
"inputs": [
{
"indexed": true,
"internalType": "bytes32",
"name": "proposalHash",
"type": "bytes32"
"internalType": "uint256",
"name": "proposalId",
"type": "uint256"
},
{
"indexed": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
"sourceCodeHash": "0x18f43b227decd0f2a895b8b55e23fa6a47706697c272bbf2482b3f912be446e1"
},
"src/governance/ProposalValidator.sol:ProposalValidator": {
"initCodeHash": "0x8f58c80a20e9f5e631d9451d86b2b5478a60879e58420f6788e75629f5863430",
"sourceCodeHash": "0x1d4ce0d6f868bd36418e7e760c81ecb033c15720e6a35f088ea135620fcae91a"
"initCodeHash": "0x4171ca5a66e60a2a3715dc3108d76f985eb16937d71197c74ee0465461e8f9fe",
"sourceCodeHash": "0xa95d144dad3bb25ef0ac0e4ae9039b1ee5304e86e9ef7c1726d263f63598f864"
},
"src/legacy/DeployerWhitelist.sol:DeployerWhitelist": {
"initCodeHash": "0x53099379ed48b87f027d55712dbdd1da7d7099925426eb0531da9c0012e02c29",
Expand Down
Loading