use bincode2

enclave-modules/host-api/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-bincode = { git = "https://github.com/bluele/bincode-sgx", branch = "serde" }
+bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "alloc"] }
 flex-error = { version = "0.4.4", default-features = false }
 ocall-commands = { path = "../../modules/ocall-commands", default-features = false }
 store = { path = "../../modules/store", default-features = false }

enclave-modules/host-api/src/api.rs

@@ -4,7 +4,8 @@ use ocall_commands::{Command, CommandResult};
 use sgx_types::*;
 
 pub fn execute_command(cmd: Command) -> Result<CommandResult, Error> {
-    let cmd_vec = bincode::serialize(&cmd).map_err(Error::bincode)?;
+    let cmd_vec = bincode::serde::encode_to_vec(&cmd, bincode::config::standard())
+        .map_err(Error::bincode_encode)?;
     let mut ret: sgx_status_t = sgx_status_t::SGX_ERROR_UNEXPECTED;
     let mut output_len = 0;
     let output_maxlen = 65536;
@@ -29,8 +30,11 @@ pub fn execute_command(cmd: Command) -> Result<CommandResult, Error> {
         unsafe {
             output_buf.set_len(output_len as usize);
         }
-        let res =
-            bincode::deserialize(&output_buf[..output_len as usize]).map_err(Error::bincode)?;
+        let res = bincode::serde::decode_borrowed_from_slice(
+            &output_buf[..output_len as usize],
+            bincode::config::standard(),
+        )
+        .map_err(Error::bincode_decode)?;
         if ret == sgx_status_t::SGX_SUCCESS {
             Ok(res)
         } else if let CommandResult::CommandError(descr) = res {

enclave-modules/host-api/src/errors.rs

@@ -20,8 +20,11 @@ define_error! {
         |e| {
             format_args!("Command error: status={:?} description={}", e.status, e.descr)
         },
-        Bincode
-        [TraceError<bincode::Error>]
-        |_| { "bincode error" }
+        BincodeEncode
+        [TraceError<bincode::error::EncodeError>]
+        |_| { "bincode encode error" },
+        BincodeDecode
+        [TraceError<bincode::error::DecodeError>]
+        |_| { "bincode decode error" }
     }
 }

enclave-modules/runtime/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_tstd = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 log = { version = "0.4.8", default-features = false }
-bincode = { git = "https://github.com/bluele/bincode-sgx", branch = "serde" }
+bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "alloc"] }
 flex-error = { version = "0.4.4", default-features = false }
 once_cell = { version = "1.15.0", default-features = false, features = ["alloc"] }
 

enclave-modules/runtime/src/ecalls.rs

@@ -34,9 +34,10 @@ pub fn ecall_execute_command(
         sgx_status_t::SGX_ERROR_UNEXPECTED
     );
 
-    let cmd: ECallCommand = match bincode::deserialize(unsafe {
-        alloc::slice::from_raw_parts(command, command_len as usize)
-    }) {
+    let cmd: ECallCommand = match bincode::serde::decode_borrowed_from_slice(
+        unsafe { alloc::slice::from_raw_parts(command, command_len as usize) },
+        bincode::config::standard(),
+    ) {
         Ok(cmd) => cmd,
         Err(e) => {
             error!("failed to bincode::deserialize: {:?}", e);
@@ -59,7 +60,7 @@ pub fn ecall_execute_command(
         ),
     };
 
-    let res = match bincode::serialize(&result) {
+    let res = match bincode::serde::encode_to_vec(&result, bincode::config::standard()) {
         Ok(res) => {
             if res.len() > output_buf_maxlen as usize {
                 error!(

modules/enclave-api/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_urts = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-bincode = "1.3"
+bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "alloc"] }
 log = "0.4.8"
 flex-error = { version = "0.4.4" }
 

modules/enclave-api/src/api/primitive.rs

@@ -35,7 +35,8 @@ fn raw_execute_command(eid: sgx_enclave_id_t, cmd: ECallCommand) -> Result<Comma
     let output_ptr = output_buf.as_mut_ptr();
     let mut ret = sgx_status_t::SGX_SUCCESS;
 
-    let command_bytes = bincode::serialize(&cmd).map_err(Error::bincode)?;
+    let command_bytes = bincode::serde::encode_to_vec(&cmd, bincode::config::standard())
+        .map_err(Error::bincode_encode)?;
     let result = unsafe {
         ffi::ecall_execute_command(
             eid,
@@ -54,8 +55,11 @@ fn raw_execute_command(eid: sgx_enclave_id_t, cmd: ECallCommand) -> Result<Comma
         unsafe {
             output_buf.set_len(output_len as usize);
         }
-        let res =
-            bincode::deserialize(&output_buf[..output_len as usize]).map_err(Error::bincode)?;
+        let res = bincode::serde::decode_borrowed_from_slice(
+            &output_buf[..output_len as usize],
+            bincode::config::standard(),
+        )
+        .map_err(Error::bincode_decode)?;
 
         if ret == sgx_status_t::SGX_SUCCESS {
             Ok(res)

modules/enclave-api/src/errors.rs

@@ -21,9 +21,13 @@ define_error! {
             format_args!("SGX error: {:?}", e.status)
         },
 
-        Bincode
-        [TraceError<bincode::Error>]
-        |_| { "Bincode error" },
+        BincodeEncode
+        [TraceError<bincode::error::EncodeError>]
+        |_| { "bincode encode error" },
+
+        BincodeDecode
+        [TraceError<bincode::error::DecodeError>]
+        |_| { "bincode decode error" },
 
         Command {
             status: sgx_status_t,

modules/host/Cargo.toml

@@ -8,7 +8,7 @@ sgx_urts = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 log = "0.4.8"
 once_cell = "1.15.0"
-bincode = "1.3"
+bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "alloc"] }
 
 ocall-commands = { path = "../ocall-commands" }
 ocall-handler = { path = "../ocall-handler" }

modules/host/src/ocalls.rs

@@ -37,15 +37,16 @@ pub extern "C" fn ocall_execute_command(
         return e;
     }
 
-    let cmd: OCallCommand =
-        match bincode::deserialize(unsafe { slice::from_raw_parts(command, command_len as usize) })
-        {
-            Ok(cmd) => cmd,
-            Err(e) => {
-                error!("failed to bincode::deserialize: {:?}", e);
-                return sgx_status_t::SGX_ERROR_UNEXPECTED;
-            }
-        };
+    let cmd: OCallCommand = match bincode::serde::decode_borrowed_from_slice(
+        unsafe { slice::from_raw_parts(command, command_len as usize) },
+        bincode::config::standard(),
+    ) {
+        Ok(cmd) => cmd,
+        Err(e) => {
+            error!("failed to bincode::deserialize: {:?}", e);
+            return sgx_status_t::SGX_ERROR_UNEXPECTED;
+        }
+    };
 
     let (status, result) = match ocall_handler::dispatch(
         HOST_ENVIRONMENT
@@ -60,7 +61,7 @@ pub extern "C" fn ocall_execute_command(
         ),
     };
 
-    let res = match bincode::serialize(&result) {
+    let res = match bincode::serde::encode_to_vec(&result, bincode::config::standard()) {
         Ok(res) => {
             if res.len() > output_buf_maxlen as usize {
                 error!(

modules/light-client/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 flex-error = { version = "0.4.4", default-features = false }
 serde = { version = "1.0", default-features = false, features = ["alloc"] }
 derive_more = { version = "0.99.0", default-features = false }
-bincode = { version = "2.0.0-rc.2", default-features = false, features = ["serde", "alloc"] }
+bincode = { version = "2.0.0-rc.3", default-features = false, features = ["serde", "alloc"] }
 ibc = { version = "0.29.0", default-features = false, features = ["serde"], optional = true }
 ibc-proto = { version = "0.26.0", default-features = false, features = ["parity-scale-codec", "borsh"], optional = true }