Update cosmwasm-std

contracts/cw1-subkeys/Cargo.toml

@@ -22,11 +22,11 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
 cw1 = { path = "../../packages/cw1", version = "0.6.0-alpha3" }
 cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
 cw1-whitelist = { path = "../cw1-whitelist", version = "0.6.0-alpha3", features = ["library"] }
-cosmwasm-std = { version = "0.14.0-beta1", features = ["iterator", "staking"] }
+cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator", "staking"] }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
-schemars = "0.7"
+schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "0.14.0-beta1" }
+cosmwasm-schema = { version = "0.14.0-beta2" }

contracts/cw1-subkeys/src/contract.rs

@@ -1186,10 +1186,7 @@ mod tests {
 
         // And then cannot (not enough funds anymore)
         let err = execute(deps.as_mut(), mock_env(), info, execute_msg.clone()).unwrap_err();
-        assert!(matches!(
-            err,
-            ContractError::Std(StdError::Underflow { .. })
-        ));
+        assert!(matches!(err, ContractError::Std(StdError::Overflow { .. })));
 
         // Owner / admins can do anything (at the contract level)
         let info = mock_info(&owner.clone(), &[]);

contracts/cw1-whitelist/Cargo.toml

@@ -21,11 +21,11 @@ library = []
 cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
 cw1 = { path = "../../packages/cw1", version = "0.6.0-alpha3" }
 cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
-cosmwasm-std = { version = "0.14.0-beta1", features = ["iterator"] }
+cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
-schemars = "0.7"
+schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "0.14.0-beta1" }
+cosmwasm-schema = { version = "0.14.0-beta2" }

contracts/cw1155-base/Cargo.toml

@@ -22,8 +22,8 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
 cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
 cw1155 = { path = "../../packages/cw1155", version = "0.6.0-alpha3" }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3" , features = ["iterator"]}
-cosmwasm-std = { version = "0.14.0-beta1", features = ["iterator"] }
-schemars = "0.7"
+cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
+schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 

contracts/cw1155-base/src/contract.rs

@@ -1,7 +1,7 @@
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{
-    to_binary, Api, Binary, Deps, DepsMut, Env, HumanAddr, MessageInfo, Order, Response, StdResult,
-    Uint128, KV,
+    to_binary, Api, Binary, Deps, DepsMut, Env, HumanAddr, MessageInfo, Order, Pair, Response,
+    StdResult, Uint128,
 };
 use cw_storage_plus::Bound;
 
@@ -103,7 +103,9 @@ fn execute_transfer_inner<'a>(
         BALANCES.update(
             deps.storage,
             (from_raw.as_slice(), token_id),
-            |balance: Option<Uint128>| balance.unwrap_or_default() - amount,
+            |balance: Option<Uint128>| -> StdResult<_> {
+                Ok(balance.unwrap_or_default().checked_sub(amount)?)
+            },
         )?;
     }
 
@@ -112,7 +114,9 @@ fn execute_transfer_inner<'a>(
         BALANCES.update(
             deps.storage,
             (canonical_to.as_slice(), token_id),
-            |balance: Option<Uint128>| -> StdResult<_> { Ok(balance.unwrap_or_default() + amount) },
+            |balance: Option<Uint128>| -> StdResult<_> {
+                Ok(balance.unwrap_or_default().checked_add(amount)?)
+            },
         )?;
     }
 
@@ -445,7 +449,7 @@ pub fn query(deps: Deps, env: Env, msg: Cw1155QueryMsg) -> StdResult<Binary> {
     }
 }
 
-fn parse_approval(api: &dyn Api, item: StdResult<KV<Expiration>>) -> StdResult<cw1155::Approval> {
+fn parse_approval(api: &dyn Api, item: StdResult<Pair<Expiration>>) -> StdResult<cw1155::Approval> {
     item.and_then(|(k, expires)| {
         let spender = api.human_address(&k.into())?;
         Ok(cw1155::Approval { spender, expires })
@@ -511,8 +515,8 @@ fn query_all_tokens(
 
 #[cfg(test)]
 mod tests {
-    use cosmwasm_std::attr;
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{attr, OverflowError, StdError};
 
     use super::*;
 
@@ -1181,19 +1185,13 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(expected = "attempt to add with overflow")]
     fn mint_overflow() {
         let mut deps = mock_dependencies(&[]);
         let token1 = "token1".to_owned();
         let minter: HumanAddr = "minter".into();
         let user1: HumanAddr = "user1".into();
 
-        let env = {
-            let mut env = mock_env();
-            env.block.height = 10;
-            env
-        };
-
+        let env = mock_env();
         let msg = InitMsg {
             minter: minter.clone(),
         };
@@ -1213,17 +1211,22 @@ mod tests {
         )
         .unwrap();
 
-        execute(
-            deps.as_mut(),
-            env.clone(),
-            mock_info(minter.clone(), &[]),
-            Cw1155ExecuteMsg::Mint {
-                to: user1.clone(),
-                token_id: token1.clone(),
-                value: 1u64.into(),
-                msg: None,
-            },
-        )
-        .unwrap();
+        assert!(matches!(
+            execute(
+                deps.as_mut(),
+                env.clone(),
+                mock_info(minter.clone(), &[]),
+                Cw1155ExecuteMsg::Mint {
+                    to: user1.clone(),
+                    token_id: token1.clone(),
+                    value: 1u64.into(),
+                    msg: None,
+                },
+            ),
+            Err(ContractError::Std(StdError::Overflow {
+                source: OverflowError { .. },
+                ..
+            }))
+        ));
     }
 }

contracts/cw20-atomic-swap/Cargo.toml

@@ -18,13 +18,13 @@ library = []
 cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
 cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
 cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
-cosmwasm-std = { version = "0.14.0-beta1", features = ["iterator"] }
+cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
-schemars = "0.7"
+schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 hex = "0.3.1"
 sha2 = "0.8.0"
 
 [dev-dependencies]
-cosmwasm-schema = { version = "0.14.0-beta1" }
+cosmwasm-schema = { version = "0.14.0-beta2" }

contracts/cw20-base/Cargo.toml

@@ -22,10 +22,10 @@ cw0 = { path = "../../packages/cw0", version = "0.6.0-alpha3" }
 cw2 = { path = "../../packages/cw2", version = "0.6.0-alpha3" }
 cw20 = { path = "../../packages/cw20", version = "0.6.0-alpha3" }
 cw-storage-plus = { path = "../../packages/storage-plus", version = "0.6.0-alpha3", features = ["iterator"] }
-cosmwasm-std = { version = "0.14.0-beta1", features = ["iterator"] }
-schemars = "0.7"
+cosmwasm-std = { version = "0.14.0-beta2", features = ["iterator"] }
+schemars = "0.8.1"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.20" }
 
 [dev-dependencies]
-cosmwasm-schema = { version = "0.14.0-beta1" }
+cosmwasm-schema = { version = "0.14.0-beta2" }