Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions op-chain-ops/interopgen/recipe.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
Prefund: make(map[common.Address]*big.Int),
}

// TODO(#11887): consider making the number of prefunded keys configurable.
l1Users := devkeys.ChainUserKeys(l1Cfg.ChainID)
for i := uint64(0); i < 20; i++ {
userAddr, err := addrs.Address(l1Users(i))
Expand Down Expand Up @@ -264,7 +263,6 @@ func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses, me
DisputeMaxClockDuration: 302400, // 3.5 days (input in seconds)
}

// TODO(#11887): consider making the number of prefunded keys configurable.
l2Users := devkeys.ChainUserKeys(new(big.Int).SetUint64(l2ChainID))
for i := uint64(0); i < 20; i++ {
userAddr, err := addrs.Address(l2Users(i))
Expand Down
1 change: 0 additions & 1 deletion op-e2e/interop/supersystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ func (s *interopE2ESystem) prepare(t *testing.T, w worldResourcePaths) {
// but if in the future these maps can diverge, the indexes for username would also diverge
// NOTE: The first 20 accounts are implicitly funded by the Recipe's World Deployment
// see: op-chain-ops/interopgen/recipe.go
// TODO(#11887): make the funded account quantity specified in the recipe so SuperSystems can know which accounts are funded
func (s *interopE2ESystem) AddUser(username string) {
for id, l2 := range s.l2s {
bigID, _ := big.NewInt(0).SetString(id, 10)
Expand Down
1 change: 0 additions & 1 deletion op-e2e/interop/supersystem_l2.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ func (s *interopE2ESystem) newL2(id string, l2Out *interopgen.L2Output) l2Net {
operatorKeys := s.newOperatorKeysForL2(l2Out)
l2Geth := s.newGethForL2(id, "sequencer", l2Out)
opNode := s.newNodeForL2(id, "sequencer", l2Out, operatorKeys, l2Geth, true)
// TODO(#11886): proposer does not work with the generated world as there is no DisputeGameFactoryProxy
proposer := s.newProposerForL2(id, operatorKeys)
batcher := s.newBatcherForL2(id, operatorKeys, l2Geth, opNode)

Expand Down
1 change: 0 additions & 1 deletion op-program/client/interop/consolidate.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ func newConsolidateCheckDeps(
progress := transitionState.PendingProgress[i]
// This is the optimistic head. It's OK if it's replaced by a deposits-only block.
// Because by then the replacement block won't be used for hazard checks.
// TODO(#14012): for extra safety, ensure the l2 oracle used for checks isn't affected by block reexec.
head := oracle.BlockByHash(progress.BlockHash, chain.ChainID)
blockByHash := func(hash common.Hash) *ethtypes.Block {
return oracle.BlockByHash(hash, chain.ChainID)
Expand Down
4 changes: 2 additions & 2 deletions op-program/host/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var (
)

type Config struct {
L2ChainID eth.ChainID // TODO: Forbid for interop
L2ChainID eth.ChainID
Rollups []*rollup.Config
// DataDir is the directory to read/write pre-image data from/to.
// If not set, an in-memory key-value store is used and fetching data must be enabled
Expand All @@ -66,7 +66,7 @@ type Config struct {
L1RPCKind sources.RPCProviderKind

// L2Head is the l2 block hash contained in the L2 Output referenced by the L2OutputRoot for pre-interop mode
L2Head common.Hash // TODO: Forbid for interop
L2Head common.Hash
// L2OutputRoot is the agreed L2 output root to start derivation from
L2OutputRoot common.Hash
// L2URLs are the URLs of the L2 nodes to fetch L2 data from, these are the canonical URL for L2 data
Expand Down
1 change: 0 additions & 1 deletion op-supervisor/supervisor/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,5 @@ func (su *SupervisorService) Stopped() bool {

func (su *SupervisorService) RPC() string {
// the RPC endpoint is assumed to be HTTP
// TODO(#11032): make this flexible for ws if the server supports it
return "http://" + su.rpcServer.Endpoint()
}