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.

Sign up for GitHub

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

Migrate Lockdrop and Vesting LP vaults to CL pools #71

Merged
merged 17 commits into from
Sep 5, 2023
Merged

Migrate Lockdrop and Vesting LP vaults to CL pools #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
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
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
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
577 changes: 485 additions & 92 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions contracts/dao/cwd-core/schema/cwd-core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,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 +1104,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 @@ -2136,7 +2136,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
6 changes: 3 additions & 3 deletions contracts/dao/cwd-core/schema/raw/execute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,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 @@ -944,7 +944,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 @@ -1976,7 +1976,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
6 changes: 3 additions & 3 deletions contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/cwd-pre-propose-multiple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,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 @@ -1012,7 +1012,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 @@ -2166,7 +2166,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
6 changes: 3 additions & 3 deletions contracts/dao/pre-propose/cwd-pre-propose-multiple/schema/raw/execute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,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 @@ -847,7 +847,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 @@ -2001,7 +2001,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
6 changes: 3 additions & 3 deletions contracts/dao/pre-propose/cwd-pre-propose-single/schema/cwd-pre-propose-single.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,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 @@ -1012,7 +1012,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 @@ -2132,7 +2132,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
6 changes: 3 additions & 3 deletions contracts/dao/pre-propose/cwd-pre-propose-single/schema/raw/execute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,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 @@ -847,7 +847,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 @@ -1967,7 +1967,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
24 changes: 12 additions & 12 deletions contracts/dao/proposal/cwd-proposal-multiple/schema/cwd-proposal-multiple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,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 @@ -1313,7 +1313,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 @@ -2470,7 +2470,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 Expand Up @@ -3921,7 +3921,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 @@ -4039,7 +4039,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 @@ -5266,7 +5266,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 Expand Up @@ -6086,7 +6086,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 @@ -6204,7 +6204,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 @@ -7412,7 +7412,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 Expand Up @@ -8220,7 +8220,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 @@ -8338,7 +8338,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 @@ -9565,7 +9565,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
6 changes: 3 additions & 3 deletions contracts/dao/proposal/cwd-proposal-multiple/schema/raw/execute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,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 @@ -1029,7 +1029,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 @@ -2186,7 +2186,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
6 changes: 3 additions & 3 deletions contracts/dao/proposal/cwd-proposal-multiple/schema/raw/response_to_list_proposals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,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 @@ -752,7 +752,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 @@ -1979,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
6 changes: 3 additions & 3 deletions contracts/dao/proposal/cwd-proposal-multiple/schema/raw/response_to_proposal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,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 @@ -756,7 +756,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 @@ -1964,7 +1964,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
6 changes: 3 additions & 3 deletions contracts/dao/proposal/cwd-proposal-multiple/schema/raw/response_to_reverse_proposals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,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 @@ -752,7 +752,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 @@ -1979,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