Merge pull request #246 from InjectiveLabs/f/dummy-contract-auction

F/dummy contract auction

Cargo.toml

@@ -22,7 +22,7 @@ ethereum-types       = { version = "0.5.2" }
 hex                  = { version = "0.4.3", features = [ "serde" ] }
 injective-cosmwasm   = { version = "0.3.0", path = "./packages/injective-cosmwasm" }
 injective-math       = { version = "0.3.0", path = "./packages/injective-math" }
-injective-std        = { version = "1.13.0", path = "./packages/injective-std" }
+injective-std        = { version = "1.13.2-auction", path = "./packages/injective-std" }
 injective-std-derive = { version = "1.13.0", path = "./packages/injective-std-derive" }
 injective-test-tube  = { version = "1.13.2" }
 injective-testing    = { version = "1.1.0", path = "./packages/injective-testing" }

contracts/dummy/Cargo.toml

@@ -31,6 +31,7 @@ cosmwasm-std       = { workspace = true }
 cw-storage-plus    = { workspace = true }
 cw2                = { workspace = true }
 injective-cosmwasm = { path = "../../packages/injective-cosmwasm" }
+injective-std      = { path = "../../packages/injective-std" }
 schemars           = { workspace = true }
 serde              = { workspace = true }
 thiserror          = { workspace = true }

contracts/dummy/src/contract.rs

@@ -27,6 +27,7 @@ pub fn instantiate(
     _msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+
     COUNTER.save(deps.storage, &0u32)?;
     ACTIVE.save(deps.storage, &false)?;
     Ok(Response::new()

contracts/injective-cosmwasm-stargate-example/src/testing/authz.rs

@@ -46,11 +46,7 @@ fn test_query_grantee_grants() {
         env.users[1].account.address().to_string(),
     );
 
-    let combined_grants = response_user0
-        .grants
-        .into_iter()
-        .chain(response_user2.grants.into_iter())
-        .collect::<Vec<_>>();
+    let combined_grants = response_user0.grants.into_iter().chain(response_user2.grants).collect::<Vec<_>>();
     let query_result = get_stargate_query_result::<StargateQueryGranteeGrantsResponse>(wasm.query(&env.contract_address, &query_msg)).unwrap();
 
     let all_grants_present = combined_grants.iter().all(|grant| query_result.grants.contains(grant));
@@ -125,15 +121,14 @@ fn test_query_grants() {
     };
 
     let contract_response: RunnerResult<QueryStargateResponse> = wasm.query(&env.contract_address, &query_msg);
-    println!("{:?}", contract_response);
 
     if let Err(QueryError { msg }) = contract_response {
         assert_eq!(
             msg, "Generic error: Querier contract error: codespace: authz, code: 2: query wasm contract failed",
             "The error message does not match the expected value"
         );
     } else {
-        assert!(false, "Expected an error, but got a success: {:?}", contract_response);
+        panic!("Expected an error, but got a success: {:?}", contract_response);
     }
 }
 

packages/injective-cosmwasm/Cargo.toml

@@ -14,7 +14,7 @@ cosmwasm-std    = { workspace = true }
 cw-storage-plus = { workspace = true }
 ethereum-types  = { workspace = true }
 hex             = { workspace = true }
-injective-math  = { workspace = true, path = "../../packages/injective-math" }
+injective-math  = { path = "../../packages/injective-math" }
 schemars        = { workspace = true }
 serde           = { workspace = true }
 serde_repr      = { workspace = true }

packages/injective-std/Cargo.toml

@@ -5,7 +5,7 @@ license     = "MIT OR Apache-2.0"
 name        = "injective-std"
 readme      = "README.md"
 repository  = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-std"
-version     = "1.13.0"
+version     = "1.13.2-auction"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

packages/injective-std/src/types/injective/auction/v1beta1.rs

@@ -20,8 +20,11 @@ pub struct Params {
 pub struct Bid {
     #[prost(string, tag = "1")]
     pub bidder: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub amount: ::prost::alloc::string::String,
+    // #[prost(string, tag = "2")]
+    // pub amount: ::prost::alloc::string::String,
+    // NOTE: THIS IS A FIX FOR RUST BINDINGS, PLEASE COPY IN FUTURE RELEASES
+    #[prost(message, optional, tag = "2")]
+    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, Eq, ::prost::Message, ::serde::Serialize, ::serde::Deserialize, ::schemars::JsonSchema, CosmwasmExt)]
@@ -31,8 +34,11 @@ pub struct LastAuctionResult {
     #[prost(string, tag = "1")]
     pub winner: ::prost::alloc::string::String,
     /// amount describes the amount the winner get from the auction
-    #[prost(string, tag = "2")]
-    pub amount: ::prost::alloc::string::String,
+    // #[prost(string, tag = "2")]
+    // pub amount: ::prost::alloc::string::String,
+    // NOTE: THIS IS A FIX FOR RUST BINDINGS, PLEASE COPY IN FUTURE RELEASES
+    #[prost(message, optional, tag = "2")]
+    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(
@@ -49,8 +55,11 @@ pub struct EventBid {
     #[prost(string, tag = "1")]
     pub bidder: ::prost::alloc::string::String,
     /// amount describes the amount the bidder put on the auction
-    #[prost(string, tag = "2")]
-    pub amount: ::prost::alloc::string::String,
+    // #[prost(string, tag = "2")]
+    // pub amount: ::prost::alloc::string::String,
+    // NOTE: THIS IS A FIX FOR RUST BINDINGS, PLEASE COPY IN FUTURE RELEASES
+    #[prost(message, optional, tag = "2")]
+    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(
@@ -67,8 +76,11 @@ pub struct EventAuctionResult {
     #[prost(string, tag = "1")]
     pub winner: ::prost::alloc::string::String,
     /// amount describes the amount the winner get from the auction
-    #[prost(string, tag = "2")]
-    pub amount: ::prost::alloc::string::String,
+    // #[prost(string, tag = "2")]
+    // pub amount: ::prost::alloc::string::String,
+    // NOTE: THIS IS A FIX FOR RUST BINDINGS, PLEASE COPY IN FUTURE RELEASES
+    #[prost(message, optional, tag = "2")]
+    pub amount: ::core::option::Option<super::super::super::cosmos::base::v1beta1::Coin>,
     /// round defines the round number of auction
     #[prost(uint64, tag = "3")]
     #[serde(

packages/injective-testing/Cargo.toml

@@ -12,9 +12,9 @@ anyhow              = { workspace = true }
 base64              = { workspace = true }
 cosmwasm-std        = { workspace = true }
 cw-multi-test       = { workspace = true }
-injective-cosmwasm  = { version = "0.3.1", path = "../injective-cosmwasm" }
-injective-math      = { version = "0.3.0", path = "../injective-math" }
-injective-std       = { version = "1.13.0", path = "../injective-std" }
+injective-cosmwasm  = { path = "../injective-cosmwasm" }
+injective-math      = { path = "../injective-math" }
+injective-std       = { path = "../injective-std" }
 injective-test-tube = { workspace = true }
 prost               = { workspace = true }
 rand                = { workspace = true }