remove cosmwasm-vm dependency

Author: colmazia

packages/vm/Cargo.toml

@@ -17,4 +17,4 @@ wasmer-middlewares = "2.3.0"
 # owasm-crypto = { path = "../crypto", version = "0.1.13" }
 tempfile = "3.1.0"
 clru = "0.2.0"
-cosmwasm-vm = "0.13.2"
+sha2 = "0.9.1"

packages/vm/src/cache.rs

@@ -1,7 +1,6 @@
-use crate::error::Error;
+use crate::{error::Error, checksum::Checksum};
 
 use clru::CLruCache;
-use cosmwasm_vm::Checksum;
 use wasmer::{Instance, Module, Store};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]

packages/vm/src/checksum.rs

@@ -0,0 +1,87 @@
+use std::convert::TryFrom;
+
+use sha2::{Digest, Sha256};
+
+use crate::Error;
+
+/// A SHA-256 checksum of a Wasm blob, used to identify a Wasm code.
+/// This must remain stable since this checksum is stored in the blockchain state.
+///
+/// This is often referred to as "code ID" in go-cosmwasm, even if code ID
+/// usually refers to an auto-incrementing number.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+pub struct Checksum([u8; 32]);
+
+impl Checksum {
+    pub fn generate(wasm: &[u8]) -> Self {
+        Checksum(Sha256::digest(wasm).into())
+    }
+
+    /// Creates a lowercase hex encoded copy of this checksum
+    pub fn to_hex(&self) -> String {
+        hex::encode(self.0)
+    }
+}
+
+impl From<[u8; 32]> for Checksum {
+    fn from(data: [u8; 32]) -> Self {
+        Checksum(data)
+    }
+}
+
+impl TryFrom<&[u8]> for Checksum {
+    type Error = Error;
+
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        if value.len() != 32 {
+            return Err(Error::ChecksumLengthNotMatch);
+        }
+        let mut data = [0u8; 32];
+        data.copy_from_slice(value);
+        Ok(Checksum(data))
+    }
+}
+
+impl Into<Vec<u8>> for Checksum {
+    fn into(self) -> Vec<u8> {
+        // Rust 1.43+ also supports self.0.into()
+        self.0.to_vec()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn generate_works() {
+        let wasm = vec![0x68, 0x69, 0x6a];
+        let checksum = Checksum::generate(&wasm);
+
+        // echo -n "hij" | sha256sum
+        let expected = [
+            0x72, 0x2c, 0x8c, 0x99, 0x3f, 0xd7, 0x5a, 0x76, 0x27, 0xd6, 0x9e, 0xd9, 0x41, 0x34,
+            0x4f, 0xe2, 0xa1, 0x42, 0x3a, 0x3e, 0x75, 0xef, 0xd3, 0xe6, 0x77, 0x8a, 0x14, 0x28,
+            0x84, 0x22, 0x71, 0x04,
+        ];
+        assert_eq!(checksum.0, expected);
+    }
+
+    #[test]
+    fn to_hex_works() {
+        let wasm = vec![0x68, 0x69, 0x6a];
+        let checksum = Checksum::generate(&wasm);
+        // echo -n "hij" | sha256sum
+        assert_eq!(
+            checksum.to_hex(),
+            "722c8c993fd75a7627d69ed941344fe2a1423a3e75efd3e6778a142884227104"
+        );
+    }
+
+    #[test]
+    fn into_vec_works() {
+        let checksum = Checksum::generate(&vec![12u8; 17]);
+        let as_vec: Vec<u8> = checksum.into();
+        assert_eq!(as_vec, checksum.0);
+    }
+}

packages/vm/src/error.rs

@@ -21,6 +21,8 @@ pub enum Error {
     OutOfGasError = 12,      // Out-of-gas while executing the Wasm script.
     BadEntrySignatureError = 13, // Bad execution entry point signature.
     MemoryOutOfBoundError = 14, // Out-of-bound memory access while executing the wasm script
+    UninitializedContextData = 15, // Error while getting uninitialized context data.
+    ChecksumLengthNotMatch = 16, // Checksum not of intended length.
     // Host-generated errors while interacting with OEI.
     WrongPeriodActionError = 128, // OEI action to invoke is not available.
     TooManyExternalDataError = 129, // Too many external data requests.

packages/vm/src/lib.rs

@@ -1,5 +1,6 @@
 pub mod cache;
 pub mod calls;
+mod checksum;
 pub mod compile;
 pub mod error;
 mod imports;

packages/vm/src/vm.rs

@@ -3,7 +3,6 @@ use std::borrow::Borrow;
 use std::ptr::NonNull;
 use std::sync::{Arc, Mutex, RwLock};
 
-use cosmwasm_vm::{VmError, VmResult};
 use wasmer::{Instance, Memory, WasmerEnv};
 use wasmer_middlewares::metering::{get_remaining_points, set_remaining_points, MeteringPoints};
 
@@ -109,16 +108,16 @@ where
         data.wasmer_instance = instance;
     }
 
-    pub fn with_wasmer_instance<C, R>(&self, callback: C) -> VmResult<R>
+    pub fn with_wasmer_instance<C, R>(&self, callback: C) -> Result<R, Error>
     where
-        C: FnOnce(&Instance) -> VmResult<R>,
+        C: FnOnce(&Instance) -> Result<R, Error>,
     {
         self.with_context_data(|context_data| match context_data.wasmer_instance {
             Some(instance_ptr) => {
                 let instance_ref = unsafe { instance_ptr.as_ref() };
                 callback(instance_ref)
             }
-            None => Err(VmError::UninitializedContextData { kind: "wasmer_instance".to_string() }),
+            None => Err(Error::UninitializedContextData),
         })
     }