Simplify customization of protocol updates and align better with node

.github/actions/setup-env/action.yml

@@ -7,9 +7,10 @@ runs:
     - name: Install Rust toolchain
       uses: RDXWorks-actions/toolchain@master
       with:
-        toolchain: stable
+        toolchain: 1.77.2
         default: true
         target: wasm32-unknown-unknown
+        components: rustfmt
 
     - name: Install nextest
       uses: RDXWorks-actions/install-action@nextest

Cargo.toml

@@ -133,6 +133,3 @@ zeroize = { version = "1.3.0" }
 # crashing the engine.
 [profile.release]
 panic = "unwind"
-
-[profile.test]
-panic = "unwind"

radix-clis/src/resim/config.rs

@@ -1,8 +1,6 @@
 use crate::resim::*;
 use radix_common::prelude::*;
-use radix_engine::updates::ProtocolUpdates;
-use radix_substate_store_interface::db_key_mapper::*;
-use radix_substate_store_interface::interface::*;
+use radix_engine::updates::*;
 use std::env;
 use std::fs;
 use std::path::PathBuf;
@@ -13,6 +11,7 @@ pub struct SimulatorEnvironment {
     pub db: RocksdbSubstateStore,
     // VMs
     pub scrypto_vm: ScryptoVm<DefaultWasmEngine>,
+    pub network_definition: NetworkDefinition,
 }
 
 impl SimulatorEnvironment {
@@ -23,7 +22,11 @@ impl SimulatorEnvironment {
         // Create the VMs
         let scrypto_vm = ScryptoVm::<DefaultWasmEngine>::default();
 
-        let mut env = Self { db, scrypto_vm };
+        let mut env = Self {
+            db,
+            scrypto_vm,
+            network_definition: NetworkDefinition::simulator(),
+        };
         env.bootstrap();
 
         Ok(env)
@@ -42,17 +45,14 @@ impl SimulatorEnvironment {
         let vm = VmInit::new(&self.scrypto_vm, NoExtension);
 
         // Bootstrap
-        Bootstrapper::new(NetworkDefinition::simulator(), &mut self.db, vm, false)
+        Bootstrapper::new(self.network_definition.clone(), &mut self.db, vm, false)
             .bootstrap_test_default();
 
-        // Run the protocol updates - unlike the test runner, the user has no way in whether they
+        // Run the protocol updates - for now, unlike the test runner, the user has no way in whether they
         // get these protocol updates or not.
-        for state_updates in
-            ProtocolUpdates::all().generate_state_updates(&self.db, &NetworkDefinition::simulator())
-        {
-            let db_updates = state_updates.create_database_updates::<SpreadPrefixKeyMapper>();
-            self.db.commit(&db_updates);
-        }
+        ProtocolBuilder::for_network(&self.network_definition)
+            .until_latest_protocol_version()
+            .commit_each_protocol_update(&mut self.db);
     }
 }
 

radix-clis/src/resim/mod.rs

@@ -62,9 +62,7 @@ use radix_engine::blueprints::consensus_manager::{
 };
 use radix_engine::blueprints::models::FieldPayload;
 use radix_engine::system::bootstrap::Bootstrapper;
-use radix_engine::system::system_db_reader::{
-    ObjectCollectionKey, SystemDatabaseReader, SystemDatabaseWriter,
-};
+use radix_engine::system::system_db_reader::*;
 use radix_engine::transaction::execute_and_commit_transaction;
 use radix_engine::transaction::ExecutionConfig;
 use radix_engine::transaction::TransactionOutcome;
@@ -81,7 +79,6 @@ use radix_engine_interface::prelude::*;
 use radix_engine_interface::types::FromPublicKey;
 use radix_rust::ContextualDisplay;
 use radix_substate_store_impls::rocks_db::RocksdbSubstateStore;
-use radix_substate_store_interface::interface::SubstateDatabase;
 use radix_substate_store_queries::typed_substate_layout::*;
 use radix_transactions::manifest::decompile;
 use radix_transactions::model::TestTransaction;
@@ -169,7 +166,9 @@ pub fn handle_system_transaction<O: std::io::Write>(
     print_receipt: bool,
     out: &mut O,
 ) -> Result<TransactionReceipt, Error> {
-    let SimulatorEnvironment { mut db, scrypto_vm } = SimulatorEnvironment::new()?;
+    let SimulatorEnvironment {
+        mut db, scrypto_vm, ..
+    } = SimulatorEnvironment::new()?;
     let vm_init = VmInit::new(&scrypto_vm, NoExtension);
 
     let nonce = get_nonce()?;
@@ -197,9 +196,7 @@ pub fn handle_system_transaction<O: std::io::Write>(
         let encoder = AddressBech32Encoder::for_simulator();
         let display_context = TransactionReceiptDisplayContextBuilder::new()
             .encoder(&encoder)
-            .schema_lookup_callback(|event_type_identifier: &EventTypeIdentifier| {
-                get_event_schema(&db, event_type_identifier)
-            })
+            .schema_lookup_from_db(&db)
             .build();
         writeln!(out, "{}", receipt.display(display_context)).map_err(Error::IOError)?;
     }
@@ -240,7 +237,9 @@ pub fn handle_manifest<O: std::io::Write>(
             Ok(None)
         }
         None => {
-            let SimulatorEnvironment { mut db, scrypto_vm } = SimulatorEnvironment::new()?;
+            let SimulatorEnvironment {
+                mut db, scrypto_vm, ..
+            } = SimulatorEnvironment::new()?;
             let vm_init = VmInit::new(&scrypto_vm, NoExtension);
 
             let sks = get_signing_keys(signing_keys)?;
@@ -265,9 +264,7 @@ pub fn handle_manifest<O: std::io::Write>(
                 let encoder = AddressBech32Encoder::for_simulator();
                 let display_context = TransactionReceiptDisplayContextBuilder::new()
                     .encoder(&encoder)
-                    .schema_lookup_callback(|event_type_identifier: &EventTypeIdentifier| {
-                        get_event_schema(&db, event_type_identifier)
-                    })
+                    .schema_lookup_from_db(&db)
                     .build();
                 writeln!(out, "{}", receipt.display(display_context)).map_err(Error::IOError)?;
             }
@@ -381,60 +378,6 @@ pub fn get_blueprint_id(component_address: ComponentAddress) -> Result<Blueprint
     Ok(object_info.blueprint_info.blueprint_id)
 }
 
-pub fn get_event_schema<S: SubstateDatabase>(
-    db: &S,
-    event_type_identifier: &EventTypeIdentifier,
-) -> Option<(LocalTypeId, VersionedScryptoSchema)> {
-    let system_reader = SystemDatabaseReader::new(db);
-
-    let (blueprint_id, event_name) = match event_type_identifier {
-        EventTypeIdentifier(Emitter::Method(node_id, node_module), event_name) => {
-            let blueprint_id = system_reader.get_blueprint_id(node_id, *node_module).ok()?;
-            (blueprint_id, event_name)
-        }
-        EventTypeIdentifier(Emitter::Function(blueprint_id), event_name) => {
-            (blueprint_id.clone(), event_name)
-        }
-    };
-
-    let version_key = BlueprintVersionKey::new_default(blueprint_id.blueprint_name.as_str());
-    let bp_definition: VersionedPackageBlueprintVersionDefinition = system_reader
-        .read_object_collection_entry(
-            blueprint_id.package_address.as_node_id(),
-            ModuleId::Main,
-            ObjectCollectionKey::KeyValue(
-                PackageCollection::BlueprintVersionDefinitionKeyValue.collection_index(),
-                &version_key,
-            ),
-        )
-        .unwrap()?;
-
-    let bp_interface = bp_definition
-        .fully_update_and_into_latest_version()
-        .interface;
-
-    let event_def = bp_interface.events.get(event_name)?;
-    match event_def {
-        BlueprintPayloadDef::Static(type_id) => {
-            let schema: VersionedScryptoSchema = system_reader
-                .read_object_collection_entry(
-                    blueprint_id.package_address.as_node_id(),
-                    ModuleId::Main,
-                    ObjectCollectionKey::KeyValue(
-                        PackageCollection::SchemaKeyValue.collection_index(),
-                        &type_id.0,
-                    ),
-                )
-                .unwrap()?;
-
-            Some((type_id.1, schema))
-        }
-        BlueprintPayloadDef::Generic(..) => {
-            panic!("Not expecting any events to use generics")
-        }
-    }
-}
-
 pub fn db_upsert_timestamps(
     milli_timestamp: ProposerMilliTimestampSubstate,
     minute_timestamp: ProposerMinuteTimestampSubstate,

radix-common/src/data/manifest/custom_formatting.rs

@@ -21,10 +21,10 @@ impl FormattableCustomExtension for ManifestCustomExtension {
                         if let Ok(bech32) = encoder.encode(node_id.as_ref()) {
                             write!(f, "\"{}\"", bech32)?;
                         } else {
-                            write!(f, "\"{}\"", hex::encode(node_id.as_ref()))?;
+                            write!(f, "\"{}\"", hex::encode(node_id.as_bytes()))?;
                         }
                     } else {
-                        write!(f, "\"{}\"", hex::encode(node_id.as_ref()))?;
+                        write!(f, "\"{}\"", hex::encode(node_id.as_bytes()))?;
                     }
                 }
                 ManifestAddress::Named(address_id) => {

radix-common/src/data/manifest/custom_serde.rs

@@ -17,13 +17,13 @@ impl SerializableCustomExtension for ManifestCustomExtension {
                             (SerializableType::String(bech32), false)
                         } else {
                             (
-                                SerializableType::String(hex::encode(node_id.as_ref())),
+                                SerializableType::String(hex::encode(node_id.as_bytes())),
                                 true,
                             )
                         }
                     } else {
                         (
-                            SerializableType::String(hex::encode(node_id.as_ref())),
+                            SerializableType::String(hex::encode(node_id.as_bytes())),
                             true,
                         )
                     }

radix-common/src/types/addresses/component_address.rs

@@ -33,6 +33,10 @@ impl ComponentAddress {
         self.0.to_vec()
     }
 
+    pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+
     pub fn virtual_account_from_public_key<P: Into<PublicKey> + Clone>(
         public_key: &P,
     ) -> ComponentAddress {
@@ -133,6 +137,12 @@ impl AsRef<[u8]> for ComponentAddress {
     }
 }
 
+impl AsRef<NodeId> for ComponentAddress {
+    fn as_ref(&self) -> &NodeId {
+        &self.0
+    }
+}
+
 impl TryFrom<[u8; NodeId::LENGTH]> for ComponentAddress {
     type Error = ParseComponentAddressError;
 

radix-common/src/types/addresses/global_address.rs

@@ -33,6 +33,10 @@ impl GlobalAddress {
         self.0.to_vec()
     }
 
+    pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+
     pub fn as_node_id(&self) -> &NodeId {
         &self.0
     }
@@ -99,6 +103,12 @@ impl AsRef<[u8]> for GlobalAddress {
     }
 }
 
+impl AsRef<NodeId> for GlobalAddress {
+    fn as_ref(&self) -> &NodeId {
+        &self.0
+    }
+}
+
 impl TryFrom<[u8; NodeId::LENGTH]> for GlobalAddress {
     type Error = ParseGlobalAddressError;
 

radix-common/src/types/addresses/internal_address.rs

@@ -32,6 +32,10 @@ impl InternalAddress {
         self.0.to_vec()
     }
 
+    pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+
     pub fn as_node_id(&self) -> &NodeId {
         &self.0
     }
@@ -89,6 +93,12 @@ impl AsRef<[u8]> for InternalAddress {
     }
 }
 
+impl AsRef<NodeId> for InternalAddress {
+    fn as_ref(&self) -> &NodeId {
+        &self.0
+    }
+}
+
 impl TryFrom<[u8; NodeId::LENGTH]> for InternalAddress {
     type Error = ParseInternalAddressError;
 

radix-common/src/types/addresses/package_address.rs

@@ -32,6 +32,10 @@ impl PackageAddress {
         self.0.to_vec()
     }
 
+    pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+
     pub fn as_node_id(&self) -> &NodeId {
         &self.0
     }
@@ -100,6 +104,12 @@ impl AsRef<[u8]> for PackageAddress {
     }
 }
 
+impl AsRef<NodeId> for PackageAddress {
+    fn as_ref(&self) -> &NodeId {
+        &self.0
+    }
+}
+
 impl TryFrom<[u8; NodeId::LENGTH]> for PackageAddress {
     type Error = ParsePackageAddressError;
 

radix-common/src/types/addresses/resource_address.rs

@@ -33,6 +33,10 @@ impl ResourceAddress {
         self.0.to_vec()
     }
 
+    pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+
     pub fn as_node_id(&self) -> &NodeId {
         &self.0
     }
@@ -92,6 +96,12 @@ impl AsRef<[u8]> for ResourceAddress {
     }
 }
 
+impl AsRef<NodeId> for ResourceAddress {
+    fn as_ref(&self) -> &NodeId {
+        &self.0
+    }
+}
+
 impl TryFrom<[u8; NodeId::LENGTH]> for ResourceAddress {
     type Error = ParseResourceAddressError;
 

radix-common/src/types/blueprint_id.rs

@@ -20,7 +20,7 @@ impl BlueprintId {
     }
 
     pub fn len(&self) -> usize {
-        self.package_address.as_ref().len() + self.blueprint_name.len()
+        self.package_address.as_bytes().len() + self.blueprint_name.len()
     }
 }
 

radix-common/src/types/node_and_substate.rs

@@ -121,6 +121,12 @@ impl NodeId {
     }
 }
 
+impl AsRef<NodeId> for NodeId {
+    fn as_ref(&self) -> &NodeId {
+        self
+    }
+}
+
 impl AsRef<[u8]> for NodeId {
     fn as_ref(&self) -> &[u8] {
         &self.0

radix-common/src/types/type_identifier.rs

@@ -31,7 +31,13 @@ pub enum GlobalTypeAddress {
 /// Note - this type provides scoping to a schema even for well-known types where
 /// the schema is irrelevant.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Sbor)]
-pub struct FullyScopedTypeId<T: Into<NodeId>>(pub T, pub SchemaHash, pub LocalTypeId);
+pub struct FullyScopedTypeId<T: AsRef<NodeId>>(pub T, pub SchemaHash, pub LocalTypeId);
+
+impl<T: AsRef<NodeId>> FullyScopedTypeId<T> {
+    pub fn into_general(self) -> FullyScopedTypeId<NodeId> {
+        FullyScopedTypeId(*self.0.as_ref(), self.1, self.2)
+    }
+}
 
 /// An identifier for a type in the context of a schema.
 ///
@@ -48,7 +54,7 @@ pub struct FullyScopedTypeId<T: Into<NodeId>>(pub T, pub SchemaHash, pub LocalTy
 pub struct ScopedTypeId(pub SchemaHash, pub LocalTypeId);
 
 impl ScopedTypeId {
-    pub fn under_node<T: Into<NodeId>>(self, node: T) -> FullyScopedTypeId<T> {
+    pub fn under_node<T: AsRef<NodeId>>(self, node: T) -> FullyScopedTypeId<T> {
         FullyScopedTypeId(node, self.0, self.1)
     }
 }