piecrust: implemented double economic mode buffer scheme

dusk-network · May 7, 2024 · 4272f58 · 4272f58
1 parent 3d97533
commit 4272f58
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/piecrust/src/imports.rs b/piecrust/src/imports.rs
@@ -13,7 +13,8 @@ use dusk_wasmtime::{
     Caller, Extern, Func, Module, Result as WasmtimeResult, Store,
 };
 use piecrust_uplink::{
-    ContractError, ContractId, ARGBUF_LEN, CONTRACT_ID_BYTES, ECO_MODE_LEN,
+    ContractError, ContractId, ARGBUF_LEN, CONTRACT_ID_BYTES, ECO_MODE_BUF_LEN,
+    ECO_MODE_LEN,
 };
 
 use crate::instance::{Env, WrappedInstance};
@@ -249,20 +250,17 @@ pub(crate) fn c(
         let arg = &arg_buf[..arg_len as usize];
 
         callee.write_argument(arg);
-        callee.clear_eco_mode();
         let ret_len = callee
             .call(name, arg.len() as u32, callee_limit)
             .map_err(Error::normalize)?;
         check_arg(callee, ret_len as u32)?;
 
         // copy back result
         callee.read_argument(&mut memory[argbuf_ofs..][..ret_len as usize]);
-        callee.read_eco_mode_buf(&mut memory[eco_mode_ofs..][..ECO_MODE_LEN]);
-        // if depth of the stack is 3 or more, economic mode is not read
-        const ECO_STACK_DEPTH: usize = 2;
-        if env.nth_from_top(ECO_STACK_DEPTH).is_some() {
-            callee.clear_eco_mode();
-        }
+        callee.read_eco_mode_buf(
+            &mut memory[eco_mode_ofs..][ECO_MODE_LEN..ECO_MODE_BUF_LEN],
+        );
+        callee.clear_eco_mode();
 
         let callee_remaining = callee.get_remaining_gas();
         let callee_spent = callee_limit - callee_remaining;