From a3f4da9b64f53e0b088cd6202972a895a400e61c Mon Sep 17 00:00:00 2001 From: agnusmor <100322135+agnusmor@users.noreply.github.com> Date: Wed, 14 Aug 2024 11:54:59 +0200 Subject: [PATCH] fix tx order in zkevm_getBatchByNumber endpoint (#3749) (#3767) --- state/pgstatestorage/transaction.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/state/pgstatestorage/transaction.go b/state/pgstatestorage/transaction.go index 48b6cec100..3135566048 100644 --- a/state/pgstatestorage/transaction.go +++ b/state/pgstatestorage/transaction.go @@ -130,7 +130,13 @@ func (p *PostgresStorage) GetTxsOlderThanNL1Blocks(ctx context.Context, nL1Block // GetEncodedTransactionsByBatchNumber returns the encoded field of all // transactions in the given batch. func (p *PostgresStorage) GetEncodedTransactionsByBatchNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) (encodedTxs []string, effectivePercentages []uint8, err error) { - const getEncodedTransactionsByBatchNumberSQL = "SELECT encoded, COALESCE(effective_percentage, 255) FROM state.transaction t INNER JOIN state.l2block b ON t.l2_block_num = b.block_num WHERE b.batch_num = $1 ORDER BY l2_block_num ASC" + const getEncodedTransactionsByBatchNumberSQL = ` + SELECT encoded, COALESCE(effective_percentage, 255) FROM state.transaction t + INNER JOIN state.l2block b ON t.l2_block_num = b.block_num + INNER JOIN state.receipt r ON t.hash = r.tx_hash + WHERE b.batch_num = $1 + ORDER BY l2_block_num, r.tx_index ASC + ` e := p.getExecQuerier(dbTx) rows, err := e.Query(ctx, getEncodedTransactionsByBatchNumberSQL, batchNumber)