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

ABS-166: Create accountability module #47

Merged
merged 73 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
917c736
create initial structure
0xmovses Aug 22, 2023
4539d87
create initial state
0xmovses Aug 22, 2023
afa4a1b
create handlers and msg
0xmovses Aug 22, 2023
b2f9d0a
create execute handler
0xmovses Aug 22, 2023
a938ec1
update names update state
0xmovses Aug 23, 2023
820eaeb
update handlers
0xmovses Aug 23, 2023
c511e32
add vote handler logic
0xmovses Aug 23, 2023
58ba5ef
fix handler compiler errors
0xmovses Aug 23, 2023
a34af41
Merge branch 'main' into 0xmovses/abs-166
0xmovses Aug 24, 2023
0cd6d9c
refactor, cleanup
0xmovses Aug 24, 2023
bf9d63b
update execute msg, more refactors
0xmovses Aug 24, 2023
7ddc6d6
create wasm test update toml
0xmovses Aug 24, 2023
c392981
create wasm test and setup for e2e
0xmovses Aug 24, 2023
4ebf3e0
Merge branch 'main' into 0xmovses/abs-166
0xmovses Aug 28, 2023
cdd2bde
create integration tests
0xmovses Aug 28, 2023
33662d7
add more tests
0xmovses Aug 28, 2023
8455147
add friend test cases
0xmovses Aug 29, 2023
0761101
add vote cases
0xmovses Aug 29, 2023
56f232b
updates
0xmovses Aug 29, 2023
bc02d4b
integrate adairrr feedback
0xmovses Aug 29, 2023
80c0057
update charge_penalty logic
0xmovses Aug 29, 2023
fa3912b
rebuilt wasms
0xmovses Aug 29, 2023
2302041
fix merge conflict
0xmovses Aug 29, 2023
485f696
rebuilt wasms
0xmovses Aug 30, 2023
0749614
fix tests and cleanup
0xmovses Aug 30, 2023
a109ada
clippy
0xmovses Aug 30, 2023
7f67ea4
integrate PR feedback
0xmovses Aug 31, 2023
23995ff
add impl methods on Vote and Friend
0xmovses Aug 31, 2023
0c2902d
update tests
0xmovses Aug 31, 2023
d97f69a
fix tests, refactor, cleanup
0xmovses Aug 31, 2023
29ba36a
integrate Buckram feedback
0xmovses Aug 31, 2023
1ccc033
add admin strike functionality and add challenge status
0xmovses Sep 1, 2023
668482f
update charge_penalty logic
0xmovses Sep 1, 2023
747ba8b
fix failing tests
0xmovses Sep 4, 2023
8159030
fix flaxy test, add remainder attribute
0xmovses Sep 4, 2023
c1ee4f9
merge main
0xmovses Sep 4, 2023
665ee6e
update to Timestamp use EndKind enum for user input
0xmovses Sep 4, 2023
faf7d92
add Timestamp to Checkin and vote_status
0xmovses Sep 4, 2023
a82034f
update contract logic
0xmovses Sep 4, 2023
f972ac5
remodel state, fix new ownership errors
0xmovses Sep 5, 2023
47fc6ff
update charge penalty math and state
0xmovses Sep 5, 2023
fa1b70a
fix tests intergrate feedback
0xmovses Sep 5, 2023
586ad1d
Merge branch 'main' into 0xmovses/abs-166
0xmovses Sep 5, 2023
78bfb14
update composite key and field names
0xmovses Sep 5, 2023
bea1879
update test after composite keys change
0xmovses Sep 5, 2023
b0b96ad
remove redundant
0xmovses Sep 5, 2023
667b32a
update comments
0xmovses Sep 5, 2023
4e5416f
update responses
0xmovses Sep 6, 2023
2038c82
add transfer msg
0xmovses Sep 6, 2023
9551a41
clippy
0xmovses Sep 6, 2023
33eb190
clippy more
0xmovses Sep 6, 2023
9be126f
run release_build
0xmovses Sep 6, 2023
0d4be6e
Update modules/contracts/apps/challenge/src/handlers/execute.rs
0xmovses Sep 6, 2023
a2df780
Update modules/contracts/apps/challenge/src/handlers/execute.rs
0xmovses Sep 6, 2023
022645f
integrate buckram feedback
0xmovses Sep 6, 2023
258e3a7
integrate Buckram feedback
0xmovses Sep 7, 2023
5aaacea
Merge branch 'main' into 0xmovses/abs-166
0xmovses Sep 7, 2023
6f763b5
generate schema
0xmovses Sep 7, 2023
e7c5a39
Merge branch 'main' into 0xmovses/abs-166
0xmovses Sep 7, 2023
58231c1
bump osmosis-test-tube
0xmovses Sep 7, 2023
b373994
Merge branch '0xmovses/abs-166' of https://github.com/AbstractSDK/abs…
0xmovses Sep 7, 2023
16977e7
Merge branch 'main' into 0xmovses/abs-166
0xmovses Sep 7, 2023
c1347ff
integrate buckram123 feedback
0xmovses Sep 7, 2023
a396d06
Merge branch '0xmovses/abs-166' of https://github.com/AbstractSDK/abs…
0xmovses Sep 7, 2023
a3568ae
merge main
0xmovses Sep 7, 2023
5f17a3b
Merge branch 'main' into 0xmovses/abs-166
0xmovses Sep 9, 2023
4133407
bump chrono
0xmovses Sep 9, 2023
00daa8a
bump chrono again
0xmovses Sep 9, 2023
05910db
chrono to 0.4.23
0xmovses Sep 9, 2023
2c7a03b
chrono to 0.4.27
0xmovses Sep 11, 2023
eee9c73
merge main
0xmovses Sep 11, 2023
7060482
chrono to 0.4.23
0xmovses Sep 11, 2023
5d26c7e
croncat version bump
Buckram123 Sep 11, 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
1 change: 1 addition & 0 deletions modules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ thiserror = { version = "1.0" }
protobuf = { version = "2", features = ["with-bytes"] }

clap = { version = "4.0.32", features = ["derive"] }
chrono = "0.4"
0xmovses marked this conversation as resolved.
Show resolved Hide resolved
semver = "1.0"
cw-semver = { version = "1.0" }
cw-orch = { version = "~0.13" }
Expand Down
62 changes: 62 additions & 0 deletions modules/contracts/apps/challenge/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[package]
name = "abstract-challenge-app"
version = "0.0.1"
authors = [
"CyberHoward <[email protected]>",
"Adair <[email protected]>",
"Abstract Money <[email protected]>",
"0xmovses <[email protected]>",
]
edition = "2021"
homepage = ""
documentation = ""
repository = ""
license = "GPL-3.0-or-later"
keywords = ["cosmos", "cosmwasm", "abstractsdk"]
resolver = "2"

exclude = ["contract.wasm", "hash.txt"]

[lib]
crate-type = ["cdylib", "rlib"]

[features]
default = ["export"]
export = []
# enable node-backed tests (ensure Docker is running)
# run with `cargo test --jobs 1 --features node-tests`
node-tests = ["interface"]
interface = ["export", "dep:abstract-interface", "dep:cw-orch"]

[dependencies]
cosmwasm-std = { workspace = true }
cosmwasm-schema = { workspace = true }
cw-controllers = { workspace = true }
cw-storage-plus = { workspace = true }
thiserror = { workspace = true }
schemars = { workspace = true }
cw-asset = { workspace = true }

abstract-core = { workspace = true }
abstract-app = { workspace = true }
abstract-sdk = { workspace = true }

chrono = { workspace = true }
0xmovses marked this conversation as resolved.
Show resolved Hide resolved

# Dependencies for interface
abstract-interface = { workspace = true, optional = true }
cw-orch = { workspace = true, optional = true }
croncat-app = { workspace = true, default-features = false }
abstract-dex-adapter = { workspace = true, default-features = false }

[dev-dependencies]
abstract-interface = { workspace = true, features = ["daemon"] }
abstract-testing = { workspace = true }
abstract-sdk = { workspace = true, features = ["test-utils"] }
speculoos = "0.11.0"
semver = "1.0"
dotenv = "0.15.0"
env_logger = "0.10.0"
cw-orch = { workspace = true, features = ["daemon"] }
wyndex-bundle = { workspace = true }

0xmovses marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
Empty file.
0xmovses marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
41 changes: 41 additions & 0 deletions modules/contracts/apps/challenge/src/contract.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
use crate::{error::AppError, handlers, msg::AppInstantiateMsg};
use abstract_app::AppContract;
use abstract_core::objects::dependency::StaticDependency;
use cosmwasm_std::{Empty, Response};
use croncat_app::{CRONCAT_ID, CRONCAT_MODULE_VERSION};

/// The version of your app
pub const CHALLENGE_APP_VERSION: &str = env!("CARGO_PKG_VERSION");
/// the id of the app
pub const CHALLENGE_APP_ID: &str = "abstract:accountability";

/// The type of the result returned by your app's entry points.
pub type AppResult<T = Response> = Result<T, AppError>;

/// The type of the app that is used to build your app and access the Abstract SDK features.
pub type ChallengeApp = AppContract<
AppError,
AppInstantiateMsg,
AccountabilityExecuteMsg,
AccountabilityQueryMsg,
Empty,
>;

const CHALLENGE_APP: ChallengeApp = ChallengeApp::new(ACC_APP_ID, ACC_APP_VERSION, None)
.with_instantiate(handlers::instantiate_handler)
.with_execute(handlers::execute_handler)
.with_query(handlers::query_handler)
.with_dependencies(&[
StaticDependency::new(CRONCAT_ID, &[CRONCAT_MODULE_VERSION]),
StaticDependency::new(
abstract_dex_adapter::EXCHANGE,
&[abstract_dex_adapter::contract::CONTRACT_VERSION],
),
]);

// Export handlers
#[cfg(feature = "export")]
abstract_app::export_endpoints!(ACC_APP, ChallengeApp);

#[cfg(feature = "interface")]
abstract_app::cw_orch_interface!(ACC_APP, ChallengeApp, ChallengeApp);
Empty file.
Loading
Loading