Skip to content

Commit

Permalink
update dops api
Browse files Browse the repository at this point in the history
  • Loading branch information
@osoftdeveloper
osoftdeveloper committed Jul 12, 2019
1 parent 979d7fa commit cd0000f
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 71 deletions.
165 changes: 96 additions & 69 deletions consensus/dpos/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"time"

"github.com/ethereum/go-ethereum/log"
"github.com/fractalplatform/fractal/common"
"github.com/fractalplatform/fractal/consensus"
"github.com/fractalplatform/fractal/rpc"
)
Expand Down Expand Up @@ -242,23 +243,22 @@ func (api *API) BrowserAllEpoch() (interface{}, error) {
if epochNumber == 1 {
break
}
// log.Info("BrowserAllEpoch1", "number", epochNumber)
epochNumber = gstate.PreEpoch
// log.Info("BrowserAllEpoch2", "number", epochNumber)
}
return epochs, nil
}

func (api *API) BrowserEpochRecord(reqEpochNumber uint64) (interface{}, error) {
bstart := time.Now()
var req, data uint64
if reqEpochNumber == 0 {
log.Warn("BrowserAccounting 0")
log.Warn("BrowserEpochRecord 0")
return nil, fmt.Errorf("request:0")
}

vote, _ := api.epoch(api.chain.CurrentHeader().Number.Uint64())
if reqEpochNumber > vote {
log.Warn("BrowserAccounting", " request:", reqEpochNumber, "> vote:", vote)
log.Warn("BrowserEpochRecord", " request:", reqEpochNumber, "> vote:", vote)
return nil, fmt.Errorf("request:%d > vote:%d", reqEpochNumber, vote)
}
req = reqEpochNumber
Expand All @@ -267,14 +267,14 @@ func (api *API) BrowserEpochRecord(reqEpochNumber uint64) (interface{}, error) {
if err != nil {
return nil, err
}
log.Info("BrowserAccounting", "req epoch:", req)
log.Info("BrowserEpochRecord", "req epoch:", req)
reqEpoch, err := sys.GetState(req)
if err != nil {
return nil, err
}

data = reqEpoch.PreEpoch
log.Info("BrowserAccounting", "data epoch:", data)
log.Info("BrowserEpochRecord", "data epoch:", data)
timestamp := sys.config.epochTimeStamp(data)
dataEpoch, err := sys.GetState(data)
if err != nil {
Expand All @@ -284,121 +284,148 @@ func (api *API) BrowserEpochRecord(reqEpochNumber uint64) (interface{}, error) {
candidateInfos := ArrayCandidateInfoForBrowser{}
candidateInfos.Data = make([]*CandidateInfoForBrowser, len(dataEpoch.ActivatedCandidateSchedule))

var spare = 7
var activate = 21
// var spare = 7
// var activate = 21
// var magic uint64 = 18446744073709551615
for i, activatedCandidate := range dataEpoch.ActivatedCandidateSchedule {
candidateInfo := &CandidateInfoForBrowser{}
candidateInfo.Candidate = activatedCandidate

curtmp, err := sys.GetCandidate(req, activatedCandidate)
if err != nil {
log.Warn("BrowserAccounting Cur Candidate:", req, " Data not found")
log.Warn("BrowserEpochRecord Cur Candidate:", req, " Data not found")
return nil, fmt.Errorf("Cur Candidate:%d Data not found", req)
}
candidateInfo.NowCounter = curtmp.Counter
candidateInfo.NowActualCounter = curtmp.ActualCounter
if curtmp != nil {
candidateInfo.NowCounter = curtmp.Counter
candidateInfo.NowActualCounter = curtmp.ActualCounter
}

tmp, err := sys.GetCandidate(data, activatedCandidate)
if err != nil {
return nil, err
}
candidateInfo.Quantity = tmp.Quantity.Mul(tmp.Quantity, api.dpos.config.unitStake()).String()
candidateInfo.TotalQuantity = tmp.TotalQuantity.String()
candidateInfo.Counter = tmp.Counter
candidateInfo.ActualCounter = tmp.ActualCounter
if i < activate {
candidateInfo.Status = 1
} else {
candidateInfo.Status = 2
if tmp != nil {
candidateInfo.Quantity = tmp.Quantity.Mul(tmp.Quantity, api.dpos.config.unitStake()).String()
candidateInfo.TotalQuantity = tmp.TotalQuantity.String()
candidateInfo.Counter = tmp.Counter
candidateInfo.ActualCounter = tmp.ActualCounter
}
// candidateInfo.Status

// if i < activate {
// candidateInfo.Status = 1
// } else {
// candidateInfo.Status = 2
// }
if balance, err := sys.GetBalanceByTime(activatedCandidate, timestamp); err != nil {
log.Warn("BrowserAccounting", "candidate", activatedCandidate, "ignore", err)
log.Warn("BrowserEpochRecord", "candidate", activatedCandidate, "ignore", err)
return nil, err
} else {
candidateInfo.Holder = balance.String()
}
candidateInfos.Data[i] = candidateInfo
}

fmt.Println(dataEpoch.BadCandidateIndexSchedule, len(candidateInfos.Data))
if len(dataEpoch.BadCandidateIndexSchedule) > 14 {
log.Warn("BrowserAccounting BadCandidateIndexSchedule > 14", "epoch", data)
return nil, fmt.Errorf("count %d > 14", len(dataEpoch.BadCandidateIndexSchedule))
}
for i := 0; i < len(dataEpoch.BadCandidateIndexSchedule); i++ {
j := i + activate
if i < spare && len(candidateInfos.Data) > j {
// log.Info("***** i", "", i)
// log.Info("***** j", "", j)
// log.Info("***** len", "", len(dataEpoch.BadCandidateIndexSchedule))
candidateInfos.Data[dataEpoch.BadCandidateIndexSchedule[i]].Status = 0
// log.Info("*********")
candidateInfos.Data[j].Status = 1
// log.Info("&&&&&&&&&")
} else {
candidateInfos.Data[dataEpoch.BadCandidateIndexSchedule[i]].Status = 0
// fmt.Println(dataEpoch.BadCandidateIndexSchedule, len(candidateInfos.Data))
// if len(dataEpoch.BadCandidateIndexSchedule) > 14 {
// log.Warn("BrowserEpochRecord BadCandidateIndexSchedule > 14", "epoch", data)
// return nil, fmt.Errorf("count %d > 14", len(dataEpoch.BadCandidateIndexSchedule))
// }
// for i := 0; i < len(dataEpoch.BadCandidateIndexSchedule); i++ {
// j := i + activate
// if i < spare && len(candidateInfos.Data) > j {
// candidateInfos.Data[dataEpoch.BadCandidateIndexSchedule[i]].Status = 0
// candidateInfos.Data[j].Status = 1
// } else {
// candidateInfos.Data[dataEpoch.BadCandidateIndexSchedule[i]].Status = 0
// }
// }
if len(dataEpoch.UsingCandidateIndexSchedule) == 0 {
usingCandidateIndexSchedule := []uint64{}
for index := range dataEpoch.ActivatedCandidateSchedule {
if uint64(index) >= sys.config.CandidateScheduleSize {
break
}
usingCandidateIndexSchedule = append(usingCandidateIndexSchedule, uint64(index))
}
for index, offset := range dataEpoch.BadCandidateIndexSchedule {
usingCandidateIndexSchedule[int(offset)] = sys.config.CandidateScheduleSize + uint64(index)
}
dataEpoch.UsingCandidateIndexSchedule = usingCandidateIndexSchedule
}

// for i, index := range dataEpoch.UsingCandidateIndexSchedule {
// if index == magic {
// candidateInfos.Data[i].Status = 0
// }
// }

candidateInfos.BadCandidateIndexSchedule = dataEpoch.BadCandidateIndexSchedule
candidateInfos.UsingCandidateIndexSchedule = dataEpoch.UsingCandidateIndexSchedule
log.Info("BrowserEpochRecord", "elapsed", common.PrettyDuration(time.Since(bstart)).String())
return candidateInfos, nil
}

func (api *API) BrowserVote() (interface{}, error) {
func (api *API) BrowserVote(reqEpochNumber uint64) (interface{}, error) {
var req, history uint64
bstart := time.Now()
if reqEpochNumber == 0 {
log.Warn("BrowserVote 0")
return nil, fmt.Errorf("request:0")
}
vote, _ := api.epoch(api.chain.CurrentHeader().Number.Uint64())

if reqEpochNumber > vote {
log.Warn("BrowserVote", " request:", reqEpochNumber, "> vote:", vote)
return nil, fmt.Errorf("request:%d > vote:%d", reqEpochNumber, vote)
}
req = reqEpochNumber
log.Info("BrowserVote", "req:", req)
sys, err := api.system()
if err != nil {
return nil, err
}
log.Info("BrowserVote", "vote:", vote)
reqEpoch, err := sys.GetState(vote)

reqEpoch, err := sys.GetState(req)
if err != nil {
return nil, err
}
history = reqEpoch.PreEpoch
log.Info("BrowserVote", "history:", history)
timestamp := sys.config.epochTimeStamp(req)
candidateInfos := ArrayCandidateInfoForBrowser{}
candidates, err := sys.GetCandidates(req)

//history miner rate
prereqEpoch, err := sys.GetState(reqEpoch.PreEpoch)
if err != nil {
return nil, err
}
sort.Sort(candidates)

history := prereqEpoch.PreEpoch
log.Info("BrowserVote", "history:", history)
timestamp := sys.config.epochTimeStamp(vote)

candidateInfos := ArrayCandidateInfoForBrowser{}
candidateInfos.Data = make([]*CandidateInfoForBrowser, len(reqEpoch.ActivatedCandidateSchedule))

for i, activatedCandidate := range reqEpoch.ActivatedCandidateSchedule {
candidateInfos.Data = make([]*CandidateInfoForBrowser, len(candidates))
for i, c := range candidates {
candidateInfo := &CandidateInfoForBrowser{}
candidateInfo.Candidate = activatedCandidate
candidateInfo.Candidate = c.Name

tmp, err := sys.GetCandidate(vote, activatedCandidate)
candidateInfo.Quantity = c.Quantity.Mul(c.Quantity, api.dpos.config.unitStake()).String()
candidateInfo.TotalQuantity = c.TotalQuantity.String()
balance, err := sys.GetBalanceByTime(c.Name, timestamp)
if err != nil {
log.Warn("BrowserVote", "candidate", c.Name, "ignore", err)
return nil, err
}
// candidateInfo.NowCounter = tmp.Counter
// candidateInfo.NowActualCounter = tmp.ActualCounter

candidateInfo.Quantity = tmp.Quantity.Mul(tmp.Quantity, api.dpos.config.unitStake()).String()
candidateInfo.TotalQuantity = tmp.TotalQuantity.String()
candidateInfo.Holder = balance.String()

// candidateInfo.Type
if balance, err := sys.GetBalanceByTime(activatedCandidate, timestamp); err != nil {
log.Warn("Accounting", "candidate", activatedCandidate, "ignore", err)
tmp, err := sys.GetCandidate(history, c.Name)
if err != nil {
return nil, err
} else {
candidateInfo.Holder = balance.String()
}

histmp, err := sys.GetCandidate(history, activatedCandidate)
if err != nil {
return nil, err
if tmp != nil {
candidateInfo.Counter = tmp.Counter
candidateInfo.ActualCounter = tmp.ActualCounter
}
candidateInfo.Counter = histmp.Counter
candidateInfo.ActualCounter = histmp.ActualCounter
candidateInfos.Data[i] = candidateInfo
}
log.Info("BrowserVote", "elapsed", common.PrettyDuration(time.Since(bstart)).String())
return candidateInfos, nil
}

Expand Down
6 changes: 4 additions & 2 deletions consensus/dpos/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,9 @@ type GlobalState struct {

// ArrayCandidateInfoForBrowser dpos state
type ArrayCandidateInfoForBrowser struct {
Data []*CandidateInfoForBrowser `json:"data"`
Data []*CandidateInfoForBrowser `json:"data"`
BadCandidateIndexSchedule []uint64 `json:"bad"`
UsingCandidateIndexSchedule []uint64 `json:"using"`
}

// CandidateInfoForBrowser dpos state
Expand All @@ -198,7 +200,7 @@ type CandidateInfoForBrowser struct {
ActualCounter uint64 `json:"actualCounter"`
NowCounter uint64 `json:"nowShouldCounter"`
NowActualCounter uint64 `json:"nowActualCounter"`
Status uint64 `json:"status"` //0:die 1:activate 2:spare
// Status uint64 `json:"status"` //0:die 1:activate 2:spare
}

// CandidateInfoArray array of candidate
Expand Down

0 comments on commit cd0000f

Please sign in to comment.