Skip to content

Commit

Permalink
chore(taiko-client): change SetHeadL1Origin && UpdateL1Origin to …
Browse files Browse the repository at this point in the history
…`taikoauth_` namespace (#18950)
  • Loading branch information
mask-pp authored Feb 18, 2025
1 parent 4090528 commit f314d6d
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0
replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.12.1-0.20250218024440-838f65315354

replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -888,8 +888,8 @@ github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3Ke
github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ=
github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c h1:LlZlD7Z4NZXa2dToHOefKOy67Ej1o3T+9Gicd/6Pgsk=
github.com/taikoxyz/optimism v0.0.0-20250212013257-f7ccb8141f3c/go.mod h1:V0VCkKtCzuaJH6qcL75SRcbdlakM9LhurMEJUhO6VXA=
github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0 h1:LEn6wBmEIJVH4RgAEb7ORbJMt9ajgvsmtgatxlqlO8E=
github.com/taikoxyz/taiko-geth v1.12.1-0.20250210044710-a0b97be30cc0/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E=
github.com/taikoxyz/taiko-geth v1.12.1-0.20250218024440-838f65315354 h1:RgGN4gW9apclVJDM5M4ja2WKylkgygL9nLWFIE0debg=
github.com/taikoxyz/taiko-geth v1.12.1-0.20250218024440-838f65315354/go.mod h1:+l/fr42Mma+xBnhefL/+z11/hcmJ2egl+ScIVPjhc7E=
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
github.com/testcontainers/testcontainers-go v0.35.0 h1:uADsZpTKFAtp8SLK+hMwSaa+X+JiERHtd4sQAFmXeMo=
github.com/testcontainers/testcontainers-go v0.35.0/go.mod h1:oEVBj5zrfJTrgjwONs1SsRbnBtH9OKl+IGl3UMcr2B4=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ func createPayloadAndSetHead(
} else if header != nil {
// Update the l1Origin and headL1Origin cursor for that preconfirmed block.
meta.L1Origin.L2BlockHash = header.Hash()
if _, err := rpc.L2.UpdateL1Origin(ctx, meta.L1Origin); err != nil {
if _, err := rpc.L2Engine.UpdateL1Origin(ctx, meta.L1Origin); err != nil {
return nil, fmt.Errorf("failed to update L1 origin: %w", err)
}
if _, err := rpc.L2.SetHeadL1Origin(ctx, meta.L1Origin.BlockID); err != nil {
if _, err := rpc.L2Engine.SetHeadL1Origin(ctx, meta.L1Origin.BlockID); err != nil {
return nil, fmt.Errorf("failed to write head L1 origin: %w", err)
}

Expand Down
23 changes: 23 additions & 0 deletions packages/taiko-client/pkg/rpc/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/miner"
"github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/rpc"
Expand Down Expand Up @@ -131,3 +132,25 @@ func (c *EngineClient) TxPoolContentWithMinTip(
}
return result, nil
}

// UpdateL1Origin sets the L2 block's corresponding L1 origin.
func (c *EngineClient) UpdateL1Origin(ctx context.Context, l1Origin *rawdb.L1Origin) (*rawdb.L1Origin, error) {
var res *rawdb.L1Origin

if err := c.CallContext(ctx, &res, "taikoAuth_updateL1Origin", l1Origin); err != nil {
return nil, err
}

return res, nil
}

// SetHeadL1Origin sets the latest L2 block's corresponding L1 origin.
func (c *EngineClient) SetHeadL1Origin(ctx context.Context, blockID *big.Int) (*big.Int, error) {
var res *big.Int

if err := c.CallContext(ctx, &res, "taikoAuth_setHeadL1Origin", blockID); err != nil {
return nil, err
}

return res, nil
}

0 comments on commit f314d6d

Please sign in to comment.