Merge pull request #147 from public-awesome/shanev/addr-string

`Addr` -> `String` in response

contracts/minter/schema/config_response.json

@@ -14,7 +14,7 @@
   ],
   "properties": {
     "admin": {
-      "$ref": "#/definitions/Addr"
+      "type": "string"
     },
     "base_token_uri": {
       "type": "string"
@@ -30,7 +30,7 @@
       "minimum": 0.0
     },
     "sg721_address": {
-      "$ref": "#/definitions/Addr"
+      "type": "string"
     },
     "sg721_code_id": {
       "type": "integer",
@@ -44,21 +44,13 @@
       "$ref": "#/definitions/Coin"
     },
     "whitelist": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/Addr"
-        },
-        {
-          "type": "null"
-        }
+      "type": [
+        "string",
+        "null"
       ]
     }
   },
   "definitions": {
-    "Addr": {
-      "description": "A human readable address.\n\nIn Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.\n\nThis type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.\n\nThis type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.",
-      "type": "string"
-    },
     "Coin": {
       "type": "object",
       "required": [

contracts/minter/src/contract.rs

@@ -545,15 +545,15 @@ fn query_config(deps: Deps) -> StdResult<ConfigResponse> {
     let sg721_address = SG721_ADDRESS.load(deps.storage)?;
 
     Ok(ConfigResponse {
-        admin: config.admin,
+        admin: config.admin.to_string(),
         base_token_uri: config.base_token_uri,
-        sg721_address,
+        sg721_address: sg721_address.to_string(),
         sg721_code_id: config.sg721_code_id,
         num_tokens: config.num_tokens,
         start_time: config.start_time,
         unit_price: config.unit_price,
         per_address_limit: config.per_address_limit,
-        whitelist: config.whitelist,
+        whitelist: config.whitelist.map(|w| w.to_string()),
     })
 }
 

contracts/minter/src/contract_tests.rs

@@ -537,7 +537,7 @@ fn mint_count_query() {
     let (creator, buyer) = setup_accounts(&mut router);
     let num_tokens = 10;
     let (minter_addr, config) = setup_minter_contract(&mut router, &creator, num_tokens);
-    let sg721_addr = config.sg721_address;
+    let sg721_addr = Addr::unchecked(config.sg721_address);
     let whitelist_addr = setup_whitelist_contract(&mut router, &creator);
     const EXPIRATION_TIME: Timestamp = Timestamp::from_nanos(GENESIS_MINT_START_TIME + 10_000);
 
@@ -895,7 +895,7 @@ fn whitelist_access_len_add_remove_expiration() {
     };
     let res = router.execute_contract(
         buyer.clone(),
-        sg721_addr,
+        Addr::unchecked(sg721_addr),
         &transfer_msg,
         &coins_for_msg(coin(123, NATIVE_DENOM)),
     );

contracts/minter/src/msg.rs

@@ -1,4 +1,4 @@
-use cosmwasm_std::{Addr, Coin, Timestamp};
+use cosmwasm_std::{Coin, Timestamp};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -39,15 +39,15 @@ pub enum QueryMsg {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ConfigResponse {
-    pub admin: Addr,
+    pub admin: String,
     pub base_token_uri: String,
     pub num_tokens: u32,
     pub per_address_limit: u32,
-    pub sg721_address: Addr,
+    pub sg721_address: String,
     pub sg721_code_id: u64,
     pub start_time: Timestamp,
     pub unit_price: Coin,
-    pub whitelist: Option<Addr>,
+    pub whitelist: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]

types/contracts/minter/config.d.ts

@@ -1,4 +1,15 @@
-import { Addr, Coin, Timestamp } from "./shared-types";
+import { Coin, Timestamp } from "./shared-types";
+
+/**
+ * A human readable address.
+ * 
+ * In Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.
+ * 
+ * This type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.
+ * 
+ * This type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.
+ */
+export type Addr = string
 
 export interface Config {
 admin: Addr

types/contracts/minter/config_response.d.ts

@@ -1,14 +1,14 @@
-import { Addr, Coin, Timestamp } from "./shared-types";
+import { Coin, Timestamp } from "./shared-types";
 
 export interface ConfigResponse {
-admin: Addr
+admin: string
 base_token_uri: string
 num_tokens: number
 per_address_limit: number
-sg721_address: Addr
+sg721_address: string
 sg721_code_id: number
 start_time: Timestamp
 unit_price: Coin
-whitelist?: (Addr | null)
+whitelist?: (string | null)
 [k: string]: unknown
 }

types/contracts/minter/shared-types.d.ts

@@ -1,13 +1,3 @@
-/**
- * A human readable address.
- *
- * In Cosmos, this is typically bech32 encoded. But for multi-chain smart contracts no assumptions should be made other than being UTF-8 encoded and of reasonable length.
- *
- * This type represents a validated address. It can be created in the following ways 1. Use `Addr::unchecked(input)` 2. Use `let checked: Addr = deps.api.addr_validate(input)?` 3. Use `let checked: Addr = deps.api.addr_humanize(canonical_addr)?` 4. Deserialize from JSON. This must only be done from JSON that was validated before such as a contract's state. `Addr` must not be used in messages sent by the user because this would result in unvalidated instances.
- *
- * This type is immutable. If you really need to mutate it (Really? Are you sure?), create a mutable copy using `let mut mutable = Addr::to_string()` and operate on that `String` instance.
- */
-export type Addr = string;
 /**
  * A point in time in nanosecond precision.
  *