Skip to content

Check two tx #606

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
dylanjeffers merged 3 commits into from
Dec 18, 2025
Merged

Check two tx #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
559d170
Check two tx
raymondjacobson Dec 18, 2025
71605f1
Fix tests
dylanjeffers Dec 18, 2025
8a9b5be
revert prizes claim
dylanjeffers Dec 18, 2025
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
9 changes: 5 additions & 4 deletions api/v1_prizes_claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,16 @@ func (app *ApiServer) v1PrizesClaim(c *fiber.Ctx) error {
default:
}

var exists bool
var count int
// Wait for 2 balance changes to appear in the database (send & receive)
err := app.pool.QueryRow(ctx, `
SELECT EXISTS(SELECT 1 FROM sol_token_account_balance_changes WHERE signature = $1)
`, req.Signature).Scan(&exists)
SELECT COUNT(*) FROM sol_token_account_balance_changes WHERE signature = $1
`, req.Signature).Scan(&count)
if err != nil {
app.logger.Error("Failed to query transaction existence", zap.Error(err))
return fiber.NewError(fiber.StatusInternalServerError, "Database error")
}
if exists {
if count >= 2 {
break
}
time.Sleep(200 * time.Millisecond) // Wait before retrying
Expand Down
45 changes: 45 additions & 0 deletions api/v1_prizes_claim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,15 @@ func TestV1PrizesClaim(t *testing.T) {
`, "wrong_mint_sig", otherMint, validWallet, "account3", -yakClaimAmount, 1000000000000, 12347, time.Now())
require.NoError(t, err)

// Insert second balance change to pass the wait loop (but with wrong mint, so validation will fail)
_, err = app.writePool.Exec(ctx, `
INSERT INTO sol_token_account_balance_changes
(signature, mint, owner, account, change, balance, slot, block_timestamp)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
ON CONFLICT DO NOTHING
`, "wrong_mint_sig", otherMint, prizeReceiverAddress, "receiver_account3", yakClaimAmount, 1000000000000, 12347, time.Now())
require.NoError(t, err)

requestBody := PrizeClaimRequest{
Signature: "wrong_mint_sig",
Wallet: validWallet,
Expand All @@ -306,6 +315,15 @@ func TestV1PrizesClaim(t *testing.T) {
`, "wrong_amount_sig", yakMintAddress, validWallet, "account_wrong_amount", -wrongAmount, 1000000000000, 12350, time.Now())
require.NoError(t, err)

// Insert second balance change to pass the wait loop (but with wrong amount, so validation will fail)
_, err = app.writePool.Exec(ctx, `
INSERT INTO sol_token_account_balance_changes
(signature, mint, owner, account, change, balance, slot, block_timestamp)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
ON CONFLICT DO NOTHING
`, "wrong_amount_sig", yakMintAddress, prizeReceiverAddress, "receiver_account_wrong_amount", wrongAmount, 1000000000000, 12350, time.Now())
require.NoError(t, err)

requestBody := PrizeClaimRequest{
Signature: "wrong_amount_sig",
Wallet: validWallet,
Expand All @@ -331,6 +349,15 @@ func TestV1PrizesClaim(t *testing.T) {
`, "wrong_wallet_sig", yakMintAddress, otherWallet, "account4", -yakClaimAmount, 1000000000000, 12348, time.Now())
require.NoError(t, err)

// Insert second balance change to pass the wait loop (but with wrong wallet, so validation will fail)
_, err = app.writePool.Exec(ctx, `
INSERT INTO sol_token_account_balance_changes
(signature, mint, owner, account, change, balance, slot, block_timestamp)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
ON CONFLICT DO NOTHING
`, "wrong_wallet_sig", yakMintAddress, prizeReceiverAddress, "receiver_account4", yakClaimAmount, 1000000000000, 12348, time.Now())
require.NoError(t, err)

requestBody := PrizeClaimRequest{
Signature: "wrong_wallet_sig",
Wallet: validWallet, // Different wallet
Expand Down Expand Up @@ -405,6 +432,15 @@ func TestV1PrizesClaim(t *testing.T) {
`, "positive_change_sig", yakMintAddress, validWallet, "account7", yakClaimAmount, 1000000000000, 12351, time.Now())
require.NoError(t, err)

// Insert second balance change to pass the wait loop (but user has positive change, so validation will fail)
_, err = app.writePool.Exec(ctx, `
INSERT INTO sol_token_account_balance_changes
(signature, mint, owner, account, change, balance, slot, block_timestamp)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
ON CONFLICT DO NOTHING
`, "positive_change_sig", yakMintAddress, prizeReceiverAddress, "receiver_account7", -yakClaimAmount, 1000000000000, 12351, time.Now())
require.NoError(t, err)

requestBody := PrizeClaimRequest{
Signature: "positive_change_sig",
Wallet: validWallet,
Expand All @@ -430,6 +466,15 @@ func TestV1PrizesClaim(t *testing.T) {
`, "zero_change_sig", yakMintAddress, validWallet, "account8", 0, 1000000000000, 12352, time.Now())
require.NoError(t, err)

// Insert second balance change to pass the wait loop (but user has zero change, so validation will fail)
_, err = app.writePool.Exec(ctx, `
INSERT INTO sol_token_account_balance_changes
(signature, mint, owner, account, change, balance, slot, block_timestamp)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
ON CONFLICT DO NOTHING
`, "zero_change_sig", yakMintAddress, prizeReceiverAddress, "receiver_account8", yakClaimAmount, 1000000000000, 12352, time.Now())
require.NoError(t, err)

requestBody := PrizeClaimRequest{
Signature: "zero_change_sig",
Wallet: validWallet,
Expand Down