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
3fbb4425
Unverified
Commit
3fbb4425
authored
Apr 16, 2024
by
clabby
Committed by
GitHub
Apr 16, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ctb): Flaky test fix (#10163)
parent
ba6d7f56
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
faultdisputegame.go
op-bindings/bindings/faultdisputegame.go
+1
-1
faultdisputegame_more.go
op-bindings/bindings/faultdisputegame_more.go
+1
-1
semver-lock.json
packages/contracts-bedrock/semver-lock.json
+2
-2
FaultDisputeGame.sol
packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+6
-6
No files found.
op-bindings/bindings/faultdisputegame.go
View file @
3fbb4425
This diff is collapsed.
Click to expand it.
op-bindings/bindings/faultdisputegame_more.go
View file @
3fbb4425
This diff is collapsed.
Click to expand it.
packages/contracts-bedrock/semver-lock.json
View file @
3fbb4425
...
@@ -112,8 +112,8 @@
...
@@ -112,8 +112,8 @@
"sourceCodeHash"
:
"0x08f34cec56d58ea6ee7a47b5adcbeca6a68a5dd1daa949330b4bde86c2e605f5"
"sourceCodeHash"
:
"0x08f34cec56d58ea6ee7a47b5adcbeca6a68a5dd1daa949330b4bde86c2e605f5"
},
},
"src/dispute/FaultDisputeGame.sol"
:
{
"src/dispute/FaultDisputeGame.sol"
:
{
"initCodeHash"
:
"0x
840cead3853807f27b3fd995d2f0c0ffc2a4a804d9dbd105cceba04e92109e47
"
,
"initCodeHash"
:
"0x
42c04ec50860cf8f1f772bc77dcbd20e7e06554a0962d16eaad2ee5fd748cfe0
"
,
"sourceCodeHash"
:
"0x
15ec89d7c8751e51e1986d1111c74462adfbd33240bffb273f2f7894a731e5dd
"
"sourceCodeHash"
:
"0x
8ea9b68ddfc6fce606065a789b7323d8b119aadb162c139f1878a9322b1e892b
"
},
},
"src/dispute/weth/DelayedWETH.sol"
:
{
"src/dispute/weth/DelayedWETH.sol"
:
{
"initCodeHash"
:
"0x7b6ec89eaec09e369426e73161a9c6932223bb1f974377190c3f6f552995da35"
,
"initCodeHash"
:
"0x7b6ec89eaec09e369426e73161a9c6932223bb1f974377190c3f6f552995da35"
,
...
...
packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
View file @
3fbb4425
...
@@ -88,8 +88,8 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
...
@@ -88,8 +88,8 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
OutputRoot public startingOutputRoot;
OutputRoot public startingOutputRoot;
/// @notice Semantic version.
/// @notice Semantic version.
/// @custom:semver 0.1
4
.0
/// @custom:semver 0.1
5
.0
string public constant version = "0.1
4
.0";
string public constant version = "0.1
5
.0";
/// @param _gameType The type ID of the game.
/// @param _gameType The type ID of the game.
/// @param _absolutePrestate The absolute prestate of the instruction trace.
/// @param _absolutePrestate The absolute prestate of the instruction trace.
...
@@ -514,10 +514,6 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
...
@@ -514,10 +514,6 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
// Set the starting output root.
// Set the starting output root.
startingOutputRoot = OutputRoot({ l2BlockNumber: rootBlockNumber, root: root });
startingOutputRoot = OutputRoot({ l2BlockNumber: rootBlockNumber, root: root });
// Do not allow the game to be initialized if the root claim corresponds to a block at or before the
// configured starting block number.
if (l2BlockNumber() <= rootBlockNumber) revert UnexpectedRootClaim(rootClaim());
// Revert if the calldata size is not the expected length.
// Revert if the calldata size is not the expected length.
//
//
// This is to prevent adding extra or omitting bytes from to `extraData` that result in a different game UUID
// This is to prevent adding extra or omitting bytes from to `extraData` that result in a different game UUID
...
@@ -539,6 +535,10 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
...
@@ -539,6 +535,10 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
}
}
}
}
// Do not allow the game to be initialized if the root claim corresponds to a block at or before the
// configured starting block number.
if (l2BlockNumber() <= rootBlockNumber) revert UnexpectedRootClaim(rootClaim());
// Set the root claim
// Set the root claim
claimData.push(
claimData.push(
ClaimData({
ClaimData({
...
...
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