Improve chat message timing in Geyser (#56)

Author: jeffyanta

pkg/code/async/geyser/external_deposit.go

@@ -186,6 +186,11 @@ func processPotentialExternalDeposit(ctx context.Context, conf *conf, data code_
 		return errors.Wrap(err, "invalid owner account")
 	}
 
+	blockTime := time.Now()
+	if tokenBalances.BlockTime != nil {
+		blockTime = *tokenBalances.BlockTime
+	}
+
 	// Use the account type to determine how we'll process this external deposit
 	//
 	// todo: Below logic is beginning to get messy and might be in need of a
@@ -247,7 +252,7 @@ func processPotentialExternalDeposit(ctx context.Context, conf *conf, data code_
 		}
 
 		if isCodeSwap {
-			chatMessage, err := chat_util.ToKinAvailableForUseMessage(signature, usdcQuarksSwapped, time.Now())
+			chatMessage, err := chat_util.ToKinAvailableForUseMessage(signature, usdcQuarksSwapped, blockTime)
 			if err != nil {
 				return errors.Wrap(err, "error creating chat message")
 			}
@@ -306,8 +311,7 @@ func processPotentialExternalDeposit(ctx context.Context, conf *conf, data code_
 	case commonpb.AccountType_SWAP:
 		bestEffortCacheExternalAccountBalance(ctx, data, tokenAccount, tokenBalances)
 
-		// todo: solana client doesn't return block time
-		chatMessage, err := chat_util.ToUsdcDepositedMessage(signature, uint64(deltaQuarks), time.Now())
+		chatMessage, err := chat_util.ToUsdcDepositedMessage(signature, uint64(deltaQuarks), blockTime)
 		if err != nil {
 			return errors.Wrap(err, "error creating chat message")
 		}

pkg/code/async/geyser/messenger.go

@@ -3,6 +3,7 @@ package async_geyser
 import (
 	"context"
 	"slices"
+	"time"
 
 	"github.com/mr-tron/base58"
 	"github.com/pkg/errors"
@@ -155,7 +156,11 @@ func processPotentialBlockchainMessage(ctx context.Context, data code_data.Provi
 				return errors.Wrap(err, "invalid owner account")
 			}
 
-			chatMessage, err := chat_util.ToBlockchainMessage(signature, feePayer, blockchainMessage, *txn.BlockTime)
+			blockTime := time.Now()
+			if txn.BlockTime != nil {
+				blockTime = *txn.BlockTime
+			}
+			chatMessage, err := chat_util.ToBlockchainMessage(signature, feePayer, blockchainMessage, blockTime)
 			if err != nil {
 				return errors.Wrap(err, "error creating proto message")
 			}

pkg/solana/client.go

@@ -146,6 +146,7 @@ type TransactionTokenBalances struct {
 	PreTokenBalances  []TokenBalance
 	PostTokenBalances []TokenBalance
 	Slot              uint64
+	BlockTime         *time.Time
 }
 
 type ConfirmedTransaction struct {
@@ -642,6 +643,7 @@ func (c *client) GetTransactionTokenBalances(sig Signature) (TransactionTokenBal
 				AccountKeys []string `json:"accountKeys"`
 			} `json:"message"`
 		} `json:"transaction"`
+		BlockTime *int64 `json:"blockTime"`
 	}
 
 	var resp *rpcResp
@@ -666,6 +668,10 @@ func (c *client) GetTransactionTokenBalances(sig Signature) (TransactionTokenBal
 		PostTokenBalances: resp.Meta.PostTokenBalances,
 		Slot:              resp.Slot,
 	}
+	if resp.BlockTime != nil {
+		txTime := time.Unix(*resp.BlockTime, 0)
+		tokenBalances.BlockTime = &txTime
+	}
 	return tokenBalances, nil
 }