Merge pull request #8 from Samourai-Wallet/develop_dojo

merge develop into master for v0.2.0

Cargo.lock

@@ -2,7 +2,7 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addrindexrs"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

 [package]
 name = "addrindexrs"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Roman Zeyde <me@romanzey.de>", "kenshin-samourai <kenshin_samourai@tutanota.com>"]
 description = "An efficient address indexer in Rust"
 license = "MIT"

RELEASE-NOTES.md

 # addrindexrs
 
-## 0.1.0 (TBD)
+
+## Releases ##
+
+- [v0.2.0](#0_2_0)
+- [v0.1.0](#0_1_0)
+
+
+<a name="0_2_0"/>
+
+## addrindexrs v0.2.0 ##
+
+### Change log ###
+
+- [#6](https://github.com/Samourai-Wallet/addrindexrs/pull/6) store the compaction marker before the full compaction
+- [#7](https://github.com/Samourai-Wallet/addrindexrs/pull/7) add trace for indexed block
+
+
+#### Credits ###
+
+- kenshin-samourai
+
+
+<a name="0_1_0"/>
+
+## addrindexrs v0.1.0 ##
+
+Initial release
 
 
 # Prior releases (electrs)

src/index.rs

@@ -393,6 +393,7 @@ impl Index {
 
             let rows_iter = batch.iter().flat_map(|block| {
                 let blockhash = block.bitcoin_hash();
+                info!("indexing block {}", blockhash);
                 index_block(block).chain(std::iter::once(last_indexed_block(&blockhash)))
             });
 

src/store.rs

@@ -209,11 +209,9 @@ fn full_compaction_marker() -> Row {
 }
 
 pub fn full_compaction(store: DBStore) -> DBStore {
-    store.flush();
-    let store = store.compact().enable_compaction();
     store.write(vec![full_compaction_marker()]);
-    // Make sure full compaction marker isn't left behind
     store.flush();
+    let store = store.compact().enable_compaction();
     store
 }