Merge branch 'main' into liquidity-orderbook-develop

Author: kent-3

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

@@ -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/.circleci/config.yml renamed to archived-contracts/dao/lp_shdswap/.circleci/config.yml

@@ -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/Cargo.toml renamed to archived-contracts/dao/lp_shdswap/Cargo.toml

@@ -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(())
-}
+}

contracts/dao/lp_shdswap/Makefile renamed to archived-contracts/dao/lp_shdswap/Makefile

@@ -1,19 +1,10 @@
-use crate::{
-    shared::is_valid_permission,
-};
+use crate::shared::is_valid_permission;
 use rstest::*;
 use shade_multi_test::multi::admin::Admin;
 use shade_protocol::{
     admin::{
-        AdminAuthStatus,
-        AdminsResponse,
-        ConfigResponse,
-        ExecuteMsg,
-        InstantiateMsg,
-        PermissionsResponse,
-        QueryMsg,
-        RegistryAction,
-        ValidateAdminPermissionResponse,
+        AdminAuthStatus, AdminsResponse, ConfigResponse, ExecuteMsg, InstantiateMsg,
+        PermissionsResponse, QueryMsg, RegistryAction, ValidateAdminPermissionResponse,
     },
     c_std::Addr,
     multi_test::App,
@@ -43,51 +34,80 @@ fn test_is_valid_permission(#[case] permission: String, #[case] is_valid: bool)
 #[case(AdminAuthStatus::Maintenance, vec![true, true, true, false, true, true, true])]
 #[case(AdminAuthStatus::Shutdown, vec![false, false, false, false, false, false, true])]
 fn test_status(#[case] status: AdminAuthStatus, #[case] expect_success: Vec<bool>) {
-        //init
-        let mut chain: App = App::default();
-        let contract = InstantiateMsg { super_admin: None }
-            .test_init(
-                Admin::default(), 
-                &mut chain, 
-                Addr::unchecked("admin"), 
-                "admin_contract", 
-                &[],
-            )
-            .unwrap();
-        //set state
-        ExecuteMsg::ToggleStatus { new_status: status }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]).unwrap();
-       
-        //register 'super' as admin
-        let action = RegistryAction::RegisterAdmin { user: "super".to_string() };
-        let result = ExecuteMsg::UpdateRegistry { action: action.clone() }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(0).unwrap());
-
-        //test bulk update
-        let actions = vec![action.clone()];
-        let result = ExecuteMsg::UpdateRegistryBulk { actions }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(1).unwrap());
-        
-        //set super admin to 'super'
-        let result = ExecuteMsg::TransferSuper { new_super: "super".to_string() }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(2).unwrap());
-
-        //register 'admin' as admin without being the super user
-        let action = RegistryAction::RegisterAdmin { user: "admin".to_string() };
-        let result = ExecuteMsg::UpdateRegistry { action: action.clone() }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(3).unwrap());
-
-        //register admin as admin with correct permissions
-        let action = RegistryAction::RegisterAdmin { user: "admin".to_string() };
-        let result = ExecuteMsg::UpdateRegistry { action: action.clone() }.test_exec(&contract, &mut chain, Addr::unchecked("super"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(4).unwrap());
-
-        //set super admin to 'admin'
-        let result = ExecuteMsg::TransferSuper { new_super: "admin".to_string() }.test_exec(&contract, &mut chain, Addr::unchecked("super"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(5).unwrap());
-
-        //self destruct
-        let result = ExecuteMsg::SelfDestruct {  }.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
-        assert_eq!(&result.is_ok(), expect_success.get(6).unwrap());
+    //init
+    let mut chain: App = App::default();
+    let contract = InstantiateMsg { super_admin: None }
+        .test_init(
+            Admin::default(),
+            &mut chain,
+            Addr::unchecked("admin"),
+            "admin_contract",
+            &[],
+        )
+        .unwrap();
+    //set state
+    ExecuteMsg::ToggleStatus { new_status: status }
+        .test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[])
+        .unwrap();
+
+    //register 'super' as admin
+    let action = RegistryAction::RegisterAdmin {
+        user: "super".to_string(),
+    };
+    let result = ExecuteMsg::UpdateRegistry {
+        action: action.clone(),
+    }
+    .test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(0).unwrap());
+
+    //test bulk update
+    let actions = vec![action.clone()];
+    let result = ExecuteMsg::UpdateRegistryBulk { actions }.test_exec(
+        &contract,
+        &mut chain,
+        Addr::unchecked("admin"),
+        &[],
+    );
+    assert_eq!(&result.is_ok(), expect_success.get(1).unwrap());
+
+    //set super admin to 'super'
+    let result = ExecuteMsg::TransferSuper {
+        new_super: "super".to_string(),
+    }
+    .test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(2).unwrap());
+
+    //register 'admin' as admin without being the super user
+    let action = RegistryAction::RegisterAdmin {
+        user: "admin".to_string(),
+    };
+    let result = ExecuteMsg::UpdateRegistry {
+        action: action.clone(),
+    }
+    .test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(3).unwrap());
+
+    //register admin as admin with correct permissions
+    let action = RegistryAction::RegisterAdmin {
+        user: "admin".to_string(),
+    };
+    let result = ExecuteMsg::UpdateRegistry {
+        action: action.clone(),
+    }
+    .test_exec(&contract, &mut chain, Addr::unchecked("super"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(4).unwrap());
+
+    //set super admin to 'admin'
+    let result = ExecuteMsg::TransferSuper {
+        new_super: "admin".to_string(),
+    }
+    .test_exec(&contract, &mut chain, Addr::unchecked("super"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(5).unwrap());
+
+    //self destruct
+    let result =
+        ExecuteMsg::SelfDestruct {}.test_exec(&contract, &mut chain, Addr::unchecked("admin"), &[]);
+    assert_eq!(&result.is_ok(), expect_success.get(6).unwrap());
 }
 
 #[rstest]
@@ -235,19 +255,15 @@ fn test_permissions(
     }
 
     // Check that only super admin chan do this
-    assert!(
-        ExecuteMsg::UpdateRegistryBulk {
-            actions: actions.clone()
-        }
-        .test_exec(&admin, &mut chain, Addr::unchecked("user"), &[])
-        .is_err()
-    );
+    assert!(ExecuteMsg::UpdateRegistryBulk {
+        actions: actions.clone()
+    }
+    .test_exec(&admin, &mut chain, Addr::unchecked("user"), &[])
+    .is_err());
 
-    assert!(
-        ExecuteMsg::UpdateRegistryBulk { actions }
-            .test_exec(&admin, &mut chain, Addr::unchecked("admin"), &[])
-            .is_ok()
-    );
+    assert!(ExecuteMsg::UpdateRegistryBulk { actions }
+        .test_exec(&admin, &mut chain, Addr::unchecked("admin"), &[])
+        .is_ok());
 
     // Confirm that all permissions are set
     for permission in permissions.iter() {
@@ -282,21 +298,17 @@ fn test_permissions(
         })
         .collect();
 
-    assert!(
-        ExecuteMsg::UpdateRegistryBulk {
-            actions: revoke_actions.clone()
-        }
-        .test_exec(&admin, &mut chain, Addr::unchecked("user"), &[])
-        .is_err()
-    );
+    assert!(ExecuteMsg::UpdateRegistryBulk {
+        actions: revoke_actions.clone()
+    }
+    .test_exec(&admin, &mut chain, Addr::unchecked("user"), &[])
+    .is_err());
 
-    assert!(
-        ExecuteMsg::UpdateRegistryBulk {
-            actions: revoke_actions
-        }
-        .test_exec(&admin, &mut chain, Addr::unchecked("admin"), &[])
-        .is_ok()
-    );
+    assert!(ExecuteMsg::UpdateRegistryBulk {
+        actions: revoke_actions
+    }
+    .test_exec(&admin, &mut chain, Addr::unchecked("admin"), &[])
+    .is_ok());
 
     for permission in permissions.iter() {
         // Check that the permissions are correctly returned

contracts/dao/lp_shdswap/README.md renamed to archived-contracts/dao/lp_shdswap/README.md

@@ -13,22 +13,19 @@ rm ./$(1).wasm
 endef
 
 CONTRACTS = \
-		airdrop governance \
-		treasury treasury_manager scrt_staking rewards_emission \
-		oracle snip20 query_auth sky peg_stability admin\
-		mock_band mock_secretswap_pair mock_sienna_pair mock_adapter\
-		mock_stkd_derivative basic_staking snip20_migration lp_shdswap stkd_scrt\
+		airdrop treasury treasury_manager scrt_staking \
+		snip20 query_auth admin \
+		mock_sienna_pair mock_adapter \
+		mock_stkd_derivative basic_staking snip20_migration stkd_scrt \
 		snip20_derivative
 
-PACKAGES = \
-	  shade_protocol contract_harness cosmwasm_math_compat \
-		network_integration network_tester secretcli
+PACKAGES = shade_protocol contract_harness cosmwasm_math_compat 
 
 release: setup
 	${build-release}
 	@$(MAKE) compress_all
 
-dao: treasury treasury_manager scrt_staking rewards_emission
+dao: treasury treasury_manager scrt_staking
 
 compress_all: setup
 	@$(MAKE) $(addprefix compress-,$(CONTRACTS))

contracts/dao/lp_shdswap/src/contract.rs renamed to archived-contracts/dao/lp_shdswap/src/contract.rs

@@ -24,7 +24,7 @@ lb_factory = ["dep:lb_factory"]
 #mock_band= ["dep:mock_band"]
 mock_stkd = ["dep:mock_stkd"]
 mock_sienna = ["dep:mock_sienna"]
-governance = ["dep:governance"]
+# governance = ["dep:governance"]
 # snip20_staking = ["dep:spip_stkd_0"]
 # scrt_staking = ["dep:scrt_staking"]
 # bonds = ["dep:bonds"]
@@ -36,7 +36,7 @@ treasury_manager = ["dep:treasury_manager"]
 stkd_scrt = ["dep:stkd_scrt"]
 dao = ["mock_adapter", "treasury", "treasury_manager", "snip20"]
 # shade-oracles = ["dep:shade-oracles"]
-peg_stability = ["dep:peg_stability"]
+# peg_stability = ["dep:peg_stability"]
 snip20_migration = ["dep:snip20_migration"]
 
 [dependencies]
@@ -50,7 +50,7 @@ lb_factory = { version = "0.1.0", path = "../../contracts/liquidity_book/lb_fact
 #mint = { version = "0.1.0", path = "../../contracts/mint", optional = true }
 #oracle = { version = "0.1.0", path = "../../contracts/oracle", optional = true }
 #mock_band = { version = "0.1.0", path = "../../contracts/mock_band", optional = true }
-governance = { version = "0.1.0", path = "../../contracts/governance", optional = true }
+# governance = { version = "0.1.0", path = "../../contracts/governance", optional = true }
 basic_staking = { version = "0.1.0", path = "../../contracts/basic_staking", optional = true }
 # spip_stkd_0 = { version = "0.1.0", path = "../../contracts/snip20_staking", optional = true }
 # bonds = { version = "0.1.0", path = "../../contracts/bonds", optional = true }
@@ -61,7 +61,7 @@ scrt_staking = { version = "0.1.0", path = "../../contracts/dao/scrt_staking", o
 treasury = { version = "0.1.0", path = "../../contracts/dao/treasury", optional = true }
 treasury_manager = { version = "0.1.0", path = "../../contracts/dao/treasury_manager", optional = true }
 admin = { version = "0.2.0", path = "../../contracts/admin", optional = true }
-peg_stability = { version = "0.1.0", path = "../../contracts/peg_stability", optional = true }
+# peg_stability = { version = "0.1.0", path = "../../contracts/peg_stability", optional = true }
 mock_stkd = { version = "0.1.0", package = "mock_stkd_derivative", path = "../../contracts/mock/mock_stkd_derivative", optional = true }
 mock_sienna = { version = "0.1.0", package = "mock_sienna_pair", path = "../../contracts/mock/mock_sienna_pair", optional = true }
 snip20_migration = { version = "0.1.0", path = "../../contracts/snip20_migration", optional = true }

contracts/dao/lp_shdswap/src/execute.rs renamed to archived-contracts/dao/lp_shdswap/src/execute.rs

@@ -75,8 +75,8 @@ scrt_staking     = ["adapter", "treasury"]
 stkd_scrt        = ["adapter"]
 treasury         = ["adapter", "dao-utils"]
 treasury_manager = ["adapter"]
-rewards_emission = ["adapter"]
-lp_shdswap       = ["interface"]
+# rewards_emission = ["adapter"]
+# lp_shdswap       = ["interface"]
 adapter          = ["interface"]
 manager          = ["interface"]
 snip20           = ["query_auth_impl", "dep:base64"]