Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
1e3bbb59
Commit
1e3bbb59
authored
Aug 03, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: polish
parent
fc17c191
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
25 deletions
+11
-25
l1erc721bridge.go
op-bindings/bindings/l1erc721bridge.go
+1
-1
l1erc721bridge_more.go
op-bindings/bindings/l1erc721bridge_more.go
+1
-1
semver-lock.json
packages/contracts-bedrock/semver-lock.json
+2
-2
L1ERC721Bridge.sol
packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+4
-11
L2ERC721Bridge.sol
packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+3
-10
No files found.
op-bindings/bindings/l1erc721bridge.go
View file @
1e3bbb59
This diff is collapsed.
Click to expand it.
op-bindings/bindings/l1erc721bridge_more.go
View file @
1e3bbb59
This diff is collapsed.
Click to expand it.
packages/contracts-bedrock/semver-lock.json
View file @
1e3bbb59
{
{
"src/L1/L1CrossDomainMessenger.sol"
:
"0x2b276f14475869cfd81868b03dc72b91dd726a787c9568caf4849fe34830b207"
,
"src/L1/L1CrossDomainMessenger.sol"
:
"0x2b276f14475869cfd81868b03dc72b91dd726a787c9568caf4849fe34830b207"
,
"src/L1/L1ERC721Bridge.sol"
:
"0x
6aeb386bab56e1fa45692188ffc0dcb09c6719e17776e1fffd13278f7a5f40c
c"
,
"src/L1/L1ERC721Bridge.sol"
:
"0x
1bf9aa5b49aecb3d1b659dfd272ea1d947069b10cb611d54578584adf8b3922
c"
,
"src/L1/L1StandardBridge.sol"
:
"0xa35dc0ab143043063c3bff73c8b065e401c23296a2017258ce8a87f4a4da9416"
,
"src/L1/L1StandardBridge.sol"
:
"0xa35dc0ab143043063c3bff73c8b065e401c23296a2017258ce8a87f4a4da9416"
,
"src/L1/L2OutputOracle.sol"
:
"0x8f32ccb4c5cb63a459a0e79ee412177dc03fd279fdaaf1dac69e8c714902e857"
,
"src/L1/L2OutputOracle.sol"
:
"0x8f32ccb4c5cb63a459a0e79ee412177dc03fd279fdaaf1dac69e8c714902e857"
,
"src/L1/OptimismPortal.sol"
:
"0xeaa47a63e8a3bcfdb7dfd3e6c8608369e34e362d9de82f3acf13cbc27c070bf7"
,
"src/L1/OptimismPortal.sol"
:
"0xeaa47a63e8a3bcfdb7dfd3e6c8608369e34e362d9de82f3acf13cbc27c070bf7"
,
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
"src/L2/L1Block.sol"
:
"0x7fbfc8b4da630386636c665570321fdec287b0867dbe0f91c2e7cd5b7697c220"
,
"src/L2/L1Block.sol"
:
"0x7fbfc8b4da630386636c665570321fdec287b0867dbe0f91c2e7cd5b7697c220"
,
"src/L2/L1FeeVault.sol"
:
"0x62bfe739ff939fc68f90916399ac4160936d31eb37749cb014dd9d0c5dd4183a"
,
"src/L2/L1FeeVault.sol"
:
"0x62bfe739ff939fc68f90916399ac4160936d31eb37749cb014dd9d0c5dd4183a"
,
"src/L2/L2CrossDomainMessenger.sol"
:
"0xc9641981f7aa79f44b5925100027098d8f76c6178c65aca99fafa859289182be"
,
"src/L2/L2CrossDomainMessenger.sol"
:
"0xc9641981f7aa79f44b5925100027098d8f76c6178c65aca99fafa859289182be"
,
"src/L2/L2ERC721Bridge.sol"
:
"0x
8c43c5f631a79df9f736c6e336af285065e798151e97f11b52bb7d722759f35f
"
,
"src/L2/L2ERC721Bridge.sol"
:
"0x
7026031cf6546b105bbbd53e7f6f0c0376e60227908d8a5bc084990b25c2f341
"
,
"src/L2/L2StandardBridge.sol"
:
"0x67e202bc6751807b20a98b88b0b65bdff30420bf1e71f2c1c7948de448cfcdc0"
,
"src/L2/L2StandardBridge.sol"
:
"0x67e202bc6751807b20a98b88b0b65bdff30420bf1e71f2c1c7948de448cfcdc0"
,
"src/L2/L2ToL1MessagePasser.sol"
:
"0xed800b600cb3f67e18a1ab10750e3934a8b3e42178f422bcacfde770a6e8e8bd"
,
"src/L2/L2ToL1MessagePasser.sol"
:
"0xed800b600cb3f67e18a1ab10750e3934a8b3e42178f422bcacfde770a6e8e8bd"
,
"src/L2/SequencerFeeVault.sol"
:
"0xd57c143b1f042400430b991b806bf971628e6980406c751e82d19ae80eeb4e8d"
,
"src/L2/SequencerFeeVault.sol"
:
"0xd57c143b1f042400430b991b806bf971628e6980406c751e82d19ae80eeb4e8d"
,
...
...
packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
View file @
1e3bbb59
...
@@ -19,21 +19,14 @@ contract L1ERC721Bridge is ERC721Bridge, Semver {
...
@@ -19,21 +19,14 @@ contract L1ERC721Bridge is ERC721Bridge, Semver {
/// @custom:semver 1.3.0
/// @custom:semver 1.3.0
/// @notice Constructs the contract.
/// @notice Constructs the contract.
constructor()
constructor() Semver(1, 3, 0) ERC721Bridge(Predeploys.L2_ERC721_BRIDGE) {
Semver(1, 3, 0)
initialize({ _messenger: CrossDomainMessenger(address(0)) });
ERC721Bridge(Predeploys.L2_ERC721_BRIDGE)
{
initialize({
_messenger: CrossDomainMessenger(address(0))
});
}
}
/// @notice Initializes the contract.
/// @notice Initializes the contract.
/// @param _messenger Address of the CrossDomainMessenger on this network.
/// @param _messenger Address of the CrossDomainMessenger on this network.
function initialize(CrossDomainMessenger _messenger) public reinitializer(1) {
function initialize(CrossDomainMessenger _messenger) public reinitializer(2) {
__ERC721Bridge_init({
__ERC721Bridge_init({ _messenger: _messenger });
_messenger: _messenger
});
}
}
/// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
/// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
...
...
packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
View file @
1e3bbb59
...
@@ -21,21 +21,14 @@ contract L2ERC721Bridge is ERC721Bridge, Semver {
...
@@ -21,21 +21,14 @@ contract L2ERC721Bridge is ERC721Bridge, Semver {
/// @custom:semver 1.3.0
/// @custom:semver 1.3.0
/// @notice Constructs the L2ERC721Bridge contract.
/// @notice Constructs the L2ERC721Bridge contract.
/// @param _otherBridge Address of the ERC721 bridge on the other network.
/// @param _otherBridge Address of the ERC721 bridge on the other network.
constructor(address _otherBridge)
constructor(address _otherBridge) Semver(1, 3, 0) ERC721Bridge(_otherBridge) {
Semver(1, 3, 0)
initialize({ _messenger: CrossDomainMessenger(address(0)) });
ERC721Bridge(_otherBridge)
{
initialize({
_messenger: CrossDomainMessenger(address(0))
});
}
}
/// @notice Initializes the contract.
/// @notice Initializes the contract.
/// @param _messenger Address of the CrossDomainMessenger on this network.
/// @param _messenger Address of the CrossDomainMessenger on this network.
function initialize(CrossDomainMessenger _messenger) public reinitializer(2) {
function initialize(CrossDomainMessenger _messenger) public reinitializer(2) {
__ERC721Bridge_init({
__ERC721Bridge_init({ _messenger: _messenger });
_messenger: _messenger
});
}
}
/// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
/// @notice Completes an ERC721 bridge from the other domain and sends the ERC721 token to the
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment