Merge remote-tracking branch 'origin/liquidity-orderbook-develop' into shadeswap-import

Author: DrPresident

Cargo.toml

@@ -4,58 +4,50 @@ members = [
   # Packages
   "packages/shade_protocol",
   "packages/shadeswap_shared",
-  "packages/secretcli",
+  # "packages/secretcli",
   "packages/multi_test",
   "packages/multi_derive",
   "packages/contract_derive",
 
   # Network setups
-  #"contracts/airdrop",
+  "contracts/airdrop",
 
   # Protocol contracts
-  #"contracts/snip20",
-  #"contracts/governance",
-  # "contracts/bonds", //TODO: migrate to v1
-  # "contracts/liability_mint", //TODO: migrate
-  #"contracts/sky", 
-  #"contracts/peg_stability",
-  #"contracts/query_auth",
-  #"contracts/admin",
-  #"contracts/basic_staking",
-  #"contracts/snip20_migration",
+  "contracts/snip20",
+  "contracts/query_auth",
+  "contracts/admin",
+  "contracts/basic_staking",
+  "contracts/snip20_migration",
+
+  # Liquidity Orderbook Contracts
   "contracts/liquidity_book/lb_factory",
   "contracts/liquidity_book/lb_pair",
   "contracts/liquidity_book/lb_token",
   "contracts/liquidity_book/router",
   "contracts/liquidity_book/tests",
 
-
   # Staking
-  #"contracts/basic_staking",
-  #"contracts/snip20_derivative",
+  "contracts/basic_staking",
+  # "contracts/snip20_derivative",
 
   # DAO
   # - Core
-  #"contracts/dao/treasury", 
-  #"contracts/dao/treasury_manager", 
+  "contracts/dao/treasury",
+  "contracts/dao/treasury_manager",
   # - Adapters
-  #"contracts/dao/scrt_staking",
-  #"contracts/dao/stkd_scrt",
-  #"contracts/dao/rewards_emission",
-  #"contracts/dao/lp_shdswap",
+  "contracts/dao/scrt_staking",
+  "contracts/dao/stkd_scrt",
 
-  # "contracts/snip20_staking", //TODO: migrate to v1
-  
   # Mock contracts
   # "contracts/mock/mock_band", //TODO: migrate to v1
   # "contracts/mock/mock_secretswap_pair", //TODO: migrate to v1
-  #"contracts/mock/mock_sienna_pair",
+  "contracts/mock/mock_sienna_pair",
   # "contracts/mock/mock_adapter", //TODO: migrate to v1
-  #"contracts/mock/mock_stkd_derivative",
+  "contracts/mock/mock_stkd_derivative",
 
   # Tools
   "tools/doc2book",
-  "launch"
+  # "launch"
 ]
 
 exclude = ["packages/network_integration"]

TODO.md

@@ -1,36 +1,18 @@
 use shade_protocol::{
     admin::{
-        errors::unauthorized_super,
-        AdminAuthStatus,
-        AdminsResponse,
-        ConfigResponse,
-        ExecuteMsg,
-        InstantiateMsg,
-        PermissionsResponse,
-        QueryMsg,
+        errors::unauthorized_super, AdminAuthStatus, AdminsResponse, ConfigResponse, ExecuteMsg,
+        InstantiateMsg, PermissionsResponse, QueryMsg,
     },
     c_std::{
-        shd_entry_point,
-        to_binary,
-        Addr,
-        Deps,
-        DepsMut,
-        Env,
-        MessageInfo,
-        QueryResponse,
-        Response,
-        StdResult,
-        Storage,
+        shd_entry_point, to_binary, Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
+        StdResult, Storage,
     },
     utils::pad_handle_result,
 };
 
 use crate::{
     execute::{
-        try_self_destruct,
-        try_toggle_status,
-        try_transfer_super,
-        try_update_registry,
+        try_self_destruct, try_toggle_status, try_transfer_super, try_update_registry,
         try_update_registry_bulk,
     },
     query::query_validate_permission,

contracts/dao/lp_shdswap/.cargo/config renamed to archived-contracts/dao/lp_shdswap/.cargo/config

@@ -1,7 +1,7 @@
+use crate::shared::{validate_permissions, ADMINS, PERMISSIONS, STATUS, SUPER};
 use shade_protocol::admin::errors::{no_permission, unregistered_admin};
-use shade_protocol::c_std::{DepsMut, Response, Storage, Api, Addr, StdResult};
-use shade_protocol::admin::{RegistryAction, AdminAuthStatus};
-use crate::shared::{STATUS, ADMINS, PERMISSIONS, SUPER, validate_permissions};
+use shade_protocol::admin::{AdminAuthStatus, RegistryAction};
+use shade_protocol::c_std::{Addr, Api, DepsMut, Response, StdResult, Storage};
 
 /// Performs one registry update. Cannot be run during a shutdown.
 pub fn try_update_registry(
@@ -164,4 +164,4 @@ fn verify_registered(admins: &[Addr], user: &Addr) -> StdResult<()> {
         return Err(no_permission(user.as_str()));
     }
     Ok(())
-}
+}

contracts/dao/lp_shdswap/.circleci/config.yml renamed to archived-contracts/dao/lp_shdswap/.circleci/config.yml

@@ -1,6 +1,9 @@
 use shade_protocol::c_std::Addr;
-use shade_protocol::{admin::{AdminAuthStatus, errors::invalid_permission_format}, c_std::StdResult};
-use shade_protocol::utils::storage::plus::{Map, Item};
+use shade_protocol::utils::storage::plus::{Item, Map};
+use shade_protocol::{
+    admin::{errors::invalid_permission_format, AdminAuthStatus},
+    c_std::StdResult,
+};
 
 /// Maps user to permissions for which they have user.
 pub const PERMISSIONS: Map<&Addr, Vec<String>> = Map::new("permissions");
@@ -20,17 +23,13 @@ pub fn validate_permissions(permissions: &[String]) -> StdResult<()> {
 
 pub fn is_valid_permission(permission: &str) -> StdResult<()> {
     if permission.len() <= 10 {
-        return Err(invalid_permission_format(
-            permission
-        ));
+        return Err(invalid_permission_format(permission));
     }
     let valid_chars = permission.bytes().all(|byte| {
         (b'A'..=b'Z').contains(&byte) || (b'0'..=b'9').contains(&byte) || b'_'.eq(&byte)
     });
     if !valid_chars {
-        return Err(invalid_permission_format(
-            permission
-        ));
+        return Err(invalid_permission_format(permission));
     }
     Ok(())
-}
+}