fix(synchroniser): Store most recent globals hash in the synchroniser, rather than fetching from the latest block (#1539)

fixes: #1537

Stores the most recent global variables hash within the synchroniser
rather than fetching it from the most recent block. This created a race
condition where the globals hash requested from the block was ahead of
the tree roots requested from the node.

As the tree roots were being requested from the node the synchroniser
was also behind.

Author: Maddiaa0

circuits/cpp/src/aztec3/circuits/abis/combined_constant_data.hpp

@@ -2,7 +2,7 @@
 
 #include "tx_context.hpp"
 
-#include "aztec3/circuits/abis/constant_historic_block_data.hpp"
+#include "aztec3/circuits/abis/historic_block_data.hpp"
 #include "aztec3/utils/types/circuit_types.hpp"
 #include "aztec3/utils/types/convert.hpp"
 #include "aztec3/utils/types/native_types.hpp"
@@ -11,7 +11,7 @@
 
 namespace aztec3::circuits::abis {
 
-using aztec3::circuits::abis::ConstantHistoricBlockData;
+using aztec3::circuits::abis::HistoricBlockData;
 using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
 using std::is_same;
@@ -20,7 +20,7 @@ template <typename NCT> struct CombinedConstantData {
     using fr = typename NCT::fr;
     using boolean = typename NCT::boolean;
 
-    ConstantHistoricBlockData<NCT> block_data{};
+    HistoricBlockData<NCT> block_data{};
     TxContext<NCT> tx_context{};
 
     // for serialization: update up with new fields

circuits/cpp/src/aztec3/circuits/abis/constant_historic_block_data.hpp circuits/cpp/src/aztec3/circuits/abis/historic_block_data.hpp

@@ -15,7 +15,7 @@ using aztec3::utils::types::CircuitTypes;
 using aztec3::utils::types::NativeTypes;
 using std::is_same;
 
-template <typename NCT> struct ConstantHistoricBlockData {
+template <typename NCT> struct HistoricBlockData {
     using fr = typename NCT::fr;
     using boolean = typename NCT::boolean;
 
@@ -29,7 +29,7 @@ template <typename NCT> struct ConstantHistoricBlockData {
 
     // Public data
     fr public_data_tree_root = 0;
-    fr prev_global_variables_hash = 0;
+    fr global_variables_hash = 0;
 
     // for serialization, update with new fields
     MSGPACK_FIELDS(private_data_tree_root,
@@ -39,44 +39,44 @@ template <typename NCT> struct ConstantHistoricBlockData {
                    blocks_tree_root,
                    private_kernel_vk_tree_root,
                    public_data_tree_root,
-                   prev_global_variables_hash);
+                   global_variables_hash);
 
-    boolean operator==(ConstantHistoricBlockData<NCT> const& other) const
+    boolean operator==(HistoricBlockData<NCT> const& other) const
     {
         return private_data_tree_root == other.private_data_tree_root &&
                nullifier_tree_root == other.nullifier_tree_root && contract_tree_root == other.contract_tree_root &&
                l1_to_l2_messages_tree_root == other.l1_to_l2_messages_tree_root &&
                blocks_tree_root == other.historic_block_root &&
                private_kernel_vk_tree_root == other.private_kernel_vk_tree_root &&
                public_data_tree_root == other.public_data_tree_root &&
-               prev_global_variables_hash == other.prev_global_variables_hash;
+               global_variables_hash == other.global_variables_hash;
     };
 
-    template <typename Builder> ConstantHistoricBlockData<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const
+    template <typename Builder> HistoricBlockData<CircuitTypes<Builder>> to_circuit_type(Builder& builder) const
     {
         static_assert((std::is_same<NativeTypes, NCT>::value));
 
         // Capture the circuit builder:
         auto to_ct = [&](auto& e) { return aztec3::utils::types::to_ct(builder, e); };
 
-        ConstantHistoricBlockData<CircuitTypes<Builder>> data = {
-            to_ct(private_data_tree_root),      to_ct(nullifier_tree_root),        to_ct(contract_tree_root),
-            to_ct(l1_to_l2_messages_tree_root), to_ct(blocks_tree_root),           to_ct(private_kernel_vk_tree_root),
-            to_ct(public_data_tree_root),       to_ct(prev_global_variables_hash),
+        HistoricBlockData<CircuitTypes<Builder>> data = {
+            to_ct(private_data_tree_root),      to_ct(nullifier_tree_root),   to_ct(contract_tree_root),
+            to_ct(l1_to_l2_messages_tree_root), to_ct(blocks_tree_root),      to_ct(private_kernel_vk_tree_root),
+            to_ct(public_data_tree_root),       to_ct(global_variables_hash),
         };
 
         return data;
     };
 
-    template <typename Builder> ConstantHistoricBlockData<NativeTypes> to_native_type() const
+    template <typename Builder> HistoricBlockData<NativeTypes> to_native_type() const
     {
         static_assert(std::is_same<CircuitTypes<Builder>, NCT>::value);
         auto to_nt = [&](auto& e) { return aztec3::utils::types::to_nt<Builder>(e); };
 
-        ConstantHistoricBlockData<NativeTypes> data = {
-            to_nt(private_data_tree_root),      to_nt(nullifier_tree_root),        to_nt(contract_tree_root),
-            to_nt(l1_to_l2_messages_tree_root), to_nt(blocks_tree_root),           to_nt(private_kernel_vk_tree_root),
-            to_nt(public_data_tree_root),       to_nt(prev_global_variables_hash),
+        HistoricBlockData<NativeTypes> data = {
+            to_nt(private_data_tree_root),      to_nt(nullifier_tree_root),   to_nt(contract_tree_root),
+            to_nt(l1_to_l2_messages_tree_root), to_nt(blocks_tree_root),      to_nt(private_kernel_vk_tree_root),
+            to_nt(public_data_tree_root),       to_nt(global_variables_hash),
         };
 
         return data;
@@ -93,13 +93,13 @@ template <typename NCT> struct ConstantHistoricBlockData {
         blocks_tree_root.set_public();
         private_kernel_vk_tree_root.set_public();
         public_data_tree_root.set_public();
-        prev_global_variables_hash.set_public();
+        global_variables_hash.set_public();
     }
 
 
     fr hash()
     {
-        return compute_block_hash(prev_global_variables_hash,
+        return compute_block_hash(global_variables_hash,
                                   private_data_tree_root,
                                   nullifier_tree_root,
                                   contract_tree_root,
@@ -108,8 +108,7 @@ template <typename NCT> struct ConstantHistoricBlockData {
     }
 };
 
-template <typename NCT>
-std::ostream& operator<<(std::ostream& os, ConstantHistoricBlockData<NCT> const& historic_tree_roots)
+template <typename NCT> std::ostream& operator<<(std::ostream& os, HistoricBlockData<NCT> const& historic_tree_roots)
 {
     return os << "private_data_tree_root: " << historic_tree_roots.private_data_tree_root << "\n"
               << "nullifier_tree_root: " << historic_tree_roots.nullifier_tree_root << "\n"
@@ -118,7 +117,7 @@ std::ostream& operator<<(std::ostream& os, ConstantHistoricBlockData<NCT> const&
               << "blocks_tree_root: " << historic_tree_roots.blocks_tree_root << "\n"
               << "private_kernel_vk_tree_root: " << historic_tree_roots.private_kernel_vk_tree_root << "\n"
               << "public_data_tree_root: " << historic_tree_roots.public_data_tree_root << "\n"
-              << "prev_global_variables_hash: " << historic_tree_roots.prev_global_variables_hash << "\n";
+              << "prev_global_variables_hash: " << historic_tree_roots.global_variables_hash << "\n";
 }
 
 }  // namespace aztec3::circuits::abis