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

Governance implementation #206

Merged
merged 30 commits into from
May 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a23589e
added governance interface
FloppyDisck Apr 4, 2022
2e679ce
restarted development on governance, focusing on how to efficiently s…
FloppyDisck Apr 7, 2022
ae3a671
added flexible proposal storage
FloppyDisck Apr 11, 2022
1f30fd5
added the cosmwasm 1.0 uint and replaced committee with assembly
FloppyDisck Apr 11, 2022
052f95c
added proposal creation
FloppyDisck Apr 11, 2022
8903c16
fixed votes and started state update
FloppyDisck Apr 12, 2022
9a74eda
expanding proposal updates
FloppyDisck Apr 15, 2022
8c9b813
Merge branch 'minor_package_fix' into governance/SPIP-implementation
FloppyDisck Apr 15, 2022
d40e606
added proposal state update
FloppyDisck Apr 15, 2022
61a0de1
added proposal funding
FloppyDisck Apr 15, 2022
5b58271
added proposal triggers and assembly voting
FloppyDisck Apr 19, 2022
6c1d9bc
expanded handle msgs
FloppyDisck Apr 20, 2022
1420ba0
removed all compilation errors
FloppyDisck Apr 20, 2022
5787011
added tests
FloppyDisck Apr 23, 2022
21529ec
added total queries
FloppyDisck Apr 25, 2022
299c588
minor proposal tests
FloppyDisck Apr 26, 2022
735c313
added new proposal tests
FloppyDisck Apr 26, 2022
b76a83c
added more assembly voting tests
FloppyDisck Apr 26, 2022
28d018f
finalized assembly tests
FloppyDisck Apr 28, 2022
f978b5e
added funding tests
FloppyDisck Apr 29, 2022
c45f24f
added multimsg transactions
FloppyDisck May 2, 2022
b2b2ae0
add assemblies to contract test
FloppyDisck May 4, 2022
8348509
fixed msg triggering proposals
FloppyDisck May 4, 2022
97d9562
finished tests
FloppyDisck May 5, 2022
eab22cf
finished tests
FloppyDisck May 9, 2022
8db187f
Merge branch 'move-staked-shd' into governance/SPIP-implementation
FloppyDisck May 9, 2022
a378327
updated for staking
FloppyDisck May 9, 2022
0e63a1d
Merge branch 'dev' into governance/SPIP-implementation
FloppyDisck May 11, 2022
da75735
Merge branch 'dev' into governance/SPIP-implementation
FloppyDisck May 13, 2022
4907476
fixed merge conflicts
FloppyDisck May 13, 2022
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
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@

# Build results
target/
# this is moved to vm/testdata, others are present locally
contracts/hackatom/contract.wasm
contracts/hackatom/hash.txt

# Testing configs
*.json

# Code coverage stuff
*.profraw

# IDEs
.vscode/
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@
path = contracts/snip20
url = https://github.com/scrtlabs/snip20-reference-impl.git
branch = master
[submodule "contracts/shd_staking"]
path = contracts/shd_staking
url = https://github.com/securesecrets/SPIP-STKN-0
branch = staking-implementation
8 changes: 7 additions & 1 deletion contracts/governance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ 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 = [
"governance",
"governance-impl",
"snip20_staking"
] }
schemars = "0.7"
serde = { version = "1.0.103", default-features = false, features = ["derive"] }
Expand All @@ -39,3 +40,8 @@ snafu = { version = "0.6.3" }
serde_json = { version = "1.0.67" }
mockall = "0.10.2"
mockall_double = "0.2.0"
fadroma-ensemble = { branch = "v100", git = "https://github.com/hackbg/fadroma.git" }
fadroma-platform-scrt = { branch = "v100", git = "https://github.com/hackbg/fadroma.git" }
contract_harness = { version = "0.1.0", path = "../../packages/contract_harness", features = [ "governance", "snip20_staking", "snip20" ] }
snip20-reference-impl = { version = "0.1.0", path = "../snip20" }
spip_stkd_0 = { version = "0.1.0", path = "../snip20_staking" }
Loading