Merge branch 'readonlycrosschain' of https://github.com/springrain/xupercore into readonlycrosschain

Author: CodeCmn

bcs/consensus/pow/pow.go

@@ -90,6 +90,8 @@ func NewPoWConsensus(cCtx context.ConsensusCtx, cCfg def.ConsensusConfig) base.C
 	if target > 256 {
 		pow.bitcoinFlag = true
 	}
+	pow.targetBits = target
+	pow.maxDifficulty = big.NewInt(int64(config.MaxTarget))
 	// 重启时需要重新更新目标target
 	tipBlock := cCtx.Ledger.GetTipBlock()
 	if tipBlock.GetHeight() > cCfg.StartHeight {
@@ -101,8 +103,6 @@ func NewPoWConsensus(cCtx context.ConsensusCtx, cCfg def.ConsensusConfig) base.C
 		target = bits
 		cCtx.XLog.Debug("PoW::NewPoWConsensus::refreshDifficulty after restart.")
 	}
-	pow.targetBits = target
-	pow.maxDifficulty = big.NewInt(int64(config.MaxTarget))
 	if pow.bitcoinFlag {
 		// 通过MaxTarget和DefaultTarget解析maxDifficulty和DefaultDifficulty
 		md, fNegative, fOverflow := SetCompact(config.MaxTarget)
@@ -229,7 +229,7 @@ func (pow *PoWConsensus) CheckMinerMatch(ctx xcontext.XContext, block context.Bl
 	if err != nil {
 		ctx.GetLog().Warn("PoW::CheckMinerMatch::verifyECDSA error", "error", err, "miner", string(block.GetProposer()))
 	}
-	if valid && pow.Ledger.GetTipBlock().GetHeight() < block.GetHeight() {
+	if valid && pow.Ledger.QueryTipBlockHeader().GetHeight() < block.GetHeight() {
 		pow.status.newHeight = block.GetHeight()
 		pow.newblock <- block.GetHeight()
 	}
@@ -238,7 +238,7 @@ func (pow *PoWConsensus) CheckMinerMatch(ctx xcontext.XContext, block context.Bl
 
 // ProcessBeforeMiner 更新下一次pow挖矿时的targetBits
 func (pow *PoWConsensus) ProcessBeforeMiner(timestamp int64) ([]byte, []byte, error) {
-	tipHeight := pow.Ledger.GetTipBlock().GetHeight()
+	tipHeight := pow.Ledger.QueryTipBlockHeader().GetHeight()
 	preBlock, err := pow.Ledger.QueryBlockHeaderByHeight(tipHeight)
 	if err != nil {
 		pow.XLog.Error("PoW::ProcessBeforeMiner::cannnot find preBlock", "logid", pow.XLog.GetLogId())
@@ -261,7 +261,7 @@ func (pow *PoWConsensus) ProcessBeforeMiner(timestamp int64) ([]byte, []byte, er
 
 // ProcessConfirmBlock 此处更新最新的block高度
 func (pow *PoWConsensus) ProcessConfirmBlock(block context.BlockInterface) error {
-	if pow.Ledger.GetTipBlock().GetHeight() < block.GetHeight() {
+	if pow.Ledger.QueryTipBlockHeader().GetHeight() < block.GetHeight() {
 		pow.status.newHeight = block.GetHeight()
 	}
 	return nil

bcs/consensus/tdpos/kernel_contract.go

@@ -397,8 +397,14 @@ func (tp *tdposConsensus) runGetTdposInfos(contractCtx contract.KContext) (*cont
 			return common.NewContractErrResponse(common.StatusErr, "Internal error."), err
 		}
 	}
-	r := `{"nominate":` + fmt.Sprintf("%v", nominateValue) + `,"vote":` + fmt.Sprintf("%v", voteMap) + `,"revoke":` + fmt.Sprintf("%v", revokeValue) + `}`
-	return common.NewContractOKResponse([]byte(r)), nil
+
+	return_map := map[string]interface{}{
+		"nominate": nominateValue,
+		"vote":     voteMap,
+		"revoke":   revokeValue,
+	}
+	return_bytes, _ := json.Marshal(return_map)
+	return common.NewContractOKResponse(return_bytes), nil
 }
 
 func (tp *tdposConsensus) checkArgs(txArgs map[string][]byte) (string, error) {

bcs/consensus/tdpos/schedule.go

@@ -157,7 +157,7 @@ func (s *tdposSchedule) GetLeader(round int64) string {
 	if proposers == nil {
 		return ""
 	}
-	addTime := s.calAddTime(round, s.ledger.GetTipBlock().GetHeight())
+	addTime := s.calAddTime(round, s.ledger.QueryTipBlockHeader().GetHeight())
 	_, pos, _ := s.minerScheduling(time.Now().UnixNano() + addTime)
 	if pos >= s.proposerNum {
 		return ""
@@ -222,7 +222,7 @@ func (s *tdposSchedule) CalculateProposers(height int64) ([]string, error) {
 	if height < s.startHeight+3 {
 		return s.initValidators, nil
 	}
-	addTime := s.calAddTime(height, s.ledger.GetTipBlock().GetHeight())
+	addTime := s.calAddTime(height, s.ledger.QueryTipBlockHeader().GetHeight())
 	inputTerm, _, _ := s.minerScheduling(time.Now().UnixNano() + addTime)
 	if s.curTerm == inputTerm {
 		return s.validators, nil
@@ -303,7 +303,7 @@ func (s *tdposSchedule) CalOldProposers(height int64, timestamp int64, storage [
 	if height < s.startHeight+3 {
 		return s.initValidators, nil
 	}
-	tipHeight := s.ledger.GetTipBlock().GetHeight()
+	tipHeight := s.ledger.QueryTipBlockHeader().GetHeight()
 	if tipHeight > height {
 		// 情况一：读取历史值，height对应区块存在于账本中，此时分成历史Key读取和计算差值两部分
 		return s.calHisValidators(height)

bcs/consensus/tdpos/tdpos.go

@@ -92,9 +92,9 @@ func NewTdposConsensus(cCtx cctx.ConsensusCtx, cCfg def.ConsensusConfig) base.Co
 		contractGetTdposInfos:     tdpos.runGetTdposInfos,
 	}
 	for method, f := range tdposKMethods {
-		if _, err := cCtx.Contract.GetKernRegistry().GetKernMethod(schedule.bindContractBucket, method); err != nil {
-			cCtx.Contract.GetKernRegistry().RegisterKernMethod(schedule.bindContractBucket, method, f)
-		}
+		// 若有历史句柄，删除老句柄
+		cCtx.Contract.GetKernRegistry().UnregisterKernMethod(schedule.bindContractBucket, method)
+		cCtx.Contract.GetKernRegistry().RegisterKernMethod(schedule.bindContractBucket, method, f)
 	}
 
 	// 凡属于共识升级的逻辑，新建的Tdpos实例将直接将当前值置为true，原因是上一共识模块已经在当前值生成了高度为trigger height的区块，新的实例会再生成一边
@@ -116,7 +116,7 @@ func NewTdposConsensus(cCtx cctx.ConsensusCtx, cCfg def.ConsensusConfig) base.Co
 		CurrentView: cCfg.StartHeight,
 	}
 	// 重启状态检查1，pacemaker需要重置
-	tipHeight := cCtx.Ledger.GetTipBlock().GetHeight()
+	tipHeight := cCtx.Ledger.QueryTipBlockHeader().GetHeight()
 	if !bytes.Equal(qcTree.GetGenesisQC().In.GetProposalId(), qcTree.GetRootQC().In.GetProposalId()) {
 		pacemaker.CurrentView = tipHeight - 1
 	}
@@ -169,18 +169,18 @@ Again:
 	}
 	// 即现在有可能发生候选人变更，此时需要拿tipHeight-3=H高度的稳定高度当作快照，故input时的高度一定是TipHeight
 	if term > tp.election.curTerm {
-		tp.election.UpdateProposers(tp.election.ledger.GetTipBlock().GetHeight())
+		tp.election.UpdateProposers(tp.election.ledger.QueryTipBlockHeader().GetHeight())
 	}
 	// 查当前term 和 pos是否是自己
 	tp.election.curTerm = term
 	tp.election.miner = tp.election.validators[pos]
 	// master check
 	if tp.election.validators[pos] == tp.election.address {
-		tp.log.Debug("consensus:tdpos:CompeteMaster: now xterm infos", "term", term, "pos", pos, "blockPos", blockPos, "master", true, "height", tp.election.ledger.GetTipBlock().GetHeight())
+		tp.log.Debug("consensus:tdpos:CompeteMaster: now xterm infos", "term", term, "pos", pos, "blockPos", blockPos, "master", true, "height", tp.election.ledger.QueryTipBlockHeader().GetHeight())
 		s := tp.needSync()
 		return true, s, nil
 	}
-	tp.log.Debug("consensus:tdpos:CompeteMaster: now xterm infos", "term", term, "pos", pos, "blockPos", blockPos, "master", false, "height", tp.election.ledger.GetTipBlock().GetHeight())
+	tp.log.Debug("consensus:tdpos:CompeteMaster: now xterm infos", "term", term, "pos", pos, "blockPos", blockPos, "master", false, "height", tp.election.ledger.QueryTipBlockHeader().GetHeight())
 	return false, false, nil
 }
 

bcs/consensus/tdpos/tdpos_test.go

@@ -16,6 +16,7 @@ import (
 
 func getTdposConsensusConf() string {
 	return `{
+		"version": "2",
         "timestamp": "1559021720000000000",
         "proposer_num": "2",
         "period": "3000",
@@ -31,6 +32,7 @@ func getTdposConsensusConf() string {
 
 func getBFTTdposConsensusConf() string {
 	return `{
+		"version": "2",
         "timestamp": "1559021720000000000",
         "proposer_num": "2",
         "period": "3000",

bcs/consensus/xpoa/common.go

@@ -3,6 +3,7 @@ package xpoa
 import (
 	"encoding/json"
 	"errors"
+	"strconv"
 )
 
 var (
@@ -30,7 +31,6 @@ const (
 )
 
 type xpoaConfig struct {
-	Version int64 `json:"version,omitempty"`
 	// 每个候选人每轮出块个数
 	BlockNum int64 `json:"block_num"`
 	// 单位为毫秒
@@ -103,3 +103,28 @@ func (a aksSlice) Less(i, j int) bool {
 	}
 	return a[j].Weight < a[i].Weight
 }
+
+type xpoaStringConfig struct {
+	Version string `json:"version,omitempty"`
+}
+
+type xpoaIntConfig struct {
+	Version int64 `json:"version,omitempty"`
+}
+
+// ParseVersion 支持string格式和int格式的version type
+func ParseVersion(cfg string) (int64, error) {
+	intVersion := xpoaIntConfig{}
+	if err := json.Unmarshal([]byte(cfg), &intVersion); err == nil {
+		return intVersion.Version, nil
+	}
+	strVersion := xpoaStringConfig{}
+	if err := json.Unmarshal([]byte(cfg), &strVersion); err != nil {
+		return 0, err
+	}
+	version, err := strconv.ParseInt(strVersion.Version, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+	return version, nil
+}

bcs/consensus/xpoa/common_test.go

@@ -42,3 +42,40 @@ func TestLoadValidatorsMultiInfo(t *testing.T) {
 		t.Error("TestLoadValidatorsMultiInfo error 2.")
 	}
 }
+
+func TestParseVersion(t *testing.T) {
+	strVersion := `{
+		"version": "2"
+	}`
+	v, err := ParseVersion(strVersion)
+	if err != nil {
+		t.Error("ParseVersion err, err: ", err)
+		return
+	}
+	if v != 2 {
+		t.Error("ParseVersion err, v: ", v)
+		return
+	}
+	intVersion := `{
+		"version": 3
+	}`
+	v, err = ParseVersion(intVersion)
+	if err != nil {
+		t.Error("ParseVersion err, err: ", err)
+		return
+	}
+	if v != 3 {
+		t.Error("ParseVersion err, v: ", v)
+		return
+	}
+	empryVersion := `{}`
+	v, err = ParseVersion(empryVersion)
+	if err != nil {
+		t.Error("ParseVersion err, err: ", err)
+		return
+	}
+	if v != 0 {
+		t.Error("ParseVersion err, v: ", v)
+		return
+	}
+}

bcs/consensus/xpoa/kernel_contract.go

@@ -33,7 +33,25 @@ func (x *xpoaConsensus) methodEditValidates(contractCtx contract.KContext) (*con
 	if err != nil {
 		return common.NewContractErrResponse(common.StatusBadRequest, "invalid acl: pls check accept value."), err
 	}
-	if !x.isAuthAddress(aks, acceptValue) {
+
+	curValiBytes, err := contractCtx.Get(x.election.bindContractBucket,
+		[]byte(fmt.Sprintf("%d_%s", x.election.consensusVersion, validateKeys)))
+	curVali, err := func() ([]string, error) {
+		if err != nil || curValiBytes == nil {
+			return x.election.initValidators, nil
+		}
+		var curValiKey ProposerInfo
+		err = json.Unmarshal(curValiBytes, &curValiKey)
+		if err != nil {
+			x.log.Error("Unmarshal error")
+			return nil, err
+		}
+		return curValiKey.Address, nil
+	}()
+	if err != nil {
+		return common.NewContractErrResponse(common.StatusBadRequest, err.Error()), err
+	}
+	if !x.isAuthAddress(curVali, aks, acceptValue, x.election.enableBFT) {
 		return common.NewContractErrResponse(common.StatusBadRequest, aclErr.Error()), aclErr
 	}
 
@@ -87,10 +105,18 @@ func (x *xpoaConsensus) methodGetValidates(contractCtx contract.KContext) (*cont
 }
 
 // isAuthAddress 判断输入aks是否能在贪心下仍能满足签名数量>33%(Chained-BFT装载) or 50%(一般情况)
-func (x *xpoaConsensus) isAuthAddress(aks map[string]float64, threshold float64) bool {
+func (x *xpoaConsensus) isAuthAddress(validators []string, aks map[string]float64, threshold float64, enableBFT bool) bool {
+	// 0. 是否是单个候选人
+	if len(validators) == 1 {
+		weight, ok := aks[validators[0]]
+		if !ok {
+			return false
+		}
+		return weight >= threshold
+	}
 	// 1. 判断aks中的地址是否是当前集合地址
 	for addr, _ := range aks {
-		if !Find(addr, x.election.validators) {
+		if !Find(addr, validators) {
 			return false
 		}
 	}
@@ -106,15 +132,14 @@ func (x *xpoaConsensus) isAuthAddress(aks map[string]float64, threshold float64)
 	greedyCount := 0
 	sum := threshold
 	for i := 0; i < len(aks); i++ {
-		if sum > 0 {
-			sum -= s[i].Weight
-			greedyCount++
-			continue
+		if sum <= 0 {
+			break
 		}
-		break
+		sum -= s[i].Weight
+		greedyCount++
 	}
-	if !x.election.enableBFT {
-		return greedyCount >= len(x.election.validators)/2+1
+	if !enableBFT {
+		return greedyCount >= len(validators)/2+1
 	}
-	return CalFault(int64(greedyCount), int64(len(x.election.validators)))
+	return CalFault(int64(greedyCount), int64(len(validators)))
 }

bcs/consensus/xpoa/kernel_contract_test.go

@@ -12,23 +12,15 @@ var (
 		"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN": 0.5,
 		"WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT": 0.5,
 	}
-)
-
-func TestIsAuthAddress(t *testing.T) {
-	cCtx, err := prepare(getXpoaConsensusConf())
-	if err != nil {
-		t.Error("prepare error", "error", err)
-		return
-	}
-	i := NewXpoaConsensus(*cCtx, getConfig(getXpoaConsensusConf()))
-	xpoa, ok := i.(*xpoaConsensus)
-	if !ok {
-		t.Error("transfer err.")
+	aks2 = map[string]float64{
+		"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN": 0.5,
+		"WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT": 0.6,
 	}
-	if !xpoa.isAuthAddress(aks, 0.6) {
-		t.Error("isAuthAddress err.")
+	aks3 = map[string]float64{
+		"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN": 0.4,
+		"WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT": 0.6,
 	}
-}
+)
 
 func NewEditArgs() map[string][]byte {
 	a := make(map[string][]byte)
@@ -85,3 +77,36 @@ func TestMethodGetValidates(t *testing.T) {
 		return
 	}
 }
+
+func TestIsAuthAddress(t *testing.T) {
+	cCtx, err := prepare(getXpoaConsensusConf())
+	if err != nil {
+		t.Error("prepare error", "error", err)
+		return
+	}
+	i := NewXpoaConsensus(*cCtx, getConfig(getXpoaConsensusConf()))
+	xpoa, ok := i.(*xpoaConsensus)
+	if !ok {
+		t.Error("transfer err.")
+		return
+	}
+	v1 := []string{"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN", "WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT"}
+	if !xpoa.isAuthAddress(v1, aks, 0.6, false) {
+		t.Error("isAuthAddress err.")
+		return
+	}
+	v2 := []string{"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN"}
+	if xpoa.isAuthAddress(v2, aks2, 0.6, true) {
+		t.Error("isAuthAddress err.")
+		return
+	}
+	v3 := []string{"WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT"}
+	if !xpoa.isAuthAddress(v3, aks2, 0.6, true) {
+		t.Error("isAuthAddress err.")
+		return
+	}
+	v4 := []string{"dpzuVdosQrF2kmzumhVeFQZa1aYcdgFpN", "WNWk3ekXeM5M2232dY2uCJmEqWhfQiDYT"}
+	if !xpoa.isAuthAddress(v4, aks2, 0.7, true) {
+		t.Error("isAuthAddress err.")
+	}
+}

bcs/consensus/xpoa/schedule.go

@@ -34,14 +34,14 @@ type xpoaSchedule struct {
 	ledger cctx.LedgerRely
 }
 
-func NewXpoaSchedule(xconfig *xpoaConfig, cCtx context.ConsensusCtx, startHeight int64) *xpoaSchedule {
+func NewXpoaSchedule(xconfig *xpoaConfig, cCtx context.ConsensusCtx, startHeight, version int64) *xpoaSchedule {
 	s := xpoaSchedule{
 		address:            cCtx.Network.PeerInfo().Account,
 		period:             xconfig.Period,
 		blockNum:           xconfig.BlockNum,
 		startHeight:        startHeight,
 		consensusName:      "poa",
-		consensusVersion:   xconfig.Version,
+		consensusVersion:   version,
 		bindContractBucket: poaBucket,
 		ledger:             cCtx.Ledger,
 		log:                cCtx.XLog,
@@ -99,7 +99,7 @@ func (s *xpoaSchedule) GetLeader(round int64) string {
 	}
 	// 计算round对应的timestamp大致区间
 	nTime := time.Now().UnixNano()
-	if round > s.ledger.GetTipBlock().GetHeight() {
+	if round > s.ledger.QueryTipBlockHeader().GetHeight() {
 		nTime += s.period * int64(time.Millisecond)
 	}
 	_, pos, _ := s.minerScheduling(nTime, len(v))