Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configurable unbonding config for pools #88

Merged
merged 19 commits into from
Mar 11, 2024
Merged

Configurable unbonding config for pools #88

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e480b98
ILPU configuration on a per-pool basis
betterclever Jan 8, 2024
788c153
add support for unsetting the custom unlock config
betterclever Jan 9, 2024
908e666
add tests for per pool unbonding config
betterclever Jan 9, 2024
dc33c8b
new artifacts
betterclever Jan 12, 2024
0b93d1f
fix tests
betterclever Jan 12, 2024
51da506
custom unbond config query
betterclever Jan 18, 2024
0d20ed3
new artifacts
betterclever Jan 19, 2024
60991d0
keeper address validation
betterclever Feb 5, 2024
f423769
fix fee ceil issue
betterclever Feb 5, 2024
bed7516
added missing unbond config validations
betterclever Feb 6, 2024
64b37f7
emit parameters in events and remove unused parameter
betterclever Feb 6, 2024
2c00c34
send the cw20 sender for create reward schedule event
betterclever Feb 6, 2024
243bc7e
whitelist for reward CW20 tokens
betterclever Feb 6, 2024
0b8bee5
fix tests and new artifacts
betterclever Feb 6, 2024
3ce856e
add sender checks
betterclever Feb 12, 2024
e99311d
Merge remote-tracking branch 'origin/main' into betterclever/multista…
betterclever Mar 11, 2024
6fabf3e
fix test
betterclever Mar 11, 2024
f6c100f
new artifacts
betterclever Mar 11, 2024
42ec905
add new schema also
betterclever Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions artifacts/checksums.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
b033c50a9172e847c3f349cf861652b92b6d3c77be24c1896b6f8fe49b351852 dexter_governance_admin-aarch64.wasm
ddab6c4c7b0ecce4f3c7fdd7a252df4513b20e8f556dced2d6fa26cb4e8b7cf5 dexter_governance_admin.wasm
763d18e2511dc2675f7922dfb436e50c873fb8700766a63d47727908dba89926 dexter_keeper-aarch64.wasm
7a6b92012a55079f30f19f281aca842b4278cdb3f9934d7d8fecbf4597932eca dexter_keeper.wasm
910c56f23aa385c0505a4e2e31a99b836630f7224442a79fd60fcc4ce04fca84 dexter_multi_staking-aarch64.wasm
389308f509cf2620a6b580c1a07e659bd2ed057ab9f6ff0fc80e899114a195fc dexter_multi_staking.wasm
a6cc2dbddf5116a94250a2da56a667f4261a303ada8fe0a9a2e18e761e72020a dexter_router-aarch64.wasm
7910f20513015a2ef412b683eca21578875013b253f5a9981949a6fc666dca37 dexter_router.wasm
ee15396844a7a5d2f3150e07077f729be8fb5b950a6163c2afe3ecf1455974d0 dexter_vault-aarch64.wasm
de02859f12133984ddc50cd267597855e4ea655ae12289450713233c034db17a dexter_vault.wasm
742d8db553a7ee49babbe94d2257d6aa1cba2853ec698d5eee938d0f63fc5552 lp_token-aarch64.wasm
a5e718ca06a7c5df8c2cc84a33b39be2aa4f4859922d2ca52536e29c2966f073 lp_token.wasm
5162acb9fb571be79d8933f6bf26a15e713bb2a3e0c5e9aa2b21876cd09a220f stable_pool-aarch64.wasm
fb1828921272e85b71a7d607552dea73892337601d52e0657827c1850b0f1f0e stable_pool.wasm
fe7a2248e0c87c9d5a7c527022e5f76e512f5ed4183da4bef9a4e6e59c079f09 weighted_pool-aarch64.wasm
e2ce35e3acb4d07ce215d524a9173ebc84395b2d24d98eedae87c84f49fcd35c weighted_pool.wasm
d076b1d88f6c53fb46a6d0416e5666a118c6aa716433f62b546f0a94176ff9a6 dexter_governance_admin-aarch64.wasm
c96adb626635e0b603cf223064d9d620a3070191375a4d24002ee6c1c950860a dexter_governance_admin.wasm
876236658baa72f1ece304cf05135ae1dd67588c374675f60cf9271d58183dec dexter_keeper-aarch64.wasm
dac4e21f06f993a0806e03b74214a2209912692d258fc306f92833b0628dee26 dexter_keeper.wasm
ac04bccd6dbe9e037cb42716d8c0d05c53e7d8927e0fe9d289747cedd30990c1 dexter_multi_staking-aarch64.wasm
e0ee3826b654802f56a7426f0a237a630898544d2178850c2b054c4bd090bcca dexter_multi_staking.wasm
a23ef63a189376be029d0504701ba5a91e5ecf88372825cdb0bee13b63d6cd75 dexter_router-aarch64.wasm
14650a04274408ad1c28c9cf31711b99be8aa6ddb3aafffe375155c5af8815c7 dexter_router.wasm
4d2185b233ea81d17fcf93522e1c047861d1658d0e3decae918491f06ac7e3db dexter_vault-aarch64.wasm
ff3d404293e7fecd3b39bc87cd60e67e8ceb80a3dd995a7f62ab60b69da4cceb dexter_vault.wasm
ee948fd7193ad20ac7541cee062a8b36ac70dc0e9ecb61c87745be753c6a39b1 lp_token-aarch64.wasm
8c0b9c8a03afeba33e9490cb0fe068b9b54132f816a18de48e206a7ab51457c9 lp_token.wasm
6a41f837f6b396764dfafc08f64eb1d09a5ec33313dfee4921f44160bc434f4c stable_pool-aarch64.wasm
7c9cf606a4f61a1cc093d3c27aa5f4e9ffb1956fa0b7a2ee26c30ea0c7737b04 stable_pool.wasm
7c810fb43841851de25417c5909849d3b5667374b656c2b348ce73d51ba8743e weighted_pool-aarch64.wasm
416a9e81dd0f210d21e81487c3526c390cf398cd78ab26d4f9cc2e00d49a6442 weighted_pool.wasm
16 changes: 8 additions & 8 deletions artifacts/checksums_intermediate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +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
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
c86b87a95c11cb0890c558e82426f6f784ae9ffd2132ea7fe85cc8c9eb1751d7 target/wasm32-unknown-unknown/release/dexter_governance_admin.wasm
d07c8ec78fdb3fe52f1f5706bf9eb2235efe7e660e4d45f8f58d5be5d55db5c7 target/wasm32-unknown-unknown/release/dexter_keeper.wasm
c798ebed7e15bff15ac0f275859259b8b105b1d9618050f5fe9b8752c34358b9 target/wasm32-unknown-unknown/release/dexter_multi_staking.wasm
22c2d5954d08136dbc16c77bfcf5cc101b72747934262b366f1d6e4198b6e164 target/wasm32-unknown-unknown/release/dexter_router.wasm
bd3c2bcae0be79d586f64eb5bc4d8c331c3d1f8c7862420a545ac6ea8412f39d target/wasm32-unknown-unknown/release/dexter_vault.wasm
7034b5d149df88dc74c735609051ee33515960e3ceac346d78a67c911c1dc770 target/wasm32-unknown-unknown/release/lp_token.wasm
1f6023ce0d54c1f10e08414fa08c16b15543e27dbd2a39e5338682a454ec3e3e target/wasm32-unknown-unknown/release/stable_pool.wasm
9c04168ef6d337a7c6f2a2bef85198e476051c7b882b042db13ca531f915c9f1 target/wasm32-unknown-unknown/release/weighted_pool.wasm
Binary file modified artifacts/dexter_governance_admin-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_governance_admin.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_keeper-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_keeper.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_multi_staking-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_multi_staking.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_router-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_router.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_vault-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/dexter_vault.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/lp_token-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/lp_token.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/stable_pool-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/stable_pool.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/weighted_pool-aarch64.wasm
View file
Open in desktop
Binary file not shown.
Binary file modified artifacts/weighted_pool.wasm
View file
Open in desktop
Binary file not shown.
12 changes: 8 additions & 4 deletions contracts/governance_admin/tests/utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,16 @@ pub fn setup_test_contracts() -> GovAdminTestSetup {
// instante the multistaking contract
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// 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
Expand Down
Loading