Better mint support detection in transaction and messaging services

Author: jeffyanta

pkg/code/common/mint.go

@@ -2,9 +2,12 @@ package common
 
 import (
 	"bytes"
+	"context"
+	"errors"
 
 	commonpb "github.com/code-payments/code-protobuf-api/generated/go/common/v1"
 	"github.com/code-payments/code-server/pkg/code/config"
+	code_data "github.com/code-payments/code-server/pkg/code/data"
 	"github.com/code-payments/code-server/pkg/solana/currencycreator"
 	"github.com/code-payments/code-server/pkg/usdc"
 	"github.com/code-payments/code-server/pkg/usdt"
@@ -17,6 +20,8 @@ var (
 	CoreMintName          = config.CoreMintName
 	CoreMintSymbol        = config.CoreMintSymbol
 
+	ErrUnsupportedMint = errors.New("unsupported mint")
+
 	jeffyMintAccount, _       = NewAccountFromPublicKeyString(config.JeffyMintPublicKey)
 	knicksNightMintAccount, _ = NewAccountFromPublicKeyString(config.KnicksNightMintPublicKey)
 )
@@ -56,3 +61,13 @@ func GetMintQuarksPerUnit(mint *Account) uint64 {
 	}
 	return currencycreator.DefaultMintQuarksPerUnit
 }
+
+func IsSupportedMint(ctx context.Context, data code_data.Provider, mintAccount *Account) (bool, error) {
+	_, err := GetVmConfigForMint(ctx, data, mintAccount)
+	if err == ErrUnsupportedMint {
+		return false, nil
+	} else if err != nil {
+		return false, err
+	}
+	return true, nil
+}

pkg/code/common/vm.go

@@ -2,7 +2,6 @@ package common
 
 import (
 	"context"
-	"errors"
 
 	"github.com/code-payments/code-server/pkg/code/config"
 	code_data "github.com/code-payments/code-server/pkg/code/data"
@@ -79,6 +78,6 @@ func GetVmConfigForMint(ctx context.Context, data code_data.Provider, mint *Acco
 			Mint:      mint,
 		}, nil
 	default:
-		return nil, errors.New("unsupported mint")
+		return nil, ErrUnsupportedMint
 	}
 }

pkg/code/server/messaging/message_handler.go

@@ -90,10 +90,11 @@ func (h *RequestToGiveBillMessageHandler) Validate(ctx context.Context, rendezvo
 		return err
 	}
 
-	switch mintAccount.PublicKey().ToBase58() {
-	case common.CoreMintAccount.PublicKey().ToBase58(), "52MNGpgvydSwCtC2H4qeiZXZ1TxEuRVCRGa8LAfk2kSj":
-	default:
-		return newMessageValidationError("mint account must be the core mint or a launcpad currency")
+	isSupportedMint, err := common.IsSupportedMint(ctx, h.data, mintAccount)
+	if err != nil {
+		return err
+	} else if !isSupportedMint {
+		return newMessageValidationError("mint account must be the core mint or a launchpad currency")
 	}
 
 	return nil

pkg/code/server/transaction/local_simulation.go

@@ -242,7 +242,9 @@ func LocalSimulation(ctx context.Context, data code_data.Provider, actions []*tr
 
 		// Validate authorities and respective derived timelock vault accounts match.
 		vmConfig, err := common.GetVmConfigForMint(ctx, data, mint)
-		if err != nil {
+		if err == common.ErrUnsupportedMint {
+			return nil, NewActionValidationError(action, "mint account must be the core mint or a launchpad currency")
+		} else if err != nil {
 			return nil, err
 		}
 		timelockAccounts, err := authority.GetTimelockAccounts(vmConfig)