From b0628f17a29f954065f1cae4a632f82bc1f2262d Mon Sep 17 00:00:00 2001
From: Fedor Sakharov <fedor.sakharov@gmail.com>
Date: Tue, 30 Jan 2024 21:51:21 +0100
Subject: [PATCH] fix(storage): return withdrawals for address for l1 and l2
 addrs matches (#378)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# What ❔

> When address A makes withdrawal to address B, api will only show that
withdrawal on address B. While we want to show it for both A and B.

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `cargo fmt`.
---
 ...c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c.json} | 4 ++--
 storage/src/lib.rs                                           | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename storage/.sqlx/{query-1439a51cb9304493287a9c54c13e59ab42e1511a38989dfc83f0a240d85a511a.json => query-2d4fbb21f9b73c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c.json} (78%)

diff --git a/storage/.sqlx/query-1439a51cb9304493287a9c54c13e59ab42e1511a38989dfc83f0a240d85a511a.json b/storage/.sqlx/query-2d4fbb21f9b73c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c.json
similarity index 78%
rename from storage/.sqlx/query-1439a51cb9304493287a9c54c13e59ab42e1511a38989dfc83f0a240d85a511a.json
rename to storage/.sqlx/query-2d4fbb21f9b73c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c.json
index 3f809610..12fc4974 100644
--- a/storage/.sqlx/query-1439a51cb9304493287a9c54c13e59ab42e1511a38989dfc83f0a240d85a511a.json
+++ b/storage/.sqlx/query-2d4fbb21f9b73c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n         SELECT\n             l2_to_l1_events.l1_token_addr,\n             l2_to_l1_events.amount,\n             withdrawals.tx_hash,\n             finalization_data.finalization_tx\n         FROM\n             l2_to_l1_events\n         JOIN finalization_data ON\n             finalization_data.l1_batch_number = l2_to_l1_events.l2_block_number\n         AND finalization_data.l2_tx_number_in_block = l2_to_l1_events.tx_number_in_block\n         JOIN withdrawals ON\n             withdrawals.id = finalization_data.withdrawal_id\n         WHERE l2_to_l1_events.to_address = $1\n         ORDER BY l2_to_l1_events.l2_block_number DESC\n         LIMIT $2\n        ",
+  "query": "\n         SELECT\n             l2_to_l1_events.l1_token_addr,\n             l2_to_l1_events.amount,\n             withdrawals.tx_hash,\n             finalization_data.finalization_tx\n         FROM\n             l2_to_l1_events\n         JOIN finalization_data ON\n             finalization_data.l1_batch_number = l2_to_l1_events.l2_block_number\n         AND finalization_data.l2_tx_number_in_block = l2_to_l1_events.tx_number_in_block\n         JOIN withdrawals ON\n             withdrawals.id = finalization_data.withdrawal_id\n         WHERE\n            l2_to_l1_events.to_address = $1\n            OR\n            finalization_data.sender = $1\n         ORDER BY l2_to_l1_events.l2_block_number DESC\n         LIMIT $2\n        ",
   "describe": {
     "columns": [
       {
@@ -37,5 +37,5 @@
       true
     ]
   },
-  "hash": "1439a51cb9304493287a9c54c13e59ab42e1511a38989dfc83f0a240d85a511a"
+  "hash": "2d4fbb21f9b73c5a557e688ea157c578e2bcfaee3a4b5f22bc1965acd67e488c"
 }
diff --git a/storage/src/lib.rs b/storage/src/lib.rs
index 4f09c8eb..48c8e16d 100644
--- a/storage/src/lib.rs
+++ b/storage/src/lib.rs
@@ -1403,7 +1403,10 @@ pub async fn withdrawals_for_address(
          AND finalization_data.l2_tx_number_in_block = l2_to_l1_events.tx_number_in_block
          JOIN withdrawals ON
              withdrawals.id = finalization_data.withdrawal_id
-         WHERE l2_to_l1_events.to_address = $1
+         WHERE
+            l2_to_l1_events.to_address = $1
+            OR
+            finalization_data.sender = $1
          ORDER BY l2_to_l1_events.l2_block_number DESC
          LIMIT $2
         ",