Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 2 additions & 21 deletions packages/core/contracts/governance/MetaHumanGovernor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -422,8 +422,7 @@ contract MetaHumanGovernor is
}

/**
* @dev Retrieves the state of a proposal, ensuring that once the main voting period ends,
* the proposal cannot be canceled regardless of the collection status from spoke chains.
* @dev Retrieves the state of a proposal.
*
* @param proposalId The ID of the proposal.
* @return The current state of the proposal.
Expand All @@ -436,25 +435,7 @@ contract MetaHumanGovernor is
override(Governor, GovernorTimelockControl)
returns (ProposalState)
{
ProposalState calculatedState = super.state(proposalId);

// Check if the main voting period has ended
if (
calculatedState == ProposalState.Succeeded ||
calculatedState == ProposalState.Defeated
) {
return calculatedState;
}

// Check if the collection phase has finished
if (
block.timestamp > proposalDeadline(proposalId) &&
!collectionFinished[proposalId]
) {
return ProposalState.Pending;
}

return calculatedState;
return super.state(proposalId);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/core/scripts/create-proposal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async function main() {
proposal.values,
proposal.calldatas,
proposal.description,
{ value: ethers.parseEther('0.015') }
{ value: ethers.parseEther('0.025') }
);

await transactionResponse.wait();
Expand Down
1 change: 1 addition & 0 deletions packages/core/scripts/update-spokes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ async function main() {
// can only be called by the governor
const transaction =
await governanceContract.updateSpokeContracts(spokeContracts);
await transaction.wait();
console.log(
'Spoke contracts updated successfully. TxHash:',
transaction.hash
Expand Down
Loading