Merge pull request #4788 from namada-net/mergify/bp/maint-201.0/pr-4786

wasm init always alloc for initial data (backport #4786)

Author: mergify[bot]

.changelog/unreleased/bug-fixes/4786-wasm-init-always-alloc.md

@@ -0,0 +1,2 @@
+- Always allocate for the initial data to allow to execute larger WASMs
+  ([\#4786](https://github.com/anoma/namada/pull/4786))

crates/vm/src/host_env.rs

@@ -890,7 +890,7 @@ where
         .map_err(|e| TxRuntimeError::MemoryError(Box::new(e)))?;
     consume_tx_gas::<MEM, D, H, CA>(env, gas)?;
 
-    tracing::debug!("tx_update {}, {:?}", key, value);
+    tracing::debug!("tx_update {}", key);
 
     let key = Key::parse(key)?;
     if key.is_validity_predicate().is_some() {
@@ -930,7 +930,7 @@ where
         .map_err(|e| TxRuntimeError::MemoryError(Box::new(e)))?;
     consume_tx_gas::<MEM, D, H, CA>(env, gas)?;
 
-    tracing::debug!("tx_write_temp {}, {:?}", key, value);
+    tracing::debug!("tx_write_temp {}", key);
 
     let key = Key::parse(key)?;
 
@@ -1119,10 +1119,9 @@ where
     let state = env.state();
     let value = vp_host_fns::read_pre(gas_meter, &state, &key)?;
     tracing::debug!(
-        "vp_read_pre addr {}, key {}, value {:?}",
+        "vp_read_pre addr {}, key {}",
         unsafe { env.ctx.address.get() },
         key,
-        value,
     );
     Ok(match value {
         Some(value) => {

crates/vm/src/wasm/run.rs

@@ -977,19 +977,12 @@ fn inject_alloc(module: elements::Module) -> Result<elements::Module> {
 
     // Alloc fn in WAT:
     //
-    // (func (;0;) (type 0) (param i32)
-    // (local i32)
+    // (func (;0;) (type 0) (param i32) (result i32)
     // block  ;; label = @1
     //   local.get 0
-    //   memory.size
-    //   i32.const 16
-    //   i32.shl
-    //   i32.gt_u
-    //   if (result i32)  ;; label = @2
-    //     local.get 0
-    //     i32.const -65536
-    //     i32.gt_u
-    //     br_if 1 (;@1;)
+    //   i32.const -65536
+    //   i32.le_u
+    //   if  ;; label = @2
     //     local.get 0
     //     i32.const 65535
     //     i32.add
@@ -998,17 +991,14 @@ fn inject_alloc(module: elements::Module) -> Result<elements::Module> {
     //     memory.grow
     //     local.tee 0
     //     i32.const -1
-    //     i32.eq
+    //     i32.ne
     //     br_if 1 (;@1;)
-    //     local.get 0
-    //     i32.const 16
-    //     i32.shl
-    //   else
-    //     i32.const 0
     //   end
-    //   return
+    //   unreachable
     // end
-    // unreachable)
+    // local.get 0
+    // i32.const 16
+    // i32.shl)
 
     const MEMORY_IX: u8 = 0;
     const WASM_PAGE_SIZE_LOG2: i32 = 16;
@@ -1017,16 +1007,10 @@ fn inject_alloc(module: elements::Module) -> Result<elements::Module> {
         use Instruction::*;
         vec![
             Block(BlockType::NoResult),
-            GetLocal(0),
-            CurrentMemory(MEMORY_IX),
-            I32Const(WASM_PAGE_SIZE_LOG2),
-            I32Shl,
-            I32GtU,
-            If(BlockType::Value(ValueType::I32)),
-            GetLocal(0),
+            GetLocal(1),
             I32Const(-WASM_PAGE_SIZE),
-            I32GtU,
-            BrIf(1),
+            I32LeU,
+            If(BlockType::NoResult),
             GetLocal(0),
             I32Const(WASM_PAGE_SIZE - 1),
             I32Add,
@@ -1035,17 +1019,14 @@ fn inject_alloc(module: elements::Module) -> Result<elements::Module> {
             GrowMemory(MEMORY_IX),
             TeeLocal(0),
             I32Const(-1),
-            I32Eq,
+            I32Ne,
             BrIf(1),
+            End,
+            Unreachable,
+            End,
             GetLocal(0),
             I32Const(WASM_PAGE_SIZE_LOG2),
             I32Shl,
-            Else,
-            I32Const(0),
-            End,
-            Return,
-            End,
-            Unreachable,
             End,
         ]
     };