Просмотр исходного кода

remove state from entrypoint params

x 3 лет назад
Родитель
Сommit
abc907ba2b
3 измененных файлов с 4 добавлено и 14 удалено
  1. 1 1
      example/smart-contract/src/lib.rs
  2. 2 2
      src/runtime/chain_state.rs
  3. 1 11
      src/sdk/src/entrypoint.rs

+ 1 - 1
example/smart-contract/src/lib.rs

@@ -37,7 +37,7 @@ pub struct Args {
 // Through here, you can branch out into different functions inside
 // this library.
 entrypoint!(process_instruction);
-fn process_instruction(/*_state: &[u8], */ ix: &[u8]) -> ContractResult {
+fn process_instruction(ix: &[u8]) -> ContractResult {
     msg!("Hello from the VM runtime!");
     // Deserialize the payload into `Args`.
     let args: Args = deserialize(ix)?;

+ 2 - 2
src/runtime/chain_state.rs

@@ -48,7 +48,7 @@ pub fn nullifier_exists(mut env: FunctionEnvMut<Env>, ptr: u32, len: u32) -> i32
     }
     */
 
-    error!(target: "wasm_runtime::nullifier_exists", "Failed to read bytes from VM memory");
+    //error!(target: "wasm_runtime::nullifier_exists", "Failed to read bytes from VM memory");
     //-2
     0
 }
@@ -78,7 +78,7 @@ pub fn is_valid_merkle(mut env: FunctionEnvMut<Env>, ptr: u32, len: u32) -> i32
     }
     */
 
-    error!(target: "wasm_runtime::is_valid_merkle", "Failed to read bytes from VM memory");
+    //error!(target: "wasm_runtime::is_valid_merkle", "Failed to read bytes from VM memory");
     //-2
     0
 }

+ 1 - 11
src/sdk/src/entrypoint.rs

@@ -32,10 +32,9 @@ macro_rules! entrypoint {
         /// # Safety
         #[no_mangle]
         pub unsafe extern "C" fn entrypoint(input: *mut u8) -> u64 {
-            //let (state, instruction_data) = $crate::entrypoint::deserialize(input);
             let instruction_data = $crate::entrypoint::deserialize(input);
 
-            match $process_instruction(/*&state, */ &instruction_data) {
+            match $process_instruction(&instruction_data) {
                 Ok(()) => $crate::entrypoint::SUCCESS,
                 Err(e) => e.into(),
             }
@@ -45,22 +44,13 @@ macro_rules! entrypoint {
 
 /// Deserialize a given payload in `entrypoint`
 /// # Safety
-//pub unsafe fn deserialize<'a>(input: *mut u8) -> (&'a [u8], &'a [u8]) {
 pub unsafe fn deserialize<'a>(input: *mut u8) -> &'a [u8] {
     let mut offset: usize = 0;
 
-    /*
-    let state_data_len = *(input.add(offset) as *const u64) as usize;
-    offset += size_of::<u64>();
-    let state_data = { from_raw_parts(input.add(offset), state_data_len) };
-    offset += state_data_len;
-    */
-
     let instruction_data_len = *(input.add(offset) as *const u64) as usize;
     offset += size_of::<u64>();
     let instruction_data = { from_raw_parts(input.add(offset), instruction_data_len) };
 
-    //(state_data, instruction_data)
     instruction_data
 }