From 548c0afac20759fe1fa4483008b00bb83ada702a Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 16 Dec 2021 13:41:26 -0700 Subject: [PATCH] Revert "Revert "Charge for sol_log_data translates (#21328) (#21335)"" This reverts commit fbf93f89a9e2a5fa1c496ec6f5c83a13348a84ca. --- programs/bpf_loader/src/syscalls.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs index 2e2ade42e8..231c301551 100644 --- a/programs/bpf_loader/src/syscalls.rs +++ b/programs/bpf_loader/src/syscalls.rs @@ -2721,9 +2721,16 @@ impl<'a> SyscallObject for SyscallLogData<'a> { ); question_mark!( - invoke_context - .get_compute_meter() - .consume(untranslated_fields.iter().map(|e| e.len() as u64).sum()), + invoke_context.get_compute_meter().consume( + budget + .syscall_base_cost + .saturating_mul(untranslated_fields.len() as u64) + .saturating_add( + untranslated_fields + .iter() + .fold(0, |total, e| total.saturating_add(e.len() as u64)) + ) + ), result );