build success

Author: kent-3

contracts/liquidity_book/lb_factory/Cargo.toml

@@ -19,13 +19,12 @@ backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
 shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol", features = ["liquidity_book_impl"] }
+schemars = "0.8.16"
 serde = { version = "1.0" }
+cosmwasm-schema = "1.5"
 thiserror = { version = "1.0" }
 ethnum = { version = "1.5" }
 
 [dev-dependencies]
 anyhow = "1"
 cosmwasm-std = { package = "secret-cosmwasm-std", version = "1.1.11" }
-
-[[bin]]
-name = "schema"

contracts/liquidity_book/lb_factory/src/bin/schema.rs

@@ -17,6 +17,7 @@ use shade_protocol::{
         DepsMut,
         Env,
         MessageInfo,
+        Order::Ascending,
         Reply,
         Response,
         StdError,
@@ -25,19 +26,19 @@ use shade_protocol::{
         SubMsgResult,
         WasmMsg,
     },
+    lb_libraries::{
+        math::encoded_sample::EncodedSample,
+        pair_parameter_helper::PairParameters,
+        price_helper::PriceHelper,
+        types::{Bytes32, ContractInstantiationInfo, StaticFeeParameters},
+    },
     liquidity_book::{
         lb_factory::*,
         lb_pair::ExecuteMsg::{ForceDecay as LbPairForceDecay, SetStaticFeeParameters},
     },
     swap::core::TokenType,
     utils::{
         callback::ExecuteCallback,
-        liquidity_book::{
-            math::encoded_sample::EncodedSample,
-            pair_parameter_helper::PairParameters,
-            price_helper::PriceHelper,
-            types::{Bytes32, ContractInstantiationInfo, StaticFeeParameters},
-        },
     },
 };
 
@@ -1166,7 +1167,7 @@ fn query_all_bin_steps(deps: Deps) -> Result<Binary> {
 
     let mut bin_step_with_preset = Vec::<u16>::new();
 
-    let iterator = PRESETS.range(deps.storage, None, None, cosmwasm_std::Order::Ascending);
+    let iterator = PRESETS.range(deps.storage, None, None, Ascending);
 
     for result in iterator {
         let (bin_step, _preset) = result.map_err(Error::CwErr)?;
@@ -1204,7 +1205,7 @@ fn query_open_bin_steps(deps: Deps) -> Result<Binary> {
 
     let mut open_bin_steps = Vec::<u16>::new();
 
-    let iterator = PRESETS.range(deps.storage, None, None, cosmwasm_std::Order::Ascending);
+    let iterator = PRESETS.range(deps.storage, None, None, Ascending);
 
     for result in iterator {
         let (bin_step, preset) = result.map_err(Error::CwErr)?;

contracts/liquidity_book/lb_factory/src/contract.rs

@@ -1,7 +1,7 @@
 //! ### Custom Errors for LB_Factory contract.
 
 use shade_protocol::{
-    c_std::Addr,
+    c_std::{Addr, StdError},
     lb_libraries::{
         bin_helper::BinError,
         fee_helper::FeeError,
@@ -97,7 +97,7 @@ pub enum LBFactoryError {
     TransactionBlock(),
 
     #[error(transparent)]
-    CwErr(#[from] cosmwasm_std::StdError),
+    CwErr(#[from] StdError),
 
     #[error(transparent)]
     BinErr(#[from] BinError),

contracts/liquidity_book/lb_factory/src/error.rs

@@ -19,8 +19,10 @@ backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
 shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol", features = ["liquidity_book_impl"] }
+schemars = "0.8.16"
 serde = { version = "1.0" }
 serde-json-wasm = { version = "1.0"}
+cosmwasm-schema = "1.5"
 thiserror = { version = "1.0" }
 ethnum = { version = "1.5" }
 
@@ -33,6 +35,3 @@ shade-multi-test = { path = "../../../packages/multi_test", features = [
   "lb_token",
   "snip20",
 ] }
-
-[[bin]]
-name = "schema"

contracts/liquidity_book/lb_pair/Cargo.toml

@@ -177,7 +177,7 @@ pub fn instantiate(
     CONFIG.save(deps.storage, &state)?;
     ORACLE.save(deps.storage, &oracle)?;
     CONTRACT_STATUS.save(deps.storage, &ContractStatus::Active)?;
-    CONTRACT_STATUS.save(deps.storage, &ContractStatus::Active);
+    CONTRACT_STATUS.save(deps.storage, &ContractStatus::Active)?;
     BIN_TREE.save(deps.storage, &tree)?;
 
     ephemeral_storage_w(deps.storage).save(&NextTokenKey {
@@ -436,7 +436,8 @@ fn try_swap(
     CONFIG.update(deps.storage, |mut state| {
         state.protocol_fees = protocol_fees;
         // TODO - map the error to a StdError
-        state.pair_parameters.set_active_id(active_id);
+        state.pair_parameters.set_active_id(active_id)
+            .map_err(|err| StdError::generic_err(err.to_string()))?;
         state.reserves = reserves;
         Ok::<State, StdError>(state)
     })?;

contracts/liquidity_book/lb_pair/src/bin/schema.rs

@@ -2,7 +2,7 @@
 
 use ethnum::U256;
 use shade_protocol::{
-    c_std::Uint128,
+    c_std::{Uint128, StdError},
     lb_libraries::{
         bin_helper::BinError,
         fee_helper::FeeError,
@@ -69,6 +69,8 @@ pub enum LBPairError {
     #[error("Zero amount for bin id: {id}")]
     ZeroAmount { id: u32 },
 
+    // TODO - why return amount_to_burn and total_supply? They will be illegible as U256 anyway.
+    // Would like to remove U256 dependency for error messages.
     #[error(
         "Zero amounts out for bin id: {id} amount to burn: {amount_to_burn} total supply: {total_supply} "
     )]
@@ -86,8 +88,9 @@ pub enum LBPairError {
     #[error("Max total fee exceeded!")]
     MaxTotalFeeExceeded,
 
+    // TODO - organize errors better. move error conversions to separate section perhaps.
     #[error(transparent)]
-    CwErr(#[from] cosmwasm_std::StdError),
+    CwErr(#[from] StdError),
 
     #[error(transparent)]
     BinErr(#[from] BinError),

contracts/liquidity_book/lb_pair/src/contract.rs

@@ -21,10 +21,12 @@ default = []
 [dependencies]
 shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol", features = ["liquidity_book_impl"] }
 snafu = { version = "0.7.1" }
+schemars = "0.8.16"
 serde = { version = "1.0.114", default-features = false, features = [
   "derive",
   "alloc"
 ] }
+cosmwasm-schema = "1.5"
 
 [dev-dependencies]
 secret-multi-test = { git = "https://github.com/securesecrets/secret-plus-utils", version = "0.13.4", features=["iterator"] }

contracts/liquidity_book/lb_pair/src/error.rs

@@ -23,6 +23,7 @@ use shade_protocol::{
         Response,
         StdError,
         StdResult,
+        SubMsgResult,
         Uint128,
     },
     snip20::helpers::send_msg,
@@ -276,10 +277,10 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> StdResult<Response> {
     pad_handle_result(
         match msg.id {
             SWAP_REPLY_ID => match msg.result {
-                cosmwasm_std::SubMsgResult::Ok(_) => {
+                SubMsgResult::Ok(_) => {
                     return next_swap(deps, env, Response::new());
                 }
-                cosmwasm_std::SubMsgResult::Err(e) => Err(StdError::generic_err(format!(
+                SubMsgResult::Err(e) => Err(StdError::generic_err(format!(
                     "Swap failed with message: {e}"
                 ))),
             },

contracts/liquidity_book/router/Cargo.toml

@@ -2,13 +2,7 @@ use shade_protocol::{
     c_std::{Addr, Storage, Uint128},
     cosmwasm_schema::cw_serde,
     storage::{
-        bucket,
-        bucket_read,
-        singleton,
-        singleton_read,
-        Bucket,
-        ReadonlyBucket,
-        ReadonlySingleton,
+        bucket, bucket_read, singleton, singleton_read, Bucket, ReadonlyBucket, ReadonlySingleton,
         Singleton,
     },
     swap::{
@@ -38,7 +32,6 @@ pub fn config_r(storage: &dyn Storage) -> ReadonlySingleton<Config> {
     singleton_read(storage, CONFIG)
 }
 
-// { addr: code_hash }
 pub fn registered_tokens_w(storage: &mut dyn Storage) -> Bucket<String> {
     bucket(storage, REGISTERED_TOKENS)
 }
@@ -70,6 +63,6 @@ pub struct CurrentSwapInfo {
     pub path: Vec<Hop>,
     pub recipient: Addr,
     pub current_index: u32,
-    //The next token that will be in the hop
+    // The next token that will be in the hop
     pub next_token_in: TokenType,
 }

contracts/liquidity_book/router/src/contract.rs

@@ -19,6 +19,7 @@ backtraces = ["cosmwasm-std/backtraces"]
 
 [dependencies]
 shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol", features = ["liquidity_book_impl"] }
+schemars = "0.8.16"
 serde = { version = "1.0" }
 serde-json-wasm = { version = "1.0"}
 ethnum = { version = "1.5" }