Added alternate signing address to /ticketstatus response (#314)

This commit is contained in:
Ukane philemon 2022-01-17 11:50:46 +01:00 committed by GitHub
parent 0b78c9c2da
commit 74aa7bcd13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions

View File

@ -210,6 +210,7 @@ its `feetxstatus` is `confirmed`.
"ticketconfirmed":true, "ticketconfirmed":true,
"feetxstatus":"broadcast", "feetxstatus":"broadcast",
"feetxhash":"e1c02b04b5bbdae66cf8e3c88366c4918d458a2d27a26144df37f54a2bc956ac", "feetxhash":"e1c02b04b5bbdae66cf8e3c88366c4918d458a2d27a26144df37f54a2bc956ac",
"altsignaddress":"Tsfkn6k9AoYgVZRV6ZzcgmuVSgCdJQt9JY2",
"votechoices":{"headercommitments":"no"}, "votechoices":{"headercommitments":"no"},
"request": {"<Copy of request body>"} "request": {"<Copy of request body>"}
} }

View File

@ -34,12 +34,26 @@ func ticketStatus(c *gin.Context) {
return return
} }
// Get altSignAddress from database
altSignAddrData, err := db.AltSignAddrData(ticket.Hash)
if err != nil {
log.Errorf("%s: db.AltSignAddrData error (ticketHash=%s): %v", funcName, ticket.Hash, err)
sendError(errInternalError, c)
return
}
altSignAddr := ""
if altSignAddrData != nil {
altSignAddr = altSignAddrData.AltSignAddr
}
sendJSONResponse(ticketStatusResponse{ sendJSONResponse(ticketStatusResponse{
Timestamp: time.Now().Unix(), Timestamp: time.Now().Unix(),
Request: reqBytes, Request: reqBytes,
TicketConfirmed: ticket.Confirmed, TicketConfirmed: ticket.Confirmed,
FeeTxStatus: string(ticket.FeeTxStatus), FeeTxStatus: string(ticket.FeeTxStatus),
FeeTxHash: ticket.FeeTxHash, FeeTxHash: ticket.FeeTxHash,
AltSignAddress: altSignAddr,
VoteChoices: ticket.VoteChoices, VoteChoices: ticket.VoteChoices,
}, c) }, c)
} }

View File

@ -68,6 +68,7 @@ type ticketStatusResponse struct {
TicketConfirmed bool `json:"ticketconfirmed"` TicketConfirmed bool `json:"ticketconfirmed"`
FeeTxStatus string `json:"feetxstatus"` FeeTxStatus string `json:"feetxstatus"`
FeeTxHash string `json:"feetxhash"` FeeTxHash string `json:"feetxhash"`
AltSignAddress string `json:"altsignaddress"`
VoteChoices map[string]string `json:"votechoices"` VoteChoices map[string]string `json:"votechoices"`
Request []byte `json:"request"` Request []byte `json:"request"`
} }