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

Release: v0.5.0 #89

Merged
merged 61 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
26bb3c3
add xyk to cl migrate handler for reserve contract
sotnikov-s Jun 7, 2023
81149f7
refactor reserve migration using callbacks instead of submsgs
sotnikov-s Jun 13, 2023
c2bbba8
tmp rm all but reserve contract
sotnikov-s Jun 13, 2023
4039ef3
fix typo in error name
sotnikov-s Jun 14, 2023
4eaf301
fix pair info and balances query in reserve migration
sotnikov-s Jun 14, 2023
8ff3856
enable all contracts
sotnikov-s Jun 14, 2023
7efb44a
move liquidity migration logic from migration handler to exec one
sotnikov-s Jun 15, 2023
0c74e0f
prettify migration config and reuse lp token addr
sotnikov-s Jun 15, 2023
c3b200e
improve MigrationAmountUnavailable error text
sotnikov-s Jun 16, 2023
3661106
wip
pr0n00gler Jun 16, 2023
68f4b37
wip
pr0n00gler Jun 19, 2023
c37b759
wip
pr0n00gler Jun 19, 2023
0aa2cb8
wip
pr0n00gler Jun 23, 2023
adbe3e1
wip
pr0n00gler Jun 26, 2023
8bdec04
fix voting power calc
quasisamurai Jul 7, 2023
3efb538
fix vp calculation
pr0n00gler Jul 10, 2023
a4b806e
Merge branch 'main' into fix/migrate-from-xyk-to-cl-pairs-vaults
pr0n00gler Aug 7, 2023
d5bc532
review fixes
pr0n00gler Aug 7, 2023
7e4119d
Merge branch 'main' of github.com:neutron-org/neutron-dao into feat/m…
sotnikov-s Aug 7, 2023
686f267
review fixes
pr0n00gler Aug 7, 2023
6dfe2d3
Merge branch 'feat/migrate-from-xyk-to-cl-pairs' into fix/migrate-fro…
pr0n00gler Aug 7, 2023
0edde36
separate contracts for migrated lockdrop and vesting lp vaults to cl …
pr0n00gler Aug 9, 2023
237e0e4
upgrade neutron voting registry to v2
sotnikov-s Aug 11, 2023
1d90c07
add migration handler+tests for voting registry v2
sotnikov-s Aug 15, 2023
a76e5d6
fix misprints
sotnikov-s Sep 1, 2023
fe1d796
add config item overwrite
sotnikov-s Sep 1, 2023
cdbb558
Merge branch 'main' of github.com:neutron-org/neutron-dao into feat/n…
sotnikov-s Sep 1, 2023
bee854b
Merge branch 'main' of github.com:neutron-org/neutron-dao into feat/m…
sotnikov-s Sep 1, 2023
353c22c
Merge branch 'feat/migrate-from-xyk-to-cl-pairs' into fix/migrate-fro…
pr0n00gler Sep 4, 2023
71981b5
check_contracts --locked
pr0n00gler Sep 4, 2023
f22fbf5
review fixes
pr0n00gler Sep 5, 2023
eb244d3
oracles -> cl_pools
pr0n00gler Sep 5, 2023
f02ec44
schema
pr0n00gler Sep 5, 2023
3394002
Merge pull request #71 from neutron-org/fix/migrate-from-xyk-to-cl-pa…
pr0n00gler Sep 5, 2023
83b7733
Merge pull request #69 from neutron-org/feat/migrate-from-xyk-to-cl-p…
pr0n00gler Sep 5, 2023
1cd5d88
Merge pull request #75 from neutron-org/feat/neutron-voting-registry-v2
pr0n00gler Sep 5, 2023
d07d7c5
backport of https://github.com/neutron-org/neutron-dao/pull/78
pr0n00gler Oct 11, 2023
ffe13f5
Merge pull request #83 from neutron-org/feat/save-failed-result-backport
pr0n00gler Oct 12, 2023
95fd7c1
bump contracts versions
pr0n00gler Oct 12, 2023
3d62d98
fixed cwd_proposal_single CONTRACT_NAME
swelf19 Oct 13, 2023
fbbfd1c
fixed CONTRACT_NAME
swelf19 Oct 13, 2023
3918ecd
moved cwd-security-subdao-pre-propose -> cwd-subdao-pre-propose-singl…
swelf19 Oct 13, 2023
d81666d
added migration entrypoint
swelf19 Oct 13, 2023
682e4f3
lint
swelf19 Oct 13, 2023
b5f708a
linter & tests
swelf19 Oct 13, 2023
53bfdf0
rust fmt
swelf19 Oct 13, 2023
4b3d00f
Merge pull request #85 from neutron-org/fix/contracts-names-fix
pr0n00gler Oct 13, 2023
d79a315
fix versions
pr0n00gler Oct 14, 2023
8bdad6f
rename cwd-subdao-pre-propose-single-no-timelock -> cwd-security-subd…
pr0n00gler Oct 15, 2023
6c91cee
fix versions
pr0n00gler Oct 16, 2023
1826405
Merge pull request #86 from neutron-org/chore/prepare-versions-for-re…
pr0n00gler Oct 17, 2023
5b00e7a
Merge pull request #84 from neutron-org/neutron_audit_informal_04_09_…
pr0n00gler Oct 17, 2023
a46f942
fix comment
quasisamurai Oct 17, 2023
3cea45f
Merge pull request #88 from neutron-org/fix/pre-propose-init-comment
pr0n00gler Oct 17, 2023
9f6bc64
bump neutron-sdk
pr0n00gler Oct 17, 2023
fae91dd
Merge branch 'main' into neutron_audit_informal_04_09_2023
pr0n00gler Oct 17, 2023
1decd80
bump versions of contracts + fix migrate handlers to be able to updat…
pr0n00gler Oct 18, 2023
d245549
remove lp migration logic
pr0n00gler Oct 18, 2023
a7b0307
remove lp migration logic
pr0n00gler Oct 18, 2023
26e35df
proper contract name, bump contract version
pr0n00gler Oct 18, 2023
f0d92cf
bump reserve version
pr0n00gler Oct 18, 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
683 changes: 427 additions & 256 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fmt:
@cargo fmt -- --check

check_contracts:
@cargo install cosmwasm-check
@cargo install cosmwasm-check --locked
@cosmwasm-check --available-capabilities iterator,staking,stargate,neutron artifacts/*.wasm

compile:
Expand Down
4 changes: 2 additions & 2 deletions contracts/dao/cwd-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "A DAO DAO core module."
edition = "2021"
name = "cwd-core"
repository = "https://github.com/DA0-DA0/dao-contracts"
version = "0.2.0"
version = "0.2.1"

[lib]
crate-type = ["cdylib", "rlib"]
Expand All @@ -28,7 +28,7 @@ cw20 = "1.1.0"
cw721 = "0.18.0"
cwd-interface = {path = "../../../packages/cwd-interface"}
cwd-macros = {path = "../../../packages/cwd-macros"}
neutron-sdk = {package = "neutron-sdk", version = "0.6.1"}
neutron-sdk = {package = "neutron-sdk", version = "0.7.0"}
schemars = "0.8.8"
serde = {version = "1.0.175", default-features = false, features = ["derive"]}
thiserror = {version = "1.0"}
165 changes: 4 additions & 161 deletions contracts/dao/cwd-core/schema/cwd-core.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contract_name": "cwd-core",
"contract_version": "0.2.0",
"contract_version": "0.2.1",
"idl_version": "1.0.0",
"instantiate": {
"$schema": "http://json-schema.org/draft-07/schema#",
Expand Down Expand Up @@ -719,30 +719,6 @@
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"staking"
],
"properties": {
"staking": {
"$ref": "#/definitions/StakingMsg"
}
},
"additionalProperties": false
},
{
"type": "object",
"required": [
"distribution"
],
"properties": {
"distribution": {
"$ref": "#/definitions/DistributionMsg"
}
},
"additionalProperties": false
},
{
"description": "A Stargate message encoded the same way as a protobuf [Any](https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/any.proto). This is the same structure as messages in `TxBody` from [ADR-020](https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-020-protobuf-transaction-encoding.md)",
"type": "object",
Expand Down Expand Up @@ -806,55 +782,6 @@
}
]
},
"DistributionMsg": {
"description": "The message types of the distribution module.\n\nSee https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto",
"oneOf": [
{
"description": "This is translated to a [MsgSetWithdrawAddress](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L29-L37). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"set_withdraw_address"
],
"properties": {
"set_withdraw_address": {
"type": "object",
"required": [
"address"
],
"properties": {
"address": {
"description": "The `withdraw_address`",
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "This is translated to a [[MsgWithdrawDelegatorReward](https://github.com/cosmos/cosmos-sdk/blob/v0.42.4/proto/cosmos/distribution/v1beta1/tx.proto#L42-L50). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"withdraw_delegator_reward"
],
"properties": {
"withdraw_delegator_reward": {
"type": "object",
"required": [
"validator"
],
"properties": {
"validator": {
"description": "The `validator_address`",
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
},
"Duration": {
"description": "Duration is a delta of time. You can add it to a BlockInfo or Expiration to move that further in the future. Note that an height-based Duration and a time-based Expiration cannot be combined",
"oneOf": [
Expand Down Expand Up @@ -986,7 +913,7 @@
]
},
"channel_id": {
"description": "exisiting channel to send the tokens over",
"description": "existing channel to send the tokens over",
"type": "string"
},
"timeout": {
Expand Down Expand Up @@ -1104,7 +1031,7 @@
"minimum": 0.0
},
"revision": {
"description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
"description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
"type": "integer",
"format": "uint64",
"minimum": 0.0
Expand Down Expand Up @@ -1810,90 +1737,6 @@
}
}
},
"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": [
{
"description": "This is translated to a [MsgDelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L81-L90). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"delegate"
],
"properties": {
"delegate": {
"type": "object",
"required": [
"amount",
"validator"
],
"properties": {
"amount": {
"$ref": "#/definitions/Coin"
},
"validator": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "This is translated to a [MsgUndelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L112-L121). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"undelegate"
],
"properties": {
"undelegate": {
"type": "object",
"required": [
"amount",
"validator"
],
"properties": {
"amount": {
"$ref": "#/definitions/Coin"
},
"validator": {
"type": "string"
}
}
}
},
"additionalProperties": false
},
{
"description": "This is translated to a [MsgBeginRedelegate](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0/proto/cosmos/staking/v1beta1/tx.proto#L95-L105). `delegator_address` is automatically filled with the current contract's address.",
"type": "object",
"required": [
"redelegate"
],
"properties": {
"redelegate": {
"type": "object",
"required": [
"amount",
"dst_validator",
"src_validator"
],
"properties": {
"amount": {
"$ref": "#/definitions/Coin"
},
"dst_validator": {
"type": "string"
},
"src_validator": {
"type": "string"
}
}
}
},
"additionalProperties": false
}
]
},
"SubDao": {
"type": "object",
"required": [
Expand Down Expand Up @@ -2136,7 +1979,7 @@
}
},
"label": {
"description": "A human-readbale label for the contract",
"description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
"type": "string"
},
"msg": {
Expand Down
Loading
Loading