Nonce service now allocates nonces across different mainnet use cases

Author: jeffyanta

pkg/code/async/nonce/allocator.go

@@ -16,9 +16,7 @@ import (
 // - Need some level of memory account management with the ability to find a free index
 // - Does not require a vault key record
 
-// todo: Split out Solana mainnet nonce allocation based on use case
-
-func (p *service) generateNonceAccountsOnSolanaMainnet(serviceCtx context.Context) error {
+func (p *service) generateNonceAccountsOnSolanaMainnet(serviceCtx context.Context, purpose nonce.Purpose, desiredPoolSize uint64) error {
 
 	hasWarnedUser := false
 	err := retry.Loop(
@@ -30,7 +28,7 @@ func (p *service) generateNonceAccountsOnSolanaMainnet(serviceCtx context.Contex
 			defer m.End()
 			tracedCtx := newrelic.NewContext(serviceCtx, m)
 
-			num_invalid, err := p.data.GetNonceCountByState(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateInvalid)
+			num_invalid, err := p.data.GetNonceCountByStateAndPurpose(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateInvalid, purpose)
 			if err != nil {
 				return err
 			}
@@ -40,30 +38,30 @@ func (p *service) generateNonceAccountsOnSolanaMainnet(serviceCtx context.Contex
 				return ErrInvalidNonceLimitExceeded
 			}
 
-			num_available, err := p.data.GetNonceCountByState(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateAvailable)
+			num_available, err := p.data.GetNonceCountByStateAndPurpose(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateAvailable, purpose)
 			if err != nil {
 				return err
 			}
 
-			num_claimed, err := p.data.GetNonceCountByState(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateClaimed)
+			num_claimed, err := p.data.GetNonceCountByStateAndPurpose(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateClaimed, purpose)
 			if err != nil {
 				return err
 			}
 
-			num_released, err := p.data.GetNonceCountByState(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateReleased)
+			num_released, err := p.data.GetNonceCountByStateAndPurpose(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateReleased, purpose)
 			if err != nil {
 				return err
 			}
 
-			num_unknown, err := p.data.GetNonceCountByState(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateUnknown)
+			num_unknown, err := p.data.GetNonceCountByStateAndPurpose(tracedCtx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateUnknown, purpose)
 			if err != nil {
 				return err
 			}
 
 			// Get a count of nonces that are available or potentially available
 			// within a short amount of time.
 			num_potentially_available := num_available + num_claimed + num_released + num_unknown
-			if num_potentially_available >= p.conf.solanaMainnetNoncePoolSize.Get(serviceCtx) {
+			if num_potentially_available >= desiredPoolSize {
 				if hasWarnedUser {
 					p.log.Warn("The nonce pool size is reached.")
 					hasWarnedUser = false

pkg/code/async/nonce/config.go

@@ -11,13 +11,17 @@ const (
 	solanaMainnetNoncePubkeyPrefixConfigEnvName = envConfigPrefix + "SOLANA_MAINNET_NONCE_PUBKEY_PREFIX"
 	defaultSolanaMainnetNoncePubkeyPrefix       = "non"
 
-	solanaMainnetNoncePoolSizeConfigEnvName = envConfigPrefix + "SOLANA_MAINNET_NONCE_POOL_SIZE"
-	defaultSolanaMainnetNoncePoolSize       = 1000
+	onDemandTransactiontNoncePoolSizeConfigEnvName = envConfigPrefix + "ON_DEMAND_TRANSACTION_NONCE_POOL_SIZE"
+	defaultOnDemandTransactionNoncePoolSize        = 1000
+
+	clientSwapNoncePoolSizeConfigEnvName = envConfigPrefix + "CLIENT_SWAP_NONCE_POOL_SIZE"
+	defaultClientSwapNoncePoolSize       = 1000
 )
 
 type conf struct {
-	solanaMainnetNoncePubkeyPrefix config.String
-	solanaMainnetNoncePoolSize     config.Uint64
+	solanaMainnetNoncePubkeyPrefix   config.String
+	onDemandTransactionNoncePoolSize config.Uint64
+	clientSwapNoncePoolSize          config.Uint64
 }
 
 // ConfigProvider defines how config values are pulled
@@ -27,8 +31,9 @@ type ConfigProvider func() *conf
 func WithEnvConfigs() ConfigProvider {
 	return func() *conf {
 		return &conf{
-			solanaMainnetNoncePubkeyPrefix: env.NewStringConfig(solanaMainnetNoncePubkeyPrefixConfigEnvName, defaultSolanaMainnetNoncePubkeyPrefix),
-			solanaMainnetNoncePoolSize:     env.NewUint64Config(solanaMainnetNoncePoolSizeConfigEnvName, defaultSolanaMainnetNoncePoolSize),
+			solanaMainnetNoncePubkeyPrefix:   env.NewStringConfig(solanaMainnetNoncePubkeyPrefixConfigEnvName, defaultSolanaMainnetNoncePubkeyPrefix),
+			onDemandTransactionNoncePoolSize: env.NewUint64Config(onDemandTransactiontNoncePoolSizeConfigEnvName, defaultOnDemandTransactionNoncePoolSize),
+			clientSwapNoncePoolSize:          env.NewUint64Config(clientSwapNoncePoolSizeConfigEnvName, defaultClientSwapNoncePoolSize),
 		}
 	}
 }

pkg/code/async/nonce/keys.go

@@ -49,7 +49,7 @@ func (p *service) generateKeys(ctx context.Context) error {
 				return err
 			}
 
-			reserveSize := (p.conf.solanaMainnetNoncePoolSize.Get(ctx) * 2)
+			reserveSize := ((p.conf.onDemandTransactionNoncePoolSize.Get(ctx) + p.conf.clientSwapNoncePoolSize.Get(ctx)) * 2)
 
 			// If we have sufficient keys, don't generate any more.
 			if res >= reserveSize {

pkg/code/async/nonce/service.go

@@ -45,7 +45,8 @@ func (p *service) Start(ctx context.Context, interval time.Duration) error {
 	go p.generateKeys(ctx)
 
 	// Watch the size of the Solana mainnet nonce pool and create accounts if necessary
-	go p.generateNonceAccountsOnSolanaMainnet(ctx)
+	go p.generateNonceAccountsOnSolanaMainnet(ctx, nonce.PurposeOnDemandTransaction, p.conf.onDemandTransactionNoncePoolSize.Get(ctx))
+	go p.generateNonceAccountsOnSolanaMainnet(ctx, nonce.PurposeClientSwap, p.conf.clientSwapNoncePoolSize.Get(ctx))
 
 	// Setup workers to watch for nonce state changes on the Solana side
 	for _, state := range []nonce.State{