Merge pull request #5334 from zajko/system_message_on_vm2_contract_installed

System message on vm2 contract installed

Author: zajko

Cargo.lock

@@ -13,7 +13,7 @@ exclude = ["proptest-regressions"]
 [dependencies]
 bincode = "1.3.3"
 bytes = "1.0.1"
-casper-types = { version = "6.0.1", path = "../types", features = ["datasize", "json-schema", "std"] }
+casper-types = { version = "7.0.0", path = "../types", features = ["datasize", "json-schema", "std"] }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 once_cell = { version = "1.5.2" }

binary_port/Cargo.toml

@@ -717,7 +717,10 @@ impl PackageIdentifier {
     pub(crate) fn random(rng: &mut TestRng) -> Self {
         match rng.gen_range(0..2) {
             0 => PackageIdentifier::ContractPackageHash(ContractPackageHash::new(rng.gen())),
-            1 => PackageIdentifier::PackageAddr(rng.gen()),
+            1 => {
+                let addr: [u8; 32] = rng.gen();
+                PackageIdentifier::PackageAddr(addr.into())
+            }
             _ => unreachable!(),
         }
     }

binary_port/src/information_request.rs

@@ -19,7 +19,7 @@ blake3 = { version = "1.5.0", default-features = false, features = ["pure"] }
 sha2 = { version = "0.10.8", default-features = false }
 keccak-asm = { version = "0.1.4", default-features = false }
 casper-storage = { version = "3.0.0", path = "../storage", default-features = true }
-casper-types = { version = "6.0.1", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema", "std"] }
+casper-types = { version = "7.0.0", path = "../types", default-features = false, features = ["datasize", "gens", "json-schema", "std"] }
 casper-wasm = { version = "1.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
 casper-wasm-utils = { version = "4.0.0", default-features = false, features = ["sign_ext", "call_indirect_overlong"] }
 casper-wasmi = { version = "1.0.0", features = ["sign_ext", "call_indirect_overlong"] }

execution_engine/CHANGELOG.md

@@ -3,7 +3,7 @@
 use casper_types::{
     bytesrepr::Bytes,
     contracts::{NamedKeys, ProtocolVersionMajor},
-    AddressableEntityHash, EntityVersion, Key, PackageHash, TransactionInvocationTarget,
+    AddressableEntityHash, EntityVersion, Key, PackageAddr, TransactionInvocationTarget,
 };
 
 use super::{wasm_v1::SessionKind, Error, ExecutableItem};
@@ -30,7 +30,7 @@ pub(crate) enum ExecutionKind<'a> {
     Deploy(&'a Bytes),
     /// A call to an entity/contract in a package/contract package.
     VersionedCall {
-        package_hash: PackageHash,
+        package_hash: PackageAddr,
         entity_version: Option<EntityVersion>,
         protocol_version_major: Option<ProtocolVersionMajor>,
         /// Entry point.
@@ -86,7 +86,7 @@ impl<'a> ExecutionKind<'a> {
                 version,
                 protocol_version_major,
             } => {
-                let package_hash = PackageHash::from(*addr);
+                let package_hash = *addr;
                 return Ok(Self::VersionedCall {
                     package_hash,
                     entity_version: *version,
@@ -104,7 +104,8 @@ impl<'a> ExecutionKind<'a> {
                     .ok_or_else(|| Error::Exec(ExecError::NamedKeyNotFound(name.to_string())))?;
 
                 let package_hash = match package_key {
-                    Key::Hash(hash) | Key::Package(hash) => PackageHash::new(*hash),
+                    Key::Package(hash) => PackageAddr::new(hash.value()),
+                    Key::Hash(hash) => PackageAddr::new(*hash),
                     _ => return Err(Error::InvalidKeyVariant(*package_key)),
                 };
                 return Ok(Self::VersionedCall {

execution_engine/Cargo.toml

@@ -756,7 +756,7 @@ fn build_session_info_for_executable_item(
             args,
         } => {
             session = ExecutableItem::Invocation(TransactionInvocationTarget::ByPackageHash {
-                addr: hash.value(),
+                addr: hash.value().into(),
                 version: *version,
                 protocol_version_major: None,
             });
@@ -922,7 +922,7 @@ fn build_payment_info_for_executable_item(
             entry_point,
         } => Ok(PaymentInfo(ExecutableInfo {
             item: ExecutableItem::Invocation(TransactionInvocationTarget::ByPackageHash {
-                addr: hash.value(),
+                addr: hash.value().into(),
                 version: *version,
                 protocol_version_major: None,
             }),

execution_engine/src/engine_state/execution_kind.rs

@@ -9,7 +9,7 @@ use casper_types::{
     bytesrepr,
     execution::TransformError,
     system, AccessRights, AddressableEntityHash, ApiError, ByteCodeHash, CLType, CLValueError,
-    ContractRuntimeTag, EntityKind, EntityVersionKey, Key, PackageHash, StoredValueTypeMismatch,
+    ContractRuntimeTag, EntityKind, EntityVersionKey, Key, PackageAddr, StoredValueTypeMismatch,
     URef,
 };
 use casper_wasm::elements;
@@ -114,7 +114,7 @@ pub enum Error {
     UnsupportedWasmStart,
     /// Contract package has no active contract versions.
     #[error("No active contract versions for contract package")]
-    NoActiveEntityVersions(PackageHash),
+    NoActiveEntityVersions(PackageAddr),
     /// Invalid entity version supplied.
     #[error("Invalid entity version: {}", _0)]
     InvalidEntityVersion(EntityVersionKey),
@@ -138,7 +138,7 @@ pub enum Error {
     UnexpectedStoredValueVariant,
     /// Error upgrading a locked contract package.
     #[error("A locked contract cannot be upgraded")]
-    LockedEntity(PackageHash),
+    LockedEntity(PackageAddr),
     /// Unable to find a contract by a specified hash address.
     #[error("Invalid contract: {}", _0)]
     InvalidEntity(AddressableEntityHash),
@@ -208,6 +208,12 @@ pub enum Error {
     /// Unexpected entity addr.
     #[error("Unexpected entity kind variant: {0}")]
     UnexpectedEntityKind(EntityKind),
+    /// Tried to add messages to a topic but it's full
+    #[error("Couldn't add messages to topic with key: {0} becuase it's full")]
+    TopicFull(Key),
+    /// No more messages in block allowed
+    #[error("No more messages in block allowed")]
+    MaxMessagesPerBlockExceeded,
 }
 
 impl From<PreprocessingError> for Error {

execution_engine/src/engine_state/wasm_v1.rs

@@ -16,7 +16,7 @@ use casper_types::{
         ContractPackageHash, EntryPoints as ContractEntryPoints, NamedKeys, ProtocolVersionMajor,
     },
     AddressableEntityHash, ApiError, EntityVersion, Gas, Group, HashAlgorithm, HostFunction,
-    HostFunctionCost, Key, PackageHash, PackageStatus, PublicKey, Signature, StoredValue, URef,
+    HostFunctionCost, Key, PackageAddr, PackageStatus, PublicKey, Signature, StoredValue, URef,
     U512, UREF_SERIALIZED_LENGTH,
 };
 
@@ -588,7 +588,7 @@ where
                     ],
                 )?;
 
-                let contract_package_hash: PackageHash =
+                let contract_package_hash: PackageAddr =
                     self.t_from_mem(package_key_ptr, package_key_size)?;
                 let label: String = self.t_from_mem(label_ptr, label_size)?;
                 let existing_urefs: BTreeSet<URef> =
@@ -644,7 +644,7 @@ where
 
                 let contract_package_hash: ContractPackageHash =
                     self.t_from_mem(contract_package_hash_ptr, contract_package_hash_size)?;
-                let package_hash = PackageHash::new(contract_package_hash.value());
+                let package_hash = PackageAddr::new(contract_package_hash.value());
                 let entry_points: EntryPoints = {
                     let contract_entry_points: ContractEntryPoints =
                         self.t_from_mem(entry_points_ptr, entry_points_size)?;
@@ -718,7 +718,7 @@ where
                     )))));
                 }
 
-                let package_hash: PackageHash =
+                let package_hash: PackageAddr =
                     self.t_from_mem(contract_package_hash_ptr, contract_package_hash_size)?;
                 let entry_points: EntryPoints =
                     self.t_from_mem(entry_points_ptr, entry_points_size)?;
@@ -805,7 +805,7 @@ where
                     )))));
                 }
 
-                let package_hash: PackageHash =
+                let package_hash: PackageAddr =
                     self.t_from_mem(contract_package_hash_ptr, contract_package_hash_size)?;
                 let entry_points: EntryPoints =
                     self.t_from_mem(entry_points_ptr, entry_points_size)?;
@@ -949,7 +949,7 @@ where
                     ],
                 )?;
 
-                let contract_package_hash: PackageHash =
+                let contract_package_hash: PackageAddr =
                     self.t_from_mem(contract_package_hash_ptr, contract_package_hash_size)?;
                 let contract_version: Option<EntityVersion> =
                     self.t_from_mem(contract_version_ptr, contract_package_size)?;
@@ -1578,7 +1578,7 @@ where
                     ],
                 )?;
 
-                let contract_package_hash: PackageHash =
+                let contract_package_hash: PackageAddr =
                     self.t_from_mem(contract_package_hash_ptr, contract_package_hash_size)?;
                 let contract_version: Option<EntityVersion> =
                     self.t_from_mem(contract_version_ptr, contract_version_size)?;