Skip to content

Comments

nft: L-13 and M-08#3491

Merged
mergify[bot] merged 15 commits intodevelopfrom
ctp/refactor-nft-bridge
Sep 21, 2022
Merged

nft: L-13 and M-08#3491
mergify[bot] merged 15 commits intodevelopfrom
ctp/refactor-nft-bridge

Conversation

@sam-goldman
Copy link
Contributor

L-13: Refactors a lot of the functionality in the NFT bridges into a single base contract.

M-08: Fixes upgradeability inconsistencies in the ERC721 bridge contracts.

The third commit replaces CrossDomainEnabled with CrossDomainMessenger in the ERC721 bridge contracts because CrossDomainEnabled is not upgradeable.

The fourth commit makes otherBridge and messenger in the NFT bridge contracts immutable as requested here.

@changeset-bot
Copy link

changeset-bot bot commented Sep 15, 2022

⚠️ No Changeset found

Latest commit: bd310e9

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@github-actions github-actions bot added 2-reviewers A-op-bindings Area: op-bindings labels Sep 15, 2022
@sam-goldman sam-goldman changed the title Ctp/refactor nft bridge nft: L-13 and M-08 Sep 15, 2022
This was referenced Sep 15, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 15, 2022

Hey @sam-goldman! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the conflict label Sep 15, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 16, 2022

Hey @sam-goldman! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the conflict label Sep 16, 2022
@mergify mergify bot removed the conflict label Sep 16, 2022
@sam-goldman
Copy link
Contributor Author

sam-goldman commented Sep 16, 2022

Added a commit that re-orders the OptimismMintableERC721Created event as suggested here

@mergify
Copy link
Contributor

mergify bot commented Sep 20, 2022

Hey @sam-goldman! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the conflict label Sep 20, 2022
Copy link
Contributor

@tynes tynes left a comment

Choose a reason for hiding this comment

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

This needs a new rebase

@mergify mergify bot removed the conflict label Sep 20, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2022

This PR has been added to the merge queue, and will be merged soon.

@mergify mergify bot merged commit ec8a511 into develop Sep 21, 2022
@mergify mergify bot deleted the ctp/refactor-nft-bridge branch September 21, 2022 13:00
@mergify
Copy link
Contributor

mergify bot commented Sep 21, 2022

This PR is next in line to be merged, and will be merged as soon as checks pass.

@mergify mergify bot removed the on-merge-train label Sep 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-op-bindings Area: op-bindings

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants