Treasury adapters

.gitmodules

@@ -5,4 +5,4 @@
 [submodule "contracts/shd_staking"]
 	path = contracts/shd_staking
 	url = https://github.com/securesecrets/SPIP-STKN-0
-    branch = staking-implementation
+    branch = staking-implementation

Cargo.toml

@@ -13,11 +13,18 @@ members = [
   "contracts/governance",
   "contracts/mint",
   "contracts/mint_router",
-  "contracts/treasury",
   "contracts/oracle",
   "contracts/snip20",
-  "contracts/shd_staking",
+
+  # DAO
+  # - Core
+  "contracts/treasury",
+  "contracts/treasury_manager",
+  # - Adapters
   "contracts/scrt_staking",
+  "contracts/rewards_emission",
+
+  "contracts/shd_staking",
 
   # Mock contracts
   "contracts/mock_band",

contractlib/secretlib/secretlib.py

@@ -123,7 +123,8 @@ def run_command_compute_hash(command):
 
     try:
         txhash = json.loads(out)["txhash"]
-        # print(txhash)
+        #print(txhash)
+
     except Exception as e:
         # print(out)
         raise e

contracts/mint/Cargo.toml

@@ -31,15 +31,14 @@ cosmwasm-storage = { version = "0.10", package = "secret-cosmwasm-storage" }
 cosmwasm-schema = "0.10.1"
 secret-toolkit = { version = "0.2" }
 cosmwasm-math-compat = { path = "../../packages/cosmwasm_math_compat" }
-shade-protocol = { version = "0.1.0", path = "../../packages/shade_protocol", features = [
-  "mint",
-  "oracle",
-  "band",
-  "dex",
-] }
+shade-protocol = { version = "0.1.0", path = "../../packages/shade_protocol", features = [ "mint", "oracle", "band", "dex", ] }
 schemars = "0.7"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 snafu = { version = "0.6.3" }
-mockall = "0.10.2"
-mockall_double = "0.2.0"
 chrono = "0.4.19"
+
+[dev-dependencies]
+fadroma = { version = "^22.1.0", git = "https://github.com/hackbg/fadroma.git" }
+snip20-reference-impl = { version = "0.1.0", path = "../../contracts/snip20" }
+oracle = { version = "0.1.0", path = "../../contracts/oracle" }
+mock_band = { version = "0.1.0", path = "../../contracts/mock_band" }

contracts/mint/src/handle.rs

@@ -484,6 +484,24 @@ pub fn calculate_mint(
     }
 }
 
+/*
+pub fn calculate_fee_curve(
+    // "Centered"
+    base_fee: Uint128, 
+    // How far off from where we want (abs(desired_price - cur_price))
+    price_skew: Uint128,
+    // skew we should never reach (where fee maxes out)
+    asymptote: Uint128,
+) -> Uint128 {
+
+    /*  aggressiveness is how sharply it turns up at the asymptote
+     *  speed is the overall speed of increase
+     *  how to include asymptote to push the threshold before acceleration?
+     * y = (x + speed) ^ (2 * aggressiveness)
+     */
+}
+*/
+
 pub fn calculate_portion(amount: Uint128, portion: Uint128) -> Uint128 {
     /* amount: total amount sent to burn (uSSCRT/uSILK/uSHD)
      * portion: percent * 10^18 e.g. 5_320_000_000_000_000_000 = 5.32% = .0532
@@ -507,5 +525,6 @@ fn oracle<S: Storage, A: Api, Q: Querier>(
         config.oracle.code_hash,
         config.oracle.address,
     )?;
-    Ok(answer.rate)
+
+    Ok(Uint128::from(answer.rate))
 }

contracts/mint/src/lib.rs

@@ -3,9 +3,6 @@ pub mod handle;
 pub mod query;
 pub mod state;
 
-#[cfg(test)]
-mod test;
-
 #[cfg(target_arch = "wasm32")]
 mod wasm {
     use super::contract;

contracts/mint/src/query.rs

@@ -64,12 +64,14 @@ pub fn mint<S: Storage, A: Api, Q: Querier>(
     offer_asset: HumanAddr,
     amount: Uint128,
 ) -> StdResult<QueryAnswer> {
+
     let native_asset = native_asset_r(&deps.storage).load()?;
 
     match assets_r(&deps.storage).may_load(offer_asset.to_string().as_bytes())? {
         Some(asset) => {
-            let fee = calculate_portion(amount, asset.fee);
-            let amount = mint_amount(deps, amount.checked_sub(fee)?, &asset, &native_asset)?;
+            //let fee = calculate_portion(amount, asset.fee);
+            //let amount = mint_amount(deps, amount.checked_sub(fee)?, &asset, &native_asset)?;
+            let amount = mint_amount(deps, amount, &asset, &native_asset)?;
             Ok(QueryAnswer::Mint {
                 asset: native_asset.contract,
                 amount,