mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-11 06:23:47 +00:00
Merge pull request #521 from maticnetwork/raneet10/pos-618
Failing geth integration tests
This commit is contained in:
commit
28b11d19be
4 changed files with 32 additions and 12 deletions
|
|
@ -42,8 +42,10 @@ The state transitioning model does all the necessary work to work out a valid ne
|
||||||
3) Create a new state object if the recipient is \0*32
|
3) Create a new state object if the recipient is \0*32
|
||||||
4) Value transfer
|
4) Value transfer
|
||||||
== If contract creation ==
|
== If contract creation ==
|
||||||
4a) Attempt to run transaction data
|
|
||||||
4b) If valid, use result as code for the new state object
|
4a) Attempt to run transaction data
|
||||||
|
4b) If valid, use result as code for the new state object
|
||||||
|
|
||||||
== end ==
|
== end ==
|
||||||
5) Run Script section
|
5) Run Script section
|
||||||
6) Derive new state root
|
6) Derive new state root
|
||||||
|
|
@ -262,13 +264,13 @@ func (st *StateTransition) preCheck() error {
|
||||||
// TransitionDb will transition the state by applying the current message and
|
// TransitionDb will transition the state by applying the current message and
|
||||||
// returning the evm execution result with following fields.
|
// returning the evm execution result with following fields.
|
||||||
//
|
//
|
||||||
// - used gas:
|
// - used gas:
|
||||||
// total gas used (including gas being refunded)
|
// total gas used (including gas being refunded)
|
||||||
// - returndata:
|
// - returndata:
|
||||||
// the returned data from evm
|
// the returned data from evm
|
||||||
// - concrete execution error:
|
// - concrete execution error:
|
||||||
// various **EVM** error which aborts the execution,
|
// various **EVM** error which aborts the execution,
|
||||||
// e.g. ErrOutOfGas, ErrExecutionReverted
|
// e.g. ErrOutOfGas, ErrExecutionReverted
|
||||||
//
|
//
|
||||||
// However if any consensus issue encountered, return the error directly with
|
// However if any consensus issue encountered, return the error directly with
|
||||||
// nil evm execution result.
|
// nil evm execution result.
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ func TestBlockchain(t *testing.T) {
|
||||||
// using 4.6 TGas
|
// using 4.6 TGas
|
||||||
bt.skipLoad(`.*randomStatetest94.json.*`)
|
bt.skipLoad(`.*randomStatetest94.json.*`)
|
||||||
|
|
||||||
// FIXME POS-618
|
// See POS-618
|
||||||
bt.skipLoad(`.*ValidBlocks*`)
|
bt.skipLoad(`.*ValidBlocks*`)
|
||||||
bt.skipLoad(`.*InvalidBlocks*`)
|
bt.skipLoad(`.*InvalidBlocks*`)
|
||||||
bt.skipLoad(`.*TransitionTests*`)
|
bt.skipLoad(`.*TransitionTests*`)
|
||||||
|
|
|
||||||
|
|
@ -28,15 +28,18 @@ import (
|
||||||
var Forks = map[string]*params.ChainConfig{
|
var Forks = map[string]*params.ChainConfig{
|
||||||
"Frontier": {
|
"Frontier": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"Homestead": {
|
"Homestead": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"EIP150": {
|
"EIP150": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
EIP150Block: big.NewInt(0),
|
EIP150Block: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"EIP158": {
|
"EIP158": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -44,6 +47,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
EIP150Block: big.NewInt(0),
|
EIP150Block: big.NewInt(0),
|
||||||
EIP155Block: big.NewInt(0),
|
EIP155Block: big.NewInt(0),
|
||||||
EIP158Block: big.NewInt(0),
|
EIP158Block: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"Byzantium": {
|
"Byzantium": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -53,6 +57,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
EIP158Block: big.NewInt(0),
|
EIP158Block: big.NewInt(0),
|
||||||
DAOForkBlock: big.NewInt(0),
|
DAOForkBlock: big.NewInt(0),
|
||||||
ByzantiumBlock: big.NewInt(0),
|
ByzantiumBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"Constantinople": {
|
"Constantinople": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -64,6 +69,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
ByzantiumBlock: big.NewInt(0),
|
ByzantiumBlock: big.NewInt(0),
|
||||||
ConstantinopleBlock: big.NewInt(0),
|
ConstantinopleBlock: big.NewInt(0),
|
||||||
PetersburgBlock: big.NewInt(10000000),
|
PetersburgBlock: big.NewInt(10000000),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"ConstantinopleFix": {
|
"ConstantinopleFix": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -75,6 +81,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
ByzantiumBlock: big.NewInt(0),
|
ByzantiumBlock: big.NewInt(0),
|
||||||
ConstantinopleBlock: big.NewInt(0),
|
ConstantinopleBlock: big.NewInt(0),
|
||||||
PetersburgBlock: big.NewInt(0),
|
PetersburgBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"Istanbul": {
|
"Istanbul": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -87,21 +94,25 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
ConstantinopleBlock: big.NewInt(0),
|
ConstantinopleBlock: big.NewInt(0),
|
||||||
PetersburgBlock: big.NewInt(0),
|
PetersburgBlock: big.NewInt(0),
|
||||||
IstanbulBlock: big.NewInt(0),
|
IstanbulBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"FrontierToHomesteadAt5": {
|
"FrontierToHomesteadAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
HomesteadBlock: big.NewInt(5),
|
HomesteadBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"HomesteadToEIP150At5": {
|
"HomesteadToEIP150At5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
EIP150Block: big.NewInt(5),
|
EIP150Block: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"HomesteadToDaoAt5": {
|
"HomesteadToDaoAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
HomesteadBlock: big.NewInt(0),
|
HomesteadBlock: big.NewInt(0),
|
||||||
DAOForkBlock: big.NewInt(5),
|
DAOForkBlock: big.NewInt(5),
|
||||||
DAOForkSupport: true,
|
DAOForkSupport: true,
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"EIP158ToByzantiumAt5": {
|
"EIP158ToByzantiumAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -110,6 +121,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
EIP155Block: big.NewInt(0),
|
EIP155Block: big.NewInt(0),
|
||||||
EIP158Block: big.NewInt(0),
|
EIP158Block: big.NewInt(0),
|
||||||
ByzantiumBlock: big.NewInt(5),
|
ByzantiumBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"ByzantiumToConstantinopleAt5": {
|
"ByzantiumToConstantinopleAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -119,6 +131,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
EIP158Block: big.NewInt(0),
|
EIP158Block: big.NewInt(0),
|
||||||
ByzantiumBlock: big.NewInt(0),
|
ByzantiumBlock: big.NewInt(0),
|
||||||
ConstantinopleBlock: big.NewInt(5),
|
ConstantinopleBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"ByzantiumToConstantinopleFixAt5": {
|
"ByzantiumToConstantinopleFixAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -129,6 +142,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
ByzantiumBlock: big.NewInt(0),
|
ByzantiumBlock: big.NewInt(0),
|
||||||
ConstantinopleBlock: big.NewInt(5),
|
ConstantinopleBlock: big.NewInt(5),
|
||||||
PetersburgBlock: big.NewInt(5),
|
PetersburgBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"ConstantinopleFixToIstanbulAt5": {
|
"ConstantinopleFixToIstanbulAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -140,6 +154,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
ConstantinopleBlock: big.NewInt(0),
|
ConstantinopleBlock: big.NewInt(0),
|
||||||
PetersburgBlock: big.NewInt(0),
|
PetersburgBlock: big.NewInt(0),
|
||||||
IstanbulBlock: big.NewInt(5),
|
IstanbulBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"Berlin": {
|
"Berlin": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -153,6 +168,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
IstanbulBlock: big.NewInt(0),
|
IstanbulBlock: big.NewInt(0),
|
||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
BerlinBlock: big.NewInt(0),
|
BerlinBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"BerlinToLondonAt5": {
|
"BerlinToLondonAt5": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -167,6 +183,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
BerlinBlock: big.NewInt(0),
|
BerlinBlock: big.NewInt(0),
|
||||||
LondonBlock: big.NewInt(5),
|
LondonBlock: big.NewInt(5),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"London": {
|
"London": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -181,6 +198,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
MuirGlacierBlock: big.NewInt(0),
|
MuirGlacierBlock: big.NewInt(0),
|
||||||
BerlinBlock: big.NewInt(0),
|
BerlinBlock: big.NewInt(0),
|
||||||
LondonBlock: big.NewInt(0),
|
LondonBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
"ArrowGlacier": {
|
"ArrowGlacier": {
|
||||||
ChainID: big.NewInt(1),
|
ChainID: big.NewInt(1),
|
||||||
|
|
@ -196,6 +214,7 @@ var Forks = map[string]*params.ChainConfig{
|
||||||
BerlinBlock: big.NewInt(0),
|
BerlinBlock: big.NewInt(0),
|
||||||
LondonBlock: big.NewInt(0),
|
LondonBlock: big.NewInt(0),
|
||||||
ArrowGlacierBlock: big.NewInt(0),
|
ArrowGlacierBlock: big.NewInt(0),
|
||||||
|
Bor: params.BorUnittestChainConfig.Bor,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ func TestState(t *testing.T) {
|
||||||
// Uses 1GB RAM per tested fork
|
// Uses 1GB RAM per tested fork
|
||||||
st.skipLoad(`^stStaticCall/static_Call1MB`)
|
st.skipLoad(`^stStaticCall/static_Call1MB`)
|
||||||
|
|
||||||
// FIXME POS-618
|
// See POS-618
|
||||||
st.skipLoad(`.*micro/*`)
|
st.skipLoad(`.*micro/*`)
|
||||||
st.skipLoad(`.*main/*`)
|
st.skipLoad(`.*main/*`)
|
||||||
st.skipLoad(`.*stSStoreTest*`)
|
st.skipLoad(`.*stSStoreTest*`)
|
||||||
|
|
@ -97,7 +97,6 @@ func TestState(t *testing.T) {
|
||||||
st.skipLoad(`.*stChangedEIP150*`)
|
st.skipLoad(`.*stChangedEIP150*`)
|
||||||
st.skipLoad(`.*stLogTests*`)
|
st.skipLoad(`.*stLogTests*`)
|
||||||
st.skipLoad(`.*stSLoadTest*`)
|
st.skipLoad(`.*stSLoadTest*`)
|
||||||
st.skipLoad(`.*stCreateTest*`)
|
|
||||||
st.skipLoad(`.*stDelegatecallTestHomestead*`)
|
st.skipLoad(`.*stDelegatecallTestHomestead*`)
|
||||||
st.skipLoad(`.*stCallDelegateCodesHomestead*`)
|
st.skipLoad(`.*stCallDelegateCodesHomestead*`)
|
||||||
st.skipLoad(`.*VMTests*`)
|
st.skipLoad(`.*VMTests*`)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue