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

ZMQ: Alter minimal txpool data to include all fields

Browse source
This commit is contained in:
DataHoarder 2023-05-31 12:16:20 +02:00
parent 27f65692be
commit 879f15515c
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
monero/client/zmq/types.go
View file

@ -61,11 +61,6 @@ type FullChainMain struct {
TxHashes []types.Hash `json:"tx_hashes"`
}
type MinimalTxPoolAdd struct {
ID types.Hash `json:"id"`
BlobSize uint64 `json:"blob_size"`
}
type FullTxPoolAdd struct {
Version int `json:"version"`
UnlockTime int64 `json:"unlock_time"`

10
monero/client/zmq/zmq.go
View file

@ -44,7 +44,7 @@ type Stream struct {
FullTxPoolAddC chan *FullTxPoolAdd
FullMinerDataC chan *FullMinerData
MinimalChainMainC chan *MinimalChainMain
MinimalTxPoolAddC chan *MinimalTxPoolAdd
MinimalTxPoolAddC chan []TxMempoolData
}
// Listen listens for a list of topics pre-configured for this client (via NewClient).
@ -65,7 +65,7 @@ func (c *Client) Listen(ctx context.Context) (*Stream, error) {
FullTxPoolAddC: make(chan *FullTxPoolAdd),
FullMinerDataC: make(chan *FullMinerData),
MinimalChainMainC: make(chan *MinimalChainMain),
MinimalTxPoolAddC: make(chan *MinimalTxPoolAdd),
MinimalTxPoolAddC: make(chan []TxMempoolData),
}
go func() {
@ -207,14 +207,12 @@ func (c *Client) transmitMinimalChainMain(stream *Stream, gson []byte) error {
}
func (c *Client) transmitMinimalTxPoolAdd(stream *Stream, gson []byte) error {
var arr []*MinimalTxPoolAdd
var arr []TxMempoolData
if err := utils.UnmarshalJSON(gson, &arr); err != nil {
return fmt.Errorf("unmarshal: %w", err)
}
for _, element := range arr {
stream.MinimalTxPoolAddC <- element
}
stream.MinimalTxPoolAddC <- arr
return nil
}