diff --git a/packages/core/contracts/governance/MetaHumanGovernor.sol b/packages/core/contracts/governance/MetaHumanGovernor.sol index 57d4d9fb0c..43fd1ee495 100644 --- a/packages/core/contracts/governance/MetaHumanGovernor.sol +++ b/packages/core/contracts/governance/MetaHumanGovernor.sol @@ -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. @@ -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); } /** diff --git a/packages/core/scripts/create-proposal.ts b/packages/core/scripts/create-proposal.ts index 3c26dd815b..64aa57721b 100644 --- a/packages/core/scripts/create-proposal.ts +++ b/packages/core/scripts/create-proposal.ts @@ -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(); diff --git a/packages/core/scripts/update-spokes.ts b/packages/core/scripts/update-spokes.ts index bd206a4ed7..fa23fb16be 100644 --- a/packages/core/scripts/update-spokes.ts +++ b/packages/core/scripts/update-spokes.ts @@ -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