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

Add new getTransactions endpoint and database backend for transactions #174

Merged
merged 11 commits into from
May 23, 2024
Merged

Add new getTransactions endpoint and database backend for transactions #174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26b249b
Increase `getTransaction` window via ingestion into a local database …
Shaptic May 3, 2024
711df2c
Merge branch 'refs/heads/main' into database-backend
aditya1702 May 3, 2024
7eaaf61
Add `getTransactions` endpoint (#136)
aditya1702 May 13, 2024
6436d33
Merge branch 'main' into database-backend
Shaptic May 16, 2024
2e22583
Add documentation on opting into the new db backend (#182)
Shaptic May 16, 2024
6b63080
Merge branch 'main' into database-backend
Shaptic May 16, 2024
b114d1d
Merge branch 'main' into database-backend
aditya1702 May 17, 2024
80c3092
Merge branch 'refs/heads/main' into database-backend
aditya1702 May 17, 2024
e8a73db
Refactor getFeeStats changes to add db changes
aditya1702 May 17, 2024
cdad649
Remove code making `GetLedgerRange` conform to interface (#186)
Shaptic May 17, 2024
3b92fe7
Add changelog entry for `getTransactions` (#183)
Shaptic May 17, 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
6 changes: 4 additions & 2 deletions cmd/soroban-rpc/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type Config struct {
CheckpointFrequency uint32
CoreRequestTimeout time.Duration
DefaultEventsLimit uint
DefaultTransactionsLimit uint
DefaultTransactionsLimit uint
EventLedgerRetentionWindow uint32
FriendbotURL string
HistoryArchiveURLs []string
Expand All @@ -34,7 +34,7 @@ type Config struct {
LogFormat LogFormat
LogLevel logrus.Level
MaxEventsLimit uint
MaxTransactionsLimit uint
MaxTransactionsLimit uint
MaxHealthyLedgerLatency time.Duration
NetworkPassphrase string
PreflightWorkerCount uint
Expand All @@ -52,6 +52,7 @@ type Config struct {
RequestBacklogGetLatestLedgerQueueLimit uint
RequestBacklogGetLedgerEntriesQueueLimit uint
RequestBacklogGetTransactionQueueLimit uint
RequestBacklogGetTransactionsQueueLimit uint
RequestBacklogSendTransactionQueueLimit uint
RequestBacklogSimulateTransactionQueueLimit uint
RequestBacklogGetFeeStatsTransactionQueueLimit uint
Expand All @@ -64,6 +65,7 @@ type Config struct {
MaxGetLatestLedgerExecutionDuration time.Duration
MaxGetLedgerEntriesExecutionDuration time.Duration
MaxGetTransactionExecutionDuration time.Duration
MaxGetTransactionsExecutionDuration time.Duration
MaxSendTransactionExecutionDuration time.Duration
MaxSimulateTransactionExecutionDuration time.Duration
MaxGetFeeStatsExecutionDuration time.Duration
Expand Down
1 change: 1 addition & 0 deletions cmd/soroban-rpc/internal/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/events"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/feewindow"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/ingest"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/ledgerbucketwindow"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/preflight"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/util"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-rpc/internal/jsonrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func NewJSONRPCHandler(cfg *config.Config, params HandlerParams) Handler {
},
{
methodName: "getFeeStats",
underlyingHandler: methods.NewGetFeeStatsHandler(params.FeeStatWindows, ledgerRangeGetter),
underlyingHandler: methods.NewGetFeeStatsHandler(params.FeeStatWindows, params.TransactionReader, params.Logger),
longName: "get_fee_stats",
queueLimit: cfg.RequestBacklogGetFeeStatsTransactionQueueLimit,
requestDurationLimit: cfg.MaxGetFeeStatsExecutionDuration,
Expand Down
12 changes: 10 additions & 2 deletions cmd/soroban-rpc/internal/methods/get_fee_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import (
"context"

"github.com/creachadair/jrpc2"
"github.com/stellar/go/support/log"

"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/db"
"github.com/stellar/soroban-rpc/cmd/soroban-rpc/internal/feewindow"
)

Expand Down Expand Up @@ -56,12 +58,18 @@ type GetFeeStatsResult struct {
}

// NewGetFeeStatsHandler returns a handler obtaining fee statistics
func NewGetFeeStatsHandler(windows *feewindow.FeeWindows, ledgerRangeGetter LedgerRangeGetter) jrpc2.Handler {
func NewGetFeeStatsHandler(windows *feewindow.FeeWindows, reader db.TransactionReader, logger *log.Entry) jrpc2.Handler {
Shaptic marked this conversation as resolved.
Show resolved Hide resolved
return NewHandler(func(ctx context.Context) (GetFeeStatsResult, error) {
ledgerInfo, err := reader.GetLedgerRange(ctx)
if err != nil { // still not fatal
logger.WithError(err).
Error("could not fetch ledger range")
}

result := GetFeeStatsResult{
SorobanInclusionFee: convertFeeDistribution(windows.SorobanInclusionFeeWindow.GetFeeDistribution()),
InclusionFee: convertFeeDistribution(windows.ClassicFeeWindow.GetFeeDistribution()),
LatestLedger: ledgerRangeGetter.GetLedgerRange().LastLedger.Sequence,
LatestLedger: ledgerInfo.LastLedger.Sequence,
}
return result, nil
})
Expand Down
Loading