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
c16f0c34
Unverified
Commit
c16f0c34
authored
Apr 19, 2023
by
mergify[bot]
Committed by
GitHub
Apr 19, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into fix/compiler-test
parents
1f92c390
d2641210
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
8 deletions
+20
-8
new-mails-explain.md
.changeset/new-mails-explain.md
+5
-0
old-poets-camp.md
.changeset/old-poets-camp.md
+5
-0
l1crossdomainmessenger.go
op-bindings/bindings/l1crossdomainmessenger.go
+1
-1
l2crossdomainmessenger.go
op-bindings/bindings/l2crossdomainmessenger.go
+1
-1
service.ts
packages/chain-mon/src/wd-mon/service.ts
+1
-1
L1CrossDomainMessenger.sol
...contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol
+2
-2
L2CrossDomainMessenger.sol
...contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol
+2
-2
SafeCall.t.sol
packages/contracts-bedrock/contracts/test/SafeCall.t.sol
+2
-0
check-l2.ts
packages/contracts-bedrock/tasks/check-l2.ts
+1
-1
No files found.
.changeset/new-mails-explain.md
0 → 100644
View file @
c16f0c34
---
'
@eth-optimism/contracts-bedrock'
:
minor
---
Bump XDM semver after #5444
.changeset/old-poets-camp.md
0 → 100644
View file @
c16f0c34
---
'
@eth-optimism/chain-mon'
:
patch
---
Fixes a bug in the wd-mon service where a node connection failure event was not handled correctly
op-bindings/bindings/l1crossdomainmessenger.go
View file @
c16f0c34
This diff is collapsed.
Click to expand it.
op-bindings/bindings/l2crossdomainmessenger.go
View file @
c16f0c34
This diff is collapsed.
Click to expand it.
packages/chain-mon/src/wd-mon/service.ts
View file @
c16f0c34
...
...
@@ -142,7 +142,7 @@ export class WithdrawalMonitor extends BaseServiceV2<Options, Metrics, State> {
section
:
'
getBlockNumber
'
,
})
this
.
metrics
.
nodeConnectionFailures
.
inc
({
chainId
:
this
.
state
.
messenger
.
l1ChainId
,
layer
:
'
l1
'
,
section
:
'
getBlockNumber
'
,
})
await
sleep
(
this
.
options
.
sleepTimeMs
)
...
...
packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol
View file @
c16f0c34
...
...
@@ -20,12 +20,12 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
OptimismPortal public immutable PORTAL;
/**
* @custom:semver 1.
1
.0
* @custom:semver 1.
2
.0
*
* @param _portal Address of the OptimismPortal contract on this network.
*/
constructor(OptimismPortal _portal)
Semver(1,
1
, 0)
Semver(1,
2
, 0)
CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER)
{
PORTAL = _portal;
...
...
packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol
View file @
c16f0c34
...
...
@@ -17,12 +17,12 @@ import { L2ToL1MessagePasser } from "./L2ToL1MessagePasser.sol";
*/
contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
/**
* @custom:semver 1.
1
.0
* @custom:semver 1.
2
.0
*
* @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
*/
constructor(address _l1CrossDomainMessenger)
Semver(1,
1
, 0)
Semver(1,
2
, 0)
CrossDomainMessenger(_l1CrossDomainMessenger)
{
initialize();
...
...
packages/contracts-bedrock/contracts/test/SafeCall.t.sol
View file @
c16f0c34
...
...
@@ -23,6 +23,8 @@ contract SafeCall_call_Test is CommonTest {
vm.assume(to != address(0x000000000000000000636F6e736F6c652e6c6f67));
// don't call the create2 deployer
vm.assume(to != address(0x4e59b44847b379578588920cA78FbF26c0B4956C));
// don't call the ffi interface
vm.assume(to != address(0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f));
assertEq(from.balance, 0, "from balance is 0");
vm.deal(from, value);
...
...
packages/contracts-bedrock/tasks/check-l2.ts
View file @
c16f0c34
...
...
@@ -245,7 +245,7 @@ const check = {
await
assertSemver
(
L2CrossDomainMessenger
,
'
L2CrossDomainMessenger
'
,
'
1.
1
.0
'
'
1.
2
.0
'
)
const
xDomainMessageSenderSlot
=
await
signer
.
provider
.
getStorageAt
(
...
...
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