Skip to content

Commit

Permalink
v0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wlsaud619 committed Sep 30, 2019
1 parent 0a681fb commit ebd0573
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 79 deletions.
4 changes: 2 additions & 2 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ network = "cosmos"

# RPC-Server
[rpc]
address = "0.:26657"
address = "0:26657"

# Rest-server
[rest_server]
address = "0.:1317"
address = "0:1317"

[validator_info]
operatorAddress = "cosmosvaloper14l0fp639yudfl46zauvv8rkzjgd4u0zk2aseys"
Expand Down
16 changes: 10 additions & 6 deletions function/block/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ func BlockStatus() t.BlockStatus {

var blockStatus t.BlockStatus

cmd := "curl -s " + t.RpcServer + "/block"
cmd := "curl -s " + t.RestServer + "/blocks/latest"
out, _ := exec.Command("/bin/bash", "-c", cmd).Output()
json.Unmarshal(out, &blockStatus)

currentBlockHeight, _ := strconv.Atoi(blockStatus.Result.Block.Header.Height)
currentBlockHeight, _ := strconv.Atoi(blockStatus.Block.Header.Height)


// 현재 precommit 정보와 현재 blockHeight를 맞추기 위해 이전 블록 정보로 표시
blockStatus = previousBlockStatus(currentBlockHeight - 1)


return blockStatus

}
Expand All @@ -33,10 +35,11 @@ func previousBlockStatus(blockHeight int) t.BlockStatus {

var blockStatus t.BlockStatus

cmd := "curl -s " + t.RpcServer + "/block?height=" + fmt.Sprint(blockHeight)
cmd := "curl -s " + t.RestServer + "/blocks/" + fmt.Sprint(blockHeight)
out, _ := exec.Command("/bin/bash", "-c", cmd).Output()
json.Unmarshal(out, &blockStatus)


return blockStatus

}
Expand All @@ -45,11 +48,12 @@ func CalcBlockTime(currentBlockStatus t.BlockStatus) float64 {

var blockTime float64

currentBlockHeight, _ := strconv.Atoi(currentBlockStatus.Result.Block.Header.Height)

currentBlockHeight, _ := strconv.Atoi(currentBlockStatus.Block.Header.Height)
previousBlockHeight := currentBlockHeight - 1

currentBlockTime := currentBlockStatus.Result.Block.Header.Time
previousBlockTime := previousBlockStatus(previousBlockHeight).Result.Block.Header.Time
currentBlockTime := currentBlockStatus.Block.Header.Time
previousBlockTime := previousBlockStatus(previousBlockHeight).Block.Header.Time

if previousBlockTime.IsZero() {
blockTime = 0.0
Expand Down
20 changes: 0 additions & 20 deletions function/consensus/consensus.go

This file was deleted.

27 changes: 9 additions & 18 deletions function/exporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

block "github.com/node-a-team/cosmos-validator_exporter/function/block"
commit "github.com/node-a-team/cosmos-validator_exporter/function/commit"
consensus "github.com/node-a-team/cosmos-validator_exporter/function/consensus"
minting "github.com/node-a-team/cosmos-validator_exporter/function/minting"
keyutil "github.com/node-a-team/cosmos-validator_exporter/function/keyutil"
staking "github.com/node-a-team/cosmos-validator_exporter/function/staking"
Expand Down Expand Up @@ -79,19 +78,20 @@ func Exporter() {
for {

blockStatus := block.BlockStatus()
currentBlockHeight, _ := strconv.Atoi(blockStatus.Result.Block.Header.Height)
consensusStatus := consensus.ConsensusStatus()
currentBlockHeight, _ := strconv.Atoi(blockStatus.Block.Header.Height)
// consensusStatus := consensus.ConsensusStatus()
commitStatus := commit.CommitStatus(currentBlockHeight)
mintingParamsStatus := minting.MintingParamsStatus()


// validators
validatorCountOrigin, validatorsetsStatus := validators.ValidatorsetsStatus()
validatorsStatus := validators.ValidatorsStatus()

// block
chainId := blockStatus.Result.Block.Header.Chain_id
blockTime := blockStatus.Result.Block.Header.Time.Format("060102 15:04:05")
blockHeight := utils.StringToFloat64(blockStatus.Result.Block.Header.Height)
chainId := blockStatus.Block.Header.Chain_id
blockTime := blockStatus.Block.Header.Time.Format("060102 15:04:05")
blockHeight := utils.StringToFloat64(blockStatus.Block.Header.Height)
currentBlockTime := block.CalcBlockTime(blockStatus)

// minting
Expand All @@ -107,8 +107,8 @@ func Exporter() {
// commit
precommitRate := commit.PrecommitRate(commitStatus) * 100
validatorCount := float64(validatorCountOrigin)
proposerConsHexAddress := blockStatus.Result.Block.Header.Proposer_address
proposerMoniker := block.ProposerMoniker(blockStatus.Result.Block.Header.Proposer_address, validatorsetsStatus, validatorsStatus)
proposerConsHexAddress := blockStatus.Block.Header.Proposer_address
proposerMoniker := block.ProposerMoniker(blockStatus.Block.Header.Proposer_address, validatorsetsStatus, validatorsStatus)
proposerWalletAccountNumber := float64(0.0)

// staking
Expand All @@ -120,11 +120,6 @@ func Exporter() {
totalBondedTokens := totalBondedTokensOrigin / math.Pow10(6)
bondedRate := bondedTokensOrigin / totalBondedTokensOrigin

// consensus
latestRound := len(consensusStatus.Result.Round_state.Height_vote_set) - 1
heightRoundStep := consensusStatus.Result.Round_state.Status
prevotes := consensusStatus.Result.Round_state.Height_vote_set[latestRound].Prevotes_bit_array
precommit := consensusStatus.Result.Round_state.Height_vote_set[latestRound].Precommits_bit_array

// csv file export(validatorsAccountNumber)
if fileExportChecker == 0 || int(blockHeight)%baseBlockForFileExport == 0 {
Expand Down Expand Up @@ -195,7 +190,7 @@ func Exporter() {
consHexAddress := keyutil.RunFromBech32(consBech32Address)

// etc
proposingStatus := float64(utils.GetPoposingCheck(blockStatus.Result.Block.Header.Proposer_address, consHexAddress))
proposingStatus := float64(utils.GetPoposingCheck(blockStatus.Block.Header.Proposer_address, consHexAddress))
delegatorCount, selfDelegationAmountOrigin := validators.ValidatorDelegatorNumber(operatorAddress, accountAddress)
delegationRatio := delegatorShares / bondedTokens
selfDelegationAmount := selfDelegationAmountOrigin / math.Pow10(6)
Expand All @@ -214,10 +209,6 @@ func Exporter() {
fmt.Printf(" - Proposer: %s(%s)\n", proposerMoniker, proposerConsHexAddress)
fmt.Printf(" - PrecommitRate: %f\n", precommitRate)

fmt.Println(" - height/round/step:", heightRoundStep)
fmt.Println(" - prevotes:", prevotes)
fmt.Println(" - precommit: ", precommit)

fmt.Println("\n - notBondedTokens: ", notBondedTokens)
fmt.Println(" - bondedTokens: ", bondedTokens)
fmt.Println(" - totalTokens: ", totalBondedTokens)
Expand Down
5 changes: 0 additions & 5 deletions types/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ import (
)

type BlockStatus struct {
Result BlockResult `json:"result"`
// Block Block
}

type BlockResult struct {
Block Block
}

Expand Down
28 changes: 0 additions & 28 deletions types/consensus.go

This file was deleted.

0 comments on commit ebd0573

Please sign in to comment.