Skip to content

Commit

Permalink
Remove archaic eip150Hash functionality (erigontech#7074)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yperbasis @calmbeing
yperbasis authored and calmbeing committed Mar 16, 2023
1 parent 942990c commit bf5e401
Show file tree
Hide file tree
Showing 65 changed files with 3 additions and 126 deletions.
9 changes: 2 additions & 7 deletions consensus/bor/bor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ import (
"time"

"github.com/google/btree"
"github.com/hashicorp/golang-lru/v2"
lru "github.com/hashicorp/golang-lru/v2"
"github.com/ledgerwatch/erigon-lib/chain"
libcommon "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/length"
"github.com/ledgerwatch/erigon-lib/kv"
"github.com/ledgerwatch/log/v3"
"go.uber.org/atomic"

"github.com/ledgerwatch/erigon/common"
"github.com/ledgerwatch/erigon/consensus"
Expand All @@ -37,7 +38,6 @@ import (
"github.com/ledgerwatch/erigon/crypto/cryptopool"
"github.com/ledgerwatch/erigon/rlp"
"github.com/ledgerwatch/erigon/rpc"
"go.uber.org/atomic"
)

const (
Expand Down Expand Up @@ -402,11 +402,6 @@ func (c *Bor) verifyHeader(chain consensus.ChainHeaderReader, header *types.Head
return fmt.Errorf("invalid gasLimit: have %v, max %v", header.GasLimit, gasCap)
}

// If all checks passed, validate any special fields for hard forks
if err := misc.VerifyForkHashes(chain.Config(), header, false); err != nil {
return err
}

// All basic checks passed, verify cascading fields
return c.verifyCascadingFields(chain, header, parents)
}
Expand Down
5 changes: 0 additions & 5 deletions consensus/clique/verifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ func (c *Clique) verifyHeader(chain consensus.ChainHeaderReader, header *types.H
return consensus.ErrUnexpectedWithdrawals
}

// If all checks passed, validate any special fields for hard forks
if err := misc.VerifyForkHashes(c.chainConfig, header, false); err != nil {
return err
}

// All basic checks passed, verify cascading fields
return c.verifyCascadingFields(chain, header, parents)
}
Expand Down
3 changes: 0 additions & 3 deletions consensus/ethash/consensus.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ func VerifyHeaderBasics(chain consensus.ChainHeaderReader, header, parent *types
if err := misc.VerifyDAOHeaderExtraData(chain.Config(), header); err != nil {
return err
}
if err := misc.VerifyForkHashes(chain.Config(), header, uncle); err != nil {
return err
}
return nil
}

Expand Down
44 changes: 0 additions & 44 deletions consensus/misc/forks.go
View file

This file was deleted.

4 changes: 0 additions & 4 deletions consensus/parlia/parlia.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,6 @@ func (p *Parlia) verifyHeader(chain consensus.ChainHeaderReader, header *types.H
return consensus.ErrUnexpectedWithdrawals
}

// If all checks passed, validate any special fields for hard forks
if err := misc.VerifyForkHashes(chain.Config(), header, false); err != nil {
return err
}
// All basic checks passed, verify cascading fields
return p.verifyCascadingFields(chain, header, parents)
}
Expand Down
1 change: 0 additions & 1 deletion core/vm/runtime/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func setDefaults(cfg *Config) {
DAOForkBlock: new(big.Int),
DAOForkSupport: false,
TangerineWhistleBlock: new(big.Int),
TangerineWhistleHash: libcommon.Hash{},
SpuriousDragonBlock: new(big.Int),
ByzantiumBlock: new(big.Int),
ConstantinopleBlock: new(big.Int),
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/create.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/deep_calls.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/delegatecall.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/inner_create_oog_outer_throw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/inner_instafail.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"homesteadBlock": 0,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"byzantiumBlock": 1700000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"chainId": 1337,
"homesteadBlock": 0,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/inner_throw_outer_revert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/oog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/revert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/revert_reason.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"chainId": 5,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/selfdestruct.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/simple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/simple_onlytop.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer/throw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/create.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/deep_calls.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/delegatecall.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_create_oog_outer_throw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_instafail.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"homesteadBlock": 0,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"byzantiumBlock": 1700000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/oog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/revert_reason.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"chainId": 5,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/selfdestruct.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/simple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_legacy/throw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"chainId": 3,
"daoForkSupport": true,
"eip150Block": 0,
"eip150Hash": "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d",
"eip155Block": 10,
"eip158Block": 10,
"ethash": {},
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_failed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
1 change: 0 additions & 1 deletion eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"daoForkBlock": 1920000,
"daoForkSupport": true,
"eip150Block": 2463000,
"eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
"eip155Block": 2675000,
"eip158Block": 2675000,
"byzantiumBlock": 4370000,
Expand Down
Loading

0 comments on commit bf5e401

Please sign in to comment.