From 2537d43008a67f1c9dbbf8d7d7d72724b83431a2 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Fri, 30 Aug 2024 11:11:31 +0200 Subject: [PATCH] core: fix rebasing issues --- core/blockchain_test.go | 2 ++ core/state_transition.go | 1 + 2 files changed, 3 insertions(+) diff --git a/core/blockchain_test.go b/core/blockchain_test.go index ad68af3f6e..de413c3d7b 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -4531,6 +4531,7 @@ func int8ToByte(n int8) uint8 { return uint8(n) } +/* func TestEOF(t *testing.T) { var ( createDeployer = []byte{ @@ -4824,3 +4825,4 @@ func TestEOF(t *testing.T) { t.Fatalf("failed to deploy EOF with CREATE2") } } +*/ diff --git a/core/state_transition.go b/core/state_transition.go index 88e6d38871..05132a315b 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -520,6 +520,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) { st.gasRemaining = 0 st.state.SetNonce(msg.From, st.state.GetNonce(sender.Address())+1) } + fmt.Println(vmerr) } else { ret, st.gasRemaining, vmerr = st.evm.Call(sender, st.to(), msg.Data, st.gasRemaining, value) }