Skip to content

Commit

Permalink
ctp: delete ERC721Bridge from ctp
Browse files Browse the repository at this point in the history
The NFT bridge tests have been ported to foundry
as part of the `contracts-bedrock` package. We can
now delete the NFT bridge code from `contracts-periphery`.

Note that the `OptimismMintableERC721Factory` will be a predeploy
when upgrading to bedrock, so we do not need a deploy script for it.
Its deploy artifact was migrated to `contracts-bedrock` so that
the existing impl can be tracked. The deployment artifacts of
the `L1ERC721Bridge` and its `Proxy` were also migrated to
`contracts-bedrock`.
  • Loading branch information
tynes authored and smartcontracts committed Dec 16, 2022
1 parent 7091d42 commit 98c0c0e
Show file tree
Hide file tree
Showing 24 changed files with 6 additions and 2,285 deletions.
2 changes: 1 addition & 1 deletion integration-tests/contracts/FakeOptimismMintableERC721.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
pragma solidity ^0.8.9;

import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import { OptimismMintableERC721 } from "@eth-optimism/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol";
import { OptimismMintableERC721 } from "@eth-optimism/contracts-bedrock/contracts/universal/OptimismMintableERC721.sol";
import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

contract FakeOptimismMintableERC721 is OptimismMintableERC721 {
Expand Down
1 change: 1 addition & 0 deletions integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"devDependencies": {
"@babel/eslint-parser": "^7.5.4",
"@eth-optimism/contracts": "^0.5.39",
"@eth-optimism/contracts-bedrock": "0.11.0",
"@eth-optimism/contracts-periphery": "^1.0.4",
"@eth-optimism/core-utils": "0.12.0",
"@eth-optimism/sdk": "1.8.0",
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/test/nft-bridge.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { ethers } from 'hardhat'
import { getChainId } from '@eth-optimism/core-utils'
import { predeploys } from '@eth-optimism/contracts'
import Artifact__TestERC721 from '@eth-optimism/contracts-periphery/artifacts/contracts/testing/helpers/TestERC721.sol/TestERC721.json'
import Artifact__L1ERC721Bridge from '@eth-optimism/contracts-periphery/artifacts/contracts/L1/L1ERC721Bridge.sol/L1ERC721Bridge.json'
import Artifact__L2ERC721Bridge from '@eth-optimism/contracts-periphery/artifacts/contracts/L2/L2ERC721Bridge.sol/L2ERC721Bridge.json'
import Artifact__OptimismMintableERC721Factory from '@eth-optimism/contracts-periphery/artifacts/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol/OptimismMintableERC721Factory.json'
import Artifact__OptimismMintableERC721 from '@eth-optimism/contracts-periphery/artifacts/contracts/universal/op-erc721/OptimismMintableERC721.sol/OptimismMintableERC721.json'
import Artifact__L1ERC721Bridge from '@eth-optimism/contracts-bedrock/artifacts/contracts/L1/L1ERC721Bridge.sol/L1ERC721Bridge.json'
import Artifact__L2ERC721Bridge from '@eth-optimism/contracts-bedrock/artifacts/contracts/L2/L2ERC721Bridge.sol/L2ERC721Bridge.json'
import Artifact__OptimismMintableERC721Factory from '@eth-optimism/contracts-bedrock/artifacts/contracts/universal/OptimismMintableERC721Factory.sol/OptimismMintableERC721Factory.json'
import Artifact__OptimismMintableERC721 from '@eth-optimism/contracts-bedrock/artifacts/contracts/universal/OptimismMintableERC721.sol/OptimismMintableERC721.json'

/* Imports: Internal */
import { expect } from './shared/setup'
Expand Down
111 changes: 0 additions & 111 deletions packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol

This file was deleted.

126 changes: 0 additions & 126 deletions packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol

This file was deleted.

Loading

0 comments on commit 98c0c0e

Please sign in to comment.