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

API: Hotfix block endpoint #1397

Merged
merged 5 commits into from
Jan 3, 2023
Merged

API: Hotfix block endpoint #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9df41f9
Filter out inner txns from GetBlock sql queries
Eric-Warehime Jan 3, 2023
f2f1f65
Remove unneccessary check
Eric-Warehime Jan 3, 2023
ae6edd2
Update idb/postgres/postgres.go
Eric-Warehime Jan 3, 2023
65241c6
Fix transaction builder
Eric-Warehime Jan 3, 2023
1f154fc
Update txn builder logic
Eric-Warehime Jan 3, 2023
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
5 changes: 0 additions & 5 deletions api/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,11 +1359,6 @@ func (si *ServerImplementation) fetchBlock(ctx context.Context, round uint64, op

results := make([]generated.Transaction, 0)
for _, txrow := range transactions {
// Do not include inner transactions.
if txrow.RootTxn != nil {
continue
}

tx, err := txnRowToTransaction(txrow)
if err != nil {
return err
Expand Down
4 changes: 4 additions & 0 deletions idb/idb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ type TransactionFilter struct {
// instead of the root txn.
ReturnInnerTxnOnly bool

// If this flag is set to true, then the query returns only root txns
// and no inner txns
ReturnRootTxnsOnly bool

// If this flag is set to true, then the query returns the block excluding
// the transactions
HeaderOnly bool
Expand Down
9 changes: 6 additions & 3 deletions idb/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ func (db *IndexerDb) GetBlock(ctx context.Context, round uint64, options idb.Get

if options.Transactions {
out := make(chan idb.TxnRow, 1)
query, whereArgs, err := buildTransactionQuery(idb.TransactionFilter{Round: &round, Limit: options.MaxTransactionsLimit + 1})
query, whereArgs, err := buildTransactionQuery(idb.TransactionFilter{Round: &round, Limit: options.MaxTransactionsLimit + 1, ReturnRootTxnsOnly: true})
if err != nil {
err = fmt.Errorf("txn query err %v", err)
out <- idb.TxnRow{Error: err}
Expand Down Expand Up @@ -658,9 +658,12 @@ func buildTransactionQuery(tf idb.TransactionFilter) (query string, whereArgs []
if tf.RekeyTo != nil && (*tf.RekeyTo) {
whereParts = append(whereParts, "(t.txn -> 'txn' -> 'rekey') IS NOT NULL")
}
if tf.ReturnRootTxnsOnly {
whereParts = append(whereParts, "t.txid IS NOT NULL")
}

// If returnInnerTxnOnly flag is false, then return the root transaction
if !tf.ReturnInnerTxnOnly {
if !(tf.ReturnInnerTxnOnly || tf.ReturnRootTxnsOnly) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ReturnInnerTxnOnly variable name does not really represent what this is doing--it makes it much harder to reason about these conditions.

Let's update the name on the develop branch--avoiding a bunch of refactoring on this hotfix branch seems more important.

I've updated the most recent patch to represent what we want, which is that if neither of these options is enabled we will fetch root.txn and also if neither is enabled we'll add the JOIN which references the intra index.

query = "SELECT t.round, t.intra, t.txn, root.txn, t.extra, t.asset, h.realtime FROM txn t JOIN block_header h ON t.round = h.round"
} else {
query = "SELECT t.round, t.intra, t.txn, NULL, t.extra, t.asset, h.realtime FROM txn t JOIN block_header h ON t.round = h.round"
Expand All @@ -671,7 +674,7 @@ func buildTransactionQuery(tf idb.TransactionFilter) (query string, whereArgs []
}

// join in the root transaction if the returnInnerTxnOnly flag is false
if !tf.ReturnInnerTxnOnly {
if !(tf.ReturnInnerTxnOnly || tf.ReturnRootTxnsOnly) {
query += " LEFT OUTER JOIN txn root ON t.round = root.round AND (t.extra->>'root-intra')::int = root.intra"
}

Expand Down