update geth pin

OffchainLabs · Nov 18, 2024 · 5601c82 · 5601c82
1 parent 64d78fc
commit 5601c82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/arbos/util/transfer.go b/arbos/util/transfer.go
@@ -41,7 +41,7 @@ func TransferBalance(
 
 		if scenario != TracingDuringEVM {
 			if tracer.CaptureArbitrumTransfer != nil {
-				tracer.CaptureArbitrumTransfer(from, to, amount, scenario == TracingBeforeEVM, purpose)
+				tracer.CaptureArbitrumTransfer(from, to, amount, scenario == TracingBeforeEVM, reason)
 			}
 		} else {
 			fromCopy := from

diff --git a/go-ethereum b/go-ethereum
diff --git a/system_tests/debugapi_test.go b/system_tests/debugapi_test.go
@@ -59,6 +59,7 @@ func TestDebugAPI(t *testing.T) {
 	arbSys, err := precompilesgen.NewArbSys(types.ArbSysAddress, builder.L2.Client)
 	Require(t, err)
 	auth := builder.L2Info.GetDefaultTransactOpts("Owner", ctx)
+	prev := builder.L2.GetBalance(t, builder.L2Info.GetAddress("Owner"))
 	withdrawalValue := big.NewInt(1000000000)
 	auth.Value = withdrawalValue
 	tx, err := arbSys.SendTxToL1(&auth, common.Address{}, []byte{})
@@ -68,6 +69,7 @@ func TestDebugAPI(t *testing.T) {
 	if len(receipt.Logs) != 1 {
 		Fatal(t, "Unexpected number of logs", len(receipt.Logs))
 	}
+	new := builder.L2.GetBalance(t, builder.L2Info.GetAddress("Owner"))
 
 	var result json.RawMessage
 	flatCallTracer := "flatCallTracer"
@@ -81,7 +83,7 @@ func TestDebugAPI(t *testing.T) {
 
 	found := false
 	for _, balChange := range trace.BalanceChanges {
-		if balChange.Reason == tracing.BalanceDecreaseWithdrawToL1.String(nil, nil) &&
+		if balChange.Reason == tracing.BalanceDecreaseWithdrawToL1.String(prev, new) &&
 			balChange.Addr == types.ArbSysAddress &&
 			balChange.Prev == "0x"+withdrawalValue.Text(16) &&
 			balChange.New == "0x0" {
@@ -120,7 +122,7 @@ func TestDebugAPI(t *testing.T) {
 	Require(t, err)
 	found = false
 	for _, balChange := range jsTrace {
-		if balChange.Reason == tracing.BalanceDecreaseWithdrawToL1.String(nil, nil) &&
+		if balChange.Reason == tracing.BalanceDecreaseWithdrawToL1.String(prev, new) &&
 			balChange.Addr == types.ArbSysAddress &&
 			balChange.Prev.Cmp(withdrawalValue) == 0 &&
 			balChange.New.Cmp(common.Big0) == 0 {
+4 −4		core/state_transition.go
+40 −29		core/tracing/hooks.go
+3 −3		eth/tracers/internal/tracetest/calltrace_test.go
+5 −5		eth/tracers/internal/tracetest/testdata/call_tracer/blob_tx.json
+5 −5		eth/tracers/internal/tracetest/testdata/call_tracer/create.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
+5 −5		eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
+5 −5		eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
+7 −7		eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
+5 −5		eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/frontier_create_outofstorage.json
+12 −12		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
+10 −10		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
+7 −7		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_failed.json
+6 −6		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
+8 −8		eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
+2 −2		eth/tracers/js/tracer_arbitrum.go
+2 −2		eth/tracers/native/mux.go
+4 −6		eth/tracers/native/tracer_arbitrum.go