Update erc20 contract to 0.8

erc20/Cargo.toml

@@ -33,18 +33,17 @@ overflow-checks = true
 default = ["cranelift"]
 # for quicker tests, cargo test --lib
 # for more explicit tests, cargo test --features=backtraces
-backtraces = ["cosmwasm/backtraces", "cosmwasm-vm/backtraces"]
+backtraces = ["cosmwasm-std/backtraces", "cosmwasm-vm/backtraces"]
 cranelift = ["cosmwasm-vm/default-cranelift"]
 singlepass = ["cosmwasm-vm/default-singlepass"]
 
 [dependencies]
-cosmwasm = { version = "0.7.0" }
-cw-storage = "0.2.0"
-schemars = "=0.5"
-serde = { version = "=1.0.103", default-features = false, features = ["derive"] }
-snafu = { version = "=0.5.0", default-features = false, features = ["rust_1_30"] }
-hex = "=0.4.0"
+cosmwasm-std = "0.8.0"
+cosmwasm-storage = "0.8.0"
+schemars = "0.7"
+serde = { version = "1.0.103", default-features = false, features = ["derive"] }
+hex = "0.4"
 
 [dev-dependencies]
-cosmwasm-vm = { version = "0.7.0", default-features = false }
-serde_json = "1.0"
+cosmwasm-vm = { version = "0.8.0", default-features = false }
+cosmwasm-schema = "0.8.0"

erc20/examples/schema.rs

@@ -1,8 +1,7 @@
 use std::env::current_dir;
-use std::fs::{create_dir_all, write};
-use std::path::PathBuf;
+use std::fs::create_dir_all;
 
-use schemars::{schema::RootSchema, schema_for};
+use cosmwasm_schema::{export_schema, remove_schemas, schema_for};
 
 use cw_erc20::contract::Constants;
 use cw_erc20::msg::{AllowanceResponse, BalanceResponse, HandleMsg, InitMsg, QueryMsg};
@@ -11,6 +10,7 @@ fn main() {
     let mut out_dir = current_dir().unwrap();
     out_dir.push("schema");
     create_dir_all(&out_dir).unwrap();
+    remove_schemas(&out_dir).unwrap();
 
     export_schema(&schema_for!(InitMsg), &out_dir);
     export_schema(&schema_for!(HandleMsg), &out_dir);
@@ -19,29 +19,3 @@ fn main() {
     export_schema(&schema_for!(AllowanceResponse), &out_dir);
     export_schema(&schema_for!(Constants), &out_dir);
 }
-
-/// Writes schema to file. Overwrites existing file.
-/// Panics on any error writing out the schema.
-fn export_schema(schema: &RootSchema, out_dir: &PathBuf) -> () {
-    let title = schema
-        .schema
-        .metadata
-        .as_ref()
-        .map(|b| b.title.clone().unwrap_or("untitled".to_string()))
-        .unwrap_or("unknown".to_string());
-    let path = out_dir.join(format!("{}.json", to_snake_case(&title)));
-    let json = serde_json::to_string_pretty(schema).unwrap();
-    write(&path, json + "\n").unwrap();
-    println!("Created {}", path.to_str().unwrap());
-}
-
-fn to_snake_case(name: &str) -> String {
-    let mut out = String::new();
-    for (index, ch) in name.char_indices() {
-        if index != 0 && ch.is_uppercase() {
-            out.push('_');
-        }
-        out.push(ch.to_ascii_lowercase());
-    }
-    out
-}

erc20/schema/allowance_response.json

@@ -7,6 +7,11 @@
   ],
   "properties": {
     "allowance": {
+      "$ref": "#/definitions/Uint128"
+    }
+  },
+  "definitions": {
+    "Uint128": {
       "type": "string"
     }
   }

erc20/schema/balance_response.json

@@ -7,6 +7,11 @@
   ],
   "properties": {
     "balance": {
+      "$ref": "#/definitions/Uint128"
+    }
+  },
+  "definitions": {
+    "Uint128": {
       "type": "string"
     }
   }

erc20/schema/handle_msg.json

@@ -16,7 +16,7 @@
           ],
           "properties": {
             "amount": {
-              "type": "string"
+              "$ref": "#/definitions/Uint128"
             },
             "spender": {
               "$ref": "#/definitions/HumanAddr"
@@ -39,7 +39,7 @@
           ],
           "properties": {
             "amount": {
-              "type": "string"
+              "$ref": "#/definitions/Uint128"
             },
             "recipient": {
               "$ref": "#/definitions/HumanAddr"
@@ -63,7 +63,7 @@
           ],
           "properties": {
             "amount": {
-              "type": "string"
+              "$ref": "#/definitions/Uint128"
             },
             "owner": {
               "$ref": "#/definitions/HumanAddr"
@@ -88,7 +88,7 @@
           ],
           "properties": {
             "amount": {
-              "type": "string"
+              "$ref": "#/definitions/Uint128"
             }
           }
         }
@@ -98,6 +98,9 @@
   "definitions": {
     "HumanAddr": {
       "type": "string"
+    },
+    "Uint128": {
+      "type": "string"
     }
   }
 }

erc20/schema/init_msg.json

@@ -42,9 +42,12 @@
           "$ref": "#/definitions/HumanAddr"
         },
         "amount": {
-          "type": "string"
+          "$ref": "#/definitions/Uint128"
         }
       }
+    },
+    "Uint128": {
+      "type": "string"
     }
   }
 }