Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix encode contract events metering #1026

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Fix encode contract events metering #1026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions soroban-env-host/src/e2e_invoke.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use crate::{
host::{
crypto::sha256_hash_from_bytes,
ledger_info_helper::get_key_durability,
metered_clone::{MeteredAlloc, MeteredClone, MeteredIterator},
metered_clone::{MeteredAlloc, MeteredClone, MeteredContainer, MeteredIterator},
metered_xdr::{metered_from_xdr_with_budget, metered_write_xdr},
},
storage::{AccessType, Footprint, FootprintMap, SnapshotSource, Storage, StorageMap},
Expand Down Expand Up @@ -310,7 +310,7 @@ pub fn invoke_host_function<T: AsRef<[u8]>, I: ExactSizeIterator<Item = T>>(

/// Encodes host events as `ContractEvent` XDR.
pub fn encode_contract_events(budget: &Budget, events: &Events) -> Result<Vec<Vec<u8>>, HostError> {
events
let ce = events
.0
.iter()
.filter(|e| !e.failed_call && e.event.type_ != ContractEventType::Diagnostic)
Expand All @@ -319,7 +319,11 @@ pub fn encode_contract_events(budget: &Budget, events: &Events) -> Result<Vec<Ve
metered_write_xdr(budget, &e.event, &mut buf)?;
Ok(buf)
})
.metered_collect::<Result<Vec<Vec<u8>>, HostError>>(budget)?
.collect::<Result<Vec<Vec<u8>>, HostError>>()?;
// Here we collect first then charge, so that the input size excludes the diagnostic events.
// This means we may temporarily go over the budget limit but should be okay.
Vec::<Vec<u8>>::charge_bulk_init_cpy(ce.len() as u64, budget)?;
Ok(ce)
}

fn extract_diagnostic_events(events: &Events, diagnostic_events: &mut Vec<DiagnosticEvent>) {
Expand Down