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.

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

Fix challange app #96

Merged
merged 53 commits into from
Oct 19, 2023
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
1109dde
replace duration enum
CyberHoward Sep 30, 2023
a772ced
formatting
CyberHoward Sep 30, 2023
a796e6e
small refactor
Buckram123 Oct 4, 2023
ae2ec4a
remove check_ins
Buckram123 Oct 4, 2023
d49b08b
voting object
Buckram123 Oct 4, 2023
3c6a914
update voting
Buckram123 Oct 4, 2023
5179336
add vote error
Buckram123 Oct 5, 2023
a2266f8
fix challenge status
Buckram123 Oct 5, 2023
068c486
challenge execute methods
Buckram123 Oct 5, 2023
84477e8
add expiration for voting
Buckram123 Oct 5, 2023
3b2847b
veto period start after votes counted
Buckram123 Oct 6, 2023
8034615
integrate voting in challenge
Buckram123 Oct 6, 2023
c99cb0b
fix remove voters
Buckram123 Oct 6, 2023
de5bc2a
add veto action
Buckram123 Oct 6, 2023
366738d
update queries
Buckram123 Oct 6, 2023
c2a33e5
add comments
Buckram123 Oct 9, 2023
3cb78f3
fix existing tests
Buckram123 Oct 9, 2023
ec77cdd
add challenge id to the response
Buckram123 Oct 9, 2023
42995db
format
Buckram123 Oct 9, 2023
a058198
previous votes
Buckram123 Oct 9, 2023
88b657b
wasm can't deserialize map
Buckram123 Oct 10, 2023
0dda5ca
fix friends
Buckram123 Oct 10, 2023
576dc2b
bugfix
Buckram123 Oct 10, 2023
9118043
rename to proposals, where it fits
Buckram123 Oct 10, 2023
f3f642a
add votes query
Buckram123 Oct 10, 2023
dc39dec
cast vote as abstract account
Buckram123 Oct 10, 2023
86bf03b
add veto tests
Buckram123 Oct 11, 2023
9c8f4a6
format
Buckram123 Oct 11, 2023
34e488c
add limits
Buckram123 Oct 11, 2023
0d8e64d
Doc-comment for SimpleVoting
Buckram123 Oct 11, 2023
fbd0c9c
clippy
Buckram123 Oct 11, 2023
3f10572
Bump challenge to 0.2.0
adairrr Oct 11, 2023
b00aee8
add validation, make description optional
Buckram123 Oct 12, 2023
497a74a
format
Buckram123 Oct 12, 2023
2ca5d81
duplicate addrs fix
Buckram123 Oct 13, 2023
2adb059
update proposal initiation and veto
Buckram123 Oct 16, 2023
8f1af63
update tests/fix bugs
Buckram123 Oct 17, 2023
b279cfe
clippy fixes
Buckram123 Oct 17, 2023
41df9bb
add readme for the challenge
Buckram123 Oct 17, 2023
ebf2919
small edit in readme
Buckram123 Oct 17, 2023
08100cc
Merge branch 'main' into fix/challange_app
Buckram123 Oct 17, 2023
cf953e3
Merge remote-tracking branch 'origin' into fix/challange_app
Buckram123 Oct 17, 2023
7da4b22
voting tests and fixes
Buckram123 Oct 18, 2023
4a4b40b
update challenge to the new simple_voting
Buckram123 Oct 18, 2023
1a3816f
add active_proposal to ChallengeEntryResponse
Buckram123 Oct 18, 2023
9c12138
update schema
Buckram123 Oct 18, 2023
a9b0627
update voting readme
Buckram123 Oct 18, 2023
c39bede
redundant take(1)
Buckram123 Oct 19, 2023
b341aa8
add proposal lifecylce
CyberHoward Oct 19, 2023
a474d75
formatting
CyberHoward Oct 19, 2023
ea40e6f
update proposal lifecylce
CyberHoward Oct 19, 2023
231da31
complete proposal lifecycle
CyberHoward Oct 19, 2023
d1d5df7
fix beta clippy
CyberHoward Oct 19, 2023
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
8 changes: 7 additions & 1 deletion framework/packages/abstract-core/src/objects/voting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@
//! * List of items queries allowed by `query_` prefix
//!
//! ## Details
//! All methods that modify proposal will return [`ProposalInfo`] to allow logging or checking current status of proposal
//! All methods that modify proposal will return [`ProposalInfo`] to allow logging or checking current status of proposal.
//!
//! Each proposal goes through the following stages:
//! 1. Active: proposal is active and can be voted on
//! 2. WaitingForCount: voting period is finished and awaiting counting
//! 3. VetoPeriod (optional): voting is counted and veto period is active
CyberHoward marked this conversation as resolved.
Show resolved Hide resolved
//! 4. Finished: proposal is finished and count is done
CyberHoward marked this conversation as resolved.
Show resolved Hide resolved

use std::{collections::HashSet, fmt::Display};

Expand Down
Loading