From f347345e778dc40962c7844c2d2d8a1a9b254875 Mon Sep 17 00:00:00 2001
From: ismellike <glopez11193@gmail.com>
Date: Wed, 18 Sep 2024 11:50:51 -0500
Subject: [PATCH] just gen-schema + callback messages in abc-factory

---
 contracts/external/cw-abc/schema/cw-abc.json       |  2 +-
 contracts/external/cw-abc/src/contract.rs          |  2 ++
 .../schema/cw-tokenfactory-issuer.json             | 14 ++++++++++++--
 .../dao-abc-factory/schema/dao-abc-factory.json    |  2 +-
 contracts/external/dao-abc-factory/src/contract.rs |  7 +++----
 .../schema/dao-voting-token-staked.json            |  2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/contracts/external/cw-abc/schema/cw-abc.json b/contracts/external/cw-abc/schema/cw-abc.json
index 999c99579..2b39a107b 100644
--- a/contracts/external/cw-abc/schema/cw-abc.json
+++ b/contracts/external/cw-abc/schema/cw-abc.json
@@ -224,7 +224,7 @@
             "type": "string"
           },
           "exponent": {
-            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 1^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
+            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 10^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
             "type": "integer",
             "format": "uint32",
             "minimum": 0.0
diff --git a/contracts/external/cw-abc/src/contract.rs b/contracts/external/cw-abc/src/contract.rs
index 9ae0e6a25..5993329de 100644
--- a/contracts/external/cw-abc/src/contract.rs
+++ b/contracts/external/cw-abc/src/contract.rs
@@ -294,6 +294,8 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
                             display: metadata.display,
                             name: metadata.name,
                             symbol: metadata.symbol,
+                            uri: String::default(),
+                            uri_hash: String::default(),
                         },
                     })?,
                     funds: vec![],
diff --git a/contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json b/contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json
index 19f03eae3..742eef309 100644
--- a/contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json
+++ b/contracts/external/cw-tokenfactory-issuer/schema/cw-tokenfactory-issuer.json
@@ -420,7 +420,7 @@
             "type": "string"
           },
           "exponent": {
-            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 1^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
+            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 10^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
             "type": "integer",
             "format": "uint32",
             "minimum": 0.0
@@ -483,7 +483,9 @@
           "description",
           "display",
           "name",
-          "symbol"
+          "symbol",
+          "uri",
+          "uri_hash"
         ],
         "properties": {
           "base": {
@@ -511,6 +513,14 @@
           "symbol": {
             "description": "symbol is the token symbol usually shown on exchanges (eg: ATOM). This can be the same as the display.\n\nSince: cosmos-sdk 0.43",
             "type": "string"
+          },
+          "uri": {
+            "description": "URI to a document (on or off-chain) that contains additional information. Optional.\n\nSince: cosmos-sdk 0.46",
+            "type": "string"
+          },
+          "uri_hash": {
+            "description": "URIHash is a sha256 hash of a document pointed by URI. It's used to verify that the document didn't change. Optional.\n\nSince: cosmos-sdk 0.46",
+            "type": "string"
           }
         }
       },
diff --git a/contracts/external/dao-abc-factory/schema/dao-abc-factory.json b/contracts/external/dao-abc-factory/schema/dao-abc-factory.json
index 5bfbc5751..deafc8ecc 100644
--- a/contracts/external/dao-abc-factory/schema/dao-abc-factory.json
+++ b/contracts/external/dao-abc-factory/schema/dao-abc-factory.json
@@ -193,7 +193,7 @@
             "type": "string"
           },
           "exponent": {
-            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 1^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
+            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 10^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
             "type": "integer",
             "format": "uint32",
             "minimum": 0.0
diff --git a/contracts/external/dao-abc-factory/src/contract.rs b/contracts/external/dao-abc-factory/src/contract.rs
index b2836742f..e78bc0ecf 100644
--- a/contracts/external/dao-abc-factory/src/contract.rs
+++ b/contracts/external/dao-abc-factory/src/contract.rs
@@ -12,8 +12,7 @@ use cw_abc::msg::{
 use cw_storage_plus::{Bound, Item, Map};
 use cw_utils::parse_reply_instantiate_data;
 use dao_interface::{
-    state::ModuleInstantiateCallback, token::TokenFactoryCallback,
-    voting::Query as VotingModuleQueryMsg,
+    state::CallbackMessages, token::TokenFactoryCallback, voting::Query as VotingModuleQueryMsg,
 };
 
 use crate::{
@@ -159,10 +158,10 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> Result<Response, ContractE
             };
 
             // DAO must accept ownership transfer. Here we include a
-            // ModuleInstantiateCallback message that will be called by the
+            // CallbackMessages message that will be called by the
             // dao-dao-core contract when voting module instantiation is
             // complete.
-            let callback = ModuleInstantiateCallback {
+            let callback = CallbackMessages {
                 msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
                     contract_addr: abc_addr.clone(),
                     msg: to_json_binary(&AbcExecuteMsg::UpdateOwnership(
diff --git a/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json b/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
index 8f6c9aaba..2b5a12759 100644
--- a/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
+++ b/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
@@ -121,7 +121,7 @@
             "type": "string"
           },
           "exponent": {
-            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 1^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
+            "description": "exponent represents power of 10 exponent that one must raise the base_denom to in order to equal the given DenomUnit's denom 1 denom = 10^exponent base_denom (e.g. with a base_denom of uatom, one can create a DenomUnit of 'atom' with exponent = 6, thus: 1 atom = 10^6 uatom).",
             "type": "integer",
             "format": "uint32",
             "minimum": 0.0