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
1d9d830a
Unverified
Commit
1d9d830a
authored
Oct 17, 2023
by
refcell.eth
Committed by
GitHub
Oct 17, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7694 from ethereum-optimism/refcell/local-context-init
feat(op-challenger): Wire Up the LocalContext
parents
a144e2f0
d4be5bd8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
+10
-6
alphabet.go
op-challenger/game/fault/test/alphabet.go
+1
-1
provider.go
op-challenger/game/fault/trace/cannon/provider.go
+2
-1
provider_test.go
op-challenger/game/fault/trace/cannon/provider_test.go
+1
-1
types.go
op-challenger/game/fault/types/types.go
+2
-1
types_test.go
op-challenger/game/fault/types/types_test.go
+4
-2
No files found.
op-challenger/game/fault/test/alphabet.go
View file @
1d9d830a
...
@@ -33,6 +33,6 @@ func (a *alphabetWithProofProvider) GetStepData(ctx context.Context, i types.Pos
...
@@ -33,6 +33,6 @@ func (a *alphabetWithProofProvider) GetStepData(ctx context.Context, i types.Pos
return
nil
,
nil
,
nil
,
err
return
nil
,
nil
,
nil
,
err
}
}
traceIndex
:=
i
.
TraceIndex
(
int
(
a
.
depth
))
.
Uint64
()
traceIndex
:=
i
.
TraceIndex
(
int
(
a
.
depth
))
.
Uint64
()
data
:=
types
.
NewPreimageOracleData
([]
byte
{
byte
(
traceIndex
)},
[]
byte
{
byte
(
traceIndex
-
1
)},
uint32
(
traceIndex
-
1
))
data
:=
types
.
NewPreimageOracleData
(
0
,
[]
byte
{
byte
(
traceIndex
)},
[]
byte
{
byte
(
traceIndex
-
1
)},
uint32
(
traceIndex
-
1
))
return
preimage
,
[]
byte
{
byte
(
traceIndex
-
1
)},
data
,
nil
return
preimage
,
[]
byte
{
byte
(
traceIndex
-
1
)},
data
,
nil
}
}
op-challenger/game/fault/trace/cannon/provider.go
View file @
1d9d830a
...
@@ -123,7 +123,8 @@ func (p *CannonTraceProvider) GetStepData(ctx context.Context, pos types.Positio
...
@@ -123,7 +123,8 @@ func (p *CannonTraceProvider) GetStepData(ctx context.Context, pos types.Positio
}
}
var
oracleData
*
types
.
PreimageOracleData
var
oracleData
*
types
.
PreimageOracleData
if
len
(
proof
.
OracleKey
)
>
0
{
if
len
(
proof
.
OracleKey
)
>
0
{
oracleData
=
types
.
NewPreimageOracleData
(
proof
.
OracleKey
,
proof
.
OracleValue
,
proof
.
OracleOffset
)
// TODO(client-pod#104): Replace the LocalContext `0` argument below with the correct local context.
oracleData
=
types
.
NewPreimageOracleData
(
0
,
proof
.
OracleKey
,
proof
.
OracleValue
,
proof
.
OracleOffset
)
}
}
return
value
,
data
,
oracleData
,
nil
return
value
,
data
,
oracleData
,
nil
}
}
...
...
op-challenger/game/fault/trace/cannon/provider_test.go
View file @
1d9d830a
...
@@ -124,7 +124,7 @@ func TestGetStepData(t *testing.T) {
...
@@ -124,7 +124,7 @@ func TestGetStepData(t *testing.T) {
require
.
EqualValues
(
t
,
generator
.
proof
.
StateData
,
preimage
)
require
.
EqualValues
(
t
,
generator
.
proof
.
StateData
,
preimage
)
require
.
EqualValues
(
t
,
generator
.
proof
.
ProofData
,
proof
)
require
.
EqualValues
(
t
,
generator
.
proof
.
ProofData
,
proof
)
expectedData
:=
types
.
NewPreimageOracleData
(
generator
.
proof
.
OracleKey
,
generator
.
proof
.
OracleValue
,
generator
.
proof
.
OracleOffset
)
expectedData
:=
types
.
NewPreimageOracleData
(
0
,
generator
.
proof
.
OracleKey
,
generator
.
proof
.
OracleValue
,
generator
.
proof
.
OracleOffset
)
require
.
EqualValues
(
t
,
expectedData
,
data
)
require
.
EqualValues
(
t
,
expectedData
,
data
)
})
})
...
...
op-challenger/game/fault/types/types.go
View file @
1d9d830a
...
@@ -33,9 +33,10 @@ func (p *PreimageOracleData) GetPreimageWithoutSize() []byte {
...
@@ -33,9 +33,10 @@ func (p *PreimageOracleData) GetPreimageWithoutSize() []byte {
}
}
// NewPreimageOracleData creates a new [PreimageOracleData] instance.
// NewPreimageOracleData creates a new [PreimageOracleData] instance.
func
NewPreimageOracleData
(
key
[]
byte
,
data
[]
byte
,
offset
uint32
)
*
PreimageOracleData
{
func
NewPreimageOracleData
(
lctx
uint64
,
key
[]
byte
,
data
[]
byte
,
offset
uint32
)
*
PreimageOracleData
{
return
&
PreimageOracleData
{
return
&
PreimageOracleData
{
IsLocal
:
len
(
key
)
>
0
&&
key
[
0
]
==
byte
(
1
),
IsLocal
:
len
(
key
)
>
0
&&
key
[
0
]
==
byte
(
1
),
LocalContext
:
lctx
,
OracleKey
:
key
,
OracleKey
:
key
,
OracleData
:
data
,
OracleData
:
data
,
OracleOffset
:
offset
,
OracleOffset
:
offset
,
...
...
op-challenger/game/fault/types/types_test.go
View file @
1d9d830a
...
@@ -9,16 +9,18 @@ import (
...
@@ -9,16 +9,18 @@ import (
func
TestNewPreimageOracleData
(
t
*
testing
.
T
)
{
func
TestNewPreimageOracleData
(
t
*
testing
.
T
)
{
t
.
Run
(
"LocalData"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"LocalData"
,
func
(
t
*
testing
.
T
)
{
data
:=
NewPreimageOracleData
([]
byte
{
1
,
2
,
3
},
[]
byte
{
4
,
5
,
6
},
7
)
data
:=
NewPreimageOracleData
(
1
,
[]
byte
{
1
,
2
,
3
},
[]
byte
{
4
,
5
,
6
},
7
)
require
.
True
(
t
,
data
.
IsLocal
)
require
.
True
(
t
,
data
.
IsLocal
)
require
.
Equal
(
t
,
uint64
(
1
),
data
.
LocalContext
)
require
.
Equal
(
t
,
[]
byte
{
1
,
2
,
3
},
data
.
OracleKey
)
require
.
Equal
(
t
,
[]
byte
{
1
,
2
,
3
},
data
.
OracleKey
)
require
.
Equal
(
t
,
[]
byte
{
4
,
5
,
6
},
data
.
OracleData
)
require
.
Equal
(
t
,
[]
byte
{
4
,
5
,
6
},
data
.
OracleData
)
require
.
Equal
(
t
,
uint32
(
7
),
data
.
OracleOffset
)
require
.
Equal
(
t
,
uint32
(
7
),
data
.
OracleOffset
)
})
})
t
.
Run
(
"GlobalData"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"GlobalData"
,
func
(
t
*
testing
.
T
)
{
data
:=
NewPreimageOracleData
([]
byte
{
0
,
2
,
3
},
[]
byte
{
4
,
5
,
6
},
7
)
data
:=
NewPreimageOracleData
(
1
,
[]
byte
{
0
,
2
,
3
},
[]
byte
{
4
,
5
,
6
},
7
)
require
.
False
(
t
,
data
.
IsLocal
)
require
.
False
(
t
,
data
.
IsLocal
)
require
.
Equal
(
t
,
uint64
(
1
),
data
.
LocalContext
)
require
.
Equal
(
t
,
[]
byte
{
0
,
2
,
3
},
data
.
OracleKey
)
require
.
Equal
(
t
,
[]
byte
{
0
,
2
,
3
},
data
.
OracleKey
)
require
.
Equal
(
t
,
[]
byte
{
4
,
5
,
6
},
data
.
OracleData
)
require
.
Equal
(
t
,
[]
byte
{
4
,
5
,
6
},
data
.
OracleData
)
require
.
Equal
(
t
,
uint32
(
7
),
data
.
OracleOffset
)
require
.
Equal
(
t
,
uint32
(
7
),
data
.
OracleOffset
)
...
...
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