Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 59 additions & 1 deletion execution_engine/src/runtime/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use num_rational::Ratio;
use casper_storage::{
global_state::{error::Error as GlobalStateError, state::StateReader},
system::{auction::Auction, handle_payment::HandlePayment, mint::Mint},
tracking_copy::TrackingCopyExt,
tracking_copy::{MessageEmissionError, TrackingCopyExt},
};
use casper_types::{
account::{
Expand Down Expand Up @@ -2790,6 +2790,35 @@ where
self.context
.metered_write_gs_unsafe(Key::Hash(contract_package_hash.value()), contract_package)?;

let current_blocktime = self.context.get_block_info().block_time();
match self.context.emit_messages_for_new_installed_version(
current_blocktime,
Key::Hash(contract_package_hash.value()),
Key::Hash(contract_hash_addr),
Key::Hash(contract_wasm_hash),
insert_contract_result.protocol_version_major(),
insert_contract_result.contract_version(),
) {
Ok(_) => (),
Err(MessageEmissionError::CLValue(clvalue_error)) => {
return Err(ExecError::CLValue(clvalue_error))
}
Err(MessageEmissionError::TrackingCopy(error)) => {
return Err(ExecError::TrackingCopy(error))
}
Err(MessageEmissionError::TypeMismatch(type_mismatch)) => {
return Err(ExecError::TypeMismatch(type_mismatch))
}
Err(MessageEmissionError::BytesRepr(error)) => return Err(ExecError::BytesRepr(error)),
Err(MessageEmissionError::TopicNotRegistered(_)) => {
return Ok(Err(ApiError::MessageTopicNotRegistered))
}
Err(MessageEmissionError::TopicFull(_)) => return Ok(Err(ApiError::MessageTopicFull)),
Err(MessageEmissionError::MaxMessagesPerBlockExceeded) => {
return Ok(Err(ApiError::MaxMessagesPerBlockExceeded))
}
}

// set return values to buffer
{
let hash_bytes = match contract_hash_addr.to_bytes() {
Expand Down Expand Up @@ -2916,6 +2945,35 @@ where
self.context
.metered_write_gs_unsafe(package_hash, package)?;

let current_blocktime = self.context.get_block_info().block_time();
match self.context.emit_messages_for_new_installed_version(
current_blocktime,
Key::Hash(package_hash.value()),
entity_key,
Key::ByteCode(ByteCodeAddr::new_wasm_addr(byte_code_hash)),
insert_entity_version_result.protocol_version_major(),
insert_entity_version_result.entity_version(),
) {
Ok(_) => (),
Err(MessageEmissionError::CLValue(clvalue_error)) => {
return Err(ExecError::CLValue(clvalue_error))
}
Err(MessageEmissionError::TrackingCopy(error)) => {
return Err(ExecError::TrackingCopy(error))
}
Err(MessageEmissionError::TypeMismatch(type_mismatch)) => {
return Err(ExecError::TypeMismatch(type_mismatch))
}
Err(MessageEmissionError::BytesRepr(error)) => return Err(ExecError::BytesRepr(error)),
Err(MessageEmissionError::TopicNotRegistered(_)) => {
return Ok(Err(ApiError::MessageTopicNotRegistered))
}
Err(MessageEmissionError::TopicFull(_)) => return Ok(Err(ApiError::MessageTopicFull)),
Err(MessageEmissionError::MaxMessagesPerBlockExceeded) => {
return Ok(Err(ApiError::MaxMessagesPerBlockExceeded))
}
}

// set return values to buffer
{
let hash_bytes = match hash_addr.to_bytes() {
Expand Down
28 changes: 26 additions & 2 deletions execution_engine/src/runtime_context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ use tracing::error;
use casper_storage::{
global_state::{error::Error as GlobalStateError, state::StateReader},
tracking_copy::{
AddResult, TrackingCopy, TrackingCopyCache, TrackingCopyEntityExt, TrackingCopyError,
TrackingCopyExt,
AddResult, MessageEmissionError, NewContractVersionInfo, TrackingCopy, TrackingCopyCache,
TrackingCopyEntityExt, TrackingCopyError, TrackingCopyExt,
},
AddressGenerator,
};
Expand Down Expand Up @@ -1647,4 +1647,28 @@ where

Ok(Ok(()))
}

pub(crate) fn emit_messages_for_new_installed_version(
&self,
current_blocktime: BlockTime,
contract_package_key: Key,
contract_key: Key,
contract_wasm_key: Key,
version_major: u32,
version_minor: u32,
) -> Result<(), MessageEmissionError> {
let message_limits = self.engine_config.wasm_config().messages_limits();
let mut tracking_copy = self.tracking_copy.borrow_mut();
tracking_copy.emit_messages_for_new_installed_version(
NewContractVersionInfo {
key_of_package: contract_package_key,
key_of_contract: contract_key,
key_of_wasm: contract_wasm_key,
version_major,
version_minor,
},
current_blocktime,
message_limits,
)
}
}
Loading
Loading