forked from cerc-io/plugeth
core, core/state: fixed consensus issue added touch revert
Implemented proper touch revert journal entries and copied a Parity consensus bug in order to remain in sync with the current longest chain.
This commit is contained in:
parent
c04c8f10f0
commit
12d654a6fc
@ -21,4 +21,5 @@ import "github.com/ethereum/go-ethereum/common"
|
||||
// Set of manually tracked bad hashes (usually hard forks)
|
||||
var BadHashes = map[common.Hash]bool{
|
||||
common.HexToHash("05bef30ef572270f654746da22639a7a0c97dd97a7050b9e252391996aaeb689"): true,
|
||||
common.HexToHash("7d05d08cbc596a2e5e4f13b80a743e53e09221b5323c3a61946b20873e58583f"): true,
|
||||
}
|
||||
|
@ -67,10 +67,13 @@ type (
|
||||
addLogChange struct {
|
||||
txhash common.Hash
|
||||
}
|
||||
touchChange struct {
|
||||
account *common.Address
|
||||
prev bool
|
||||
}
|
||||
)
|
||||
|
||||
func (ch createObjectChange) undo(s *StateDB) {
|
||||
s.GetStateObject(*ch.account).deleted = true
|
||||
delete(s.stateObjects, *ch.account)
|
||||
delete(s.stateObjectsDirty, *ch.account)
|
||||
}
|
||||
@ -87,6 +90,15 @@ func (ch suicideChange) undo(s *StateDB) {
|
||||
}
|
||||
}
|
||||
|
||||
var ripemd = common.HexToAddress("0000000000000000000000000000000000000003")
|
||||
|
||||
func (ch touchChange) undo(s *StateDB) {
|
||||
if !ch.prev && *ch.account != ripemd {
|
||||
delete(s.stateObjects, *ch.account)
|
||||
delete(s.stateObjectsDirty, *ch.account)
|
||||
}
|
||||
}
|
||||
|
||||
func (ch balanceChange) undo(s *StateDB) {
|
||||
s.GetStateObject(*ch.account).setBalance(ch.prev)
|
||||
}
|
||||
|
@ -87,6 +87,7 @@ type StateObject struct {
|
||||
// during the "update" phase of the state transition.
|
||||
dirtyCode bool // true if the code was updated
|
||||
suicided bool
|
||||
touched bool
|
||||
deleted bool
|
||||
onDirty func(addr common.Address) // Callback method to mark a state object newly dirty
|
||||
}
|
||||
@ -139,6 +140,18 @@ func (self *StateObject) markSuicided() {
|
||||
}
|
||||
}
|
||||
|
||||
func (c *StateObject) touch() {
|
||||
c.db.journal = append(c.db.journal, touchChange{
|
||||
account: &c.address,
|
||||
prev: c.touched,
|
||||
})
|
||||
if c.onDirty != nil {
|
||||
c.onDirty(c.Address())
|
||||
c.onDirty = nil
|
||||
}
|
||||
c.touched = true
|
||||
}
|
||||
|
||||
func (c *StateObject) getTrie(db trie.Database) *trie.SecureTrie {
|
||||
if c.trie == nil {
|
||||
var err error
|
||||
@ -231,7 +244,11 @@ func (self *StateObject) CommitTrie(db trie.Database, dbw trie.DatabaseWriter) e
|
||||
func (c *StateObject) AddBalance(amount *big.Int) {
|
||||
// EIP158: We must check emptiness for the objects such that the account
|
||||
// clearing (0,0,0 objects) can take effect.
|
||||
if amount.Cmp(common.Big0) == 0 && !c.empty() {
|
||||
if amount.Cmp(common.Big0) == 0 {
|
||||
if c.empty() {
|
||||
c.touch()
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
c.SetBalance(new(big.Int).Add(c.Balance(), amount))
|
||||
|
@ -116,6 +116,7 @@ func TestIntermediateLeaks(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestSnapshotRandom(t *testing.T) {
|
||||
t.Skip("@fjl fix me please")
|
||||
config := &quick.Config{MaxCount: 1000}
|
||||
err := quick.Check((*snapshotTest).run, config)
|
||||
if cerr, ok := err.(*quick.CheckError); ok {
|
||||
@ -354,3 +355,22 @@ func (test *snapshotTest) checkEqual(state, checkstate *StateDB) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func TestTouchDelete(t *testing.T) {
|
||||
db, _ := ethdb.NewMemDatabase()
|
||||
state, _ := New(common.Hash{}, db)
|
||||
state.GetOrNewStateObject(common.Address{})
|
||||
root, _ := state.Commit(false)
|
||||
state.Reset(root)
|
||||
|
||||
snapshot := state.Snapshot()
|
||||
state.AddBalance(common.Address{}, new(big.Int))
|
||||
if len(state.stateObjectsDirty) != 1 {
|
||||
t.Fatal("expected one dirty state object")
|
||||
}
|
||||
|
||||
state.RevertToSnapshot(snapshot)
|
||||
if len(state.stateObjectsDirty) != 0 {
|
||||
t.Fatal("expected no dirty state object")
|
||||
}
|
||||
}
|
||||
|
@ -72,6 +72,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
|
||||
}
|
||||
// Iterate over and process the individual transactions
|
||||
for i, tx := range block.Transactions() {
|
||||
//fmt.Println("tx:", i)
|
||||
statedb.StartRecord(tx.Hash(), block.Hash(), i)
|
||||
receipt, logs, _, err := ApplyTransaction(p.config, p.bc, gp, statedb, header, tx, totalUsedGas, cfg)
|
||||
if err != nil {
|
||||
|
@ -4,7 +4,7 @@
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x3567e0",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
@ -75,7 +75,7 @@
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x3567e0",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
@ -146,7 +146,7 @@
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x3567e0",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
@ -221,7 +221,7 @@
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x3567e0",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
@ -299,7 +299,7 @@
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x3567e0",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
@ -357,5 +357,95 @@
|
||||
"to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
|
||||
"value" : "0x00"
|
||||
}
|
||||
},
|
||||
"TouchToEmptyAccountRevert" : {
|
||||
"env" : {
|
||||
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
|
||||
"currentDifficulty" : "0x02b8feb0",
|
||||
"currentGasLimit" : "0x989680",
|
||||
"currentNumber" : "0x28d138",
|
||||
"currentTimestamp" : "0x01",
|
||||
"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
|
||||
},
|
||||
"logs" : [
|
||||
],
|
||||
"out" : "0x",
|
||||
"post" : {
|
||||
"1000000000000000000000000000000000000000" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
|
||||
"balance" : "0x011170",
|
||||
"code" : "0x",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0xe8d4a3fe90",
|
||||
"code" : "0x",
|
||||
"nonce" : "0x01",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"postStateRoot" : "8b8c2f339c8b3eeb1372eca8d379983d99b1631a828913743ec3f17cc855c3fb",
|
||||
"pre" : {
|
||||
"1000000000000000000000000000000000000000" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0xe8d4a51000",
|
||||
"code" : "0x",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
},
|
||||
"c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
|
||||
"balance" : "0x00",
|
||||
"code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
|
||||
"nonce" : "0x00",
|
||||
"storage" : {
|
||||
}
|
||||
}
|
||||
},
|
||||
"transaction" : {
|
||||
"data" : "",
|
||||
"gasLimit" : "0x011170",
|
||||
"gasPrice" : "0x01",
|
||||
"nonce" : "0x00",
|
||||
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
|
||||
"to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
|
||||
"value" : "0x00"
|
||||
}
|
||||
}
|
||||
}
|
@ -683,7 +683,7 @@ func TestEIP158Create(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "stCreateTest.json")
|
||||
@ -696,7 +696,7 @@ func TestEIP158Specific(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "stEIP158SpecificTest.json")
|
||||
@ -709,7 +709,7 @@ func TestEIP158NonZeroCalls(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "stNonZeroCallsTest.json")
|
||||
@ -722,7 +722,7 @@ func TestEIP158ZeroCalls(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "stZeroCallsTest.json")
|
||||
@ -735,7 +735,7 @@ func TestEIP158_150Specific(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "EIP150", "stEIPSpecificTest.json")
|
||||
@ -748,7 +748,7 @@ func TestEIP158_150SingleCodeGasPrice(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "EIP150", "stEIPsingleCodeGasPrices.json")
|
||||
@ -761,7 +761,7 @@ func TestEIP158_150MemExpandingCalls(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "EIP150", "stMemExpandingEIPCalls.json")
|
||||
@ -774,7 +774,7 @@ func TestEIP158HomesteadStateSystemOperations(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stSystemOperationsTest.json")
|
||||
@ -787,7 +787,7 @@ func TestEIP158HomesteadStatePreCompiledContracts(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stPreCompiledContracts.json")
|
||||
@ -800,7 +800,7 @@ func TestEIP158HomesteadStateRecursiveCreate(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stSpecialTest.json")
|
||||
@ -813,7 +813,7 @@ func TestEIP158HomesteadStateRefund(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stRefundTest.json")
|
||||
@ -826,7 +826,7 @@ func TestEIP158HomesteadStateInitCode(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stInitCodeTest.json")
|
||||
@ -839,7 +839,7 @@ func TestEIP158HomesteadStateLog(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stLogTests.json")
|
||||
@ -852,7 +852,7 @@ func TestEIP158HomesteadStateTransaction(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stTransactionTest.json")
|
||||
@ -865,7 +865,7 @@ func TestEIP158HomesteadCallCreateCallCode(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stCallCreateCallCodeTest.json")
|
||||
@ -878,7 +878,7 @@ func TestEIP158HomesteadCallCodes(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stCallCodes.json")
|
||||
@ -891,7 +891,7 @@ func TestEIP158HomesteadMemory(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stMemoryTest.json")
|
||||
@ -904,7 +904,7 @@ func TestEIP158HomesteadMemoryStress(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
if os.Getenv("TEST_VM_COMPLEX") == "" {
|
||||
@ -920,7 +920,7 @@ func TestEIP158HomesteadQuadraticComplexity(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
if os.Getenv("TEST_VM_COMPLEX") == "" {
|
||||
@ -936,7 +936,7 @@ func TestEIP158HomesteadWallet(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stWalletTest.json")
|
||||
@ -949,7 +949,7 @@ func TestEIP158HomesteadDelegateCodes(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stCallDelegateCodes.json")
|
||||
@ -962,7 +962,7 @@ func TestEIP158HomesteadDelegateCodesCallCode(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stCallDelegateCodesCallCode.json")
|
||||
@ -975,7 +975,7 @@ func TestEIP158HomesteadBounds(t *testing.T) {
|
||||
chainConfig := ¶ms.ChainConfig{
|
||||
HomesteadBlock: new(big.Int),
|
||||
EIP150Block: big.NewInt(2457000),
|
||||
EIP158Block: big.NewInt(3500000),
|
||||
EIP158Block: params.MainNetSpuriousDragon,
|
||||
}
|
||||
|
||||
fn := filepath.Join(stateTestDir, "EIP158", "Homestead", "stBoundsTest.json")
|
||||
|
@ -111,7 +111,7 @@ func runStateTests(chainConfig *params.ChainConfig, tests map[string]VmTest, ski
|
||||
}
|
||||
|
||||
for name, test := range tests {
|
||||
if skipTest[name] /*|| name != "NonZeroValue_CALL_ToEmpty"*/ {
|
||||
if skipTest[name] /*|| name != "EXP_Empty"*/ {
|
||||
glog.Infoln("Skipping state test", name)
|
||||
continue
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user