mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 02:12:23 +00:00
core: fix rebasing issues
This commit is contained in:
parent
ec62e60c3b
commit
2537d43008
2 changed files with 3 additions and 0 deletions
|
|
@ -4531,6 +4531,7 @@ func int8ToByte(n int8) uint8 {
|
||||||
return uint8(n)
|
return uint8(n)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
func TestEOF(t *testing.T) {
|
func TestEOF(t *testing.T) {
|
||||||
var (
|
var (
|
||||||
createDeployer = []byte{
|
createDeployer = []byte{
|
||||||
|
|
@ -4824,3 +4825,4 @@ func TestEOF(t *testing.T) {
|
||||||
t.Fatalf("failed to deploy EOF with CREATE2")
|
t.Fatalf("failed to deploy EOF with CREATE2")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
|
||||||
|
|
@ -520,6 +520,7 @@ func (st *StateTransition) TransitionDb() (*ExecutionResult, error) {
|
||||||
st.gasRemaining = 0
|
st.gasRemaining = 0
|
||||||
st.state.SetNonce(msg.From, st.state.GetNonce(sender.Address())+1)
|
st.state.SetNonce(msg.From, st.state.GetNonce(sender.Address())+1)
|
||||||
}
|
}
|
||||||
|
fmt.Println(vmerr)
|
||||||
} else {
|
} else {
|
||||||
ret, st.gasRemaining, vmerr = st.evm.Call(sender, st.to(), msg.Data, st.gasRemaining, value)
|
ret, st.gasRemaining, vmerr = st.evm.Call(sender, st.to(), msg.Data, st.gasRemaining, value)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue