Merge branch 'pr/cw-orch-interface' into improvements/cw-abc

Arena-DAO · Sep 18, 2024 · a539980 · a539980
2 parents 5631670 + b3b2ce7
commit a539980
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 324 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -62,13 +62,13 @@ integer-sqrt = "0.1.5"
 integer-cbrt = "0.1.2"
 once_cell = "1.18"
 omniflix-std = "0.1.8"
-osmosis-std = "0.20.1"
+osmosis-std = "0.25.0"
 osmosis-std-derive = "0.20.1"
-osmosis-test-tube = "20.1.2"
+osmosis-test-tube = "25.0.0"
 proc-macro2 = "1.0"
-prost = { version = "=0.12.3", features = ["prost-derive"] }
-prost-types = { version = "=0.12.3", default-features = false }
-prost-derive = "=0.12.3"
+prost = { version = "0.12.3", features = ["prost-derive"] }
+prost-types = { version = "0.12.3", default-features = false }
+prost-derive = "0.12.3"
 rust_decimal = "1.14.3"
 quote = "1.0"
 rand = "0.8"
@@ -88,7 +88,7 @@ test-context = "0.1"
 thiserror = { version = "1.0" }
 wynd-utils = "0.4"
 cw-orch = "0.24.1"
-tokio = "=1.38.1"
+tokio = "1.40.0"
 
 # One commit ahead of version 0.3.0. Allows initialization with an
 # optional owner.

diff --git a/contracts/external/cw-tokenfactory-issuer/tests/cases/burn.rs b/contracts/external/cw-tokenfactory-issuer/tests/cases/burn.rs
@@ -209,7 +209,7 @@ fn burn_more_than_balance_should_fail_and_not_deduct_allowance() {
         assert_eq!(
             err,
             RunnerError::ExecuteError {
-                msg: format!("failed to execute message; message index: 0: dispatch: submessages: {balance}{denom} is smaller than {burn_amount}{denom}: insufficient funds")
+                msg: format!("failed to execute message; message index: 0: dispatch: submessages: spendable balance {balance}{denom} is smaller than {burn_amount}{denom}: insufficient funds")
             }
         );
 

diff --git a/contracts/external/cw-tokenfactory-issuer/tests/cases/denom_metadata.rs b/contracts/external/cw-tokenfactory-issuer/tests/cases/denom_metadata.rs
@@ -30,6 +30,8 @@ fn set_denom_metadata_by_contract_owner_should_work() {
         display: "sthb".to_string(),
         name: "Stable Thai Baht".to_string(),
         symbol: "STHB".to_string(),
+        uri: String::default(),
+        uri_hash: String::default(),
     };
     env.cw_tokenfactory_issuer
         .set_denom_metadata(metadata, owner)
@@ -64,6 +66,8 @@ fn set_denom_metadata_by_contract_non_owner_should_fail() {
         display: "sthb".to_string(),
         name: "Stable Thai Baht".to_string(),
         symbol: "STHB".to_string(),
+        uri: String::default(),
+        uri_hash: String::default(),
     };
 
     // Set denom metadata
@@ -108,6 +112,8 @@ fn set_denom_metadata_with_base_denom_unit_should_overides_default_base_denom_un
         display: "sthb".to_string(),
         name: "Stable Thai Baht".to_string(),
         symbol: "STHB".to_string(),
+        uri: String::default(),
+        uri_hash: String::default(),
     };
 
     // Set denom metadata

diff --git a/contracts/external/cw-tokenfactory-issuer/tests/test_env.rs b/contracts/external/cw-tokenfactory-issuer/tests/test_env.rs
@@ -149,7 +149,7 @@ impl TokenfactoryIssuer {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("cw_tokenfactory_issuer"),
                 &[token_creation_fee],
                 signer,
             )?

diff --git a/contracts/voting/dao-voting-cw721-staked/src/testing/integration_tests.rs b/contracts/voting/dao-voting-cw721-staked/src/testing/integration_tests.rs
@@ -128,7 +128,7 @@ fn test_full_integration_with_factory() {
     // Error is insufficient funds as no funds were sent
     assert_eq!(
         RunnerError::ExecuteError {
-            msg: "failed to execute message; message index: 0: dispatch: submessages: 0uosmo is smaller than 1000uosmo: insufficient funds".to_string()
+            msg: "failed to execute message; message index: 0: dispatch: submessages: spendable balance  is smaller than 1000uosmo: insufficient funds".to_string()
         },
         err
     );

diff --git a/contracts/voting/dao-voting-token-staked/src/contract.rs b/contracts/voting/dao-voting-token-staked/src/contract.rs
@@ -633,7 +633,8 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
                     // If metadata, set it by calling the contract
                     #[cfg(any(
                         feature = "osmosis_tokenfactory",
-                        feature = "cosmwasm_tokenfactory"
+                        feature = "cosmwasm_tokenfactory",
+                        feature = "kujira_tokenfactory"
                     ))]
                     if let Some(metadata) = token.metadata {
                         // The first denom_unit must be the same as the tf and base denom.
@@ -663,6 +664,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/voting/dao-voting-token-staked/src/tests/test_tube/test_env.rs b/contracts/voting/dao-voting-token-staked/src/tests/test_tube/test_env.rs
@@ -348,7 +348,7 @@ impl<'a> TokenVotingContract<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("token_voting"),
                 &[],
                 signer,
             )?
@@ -398,7 +398,7 @@ impl<'a> TokenVotingContract<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("token_voting_contract"),
                 &[],
                 signer,
             )?

diff --git a/packages/cw-tokenfactory-types/src/msg.rs b/packages/cw-tokenfactory-types/src/msg.rs
@@ -61,6 +61,8 @@ mod tokenfactory_msg {
                 display: metadata.display,
                 name: metadata.name,
                 symbol: metadata.symbol,
+                uri: metadata.uri,
+                uri_hash: metadata.uri_hash,
             }),
         }
     }

diff --git a/packages/dao-testing/src/lib.rs b/packages/dao-testing/src/lib.rs
@@ -12,6 +12,9 @@ pub mod contracts;
 #[cfg(not(target_arch = "wasm32"))]
 pub use tests::*;
 
+// Integration tests using an actual chain binary, requires
+// the "test-tube" feature to be enabled
+// cargo test --features test-tube
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(feature = "test-tube")]
 pub mod test_tube;
diff --git a/packages/dao-testing/src/test_tube/cw4_group.rs b/packages/dao-testing/src/test_tube/cw4_group.rs
@@ -36,7 +36,7 @@ impl<'a> Cw4Group<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("cw4_group"),
                 &[],
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/cw721_base.rs b/packages/dao-testing/src/test_tube/cw721_base.rs
@@ -36,7 +36,7 @@ impl<'a> Cw721Base<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("cw721_base"),
                 &[],
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/cw_admin_factory.rs b/packages/dao-testing/src/test_tube/cw_admin_factory.rs
@@ -37,7 +37,7 @@ impl<'a> CwAdminFactory<'a> {
                 code_id,
                 &InstantiateMsg { admin },
                 Some(&signer.address()),
-                None,
+                Some("cw_admin_factory"),
                 funds,
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/cw_tokenfactory_issuer.rs b/packages/dao-testing/src/test_tube/cw_tokenfactory_issuer.rs
@@ -40,7 +40,7 @@ impl<'a> TokenfactoryIssuer<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("cw_tokenfactory_issuer"),
                 &[token_creation_fee],
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/dao_dao_core.rs b/packages/dao-testing/src/test_tube/dao_dao_core.rs
@@ -34,7 +34,7 @@ impl<'a> DaoCore<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("dao_dao_core"),
                 funds,
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/dao_proposal_single.rs b/packages/dao-testing/src/test_tube/dao_proposal_single.rs
@@ -37,7 +37,7 @@ impl<'a> DaoProposalSingle<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("dao_proposal_single"),
                 &[token_creation_fee],
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/dao_test_custom_factory.rs b/packages/dao-testing/src/test_tube/dao_test_custom_factory.rs
@@ -37,7 +37,7 @@ impl<'a> CustomFactoryContract<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("dao_test_custom_factory"),
                 &[token_creation_fee],
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/dao_voting_cw4.rs b/packages/dao-testing/src/test_tube/dao_voting_cw4.rs
@@ -36,7 +36,7 @@ impl<'a> DaoVotingCw4<'a> {
                 code_id,
                 &instantiate_msg,
                 Some(&signer.address()),
-                None,
+                Some("dao_voting_cw4"),
                 funds,
                 signer,
             )?

diff --git a/packages/dao-testing/src/test_tube/mod.rs b/packages/dao-testing/src/test_tube/mod.rs
@@ -2,10 +2,6 @@
 // and also, tarpaulin will not be able read coverage out of wasm binary anyway
 #![cfg(not(tarpaulin))]
 
-// Integration tests using an actual chain binary, requires
-// the "test-tube" feature to be enabled
-// cargo test --features test-tube
-
 pub mod cw4_group;
 pub mod cw721_base;
 pub mod cw_abc;