Skip to content

Commit d889d9e

Browse files
PlasmaPowerPlasmaPower
authored
Merge pull request #365 from OffchainLabs/gligneul/fix-merge-1.14.0
Remove empty Arbitrum tracing hooks
2 parents c786b5b + e011273 commit d889d9e

File tree

14 files changed

+71
-178
lines changed

14 files changed

+71
-178
lines changed

‎core/state_transition.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func (st *StateTransition) buyGas() error {
309309
st.state.SubBalance(st.msg.From, mgvalU256, tracing.BalanceDecreaseGasBuy)
310310

311311
// Arbitrum: record fee payment
312-
if tracer := st.evm.Config.Tracer; tracer != nil {
312+
if tracer := st.evm.Config.Tracer; tracer != nil && tracer.CaptureArbitrumTransfer != nil {
313313
tracer.CaptureArbitrumTransfer(&st.msg.From, nil, mgval, true, "feePayment")
314314
}
315315

@@ -528,14 +528,14 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
528528
}
529529

530530
// Arbitrum: record the tip
531-
if tracer := st.evm.Config.Tracer; tracer != nil && !st.evm.ProcessingHook.DropTip() {
531+
if tracer := st.evm.Config.Tracer; tracer != nil && !st.evm.ProcessingHook.DropTip() && tracer.CaptureArbitrumTransfer != nil {
532532
tracer.CaptureArbitrumTransfer(nil, &tipReceipient, tipAmount, false, "tip")
533533
}
534534

535535
st.evm.ProcessingHook.EndTxHook(st.gasRemaining, vmerr == nil)
536536

537537
// Arbitrum: record self destructs
538-
if tracer := st.evm.Config.Tracer; tracer != nil {
538+
if tracer := st.evm.Config.Tracer; tracer != nil && tracer.CaptureArbitrumTransfer != nil {
539539
suicides := st.evm.StateDB.GetSelfDestructs()
540540
for i, address := range suicides {
541541
balance := st.evm.StateDB.GetBalance(address)
@@ -582,7 +582,7 @@ func (st *StateTransition) refundGas(refundQuotient uint64) uint64 {
582582
}
583583

584584
// Arbitrum: record the gas refund
585-
if tracer := st.evm.Config.Tracer; tracer != nil {
585+
if tracer := st.evm.Config.Tracer; tracer != nil && tracer.CaptureArbitrumTransfer != nil {
586586
tracer.CaptureArbitrumTransfer(nil, &st.msg.From, remaining.ToBig(), false, "gasRefund")
587587
}
588588

‎eth/tracers/js/goja.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,14 @@ func newJsTracer(code string, ctx *tracers.Context, cfg json.RawMessage) (*trace
224224

225225
return &tracers.Tracer{
226226
Hooks: &tracing.Hooks{
227-
OnTxStart: t.OnTxStart,
228-
OnTxEnd: t.OnTxEnd,
229-
OnEnter: t.OnEnter,
230-
OnExit: t.OnExit,
231-
OnOpcode: t.OnOpcode,
232-
OnFault: t.OnFault,
233-
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
234-
CaptureArbitrumStorageGet: t.CaptureArbitrumStorageGet,
235-
CaptureArbitrumStorageSet: t.CaptureArbitrumStorageSet,
236-
CaptureStylusHostio: t.CaptureStylusHostio,
227+
OnTxStart: t.OnTxStart,
228+
OnTxEnd: t.OnTxEnd,
229+
OnEnter: t.OnEnter,
230+
OnExit: t.OnExit,
231+
OnOpcode: t.OnOpcode,
232+
OnFault: t.OnFault,
233+
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
234+
CaptureStylusHostio: t.CaptureStylusHostio,
237235
},
238236
GetResult: t.GetResult,
239237
Stop: t.Stop,

‎eth/tracers/js/tracer_arbitrum.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ func (jst *jsTracer) CaptureArbitrumTransfer(
5252
}
5353
}
5454

55-
func (*jsTracer) CaptureArbitrumStorageGet(key common.Hash, depth int, before bool) {}
56-
func (*jsTracer) CaptureArbitrumStorageSet(key, value common.Hash, depth int, before bool) {}
57-
5855
func (jst *jsTracer) CaptureStylusHostio(name string, args, outs []byte, startInk, endInk uint64) {
5956
hostio, ok := goja.AssertFunction(jst.obj.Get("hostio"))
6057
if !ok {

‎eth/tracers/logger/access_list_tracer.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ func NewAccessListTracer(acl types.AccessList, from, to common.Address, precompi
127127

128128
func (a *AccessListTracer) Hooks() *tracing.Hooks {
129129
return &tracing.Hooks{
130-
OnOpcode: a.OnOpcode,
131-
CaptureArbitrumTransfer: a.CaptureArbitrumTransfer,
132-
CaptureArbitrumStorageGet: a.CaptureArbitrumStorageGet,
133-
CaptureArbitrumStorageSet: a.CaptureArbitrumStorageSet,
134-
CaptureStylusHostio: a.CaptureStylusHostio,
130+
OnOpcode: a.OnOpcode,
135131
}
136132
}
137133

‎eth/tracers/logger/logger.go

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,10 @@ func NewStructLogger(cfg *Config) *StructLogger {
134134

135135
func (l *StructLogger) Hooks() *tracing.Hooks {
136136
return &tracing.Hooks{
137-
OnTxStart: l.OnTxStart,
138-
OnTxEnd: l.OnTxEnd,
139-
OnExit: l.OnExit,
140-
OnOpcode: l.OnOpcode,
141-
CaptureArbitrumTransfer: l.CaptureArbitrumTransfer,
142-
CaptureArbitrumStorageGet: l.CaptureArbitrumStorageGet,
143-
CaptureArbitrumStorageSet: l.CaptureArbitrumStorageSet,
144-
CaptureStylusHostio: l.CaptureStylusHostio,
137+
OnTxStart: l.OnTxStart,
138+
OnTxEnd: l.OnTxEnd,
139+
OnExit: l.OnExit,
140+
OnOpcode: l.OnOpcode,
145141
}
146142
}
147143

@@ -349,15 +345,11 @@ func NewMarkdownLogger(cfg *Config, writer io.Writer) *mdLogger {
349345

350346
func (t *mdLogger) Hooks() *tracing.Hooks {
351347
return &tracing.Hooks{
352-
OnTxStart: t.OnTxStart,
353-
OnEnter: t.OnEnter,
354-
OnExit: t.OnExit,
355-
OnOpcode: t.OnOpcode,
356-
OnFault: t.OnFault,
357-
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
358-
CaptureArbitrumStorageGet: t.CaptureArbitrumStorageGet,
359-
CaptureArbitrumStorageSet: t.CaptureArbitrumStorageSet,
360-
CaptureStylusHostio: t.CaptureStylusHostio,
348+
OnTxStart: t.OnTxStart,
349+
OnEnter: t.OnEnter,
350+
OnExit: t.OnExit,
351+
OnOpcode: t.OnOpcode,
352+
OnFault: t.OnFault,
361353
}
362354
}
363355

‎eth/tracers/logger/logger_arbitrum.go

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎eth/tracers/logger/logger_json.go

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,10 @@ func NewJSONLogger(cfg *Config, writer io.Writer) *tracing.Hooks {
6868
l.cfg = &Config{}
6969
}
7070
return &tracing.Hooks{
71-
OnTxStart: l.OnTxStart,
72-
OnExit: l.OnExit,
73-
OnOpcode: l.OnOpcode,
74-
OnFault: l.OnFault,
75-
CaptureArbitrumTransfer: l.CaptureArbitrumTransfer,
76-
CaptureArbitrumStorageGet: l.CaptureArbitrumStorageGet,
77-
CaptureArbitrumStorageSet: l.CaptureArbitrumStorageSet,
78-
CaptureStylusHostio: l.CaptureStylusHostio,
71+
OnTxStart: l.OnTxStart,
72+
OnExit: l.OnExit,
73+
OnOpcode: l.OnOpcode,
74+
OnFault: l.OnFault,
7975
}
8076
}
8177

@@ -87,15 +83,11 @@ func NewJSONLoggerWithCallFrames(cfg *Config, writer io.Writer) *tracing.Hooks {
8783
l.cfg = &Config{}
8884
}
8985
return &tracing.Hooks{
90-
OnTxStart: l.OnTxStart,
91-
OnEnter: l.OnEnter,
92-
OnExit: l.OnExit,
93-
OnOpcode: l.OnOpcode,
94-
OnFault: l.OnFault,
95-
CaptureArbitrumTransfer: l.CaptureArbitrumTransfer,
96-
CaptureArbitrumStorageGet: l.CaptureArbitrumStorageGet,
97-
CaptureArbitrumStorageSet: l.CaptureArbitrumStorageSet,
98-
CaptureStylusHostio: l.CaptureStylusHostio,
86+
OnTxStart: l.OnTxStart,
87+
OnEnter: l.OnEnter,
88+
OnExit: l.OnExit,
89+
OnOpcode: l.OnOpcode,
90+
OnFault: l.OnFault,
9991
}
10092
}
10193

‎eth/tracers/native/4byte.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,8 @@ func newFourByteTracer(ctx *tracers.Context, _ json.RawMessage) (*tracers.Tracer
6262
}
6363
return &tracers.Tracer{
6464
Hooks: &tracing.Hooks{
65-
OnTxStart: t.OnTxStart,
66-
OnEnter: t.OnEnter,
67-
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
68-
CaptureArbitrumStorageGet: t.CaptureArbitrumStorageGet,
69-
CaptureArbitrumStorageSet: t.CaptureArbitrumStorageSet,
70-
CaptureStylusHostio: t.CaptureStylusHostio,
65+
OnTxStart: t.OnTxStart,
66+
OnEnter: t.OnEnter,
7167
},
7268
GetResult: t.GetResult,
7369
Stop: t.Stop,

‎eth/tracers/native/call.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,12 @@ func newCallTracer(ctx *tracers.Context, cfg json.RawMessage) (*tracers.Tracer,
136136
}
137137
return &tracers.Tracer{
138138
Hooks: &tracing.Hooks{
139-
OnTxStart: t.OnTxStart,
140-
OnTxEnd: t.OnTxEnd,
141-
OnEnter: t.OnEnter,
142-
OnExit: t.OnExit,
143-
OnLog: t.OnLog,
144-
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
145-
CaptureArbitrumStorageGet: t.CaptureArbitrumStorageGet,
146-
CaptureArbitrumStorageSet: t.CaptureArbitrumStorageSet,
147-
CaptureStylusHostio: t.CaptureStylusHostio,
139+
OnTxStart: t.OnTxStart,
140+
OnTxEnd: t.OnTxEnd,
141+
OnEnter: t.OnEnter,
142+
OnExit: t.OnExit,
143+
OnLog: t.OnLog,
144+
CaptureArbitrumTransfer: t.CaptureArbitrumTransfer,
148145
},
149146
GetResult: t.GetResult,
150147
Stop: t.Stop,

‎eth/tracers/native/call_flat.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,11 @@ func newFlatCallTracer(ctx *tracers.Context, cfg json.RawMessage) (*tracers.Trac
151151
ft := &flatCallTracer{tracer: t, ctx: ctx, config: config}
152152
return &tracers.Tracer{
153153
Hooks: &tracing.Hooks{
154-
OnTxStart: ft.OnTxStart,
155-
OnTxEnd: ft.OnTxEnd,
156-
OnEnter: ft.OnEnter,
157-
OnExit: ft.OnExit,
158-
CaptureArbitrumTransfer: ft.CaptureArbitrumTransfer,
159-
CaptureArbitrumStorageGet: ft.CaptureArbitrumStorageGet,
160-
CaptureArbitrumStorageSet: ft.CaptureArbitrumStorageSet,
161-
CaptureStylusHostio: ft.CaptureStylusHostio,
154+
OnTxStart: ft.OnTxStart,
155+
OnTxEnd: ft.OnTxEnd,
156+
OnEnter: ft.OnEnter,
157+
OnExit: ft.OnExit,
158+
CaptureArbitrumTransfer: ft.CaptureArbitrumTransfer,
162159
},
163160
Stop: ft.Stop,
164161
GetResult: ft.GetResult,

0 commit comments

Comments
 (0)