Configurable unbonding config for pools (#88)

dexter-zone · Mar 11, 2024 · ead2662 · ead2662
2 parents 31978a8 + 42ec905
commit ead2662
Show file tree

Hide file tree

Showing 37 changed files with 1,783 additions and 498 deletions.
diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt
@@ -1,18 +1,18 @@
-4dab2fc6bd56a50b3765baf335c14ec05b49f4815099e17519f4a7114010d023  dexter_governance_admin-aarch64.wasm
-61fd5eb6d634ef8b531298698e4e45424cfd26d92a1228511642608287cddbf4  dexter_governance_admin.wasm
-2c6ac09506b69a0ac06ce22079c9477dac495d3f2ff5e4d2c62068887ca0e64e  dexter_keeper-aarch64.wasm
-2a2c9c0488feba7ac4e9fab0a3bb9b2f1d95a80b2414671593a6dd42b982b4f0  dexter_keeper.wasm
-d96e7c699d163ef8f15079ad340015350ac64c84dfef15320815aef6269c67c1  dexter_multi_staking-aarch64.wasm
-7cd99e6f45131c63e35949ebd076e5f053d8da065f07fc24550cc3b51b839408  dexter_multi_staking.wasm
-68de586576ab108c927259201288f75b00f90276cbc80ba909993981dd425a19  dexter_router-aarch64.wasm
-4102b52a873a4fffa114b0c772117c842addc85762362366479099c64d2b69bf  dexter_router.wasm
-f3046bc7873053f1a64033fe41160a3ac2be874b6ac2f2f1b67b91046bace936  dexter_superfluid_lp-aarch64.wasm
-88697e167e6da1af0389c77bd3c740cbb8ffab0e6c79ac8a5b5c86e5b4136d19  dexter_superfluid_lp.wasm
-5089880ebaaa47e7d8641368920eeb5298480a1ea025bfc019f501ee5c7e3594  dexter_vault-aarch64.wasm
-f86dce8871e7466e2c24922cd753812830277dd8372e3002a94cecd476d5bb9a  dexter_vault.wasm
-45a289fd2342621e0dbe9d2c6193536be7e7a17843cacb56e392a94ce5a62dcb  lp_token-aarch64.wasm
-b944e64e40cbea733c247e8bfeed7329ea2159bd295dde402a485d61e81ba1aa  lp_token.wasm
-dbcb817d905d9ccc1183c62715f32e9592981cbf5329fe529353b8d12a2f8316  stable_pool-aarch64.wasm
-0d2a3990e5b0fdd6276fe330adb2ed38c1235150b2acebc2be2f734ccf1dfc89  stable_pool.wasm
-08436930bb4abe2cb78f5f7ae8583410b10fc3eef57e6bc9e6e021f61ef739d8  weighted_pool-aarch64.wasm
-755d6a4c78ea6f1579260b7b61b52545d11f2b90c149838eee078924453a274a  weighted_pool.wasm
+21355a578e0ef0861f4b9c23e70f54e90847137ad7cf550bdc60ad762c4df8e3  dexter_governance_admin-aarch64.wasm
+378459f0abdc57f4cadb8692be2352cea64acc16d2fc77d104f2d1467939401d  dexter_governance_admin.wasm
+ca6a64f456f478973cfd9b3bc99c2725f6f5c182f9f4df9005d7f0436661aa5d  dexter_keeper-aarch64.wasm
+50242640f23b46c1f0276f479a2852fac30ea386c590c17f7493b4529112c870  dexter_keeper.wasm
+6422ec98a4996161f687380bcca826b02fe26f402a20620246a18ea21229420f  dexter_multi_staking-aarch64.wasm
+09c374819a3e57ea0b9da6be5c54d061b6d5838d2e943fce7096af3db5c00de8  dexter_multi_staking.wasm
+1f2687ed6d8d91595c3251abd4514c09749bebf6b9ef8cbd94753bcdc467e218  dexter_router-aarch64.wasm
+48b97784bc431744d2f727941da939ce6cf04c49959b97595dc431b080070cf9  dexter_router.wasm
+b448981216b66c02f592c4edc8afb95caa563d9191876d8f71532f8387df70f3  dexter_superfluid_lp-aarch64.wasm
+803214635c6b618c4395206bb54f0f5f4d861c90096f064272d1dabf7fa1e3cc  dexter_superfluid_lp.wasm
+f08b0b2809e99e8ae65ec28293a097a6faca78e5a4530ba94d498382a32ae9ae  dexter_vault-aarch64.wasm
+0c15b06cfb0f52b779b79fd4b56f784babcb172b75c35ac4b83f3b0fdf7acdba  dexter_vault.wasm
+9c1ef4d27c2f76a968c909ffdc6739a794d871594151e49e931a48da1d87bdc2  lp_token-aarch64.wasm
+9633cca272749e266be93aba1a597d3fe49d0a84e7ab842d7a34402c01f8bef5  lp_token.wasm
+5e35bfe3d8e3c5f89f585c04b2353893162cac2d299c132c2bccb494a25ee7a7  stable_pool-aarch64.wasm
+730fe353b08d71a33bd12694064338dc78373a35fe39a7575ad5ed79d389b821  stable_pool.wasm
+7aea930f4bcb0da4e94dc173c0528185138671b2d868cf679ce42b9ca90a53fa  weighted_pool-aarch64.wasm
+7019ffc8f3eacdfcc13d588d26de784204f729fa2898ba1ff2cf5bb1e7bee586  weighted_pool.wasm
diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt
@@ -1,9 +1,8 @@
-6864211daf765d04b611daed7e4aa91fa1594f8c65eb1a1669e065ce4f9504f2  target/wasm32-unknown-unknown/release/dexter_governance_admin.wasm
-337c3945a6fd4f80383370664b7a10fae5bcc2ffa665de30e51cf1fe81e9a4fd  target/wasm32-unknown-unknown/release/dexter_keeper.wasm
-ac31cf4d60749229327a513a630efe212096a1de1d5af4da0c78beb46dca2087  target/wasm32-unknown-unknown/release/dexter_multi_staking.wasm
-fb899ce3aa92829910f318462dfe735303023e76cd76a24189a6bb45f06472ca  target/wasm32-unknown-unknown/release/dexter_router.wasm
-7304a5cacdf40b2fca1f5d69bd1504167905bd94083df06a31014fc10d52ed28  target/wasm32-unknown-unknown/release/dexter_superfluid_lp.wasm
-6b5dc74e43757d44d35bab7ae7f3a4807a836540a4f675b2dd35f8715ab63864  target/wasm32-unknown-unknown/release/dexter_vault.wasm
-5e37e85f31a5c762543e16159c3bba55413b1436937690465166fb4ce96558a4  target/wasm32-unknown-unknown/release/lp_token.wasm
-4725f4f4d7b910a529182fc47b0b2cfd47ef1343e4652ce6d5449941d7a021e3  target/wasm32-unknown-unknown/release/stable_pool.wasm
-ed142f681bfe3b3bba578ccfc3af05009cb3d03147fb3fa9561edabc78dcf270  target/wasm32-unknown-unknown/release/weighted_pool.wasm
+391c353d650626d40011385a2fe50fb506a09d2472a6c54da94d885cd1ac52bf  target/wasm32-unknown-unknown/release/dexter_governance_admin.wasm
+13fe7953094edaf64dd46dd832be31541557a93d3601f6017315d227fc8b9a27  target/wasm32-unknown-unknown/release/dexter_keeper.wasm
+2465ac00de52d10397e64142799751ca33cd6a387b348e462d43fc79192cf1c7  target/wasm32-unknown-unknown/release/dexter_multi_staking.wasm
+d7fce682716cc1e79e2d370da5544fd0840e4bbf75f3c9d8c7a34c55d0fa713f  target/wasm32-unknown-unknown/release/dexter_router.wasm
+add05a4995b70b780078908bfbe9e6754ad06c2ce5793f93595d252ad4121ea7  target/wasm32-unknown-unknown/release/dexter_vault.wasm
+00ba3921736b1f788e079c87085199289e5dc3c7801c7762c24674603f933551  target/wasm32-unknown-unknown/release/lp_token.wasm
+936645177e3da336e4689d535cfdc25c48f5723b0d4b34b42d38783b2fd3f7b9  target/wasm32-unknown-unknown/release/stable_pool.wasm
+f99881e3c5db034788179720ed70afffafc0d3651eb156a8f24bfb4a5048e850  target/wasm32-unknown-unknown/release/weighted_pool.wasm
diff --git a/artifacts/dexter_governance_admin-aarch64.wasm b/artifacts/dexter_governance_admin-aarch64.wasm
diff --git a/artifacts/dexter_governance_admin.wasm b/artifacts/dexter_governance_admin.wasm
diff --git a/artifacts/dexter_keeper-aarch64.wasm b/artifacts/dexter_keeper-aarch64.wasm
diff --git a/artifacts/dexter_keeper.wasm b/artifacts/dexter_keeper.wasm
diff --git a/artifacts/dexter_multi_staking-aarch64.wasm b/artifacts/dexter_multi_staking-aarch64.wasm
diff --git a/artifacts/dexter_multi_staking.wasm b/artifacts/dexter_multi_staking.wasm
diff --git a/artifacts/dexter_router-aarch64.wasm b/artifacts/dexter_router-aarch64.wasm
diff --git a/artifacts/dexter_router.wasm b/artifacts/dexter_router.wasm
diff --git a/artifacts/dexter_superfluid_lp-aarch64.wasm b/artifacts/dexter_superfluid_lp-aarch64.wasm
diff --git a/artifacts/dexter_superfluid_lp.wasm b/artifacts/dexter_superfluid_lp.wasm
diff --git a/artifacts/dexter_vault-aarch64.wasm b/artifacts/dexter_vault-aarch64.wasm
diff --git a/artifacts/dexter_vault.wasm b/artifacts/dexter_vault.wasm
diff --git a/artifacts/lp_token-aarch64.wasm b/artifacts/lp_token-aarch64.wasm
diff --git a/artifacts/lp_token.wasm b/artifacts/lp_token.wasm
diff --git a/artifacts/stable_pool-aarch64.wasm b/artifacts/stable_pool-aarch64.wasm
diff --git a/artifacts/stable_pool.wasm b/artifacts/stable_pool.wasm
diff --git a/artifacts/weighted_pool-aarch64.wasm b/artifacts/weighted_pool-aarch64.wasm
diff --git a/artifacts/weighted_pool.wasm b/artifacts/weighted_pool.wasm
diff --git a/contracts/governance_admin/tests/utils/mod.rs b/contracts/governance_admin/tests/utils/mod.rs
@@ -304,15 +304,18 @@ pub fn setup_test_contracts() -> GovAdminTestSetup {
         .data
         .address;
 
-    // instante the multistaking contract
+    // instantiate the multistaking contract
     let multi_staking_instantiate = dexter::multi_staking::InstantiateMsg {
         owner: Addr::unchecked(gov_admin_instance.clone()),
-        unlock_period: 86400u64,
         keeper_addr: Addr::unchecked(gov_admin_instance.clone()),
-        minimum_reward_schedule_proposal_start_delay: 0,
-        instant_unbond_fee_bp: 500u64,
-        instant_unbond_min_fee_bp: 200u64,
-        fee_tier_interval: 86400u64,
+        unbond_config: dexter::multi_staking::UnbondConfig {
+            unlock_period: 86400u64,
+            instant_unbond_config: dexter::multi_staking::InstantUnbondConfig::Enabled {
+                min_fee: 200u64,
+                max_fee: 500u64,
+                fee_tier_interval: 86400u64,
+            },
+        },
     };
 
     let multi_staking_instance = wasm

diff --git a/contracts/multi_staking/Cargo.toml b/contracts/multi_staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dexter-multi-staking"
-version = "3.0.0"
+version = "3.1.0"
 authors = ["Persistence Labs"]
 edition = "2021"