Update CalculateUsdMarketValue to return rate and consider mints beyond core

Author: jeffyanta

pkg/code/async/account/gift_card.go

@@ -305,7 +305,7 @@ func insertAutoReturnIntentRecord(ctx context.Context, data code_data.Provider,
 		return err
 	}
 
-	usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, data, mintAccount, giftCardIssuedIntent.SendPublicPaymentMetadata.Quantity, time.Now())
+	usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, data, mintAccount, giftCardIssuedIntent.SendPublicPaymentMetadata.Quantity, time.Now())
 	if err != nil {
 		return err
 	}

pkg/code/async/geyser/external_deposit.go

@@ -308,7 +308,7 @@ func processPotentialExternalDepositIntoVm(ctx context.Context, data code_data.P
 			return errors.Wrap(err, "invalid owner account")
 		}
 
-		usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, data, common.CoreMintAccount, uint64(deltaQuarksIntoOmnibus), time.Now())
+		usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, data, common.CoreMintAccount, uint64(deltaQuarksIntoOmnibus), time.Now())
 		if err != nil {
 			return errors.Wrap(err, "error calculating usd market value")
 		}

pkg/code/currency/usd_market_value.go

@@ -7,18 +7,31 @@ import (
 	"github.com/code-payments/code-server/pkg/code/common"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
 	currency_lib "github.com/code-payments/code-server/pkg/currency"
+	"github.com/code-payments/code-server/pkg/solana/currencycreator"
 )
 
 // CalculateUsdMarketValue calculates the current USD market value of a crypto
 // amount in quarks.
-func CalculateUsdMarketValue(ctx context.Context, data code_data.Provider, mint *common.Account, quarks uint64, at time.Time) (float64, error) {
+func CalculateUsdMarketValue(ctx context.Context, data code_data.Provider, mint *common.Account, quarks uint64, at time.Time) (float64, float64, error) {
 	usdExchangeRecord, err := data.GetExchangeRate(ctx, currency_lib.USD, at)
 	if err != nil {
-		return 0, err
+		return 0, 0, err
 	}
 
+	pricePerCoreMint := 1.0
+	if mint.PublicKey().ToBase58() != common.CoreMintAccount.PublicKey().ToBase58() {
+		reserveRecord, err := data.GetCurrencyReserveAtTime(ctx, mint.PublicKey().ToBase58(), at)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		pricePerCoreMint, _ = currencycreator.EstimateCurrentPrice(reserveRecord.SupplyFromBonding).Float64()
+	}
+
+	rate := pricePerCoreMint * usdExchangeRecord.Rate
+
 	quarksPerUnit := common.GetMintQuarksPerUnit(mint)
 	units := float64(quarks) / float64(quarksPerUnit)
 	marketValue := usdExchangeRecord.Rate * units
-	return marketValue, nil
+	return marketValue, rate, nil
 }

pkg/code/server/transaction/airdrop.go

@@ -214,7 +214,7 @@ func (s *transactionServer) airdrop(ctx context.Context, intentId string, owner
 	coreMintAmount := nativeAmount / exchangeRateRecord.Rate
 	quarkAmount := uint64(coreMintAmount*float64(common.CoreMintQuarksPerUnit)) + additionalQuarks
 
-	usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, s.data, common.CoreMintAccount, quarkAmount, currency_util.GetLatestExchangeRateTime())
+	usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, s.data, common.CoreMintAccount, quarkAmount, currency_util.GetLatestExchangeRateTime())
 	if err != nil {
 		log.WithError(err).Warn("failure calculating usd market value")
 		return nil, err

pkg/code/server/transaction/intent_handler.go

@@ -355,7 +355,7 @@ func (h *SendPublicPaymentIntentHandler) PopulateMetadata(ctx context.Context, i
 
 	exchangeData := typedProtoMetadata.ExchangeData
 
-	usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, exchangeData.Quarks, currency_util.GetLatestExchangeRateTime())
+	usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, exchangeData.Quarks, currency_util.GetLatestExchangeRateTime())
 	if err != nil {
 		return err
 	}
@@ -893,7 +893,7 @@ func (h *ReceivePaymentsPubliclyIntentHandler) PopulateMetadata(ctx context.Cont
 	}
 	h.cachedGiftCardIssuedIntentRecord = giftCardIssuedIntentRecord
 
-	usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, typedProtoMetadata.Quarks, currency_util.GetLatestExchangeRateTime())
+	usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, typedProtoMetadata.Quarks, currency_util.GetLatestExchangeRateTime())
 	if err != nil {
 		return err
 	}
@@ -1203,7 +1203,7 @@ func (h *PublicDistributionIntentHandler) PopulateMetadata(ctx context.Context,
 		totalQuarks += distribution.Quarks
 	}
 
-	usdMarketValue, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, totalQuarks, currency_util.GetLatestExchangeRateTime())
+	usdMarketValue, _, err := currency_util.CalculateUsdMarketValue(ctx, h.data, mint, totalQuarks, currency_util.GetLatestExchangeRateTime())
 	if err != nil {
 		return err
 	}