Merge remote-tracking branch 'elastos/release_v0.10.0' into feature_fee

README.md

@@ -18,20 +18,20 @@ Make sure the [macOS version](https://en.wikipedia.org/wiki/MacOS#Release_histor
 
 ```bash
 $ uname -srm
-Darwin 18.7.0 x86_64
+Darwin 20.04 x86_64
 ```
 
-Use [Homebrew](https://brew.sh/) to install Golang 1.16
+Use [Homebrew](https://brew.sh/) to install Golang 1.20
 
 ```bash
-$ brew install go@1.16
+$ brew install go@1.20
 ```
 
 Check the golang version. Make sure they are the following version number or above.
 
 ```bash
 $ go version
-go version go1.16.5 darwin/amd64
+go version go1.20.3 darwin/amd64
 ```
 
 ### 2. Ubuntu Prerequisites
@@ -40,7 +40,7 @@ Make sure your ubuntu version is 18.04 or later.
 
 ```bash
 $ cat /etc/issue
-Ubuntu 18.04.5 LTS \n \l
+Ubuntu 20.04 LTS \n \l
 ```
 
 Install Git.
@@ -52,8 +52,8 @@ $ sudo apt-get install -y git
 Install Go distribution.
 
 ```bash
-$ curl -O https://golang.org/dl/go1.13.15.linux-amd64.tar.gz
-$ tar -xvf go1.13.15.linux-amd64.tar.gz
+$ curl -O https://golang.org/dl/go1.20.3.linux-amd64.tar.gz
+$ tar -xvf go1.20.3.linux-amd64.tar.gz
 $ sudo chown -R root:root ./go
 $ sudo mv go /usr/local
 $ export GOPATH=$HOME/go

blockchain/blockchain.go

@@ -698,7 +698,6 @@ func (b *BlockChain) GetHeight() uint32 {
 
 	return b.getHeight()
 }
-
 func (b *BlockChain) getHeight() uint32 {
 	if len(b.Nodes) == 0 {
 		return 0
@@ -1645,9 +1644,7 @@ func (b *BlockChain) maybeAcceptBlock(block *Block, confirm *payload.Confirm) (b
 			b.state.RevertToPOWBlockHeight, false)
 		DefaultLedger.Arbitrators.DumpInfo(block.Height)
 	}
-
 	events.Notify(events.ETBlockProcessed, block)
-
 	// Notify the caller that the new block was accepted into the block
 	// chain.  The caller would typically want to react by relaying the
 	// inventory to other peers.

common/config/config.go

@@ -197,6 +197,9 @@ func GetDefaultParams() *Configuration {
 			NFTStartHeight:                    1405000,
 			NFTV2StartHeight:                  math.MaxUint32, // todo complete me
 			DexStartHeight:                    math.MaxUint32, // todo complete me
+			ChangeVoteTargetStartHeight:       math.MaxUint32, // todo complete me
+			RenewalVotingTargetDuration:       14 * 720,       // todo complete me
+			MinRenewalVotingTargetLockTime:    720,            // todo complete me
 			OriginArbiters: []string{
 				"0248df6705a909432be041e0baa25b8f648741018f70d1911f2ed28778db4b8fe4",
 				"02771faf0f4d4235744b30972d5f2c470993920846c761e4d08889ecfdc061cddf",
@@ -388,6 +391,9 @@ func (p *Configuration) TestNet() *Configuration {
 	p.DPoSConfiguration.NFTStartHeight = 1098000
 	p.DPoSConfiguration.NFTV2StartHeight = 1171000
 	p.DPoSConfiguration.DexStartHeight = 1171000
+	p.DPoSConfiguration.ChangeVoteTargetStartHeight = 1252600
+	p.DPoSConfiguration.RenewalVotingTargetDuration = 14 * 720
+	p.DPoSConfiguration.MinRenewalVotingTargetLockTime = 720
 
 	p.HttpInfoPort = 21333
 	p.HttpRestPort = 21334
@@ -520,8 +526,11 @@ func (p *Configuration) RegNet() *Configuration {
 	p.ProducerSchnorrStartHeight = math.MaxUint32
 	p.CRSchnorrStartHeight = math.MaxUint32
 	p.VotesSchnorrStartHeight = math.MaxUint32
-	p.MultiExchangeVotesStartHeight = math.MaxUint32    // todo complete me
-	p.DPoSConfiguration.DexStartHeight = math.MaxUint32 // todo complete me
+	p.MultiExchangeVotesStartHeight = math.MaxUint32                 // todo complete me
+	p.DPoSConfiguration.DexStartHeight = math.MaxUint32              // todo complete me
+	p.DPoSConfiguration.ChangeVoteTargetStartHeight = math.MaxUint32 // todo complete me
+	p.DPoSConfiguration.RenewalVotingTargetDuration = 14 * 720       // todo complete me
+	p.DPoSConfiguration.MinRenewalVotingTargetLockTime = 720         // todo complete me
 
 	p.CRConfiguration.ChangeSideChainMinGasPriceHeight = math.MaxUint32 // todo complete me
 
@@ -745,6 +754,12 @@ type DPoSConfiguration struct {
 	NFTV2StartHeight uint32 `screw:"--NFTV2StartHeight" usage:"the start height of NFT 2.0 transaction"`
 	// DexStartHeight defines the height of DEX started.
 	DexStartHeight uint32 `screw:"--dexstartheight" usage:"the starting height of Dex support"`
+	// ChangeVoteTargetStartHeight defines the starting height for allowing changes to the voting target.
+	ChangeVoteTargetStartHeight uint32 `screw:"--changevotetargetstartheight" usage:"the starting height for allowing changes to the voting target"`
+	// RenewalVotingTargetDuration defines the duration of renewal voting target.
+	RenewalVotingTargetDuration uint32 `crew:"--renewalvotingtargetduration" usage:"the duration of renewal voting target"`
+	// MinRenewalVotingTargetLockTime defines the min lock time of renewal voting target.
+	MinRenewalVotingTargetLockTime uint32 `crew:"--minrenewalvotingtargetlocktime" usage:"the min lock time of renewal voting target"`
 }
 
 type CRConfiguration struct {

core/checkpoint/manager.go

@@ -355,7 +355,6 @@ func (m *Manager) onBlockSaved(block *types.DposBlock,
 				<-reply
 			}
 		}
-
 		if block.Height >=
 			originalHeight+v.SavePeriod() {
 			v.SetHeight(block.Height)

core/transaction/activateproducertransaction.go

@@ -175,7 +175,7 @@ func (t *ActivateProducerTransaction) SpecialContextCheck() (elaerr.ELAError, bo
 	}
 
 	var minActivateAmount common.Fixed64
-	if t.parameters.BlockHeight >= t.parameters.BlockChain.GetState().DPoSV2ActiveHeight {
+	if t.parameters.BlockHeight >= t.parameters.BlockChain.GetState().GetDPoSV2ActiveHeight() {
 		switch producer.Identity() {
 		case state.DPoSV1:
 			return elaerr.Simple(elaerr.ErrTxPayload, errors.New("not allow to activate producer 1.0")), true

core/transaction/crcappropriationtransaction.go

@@ -139,7 +139,7 @@ func (t *CRCAppropriationTransaction) SpecialContextCheck() (result elaerr.ELAEr
 	//
 	// Outputs has check in CheckTransactionOutput function:
 	// first one to CRCommitteeAddress, second one to CRAssetsAddress
-	appropriationAmount := t.parameters.BlockChain.GetCRCommittee().AppropriationAmount
+	appropriationAmount := t.parameters.BlockChain.GetCRCommittee().GetAppropriationAmount()
 	if appropriationAmount != t.Outputs()[0].Value {
 		return elaerr.Simple(elaerr.ErrTxPayload,
 			fmt.Errorf("invalid appropriation amount %s, need to be %s",

core/transaction/crcouncilmemberclaimnodetransaction.go

@@ -7,7 +7,6 @@ package transaction
 
 import (
 	"bytes"
-	"encoding/hex"
 	"errors"
 	"fmt"
 
@@ -64,7 +63,7 @@ func (t *CRCouncilMemberClaimNodeTransaction) SpecialContextCheck() (result elae
 		switch t.payloadVersion {
 		case payload.CurrentCRClaimDPoSNodeVersion:
 			crMember = t.parameters.BlockChain.GetCRCommittee().GetMember(did)
-			if _, ok := comm.ClaimedDPoSKeys[hex.EncodeToString(manager.NodePublicKey)]; ok {
+			if ok := comm.PubKeyExistClaimedDPoSKeys(manager.NodePublicKey); ok {
 				return elaerr.Simple(elaerr.ErrTxPayload, fmt.Errorf("producer already registered")), true
 			}
 			// check duplication of node.
@@ -73,7 +72,7 @@ func (t *CRCouncilMemberClaimNodeTransaction) SpecialContextCheck() (result elae
 			}
 		case payload.NextCRClaimDPoSNodeVersion:
 			crMember = t.parameters.BlockChain.GetCRCommittee().GetNextMember(did)
-			if _, ok := comm.NextClaimedDPoSKeys[hex.EncodeToString(manager.NodePublicKey)]; ok {
+			if ok := comm.PubKeyExistNextClaimedDPoSKey(manager.NodePublicKey); ok {
 				return elaerr.Simple(elaerr.ErrTxPayload, fmt.Errorf("producer already registered")), true
 			}
 			// check duplication of node.

core/transaction/crcproposaltransaction.go

@@ -679,15 +679,15 @@ func (t *CRCProposalTransaction) checkNormalOrELIPProposal(params *TransactionPa
 	if finalPaymentCount != 1 {
 		return errors.New("final payment count invalid")
 	}
-	if amount > (t.parameters.BlockChain.GetCRCommittee().CRCCurrentStageAmount-
-		t.parameters.BlockChain.GetCRCommittee().CommitteeUsedAmount)*blockchain.CRCProposalBudgetsPercentage/100 {
+	if amount > (t.parameters.BlockChain.GetCRCommittee().GetCRCCurrentStageAmount()-
+		t.parameters.BlockChain.GetCRCommittee().GetCommitteeUsedAmount())*blockchain.CRCProposalBudgetsPercentage/100 {
 		return errors.New("budgets exceeds 10% of CRC committee balance")
-	} else if amount > t.parameters.BlockChain.GetCRCommittee().CRCCurrentStageAmount-
-		t.parameters.BlockChain.GetCRCommittee().CRCCommitteeUsedAmount-proposalsUsedAmount {
+	} else if amount > t.parameters.BlockChain.GetCRCommittee().GetCRCCurrentStageAmount()-
+		t.parameters.BlockChain.GetCRCommittee().GetCRCCommitteeUsedAmount()-proposalsUsedAmount {
 		return errors.New(fmt.Sprintf("budgets exceeds the balance of CRC"+
 			" committee, proposal hash:%s, budgets:%s, need <= %s",
-			common.ToReversedString(proposal.Hash(PayloadVersion)), amount, t.parameters.BlockChain.GetCRCommittee().CRCCurrentStageAmount-
-				t.parameters.BlockChain.GetCRCommittee().CRCCommitteeUsedAmount-proposalsUsedAmount))
+			common.ToReversedString(proposal.Hash(PayloadVersion)), amount, t.parameters.BlockChain.GetCRCommittee().GetCRCCurrentStageAmount()-
+				t.parameters.BlockChain.GetCRCommittee().GetCRCCommitteeUsedAmount()-proposalsUsedAmount))
 	} else if amount < 0 {
 		return errors.New("budgets is invalid")
 	}

core/transaction/createnfttransaction.go

@@ -92,7 +92,21 @@ func (t *CreateNFTTransaction) SpecialContextCheck() (elaerr.ELAError, bool) {
 	}
 
 	state := t.parameters.BlockChain.GetState()
-	crState := t.parameters.BlockChain.GetCRCommittee().GetState()
+	crCommittee := t.parameters.BlockChain.GetCRCommittee()
+
+	processingReferKeys := make(map[common.Uint256]struct{}, 0)
+	for _, v := range state.GetRenewalTargetTransactionsInfo() {
+		for _, tx := range v {
+			pd := tx.Payload().(*payload.Voting)
+			for _, content := range pd.RenewalContents {
+				processingReferKeys[content.ReferKey] = struct{}{}
+			}
+		}
+	}
+	if _, ok := processingReferKeys[pld.ReferKey]; ok {
+		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("refer key is processing")), true
+	}
+
 	producers := state.GetDposV2Producers()
 	nftID := common.GetNFTID(pld.ReferKey, t.hash())
 	var existVote bool
@@ -143,37 +157,37 @@ func (t *CreateNFTTransaction) SpecialContextCheck() (elaerr.ELAError, bool) {
 	}
 
 	// nft has not been created before
-	if g, ok := state.NFTIDInfoHashMap[nftID]; ok {
+	if nftInfo, ok := state.GetNFTInfo(nftID); ok {
 		log.Warnf("NFT has been create before, side chain genesis block "+
-			"hash: %s", g)
+			"hash: %s", nftInfo.GenesisBlockHash.String())
 		return elaerr.Simple(elaerr.ErrTxPayload,
 			errors.New("NFT has been created before")), true
 	}
 
 	// check the vote rights is enough or not
-	totalVoteRights := state.DposV2VoteRights[*stakeProgramHash]
+	totalVoteRights, _ := state.GetDposV2VoteRights(*stakeProgramHash)
 	var usedCRVotes common.Fixed64
-	if ucv := crState.UsedCRVotes[*stakeProgramHash]; ucv != nil {
+	if ucv := crCommittee.GetUsedCRVotes(*stakeProgramHash); ucv != nil {
 		for _, v := range ucv {
 			usedCRVotes += v.Votes
 		}
 	}
 	var usedCRImpeachmentVotes common.Fixed64
-	if ucv := crState.UsedCRImpeachmentVotes[*stakeProgramHash]; ucv != nil {
+	if ucv := crCommittee.GetUsedCRImpeachmentVotes(*stakeProgramHash); ucv != nil {
 		for _, v := range ucv {
 			usedCRImpeachmentVotes += v.Votes
 		}
 	}
 	var usedCRProposalVotes common.Fixed64
-	if ucv := crState.UsedCRCProposalVotes[*stakeProgramHash]; ucv != nil {
+	if ucv := crCommittee.GetUsedCRCProposalVotes(*stakeProgramHash); ucv != nil {
 		for _, v := range ucv {
 			if usedCRProposalVotes < v.Votes {
 				usedCRProposalVotes = v.Votes
 			}
 		}
 	}
 	var usedDPoSVotes common.Fixed64
-	if udv := state.UsedDposVotes[*stakeProgramHash]; udv != nil {
+	if udv, ok := state.GetUsedDposVotes(*stakeProgramHash); ok {
 		for _, v := range udv {
 			if usedDPoSVotes < v.Votes {
 				usedDPoSVotes = v.Votes
@@ -182,7 +196,7 @@ func (t *CreateNFTTransaction) SpecialContextCheck() (elaerr.ELAError, bool) {
 	}
 
 	blockHeight := t.parameters.BlockHeight
-	if blockHeight < state.DPoSV2ActiveHeight {
+	if blockHeight < state.GetDPoSV2ActiveHeight() {
 		if nftAmount > totalVoteRights-usedDPoSVotes {
 			log.Errorf("vote rights is not enough, nft amount:%s, "+
 				"total vote rights:%s, used DPoS 1.0 votes:%s",

core/transaction/dposv2claimrewardtransaction.go

@@ -98,13 +98,13 @@ func (t *DPoSV2ClaimRewardTransaction) SpecialContextCheck() (elaerr.ELAError, b
 	if err != nil {
 		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("Programs code to address error")), true
 	}
-	claimAmount, ok := t.parameters.BlockChain.GetState().DPoSV2RewardInfo[addr]
+	claimAmount, ok := t.parameters.BlockChain.GetState().GetDPoSV2RewardInfo(addr)
 	if !ok {
 		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("no reward to claim for such address")), true
 	}
 
 	if claimAmount < claimReward.Value {
-		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("claim reward exceeded , max claim reward "+claimAmount.String()+"current:"+ claimAmount.String())), true
+		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("claim reward exceeded , max claim reward "+claimAmount.String()+"current:"+claimAmount.String())), true
 	}
 
 	if claimReward.Value <= t.parameters.Config.CRConfiguration.RealWithdrawSingleFee {

core/transaction/registerproducertransaction.go

@@ -9,14 +9,13 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	state2 "github.com/elastos/Elastos.ELA/dpos/state"
-
 	"github.com/elastos/Elastos.ELA/blockchain"
 	"github.com/elastos/Elastos.ELA/common"
 	"github.com/elastos/Elastos.ELA/core/contract"
 	"github.com/elastos/Elastos.ELA/core/types/payload"
 	crstate "github.com/elastos/Elastos.ELA/cr/state"
 	"github.com/elastos/Elastos.ELA/crypto"
+	state2 "github.com/elastos/Elastos.ELA/dpos/state"
 	elaerr "github.com/elastos/Elastos.ELA/errors"
 	"github.com/elastos/Elastos.ELA/vm"
 )
@@ -201,12 +200,11 @@ func (t *RegisterProducerTransaction) SpecialContextCheck() (elaerr.ELAError, bo
 	state := t.parameters.BlockChain.GetState()
 	if height < t.parameters.Config.DPoSV2StartHeight && t.payloadVersion == payload.ProducerInfoDposV2Version {
 		return elaerr.Simple(elaerr.ErrTxPayload, fmt.Errorf("can not register dposv2 before dposv2 start height")), true
-	} else if height > state.DPoSV2ActiveHeight && t.payloadVersion == payload.ProducerInfoVersion {
+	} else if height > state.GetDPoSV2ActiveHeight() && t.payloadVersion == payload.ProducerInfoVersion {
 		return elaerr.Simple(elaerr.ErrTxPayload, fmt.Errorf("can not register dposv1 after dposv2 active height")), true
 	} else if height < t.parameters.Config.SupportMultiCodeHeight && t.payloadVersion == payload.ProducerInfoMultiVersion {
 		return elaerr.Simple(elaerr.ErrTxPayload, fmt.Errorf("not support ProducerInfoMultiVersion when height is not reach  SupportMultiCodeHeight")), true
 	}
-
 	var ownKeyProgramHash *common.Uint168
 
 	ownKeyProgramHash, err := state2.GetOwnerKeyDepositProgramHash(info.OwnerKey)

core/transaction/returnvotes.go

@@ -103,15 +103,15 @@ func (t *ReturnVotesTransaction) SpecialContextCheck() (result elaerr.ELAError,
 	stakeProgramHash := ct.ToProgramHash()
 	state := t.parameters.BlockChain.GetState()
 	commitee := t.parameters.BlockChain.GetCRCommittee()
-	voteRights := state.DposV2VoteRights[*stakeProgramHash]
+	voteRights, _ := state.GetDposV2VoteRights(*stakeProgramHash)
 	usedDposVoteRights := state.GetUsedDPoSVoteRights(stakeProgramHash)
-	usedDposV2VoteRights := state.UsedDposV2Votes[*stakeProgramHash]
+	usedDposV2VoteRights := state.GetUsedDposV2Votes(*stakeProgramHash)
 	cs := commitee.GetState()
 	usedCRVoteRights := cs.GetUsedCRVoteRights(stakeProgramHash)
 	usedCRImpeachmentVoteRights := cs.GetUsedCRImpeachmentVoteRights(stakeProgramHash)
 	usedCRCProposalVoteRights := cs.GetUsedCRCProposalVoteRights(stakeProgramHash)
 
-	if t.parameters.BlockHeight > state.DPoSV2ActiveHeight {
+	if t.parameters.BlockHeight > state.GetDPoSV2ActiveHeight() {
 		if pl.Value > voteRights-usedDposV2VoteRights ||
 			pl.Value > voteRights-usedCRVoteRights ||
 			pl.Value > voteRights-usedCRImpeachmentVoteRights ||

core/transaction/reverttodpostransaction.go

@@ -115,7 +115,7 @@ func (t *RevertToDPOSTransaction) SpecialContextCheck() (elaerr.ELAError, bool)
 	}
 
 	// to avoid init DPOSWorkHeight repeatedly
-	if t.parameters.BlockChain.GetState().DPOSWorkHeight > t.parameters.BlockHeight {
+	if t.parameters.BlockChain.GetState().GetDPOSWorkHeight() > t.parameters.BlockHeight {
 		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("already receieved  revertodpos")), true
 	}
 

core/transaction/reverttopowtransaction.go

@@ -95,11 +95,11 @@ func (t *RevertToPOWTransaction) SpecialContextCheck() (result elaerr.ELAError,
 			}
 		}
 	case payload.NoProducers:
-		if !t.parameters.BlockChain.GetState().NoProducers {
+		if !t.parameters.BlockChain.GetState().GetNoProducers() {
 			return elaerr.Simple(elaerr.ErrTxPayload, errors.New("current producers is enough")), true
 		}
 	case payload.NoClaimDPOSNode:
-		if !t.parameters.BlockChain.GetState().NoClaimDPOSNode {
+		if !t.parameters.BlockChain.GetState().GetNoClaimDPOSNode() {
 			return elaerr.Simple(elaerr.ErrTxPayload, errors.New("current CR member claimed DPoS node")), true
 		}
 	}

core/transaction/transactionchecker.go

@@ -358,7 +358,7 @@ func (t *DefaultChecker) tryCheckVoteOutputs() error {
 			candidates = []*crstate.Candidate{}
 		}
 		dposv2Run := false
-		if blockHeight >= dposState.DPoSV2ActiveHeight {
+		if blockHeight >= dposState.GetDPoSV2ActiveHeight() {
 			dposv2Run = true
 		}
 		err := t.checkVoteOutputs(blockHeight, txn.Outputs(), t.references,

core/transaction/updateproducertransaction.go

@@ -149,7 +149,7 @@ func (t *UpdateProducerTransaction) SpecialContextCheck() (elaerr.ELAError, bool
 	if producer == nil {
 		return elaerr.Simple(elaerr.ErrTxPayload, errors.New("updating unknown producer")), true
 	}
-	stake := t.parameters.BlockChain.GetState()
+	dposState := t.parameters.BlockChain.GetState()
 	//if producer is already dposv2
 	switch producer.Identity() {
 	case state.DPoSV1:
@@ -173,7 +173,7 @@ func (t *UpdateProducerTransaction) SpecialContextCheck() (elaerr.ELAError, bool
 		}
 
 	case state.DPoSV1V2:
-		if t.parameters.BlockHeight >= stake.DPoSV2ActiveHeight {
+		if t.parameters.BlockHeight >= dposState.GetDPoSV2ActiveHeight() {
 			if t.parameters.BlockHeight > producer.Info().StakeUntil {
 				return elaerr.Simple(elaerr.ErrTxPayload, errors.New("producer already expired and dposv2 already started, can not update anything ")), true
 			}
@@ -246,7 +246,7 @@ func (t *UpdateProducerTransaction) additionalProducerInfoCheck(info *payload.Pr
 			return errors.New("invalid node public key in payload")
 		}
 
-		for _, m := range t.parameters.BlockChain.GetCRCommittee().Members {
+		for _, m := range t.parameters.BlockChain.GetCRCommittee().GetMembers() {
 			if bytes.Equal(m.DPOSPublicKey, info.NodePublicKey) {
 				return errors.New("node public key can't equal with current CR Node PK")
 			}
@@ -255,7 +255,7 @@ func (t *UpdateProducerTransaction) additionalProducerInfoCheck(info *payload.Pr
 			}
 		}
 
-		for _, m := range t.parameters.BlockChain.GetCRCommittee().NextMembers {
+		for _, m := range t.parameters.BlockChain.GetCRCommittee().GetNextMembers() {
 			if bytes.Equal(m.DPOSPublicKey, info.NodePublicKey) {
 				return errors.New("node public key can't equal with next CR Node PK")
 			}