Skip to content
This repository was archived by the owner on May 11, 2024. It is now read-only.

Commit a115600

Browse files
mask-ppmask-pp
committed
revert change
1 parent 441571e commit a115600

38 files changed

+260
-260
lines changed

‎driver/anchor_tx_constructor/anchor_tx_constructor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (c *AnchorTxConstructor) AssembleAnchorTx(
6868
return nil, err
6969
}
7070

71-
signalRoot, err := c.rpc.GetStorageRoot(ctx, c.rpc.L1Client, c.signalServiceAddress, l1Height)
71+
signalRoot, err := c.rpc.GetStorageRoot(ctx, c.rpc.L1, c.signalServiceAddress, l1Height)
7272
if err != nil {
7373
return nil, err
7474
}

‎driver/anchor_tx_constructor/anchor_tx_constructor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (s *AnchorTxConstructorTestSuite) SetupTest() {
2828
common.HexToAddress(os.Getenv("L1_SIGNAL_SERVICE_CONTRACT_ADDRESS")),
2929
)
3030
s.Nil(err)
31-
head, err := s.RPCClient.L1Client.BlockByNumber(context.Background(), nil)
31+
head, err := s.RPCClient.L1.BlockByNumber(context.Background(), nil)
3232
s.Nil(err)
3333
s.l1Height = head.Number()
3434
s.l1Hash = head.Hash()

‎driver/chain_syncer/beaconsync/progress_tracker_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type BeaconSyncProgressTrackerTestSuite struct {
2020
func (s *BeaconSyncProgressTrackerTestSuite) SetupTest() {
2121
s.ClientTestSuite.SetupTest()
2222

23-
s.t = NewSyncProgressTracker(s.RPCClient.L2Client, 30*time.Second)
23+
s.t = NewSyncProgressTracker(s.RPCClient.L2, 30*time.Second)
2424
}
2525

2626
func (s *BeaconSyncProgressTrackerTestSuite) TestSyncProgressed() {

‎driver/chain_syncer/beaconsync/syncer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func (s *Syncer) TriggerBeaconSync() error {
5454
}
5555
}
5656

57-
status, err := s.rpc.L2AuthClient.NewPayload(
57+
status, err := s.rpc.L2Engine.NewPayload(
5858
s.ctx,
5959
latestVerifiedHeadPayload,
6060
)
@@ -66,7 +66,7 @@ func (s *Syncer) TriggerBeaconSync() error {
6666
return fmt.Errorf("unexpected NewPayload response status: %s", status.Status)
6767
}
6868

69-
fcRes, err := s.rpc.L2AuthClient.ForkchoiceUpdate(s.ctx, &engine.ForkchoiceStateV1{
69+
fcRes, err := s.rpc.L2Engine.ForkchoiceUpdate(s.ctx, &engine.ForkchoiceStateV1{
7070
HeadBlockHash: latestVerifiedHeadPayload.BlockHash,
7171
SafeBlockHash: latestVerifiedHeadPayload.BlockHash,
7272
FinalizedBlockHash: latestVerifiedHeadPayload.BlockHash,

‎driver/chain_syncer/calldata/syncer.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (s *Syncer) ProcessL1Blocks(ctx context.Context, l1End *types.Header) error
8989
startL1Current := s.state.GetL1Current()
9090
// If there is a L1 reorg, sometimes this will happen.
9191
if startL1Current.Number.Uint64() >= l1End.Number.Uint64() && startL1Current.Hash() != l1End.Hash() {
92-
newL1Current, err := s.rpc.L1Client.HeaderByNumber(ctx, new(big.Int).Sub(l1End.Number, common.Big1))
92+
newL1Current, err := s.rpc.L1.HeaderByNumber(ctx, new(big.Int).Sub(l1End.Number, common.Big1))
9393
if err != nil {
9494
return err
9595
}
@@ -108,7 +108,7 @@ func (s *Syncer) ProcessL1Blocks(ctx context.Context, l1End *types.Header) error
108108
}
109109

110110
iter, err := eventIterator.NewBlockProposedIterator(ctx, &eventIterator.BlockProposedIteratorConfig{
111-
Client: s.rpc.L1Client,
111+
Client: s.rpc.L1,
112112
TaikoL1: s.rpc.TaikoL1,
113113
StartHeight: s.state.GetL1Current().Number,
114114
EndHeight: l1End.Number,
@@ -218,7 +218,7 @@ func (s *Syncer) onBlockProposed(
218218
return nil
219219
}
220220

221-
parent, err = s.rpc.L2Client.HeaderByHash(ctx, s.progressTracker.LastSyncedVerifiedBlockHash())
221+
parent, err = s.rpc.L2.HeaderByHash(ctx, s.progressTracker.LastSyncedVerifiedBlockHash())
222222
} else {
223223
parent, err = s.rpc.L2ParentByBlockID(ctx, event.BlockId)
224224
}
@@ -229,7 +229,7 @@ func (s *Syncer) onBlockProposed(
229229

230230
log.Debug("Parent block", "height", parent.Number, "hash", parent.Hash())
231231

232-
tx, err := s.rpc.L1Client.TransactionInBlock(
232+
tx, err := s.rpc.L1.TransactionInBlock(
233233
ctx,
234234
event.Raw.BlockHash,
235235
event.Raw.TxIndex,
@@ -393,7 +393,7 @@ func (s *Syncer) insertNewHead(
393393

394394
// Update the fork choice
395395
fc.HeadBlockHash = payload.BlockHash
396-
fcRes, err := s.rpc.L2AuthClient.ForkchoiceUpdate(ctx, fc, nil)
396+
fcRes, err := s.rpc.L2Engine.ForkchoiceUpdate(ctx, fc, nil)
397397
if err != nil {
398398
return nil, err
399399
}
@@ -453,7 +453,7 @@ func (s *Syncer) createExecutionPayloads(
453453
)
454454

455455
// Step 1, prepare a payload
456-
fcRes, err := s.rpc.L2AuthClient.ForkchoiceUpdate(ctx, fc, attributes)
456+
fcRes, err := s.rpc.L2Engine.ForkchoiceUpdate(ctx, fc, attributes)
457457
if err != nil {
458458
return nil, fmt.Errorf("failed to update fork choice: %w", err)
459459
}
@@ -465,7 +465,7 @@ func (s *Syncer) createExecutionPayloads(
465465
}
466466

467467
// Step 2, get the payload
468-
payload, err := s.rpc.L2AuthClient.GetPayload(ctx, fcRes.PayloadID)
468+
payload, err := s.rpc.L2Engine.GetPayload(ctx, fcRes.PayloadID)
469469
if err != nil {
470470
return nil, fmt.Errorf("failed to get payload: %w", err)
471471
}
@@ -483,7 +483,7 @@ func (s *Syncer) createExecutionPayloads(
483483
)
484484

485485
// Step 3, execute the payload
486-
execStatus, err := s.rpc.L2AuthClient.NewPayload(ctx, payload)
486+
execStatus, err := s.rpc.L2Engine.NewPayload(ctx, payload)
487487
if err != nil {
488488
return nil, fmt.Errorf("failed to create a new payload: %w", err)
489489
}
@@ -502,7 +502,7 @@ func (s *Syncer) checkLastVerifiedBlockMismatch(ctx context.Context) (bool, erro
502502
return false, nil
503503
}
504504

505-
l2Header, err := s.rpc.L2Client.HeaderByNumber(ctx, lastVerifiedBlockInfo.ID)
505+
l2Header, err := s.rpc.L2.HeaderByNumber(ctx, lastVerifiedBlockInfo.ID)
506506
if err != nil {
507507
return false, err
508508
}

‎driver/chain_syncer/calldata/syncer_test.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (s *CalldataSyncerTestSuite) SetupTest() {
3737
context.Background(),
3838
s.RPCClient,
3939
state,
40-
beaconsync.NewSyncProgressTracker(s.RPCClient.L2Client, 1*time.Hour),
40+
beaconsync.NewSyncProgressTracker(s.RPCClient.L2, 1*time.Hour),
4141
common.HexToAddress(os.Getenv("L1_SIGNAL_SERVICE_CONTRACT_ADDRESS")),
4242
)
4343
s.Nil(err)
@@ -87,13 +87,13 @@ func (s *CalldataSyncerTestSuite) TestCancelNewSyncer() {
8787
}
8888

8989
func (s *CalldataSyncerTestSuite) TestProcessL1Blocks() {
90-
head, err := s.s.rpc.L1Client.HeaderByNumber(context.Background(), nil)
90+
head, err := s.s.rpc.L1.HeaderByNumber(context.Background(), nil)
9191
s.Nil(err)
9292
s.Nil(s.s.ProcessL1Blocks(context.Background(), head))
9393
}
9494

9595
func (s *CalldataSyncerTestSuite) TestProcessL1BlocksReorg() {
96-
head, err := s.s.rpc.L1Client.HeaderByNumber(context.Background(), nil)
96+
head, err := s.s.rpc.L1.HeaderByNumber(context.Background(), nil)
9797
testutils.ProposeAndInsertEmptyBlocks(&s.ClientTestSuite, s.p, s.s)
9898
s.Nil(err)
9999
s.Nil(s.s.ProcessL1Blocks(context.Background(), head))
@@ -113,9 +113,9 @@ func (s *CalldataSyncerTestSuite) TestOnBlockProposed() {
113113
}
114114

115115
func (s *CalldataSyncerTestSuite) TestInsertNewHead() {
116-
parent, err := s.s.rpc.L2Client.HeaderByNumber(context.Background(), nil)
116+
parent, err := s.s.rpc.L2.HeaderByNumber(context.Background(), nil)
117117
s.Nil(err)
118-
l1Head, err := s.s.rpc.L1Client.BlockByNumber(context.Background(), nil)
118+
l1Head, err := s.s.rpc.L1.BlockByNumber(context.Background(), nil)
119119
s.Nil(err)
120120
_, err = s.s.insertNewHead(
121121
context.Background(),
@@ -148,18 +148,18 @@ func (s *CalldataSyncerTestSuite) TestTreasuryIncomeAllAnchors() {
148148
treasury := common.HexToAddress(os.Getenv("TREASURY"))
149149
s.NotZero(treasury.Big().Uint64())
150150

151-
balance, err := s.RPCClient.L2Client.BalanceAt(context.Background(), treasury, nil)
151+
balance, err := s.RPCClient.L2.BalanceAt(context.Background(), treasury, nil)
152152
s.Nil(err)
153153

154-
headBefore, err := s.RPCClient.L2Client.BlockNumber(context.Background())
154+
headBefore, err := s.RPCClient.L2.BlockNumber(context.Background())
155155
s.Nil(err)
156156

157157
testutils.ProposeAndInsertEmptyBlocks(&s.ClientTestSuite, s.p, s.s)
158158

159-
headAfter, err := s.RPCClient.L2Client.BlockNumber(context.Background())
159+
headAfter, err := s.RPCClient.L2.BlockNumber(context.Background())
160160
s.Nil(err)
161161

162-
balanceAfter, err := s.RPCClient.L2Client.BalanceAt(context.Background(), treasury, nil)
162+
balanceAfter, err := s.RPCClient.L2.BalanceAt(context.Background(), treasury, nil)
163163
s.Nil(err)
164164

165165
s.Greater(headAfter, headBefore)
@@ -170,27 +170,27 @@ func (s *CalldataSyncerTestSuite) TestTreasuryIncome() {
170170
treasury := common.HexToAddress(os.Getenv("TREASURY"))
171171
s.NotZero(treasury.Big().Uint64())
172172

173-
balance, err := s.RPCClient.L2Client.BalanceAt(context.Background(), treasury, nil)
173+
balance, err := s.RPCClient.L2.BalanceAt(context.Background(), treasury, nil)
174174
s.Nil(err)
175175

176-
headBefore, err := s.RPCClient.L2Client.BlockNumber(context.Background())
176+
headBefore, err := s.RPCClient.L2.BlockNumber(context.Background())
177177
s.Nil(err)
178178

179179
testutils.ProposeAndInsertEmptyBlocks(&s.ClientTestSuite, s.p, s.s)
180180
testutils.ProposeAndInsertValidBlock(&s.ClientTestSuite, s.p, s.s)
181181

182-
headAfter, err := s.RPCClient.L2Client.BlockNumber(context.Background())
182+
headAfter, err := s.RPCClient.L2.BlockNumber(context.Background())
183183
s.Nil(err)
184184

185-
balanceAfter, err := s.RPCClient.L2Client.BalanceAt(context.Background(), treasury, nil)
185+
balanceAfter, err := s.RPCClient.L2.BalanceAt(context.Background(), treasury, nil)
186186
s.Nil(err)
187187

188188
s.Greater(headAfter, headBefore)
189189
s.True(balanceAfter.Cmp(balance) > 0)
190190

191191
var hasNoneAnchorTxs bool
192192
for i := headBefore + 1; i <= headAfter; i++ {
193-
block, err := s.RPCClient.L2Client.BlockByNumber(context.Background(), new(big.Int).SetUint64(i))
193+
block, err := s.RPCClient.L2.BlockByNumber(context.Background(), new(big.Int).SetUint64(i))
194194
s.Nil(err)
195195
s.GreaterOrEqual(block.Transactions().Len(), 1)
196196
s.Greater(block.BaseFee().Uint64(), uint64(0))
@@ -201,7 +201,7 @@ func (s *CalldataSyncerTestSuite) TestTreasuryIncome() {
201201
}
202202

203203
hasNoneAnchorTxs = true
204-
receipt, err := s.RPCClient.L2Client.TransactionReceipt(context.Background(), tx.Hash())
204+
receipt, err := s.RPCClient.L2.TransactionReceipt(context.Background(), tx.Hash())
205205
s.Nil(err)
206206

207207
fee := new(big.Int).Mul(block.BaseFee(), new(big.Int).SetUint64(receipt.GasUsed))

‎driver/chain_syncer/chain_syncer.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func New(
4343
p2pSyncTimeout time.Duration,
4444
signalServiceAddress common.Address,
4545
) (*L2ChainSyncer, error) {
46-
tracker := beaconsync.NewSyncProgressTracker(rpc.L2Client, p2pSyncTimeout)
46+
tracker := beaconsync.NewSyncProgressTracker(rpc.L2, p2pSyncTimeout)
4747
go tracker.Track(ctx)
4848

4949
beaconSyncer := beaconsync.NewSyncer(ctx, rpc, state, tracker)
@@ -86,7 +86,7 @@ func (s *L2ChainSyncer) Sync(l1End *types.Header) error {
8686
)
8787

8888
// Get the execution engine's chain head.
89-
l2Head, err := s.rpc.L2Client.HeaderByNumber(s.ctx, nil)
89+
l2Head, err := s.rpc.L2.HeaderByNumber(s.ctx, nil)
9090
if err != nil {
9191
return err
9292
}

‎driver/chain_syncer/chain_syncer_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (s *ChainSyncerTestSuite) TestGetInnerSyncers() {
8181
}
8282

8383
func (s *ChainSyncerTestSuite) TestSync() {
84-
head, err := s.RPCClient.L1Client.HeaderByNumber(context.Background(), nil)
84+
head, err := s.RPCClient.L1.HeaderByNumber(context.Background(), nil)
8585
s.Nil(err)
8686
s.Nil(s.s.Sync(head))
8787
}
@@ -98,10 +98,10 @@ func (s *ChainSyncerTestSuite) TestAheadOfProtocolVerifiedHead2() {
9898
opts, err := bind.NewKeyedTransactorWithChainID(privKey, s.RPCClient.L1ChainID)
9999
s.Nil(err)
100100

101-
head, err := s.RPCClient.L1Client.HeaderByNumber(context.Background(), nil)
101+
head, err := s.RPCClient.L1.HeaderByNumber(context.Background(), nil)
102102
s.Nil(err)
103103

104-
l2Head, err := s.RPCClient.L2Client.HeaderByNumber(context.Background(), nil)
104+
l2Head, err := s.RPCClient.L2.HeaderByNumber(context.Background(), nil)
105105
s.Nil(err)
106106
s.Equal("test", string(bytes.TrimRight(l2Head.Extra, "\x00")))
107107
log.Info("L1HeaderByNumber head", "number", head.Number)
@@ -117,10 +117,10 @@ func (s *ChainSyncerTestSuite) TestAheadOfProtocolVerifiedHead2() {
117117
s.Nil(err)
118118
s.NotNil(tx)
119119

120-
head2, err := s.RPCClient.L1Client.HeaderByNumber(context.Background(), nil)
120+
head2, err := s.RPCClient.L1.HeaderByNumber(context.Background(), nil)
121121
s.Nil(err)
122122

123-
l2Head2, err := s.RPCClient.L2Client.HeaderByNumber(context.Background(), nil)
123+
l2Head2, err := s.RPCClient.L2.HeaderByNumber(context.Background(), nil)
124124
s.Nil(err)
125125

126126
log.Info("L1HeaderByNumber head2", "number", head2.Number)
@@ -136,15 +136,15 @@ func TestChainSyncerTestSuite(t *testing.T) {
136136

137137
func (s *ChainSyncerTestSuite) TakeSnapshot() {
138138
// record snapshot state to revert to before changes
139-
s.Nil(s.RPCClient.L1Client.CallContext(context.Background(), &s.snapshotID, "evm_snapshot"))
139+
s.Nil(s.RPCClient.L1.CallContext(context.Background(), &s.snapshotID, "evm_snapshot"))
140140
}
141141

142142
func (s *ChainSyncerTestSuite) RevertSnapshot() {
143143
// revert to the snapshot state so protocol configs are unaffected
144144
var revertRes bool
145-
s.Nil(s.RPCClient.L1Client.CallContext(context.Background(), &revertRes, "evm_revert", s.snapshotID))
145+
s.Nil(s.RPCClient.L1.CallContext(context.Background(), &revertRes, "evm_revert", s.snapshotID))
146146
s.True(revertRes)
147-
s.Nil(rpc.SetHead(context.Background(), s.RPCClient.L2Client, common.Big0))
147+
s.Nil(rpc.SetHead(context.Background(), s.RPCClient.L2, common.Big0))
148148
}
149149

150150
func (s *ChainSyncerTestSuite) TestAheadOfProtocolVerifiedHead() {

‎driver/driver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (d *Driver) InitFromConfig(ctx context.Context, cfg *Config) (err error) {
6767
return err
6868
}
6969

70-
peers, err := d.rpc.L2Client.PeerCount(d.ctx)
70+
peers, err := d.rpc.L2.PeerCount(d.ctx)
7171
if err != nil {
7272
return err
7373
}
@@ -242,7 +242,7 @@ func (d *Driver) exchangeTransitionConfigLoop() {
242242
return
243243
case <-ticker.C:
244244
func() {
245-
tc, err := d.rpc.L2AuthClient.ExchangeTransitionConfiguration(d.ctx, &engine.TransitionConfigurationV1{
245+
tc, err := d.rpc.L2Engine.ExchangeTransitionConfiguration(d.ctx, &engine.TransitionConfigurationV1{
246246
TerminalTotalDifficulty: (*hexutil.Big)(common.Big0),
247247
TerminalBlockHash: common.Hash{},
248248
TerminalBlockNumber: 0,

0 commit comments

Comments
 (0)