Skip to content
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

Jump to bottom

Handle cancelled proposal #61

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Handle cancelled proposal #61

merged 3 commits into from
Sep 28, 2023

Conversation

alexkeating
Copy link
Collaborator

@alexkeating alexkeating commented Sep 19, 2023 •
edited
Loading

Description

  • Handle cancelled proposal in bridging and on proposal active

Closes #48

@alexkeating
Copy link
Collaborator Author

alexkeating commented Sep 19, 2023 •
edited
Loading

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@alexkeating alexkeating marked this pull request as ready for review September 19, 2023 20:47
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from 9a07f38 to 797a89d Compare September 20, 2023 02:46
wildmolasses
wildmolasses reviewed Sep 20, 2023
View reviewed changes
Copy link
Contributor

@wildmolasses wildmolasses left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, a few mostly cosmetic things

src/L2VoteAggregator.sol Outdated Show resolved Hide resolved
src/L2GovernorMetadata.sol Outdated Show resolved Hide resolved
test/WormholeL2VoteAggregator.t.sol Outdated Show resolved Hide resolved
test/WormholeL2VoteAggregator.t.sol Outdated Show resolved Hide resolved
test/WormholeL2VoteAggregator.t.sol Outdated Show resolved Hide resolved
@alexkeating alexkeating changed the base branch from main to chore/udpate-proposal-interfaces September 25, 2023 14:29
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from 20b0e02 to 81139aa Compare September 25, 2023 14:29
This was referenced Sep 25, 2023
Merged
Merged
Merged
Merged
Merged
Merged
@alexkeating alexkeating force-pushed the chore/udpate-proposal-interfaces branch from 17ffdf4 to eb4d118 Compare September 25, 2023 19:31
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from 81139aa to acdd800 Compare September 25, 2023 19:31
@alexkeating alexkeating force-pushed the chore/udpate-proposal-interfaces branch from eb4d118 to ad603f4 Compare September 25, 2023 19:35
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from acdd800 to cfbfc83 Compare September 25, 2023 19:35
apbendi
apbendi reviewed Sep 25, 2023
View reviewed changes
Copy link
Member

@apbendi apbendi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good, a few comments @alexkeating

src/WormholeL1GovernorMetadataBridge.sol Outdated Show resolved Hide resolved
test/WormholeL2GovernorMetadata.t.sol Show resolved Hide resolved
test/WormholeL2VoteAggregator.t.sol Show resolved Hide resolved
@alexkeating alexkeating changed the base branch from chore/udpate-proposal-interfaces to main September 26, 2023 15:05
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from cfbfc83 to e070d2d Compare September 26, 2023 15:05
@alexkeating alexkeating force-pushed the feature/handle-cancelled-proposal branch from 4b481f1 to 9fb73ea Compare September 26, 2023 18:52
@github-actions
Copy link

Coverage after merging feature/handle-cancelled-proposal into main will be

94.44%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
src
   FakeERC20.sol100%100%100%100%
   L1Block.sol25%100%25%25%23, 27, 31
   L1VotePool.sol100%100%100%100%
   L2GovernorMetadata.sol100%100%100%100%
   L2VoteAggregator.sol91.84%81.25%100%96.43%103, 106, 115, 82
   WormholeL1ERC20Bridge.sol88%66.67%100%92.86%69, 89, 94
   WormholeL1GovernorMetadataBridge.sol100%100%100%100%
   WormholeL1VotePool.sol100%100%100%100%
   WormholeL2ERC20.sol95.24%75%100%100%87
   WormholeL2GovernorMetadata.sol100%100%100%100%
   WormholeL2VoteAggregator.sol100%100%100%100%
   WormholeReceiver.sol100%100%100%100%
   WormholeSender.sol100%100%100%100%

apbendi
apbendi approved these changes Sep 27, 2023
View reviewed changes
Copy link
Member

@apbendi apbendi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks @alexkeating

@alexkeating alexkeating mentioned this pull request Sep 28, 2023
Merged
@wildmolasses wildmolasses self-requested a review September 28, 2023 14:46
wildmolasses
wildmolasses approved these changes Sep 28, 2023
View reviewed changes
Copy link
Contributor

@wildmolasses wildmolasses left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@alexkeating alexkeating merged commit 20b81e2 into main Sep 28, 2023
4 checks passed
This was referenced Sep 29, 2023
Merged
Merged
@alexkeating alexkeating mentioned this pull request Oct 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wildmolasses wildmolasses wildmolasses approved these changes

@apbendi apbendi apbendi approved these changes

@mds1 mds1 Awaiting requested review from mds1

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Handle cancelled state
3 participants
@alexkeating @apbendi @wildmolasses