Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
216 changes: 173 additions & 43 deletions Cargo.lock

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions contracts/cw-proposal-single/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cw-proposal-single"
version = "0.1.0"
version = "0.1.1"
authors = ["Zeke Medley <zekemedley@gmail.com>"]
edition = "2018"

Expand Down Expand Up @@ -47,15 +47,16 @@ indexable-hooks = { version = "*", path = "../../packages/indexable-hooks" }
proposal-hooks = { version = "*", path = "../../packages/proposal-hooks" }
vote-hooks = { version = "*", path = "../../packages/vote-hooks" }

# neta dependencies. used to migrate back to v1
cw-proposal-single-v1 = { package = "cw-proposal-single", version = "0.1.0" }
voting-v1 = { package = "dao-voting", version = "0.1.0" }

[dev-dependencies]
cosmwasm-schema = { version = "1.0.0" }
cw-multi-test = "0.13"
cw4-voting = { path = "../cw4-voting", version = "*" }
cw20-balance-voting = { path = "../../debug/cw20-balance-voting", version = "*" }
cw20-staked-balance-voting = { path = "../cw20-staked-balance-voting", version = "*" }
cw-native-staked-balance-voting = { path = "../cw-native-staked-balance-voting", version = "*" }
cw721-stake = { path = "../cw721-stake", version = "*" }
cw721-base = "0.13"
testing = { version = "*", path = "../../packages/testing" }
cw20-stake = { path= "../cw20-stake", version = "*" }
cw20-base = "0.13"
Expand Down
1 change: 0 additions & 1 deletion contracts/cw-proposal-single/examples/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ fn main() {
"ProposalHooksResponse",
);
export_schema_with_title(&schema_for!(HooksResponse), &out_dir, "VoteHooksResponse");
export_schema_with_title(&schema_for!(VoteResponse), &out_dir, "GetVoteResponse");
}
4 changes: 0 additions & 4 deletions contracts/cw-proposal-single/schema/execute_msg.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
"additionalProperties": false
},
{
"description": "Adds an address as a consumer of proposal hooks. Consumers of proposal hooks have hook messages executed on them whenever the status of a proposal changes or a proposal is created. If a consumer contract errors when handling a hook message it will be removed from the list of consumers.",
"type": "object",
"required": [
"add_proposal_hook"
Expand All @@ -212,7 +211,6 @@
"additionalProperties": false
},
{
"description": "Removes a consumer of proposal hooks.",
"type": "object",
"required": [
"remove_proposal_hook"
Expand All @@ -233,7 +231,6 @@
"additionalProperties": false
},
{
"description": "Adds an address as a consumer of vote hooks. Consumers of vote hooks have hook messages executed on them whenever the a vote is cast. If a consumer contract errors when handling a hook message it will be removed from the list of consumers.",
"type": "object",
"required": [
"add_vote_hook"
Expand All @@ -254,7 +251,6 @@
"additionalProperties": false
},
{
"description": "Removed a consumer of vote hooks.",
"type": "object",
"required": [
"remove_vote_hook"
Expand Down
72 changes: 0 additions & 72 deletions contracts/cw-proposal-single/schema/get_vote_response.json

This file was deleted.

57 changes: 19 additions & 38 deletions contracts/cw-proposal-single/schema/list_proposals_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -557,33 +557,12 @@
}
]
},
"ProposalResponse": {
"description": "Information about a proposal returned by proposal queries.",
"type": "object",
"required": [
"id",
"proposal"
],
"properties": {
"id": {
"description": "The ID of the proposal being returned.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"proposal": {
"$ref": "#/definitions/SingleChoiceProposal"
}
}
},
"SingleChoiceProposal": {
"Proposal": {
"type": "object",
"required": [
"allow_revoting",
"created",
"description",
"expiration",
"last_updated",
"msgs",
"proposer",
"start_height",
Expand All @@ -597,14 +576,6 @@
"allow_revoting": {
"type": "boolean"
},
"created": {
"description": "The timestamp at which this proposal was created.",
"allOf": [
{
"$ref": "#/definitions/Timestamp"
}
]
},
"deposit_info": {
"description": "Information about the deposit that was sent as part of this proposal. None if no deposit.",
"anyOf": [
Expand All @@ -627,14 +598,6 @@
}
]
},
"last_updated": {
"description": "The timestamp at which this proposal's status last changed (e.g. Passed, Executed).",
"allOf": [
{
"$ref": "#/definitions/Timestamp"
}
]
},
"min_voting_period": {
"description": "The minimum amount of time this proposal must remain open for voting. The proposal may not pass unless this is expired or None.",
"anyOf": [
Expand Down Expand Up @@ -694,6 +657,24 @@
}
}
},
"ProposalResponse": {
"description": "Information about a proposal returned by proposal queries.",
"type": "object",
"required": [
"id",
"proposal"
],
"properties": {
"id": {
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"proposal": {
"$ref": "#/definitions/Proposal"
}
}
},
"StakingMsg": {
"description": "The message types of the staking module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto",
"oneOf": [
Expand Down
23 changes: 2 additions & 21 deletions contracts/cw-proposal-single/schema/proposal_response.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
],
"properties": {
"id": {
"description": "The ID of the proposal being returned.",
"type": "integer",
"format": "uint64",
"minimum": 0.0
},
"proposal": {
"$ref": "#/definitions/SingleChoiceProposal"
"$ref": "#/definitions/Proposal"
}
},
"definitions": {
Expand Down Expand Up @@ -561,14 +560,12 @@
}
]
},
"SingleChoiceProposal": {
"Proposal": {
"type": "object",
"required": [
"allow_revoting",
"created",
"description",
"expiration",
"last_updated",
"msgs",
"proposer",
"start_height",
Expand All @@ -582,14 +579,6 @@
"allow_revoting": {
"type": "boolean"
},
"created": {
"description": "The timestamp at which this proposal was created.",
"allOf": [
{
"$ref": "#/definitions/Timestamp"
}
]
},
"deposit_info": {
"description": "Information about the deposit that was sent as part of this proposal. None if no deposit.",
"anyOf": [
Expand All @@ -612,14 +601,6 @@
}
]
},
"last_updated": {
"description": "The timestamp at which this proposal's status last changed (e.g. Passed, Executed).",
"allOf": [
{
"$ref": "#/definitions/Timestamp"
}
]
},
"min_voting_period": {
"description": "The minimum amount of time this proposal must remain open for voting. The proposal may not pass unless this is expired or None.",
"anyOf": [
Expand Down
Loading