Merge pull request #129 from aionnetwork/dev

Dev
aionnetwork · Apr 13, 2020 · a930651 · a930651
2 parents 35dfa04 + e94120f
commit a930651
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/resources/Dockerfile b/resources/Dockerfile
@@ -14,6 +14,6 @@ ENV LIBRARY_PATH="${JAVA_HOME}/lib/server"
 ENV LD_LIBRARY_PATH="${LIBRARY_PATH}:/usr/local/lib:/run/libs" PATH="${PATH}:${JAVA_HOME}/bin"
 
 ENTRYPOINT ["/bin/bash"]
-CMD ["./mainnet.sh --base-path=mainnet/base"]
+CMD ["./mainnet.sh", "--base-path=mainnet/base"]
 
 EXPOSE 30303 8545 8546 8547 8008
diff --git a/vms/fastvm/native/rust_evm_intf/fastvm.cpp b/vms/fastvm/native/rust_evm_intf/fastvm.cpp
@@ -382,9 +382,12 @@ extern "C" {
     pop_gbl_obj();
     gbl_cb_obj = gbl_cb_objs[cur_obj];
     recv_idx -= 1;
-    if (recv_idx == -1)
+    if (recv_idx == -1) {
       curr_recv_addr.filled = 0;
-
+    }
+    else {
+      memcpy(&curr_recv_addr.addr, &recv_addr_repo[recv_idx], sizeof(evm_address));
+    }
     // release
 #if 1
     if (evm_result.release) {

diff --git a/vms/fastvm/src/core.rs b/vms/fastvm/src/core.rs
@@ -26,6 +26,7 @@ use std::ptr;
 use bincode::{serialize};
 use ffi::*;
 
+const REVISION_AION_V0: i32 = 5;
 const REVISION_AION_V1: i32 = 7;
 
 impl EvmJit<u8> for EvmResult {
@@ -133,7 +134,12 @@ impl FastVM {
         //let vm_ctx: *mut ::libc::wchar_t = unsafe { mem::transmute(&ctx_buffer[0]) };
         let vm_ctx = get_libc_pointer_of_bytes(&ctx_buffer);
 
-        let vm_rev: i32 = self.revision.clone() as i32;
+        // let vm_rev: i32 = self.revision.clone() as i32;
+        let vm_rev: i32 = if ctx.depth == 0 {
+            REVISION_AION_V1
+        } else {
+            REVISION_AION_V0
+        };
         let mut result = EvmResult::new();
 
         match result.output_data.is_null() {