🐛 Fix indexer ordering - DESC on height and index (#1017)

Author: wraitii

src/indexer.rs

@@ -1317,10 +1317,10 @@ mod test {
         assert_json_include!(
             actual: all_txs.json::<serde_json::Value>(),
             expected: json!([
-                { "index": 0, "transaction_type": "BlobTransaction", "transaction_status": "Success" },
-                { "index": 1, "transaction_type": "BlobTransaction", "transaction_status": "Success" },
+                { "index": 5, "transaction_type": "BlobTransaction", "transaction_status": "Sequenced" },
                 { "index": 2, "transaction_type": "BlobTransaction", "transaction_status": "Success" },
-                { "index": 5, "transaction_type": "BlobTransaction", "transaction_status": "Sequenced" }
+                { "index": 1, "transaction_type": "BlobTransaction", "transaction_status": "Success" },
+                { "index": 0, "transaction_type": "BlobTransaction", "transaction_status": "Success" },
             ])
         );
 
@@ -1355,10 +1355,10 @@ mod test {
             actual: proofs_response.json::<serde_json::Value>(),
             expected: json!([
                 { "index": 3, "transaction_type": "ProofTransaction", "transaction_status": "Success", "block_hash": block_2_hash },
-                { "index": 3, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
-                { "index": 4, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
+                { "index": 7, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
                 { "index": 6, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
-                { "index": 7, "transaction_type": "ProofTransaction", "transaction_status": "Success" }
+                { "index": 4, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
+                { "index": 3, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
             ])
         );
 
@@ -1367,10 +1367,10 @@ mod test {
         assert_json_include!(
             actual: proofs_by_height.json::<serde_json::Value>(),
             expected: json!([
-                { "index": 3, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
-                { "index": 4, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
+                { "index": 7, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
                 { "index": 6, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
-                { "index": 7, "transaction_type": "ProofTransaction", "transaction_status": "Success" }
+                { "index": 4, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
+                { "index": 3, "transaction_type": "ProofTransaction", "transaction_status": "Success" },
             ])
         );
 

src/indexer/api.rs

@@ -152,7 +152,7 @@ pub async fn get_transactions(
             FROM transactions t
             LEFT JOIN blocks b ON t.block_hash = b.hash
             WHERE b.height <= $1 and b.height > $2 AND t.transaction_type = 'blob_transaction'
-            ORDER BY b.height DESC, t.index ASC
+            ORDER BY b.height DESC, t.index DESC
             LIMIT $3
             "#,
         )
@@ -165,7 +165,7 @@ pub async fn get_transactions(
             FROM transactions t
             LEFT JOIN blocks b ON t.block_hash = b.hash
             WHERE t.transaction_type = 'blob_transaction'
-            ORDER BY b.height DESC, t.index ASC
+            ORDER BY b.height DESC, t.index DESC
             LIMIT $1
             "#,
         )
@@ -203,7 +203,7 @@ pub async fn get_transactions_by_contract(
             JOIN blobs b ON t.tx_hash = b.tx_hash
             LEFT JOIN blocks bl ON t.block_hash = bl.hash
             WHERE b.contract_name = $1 AND bl.height <= $2 AND bl.height > $3 AND t.transaction_type = 'blob_transaction'
-            ORDER BY bl.height DESC, t.index ASC
+            ORDER BY bl.height DESC, t.index DESC
             LIMIT $4
             "#,
         )
@@ -217,7 +217,7 @@ pub async fn get_transactions_by_contract(
             FROM transactions t
             JOIN blobs b ON t.tx_hash = b.tx_hash AND t.parent_dp_hash = b.parent_dp_hash
             WHERE b.contract_name = $1 AND t.transaction_type = 'blob_transaction'
-            ORDER BY t.block_hash DESC, t.index ASC
+            ORDER BY t.block_hash DESC, t.index DESC
             LIMIT $2
             "#,
         )
@@ -255,7 +255,7 @@ pub async fn get_transactions_by_height(
         FROM transactions t
         JOIN blocks b ON t.block_hash = b.hash
         WHERE b.height = $1 AND t.transaction_type = 'blob_transaction'
-        ORDER BY t.index ASC
+        ORDER BY t.index DESC
         "#,
     )
     .bind(height)
@@ -287,7 +287,7 @@ pub async fn get_transaction_with_hash(
         SELECT tx_hash, version, transaction_type, transaction_status, parent_dp_hash, block_hash, index
         FROM transactions
         WHERE tx_hash = $1 AND transaction_type = 'blob_transaction'
-        ORDER BY index ASC
+        ORDER BY index DESC
         "#,
     )
     .bind(tx_hash)
@@ -641,7 +641,7 @@ pub async fn get_proofs(
             FROM transactions t
             LEFT JOIN blocks b ON t.block_hash = b.hash
             WHERE b.height <= $1 and b.height > $2 AND t.transaction_type = 'proof_transaction'
-            ORDER BY b.height DESC, t.index ASC
+            ORDER BY b.height DESC, t.index DESC
             LIMIT $3
             "#,
         )
@@ -654,7 +654,7 @@ pub async fn get_proofs(
             FROM transactions t
             LEFT JOIN blocks b ON t.block_hash = b.hash
             WHERE t.transaction_type = 'proof_transaction'
-            ORDER BY b.height DESC, t.index ASC
+            ORDER BY b.height DESC, t.index DESC
             LIMIT $1
             "#,
         )
@@ -689,7 +689,7 @@ pub async fn get_proofs_by_height(
         FROM transactions t
         JOIN blocks b ON t.block_hash = b.hash
         WHERE b.height = $1 AND t.transaction_type = 'proof_transaction'
-        ORDER BY t.index ASC
+        ORDER BY t.index DESC
         "#,
     )
     .bind(height)
@@ -721,7 +721,7 @@ pub async fn get_proof_with_hash(
         SELECT tx_hash, version, transaction_type, transaction_status, parent_dp_hash, block_hash, index
         FROM transactions
         WHERE tx_hash = $1 AND transaction_type = 'proof_transaction'
-        ORDER BY index ASC
+        ORDER BY index DESC
         "#,
     )
     .bind(tx_hash)