Split up contracts (#672)

CHANGELOG.md

@@ -26,11 +26,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added MultiSig ADO [(#619)](https://github.com/andromedaprotocol/andromeda-core/pull/619)
 - Added Validator Staking ADO [(#330)](https://github.com/andromedaprotocol/andromeda-core/pull/330)
 - Added Restake and Redelegate to Validator Staking [(#622)](https://github.com/andromedaprotocol/andromeda-core/pull/622)
+- Added andromeda-math and andromeda-account packages[(#672)](https://github.com/andromedaprotocol/andromeda-core/pull/672)
+
 
 ### Changed
 
 - Removed staking from vesting contract [(#554)](https://github.com/andromedaprotocol/andromeda-core/pull/554)
 - Vesting: Changed to use Milliseconds instead of seconds and removed unnecessary is_multi_batch_enabled flag [(#578)](https://github.com/andromedaprotocol/andromeda-core/pull/578)
+- Splits up ADOs: moved Counter, Curve, Date-Time, Graph, Point, Shunting ADOs to math package and Fixed Multisig ADO to accounts package[(#672)](https://github.com/andromedaprotocol/andromeda-core/pull/672)
 
 ### Fixed
 

Cargo.toml

@@ -10,6 +10,8 @@ members = [
     # "contracts/automation/*",
     "contracts/modules/*",
     "contracts/os/*",
+    "contracts/accounts/*",
+    "contracts/math/*",
 
     #Internal
     "tests-integration",
@@ -40,6 +42,8 @@ andromeda-data-storage = { path = "./packages/andromeda-data-storage", version =
 andromeda-modules = { path = "./packages/andromeda-modules", version = "2.0.0" }
 andromeda-app = { path = "./packages/andromeda-app", version = "1.0.0" }
 andromeda-ecosystem = { path = "./packages/andromeda-ecosystem", version = "1.0.0" }
+andromeda-accounts = { path = "./packages/andromeda-accounts", version = "1.0.0" }
+andromeda-math = { path = "./packages/andromeda-math", version = "1.0.0" }
 andromeda-testing = { path = "./packages/andromeda-testing", version = "1.0.0" }
 andromeda-testing-e2e = { path = "./packages/andromeda-testing-e2e", version = "1.0.0" }
 

contracts/finance/andromeda-fixed-multisig/Cargo.toml → contracts/accounts/andromeda-fixed-multisig/Cargo.toml

@@ -26,7 +26,7 @@ cw4 = { workspace = true }
 cw3-fixed-multisig = { git = "https://github.com/CosmWasm/cw-plus" }
 
 andromeda-std = { workspace = true }
-andromeda-finance = { workspace = true }
+andromeda-accounts = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-orch = { workspace = true }

contracts/finance/andromeda-fixed-multisig/examples/schema.rs → contracts/accounts/andromeda-fixed-multisig/examples/schema.rs

@@ -1,4 +1,4 @@
-use andromeda_finance::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_accounts::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 
 fn main() {

contracts/finance/andromeda-fixed-multisig/src/contract.rs → contracts/accounts/andromeda-fixed-multisig/src/contract.rs

@@ -2,7 +2,7 @@
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError};
 
-use andromeda_finance::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_accounts::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{
     ado_base::{InstantiateMsg as BaseInstantiateMsg, MigrateMsg},
     ado_contract::ADOContract,

contracts/finance/andromeda-fixed-multisig/src/execute.rs → contracts/accounts/andromeda-fixed-multisig/src/execute.rs

@@ -1,4 +1,4 @@
-use andromeda_finance::fixed_multisig::ExecuteMsg;
+use andromeda_accounts::fixed_multisig::ExecuteMsg;
 use andromeda_std::{
     ado_contract::ADOContract,
     common::{actions::call_action, context::ExecuteContext},

contracts/finance/andromeda-fixed-multisig/src/interface.rs → contracts/accounts/andromeda-fixed-multisig/src/interface.rs

@@ -1,4 +1,4 @@
-use andromeda_finance::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_accounts::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
 
 pub const CONTRACT_ID: &str = "fixed-multisig";

contracts/finance/andromeda-fixed-multisig/src/testing/tests.rs → contracts/accounts/andromeda-fixed-multisig/src/testing/tests.rs

@@ -7,8 +7,8 @@ use cw2::{get_contract_version, ContractVersion};
 use cw3::{ProposalResponse, Status, Vote, VoteListResponse};
 use cw_utils::{Duration, Expiration, Threshold};
 
-use andromeda_finance::fixed_multisig::Voter;
-use andromeda_finance::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_accounts::fixed_multisig::Voter;
+use andromeda_accounts::fixed_multisig::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{
     amp::AndrAddr,
     error::ContractError,

contracts/data-storage/andromeda-counter/Cargo.toml → contracts/math/andromeda-counter/Cargo.toml

@@ -28,10 +28,9 @@ cosmwasm-std = { workspace = true }
 cosmwasm-schema = { workspace = true }
 cw-storage-plus = { workspace = true }
 cw-utils = { workspace = true }
-cw20 = { workspace = true }
 
 andromeda-std = { workspace = true, features = ["rates"] }
-andromeda-data-storage = { workspace = true }
+andromeda-math = { workspace = true }
 
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

contracts/modules/andromeda-shunting/examples/schema.rs → contracts/math/andromeda-counter/examples/schema.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::shunting::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::counter::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 fn main() {
     write_api! {

contracts/data-storage/andromeda-counter/src/contract.rs → contracts/math/andromeda-counter/src/contract.rs

@@ -4,8 +4,8 @@ use cosmwasm_std::{
     attr, ensure, Addr, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError, Storage,
 };
 
-use andromeda_data_storage::counter::{CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg};
-use andromeda_data_storage::counter::{
+use andromeda_math::counter::{CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::counter::{
     GetCurrentAmountResponse, GetDecreaseAmountResponse, GetIncreaseAmountResponse,
     GetInitialAmountResponse, GetRestrictionResponse,
 };

contracts/data-storage/andromeda-counter/src/interface.rs → contracts/math/andromeda-counter/src/interface.rs

@@ -1,4 +1,4 @@
-use andromeda_data_storage::counter::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::counter::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
 
 pub const CONTRACT_ID: &str = "counter";

contracts/data-storage/andromeda-counter/src/mock.rs → contracts/math/andromeda-counter/src/mock.rs

@@ -1,9 +1,7 @@
 #![cfg(all(not(target_arch = "wasm32"), feature = "testing"))]
 use crate::contract::{execute, instantiate, query};
-use andromeda_data_storage::counter::{
-    CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg, State,
-};
-use andromeda_data_storage::counter::{
+use andromeda_math::counter::{CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg, State};
+use andromeda_math::counter::{
     GetCurrentAmountResponse, GetDecreaseAmountResponse, GetIncreaseAmountResponse,
     GetInitialAmountResponse, GetRestrictionResponse,
 };

contracts/data-storage/andromeda-counter/src/state.rs → contracts/math/andromeda-counter/src/state.rs

@@ -1,4 +1,4 @@
-use andromeda_data_storage::counter::CounterRestriction;
+use andromeda_math::counter::CounterRestriction;
 use cw_storage_plus::Item;
 
 pub const INITIAL_AMOUNT: Item<u64> = Item::new("initial_amount");

contracts/data-storage/andromeda-counter/src/testing/mock.rs → contracts/math/andromeda-counter/src/testing/mock.rs

@@ -1,5 +1,5 @@
-use andromeda_data_storage::counter::{CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg};
-use andromeda_data_storage::counter::{
+use andromeda_math::counter::{CounterRestriction, ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::counter::{
     GetCurrentAmountResponse, GetDecreaseAmountResponse, GetIncreaseAmountResponse,
     GetInitialAmountResponse, GetRestrictionResponse, State,
 };

contracts/data-storage/andromeda-counter/src/testing/tests.rs → contracts/math/andromeda-counter/src/testing/tests.rs

@@ -3,7 +3,7 @@ use super::mock::{
     query_increase_amount, query_initial_amount, query_restriction, reset, set_decrease_amount,
     set_increase_amount, update_restriction,
 };
-use andromeda_data_storage::counter::{CounterRestriction, State};
+use andromeda_math::counter::{CounterRestriction, State};
 use andromeda_std::error::ContractError;
 use cosmwasm_std::Attribute;
 

contracts/modules/andromeda-curve/Cargo.toml → contracts/math/andromeda-curve/Cargo.toml

@@ -23,7 +23,7 @@ cw-utils = { workspace = true }
 test-case = { workspace = true }
 
 andromeda-std = { workspace = true, features = [] }
-andromeda-modules = { workspace = true }
+andromeda-math = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 cw-multi-test = { workspace = true, optional = true }

contracts/modules/andromeda-date-time/examples/schema.rs → contracts/math/andromeda-curve/examples/schema.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::curve::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 fn main() {
     write_api! {

contracts/modules/andromeda-curve/src/contract.rs → contracts/math/andromeda-curve/src/contract.rs

@@ -1,6 +1,6 @@
 #[cfg(not(feature = "library"))]
 use crate::state::{CURVE_CONFIG, DEFAULT_CONSTANT_VALUE, DEFAULT_MULTIPLE_VARIABLE_VALUE};
-use andromeda_modules::curve::{
+use andromeda_math::curve::{
     CurveConfig, CurveType, ExecuteMsg, GetCurveConfigResponse, GetPlotYFromXResponse,
     InstantiateMsg, QueryMsg,
 };

contracts/modules/andromeda-curve/src/interface.rs → contracts/math/andromeda-curve/src/interface.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::curve::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::curve::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
 
 pub const CONTRACT_ID: &str = "curve";

contracts/modules/andromeda-curve/src/mock.rs → contracts/math/andromeda-curve/src/mock.rs

@@ -1,6 +1,6 @@
 #![cfg(all(not(target_arch = "wasm32"), feature = "testing"))]
 use crate::contract::{execute, instantiate, query};
-use andromeda_modules::curve::{
+use andromeda_math::curve::{
     CurveConfig, ExecuteMsg, GetCurveConfigResponse, GetPlotYFromXResponse, InstantiateMsg,
     QueryMsg,
 };

contracts/modules/andromeda-curve/src/state.rs → contracts/math/andromeda-curve/src/state.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::curve::CurveConfig;
+use andromeda_math::curve::CurveConfig;
 use cw_storage_plus::Item;
 
 pub const CURVE_CONFIG: Item<CurveConfig> = Item::new("curve_config");

contracts/modules/andromeda-curve/src/testing/mock.rs → contracts/math/andromeda-curve/src/testing/mock.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::curve::{
+use andromeda_math::curve::{
     CurveConfig, ExecuteMsg, GetCurveConfigResponse, GetPlotYFromXResponse, InstantiateMsg,
     QueryMsg,
 };

contracts/modules/andromeda-curve/src/testing/tests.rs → contracts/math/andromeda-curve/src/testing/tests.rs

@@ -2,7 +2,7 @@ use super::mock::{
     error_initialization, proper_initialization, query_curve_config, query_plot_y_from_x, reset,
     update_curve_config,
 };
-use andromeda_modules::curve::{CurveConfig, CurveType};
+use andromeda_math::curve::{CurveConfig, CurveType};
 use andromeda_std::{amp::AndrAddr, error::ContractError};
 use cosmwasm_std::StdError;
 use test_case::test_case;
@@ -38,7 +38,7 @@ fn test_reset() {
     reset(deps.as_mut(), "user1").unwrap();
 
     let err_res = query_curve_config(deps.as_ref()).unwrap_err();
-    assert_eq!(err_res, ContractError::Std(StdError::NotFound { kind: "type: andromeda_modules::curve::CurveConfig; key: [63, 75, 72, 76, 65, 5F, 63, 6F, 6E, 66, 69, 67]".to_string() }));
+    assert_eq!(err_res, ContractError::Std(StdError::NotFound { kind: "type: andromeda_math::curve::CurveConfig; key: [63, 75, 72, 76, 65, 5F, 63, 6F, 6E, 66, 69, 67]".to_string() }));
 }
 
 #[test]

contracts/modules/andromeda-date-time/Cargo.toml → contracts/math/andromeda-date-time/Cargo.toml

@@ -22,7 +22,7 @@ cw-storage-plus = { workspace = true }
 cw-utils = { workspace = true }
 
 andromeda-std = { workspace = true }
-andromeda-modules = { workspace = true }
+andromeda-math = { workspace = true }
 
 chrono = "0.4.38"
 

contracts/data-storage/andromeda-graph/examples/schema.rs → contracts/math/andromeda-date-time/examples/schema.rs

@@ -1,4 +1,4 @@
-use andromeda_data_storage::graph::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use cosmwasm_schema::write_api;
 fn main() {
     write_api! {

contracts/modules/andromeda-date-time/src/contract.rs → contracts/math/andromeda-date-time/src/contract.rs

@@ -2,8 +2,8 @@
 use cosmwasm_std::entry_point;
 use cosmwasm_std::{Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError};
 
-use andromeda_modules::date_time::GetDateTimeResponse;
-use andromeda_modules::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg, Timezone};
+use andromeda_math::date_time::GetDateTimeResponse;
+use andromeda_math::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg, Timezone};
 use andromeda_std::{
     ado_base::{InstantiateMsg as BaseInstantiateMsg, MigrateMsg},
     ado_contract::ADOContract,

contracts/modules/andromeda-date-time/src/interface.rs → contracts/math/andromeda-date-time/src/interface.rs

@@ -1,4 +1,4 @@
-use andromeda_modules::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg};
+use andromeda_math::date_time::{ExecuteMsg, InstantiateMsg, QueryMsg};
 use andromeda_std::{ado_base::MigrateMsg, contract_interface, deploy::ADOMetadata};
 
 pub const CONTRACT_ID: &str = "date-time";

contracts/modules/andromeda-date-time/src/mock.rs → contracts/math/andromeda-date-time/src/mock.rs

@@ -1,7 +1,7 @@
 #![cfg(all(not(target_arch = "wasm32"), feature = "testing"))]
 use crate::contract::{execute, instantiate, query};
-use andromeda_modules::date_time::GetDateTimeResponse;
-use andromeda_modules::date_time::{InstantiateMsg, QueryMsg, Timezone};
+use andromeda_math::date_time::GetDateTimeResponse;
+use andromeda_math::date_time::{InstantiateMsg, QueryMsg, Timezone};
 use andromeda_testing::mock::MockApp;
 use andromeda_testing::{
     mock_ado,