Skip to content

Commit 747e377

Browse files
jeffyantajeffyanta
committed
Define a new nonce pool for swaps
1 parent 817a550 commit 747e377

File tree

9 files changed

+63
-44
lines changed

9 files changed

+63
-44
lines changed

‎pkg/code/async/nonce/metrics.go‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@ func (p *service) metricsGaugeWorker(ctx context.Context) error {
3333
nonce.StateInvalid,
3434
nonce.StateClaimed,
3535
} {
36-
count, err := p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, common.CodeVmAccount.PublicKey().ToBase58(), state, nonce.PurposeClientTransaction)
36+
count, err := p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, common.CodeVmAccount.PublicKey().ToBase58(), state, nonce.PurposeClientIntent)
3737
if err != nil {
3838
continue
3939
}
40-
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, common.CodeVmAccount.PublicKey().ToBase58(), state, nonce.PurposeClientTransaction, count)
40+
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, common.CodeVmAccount.PublicKey().ToBase58(), state, nonce.PurposeClientIntent, count)
4141

42-
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "Bii3UFB9DzPq6UxgewF5iv9h1Gi8ZnP6mr7PtocHGNta", state, nonce.PurposeClientTransaction)
42+
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "Bii3UFB9DzPq6UxgewF5iv9h1Gi8ZnP6mr7PtocHGNta", state, nonce.PurposeClientIntent)
4343
if err != nil {
4444
continue
4545
}
46-
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "Bii3UFB9DzPq6UxgewF5iv9h1Gi8ZnP6mr7PtocHGNta", state, nonce.PurposeClientTransaction, count)
46+
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "Bii3UFB9DzPq6UxgewF5iv9h1Gi8ZnP6mr7PtocHGNta", state, nonce.PurposeClientIntent, count)
4747

48-
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "9Du5GuKYT21ydLQ9KzUTWWQ7NKdwoXB15y4ypNnnpbJa", state, nonce.PurposeClientTransaction)
48+
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "9Du5GuKYT21ydLQ9KzUTWWQ7NKdwoXB15y4ypNnnpbJa", state, nonce.PurposeClientIntent)
4949
if err != nil {
5050
continue
5151
}
52-
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "9Du5GuKYT21ydLQ9KzUTWWQ7NKdwoXB15y4ypNnnpbJa", state, nonce.PurposeClientTransaction, count)
52+
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "9Du5GuKYT21ydLQ9KzUTWWQ7NKdwoXB15y4ypNnnpbJa", state, nonce.PurposeClientIntent, count)
5353

54-
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "5x9SP9a7dEGxK4xy8kurh8RC2fxvL1DSXhTCdcAMgpdb", state, nonce.PurposeClientTransaction)
54+
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentCvm, "5x9SP9a7dEGxK4xy8kurh8RC2fxvL1DSXhTCdcAMgpdb", state, nonce.PurposeClientIntent)
5555
if err != nil {
5656
continue
5757
}
58-
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "5x9SP9a7dEGxK4xy8kurh8RC2fxvL1DSXhTCdcAMgpdb", state, nonce.PurposeClientTransaction, count)
58+
recordNonceCountEvent(ctx, nonce.EnvironmentCvm, "5x9SP9a7dEGxK4xy8kurh8RC2fxvL1DSXhTCdcAMgpdb", state, nonce.PurposeClientIntent, count)
5959

6060
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, state, nonce.PurposeOnDemandTransaction)
6161
if err != nil {
@@ -68,6 +68,12 @@ func (p *service) metricsGaugeWorker(ctx context.Context) error {
6868
continue
6969
}
7070
recordNonceCountEvent(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, state, nonce.PurposeInternalServerProcess, count)
71+
72+
count, err = p.data.GetNonceCountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, state, nonce.PurposeClientSwap)
73+
if err != nil {
74+
continue
75+
}
76+
recordNonceCountEvent(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, state, nonce.PurposeInternalServerProcess, count)
7177
}
7278

7379
delay = time.Second - time.Since(start)

‎pkg/code/async/sequencer/worker_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ func (e *workerTestEnv) createAnyFulfillmentInState(t *testing.T, state fulfillm
315315
Authority: "code",
316316
Environment: nonce.EnvironmentSolana,
317317
EnvironmentInstance: nonce.EnvironmentInstanceSolanaMainnet,
318-
Purpose: nonce.PurposeClientTransaction,
318+
Purpose: nonce.PurposeClientIntent,
319319
Signature: *fulfillmentRecord.Signature,
320320
State: nonce.StateReserved,
321321
}

‎pkg/code/common/subsidizer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestEstimateUsedSubsidizerBalance(t *testing.T) {
4848
nonceRecord.Authority = "code"
4949
nonceRecord.Environment = nonce.EnvironmentSolana
5050
nonceRecord.EnvironmentInstance = nonce.EnvironmentInstanceSolanaMainnet
51-
nonceRecord.Purpose = nonce.PurposeClientTransaction
51+
nonceRecord.Purpose = nonce.PurposeClientIntent
5252
require.NoError(t, data.SaveNonce(ctx, nonceRecord))
5353
}
5454

‎pkg/code/data/nonce/nonce.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ type Purpose uint8
4343

4444
const (
4545
PurposeUnknown Purpose = iota
46-
PurposeClientTransaction
46+
PurposeClientIntent
4747
PurposeInternalServerProcess
4848
PurposeOnDemandTransaction
49+
PurposeClientSwap
4950
)
5051

5152
type Record struct {
@@ -202,12 +203,14 @@ func (p Purpose) String() string {
202203
switch p {
203204
case PurposeUnknown:
204205
return "unknown"
205-
case PurposeClientTransaction:
206-
return "client_transaction"
206+
case PurposeClientIntent:
207+
return "client_intent"
207208
case PurposeInternalServerProcess:
208209
return "internal_server_process"
209210
case PurposeOnDemandTransaction:
210211
return "on_demand_transaction"
212+
case PurposeClientSwap:
213+
return "client_swap"
211214
}
212215

213216
return "unknown"

‎pkg/code/data/nonce/tests/tests.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func testRoundTrip(t *testing.T, s nonce.Store) {
4747
Blockhash: "test_blockhash",
4848
Environment: nonce.EnvironmentSolana,
4949
EnvironmentInstance: nonce.EnvironmentInstanceSolanaMainnet,
50-
Purpose: nonce.PurposeClientTransaction,
50+
Purpose: nonce.PurposeClientIntent,
5151
State: nonce.StateClaimed,
5252
ClaimNodeID: pointer.String("test_claim_node_id"),
5353
ClaimExpiresAt: pointer.Time(time.Now().Add(time.Hour)),
@@ -276,12 +276,12 @@ func testGetCount(t *testing.T, s nonce.Store) {
276276
ctx := context.Background()
277277

278278
expected := []nonce.Record{
279-
{Address: "t1", Authority: "a1", Blockhash: "b1", State: nonce.StateUnknown, Purpose: nonce.PurposeClientTransaction, Signature: "s1"},
280-
{Address: "t2", Authority: "a2", Blockhash: "b1", State: nonce.StateInvalid, Purpose: nonce.PurposeClientTransaction, Signature: "s2"},
281-
{Address: "t3", Authority: "a3", Blockhash: "b1", State: nonce.StateReserved, Purpose: nonce.PurposeClientTransaction, Signature: "s3"},
282-
{Address: "t4", Authority: "a1", Blockhash: "b2", State: nonce.StateReserved, Purpose: nonce.PurposeClientTransaction, Signature: "s4"},
279+
{Address: "t1", Authority: "a1", Blockhash: "b1", State: nonce.StateUnknown, Purpose: nonce.PurposeClientIntent, Signature: "s1"},
280+
{Address: "t2", Authority: "a2", Blockhash: "b1", State: nonce.StateInvalid, Purpose: nonce.PurposeClientIntent, Signature: "s2"},
281+
{Address: "t3", Authority: "a3", Blockhash: "b1", State: nonce.StateReserved, Purpose: nonce.PurposeClientIntent, Signature: "s3"},
282+
{Address: "t4", Authority: "a1", Blockhash: "b2", State: nonce.StateReserved, Purpose: nonce.PurposeClientIntent, Signature: "s4"},
283283
{Address: "t5", Authority: "a2", Blockhash: "b2", State: nonce.StateReserved, Purpose: nonce.PurposeInternalServerProcess, Signature: "s5"},
284-
{Address: "t6", Authority: "a3", Blockhash: "b2", State: nonce.StateInvalid, Purpose: nonce.PurposeClientTransaction, Signature: "s6"},
284+
{Address: "t6", Authority: "a3", Blockhash: "b2", State: nonce.StateInvalid, Purpose: nonce.PurposeClientIntent, Signature: "s6"},
285285
}
286286

287287
for index, item := range expected {
@@ -312,15 +312,15 @@ func testGetCount(t *testing.T, s nonce.Store) {
312312
require.NoError(t, err)
313313
assert.EqualValues(t, 3, count)
314314

315-
count, err = s.CountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateReserved, nonce.PurposeClientTransaction)
315+
count, err = s.CountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateReserved, nonce.PurposeClientIntent)
316316
require.NoError(t, err)
317317
assert.EqualValues(t, 2, count)
318318

319319
count, err = s.CountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateReserved, nonce.PurposeInternalServerProcess)
320320
require.NoError(t, err)
321321
assert.EqualValues(t, 1, count)
322322

323-
count, err = s.CountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateUnknown, nonce.PurposeClientTransaction)
323+
count, err = s.CountByStateAndPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.StateUnknown, nonce.PurposeClientIntent)
324324
require.NoError(t, err)
325325
assert.EqualValues(t, 1, count)
326326

@@ -337,12 +337,12 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
337337
minExpiry := time.Now().Add(time.Hour).Truncate(time.Millisecond)
338338
maxExpiry := time.Now().Add(2 * time.Hour).Truncate(time.Millisecond)
339339

340-
nonces, err := s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction, 100, "my_node_id", minExpiry, maxExpiry)
340+
nonces, err := s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent, 100, "my_node_id", minExpiry, maxExpiry)
341341
require.Equal(t, nonce.ErrNonceNotFound, err)
342342
require.Empty(t, nonces)
343343

344344
for _, purpose := range []nonce.Purpose{
345-
nonce.PurposeClientTransaction,
345+
nonce.PurposeClientIntent,
346346
nonce.PurposeInternalServerProcess,
347347
} {
348348
for _, state := range []nonce.State{
@@ -396,7 +396,7 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
396396
Blockhash: "bh",
397397
Environment: nonce.EnvironmentCvm,
398398
EnvironmentInstance: "pubkey",
399-
Purpose: nonce.PurposeClientTransaction,
399+
Purpose: nonce.PurposeClientIntent,
400400
State: nonce.StateClaimed,
401401
Signature: "",
402402
ClaimNodeID: pointer.String("other_node_id"),
@@ -407,7 +407,7 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
407407

408408
var claimed []*nonce.Record
409409
for remaining := 75; remaining > 0; {
410-
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction, 10, "my_node_d", minExpiry, maxExpiry)
410+
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent, 10, "my_node_d", minExpiry, maxExpiry)
411411
require.NoError(t, err)
412412
require.Len(t, nonces, min(remaining, 10))
413413

@@ -424,14 +424,14 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
424424
require.LessOrEqual(t, *actual.ClaimExpiresAt, maxExpiry)
425425
require.Equal(t, nonce.EnvironmentSolana, actual.Environment)
426426
require.Equal(t, nonce.EnvironmentInstanceSolanaMainnet, actual.EnvironmentInstance)
427-
require.Equal(t, nonce.PurposeClientTransaction, actual.Purpose)
427+
require.Equal(t, nonce.PurposeClientIntent, actual.Purpose)
428428
require.EqualValues(t, 2, actual.Version)
429429

430430
claimed = append(claimed, actual)
431431
}
432432
}
433433

434-
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction, 10, "my_node_id", minExpiry, maxExpiry)
434+
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent, 10, "my_node_id", minExpiry, maxExpiry)
435435
require.Equal(t, nonce.ErrNonceNotFound, err)
436436
require.Empty(t, nonces)
437437

@@ -442,7 +442,7 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
442442
s.Save(ctx, claimed[i])
443443
}
444444

445-
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction, 30, "my_node_id2", minExpiry, maxExpiry)
445+
nonces, err = s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent, 30, "my_node_id2", minExpiry, maxExpiry)
446446
require.NoError(t, err)
447447
require.Len(t, nonces, 20)
448448

@@ -462,7 +462,7 @@ func testBatchClaimAvailableByPurpose(t *testing.T, s nonce.Store) {
462462
require.LessOrEqual(t, *actual.ClaimExpiresAt, maxExpiry)
463463
require.Equal(t, nonce.EnvironmentSolana, actual.Environment)
464464
require.Equal(t, nonce.EnvironmentInstanceSolanaMainnet, actual.EnvironmentInstance)
465-
require.Equal(t, nonce.PurposeClientTransaction, actual.Purpose)
465+
require.Equal(t, nonce.PurposeClientIntent, actual.Purpose)
466466
require.Equal(t, claimed[i].Address, actual.Address)
467467
require.EqualValues(t, 4, actual.Version)
468468
}
@@ -478,20 +478,20 @@ func testBatchClaimAvailableByPurposeExpirationRandomness(t *testing.T, s nonce.
478478

479479
for i := 0; i < 1000; i++ {
480480
record := &nonce.Record{
481-
Address: fmt.Sprintf("nonce_%s_%s_%d", nonce.PurposeClientTransaction, nonce.StateAvailable, i),
481+
Address: fmt.Sprintf("nonce_%s_%s_%d", nonce.PurposeClientIntent, nonce.StateAvailable, i),
482482
Authority: "authority",
483483
Blockhash: "bh",
484484
Environment: nonce.EnvironmentSolana,
485485
EnvironmentInstance: nonce.EnvironmentInstanceSolanaMainnet,
486-
Purpose: nonce.PurposeClientTransaction,
486+
Purpose: nonce.PurposeClientIntent,
487487
State: nonce.StateAvailable,
488488
Signature: "",
489489
}
490490

491491
require.NoError(t, s.Save(ctx, record))
492492
}
493493

494-
nonces, err := s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction, 1000, "my_node_id", min, max)
494+
nonces, err := s.BatchClaimAvailableByPurpose(ctx, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent, 1000, "my_node_id", min, max)
495495
require.NoError(t, err)
496496
require.Len(t, nonces, 1000)
497497

‎pkg/code/server/transaction/airdrop.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ func (s *transactionServer) airdrop(ctx context.Context, intentId string, owner
273273
noncePool, err := transaction.SelectNoncePool(
274274
nonce.EnvironmentCvm,
275275
common.CodeVmAccount.PublicKey().ToBase58(),
276-
nonce.PurposeClientTransaction,
276+
nonce.PurposeClientIntent,
277277
s.noncePools...,
278278
)
279279
if err != nil {

‎pkg/code/server/transaction/intent.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ func (s *transactionServer) SubmitIntent(streamer transactionpb.Transaction_Subm
402402
noncePool, err := transaction.SelectNoncePool(
403403
nonce.EnvironmentCvm,
404404
vmAccount.PublicKey().ToBase58(),
405-
nonce.PurposeClientTransaction,
405+
nonce.PurposeClientIntent,
406406
s.noncePools...,
407407
)
408408
if err != nil {

‎pkg/code/server/transaction/server.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,21 @@ func NewTransactionServer(
6464
_, err := transaction.SelectNoncePool(
6565
nonce.EnvironmentCvm,
6666
common.CodeVmAccount.PublicKey().ToBase58(),
67-
nonce.PurposeClientTransaction,
67+
nonce.PurposeClientIntent,
6868
noncePools...,
6969
)
7070
if err != nil {
71-
return nil, errors.New("nonce pool for core mint is not provided")
71+
return nil, errors.New("nonce pool for core mint intent operations is not provided")
72+
}
73+
74+
_, err = transaction.SelectNoncePool(
75+
nonce.EnvironmentSolana,
76+
nonce.EnvironmentInstanceSolanaMainnet,
77+
nonce.PurposeClientSwap,
78+
noncePools...,
79+
)
80+
if err != nil {
81+
return nil, errors.New("nonce pool for swap operations is not provided")
7282
}
7383

7484
s := &transactionServer{

‎pkg/code/transaction/nonce_pool_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ func TestLocalNoncePool(t *testing.T) {
4141
func testLocalNoncePoolHappyPath(nt *localNoncePoolTest) {
4242
start := time.Now()
4343

44-
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction)
44+
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent)
4545
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeOnDemandTransaction)
46-
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaDevnet, nonce.PurposeClientTransaction)
47-
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentCvm, testutil.NewRandomAccount(nt.t).PublicKey().ToBase58(), nonce.PurposeClientTransaction)
46+
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaDevnet, nonce.PurposeClientIntent)
47+
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentCvm, testutil.NewRandomAccount(nt.t).PublicKey().ToBase58(), nonce.PurposeClientIntent)
4848

4949
ctx := context.Background()
5050

@@ -72,7 +72,7 @@ func testLocalNoncePoolHappyPath(nt *localNoncePoolTest) {
7272
require.NoError(nt.t, err)
7373
require.Equal(nt.t, actual.Environment, nonce.EnvironmentSolana)
7474
require.Equal(nt.t, actual.EnvironmentInstance, nonce.EnvironmentInstanceSolanaMainnet)
75-
require.Equal(nt.t, actual.Purpose, nonce.PurposeClientTransaction)
75+
require.Equal(nt.t, actual.Purpose, nonce.PurposeClientIntent)
7676
require.Equal(nt.t, actual.State, nonce.StateClaimed)
7777
require.Equal(nt.t, *actual.ClaimNodeID, nt.pool.opts.nodeID)
7878
require.True(nt.t, actual.ClaimExpiresAt.After(start.Add(nt.pool.opts.minExpiration)))
@@ -152,7 +152,7 @@ func testLocalNoncePoolHappyPath(nt *localNoncePoolTest) {
152152
func testLocalNoncePoolReload(nt *localNoncePoolTest) {
153153
ctx := context.Background()
154154

155-
nt.initializeNonces(10*nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction)
155+
nt.initializeNonces(10*nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent)
156156

157157
_, err := nt.pool.load(ctx, nt.pool.opts.desiredPoolSize)
158158
require.NoError(nt.t, err)
@@ -183,7 +183,7 @@ func testLocalNoncePoolReload(nt *localNoncePoolTest) {
183183
func testLocalNoncePoolRefresh(nt *localNoncePoolTest) {
184184
ctx := context.Background()
185185

186-
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction)
186+
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent)
187187

188188
_, err := nt.pool.load(ctx, nt.pool.opts.desiredPoolSize)
189189
require.NoError(nt.t, err)
@@ -216,7 +216,7 @@ func testLocalNoncePoolRefresh(nt *localNoncePoolTest) {
216216
func testLocalNoncePoolReserveWithSignatureEdgeCases(nt *localNoncePoolTest) {
217217
ctx := context.Background()
218218

219-
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientTransaction)
219+
nt.initializeNonces(nt.pool.opts.desiredPoolSize, nonce.EnvironmentSolana, nonce.EnvironmentInstanceSolanaMainnet, nonce.PurposeClientIntent)
220220

221221
_, err := nt.pool.load(ctx, nt.pool.opts.desiredPoolSize)
222222
require.NoError(nt.t, err)
@@ -268,7 +268,7 @@ func newLocalNoncePoolTest(t *testing.T) *localNoncePoolTest {
268268
nil,
269269
nonce.EnvironmentSolana,
270270
nonce.EnvironmentInstanceSolanaMainnet,
271-
nonce.PurposeClientTransaction,
271+
nonce.PurposeClientIntent,
272272
WithNoncePoolRefreshInterval(time.Second),
273273
WithNoncePoolRefreshPoolInterval(2*time.Second),
274274
WithNoncePoolMinExpiration(10*time.Second),

0 commit comments

Comments
 (0)