Merge pull request #121 from public-awesome/JakeHartnell/re-add-creator

Re-add creator to CollectionInfo, @stargazezone/types v0.2.3

contracts/minter/schema/instantiate_msg.json

@@ -65,10 +65,14 @@
     "CollectionInfo_for_RoyaltyInfoResponse": {
       "type": "object",
       "required": [
+        "creator",
         "description",
         "image"
       ],
       "properties": {
+        "creator": {
+          "type": "string"
+        },
         "description": {
           "type": "string"
         },

contracts/minter/src/contract_tests.rs

@@ -107,6 +107,7 @@ fn setup_minter_contract(
             symbol: String::from("TEST"),
             minter: creator.to_string(),
             collection_info: CollectionInfo {
+                creator: creator.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -215,6 +216,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -244,6 +246,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -273,6 +276,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -301,6 +305,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -329,6 +334,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -357,6 +363,7 @@ fn initialization() {
             symbol: String::from("TEST"),
             minter: info.sender.to_string(),
             collection_info: CollectionInfo {
+                creator: info.sender.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -1189,6 +1196,7 @@ fn test_start_time_before_genesis() {
             symbol: String::from("TEST"),
             minter: creator.to_string(),
             collection_info: CollectionInfo {
+                creator: creator.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -1239,6 +1247,7 @@ fn test_update_start_time() {
             symbol: String::from("TEST"),
             minter: creator.to_string(),
             collection_info: CollectionInfo {
+                creator: creator.to_string(),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),

contracts/sg721/schema/collection_info_response.json

@@ -3,10 +3,14 @@
   "title": "CollectionInfoResponse",
   "type": "object",
   "required": [
+    "creator",
     "description",
     "image"
   ],
   "properties": {
+    "creator": {
+      "type": "string"
+    },
     "description": {
       "type": "string"
     },

contracts/sg721/schema/instantiate_msg.json

@@ -26,10 +26,14 @@
     "CollectionInfo_for_RoyaltyInfoResponse": {
       "type": "object",
       "required": [
+        "creator",
         "description",
         "image"
       ],
       "properties": {
+        "creator": {
+          "type": "string"
+        },
         "description": {
           "type": "string"
         },

contracts/sg721/src/contract.rs

@@ -69,7 +69,10 @@ pub fn instantiate(
         None => None,
     };
 
+    deps.api.addr_validate(&msg.collection_info.creator)?;
+
     let collection_info = CollectionInfo {
+        creator: msg.collection_info.creator,
         description: msg.collection_info.description,
         image: msg.collection_info.image,
         external_link: msg.collection_info.external_link,
@@ -116,6 +119,7 @@ fn query_config(deps: Deps) -> StdResult<CollectionInfoResponse> {
     };
 
     Ok(CollectionInfoResponse {
+        creator: info.creator,
         description: info.description,
         image: info.image,
         external_link: info.external_link,
@@ -142,6 +146,7 @@ mod tests {
             symbol: String::from("BOBO"),
             minter: String::from("minter"),
             collection_info: CollectionInfo {
+                creator: String::from("creator"),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),
@@ -177,6 +182,7 @@ mod tests {
             symbol: String::from("BOBO"),
             minter: String::from("minter"),
             collection_info: CollectionInfo {
+                creator: String::from("creator"),
                 description: String::from("Stargaze Monkeys"),
                 image: "https://example.com/image.png".to_string(),
                 external_link: Some("https://example.com/external.html".to_string()),

contracts/sg721/src/msg.rs

@@ -141,6 +141,7 @@ impl From<QueryMsg> for Cw721QueryMsg {
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct CollectionInfoResponse {
+    pub creator: String,
     pub description: String,
     pub image: String,
     pub external_link: Option<String>,

contracts/sg721/src/state.rs

@@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct CollectionInfo<T> {
+    pub creator: String,
     pub description: String,
     pub image: String,
     pub external_link: Option<String>,

types/contracts/minter/config.d.ts

@@ -4,9 +4,9 @@ export interface Config {
 admin: Addr
 base_token_uri: string
 num_tokens: number
-per_address_limit?: (number | null)
+per_address_limit: number
 sg721_code_id: number
-start_time?: (Expiration | null)
+start_time: Expiration
 unit_price: Coin
 whitelist?: (Addr | null)
 [k: string]: unknown

types/contracts/minter/config_response.d.ts

@@ -4,10 +4,10 @@ export interface ConfigResponse {
 admin: Addr
 base_token_uri: string
 num_tokens: number
-per_address_limit?: (number | null)
+per_address_limit: number
 sg721_address: Addr
 sg721_code_id: number
-start_time?: (Expiration | null)
+start_time: Expiration
 unit_price: Coin
 whitelist?: (Addr | null)
 [k: string]: unknown

types/contracts/minter/instantiate_msg.d.ts

@@ -1,4 +1,4 @@
-import { Addr, Coin, Expiration } from "./shared-types";
+import { Coin, Expiration } from "./shared-types";
 
 /**
  * A fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0
@@ -10,30 +10,31 @@ export type Decimal = string
 export interface InstantiateMsg {
 base_token_uri: string
 num_tokens: number
-per_address_limit?: (number | null)
+per_address_limit: number
 sg721_code_id: number
 sg721_instantiate_msg: InstantiateMsg1
-start_time?: (Expiration | null)
+start_time: Expiration
 unit_price: Coin
 whitelist?: (string | null)
 [k: string]: unknown
 }
 export interface InstantiateMsg1 {
-collection_info: CollectionInfo
+collection_info: CollectionInfoFor_RoyaltyInfoResponse
 minter: string
 name: string
 symbol: string
 [k: string]: unknown
 }
-export interface CollectionInfo {
+export interface CollectionInfoFor_RoyaltyInfoResponse {
+creator: string
 description: string
 external_link?: (string | null)
 image: string
-royalties?: (RoyaltyInfo | null)
+royalty_info?: (RoyaltyInfoResponse | null)
 [k: string]: unknown
 }
-export interface RoyaltyInfo {
-payment_address: Addr
+export interface RoyaltyInfoResponse {
+payment_address: string
 share: Decimal
 [k: string]: unknown
 }

types/contracts/minter/query_msg.d.ts

@@ -14,4 +14,9 @@ start_time: {
 mint_price: {
 [k: string]: unknown
 }
+} | {
+mint_count: {
+address: string
+[k: string]: unknown
+}
 })

types/contracts/sg721/collection_info_response.d.ts

@@ -1,9 +1,10 @@
-import { RoyaltyInfo } from "./shared-types";
+import { RoyaltyInfoResponse } from "./shared-types";
 
 export interface CollectionInfoResponse {
+creator: string
 description: string
 external_link?: (string | null)
 image: string
-royalty?: (RoyaltyInfo | null)
+royalty?: (RoyaltyInfoResponse | null)
 [k: string]: unknown
 }

types/contracts/sg721/instantiate_msg.d.ts

@@ -1,16 +1,17 @@
-import { RoyaltyInfo } from "./shared-types";
+import { RoyaltyInfoResponse } from "./shared-types";
 
 export interface InstantiateMsg {
-collection_info: CollectionInfo
+collection_info: CollectionInfoFor_RoyaltyInfoResponse
 minter: string
 name: string
 symbol: string
 [k: string]: unknown
 }
-export interface CollectionInfo {
+export interface CollectionInfoFor_RoyaltyInfoResponse {
+creator: string
 description: string
 external_link?: (string | null)
 image: string
-royalties?: (RoyaltyInfo | null)
+royalty_info?: (RoyaltyInfoResponse | null)
 [k: string]: unknown
 }

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

@@ -1,21 +1,11 @@
-/**
- * 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 fixed-point decimal value with 18 fractional digits, i.e. Decimal(1_000_000_000_000_000_000) == 1.0
  *
  * The greatest possible value that can be represented is 340282366920938463463.374607431768211455 (which is (2^128 - 1) / 10^18)
  */
 export type Decimal = string;
-export interface RoyaltyInfo {
+export interface RoyaltyInfoResponse {
     [k: string]: unknown;
-    payment_address: Addr;
+    payment_address: string;
     share: Decimal;
 }

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stargazezone/types",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Types for Stargaze CosmWasm Contracts",
   "main": "build/codegen.js",
   "scripts": {