Merge pull request #371 from Concordium/fix-non-existing-account-bug-…

…in-account-tokens-table Fix bug when processing buggy cis2 contract event logs
Concordium · Jan 9, 2025 · e9afee3 · e9afee3
2 parents 50990a8 + 857253f
commit e9afee3
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 37 deletions.
diff --git a/...nd-rust/.sqlx/query-188b2ac4ef5afdacfe2a1906c1bfa474a590ff49093401331f60b58781ccb1f0.json b/...nd-rust/.sqlx/query-188b2ac4ef5afdacfe2a1906c1bfa474a590ff49093401331f60b58781ccb1f0.json
diff --git a/...nd-rust/.sqlx/query-8d11d3f39ddf6040382c43f0af3831c395340cb2eb129542e734c21a6bd8e032.json b/...nd-rust/.sqlx/query-8d11d3f39ddf6040382c43f0af3831c395340cb2eb129542e734c21a6bd8e032.json
diff --git a/...nd-rust/.sqlx/query-caa2e6b17e40287c25b573b7e8be07df1f1b025848854020d8b83395a661f99b.json b/...nd-rust/.sqlx/query-caa2e6b17e40287c25b573b7e8be07df1f1b025848854020d8b83395a661f99b.json
diff --git a/backend-rust/src/indexer.rs b/backend-rust/src/indexer.rs
@@ -2666,12 +2666,14 @@ async fn process_cis2_event(
                 sqlx::query!(
                     "
                     INSERT INTO account_tokens (index, account_index, token_index, balance)
-                    VALUES (
-                        (SELECT COALESCE(MAX(index) + 1, 0) FROM account_tokens),
-                        (SELECT index FROM accounts WHERE address = $1),
-                        (SELECT index FROM tokens WHERE token_address = $2),  
+                    SELECT
+                        COALESCE((SELECT MAX(index) + 1 FROM account_tokens), 0),
+                        accounts.index,
+                        tokens.index,
                         $3
-                    )
+                    FROM accounts, tokens
+                    WHERE accounts.address = $1
+                        AND tokens.token_address = $2
                     ON CONFLICT (token_index, account_index)
                     DO UPDATE SET balance = account_tokens.balance + EXCLUDED.balance",
                     owner.to_string(),
@@ -2743,12 +2745,14 @@ async fn process_cis2_event(
                 sqlx::query!(
                     "
                     INSERT INTO account_tokens (index, account_index, token_index, balance)
-                    VALUES (
-                        (SELECT COALESCE(MAX(index) + 1, 0) FROM account_tokens),
-                        (SELECT index FROM accounts WHERE address = $1),
-                        (SELECT index FROM tokens WHERE token_address = $2),  
+                    SELECT
+                        COALESCE((SELECT MAX(index) + 1 FROM account_tokens), 0),
+                        accounts.index,
+                        tokens.index,
                         $3
-                    )
+                    FROM accounts, tokens
+                    WHERE accounts.address = $1
+                        AND tokens.token_address = $2
                     ON CONFLICT (token_index, account_index)
                     DO UPDATE SET balance = account_tokens.balance + EXCLUDED.balance",
                     owner.to_string(),
@@ -2787,12 +2791,14 @@ async fn process_cis2_event(
                 sqlx::query!(
                     "
                     INSERT INTO account_tokens (index, account_index, token_index, balance)
-                    VALUES (
-                        (SELECT COALESCE(MAX(index) + 1, 0) FROM account_tokens),
-                        (SELECT index FROM accounts WHERE address = $1),
-                        (SELECT index FROM tokens WHERE token_address = $2),  
+                    SELECT
+                        COALESCE((SELECT MAX(index) + 1 FROM account_tokens), 0),
+                        accounts.index,
+                        tokens.index,
                         $3
-                    )
+                    FROM accounts, tokens
+                    WHERE accounts.address = $1
+                        AND tokens.token_address = $2
                     ON CONFLICT (token_index, account_index)
                     DO UPDATE SET balance = account_tokens.balance + EXCLUDED.balance",
                     from.to_string(),
@@ -2811,14 +2817,16 @@ async fn process_cis2_event(
                 sqlx::query!(
                     "
                     INSERT INTO account_tokens (index, account_index, token_index, balance)
-                    VALUES (
-                        (SELECT COALESCE(MAX(index) + 1, 0) FROM account_tokens),
-                        (SELECT index FROM accounts WHERE address = $1),
-                        (SELECT index FROM tokens WHERE token_address = $2),  
+                    SELECT
+                        COALESCE((SELECT MAX(index) + 1 FROM account_tokens), 0),
+                        accounts.index,
+                        tokens.index,
                         $3
-                    )
+                    FROM accounts, tokens
+                    WHERE accounts.address = $1
+                        AND tokens.token_address = $2
                     ON CONFLICT (token_index, account_index)
-                    DO UPDATE SET balance = account_tokens.balance + EXCLUDED.balance",
+                        DO UPDATE SET balance = account_tokens.balance + EXCLUDED.balance",
                     to.to_string(),
                     token_address,
                     tokens_transferred