add the previous nonce and balance to the accounts schema

src/eth/storage/postgres/queries/insert_entire_block.sql

@@ -135,37 +135,31 @@ account_insert AS (
                 new_balance,
                 new_nonce,
                 creation_block,
-                original_balance,
-                original_nonce
+                previous_balance,
+                previous_nonce
             )
     )
 
     INSERT INTO accounts (
-        address, bytecode, latest_balance, latest_nonce, creation_block
+        address, bytecode, latest_balance, latest_nonce, creation_block, previous_balance, previous_nonce
     )
     SELECT
         address,
         bytecode,
         new_balance,
         new_nonce,
-        creation_block
+        creation_block,
+        previous_balance,
+        previous_nonce
     FROM account_updates
     ON CONFLICT (address) DO
     UPDATE
     SET latest_nonce = excluded.latest_nonce,
-    latest_balance = excluded.latest_balance
-    WHERE accounts.latest_nonce
-    = (
-        SELECT original_nonce
-        FROM account_updates
-        WHERE account_updates.address = excluded.address
-    )
-    AND accounts.latest_balance
-    = (
-        SELECT original_balance
-        FROM account_updates
-        WHERE account_updates.address = excluded.address
-    )
+        latest_balance = excluded.latest_balance,
+        previous_balance = excluded.previous_balance,
+        previous_nonce = excluded.previous_nonce
+    WHERE accounts.latest_nonce = excluded.previous_nonce
+    AND accounts.latest_balance = excluded.previous_balance
     RETURNING 1 as res
 ),
 

static/schema/001-init.sql

@@ -27,6 +27,8 @@ CREATE TABLE IF NOT EXISTS accounts (
     bytecode BYTEA,
     latest_balance NUMERIC NOT NULL CHECK (latest_balance >= 0),
     latest_nonce NUMERIC NOT NULL CHECK (latest_nonce >= 0),
+    previous_balance NUMERIC CHECK (latest_balance >= 0),
+    previous_nonce NUMERIC CHECK (latest_balance >= 0),
     creation_block  NUMERIC NOT NULL REFERENCES blocks (number) ON DELETE CASCADE,
     PRIMARY KEY (address)
 );