Fixes and improvements to nonce service (#115)

Author: jeffyanta

pkg/code/async/nonce/allocator.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"time"
 
+	"github.com/newrelic/go-agent/v3/newrelic"
+
+	"github.com/code-payments/code-server/pkg/code/data/nonce"
 	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/retry"
-	"github.com/code-payments/code-server/pkg/code/data/nonce"
-	"github.com/newrelic/go-agent/v3/newrelic"
 )
 
 func (p *service) generateNonceAccounts(serviceCtx context.Context) error {

pkg/code/async/nonce/keys.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"time"
 
+	"github.com/newrelic/go-agent/v3/newrelic"
+
+	"github.com/code-payments/code-server/pkg/code/data/vault"
 	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/retry"
-	"github.com/code-payments/code-server/pkg/code/data/vault"
-	"github.com/newrelic/go-agent/v3/newrelic"
 )
 
 func (p *service) generateKey(ctx context.Context) (*vault.Record, error) {

pkg/code/async/nonce/pool.go

@@ -8,13 +8,13 @@ import (
 	"github.com/mr-tron/base58/base58"
 	"github.com/newrelic/go-agent/v3/newrelic"
 
+	"github.com/code-payments/code-server/pkg/code/data/nonce"
+	"github.com/code-payments/code-server/pkg/code/data/transaction"
 	"github.com/code-payments/code-server/pkg/database/query"
 	"github.com/code-payments/code-server/pkg/metrics"
 	"github.com/code-payments/code-server/pkg/retry"
 	"github.com/code-payments/code-server/pkg/solana"
 	"github.com/code-payments/code-server/pkg/solana/system"
-	"github.com/code-payments/code-server/pkg/code/data/nonce"
-	"github.com/code-payments/code-server/pkg/code/data/transaction"
 )
 
 func (p *service) worker(serviceCtx context.Context, state nonce.State, interval time.Duration) error {
@@ -131,19 +131,21 @@ func (p *service) handle(ctx context.Context, record *nonce.Record) error {
 func (p *service) handleUnknown(ctx context.Context, record *nonce.Record) error {
 	// Newly created nonces.
 
-	// Check the signature for a potential timeout (e.g. if the nonce account
-	// was never created because the blockchain never saw the init/create
-	// transaction)
-	err := p.checkForMissingTx(ctx, record)
-	if err != nil {
-		return p.markInvalid(ctx, record)
-	}
-
 	// We're going to the blockchain directly here (super slow btw)
 	// because we don't capture the transaction through history yet (it only
 	// grabs transfer style transactions for KIN accounts).
 	stx, err := p.data.GetBlockchainTransaction(ctx, record.Signature, solana.CommitmentFinalized)
-	if err != nil {
+	if err == solana.ErrSignatureNotFound {
+		// Check the signature for a potential timeout (e.g. if the nonce account
+		// was never created because the blockchain never saw the init/create
+		// transaction)
+		err := p.checkForMissingTx(ctx, record)
+		if err != nil {
+			return p.markInvalid(ctx, record)
+		}
+
+		return nil
+	} else if err != nil {
 		return err
 	}
 

pkg/code/async/nonce/util.go

@@ -3,22 +3,24 @@ package async_nonce
 import (
 	"context"
 	"errors"
-	"fmt"
+	"sync"
 	"time"
 
-	"github.com/code-payments/code-server/pkg/solana"
-	"github.com/code-payments/code-server/pkg/solana/memo"
-	"github.com/code-payments/code-server/pkg/solana/system"
+	"github.com/mr-tron/base58/base58"
+
 	"github.com/code-payments/code-server/pkg/code/common"
 	"github.com/code-payments/code-server/pkg/code/data/nonce"
 	"github.com/code-payments/code-server/pkg/code/data/transaction"
 	"github.com/code-payments/code-server/pkg/code/data/vault"
-	"github.com/mr-tron/base58/base58"
+	"github.com/code-payments/code-server/pkg/solana"
+	compute_budget "github.com/code-payments/code-server/pkg/solana/computebudget"
+	"github.com/code-payments/code-server/pkg/solana/system"
 )
 
 var (
 	sigTimeout      = time.Minute * 5
 	sigTimeoutCache = make(map[string]time.Time) // temporary hack
+	sigCacheMu      sync.Mutex
 )
 
 func (p *service) markReleased(ctx context.Context, record *nonce.Record) error {
@@ -148,7 +150,8 @@ func (p *service) createNonceAccountTx(ctx context.Context, nonce *nonce.Record)
 	}
 
 	instructions := []solana.Instruction{
-		memo.Instruction(fmt.Sprintf("nonce:%d", nonce.Id)),
+		compute_budget.SetComputeUnitLimit(10_000),
+		compute_budget.SetComputeUnitPrice(10_000),
 		system.CreateAccount(
 			subPub,
 			noncePub,
@@ -174,6 +177,9 @@ func (p *service) createNonceAccountTx(ctx context.Context, nonce *nonce.Record)
 }
 
 func (p *service) checkForMissingTx(ctx context.Context, nonce *nonce.Record) error {
+	sigCacheMu.Lock()
+	defer sigCacheMu.Unlock()
+
 	// todo: use the DB to store the createdAt time of the nonce account
 
 	t := sigTimeoutCache[nonce.Signature]