Skip to content

Improve error messaging in SubmitIntent for supported mints #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffyanta merged 1 commit into from
Jan 20, 2026
Merged

Improve error messaging in SubmitIntent for supported mints #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ocp/currency/usd_market_value.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ import (
// CalculateUsdMarketValue calculates the current USD market value of a crypto
// amount in quarks.
func CalculateUsdMarketValue(ctx context.Context, data ocp_data.Provider, mint *common.Account, quarks uint64, at time.Time) (float64, float64, error) {
_, err := common.GetVmConfigForMint(ctx, data, mint)
if err != nil {
return 0, 0, err
}

usdExchangeRecord, err := data.GetExchangeRate(ctx, currency_lib.USD, at)
if err != nil {
return 0, 0, err
Expand Down
23 changes: 22 additions & 1 deletion ocp/rpc/transaction/intent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,24 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm

// Figure out what kind of intent we're operating on and initialize the intent handler
var intentHandler CreateIntentHandler
switch submitActionsReq.Metadata.Type.(type) {
var protoMint *commonpb.SolanaAccountId
switch typed := submitActionsReq.Metadata.Type.(type) {
case *transactionpb.Metadata_OpenAccounts:
log = log.With(zap.String("intent_type", "open_accounts"))
intentHandler = NewOpenAccountsIntentHandler(s.conf, s.log, s.data, s.antispamGuard)
protoMint = typed.OpenAccounts.Mint
case *transactionpb.Metadata_SendPublicPayment:
log = log.With(zap.String("intent_type", "send_public_payment"))
intentHandler = NewSendPublicPaymentIntentHandler(s.conf, s.log, s.data, s.antispamGuard, s.amlGuard)
protoMint = typed.SendPublicPayment.Mint
case *transactionpb.Metadata_ReceivePaymentsPublicly:
log = log.With(zap.String("intent_type", "receive_payments_publicly"))
intentHandler = NewReceivePaymentsPubliclyIntentHandler(s.conf, s.log, s.data, s.antispamGuard, s.amlGuard)
protoMint = typed.ReceivePaymentsPublicly.Mint
case *transactionpb.Metadata_PublicDistribution:
log = log.With(zap.String("intent_type", "public_distribution"))
intentHandler = NewPublicDistributionIntentHandler(s.conf, s.log, s.data, s.antispamGuard, s.amlGuard)
protoMint = typed.PublicDistribution.Mint
default:
return handleSubmitIntentError(ctx, streamer, intentRecord, status.Error(codes.InvalidArgument, "SubmitIntentRequest.SubmitActions.Metadata is nil"))
}
Expand Down Expand Up @@ -233,6 +238,22 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm
return handleSubmitIntentError(ctx, streamer, intentRecord, NewStaleStateError("intent already exists"))
}

// Global validation on supported mint
mintAccount, err := common.GetBackwardsCompatMint(protoMint)
if err != nil {
log.With(zap.Error(err)).Warn("invalid mint account")
return handleSubmitIntentError(ctx, streamer, intentRecord, err)
}
log = log.With(zap.String("mint", mintAccount.PublicKey().ToBase58()))

_, err = common.GetVmConfigForMint(ctx, s.data, mintAccount)
if err == common.ErrUnsupportedMint {
return handleSubmitIntentError(ctx, streamer, intentRecord, NewIntentValidationError("mint account must be the core mint or a launchpad currency"))
} else if err != nil {
log.With(zap.Error(err)).Warn("failure getting vm config for mint")
return handleSubmitIntentError(ctx, streamer, intentRecord, err)
}

// Populate metadata into the new DB record
err = intentHandler.PopulateMetadata(ctx, intentRecord, submitActionsReq.Metadata)
if err != nil {
Expand Down
Loading