P2Pool/consensus
P2Pool/consensus
1
1
Fork 0
Code Issues 3 Pull requests Releases Activity

Added sidechain tip state from value to API

Browse source
This commit is contained in:
DataHoarder 2023-03-18 11:28:54 +01:00
parent 7f7c19d38e
commit 90d82e5f80
Signed by: DataHoarder
SSH key fingerprint: SHA256:EnPQOqPpbCa7nzalCEJY2sd9iPluFIBuJu2rDFalACI
4 changed files with 170 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
cmd/p2pool/p2pool.go
View file

@ -2,7 +2,6 @@ package main
import (
"bufio"
"encoding/hex"
"encoding/json"
"flag"
"fmt"
@ -188,7 +187,7 @@ func main() {
} else {
result = append(result, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: hex.EncodeToString(blob),
Blob: blob,
})
}
}
@ -204,16 +203,13 @@ func main() {
})
serveMux.HandleFunc("/sidechain/block_by_template_id/{id:[0-9a-f]+}", func(writer http.ResponseWriter, request *http.Request) {
if templateId, err := types.HashFromString(mux.Vars(request)["id"]); err == nil {
result := types2.P2PoolBinaryBlockResult{
Blob: "",
Error: "",
}
var result types2.P2PoolBinaryBlockResult
if b := instance.SideChain().GetPoolBlockByTemplateId(templateId); b != nil {
result.Version = int(b.ShareVersion())
if blob, err := b.MarshalBinary(); err != nil {
result.Error = err.Error()
} else {
result.Blob = hex.EncodeToString(blob)
result.Blob = blob
}
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
@ -226,17 +222,114 @@ func main() {
_, _ = writer.Write([]byte("[]"))
}
})
serveMux.HandleFunc("/sidechain/tip", func(writer http.ResponseWriter, request *http.Request) {
result := types2.P2PoolBinaryBlockResult{
Blob: "",
Error: "",
serveMux.HandleFunc("/sidechain/state/tip", func(writer http.ResponseWriter, request *http.Request) {
tip := instance.SideChain().GetChainTip()
if tip != nil {
tipId := instance.SideChain().GetChainTip().SideTemplateId(instance.Consensus())
chain, uncles := instance.SideChain().GetPoolBlocksFromTip(tipId)
result := types2.P2PoolSideChainStateResult{
TipHeight: tip.Side.Height,
TipId: tipId,
Chain: make([]types2.P2PoolBinaryBlockResult, 0, len(chain)),
Uncles: make([]types2.P2PoolBinaryBlockResult, 0, len(uncles)),
}
for _, b := range chain {
if blob, err := b.MarshalBinary(); err != nil {
result.Chain = append(result.Chain, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Error: err.Error(),
})
} else {
result.Chain = append(result.Chain, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: blob,
})
}
}
for _, b := range uncles {
if blob, err := b.MarshalBinary(); err != nil {
result.Uncles = append(result.Uncles, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Error: err.Error(),
})
} else {
result.Uncles = append(result.Uncles, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: blob,
})
}
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
buf, _ := encodeJson(request, result)
_, _ = writer.Write(buf)
} else {
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
_, _ = writer.Write([]byte("{}"))
}
})
serveMux.HandleFunc("/sidechain/state/{id:[0-9a-f]+}", func(writer http.ResponseWriter, request *http.Request) {
if templateId, err := types.HashFromString(mux.Vars(request)["id"]); err == nil {
tip := instance.SideChain().GetPoolBlockByTemplateId(templateId)
if tip != nil {
tipId := tip.SideTemplateId(instance.Consensus())
chain, uncles := instance.SideChain().GetPoolBlocksFromTip(tipId)
result := types2.P2PoolSideChainStateResult{
TipHeight: tip.Side.Height,
TipId: tipId,
Chain: make([]types2.P2PoolBinaryBlockResult, 0, len(chain)),
Uncles: make([]types2.P2PoolBinaryBlockResult, 0, len(uncles)),
}
for _, b := range chain {
if blob, err := b.MarshalBinary(); err != nil {
result.Chain = append(result.Chain, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Error: err.Error(),
})
} else {
result.Chain = append(result.Chain, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: blob,
})
}
}
for _, b := range uncles {
if blob, err := b.MarshalBinary(); err != nil {
result.Uncles = append(result.Uncles, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Error: err.Error(),
})
} else {
result.Uncles = append(result.Uncles, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: blob,
})
}
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
buf, _ := encodeJson(request, result)
_, _ = writer.Write(buf)
} else {
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
_, _ = writer.Write([]byte("{}"))
}
} else {
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
_, _ = writer.Write([]byte("{}"))
}
})
serveMux.HandleFunc("/sidechain/tip", func(writer http.ResponseWriter, request *http.Request) {
var result types2.P2PoolBinaryBlockResult
if b := instance.SideChain().GetChainTip(); b != nil {
result.Version = int(b.ShareVersion())
if blob, err := b.MarshalBinary(); err != nil {
result.Error = err.Error()
} else {
result.Blob = hex.EncodeToString(blob)
result.Blob = blob
}
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
@ -255,7 +348,7 @@ func main() {
result.Height = tip.Side.Height
result.Id = tip.SideTemplateId(instance.Consensus())
result.Difficulty = tip.Side.Difficulty
result.CummulativeDifficulty = tip.Side.CumulativeDifficulty
result.CumulativeDifficulty = tip.Side.CumulativeDifficulty
}
writer.Header().Set("Content-Type", "application/json; charset=utf-8")
writer.WriteHeader(http.StatusOK)
@ -282,7 +375,7 @@ func main() {
} else {
result = append(result, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: hex.EncodeToString(blob),
Blob: blob,
})
}
}
@ -313,7 +406,7 @@ func main() {
} else {
result = append(result, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: hex.EncodeToString(blob),
Blob: blob,
})
}
}
@ -330,10 +423,7 @@ func main() {
serveMux.HandleFunc("/archive/block_by_main_id/{id:[0-9a-f]+}", func(writer http.ResponseWriter, request *http.Request) {
if mainId, err := types.HashFromString(mux.Vars(request)["id"]); err == nil {
result := types2.P2PoolBinaryBlockResult{
Blob: "",
Error: "",
}
var result types2.P2PoolBinaryBlockResult
if b := archiveCache.LoadByMainId(mainId); b != nil {
result.Version = int(b.ShareVersion())
if err := archiveCache.ProcessBlock(b); err != nil {
@ -342,7 +432,7 @@ func main() {
if blob, err := b.MarshalBinary(); err != nil {
result.Error = err.Error()
} else {
result.Blob = hex.EncodeToString(blob)
result.Blob = blob
}
}
}
@ -373,7 +463,7 @@ func main() {
} else {
result = append(result, types2.P2PoolBinaryBlockResult{
Version: int(b.ShareVersion()),
Blob: hex.EncodeToString(blob),
Blob: blob,
})
}
}

21
p2pool/sidechain/sidechain.go
View file

@ -825,6 +825,27 @@ func (c *SideChain) getPoolBlocksByHeight(height uint64) []*PoolBlock {
return c.blocksByHeight[height]
}
func (c *SideChain) GetPoolBlocksFromTip(id types.Hash) (chain []*PoolBlock, uncles []*PoolBlock) {
chain = make([]*PoolBlock, 0, c.Consensus().ChainWindowSize*2+monero.BlockTime/c.Consensus().TargetBlockTime)
uncles = make([]*PoolBlock, 0, len(chain)/20)
c.sidechainLock.RLock()
defer c.sidechainLock.RUnlock()
for cur := c.getPoolBlockByTemplateId(id); cur != nil; cur = c.getPoolBlockByTemplateId(cur.Side.Parent) {
for i, uncleId := range cur.Side.Uncles {
if u := c.getPoolBlockByTemplateId(uncleId); u == nil {
//return few uncles than necessary
return chain, uncles[:len(uncles)-i]
} else {
uncles = append(uncles, u)
}
}
chain = append(chain, cur)
}
return chain, uncles
}
func (c *SideChain) GetPoolBlockCount() int {
c.sidechainLock.RLock()
defer c.sidechainLock.RUnlock()

25
p2pool/types/api.go
View file

@ -4,19 +4,26 @@ import (
"git.gammaspectra.live/P2Pool/p2pool-observer/types"
)
type P2PoolSideChainStateResult struct {
TipHeight uint64 `json:"tip_height"`
TipId types.Hash `json:"tip_id"`
Chain []P2PoolBinaryBlockResult `json:"chain"`
Uncles []P2PoolBinaryBlockResult `json:"uncles"`
}
type P2PoolBinaryBlockResult struct {
Version int `json:"version"`
Blob string `json:"blob"`
Error string `json:"error,omitempty"`
Version int `json:"version"`
Blob types.Bytes `json:"blob"`
Error string `json:"error,omitempty"`
}
type P2PoolSideChainStatusResult struct {
Synchronized bool `json:"synchronized"`
Height uint64 `json:"tip_height"`
Id types.Hash `json:"tip_id"`
Difficulty types.Difficulty `json:"difficulty"`
CummulativeDifficulty types.Difficulty `json:"cummulative_difficulty"`
Blocks int `json:"blocks"`
Synchronized bool `json:"synchronized"`
Height uint64 `json:"tip_height"`
Id types.Hash `json:"tip_id"`
Difficulty types.Difficulty `json:"difficulty"`
CumulativeDifficulty types.Difficulty `json:"cumulative_difficulty"`
Blocks int `json:"blocks"`
}
type P2PoolServerStatusResult struct {

22
types/types.go
View file

@ -104,3 +104,25 @@ func (h *Hash) UnmarshalJSON(b []byte) error {
return nil
}
}
type Bytes []byte
func (b Bytes) MarshalJSON() ([]byte, error) {
return json.Marshal(b.String())
}
func (b Bytes) String() string {
return hex.EncodeToString(b)
}
func (b *Bytes) UnmarshalJSON(buf []byte) error {
var s string
if err := json.Unmarshal(buf, &s); err != nil {
return err
}
if buf2, err := hex.DecodeString(s); err != nil {
return err
} else {
*b = append(*b, buf2...)
return nil
}
}