Add sync verification for esplora

bitcoindevkit · Feb 9, 2022 · 6fa29fa · 6fa29fa
1 parent ad07116
commit 6fa29fa
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/blockchain/esplora/reqwest.rs b/src/blockchain/esplora/reqwest.rs
@@ -167,9 +167,27 @@ impl Blockchain for EsploraBlockchain {
                         .request()
                         .map(|txid| {
                             let tx = tx_index.get(txid).expect("must be in index");
-                            (tx.previous_outputs(), tx.to_tx())
+                            // Verify this transaction if requested via feature flag
+                            #[cfg(feature = "verify")]
+                            {
+                                use crate::wallet::verify::VerifyError;
+                                let prev_outs = tx.previous_outputs();
+                                let tx_bytes = serialize(&tx.to_tx());
+                                for (index, output) in prev_outs.iter().enumerate() {
+                                    if let Some(output) = output {
+                                        bitcoinconsensus::verify(
+                                            output.script_pubkey.to_bytes().as_ref(),
+                                            output.value,
+                                            &tx_bytes,
+                                            index,
+                                        )
+                                        .map_err(|e| VerifyError::from(e))?;
+                                    }
+                                }
+                            }
+                            Ok((tx.previous_outputs(), tx.to_tx()))
                         })
-                        .collect();
+                        .collect::<Result<_, Error>>()?;
                     tx_req.satisfy(full_txs)?
                 }
                 Request::Finish(batch_update) => break batch_update,

diff --git a/src/blockchain/esplora/ureq.rs b/src/blockchain/esplora/ureq.rs
@@ -166,9 +166,27 @@ impl Blockchain for EsploraBlockchain {
                         .request()
                         .map(|txid| {
                             let tx = tx_index.get(txid).expect("must be in index");
-                            (tx.previous_outputs(), tx.to_tx())
+                            // Verify this transaction if requested via feature flag
+                            #[cfg(feature = "verify")]
+                            {
+                                use crate::wallet::verify::VerifyError;
+                                let prev_outs = tx.previous_outputs();
+                                let tx_bytes = serialize(&tx.to_tx());
+                                for (index, output) in prev_outs.iter().enumerate() {
+                                    if let Some(output) = output {
+                                        bitcoinconsensus::verify(
+                                            output.script_pubkey.to_bytes().as_ref(),
+                                            output.value,
+                                            &tx_bytes,
+                                            index,
+                                        )
+                                        .map_err(|e| VerifyError::from(e))?;
+                                    }
+                                }
+                            }
+                            Ok((tx.previous_outputs(), tx.to_tx()))
                         })
-                        .collect();
+                        .collect::<Result<_, Error>>()?;
                     tx_req.satisfy(full_txs)?
                 }
                 Request::Finish(batch_update) => break batch_update,