Merge pull request #2490 from blockstack/fix/analysis-db-storage

Fix: improved analysis db storage

Author: Aaron Blankstein

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.8] - 2021-03-02
+
+This is a hotfix release for improved handling of static analysis storage and
+improved `at-block` behavior. The chainstate directory of 2.0.8 is compatible with
+the 2.0.7 chainstate.
+
+## Fixed
+
+- Improved static analysis storage
+- `at-block` behavior in `clarity-cli` and unit tests (no changes in `stacks-node`
+  behavior).
+
 ## [2.0.7] - 2021-02-26
 
 This is an emergency hotfix that prevents the node from accidentally deleting

src/chainstate/stacks/db/transactions.rs

@@ -1039,7 +1039,13 @@ impl StacksChainState {
                     .expect("BUG: total block cost decreased");
 
                 let (asset_map, events) = match initialize_resp {
-                    Ok(x) => x,
+                    Ok(x) => {
+                        // store analysis -- if this fails, then the have some pretty bad problems
+                        clarity_tx
+                            .save_analysis(&contract_id, &contract_analysis)
+                            .expect("FATAL: failed to store contract analysis");
+                        x
+                    }
                     Err(e) => match handle_clarity_runtime_error(e) {
                         ClarityRuntimeTxError::Acceptable { error, err_type } => {
                             info!("Smart-contract processed with {}", err_type;
@@ -1076,11 +1082,6 @@ impl StacksChainState {
                     },
                 };
 
-                // store analysis -- if this fails, then the have some pretty bad problems
-                clarity_tx
-                    .save_analysis(&contract_id, &contract_analysis)
-                    .expect("FATAL: failed to store contract analysis");
-
                 let receipt = StacksTransactionReceipt::from_smart_contract(
                     tx.clone(),
                     events,

src/vm/database/key_value_wrapper.rs

@@ -310,8 +310,14 @@ impl<'a> RollbackWrapper<'a> {
         bhh: StacksBlockId,
         query_pending_data: bool,
     ) -> Result<StacksBlockId> {
-        self.query_pending_data = query_pending_data;
-        self.store.set_block_hash(bhh)
+        self.store.set_block_hash(bhh).and_then(|x| {
+            // use and_then so that query_pending_data is only set once set_block_hash succeeds
+            //  this doesn't matter in practice, because a set_block_hash failure always aborts
+            //  the transaction with a runtime error (destroying its environment), but it's much
+            //  better practice to do this, especially if the abort behavior changes in the future.
+            self.query_pending_data = query_pending_data;
+            Ok(x)
+        })
     }
 
     /// this function will only return commitment proofs for values _already_ materialized