Merge branch 'development' into mempool-efficient-gossip

sdbondi · Sep 28, 2023 · 4293fba · 4293fba
2 parents 78ded37 + 1151324
commit 4293fba
Show file tree

Hide file tree

Showing 140 changed files with 6,413 additions and 2,021 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ members = [
     "clients/base_node_client",
     "clients/validator_node_client",
     "clients/wallet_daemon_client",
+    "dan_layer/comms_rpc_state_sync",
     "dan_layer/consensus",
     "dan_layer/consensus_tests",
     "dan_layer/epoch_manager",

diff --git a/applications/tari_dan_app_utilities/src/base_layer_scanner.rs b/applications/tari_dan_app_utilities/src/base_layer_scanner.rs
@@ -386,11 +386,8 @@ impl BaseLayerScanner {
                     created_justify: *genesis.justify().id(),
                     created_block: *genesis.id(),
                     created_height: NodeHeight::zero(),
-                    destroyed_by_transaction: None,
-                    destroyed_justify: None,
-                    destroyed_by_block: None,
                     created_at_epoch: Epoch(0),
-                    destroyed_at_epoch: None,
+                    destroyed: None,
                 }
                 .create(tx)
             })

diff --git a/applications/tari_dan_wallet_web_ui/dist/.gitkeep b/applications/tari_dan_wallet_web_ui/dist/.gitkeep