fix: pass Memory as value

Author: BowTiedWoo

clarity/src/vm/clarity_wasm.rs

@@ -5030,20 +5030,20 @@ fn link_map_delete_fn(linker: &mut Linker<ClarityWasmContext>) -> Result<(), Err
 
 fn check_height_valid(
     caller: &mut Caller<'_, ClarityWasmContext>,
-    memory: &Memory,
+    memory: Memory,
     height_lo: i64,
     height_hi: i64,
     return_offset: i32,
 ) -> Result<u32, Error> {
-    let height = (height_lo as u128) | ((height_hi as u128) << 64);
+    let height = (height_hi as u128) << 64 | ((height_lo as u64) as u128);
 
     let height_value = match u32::try_from(height) {
         Ok(result) => result,
         _ => {
             // Write a 0 to the return buffer for `none`
             write_to_wasm(
                 caller,
-                *memory,
+                memory,
                 &TypeSignature::BoolType,
                 return_offset,
                 return_offset + get_type_size(&TypeSignature::BoolType),
@@ -5063,7 +5063,7 @@ fn check_height_valid(
         // Write a 0 to the return buffer for `none`
         write_to_wasm(
             caller,
-            *memory,
+            memory,
             &TypeSignature::BoolType,
             return_offset,
             return_offset + get_type_size(&TypeSignature::BoolType),
@@ -5094,20 +5094,21 @@ fn link_get_block_info_time_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let block_time = caller
                     .data_mut()
                     .global_context
                     .database
                     .get_block_time(height_value)?;
+                let (result, ty) = (Value::UInt(block_time as u128), TypeSignature::UIntType);
                 write_to_wasm(
                     &mut caller,
                     memory,
-                    &TypeSignature::UIntType,
+                    &ty,
                     return_offset,
-                    return_offset + get_type_size(&TypeSignature::UIntType),
-                    &Value::UInt(block_time as u128),
+                    return_offset + get_type_size(&ty),
+                    &Value::some(result)?,
                     true,
                 )?;
 
@@ -5143,7 +5144,7 @@ fn link_get_block_info_vrf_seed_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let vrf_seed = caller
                     .data_mut()
@@ -5200,7 +5201,7 @@ fn link_get_block_info_header_hash_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let header_hash = caller
                     .data_mut()
@@ -5257,7 +5258,7 @@ fn link_get_block_info_burnchain_header_hash_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let burnchain_header_hash = caller
                     .data_mut()
@@ -5314,7 +5315,7 @@ fn link_get_block_info_identity_header_hash_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let id_header_hash = caller
                     .data_mut()
@@ -5371,7 +5372,7 @@ fn link_get_block_info_miner_address_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let miner_address = caller
                     .data_mut()
@@ -5421,7 +5422,7 @@ fn link_get_block_info_miner_spend_winner_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let winner_spend = caller
                     .data_mut()
@@ -5471,7 +5472,7 @@ fn link_get_block_info_miner_spend_total_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let total_spend = caller
                     .data_mut()
@@ -5521,7 +5522,7 @@ fn link_get_block_info_block_reward_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let block_reward_opt = caller
                     .data_mut()
@@ -5589,7 +5590,7 @@ fn link_get_burn_block_info_header_hash_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let burnchain_header_hash_opt = caller
                     .data_mut()
@@ -5650,7 +5651,7 @@ fn link_get_burn_block_info_pox_addrs_property_fn(
                     .ok_or(Error::Wasm(WasmError::MemoryNotFound))?;
 
                 let height_value =
-                    check_height_valid(&mut caller, &memory, height_lo, height_hi, return_offset)?;
+                    check_height_valid(&mut caller, memory, height_lo, height_hi, return_offset)?;
 
                 let pox_addrs_and_payout = caller
                     .data_mut()