merge v0.2.5

Author: zhangbin

README.md

@@ -9,7 +9,7 @@ For prerequisites and detailed build instructions please read the
 [Installation Instructions](https://github.com/elastos/Elastos.ELA.SideChain.ESC/wiki/Building-Ethereum)
 on the wiki.
 
-Building `geth` requires both a Go (version 1.16.5 or later) and a C compiler. You can install
+Building `geth` requires both a Go (version 1.20 or later) and a C compiler. You can install
 them using your favourite package manager. Once the dependencies are installed, run
 
 ```shell

cmd/geth/main.go

@@ -183,6 +183,7 @@ var (
 		utils.FrozenAccount,
 		utils.UpdateArbiterListToLayer1Flag,
 		utils.PledgedBillContract,
+		utils.DeveloperFeeContract,
 	}
 
 	rpcFlags = []cli.Flag{
@@ -464,7 +465,12 @@ func startSpv(ctx *cli.Context, stack *node.Node) {
 		}
 
 		// calculate ELA mainchain address from the genesis block hash and set the SPV monitor address accordingly
-		log.Info(fmt.Sprintf("Genesis block hash: %v", ghash.String()))
+		genesisU256, err := elacom.Uint256FromBytes(ghash.Bytes())
+		if err != nil {
+			utils.Fatalf("Blockchain not running: %v", err)
+		}
+		spvCfg.GenesisHash = *genesisU256
+		log.Info(fmt.Sprintf("Genesis block hash: %v uint256 fromat:%v", ghash.String(), genesisU256.String()))
 		if gaddr, err := calculateGenesisAddress(ghash.String()); err != nil {
 			utils.Fatalf("Cannot calculate: %v", err)
 		} else {

cmd/utils/flags.go

@@ -824,6 +824,12 @@ var (
 		Usage: "configue pledged bill address",
 		Value: "",
 	}
+
+	DeveloperFeeContract = cli.StringSliceFlag{
+		Name:  "developer.fee.contract",
+		Usage: "configue developer fee contract address",
+		Value: &cli.StringSlice{},
+	}
 )
 
 // MakeDataDir retrieves the currently requested data directory, terminating
@@ -1165,6 +1171,19 @@ func MakePasswordList(ctx *cli.Context) []string {
 	return lines
 }
 
+func MakeDeveloperFeeContractAddress(ctx *cli.Context) ([]string, error) {
+	list := ctx.StringSlice(DeveloperFeeContract.Name)
+	if len(list) == 0 {
+		return []string{}, nil
+	}
+	for _, account := range list {
+		if !common.IsHexAddress(account) {
+			return []string{}, errors.New("error address format")
+		}
+	}
+	return list, nil
+}
+
 func MakeMinerCoinbaseAddress(ctx *cli.Context) string {
 	path := ctx.GlobalString(PbftMinerAddress.Name)
 	if path == "" {
@@ -1604,6 +1623,12 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 
 	cfg.DynamicArbiterHeight = ctx.GlobalUint64(DynamicArbiter.Name)
 	cfg.PledgedBillContract = ctx.GlobalString(PledgedBillContract.Name)
+	listAccount, err := MakeDeveloperFeeContractAddress(ctx)
+	if err != nil {
+		log.Error("MakeDeveloperFeeContractAddress failed", "error", err)
+	} else {
+		cfg.DeveloperFeeContract = listAccount
+	}
 
 	cfg.FrozenAccountList = make([]string, 0)
 	// Override any default configs for hard coded networks.

consensus/clique/clique.go

@@ -56,11 +56,11 @@ const (
 var (
 	epochLength = uint64(30000) // Default number of blocks after which to checkpoint and reset the pending votes
 
-	extraVanity = 32                     // Fixed number of extra-data prefix bytes reserved for signer vanity
-	extraSeal   = crypto.SignatureLength // Fixed number of extra-data suffix bytes reserved for signer seal
+	extraVanity    = 32                     // Fixed number of extra-data prefix bytes reserved for signer vanity
+	extraSeal      = crypto.SignatureLength // Fixed number of extra-data suffix bytes reserved for signer seal
 	extraElaHeight = 8
-	nonceAuthVote = hexutil.MustDecode("0xffffffffffffffff") // Magic nonce number to vote on adding a new signer
-	nonceDropVote = hexutil.MustDecode("0x0000000000000000") // Magic nonce number to vote on removing a signer.
+	nonceAuthVote  = hexutil.MustDecode("0xffffffffffffffff") // Magic nonce number to vote on adding a new signer
+	nonceDropVote  = hexutil.MustDecode("0x0000000000000000") // Magic nonce number to vote on removing a signer.
 
 	uncleHash = types.CalcUncleHash(nil) // Always Keccak256(RLP([])) as uncles are meaningless outside of PoW.
 
@@ -162,7 +162,6 @@ func ecrecover(header *types.Header, sigcache *lru.ARCCache) (common.Address, er
 	}
 	var signer common.Address
 	copy(signer[:], crypto.Keccak256(pubkey[1:])[12:])
-
 	sigcache.Add(hash, signer)
 	return signer, nil
 }
@@ -383,7 +382,7 @@ func (c *Clique) snapshot(chain consensus.ChainReader, number uint64, hash commo
 			if checkpoint != nil {
 				hash := checkpoint.Hash()
 				signersSize := len(checkpoint.Extra) - extraVanity - extraSeal
-				if signersSize %common.AddressLength == extraElaHeight {
+				if signersSize%common.AddressLength == extraElaHeight {
 					signersSize -= extraElaHeight
 				}
 
@@ -425,7 +424,7 @@ func (c *Clique) snapshot(chain consensus.ChainReader, number uint64, hash commo
 	beforeChangeEngine := false
 	for i := 0; i < len(headers); i++ {
 		beforeChangeEngine = c.isBeforeChangeEngine(chain, headers[i])
-		log.Info("snap headers","number:", headers[i].Number.Uint64(), "beforeChangeEngine", beforeChangeEngine)
+		log.Info("snap headers", "number:", headers[i].Number.Uint64(), "beforeChangeEngine", beforeChangeEngine)
 		if beforeChangeEngine {
 			log.Info("get before change engine header")
 			break
@@ -586,7 +585,7 @@ func (c *Clique) Finalize(chain consensus.ChainReader, header *types.Header, sta
 	// No block rewards in PoA, so the state remains as is and uncles are dropped
 	header.Root = state.IntermediateRoot(chain.Config().IsEIP158(header.Number))
 	header.UncleHash = types.CalcUncleHash(nil)
-	log.Info("clique finalize", "height", header.Number.Uint64(), "hash",   header.Hash().String())
+	log.Info("clique finalize", "height", header.Number.Uint64(), "hash", header.Hash().String())
 }
 
 // FinalizeAndAssemble implements consensus.Engine, ensuring no uncles are set,
@@ -615,7 +614,7 @@ func (c *Clique) isBeforeChangeEngine(chain consensus.ChainReader,
 	if chain.Config().PBFTBlock == nil {
 		return false
 	}
-	return chain.Config().PBFTBlock.Uint64() - 1 == header.Number.Uint64()
+	return chain.Config().PBFTBlock.Uint64()-1 == header.Number.Uint64()
 }
 
 // Seal implements consensus.Engine, attempting to create a sealed block using
@@ -696,7 +695,7 @@ func (c *Clique) Seal(chain consensus.ChainReader, block *types.Block, results c
 	if err != nil {
 		return err
 	}
-	copy(header.Extra[length - extraSeal:], sighash)
+	copy(header.Extra[length-extraSeal:], sighash)
 	// Wait until sealing is terminated or delay timeout.
 	log.Trace("Waiting for slot to sign and propagate", "delay", common.PrettyDuration(delay))
 	go func() {

consensus/pbft/network.go

@@ -76,6 +76,21 @@ func (p *Pbft) BroadMessage(msg elap2p.Message) {
 	}
 }
 
+func (p *Pbft) BroadMessageExcept(msg elap2p.Message, exceptPeer peer.PID) {
+	peers := p.network.DumpPeersInfo()
+	for _, peer := range peers {
+		pid := peer.PID[:]
+		producer := p.dispatcher.GetConsensusView().IsProducers(pid)
+		if producer == false {
+			continue
+		}
+		if peer.PID.Equal(exceptPeer) {
+			continue
+		}
+		p.network.SendMessageToPeer(peer.PID, msg)
+	}
+}
+
 func (p *Pbft) BroadMessageToPeers(msg elap2p.Message, peers [][]byte) {
 	for _, pbk := range peers {
 		pid := peer.PID{}
@@ -201,7 +216,7 @@ func (p *Pbft) OnPong(id peer.PID, height uint32) {
 }
 
 func (p *Pbft) OnBlock(id peer.PID, block *dmsg.BlockMsg) {
-	log.Info("-----OnBlock received------")
+	log.Info("-----PBFT OnBlock received------")
 	b := &types.Block{}
 
 	err := b.DecodeRLP(rlp.NewStream(bytes.NewBuffer(block.GetData()), 0))
@@ -306,6 +321,10 @@ func (p *Pbft) OnInv(id peer.PID, blockHash elacom.Uint256) {
 		return
 	}
 	hash := common.BytesToHash(blockHash.Bytes())
+	if p.chain.GetBlockByHash(hash) != nil {
+		return
+	}
+
 	if _, ok := p.requestedBlocks[hash]; ok {
 		return
 	}
@@ -317,8 +336,16 @@ func (p *Pbft) OnInv(id peer.PID, blockHash elacom.Uint256) {
 }
 
 func (p *Pbft) OnGetBlock(id peer.PID, blockHash elacom.Uint256) {
-	if block, ok := p.blockPool.GetBlock(blockHash); ok {
-		if b, suc := block.(*types.Block); suc {
+	ok := false
+	var block dpos.DBlock
+	block, ok = p.blockPool.GetBlock(blockHash)
+	if !ok {
+		hash := common.BytesToHash(blockHash.Bytes())
+		block = p.chain.GetBlockByHash(hash)
+		ok = block != nil
+	}
+	if ok {
+		if b, suc := block.(*types.Block); suc && b != nil {
 			buffer := bytes.NewBuffer([]byte{})
 			err := b.EncodeRLP(buffer)
 			if err != nil {
@@ -388,7 +415,7 @@ func (p *Pbft) OnIllegalVotesReceived(id peer.PID, votes *payload.DPOSIllegalVot
 }
 
 func (p *Pbft) OnProposalReceived(id peer.PID, proposal *payload.DPOSProposal) {
-	log.Info("OnProposalReceived", "hash:", proposal.Hash().String())
+	log.Info("OnProposalReceived", "hash:", proposal.Hash().String(), "from", id.String())
 	if _, ok := p.requestedProposals[proposal.Hash()]; ok {
 		delete(p.requestedProposals, proposal.Hash())
 	}
@@ -692,10 +719,28 @@ func (p *Pbft) OnBlockReceived(id peer.PID, b *dmsg.BlockMsg, confirmed bool) {
 		log.Warn("is bigger than local number")
 		return
 	}
+	if p.chain.GetBlockByHash(block.Hash()) != nil {
+		log.Error("insert chain is known block", "hash", block.Hash().String(), "number", block.NumberU64())
+		return
+	}
 	if _, err := p.chain.InsertChain(blocks); err != nil {
 		if p.OnInsertChainError != nil {
 			p.OnInsertChainError(id, block, err)
 		}
+	} else {
+		preHash, err := elacom.Uint256FromBytes(block.ParentHash().Bytes())
+		if err != nil {
+			log.Error("error parent block hash", "error", err, "parentHash", block.ParentHash().String())
+		} else {
+			p.BroadMessageExcept(msg.NewInventory(*preHash), id)
+		}
+
+		blockHash, err := elacom.Uint256FromBytes(block.Hash().Bytes())
+		if err != nil {
+			log.Error("error block hash", "error", err, "blockHash", block.Hash().String())
+		} else {
+			p.BroadMessageExcept(msg.NewInventory(*blockHash), id)
+		}
 	}
 }
 

core/chain_makers.go

@@ -297,4 +297,4 @@ func (cr *fakeChainReader) GetHeaderByNumber(number uint64) *types.Header
 func (cr *fakeChainReader) GetHeaderByHash(hash common.Hash) *types.Header          { return nil }
 func (cr *fakeChainReader) GetHeader(hash common.Hash, number uint64) *types.Header { return nil }
 func (cr *fakeChainReader) GetBlock(hash common.Hash, number uint64) *types.Block   { return nil }
-func (cr *fakeChainReader) IsDangerChain() bool { return false}
+func (cr *fakeChainReader) IsDangerChain() bool                                     { return false }

core/headerchain.go

@@ -69,9 +69,10 @@ type HeaderChain struct {
 }
 
 // NewHeaderChain creates a new HeaderChain structure.
-//  getValidator should return the parent's validator
-//  procInterrupt points to the parent's interrupt semaphore
-//  wg points to the parent's shutdown wait group
+//
+//	getValidator should return the parent's validator
+//	procInterrupt points to the parent's interrupt semaphore
+//	wg points to the parent's shutdown wait group
 func NewHeaderChain(chainDb ethdb.Database, config *params.ChainConfig, engine consensus.Engine, procInterrupt func() bool) (*HeaderChain, error) {
 	headerCache, _ := lru.New(headerCacheLimit)
 	tdCache, _ := lru.New(tdCacheLimit)
@@ -123,6 +124,14 @@ func (hc *HeaderChain) SetDposChain(engine consensus.Engine) {
 	hc.pbftEngine = engine
 }
 
+func (hc *HeaderChain) GetPOAEngine() consensus.Engine {
+	return hc.poaEngine
+}
+
+func (hc *HeaderChain) GetDposChain() consensus.Engine {
+	return hc.pbftEngine
+}
+
 // GetBlockNumber retrieves the block number belonging to the given hash
 // from the cache or database
 func (hc *HeaderChain) GetBlockNumber(hash common.Hash) *uint64 {

core/state/journal.go

@@ -33,14 +33,14 @@ type journalEntry interface {
 }
 
 // journal contains the list of state modifications applied since the last state
-// commit. These are tracked to be able to be reverted in case of an execution
-// exception or revertal request.
+// commit. These are tracked to be able to be reverted in the case of an execution
+// exception or request for reversal.
 type journal struct {
 	entries []journalEntry         // Current changes tracked by the journal
 	dirties map[common.Address]int // Dirty accounts and the number of changes
 }
 
-// newJournal create a new initialized journal.
+// newJournal creates a new initialized journal.
 func newJournal() *journal {
 	return &journal{
 		dirties: make(map[common.Address]int),
@@ -90,7 +90,8 @@ type (
 		account *common.Address
 	}
 	resetObjectChange struct {
-		prev *stateObject
+		prev         *stateObject
+		prevdestruct bool
 	}
 	suicideChange struct {
 		account     *common.Address
@@ -127,9 +128,7 @@ type (
 		hash common.Hash
 	}
 	touchChange struct {
-		account   *common.Address
-		prev      bool
-		prevDirty bool
+		account *common.Address
 	}
 	// Changes to the access list
 	accessListAddAccountChange struct {
@@ -139,6 +138,11 @@ type (
 		address *common.Address
 		slot    *common.Hash
 	}
+
+	transientStorageChange struct {
+		account       *common.Address
+		key, prevalue common.Hash
+	}
 )
 
 func (ch createObjectChange) revert(s *StateDB) {
@@ -152,6 +156,9 @@ func (ch createObjectChange) dirtied() *common.Address {
 
 func (ch resetObjectChange) revert(s *StateDB) {
 	s.setStateObject(ch.prev)
+	if !ch.prevdestruct {
+		delete(s.stateObjectsDestruct, ch.prev.address)
+	}
 }
 
 func (ch resetObjectChange) dirtied() *common.Address {
@@ -211,6 +218,14 @@ func (ch storageChange) dirtied() *common.Address {
 	return ch.account
 }
 
+func (ch transientStorageChange) revert(s *StateDB) {
+	s.setTransientState(*ch.account, ch.key, ch.prevalue)
+}
+
+func (ch transientStorageChange) dirtied() *common.Address {
+	return nil
+}
+
 func (ch refundChange) revert(s *StateDB) {
 	s.refund = ch.prev
 }