forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 21:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

delete Keccak256RLP and Keccak256RLPHash

Browse source
This commit is contained in:
maskpp 2025-06-19 07:42:04 +08:00
parent 35394489e5
commit 14e2d1c751
5 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/evm/internal/t8ntool/execution.go
View file

@ -436,7 +436,8 @@ func MakePreState(db ethdb.Database, accounts types.GenesisAlloc) *state.StateDB
}
func rlpHash(x interface{}) (h common.Hash) {
return crypto.Keccak256RLPHash(x)
bytes, _ := rlp.EncodeToBytes(x)
return crypto.Keccak256Hash(bytes)
}
// calcDifficulty is based on ethash.CalcDifficulty. This method is used in case

4
cmd/workload/historytestgen.go
View file

@ -27,6 +27,7 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/rlp"
"github.com/urfave/cli/v2"
)
@ -130,7 +131,8 @@ func generateHistoryTests(clictx *cli.Context) error {
}
func calcReceiptsHash(rcpt []*types.Receipt) common.Hash {
return crypto.Keccak256RLPHash(rcpt)
bytes, _ := rlp.EncodeToBytes(rcpt)
return crypto.Keccak256Hash(bytes)
}
func writeJSON(fileName string, value any) {

4
consensus/ethash/consensus.go
View file

@ -19,6 +19,7 @@ package ethash
import (
"errors"
"fmt"
"github.com/ethereum/go-ethereum/rlp"
"math/big"
"time"
@ -556,7 +557,8 @@ func (ethash *Ethash) SealHash(header *types.Header) (hash common.Hash) {
if header.ParentBeaconRoot != nil {
panic("parent beacon root set on ethash")
}
return crypto.Keccak256RLPHash(enc)
bytes, _ := rlp.EncodeToBytes(enc)
return crypto.Keccak256Hash(bytes)
}
// accumulateRewards credits the coinbase of the given block with the mining

20
crypto/crypto.go
View file

@ -94,12 +94,6 @@ func Keccak256(data ...[]byte) []byte {
return b[:]
}
// Keccak256RLP calculates and returns the Keccak256 hash of the input interface.
func Keccak256RLP(x interface{}) []byte {
b := Keccak256RLPHash(x)
return b[:]
}
// Keccak256Hash calculates and returns the Keccak256 hash of the input data,
// converting it to an internal Hash data structure.
func Keccak256Hash(data ...[]byte) (h common.Hash) {
@ -113,17 +107,6 @@ func Keccak256Hash(data ...[]byte) (h common.Hash) {
return h
}
// Keccak256RLPHash calculates and returns the Keccak256 hash of the input interface,
// converting it to an internal Hash data structure.
func Keccak256RLPHash(x interface{}) (h common.Hash) {
d := hasherPool.Get().(KeccakState)
d.Reset()
rlp.Encode(d, x)
d.Read(h[:])
hasherPool.Put(d)
return h
}
// Keccak512 calculates and returns the Keccak512 hash of the input data.
func Keccak512(data ...[]byte) []byte {
d := sha3.NewLegacyKeccak512()
@ -135,7 +118,8 @@ func Keccak512(data ...[]byte) []byte {
// CreateAddress creates an ethereum address given the bytes and the nonce
func CreateAddress(b common.Address, nonce uint64) common.Address {
return common.BytesToAddress(Keccak256RLP([]interface{}{b, nonce})[12:])
data, _ := rlp.EncodeToBytes([]interface{}{b, nonce})
return common.BytesToAddress(Keccak256(data)[12:])
}
// CreateAddress2 creates an ethereum address given the address bytes, initial

6
p2p/enode/idscheme.go
View file

@ -48,7 +48,8 @@ func SignV4(r *enr.Record, privkey *ecdsa.PrivateKey) error {
cpy.Set(enr.ID("v4"))
cpy.Set(Secp256k1(privkey.PublicKey))
digestHash := crypto.Keccak256RLP(cpy.AppendElements(nil))
bytes, _ := rlp.EncodeToBytes(cpy.AppendElements(nil))
digestHash := crypto.Keccak256(bytes)
sig, err := crypto.Sign(digestHash, privkey)
if err != nil {
return err
@ -68,7 +69,8 @@ func (V4ID) Verify(r *enr.Record, sig []byte) error {
return errors.New("invalid public key")
}
digestHash := crypto.Keccak256RLP(r.AppendElements(nil))
bytes, _ := rlp.EncodeToBytes(r.AppendElements(nil))
digestHash := crypto.Keccak256(bytes)
if !crypto.VerifySignature(entry, digestHash, sig) {
return enr.ErrInvalidSig
}