fix(coprocessor): use block hash to identify transaction

fixes a bug where 2 transactions are swapped in a reorg
but keeping the same tx id and being dependent on each other
the 4 apparent tx are merged to 2 tx and create a cycle

Author: rudy-6-4

…8eb9067669b008dc7d1c80b11d75cbe9897.json …32e14c467b7d9e91ace65c7da0cbeff399d.jsoncoprocessor/fhevm-engine/.sqlx/query-9a71466b2a069b1f23002c8e3e2368eb9067669b008dc7d1c80b11d75cbe9897.json renamed to coprocessor/fhevm-engine/.sqlx/query-2c0cbd163c2be49aa72f7501e7d9932e14c467b7d9e91ace65c7da0cbeff399d.json coprocessor/fhevm-engine/.sqlx/query-9a71466b2a069b1f23002c8e3e2368eb9067669b008dc7d1c80b11d75cbe9897.json renamed to coprocessor/fhevm-engine/.sqlx/query-2c0cbd163c2be49aa72f7501e7d9932e14c467b7d9e91ace65c7da0cbeff399d.json

@@ -107,7 +107,7 @@ WORKDIR /app
 
 # Install sqlx-cli
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
-    cargo install sqlx-cli --version 0.7.2 \
+    cargo install sqlx-cli --version 0.8.6 \
     --no-default-features --features postgres --locked
 
 # =============================================================================

…4c633a9b0d724d094e0355455e0d80de3c1.json …a2f44ff9cb933e848e198e9b4da27ee0c33.jsoncoprocessor/fhevm-engine/.sqlx/query-abf5e9cde25bc541a81b63750c3464c633a9b0d724d094e0355455e0d80de3c1.json renamed to coprocessor/fhevm-engine/.sqlx/query-51b8e3aa98b5e3b05d6b689513337a2f44ff9cb933e848e198e9b4da27ee0c33.json coprocessor/fhevm-engine/.sqlx/query-abf5e9cde25bc541a81b63750c3464c633a9b0d724d094e0355455e0d80de3c1.json renamed to coprocessor/fhevm-engine/.sqlx/query-51b8e3aa98b5e3b05d6b689513337a2f44ff9cb933e848e198e9b4da27ee0c33.json

@@ -7,7 +7,7 @@ WORKDIR /app
 
 # Install sqlx-cli
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
-    cargo install sqlx-cli --version 0.7.2 \
+    cargo install sqlx-cli --version 0.8.6 \
     --no-default-features --features postgres --locked
 
 # Copy migrations and initialization script

…97aa95adc548f114c5bb009248c84f304b2.json …35d4ade73c57a1f64fdfba0b3d7cccf2c16.jsoncoprocessor/fhevm-engine/.sqlx/query-571a684cbff1241ec33dda67bd02697aa95adc548f114c5bb009248c84f304b2.json renamed to coprocessor/fhevm-engine/.sqlx/query-c16c82c56c7b1dfdd564095e7a11e35d4ade73c57a1f64fdfba0b3d7cccf2c16.json coprocessor/fhevm-engine/.sqlx/query-571a684cbff1241ec33dda67bd02697aa95adc548f114c5bb009248c84f304b2.json renamed to coprocessor/fhevm-engine/.sqlx/query-c16c82c56c7b1dfdd564095e7a11e35d4ade73c57a1f64fdfba0b3d7cccf2c16.json

@@ -0,0 +1,24 @@
+ALTER TABLE computations
+  ADD COLUMN IF NOT EXISTS block_hash BYTEA NOT NULL DEFAULT '\x00'::BYTEA;
+-- Default value ensures a basic rollback does not fail, but it is not ideal.
+-- We should remove the default value in the next release.
+
+-- Alter the primary key to include block_hash
+ALTER TABLE computations DROP CONSTRAINT computations_pkey;
+ALTER TABLE computations
+  ADD CONSTRAINT computations_pkey
+  PRIMARY KEY (tenant_id, output_handle, transaction_id, block_hash);
+-- Note: this is non reversible except manually:
+--  * dropping the primary key
+--  * either removing all reorg out blocks or deduplicating handle with different block_hash but same tx_id
+
+-- Alter the unique primary key to include block_hash
+DROP INDEX IF EXISTS idx_computations_no_tenant;
+CREATE UNIQUE INDEX IF NOT EXISTS idx_computations_no_tenant
+    ON computations (output_handle, transaction_id, block_hash);
+-- Note: this is non reversible except manually:
+--  * dropping the primary key
+--  * either removing all reorg out blocks or deduplicating handle with different block_hash but same tx_id
+
+-- For next release, we should remove the default values for block_hash and block_number.
+-- ALTER TABLE computations ALTER COLUMN block_hash DROP DEFAULT;

…0eea8c05c2a29d4953a05742478ba3c35e0.json …fa1ed397da7ca4c7aec62b62fd2a397ccf8.jsoncoprocessor/fhevm-engine/.sqlx/query-a4c38217a203643b4890c03be19520eea8c05c2a29d4953a05742478ba3c35e0.json renamed to coprocessor/fhevm-engine/.sqlx/query-e94b1ae0deacdc1d532d6d5ff4761fa1ed397da7ca4c7aec62b62fd2a397ccf8.json coprocessor/fhevm-engine/.sqlx/query-a4c38217a203643b4890c03be19520eea8c05c2a29d4953a05742478ba3c35e0.json renamed to coprocessor/fhevm-engine/.sqlx/query-e94b1ae0deacdc1d532d6d5ff4761fa1ed397da7ca4c7aec62b62fd2a397ccf8.json

@@ -474,7 +474,9 @@ mod tests {
     use crate::contracts::TfheContract as C;
     use crate::contracts::TfheContract::TfheContractEvents as E;
     use crate::database::dependence_chains::dependence_chains;
-    use crate::database::tfhe_event_propagate::{Chain, ChainCache, LogTfhe};
+    use crate::database::tfhe_event_propagate::{
+        Chain, ChainCache, ChainHash, LogTfhe,
+    };
     use crate::database::tfhe_event_propagate::{
         ClearConst, Handle, TransactionHash,
     };
@@ -502,6 +504,7 @@ mod tests {
             event: tfhe_event(e),
             is_allowed,
             block_number: 0,
+            block_hash: ChainHash::ZERO,
             block_timestamp: sqlx::types::time::PrimitiveDateTime::MIN,
             transaction_hash: Some(tx),
             dependence_chain: TransactionHash::ZERO,

coprocessor/fhevm-engine/Dockerfile.workspace

@@ -209,6 +209,7 @@ pub async fn ingest_block_logs(
                     transaction_hash: log.transaction_hash,
                     block_number,
                     block_timestamp,
+                    block_hash,
                     // updated in the next loop and dependence_chains
                     is_allowed: false,
                     dependence_chain: Default::default(),

coprocessor/fhevm-engine/db-migration/Dockerfile

@@ -122,6 +122,7 @@ pub struct LogTfhe {
     pub transaction_hash: Option<TransactionHash>,
     pub is_allowed: bool,
     pub block_number: u64,
+    pub block_hash: BlockHash,
     pub block_timestamp: PrimitiveDateTime,
     pub tx_depth_size: u64,
     pub dependence_chain: TransactionHash,
@@ -375,10 +376,11 @@ impl Database {
                 schedule_order,
                 is_completed,
                 host_chain_id,
+                block_hash,
                 block_number
             )
-            VALUES ($1, $2, $3, $4, $5, $6, $7, NOW(), $8::timestamp, $9, $10, $11)
-            ON CONFLICT (output_handle, transaction_id) DO NOTHING
+            VALUES ($1, $2, $3, $4, $5, $6, $7, NOW(), $8::timestamp, $9, $10, $11, $12)
+            ON CONFLICT (output_handle, transaction_id, block_hash) DO NOTHING
             "#,
             output_handle,
             &dependencies,
@@ -393,7 +395,8 @@ impl Database {
                 )),
             !log.is_allowed,
             self.chain_id.as_i64(),
-            log.block_number as i64
+            log.block_hash.as_slice(),
+            log.block_number as i64,
         );
         query
             .execute(tx.deref_mut())