Fix contract to parse proper types

x/contract/examples/regen/Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 # lto = true
 
 [dependencies]
-serde_json = "1.0.39"
+serde_json = { version = "1.0.39", features = ["raw_value"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 heapless = "0.4.0"
 failure = "0.1.5"

x/contract/examples/regen/src/contract.rs

@@ -2,26 +2,26 @@ use crate::{get_state, set_state, CosmosMsg, InitParams, SendAmount, SendParams}
 
 use failure::{bail, Error};
 use serde::{Deserialize, Serialize};
-use serde_json::{from_slice, to_vec};
+use serde_json::{from_slice, from_str, to_vec};
 
 #[derive(Serialize, Deserialize)]
 struct RegenInitMsg {
-    verifier: Vec<u8>,
-    beneficiary: Vec<u8>,
+    verifier: String,
+    beneficiary: String,
 }
 
 #[derive(Serialize, Deserialize)]
 struct RegenState {
-    verifier: Vec<u8>,
-    beneficiary: Vec<u8>,
+    verifier: String,
+    beneficiary: String,
     payout: u64,
 }
 
 #[derive(Serialize, Deserialize)]
 struct RegenSendMsg {}
 
 pub fn init(params: InitParams) -> Result<Vec<CosmosMsg>, Error> {
-    let msg: RegenInitMsg = from_slice(&params.msg)?;
+    let msg: RegenInitMsg = from_str(params.msg.get())?;
 
     set_state(to_vec(&RegenState {
         verifier: msg.verifier,

x/contract/examples/regen/src/lib.rs

@@ -5,6 +5,7 @@ extern crate serde_json;
 
 use failure::Error;
 use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
 use serde_json::{from_slice, to_vec};
 use std::ffi::{CStr, CString};
 use std::mem;
@@ -14,10 +15,11 @@ mod contract;
 use contract::{init, send};
 
 #[derive(Serialize, Deserialize)]
-pub struct SendParams {
-    contract_address: Vec<u8>,
-    sender: Vec<u8>,
-    msg: Vec<u8>,
+pub struct SendParams<'a> {
+    contract_address: String,
+    sender: String,
+    #[serde(borrow)]
+    msg: &'a RawValue,
     sent_funds: u64,
 }
 
@@ -27,8 +29,8 @@ struct RegenSendMsg {}
 #[derive(Serialize, Deserialize)]
 pub enum CosmosMsg {
     SendTx {
-        from_address: Vec<u8>,
-        to_address: Vec<u8>,
+        from_address: String,
+        to_address: String,
         amount: Vec<SendAmount>,
     },
 }
@@ -85,10 +87,11 @@ pub extern "C" fn deallocate(pointer: *mut c_void, capacity: usize) {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct InitParams {
-    contract_address: Vec<u8>,
-    sender: Vec<u8>,
-    msg: Vec<u8>,
+pub struct InitParams<'a> {
+    contract_address: String,
+    sender: String,
+    #[serde(borrow)]
+    msg: &'a RawValue,
     sent_funds: u64,
 }