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

feat: alliance lp hub #31

Merged
merged 12 commits into from
Jan 16, 2024
Merged

feat: alliance lp hub #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
310e327
init: alliance lp hub
emidev98 Jan 8, 2024
d96fad3
feat: generate schemas
emidev98 Jan 8, 2024
80a6c3d
wip(lp-hub): create modify assets method
emidev98 Jan 9, 2024
4e9a0be
wip(lp-hub): enable staking of CW20 and Native
emidev98 Jan 9, 2024
2599ecc
wip(lp-hub): cw20 staking for both native and cw20
emidev98 Jan 9, 2024
cd636ca
feat: update emissions distribution msg
javiersuweijie Jan 10, 2024
2928a20
test: added tests for unallocated rewards
javiersuweijie Jan 10, 2024
f22c16b
feat: deposit funds into the astro incentives
emidev98 Jan 11, 2024
9dbb361
feat: send cw20 tokens to astro incentives contract
emidev98 Jan 12, 2024
ea56af9
feat: alliance lp hub tests to stake astro
emidev98 Jan 12, 2024
d611779
feat: send unallocated rewards to fee collector
emidev98 Jan 15, 2024
715f42e
fix: lint
javiersuweijie Jan 16, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ node_modules
.idea
.env

.vscode

# Metadata from deployments
scripts/.oracle_address.log
scripts/.hub_address.log
94 changes: 57 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
members = [
"contracts/alliance-hub",
"contracts/alliance-oracle",
"contracts/alliance-lp-hub",
"packages/alliance-protocol",
]
exclude = []
Expand Down Expand Up @@ -40,4 +41,6 @@ serde = { version = "1.0.152", default-features = false, featu
terra-proto-rs = { version = "4.0.2", default-features = false}
thiserror = { version = "1.0.38" }
cw2 = "1.0.1"
cw20 = "1.0.1"
cw-utils = "1.0.1"
alliance-protocol = { path = "./packages/alliance-protocol" }
39 changes: 19 additions & 20 deletions contracts/alliance-hub/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
[package]
name = "alliance-hub"
version = "0.1.1"
authors = ["Terra Money <[email protected]>"]
edition = "2018"
name = "alliance-hub"
version = "0.1.1"
authors = ["Terra Money <[email protected]>"]
edition = "2018"

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

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

[features]
backtraces = ["cosmwasm-std/backtraces"]
library = []
backtraces = ["cosmwasm-std/backtraces"]
library = []

[dependencies]
cosmwasm-std = { workspace = true, features = ["stargate"] }
cosmwasm-storage = { workspace = true }
cosmwasm-schema = { workspace = true }
cw-storage-plus = { workspace = true }
cw-asset = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
cosmwasm-std = { workspace = true, features = ["stargate"] }
cosmwasm-storage = { workspace = true }
cosmwasm-schema = { workspace = true }
cw-storage-plus = { workspace = true }
cw-asset = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
alliance-protocol = { workspace = true }

cw2 = "1.0.1"
cw-utils = "1.0.1"
terra-proto-rs = {version = "3.0.2", default-features = false}
cw2 = { workspace = true }
cw-utils = { workspace = true }
terra-proto-rs = { workspace = true }
Loading
Loading