Merge pull request #2467 from fluidity-money/develop-utility-category

use correct category when creating pending winners
fluidity-money · Dec 21, 2023 · 1a15d9c · 1a15d9c
2 parents 928fa97 + 7c0966e
commit 1a15d9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/databases/timescale/spooler/spooler.go b/lib/databases/timescale/spooler/spooler.go
@@ -33,7 +33,8 @@ func CreatePendingWinners(winner worker.EthereumWinnerAnnouncement, tokenDetails
 	var (
 		pendingWinners []PendingWinner
 
-		fluidTokenDetails = winner.TokenDetails
+		fluidTokenDetails   = winner.TokenDetails
+		fluidTokenShortName = fluidTokenDetails.TokenShortName
 
 		network_           = winner.Network
 		hash               = winner.TransactionHash
@@ -111,6 +112,7 @@ func CreatePendingWinners(winner worker.EthereumWinnerAnnouncement, tokenDetails
 
 		// create the recipient
 		pendingWinners = append(pendingWinners, PendingWinner{
+			Category:        fluidTokenShortName,
 			TokenDetails:    details,
 			TransactionHash: hash,
 			SenderAddress:   recipientAddress,
@@ -171,7 +173,7 @@ func InsertPendingWinners(pendingWinners []PendingWinner) {
 		var (
 			fluidTokenDetails = pendingWinner.TokenDetails
 
-			fluidTokenShortName = fluidTokenDetails.TokenShortName
+			category            = pendingWinner.Category
 			hash                = pendingWinner.TransactionHash
 			senderAddress       = pendingWinner.SenderAddress
 			nativeWinAmount     = pendingWinner.NativeWinAmount
@@ -185,7 +187,7 @@ func InsertPendingWinners(pendingWinners []PendingWinner) {
 		)
 		_, err := timescaleClient.Exec(
 			statementText,
-			fluidTokenShortName,
+			category,
 			fluidTokenDetails.TokenShortName,
 			fluidTokenDetails.TokenDecimals,
 			hash,

diff --git a/lib/types/winners/winners.go b/lib/types/winners/winners.go
@@ -56,6 +56,8 @@ type BlockedWinner struct {
 
 // PendingWinner is a winner that has been spooled but not sent
 type PendingWinner struct {
+	// Category is the TokenShortName of the corresponding token (e.g. USDC)
+	Category        string                     `json:"category"`
 	TokenDetails    token_details.TokenDetails `json:"token_details"`
 	TransactionHash ethereum.Hash              `json:"transaction_hash"`
 	SenderAddress   ethereum.Address           `json:"sender_address"`