Update CHANGELOG (#74)

* Add changelog * Save mint lock state on collection creation (#56) * Token Module (#57) * Use sender for contract admin query on token module instantiate * Refactor token module tests * Update CHANGELOG * Change typescript file name * Update update price events (#64) * Custom Module Template (#65) * Add initial contract files * Add msg template * Add state template * Add test template * Add contract files * Add error template * Add contract template * Run fmt * Update notice email * Update contract name * Update some comments * Update README * Update readme * Update comments * Update CHANGELOG * Update README * Custom Permission Template (#66) * Add contract related files * Add contract state * Add msg template * Add error template * Add contract template * Run fmt * Update CHANGELOG * Update README * Add missing instantiate code (#67) * Fix small errors (#70) * Modules Query Hub Module (#68) * Change modules key to be a string * Add modules query message * Add query codee * Add tests for query * Update CHANGELOG * Fee Module Operator Support (#69) * Add new messages * Add state * Add contract logic * Add tests * Update CHANGELOG * Save sender's address as an operator on hub creation (#73) * Save sender's address as an operator on hub creation * Update CHANGELOG * Move token module integration tests to mint module (#72) * Bump versions * Update CHANGELOG * Update CHANGELOG
KompleTeam · Feb 23, 2023 · b4d23fe · b4d23fe
1 parent 00d0c31
commit b4d23fe
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1-beta] - 2023-02-32
+
+### Changed
+
+- On Hub Module instantiation, `info.sender` is now saved as an operator for the contract. ([#73](https://github.com/KompleTeam/komple-framework/pull/73))
+
 ## [1.1.0-beta] - 2023-02-14
 
 ### Added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/modules/custom/Cargo.toml b/contracts/modules/custom/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-custom-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used as a template for kickstarting module development in Komple Framework."
@@ -54,8 +54,8 @@ cw2 = "1.0.1"
 schemars = "0.8.10"
 serde = { version = "1.0.145", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.31" }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta" }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta" }
 
 [dev-dependencies]
 cw-multi-test = "0.16.2"
diff --git a/contracts/modules/fee/Cargo.toml b/contracts/modules/fee/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-fee-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for general fee configuration and distribution in Komple Framework."
@@ -53,8 +53,8 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["response", "funds"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["response", "funds"] }
 cw20 = "0.16.0"
 
 [dev-dependencies]

diff --git a/contracts/modules/hub/Cargo.toml b/contracts/modules/hub/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-hub-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for module registry and address resolution in Komple Framework."
@@ -53,8 +53,8 @@ cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
 cw-utils = "0.15.1"
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["funds"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["funds"] }
 
 [dev-dependencies]
 cw-multi-test = "0.15.1"

diff --git a/contracts/modules/hub/src/contract.rs b/contracts/modules/hub/src/contract.rs
@@ -35,7 +35,7 @@ const MAX_DESCRIPTION_LENGTH: u32 = 512;
 pub fn instantiate(
     deps: DepsMut,
     _env: Env,
-    _info: MessageInfo,
+    info: MessageInfo,
     msg: RegisterMsg,
 ) -> Result<Response, ContractError> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
@@ -47,9 +47,11 @@ pub fn instantiate(
     let data: InstantiateMsg = from_binary(&msg.data.unwrap())?;
 
     let admin = deps.api.addr_validate(&msg.admin)?;
-    let config = Config { admin };
+    let config = Config { admin: admin.clone() };
     CONFIG.save(deps.storage, &config)?;
 
+    OPERATORS.save(deps.storage, &vec![info.sender])?;
+
     if data.hub_info.description.len() > MAX_DESCRIPTION_LENGTH as usize {
         return Err(ContractError::DescriptionTooLong {});
     }

diff --git a/contracts/modules/marketplace/Cargo.toml b/contracts/modules/marketplace/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-marketplace-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for the second hand sale of tokens in Komple Framework."
@@ -52,10 +52,10 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta" }
-komple-framework-token-module = { path = "../token", version = "1.1.0-beta", features = ["library"] }
-komple-framework-fee-module = { path = "../fee", version = "1.1.0-beta", features = ["library"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta" }
+komple-framework-token-module = { path = "../token", version = "1.1.1-beta", features = ["library"] }
+komple-framework-fee-module = { path = "../fee", version = "1.1.1-beta", features = ["library"] }
 cw721-base = { version = "0.15.0", features = ["library"] }
 cw20 = "0.16.0"
 

diff --git a/contracts/modules/merge/Cargo.toml b/contracts/modules/merge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-merge-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for merging multiple tokens and minting a new one in Komple Framework."
@@ -52,11 +52,11 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-token-module = { path = "../token", version = "1.1.0-beta", features = ["library"] }
-komple-framework-permission-module = { path = "../permission", version = "1.1.0-beta", features = ["library"] }
-komple-framework-mint-module = { path = "../mint", version = "1.1.0-beta", features = ["library"] }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["storage"] }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
+komple-framework-token-module = { path = "../token", version = "1.1.1-beta", features = ["library"] }
+komple-framework-permission-module = { path = "../permission", version = "1.1.1-beta", features = ["library"] }
+komple-framework-mint-module = { path = "../mint", version = "1.1.1-beta", features = ["library"] }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["storage"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
 cw721-base = { version = "0.15.0", features = ["library"] }
 
 [dev-dependencies]

diff --git a/contracts/modules/metadata/Cargo.toml b/contracts/modules/metadata/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-metadata-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for keeping metadata information of a collection in Komple Framework."
@@ -52,8 +52,8 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["response"] }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["response"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
 
 [dev-dependencies]
 cw-multi-test = "0.15.1"
diff --git a/contracts/modules/mint/Cargo.toml b/contracts/modules/mint/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-mint-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for collection management and token minting in Komple Framework."
@@ -52,13 +52,13 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-token-module = { path = "../token", version = "1.1.0-beta", features = ["library"] }
-komple-framework-permission-module = { path = "../permission", version = "1.1.0-beta", features = ["library"] }
+komple-framework-token-module = { path = "../token", version = "1.1.1-beta", features = ["library"] }
+komple-framework-permission-module = { path = "../permission", version = "1.1.1-beta", features = ["library"] }
 cw-utils = "0.15.1"
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta" }
-komple-framework-fee-module = { path = "../fee", version = "1.1.0-beta", features = ["library"] }
-komple-framework-whitelist-module = { path = "../whitelist", version = "1.1.0-beta", features = ["library"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta" }
+komple-framework-fee-module = { path = "../fee", version = "1.1.1-beta", features = ["library"] }
+komple-framework-whitelist-module = { path = "../whitelist", version = "1.1.1-beta", features = ["library"] }
 cw20 = "0.16.0"
 
 [dev-dependencies]

diff --git a/contracts/modules/token/tests/helpers/mod.rs → contracts/modules/mint/tests/helpers/mod.rs b/contracts/modules/token/tests/helpers/mod.rs → contracts/modules/mint/tests/helpers/mod.rs
diff --git a/contracts/modules/token/tests/integration.rs → ...s/modules/mint/tests/token_integration.rs b/contracts/modules/token/tests/integration.rs → ...s/modules/mint/tests/token_integration.rs
diff --git a/...ules/token/tests/whitelist_integration.rs → ...dules/mint/tests/whitelist_integration.rs b/...ules/token/tests/whitelist_integration.rs → ...dules/mint/tests/whitelist_integration.rs
diff --git a/contracts/modules/permission/Cargo.toml b/contracts/modules/permission/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-permission-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for permission registry and execute/query message execution in front of module operations in Komple Framework."
@@ -52,8 +52,8 @@ cosmwasm-schema = "1.1.0"
 cw-storage-plus = "0.15.1"
 cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["storage"] }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["storage"] }
 cw-utils = "0.15.1"
 
 [dev-dependencies]

diff --git a/contracts/modules/token/Cargo.toml b/contracts/modules/token/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "komple-framework-token-module"
-version = "1.1.0-beta"
+version = "1.1.1-beta"
 authors = ["findolor <findolor@komple.io>"]
 edition = "2018"
 description = "Contract used for collection configuration and token management in Komple Framework."
@@ -54,12 +54,11 @@ cw2 = "0.15.1"
 thiserror = { version = "1.0.31" }
 cw721 = "0.15.0"
 cw721-base = { version = "0.15.0", features = ["library"] }
-komple-framework-types = { path = "../../../packages/types", version = "1.1.0-beta" }
-komple-framework-utils = { path = "../../../packages/utils", version = "1.1.0-beta", features = ["response", "storage"] }
-komple-framework-metadata-module = { path = "../metadata", version = "1.1.0-beta", features = ["library"] }
-komple-framework-whitelist-module = { path = "../whitelist", version = "1.1.0-beta", features = ["library"]  }
+komple-framework-types = { path = "../../../packages/types", version = "1.1.1-beta" }
+komple-framework-utils = { path = "../../../packages/utils", version = "1.1.1-beta", features = ["response", "storage"] }
+komple-framework-metadata-module = { path = "../metadata", version = "1.1.1-beta", features = ["library"] }
+komple-framework-whitelist-module = { path = "../whitelist", version = "1.1.1-beta", features = ["library"]  }
 cw-utils = "0.15.1"
 
 [dev-dependencies]
 cw-multi-test = "0.15.1"
-komple-framework-mint-module = { path = "../mint", features = ["library"] }