feat: injective cosmwasm 0.3.5-1

Author: jbernal87

packages/injective-cosmwasm/Cargo.toml

@@ -6,20 +6,19 @@ license = "Apache-2.0"
 name = "injective-cosmwasm"
 readme = "README.md"
 repository = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-cosmwasm"
-version = "0.3.4-1"
+version = "0.3.5-1"
 
 [dependencies]
-cosmwasm-std    = { version = "2.2.2", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
-cw-storage-plus = { version = "2.0.0" }
+cosmwasm-std    = { version = "3.0.2", features = ["cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0", "iterator", "stargate" ] }
+cw-storage-plus = { version = "3.0.1" }
 ethereum-types  = { version = "0.5.2" }
 hex             = { version = "0.4.3", features = [ "serde" ] }
-injective-math  = { version = "0.3.4-1" }
+injective-math  = { version = "0.3.5-1", path="../injective-math" }
 schemars        = { version = "0.8.16" }
 serde           = { version = "1.0.196", default-features = false, features = [ "derive" ] }
 serde_repr      = { version = "0.1.17" }
 subtle-encoding = { version = "0.5.1", features = [ "bech32-preview" ] }
 tiny-keccak     = { version = "1.2.1" }
-ed25519-zebra   = { version = "4.1.0", features = ["alloc"] }
 
 
 [dev-dependencies]

packages/injective-cosmwasm/src/exchange/types.rs

@@ -106,11 +106,11 @@ impl MarketId {
         let market_id = market_id_s.into();
 
         if !market_id.starts_with("0x") {
-            return Err(StdError::generic_err("Invalid prefix: market_id must start with 0x"));
+            return Err(StdError::msg("Invalid prefix: market_id must start with 0x"));
         }
 
         if market_id.len() != 66 {
-            return Err(StdError::generic_err("Invalid length: market_id must be exactly 66 characters"));
+            return Err(StdError::msg("Invalid length: market_id must be exactly 66 characters"));
         }
 
         Ok(Self(market_id.to_lowercase()))
@@ -191,11 +191,11 @@ impl SubaccountId {
         let subaccount_id = subaccount_id_s.into();
 
         if !subaccount_id.starts_with("0x") {
-            return Err(StdError::generic_err("Invalid prefix: subaccount_id must start with 0x"));
+            return Err(StdError::msg("Invalid prefix: subaccount_id must start with 0x"));
         }
 
         if subaccount_id.len() != 66 {
-            return Err(StdError::generic_err("Invalid length: subaccount_id must be exactly 66 characters"));
+            return Err(StdError::msg("Invalid length: subaccount_id must be exactly 66 characters"));
         }
 
         Ok(Self(subaccount_id.to_lowercase()))
@@ -283,15 +283,15 @@ impl ShortSubaccountId {
     pub fn validate(&self) -> StdResult<Self> {
         let as_decimal = match u32::from_str_radix(self.as_str(), 16) {
             Ok(dec) => Ok(dec),
-            Err(_) => Err(StdError::generic_err(format!(
+            Err(_) => Err(StdError::msg(format!(
                 "Invalid value: ShortSubaccountId was not a hexadecimal number: {}",
                 &self.0
             ))),
         };
 
         match as_decimal?.to_string().parse::<u16>() {
             Ok(value) if value <= MAX_SHORT_SUBACCOUNT_NONCE => Ok(self.clone()),
-            _ => Err(StdError::generic_err(format!(
+            _ => Err(StdError::msg(format!(
                 "Invalid value: ShortSubaccountId must be a number between 0-999, but {} was received",
                 &self.0
             ))),
@@ -430,7 +430,7 @@ impl Hash {
 
     pub fn from_hex<T: AsRef<[u8]>>(s: T) -> StdResult<Hash> {
         let mut bytes = [0u8; 32];
-        hex::decode_to_slice(s, &mut bytes).map_err(|e| StdError::generic_err(e.to_string()))?;
+        hex::decode_to_slice(s, &mut bytes).map_err(|e| StdError::msg(e.to_string()))?;
         Ok(Hash::new(bytes))
     }
 }

packages/injective-cosmwasm/src/exchange_mock_querier.rs

@@ -2,10 +2,7 @@ use std::marker::PhantomData;
 use std::str::FromStr;
 
 use cosmwasm_std::testing::{MockApi, MockStorage};
-use cosmwasm_std::{
-    from_json, to_json_binary, Addr, AllBalanceResponse, BalanceResponse, BankQuery, Binary, Coin, ContractResult, OwnedDeps, Querier, QuerierResult,
-    QueryRequest, SupplyResponse, SystemError, SystemResult, Uint128, WasmQuery,
-};
+use cosmwasm_std::{from_json, to_json_binary, Addr, BalanceResponse, BankQuery, Binary, Coin, ContractResult, OwnedDeps, Querier, QuerierResult, QueryRequest, SupplyResponse, SystemError, SystemResult, Uint128, Uint256, WasmQuery};
 
 use injective_math::FPDecimal;
 
@@ -248,7 +245,7 @@ fn default_token_factory_denom_total_supply_handler() -> QuerierResult {
 fn default_bank_total_supply_handler() -> QuerierResult {
     let response = SupplyResponse::new(Coin {
         denom: "inj".to_string(),
-        amount: Uint128::from(1000u128),
+        amount: Uint256::from(1000u128),
     });
     SystemResult::Ok(ContractResult::from(to_json_binary(&response)))
 }
@@ -270,11 +267,6 @@ fn default_balance_bank_query_handler(denom: impl Into<String>) -> QuerierResult
     SystemResult::Ok(ContractResult::from(to_json_binary(&response)))
 }
 
-fn default_all_balances_bank_query_handler() -> QuerierResult {
-    let response = AllBalanceResponse::new(vec![Coin::new(1000000000000000u128, "inj")]);
-    SystemResult::Ok(ContractResult::from(to_json_binary(&response)))
-}
-
 fn default_exchange_params_response_handler() -> QuerierResult {
     let denom = "inj";
 
@@ -434,9 +426,6 @@ pub trait HandlesBankBalanceQuery {
     fn handle(&self, address: String, denom: String) -> QuerierResult;
 }
 
-pub trait HandlesBankAllBalancesQuery {
-    fn handle(&self, address: String) -> QuerierResult;
-}
 
 pub trait HandlesByAddressQuery {
     fn handle(&self, address: String) -> QuerierResult;
@@ -504,7 +493,6 @@ pub struct WasmMockQuerier {
     pub token_factory_denom_total_supply_handler: Option<Box<dyn HandlesDenomSupplyQuery>>,
     pub token_factory_denom_creation_fee_handler: Option<Box<dyn HandlesFeeQuery>>,
     pub balance_query_handler: Option<Box<dyn HandlesBankBalanceQuery>>,
-    pub all_balances_query_handler: Option<Box<dyn HandlesBankAllBalancesQuery>>,
     pub total_supply_handler: Option<Box<dyn HandlesDenomSupplyQuery>>,
     pub registered_contract_info_query_handler: Option<Box<dyn HandlesByAddressQuery>>,
     pub spot_market_orderbook_response_handler: Option<Box<dyn HandlesPriceLevelsQuery>>,
@@ -555,11 +543,6 @@ impl WasmMockQuerier {
                     Some(handler) => handler.handle(address.to_string(), denom.to_string()),
                     None => default_balance_bank_query_handler(denom),
                 },
-                #[allow(deprecated)]
-                BankQuery::AllBalances { address } => match &self.all_balances_query_handler {
-                    Some(handler) => handler.handle(address.to_string()),
-                    None => default_all_balances_bank_query_handler(),
-                },
                 BankQuery::Supply { denom } => match &self.total_supply_handler {
                     Some(handler) => handler.handle(denom.to_string()),
                     None => default_bank_total_supply_handler(),
@@ -767,7 +750,6 @@ impl WasmMockQuerier {
             token_factory_denom_total_supply_handler: None,
             token_factory_denom_creation_fee_handler: None,
             balance_query_handler: None,
-            all_balances_query_handler: None,
             registered_contract_info_query_handler: None,
             denom_decimals_handler: None,
             spot_market_orderbook_response_handler: None,
@@ -801,10 +783,7 @@ impl TestDeposit {
 }
 
 pub mod handlers {
-    use cosmwasm_std::{
-        to_json_binary, Addr, AllBalanceResponse, BalanceResponse, Binary, Checksum, CodeInfoResponse, Coin, ContractInfoResponse, ContractResult,
-        QuerierResult, StdResult, SupplyResponse, SystemError, SystemResult, Uint128,
-    };
+    use cosmwasm_std::{to_json_binary, Addr, BalanceResponse, Binary, Checksum, CodeInfoResponse, Coin, ContractInfoResponse, ContractResult, QuerierResult, SupplyResponse, SystemError, SystemResult, Uint128, Uint256};
     use std::collections::HashMap;
 
     use injective_math::FPDecimal;
@@ -824,7 +803,7 @@ pub mod handlers {
         TrimmedSpotLimitOrder,
     };
     use crate::{
-        HandlesBankAllBalancesQuery, HandlesBankBalanceQuery, HandlesCodeInfo, HandlesContractInfo,
+        HandlesBankBalanceQuery, HandlesCodeInfo, HandlesContractInfo,
         HandlesTraderDerivativeOrdersToCancelUpToAmountQuery, MarketMidPriceAndTOBResponse, OracleType,
     };
 
@@ -1202,9 +1181,9 @@ pub mod handlers {
         }))
     }
 
-    pub fn create_bank_supply_handler(supply: Uint128) -> Option<Box<dyn HandlesDenomSupplyQuery>> {
+    pub fn create_bank_supply_handler(supply: Uint256) -> Option<Box<dyn HandlesDenomSupplyQuery>> {
         struct Temp {
-            supply: Uint128,
+            supply: Uint256,
         }
         impl HandlesDenomSupplyQuery for Temp {
             fn handle(&self, denom: String) -> QuerierResult {
@@ -1273,20 +1252,6 @@ pub mod handlers {
         Some(Box::new(Temp { balances }))
     }
 
-    pub fn create_simple_all_balances_bank_query_handler(balances: Vec<Coin>) -> Option<Box<dyn HandlesBankAllBalancesQuery>> {
-        struct Temp {
-            balances: Vec<Coin>,
-        }
-        impl HandlesBankAllBalancesQuery for Temp {
-            fn handle(&self, _: String) -> QuerierResult {
-                let res = AllBalanceResponse::new(self.balances.to_owned());
-
-                SystemResult::Ok(ContractResult::from(to_json_binary(&res)))
-            }
-        }
-        Some(Box::new(Temp { balances }))
-    }
-
     pub fn create_atomic_order_fee_multiplier_handler(multiplier: FPDecimal) -> Option<Box<dyn HandlesMarketIdQuery>> {
         struct Temp {
             multiplier: FPDecimal,
@@ -1307,7 +1272,7 @@ pub mod handlers {
         impl HandlesSmartQuery for Temp {
             fn handle(&self, _contract_addr: &str, _msg: &Binary) -> QuerierResult {
                 match self.result.clone() {
-                    Ok(resp) => SystemResult::Ok(ContractResult::from(StdResult::Ok(resp))),
+                    Ok(resp) => SystemResult::Ok(ContractResult::from(Ok::<Binary, cosmwasm_std::StdError>(resp))),
                     Err(err) => SystemResult::Err(err),
                 }
             }
@@ -1322,7 +1287,7 @@ pub mod handlers {
         impl HandlesRawQuery for Temp {
             fn handle(&self, _contract_addr: &str, _key: &Binary) -> QuerierResult {
                 match self.result.clone() {
-                    Ok(resp) => SystemResult::Ok(ContractResult::from(StdResult::Ok(resp))),
+                    Ok(resp) => SystemResult::Ok(ContractResult::from(Ok::<Binary, cosmwasm_std::StdError>(resp))),
                     Err(err) => SystemResult::Err(err),
                 }
             }
@@ -1338,8 +1303,7 @@ pub mod handlers {
 
         impl HandlesContractInfo for Temp {
             fn handle(&self, _contract_addr: &str) -> QuerierResult {
-                let response = ContractInfoResponse::new(self.code_id, self.creator.to_owned(), None, false, None);
-
+                let response = ContractInfoResponse::new(self.code_id, self.creator.to_owned(), None, false, None, None);
                 SystemResult::Ok(ContractResult::from(to_json_binary(&response)))
             }
         }

packages/injective-cosmwasm/src/msg.rs

@@ -234,7 +234,7 @@ pub fn create_external_transfer_msg(
     }
 
     if is_default_subaccount(source_subaccount_id) {
-        return Err(StdError::generic_err("Cannot send from default subaccount to external subaccount"));
+        return Err(StdError::msg("Cannot send from default subaccount to external subaccount"));
     }
 
     Ok(vec![InjectiveMsgWrapper {

packages/injective-cosmwasm/src/test_helpers.rs

@@ -6,9 +6,7 @@ pub(crate) mod testing_helpers {
     use std::string::ToString;
 
     use cosmwasm_std::testing::{MockApi, MockStorage};
-    use cosmwasm_std::{
-        Addr, Api, BlockInfo, ContractInfo, CustomQuery, DepsMut, Env, OwnedDeps, Querier, QuerierWrapper, Storage, Timestamp, TransactionInfo,
-    };
+    use cosmwasm_std::{Addr, Api, BlockInfo, ContractInfo, CustomQuery, DepsMut, Env, OwnedDeps, Querier, QuerierWrapper, Storage, Timestamp};
 
     use injective_math::FPDecimal;
 
@@ -53,7 +51,7 @@ pub(crate) mod testing_helpers {
                 time: Timestamp::from_nanos(1_571_797_419_879_305_533),
                 chain_id: "cosmos-testnet-14002".to_string(),
             },
-            transaction: Some(TransactionInfo { index: 3 }),
+            transaction: None,
             contract: ContractInfo {
                 address: Addr::unchecked(TEST_CONTRACT_ADDR),
             },