Merge pull request #9 from AlayaNetwork/feature/compatible-with-evm

Feature/compatible with evm

cmd/utils/flags.go

@@ -20,14 +20,15 @@ package utils
 import (
 	"crypto/ecdsa"
 	"fmt"
-	"github.com/AlayaNetwork/Alaya-Go/miner"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/AlayaNetwork/Alaya-Go/miner"
+
 	"github.com/AlayaNetwork/Alaya-Go/core/snapshotdb"
 
 	"gopkg.in/urfave/cli.v1"

common/address.go

@@ -6,14 +6,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"golang.org/x/crypto/sha3"
 	"math/big"
 	"strings"
 
 	"github.com/btcsuite/btcutil/bech32"
 
 	"github.com/AlayaNetwork/Alaya-Go/common/bech32util"
 	"github.com/AlayaNetwork/Alaya-Go/common/hexutil"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/log"
 )
 
@@ -137,7 +138,7 @@ func (a Address) Hex() string {
 
 func (a Address) HexWithNoPrefix() string {
 	unchecksummed := hex.EncodeToString(a[:])
-	sha := sha3.NewKeccak256()
+	sha := sha3.NewLegacyKeccak256()
 	sha.Write([]byte(unchecksummed))
 	hash := sha.Sum(nil)
 
@@ -359,7 +360,7 @@ func (a NodeAddress) Hash() Hash { return BytesToHash(a[:]) }
 // Hex returns an EIP55-compliant hex string representation of the address.
 func (a NodeAddress) Hex() string {
 	unchecksummed := hex.EncodeToString(a[:])
-	sha := sha3.NewKeccak256()
+	sha := sha3.NewLegacyKeccak256()
 	sha.Write([]byte(unchecksummed))
 	hash := sha.Sum(nil)
 
@@ -380,7 +381,7 @@ func (a NodeAddress) Hex() string {
 
 func (a NodeAddress) HexWithNoPrefix() string {
 	unchecksummed := hex.EncodeToString(a[:])
-	sha := sha3.NewKeccak256()
+	sha := sha3.NewLegacyKeccak256()
 	sha.Write([]byte(unchecksummed))
 	hash := sha.Sum(nil)
 

common/mock/chain.go

@@ -19,14 +19,15 @@ package mock
 import (
 	"encoding/json"
 	"fmt"
+	"golang.org/x/crypto/sha3"
 	"math/big"
 	"math/rand"
 	"reflect"
 	"time"
 
 	"github.com/AlayaNetwork/Alaya-Go/common/vm"
 	"github.com/AlayaNetwork/Alaya-Go/crypto"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 
 	"github.com/AlayaNetwork/Alaya-Go/core/snapshotdb"
@@ -92,7 +93,7 @@ func (c *Chain) execTx(miner bool, f Transaction) error {
 type Transaction func(blockHash common.Hash, header *types.Header, statedb *MockStateDB, sdb snapshotdb.DB) error
 
 func (T *Transaction) Hash() (h common.Hash) {
-	hw := sha3.NewKeccak256()
+	hw := sha3.NewLegacyKeccak256()
 	if err := rlp.Encode(hw, fmt.Sprint(T)); err != nil {
 		panic(err)
 	}
@@ -365,7 +366,7 @@ func (s *MockStateDB) SetCode(addr common.Address, code []byte) {
 	s.Code[addr] = code
 
 	var h common.Hash
-	hw := sha3.NewKeccak256()
+	hw := sha3.NewLegacyKeccak256()
 	rlp.Encode(hw, code)
 	hw.Sum(h[:0])
 	s.CodeHash[addr] = h[:]

common/mock/journal.go

@@ -17,9 +17,10 @@
 package mock
 
 import (
+	"golang.org/x/crypto/sha3"
 	"math/big"
 
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
@@ -132,7 +133,7 @@ func (ch codeChange) revert(s *MockStateDB) {
 		s.Code[*ch.account] = ch.prevcode
 
 		var h common.Hash
-		hw := sha3.NewKeccak256()
+		hw := sha3.NewLegacyKeccak256()
 		rlp.Encode(hw, ch.prevcode)
 		hw.Sum(h[:0])
 		s.CodeHash[*ch.account] = h[:]

common/rlp_utils.go

@@ -18,8 +18,8 @@ package common
 
 import (
 	"bytes"
+	"golang.org/x/crypto/sha3"
 
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 )
 
@@ -40,7 +40,7 @@ func GenerateKVHash(k, v []byte, oldHash Hash) Hash {
 }
 
 func RlpHash(x interface{}) (h Hash) {
-	hw := sha3.NewKeccak256()
+	hw := sha3.NewLegacyKeccak256()
 	rlp.Encode(hw, x)
 	hw.Sum(h[:0])
 	return h

consensus/cbft/cbft.go

@@ -260,6 +260,11 @@ func (cbft *Cbft) Start(chain consensus.ChainReader, blockCacheWriter consensus.
 	// Start the handler to process the message.
 	go cbft.network.Start()
 
+	if cbft.config.Option.NodePriKey == nil {
+		cbft.config.Option.NodePriKey = cbft.nodeServiceContext.NodePriKey()
+		cbft.config.Option.NodeID = discover.PubkeyID(&cbft.config.Option.NodePriKey.PublicKey)
+	}
+
 	if isGenesis() {
 		cbft.validatorPool = validator.NewValidatorPool(agency, block.NumberU64(), cstate.DefaultEpoch, cbft.config.Option.NodeID)
 		cbft.changeView(cstate.DefaultEpoch, cstate.DefaultViewNumber, block, qc, nil)

consensus/cbft/utils/util.go

@@ -19,13 +19,14 @@ package utils
 
 import (
 	"bytes"
+	"golang.org/x/crypto/sha3"
 	"io"
 	"math/rand"
 	"sort"
 	"sync/atomic"
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 )
 
 // RandomOffset returns a random offset between 0 and n

consensus/sign.go

@@ -18,11 +18,12 @@ package consensus
 
 import (
 	"errors"
+	"golang.org/x/crypto/sha3"
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
 	"github.com/AlayaNetwork/Alaya-Go/core/types"
 	"github.com/AlayaNetwork/Alaya-Go/crypto"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 	lru "github.com/hashicorp/golang-lru"
 )
@@ -43,7 +44,7 @@ var (
 // panics. This is done to avoid accidentally using both forms (signature present
 // or not), which could be abused to produce different hashes for the same header.
 func SigHash(header *types.Header) (hash common.Hash) {
-	hasher := sha3.NewKeccak256()
+	hasher := sha3.NewLegacyKeccak256()
 
 	rlp.Encode(hasher, []interface{}{
 		header.ParentHash,

core/block_validator.go

@@ -76,7 +76,7 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 // transition, such as amount of used gas, the receipt roots and the state root
 // itself. ValidateState returns a database batch if the validation was a success
 // otherwise nil and an error is returned.
-func (v *BlockValidator) ValidateState(block, parent *types.Block, statedb *state.StateDB, receipts types.Receipts, usedGas uint64) error {
+func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateDB, receipts types.Receipts, usedGas uint64) error {
 	header := block.Header()
 	if block.GasUsed() != usedGas {
 		return fmt.Errorf("invalid gas used (remote: %d local: %d)", block.GasUsed(), usedGas)

core/blockchain.go

@@ -1579,7 +1579,7 @@ func (bc *BlockChain) ProcessDirectly(block *types.Block, state *state.StateDB,
 
 	// Validate the state using the default validator
 	start = time.Now()
-	err = bc.Validator().ValidateState(block, parent, state, receipts, usedGas)
+	err = bc.Validator().ValidateState(block, state, receipts, usedGas)
 	if err != nil {
 		bc.reportBlock(block, receipts, err)
 		return nil, err

core/blockchain_insert.go

@@ -114,14 +114,6 @@ func (it *insertIterator) current() *types.Block {
 	return it.chain[it.index]
 }
 
-// previous returns the previous block was being processed, or nil
-func (it *insertIterator) previous() *types.Block {
-	if it.index < 1 {
-		return nil
-	}
-	return it.chain[it.index-1]
-}
-
 // first returns the first block in the it.
 func (it *insertIterator) first() *types.Block {
 	return it.chain[0]

core/rawdb/accessors_chain_test.go

@@ -20,14 +20,15 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	"golang.org/x/crypto/sha3"
 	"math/big"
 	"testing"
 
 	"github.com/AlayaNetwork/Alaya-Go/params"
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
 	"github.com/AlayaNetwork/Alaya-Go/core/types"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 )
 
@@ -50,7 +51,7 @@ func TestHeaderStorage(t *testing.T) {
 	if entry := ReadHeaderRLP(db, header.Hash(), header.Number.Uint64()); entry == nil {
 		t.Fatalf("Stored header RLP not found")
 	} else {
-		hasher := sha3.NewKeccak256()
+		hasher := sha3.NewLegacyKeccak256()
 		hasher.Write(entry)
 
 		if hash := common.BytesToHash(hasher.Sum(nil)); hash != header.Hash() {
@@ -71,7 +72,7 @@ func TestBodyStorage(t *testing.T) {
 	// Create a test body to move around the database and make sure it's really new
 	body := &types.Body{}
 
-	hasher := sha3.NewKeccak256()
+	hasher := sha3.NewLegacyKeccak256()
 	rlp.Encode(hasher, body)
 	hash := common.BytesToHash(hasher.Sum(nil))
 
@@ -88,7 +89,7 @@ func TestBodyStorage(t *testing.T) {
 	if entry := ReadBodyRLP(db, hash, 0); entry == nil {
 		t.Fatalf("Stored body RLP not found")
 	} else {
-		hasher := sha3.NewKeccak256()
+		hasher := sha3.NewLegacyKeccak256()
 		hasher.Write(entry)
 
 		if calc := common.BytesToHash(hasher.Sum(nil)); calc != hash {

core/snapshotdb/util.go

@@ -19,6 +19,7 @@ package snapshotdb
 
 import (
 	"bytes"
+	"golang.org/x/crypto/sha3"
 	"io"
 	"math/big"
 	"math/rand"
@@ -28,7 +29,7 @@ import (
 	"github.com/AlayaNetwork/Alaya-Go/core/types"
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 )
 
@@ -41,7 +42,7 @@ func generateKVHash(k, v []byte, hash common.Hash) common.Hash {
 }
 
 func rlpHash(x interface{}) (h common.Hash) {
-	hw := sha3.NewKeccak256()
+	hw := sha3.NewLegacyKeccak256()
 	rlp.Encode(hw, x)
 	hw.Sum(h[:0])
 	return h

core/state/state_object.go

@@ -21,11 +21,12 @@ import (
 	"bytes"
 	"fmt"
 	"github.com/AlayaNetwork/Alaya-Go/metrics"
+	"golang.org/x/crypto/sha3"
 	"io"
 	"math/big"
 	"time"
 
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 
 	"github.com/AlayaNetwork/Alaya-Go/common"
 	cvm "github.com/AlayaNetwork/Alaya-Go/common/vm"
@@ -307,7 +308,7 @@ func (self *stateObject) getPrefixValue(pack, key, value []byte) []byte {
 	prefix := append(self.data.StorageKeyPrefix, pack...)
 	prefix = append(prefix, key...)
 	prefixHash := common.Hash{}
-	keccak := sha3.NewKeccak256()
+	keccak := sha3.NewLegacyKeccak256()
 	keccak.Write(prefix)
 	keccak.Sum(prefixHash[:0])
 	return append(prefixHash[:], value...)

core/state/statedb.go

@@ -546,7 +546,7 @@ func (self *StateDB) ListActiveVersion() ([]gov.ActiveVersionValue, error) {
 //	buffer.Write(value)
 //
 //	valueKey := common.Hash{}
-//	keccak := sha3.NewKeccak256()
+//	keccak := sha3.NewLegacyKeccak256()
 //	keccak.Write(buffer.Bytes())
 //	keccak.Sum(valueKey[:0])
 //

core/types.go

@@ -34,7 +34,7 @@ type Validator interface {
 
 	// ValidateState validates the given statedb and optionally the receipts and
 	// gas used.
-	ValidateState(block, parent *types.Block, state *state.StateDB, receipts types.Receipts, usedGas uint64) error
+	ValidateState(block *types.Block, state *state.StateDB, receipts types.Receipts, usedGas uint64) error
 }
 
 // Processor is an interface for processing blocks using a given initial state.

core/types/block.go

@@ -20,6 +20,7 @@ package types
 import (
 	"crypto/ecdsa"
 	"fmt"
+	"golang.org/x/crypto/sha3"
 	"io"
 	"math/big"
 	"sort"
@@ -31,7 +32,7 @@ import (
 	"github.com/AlayaNetwork/Alaya-Go/common"
 	"github.com/AlayaNetwork/Alaya-Go/common/hexutil"
 	"github.com/AlayaNetwork/Alaya-Go/crypto"
-	"github.com/AlayaNetwork/Alaya-Go/crypto/sha3"
+
 	"github.com/AlayaNetwork/Alaya-Go/log"
 	"github.com/AlayaNetwork/Alaya-Go/rlp"
 )
@@ -146,7 +147,7 @@ func (h *Header) SealHash() (hash common.Hash) {
 func (h *Header) _sealHash() (hash common.Hash) {
 	extra := h.Extra
 
-	hasher := sha3.NewKeccak256()
+	hasher := sha3.NewLegacyKeccak256()
 	if len(h.Extra) > 32 {
 		extra = h.Extra[0:32]
 	}
@@ -198,7 +199,7 @@ func (h *Header) IsInvalid() bool {
 // hasherPool holds Keccak hashers.
 var hasherPool = sync.Pool{
 	New: func() interface{} {
-		return sha3.NewKeccak256()
+		return sha3.NewLegacyKeccak256()
 	},
 }