Skip to content
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

Jump to bottom

Fix not found tx response #90

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Fix not found tx response #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
410bebb
Fix error response
gagliardetto Feb 20, 2024
69edfd4
Add comments
gagliardetto Feb 20, 2024
71a3914
Fix error formatting
gagliardetto Feb 20, 2024
5059d87
If tx not found, return `"result": null` like solana does
gagliardetto Feb 20, 2024
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
23 changes: 12 additions & 11 deletions multiepoch-getTransaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (multi *MultiEpoch) findEpochNumberFromSignature(ctx context.Context, sig s
continue
}
if has, err := bucket.Has(sig); err != nil {
return 0, fmt.Errorf("failed to check if signature exists in bucket: %v", err)
return 0, fmt.Errorf("failed to check if signature exists in bucket: %w", err)
} else if has {
found = append(found, epochNumber)
}
Expand All @@ -81,7 +81,7 @@ func (multi *MultiEpoch) findEpochNumberFromSignature(ctx context.Context, sig s
wg.Spawn(func() (any, error) {
epoch, err := multi.GetEpoch(epochNumber)
if err != nil {
return nil, fmt.Errorf("failed to get epoch %d: %v", epochNumber, err)
return nil, fmt.Errorf("failed to get epoch %d: %w", epochNumber, err)
}
if _, err := epoch.FindCidFromSignature(ctx, sig); err == nil {
return epochNumber, nil
Expand Down Expand Up @@ -118,7 +118,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInvalidParams,
Message: "Invalid params",
}, fmt.Errorf("failed to parse params: %v", err)
}, fmt.Errorf("failed to parse params: %w", err)
}
if err := params.Validate(); err != nil {
return &jsonrpc2.Error{
Expand All @@ -133,15 +133,16 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
epochNumber, err := multi.findEpochNumberFromSignature(ctx, sig)
if err != nil {
if errors.Is(err, ErrNotFound) {
// solana just returns null here in case of transaction not found: {"jsonrpc":"2.0","result":null,"id":1}
return &jsonrpc2.Error{
Code: CodeNotFound,
Message: fmt.Sprintf("Epoch %d is not available from this RPC", epochNumber),
}, fmt.Errorf("failed to find epoch number from signature %s: %v", sig, err)
Message: "Transaction not found",
}, fmt.Errorf("failed to find epoch number from signature %s: %w", sig, err)
}
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInternalError,
Message: "Internal error",
}, fmt.Errorf("failed to get epoch for signature %s: %v", sig, err)
}, fmt.Errorf("failed to get epoch for signature %s: %w", sig, err)
}
klog.V(4).Infof("Found signature %s in epoch %d in %s", sig, epochNumber, time.Since(startedEpochLookupAt))

Expand All @@ -156,7 +157,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
transactionNode, transactionCid, err := epochHandler.GetTransaction(WithSubrapghPrefetch(ctx, true), sig)
if err != nil {
if errors.Is(err, compactindexsized.ErrNotFound) {
// NOTE: solana just returns null here in case of transaction not found
// NOTE: solana just returns null here in case of transaction not found: {"jsonrpc":"2.0","result":null,"id":1}
return &jsonrpc2.Error{
Code: CodeNotFound,
Message: "Transaction not found",
Expand All @@ -165,7 +166,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInternalError,
Message: "Internal error",
}, fmt.Errorf("failed to get Transaction: %v", err)
}, fmt.Errorf("failed to get Transaction: %w", err)
}
{
conn.ctx.Response.Header.Set("DAG-Root-CID", transactionCid.String())
Expand All @@ -180,7 +181,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInternalError,
Message: "Internal error",
}, fmt.Errorf("failed to get block: %v", err)
}, fmt.Errorf("failed to get block: %w", err)
}
blocktime := uint64(block.Meta.Blocktime)
if blocktime != 0 {
Expand All @@ -198,7 +199,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInternalError,
Message: "Internal error",
}, fmt.Errorf("failed to decode transaction: %v", err)
}, fmt.Errorf("failed to decode transaction: %w", err)
}
response.Signatures = tx.Signatures
if tx.Message.IsVersioned() {
Expand All @@ -213,7 +214,7 @@ func (multi *MultiEpoch) handleGetTransaction(ctx context.Context, conn *request
return &jsonrpc2.Error{
Code: jsonrpc2.CodeInternalError,
Message: "Internal error",
}, fmt.Errorf("failed to encode transaction: %v", err)
}, fmt.Errorf("failed to encode transaction: %w", err)
}
response.Transaction = encodedTx
}
Expand Down
20 changes: 15 additions & 5 deletions multiepoch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"context"
"errors"
"fmt"
"net/http"
"sort"
Expand Down Expand Up @@ -401,11 +402,20 @@ func newMultiEpochHandler(handler *MultiEpoch, lsConf *ListenerConfig) func(ctx
metrics_methodToNumProxied.WithLabelValues(sanitizeMethod(method)).Inc()
return
} else {
rqCtx.ReplyWithError(
reqCtx,
rpcRequest.ID,
errorResp,
)
if errors.Is(err, ErrNotFound) {
// reply with null result
rqCtx.ReplyRaw(
reqCtx,
rpcRequest.ID,
nil,
)
} else {
rqCtx.ReplyWithError(
reqCtx,
rpcRequest.ID,
errorResp,
)
}
}
return
}
Expand Down
Loading