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
de795648
Unverified
Commit
de795648
authored
Oct 23, 2024
by
Adrian Sutton
Committed by
GitHub
Oct 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-challenger: Log warning and continue if game impl not available (#12539)
parent
984bd412
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
2 deletions
+77
-2
register_task.go
op-challenger/game/fault/register_task.go
+6
-2
register_task_test.go
op-challenger/game/fault/register_task_test.go
+71
-0
No files found.
op-challenger/game/fault/register_task.go
View file @
de795648
...
@@ -256,7 +256,7 @@ func (e *RegisterTask) Register(
...
@@ -256,7 +256,7 @@ func (e *RegisterTask) Register(
}
}
return
NewGamePlayer
(
ctx
,
systemClock
,
l1Clock
,
logger
,
m
,
dir
,
game
.
Proxy
,
txSender
,
contract
,
syncValidator
,
validators
,
creator
,
l1HeaderSource
,
selective
,
claimants
)
return
NewGamePlayer
(
ctx
,
systemClock
,
l1Clock
,
logger
,
m
,
dir
,
game
.
Proxy
,
txSender
,
contract
,
syncValidator
,
validators
,
creator
,
l1HeaderSource
,
selective
,
claimants
)
}
}
err
:=
registerOracle
(
ctx
,
m
,
oracles
,
gameFactory
,
caller
,
e
.
gameType
)
err
:=
registerOracle
(
ctx
,
logger
,
m
,
oracles
,
gameFactory
,
caller
,
e
.
gameType
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -269,11 +269,15 @@ func (e *RegisterTask) Register(
...
@@ -269,11 +269,15 @@ func (e *RegisterTask) Register(
return
nil
return
nil
}
}
func
registerOracle
(
ctx
context
.
Context
,
m
metrics
.
Metricer
,
oracles
OracleRegistry
,
gameFactory
*
contracts
.
DisputeGameFactoryContract
,
caller
*
batching
.
MultiCaller
,
gameType
faultTypes
.
GameType
)
error
{
func
registerOracle
(
ctx
context
.
Context
,
logger
log
.
Logger
,
m
metrics
.
Metricer
,
oracles
OracleRegistry
,
gameFactory
*
contracts
.
DisputeGameFactoryContract
,
caller
*
batching
.
MultiCaller
,
gameType
faultTypes
.
GameType
)
error
{
implAddr
,
err
:=
gameFactory
.
GetGameImpl
(
ctx
,
gameType
)
implAddr
,
err
:=
gameFactory
.
GetGameImpl
(
ctx
,
gameType
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to load implementation for game type %v: %w"
,
gameType
,
err
)
return
fmt
.
Errorf
(
"failed to load implementation for game type %v: %w"
,
gameType
,
err
)
}
}
if
implAddr
==
(
common
.
Address
{})
{
logger
.
Warn
(
"No game implementation set for game type"
,
"gameType"
,
gameType
)
return
nil
}
contract
,
err
:=
contracts
.
NewFaultDisputeGameContract
(
ctx
,
m
,
implAddr
,
caller
)
contract
,
err
:=
contracts
.
NewFaultDisputeGameContract
(
ctx
,
m
,
implAddr
,
caller
)
if
err
!=
nil
{
if
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to create fault dispute game contracts: %w"
,
err
)
return
fmt
.
Errorf
(
"failed to create fault dispute game contracts: %w"
,
err
)
...
...
op-challenger/game/fault/register_task_test.go
0 → 100644
View file @
de795648
package
fault
import
(
"context"
"testing"
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/contracts"
faultTypes
"github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
"github.com/ethereum-optimism/optimism/op-challenger/game/registry"
"github.com/ethereum-optimism/optimism/op-challenger/metrics"
"github.com/ethereum-optimism/optimism/op-service/sources/batching"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/rpcblock"
"github.com/ethereum-optimism/optimism/op-service/sources/batching/test"
"github.com/ethereum-optimism/optimism/op-service/testlog"
"github.com/ethereum-optimism/optimism/packages/contracts-bedrock/snapshots"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/stretchr/testify/require"
)
func
TestRegisterOracle_MissingGameImpl
(
t
*
testing
.
T
)
{
gameFactoryAddr
:=
common
.
Address
{
0xaa
}
rpc
:=
test
.
NewAbiBasedRpc
(
t
,
gameFactoryAddr
,
snapshots
.
LoadDisputeGameFactoryABI
())
m
:=
metrics
.
NoopMetrics
caller
:=
batching
.
NewMultiCaller
(
rpc
,
batching
.
DefaultBatchSize
)
gameFactory
:=
contracts
.
NewDisputeGameFactoryContract
(
m
,
gameFactoryAddr
,
caller
)
logger
,
logs
:=
testlog
.
CaptureLogger
(
t
,
log
.
LvlInfo
)
oracles
:=
registry
.
NewOracleRegistry
()
gameType
:=
faultTypes
.
CannonGameType
rpc
.
SetResponse
(
gameFactoryAddr
,
"gameImpls"
,
rpcblock
.
Latest
,
[]
interface
{}{
gameType
},
[]
interface
{}{
common
.
Address
{}})
err
:=
registerOracle
(
context
.
Background
(),
logger
,
m
,
oracles
,
gameFactory
,
caller
,
gameType
)
require
.
NoError
(
t
,
err
)
require
.
NotNil
(
t
,
logs
.
FindLog
(
testlog
.
NewMessageFilter
(
"No game implementation set for game type"
),
testlog
.
NewAttributesFilter
(
"gameType"
,
gameType
.
String
())))
}
func
TestRegisterOracle_AddsOracle
(
t
*
testing
.
T
)
{
gameFactoryAddr
:=
common
.
Address
{
0xaa
}
gameImplAddr
:=
common
.
Address
{
0xbb
}
vmAddr
:=
common
.
Address
{
0xcc
}
oracleAddr
:=
common
.
Address
{
0xdd
}
rpc
:=
test
.
NewAbiBasedRpc
(
t
,
gameFactoryAddr
,
snapshots
.
LoadDisputeGameFactoryABI
())
rpc
.
AddContract
(
gameImplAddr
,
snapshots
.
LoadFaultDisputeGameABI
())
rpc
.
AddContract
(
vmAddr
,
snapshots
.
LoadMIPSABI
())
rpc
.
AddContract
(
oracleAddr
,
snapshots
.
LoadPreimageOracleABI
())
m
:=
metrics
.
NoopMetrics
caller
:=
batching
.
NewMultiCaller
(
rpc
,
batching
.
DefaultBatchSize
)
gameFactory
:=
contracts
.
NewDisputeGameFactoryContract
(
m
,
gameFactoryAddr
,
caller
)
logger
:=
testlog
.
Logger
(
t
,
log
.
LvlInfo
)
oracles
:=
registry
.
NewOracleRegistry
()
gameType
:=
faultTypes
.
CannonGameType
// Use the latest v1 of these contracts. Doesn't have to be an exact match for the version.
rpc
.
SetResponse
(
gameImplAddr
,
"version"
,
rpcblock
.
Latest
,
[]
interface
{}{},
[]
interface
{}{
"1.100.0"
})
rpc
.
SetResponse
(
oracleAddr
,
"version"
,
rpcblock
.
Latest
,
[]
interface
{}{},
[]
interface
{}{
"1.100.0"
})
rpc
.
SetResponse
(
gameFactoryAddr
,
"gameImpls"
,
rpcblock
.
Latest
,
[]
interface
{}{
gameType
},
[]
interface
{}{
gameImplAddr
})
rpc
.
SetResponse
(
gameImplAddr
,
"vm"
,
rpcblock
.
Latest
,
[]
interface
{}{},
[]
interface
{}{
vmAddr
})
rpc
.
SetResponse
(
vmAddr
,
"oracle"
,
rpcblock
.
Latest
,
[]
interface
{}{},
[]
interface
{}{
oracleAddr
})
err
:=
registerOracle
(
context
.
Background
(),
logger
,
m
,
oracles
,
gameFactory
,
caller
,
gameType
)
require
.
NoError
(
t
,
err
)
registered
:=
oracles
.
Oracles
()
require
.
Len
(
t
,
registered
,
1
)
require
.
Equal
(
t
,
oracleAddr
,
registered
[
0
]
.
Addr
())
}
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