From fbf93f89a9e2a5fa1c496ec6f5c83a13348a84ca Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Mon, 13 Dec 2021 08:48:40 -0700 Subject: [PATCH] Revert "Charge for sol_log_data translates (#21328) (#21335)" This reverts commit 0565fe3320f60e6dd0e87c59ffc47c74229b53bc. --- programs/bpf_loader/src/syscalls.rs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs index b9aefbb3b1..0bc3e3f5f1 100644 --- a/programs/bpf_loader/src/syscalls.rs +++ b/programs/bpf_loader/src/syscalls.rs @@ -2721,16 +2721,9 @@ impl<'a> SyscallObject for SyscallLogData<'a> { ); question_mark!( - 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)) - ) - ), + invoke_context + .get_compute_meter() + .consume(untranslated_fields.iter().map(|e| e.len() as u64).sum()), result );