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

Jump to bottom

Treasury adapters #204

Merged
merged 54 commits into from
May 10, 2022
Merged

Treasury adapters #204

merged 54 commits into from
May 10, 2022

Conversation

DrPresident
Copy link
Collaborator

Major Changes:
treasury

  • Only does allowances for outgoing
  • Basic Rebalancing (needs refining)
  • Unbonding from adapters
  • Rough start for whitelisted unbonding from treasury

adapter

  • Basic interface for per-asset treasury integration (subject to changes)
  • unbonding - pulling assets from an adapter
  • balance - checking balance on a given asset
  • claiming - collecting funds that have been unbonded
  • updating - regular maintenance handle

treasury_manager

  • Allocates funds among adapters from treasury allowance
  • Rebalancing (needs refining)

rewards_emission

  • Holding treasury allowance for collection for a given target to refill its rewards
  • NOTE - very rough, will refine once swap is ready for integration

scrt_staking

  • Reworked for adapter interface
  • TODO: voting from govt (Authz)?

@DrPresident
roughed out adapter interface, applied to scrt_staking
58dbe75
@DrPresident
treasury updates for rewards tracking
22c1398
@DrPresident
working, was a gas issue
2247013
@DrPresident
treasury building, need finance_manager & unbonding logic
dd010b5
@DrPresident
treasury rework
3ab7db0
@DrPresident
minor fix
e92a33d
@DrPresident
registering managers on treasury
2b88dfc
@DrPresident
finance manager rebalance very rough
be57484
@DrPresident
adapter balance fn
f2d911e
@DrPresident
Added dao.drawio
6122eb2
@DrPresident
Update dao.drawio
a1306e3
@DrPresident
a little more done
db21cbc
@DrPresident
imported cargo features
9ff561b
@DrPresident
scrt staking tested and working
6621e88
@DrPresident
commented tx hash print
5e31277
@DrPresident
updated make clean to remove lock files
29d4300
@DrPresident
removed unbonding logic from 'update'
83f2bac
@DrPresident
PoC working, need manager unbonding
ac4962b
@DrPresident
needs rebalance threshold on treasury, otherwise appears to be workin…
408070e 
…g well
@DrPresident
starting on accounts for staking, moved treasury to an adapter
bfffdfb
@DrPresident
finance -> farming manager
42609bc
@DrPresident
started rewards emissions
d26581c
@DrPresident
removed unusude stuff
54922d2
@DrPresident
rough start on rewards_emission
a9c501b
@DrPresident
apparently never committed the mock pairs
0bf089b
@DrPresident
emissions building needs testing
ca12592
@DrPresident
added some queries to treasury and roughed out readme
4ba60e1
@DrPresident
removed commented
0c82aaf
@DrPresident
tweaks
47d7491
@DrPresident
removed empty adapter query funcs
0b0e604
@DrPresident DrPresident force-pushed the treasury-adapters branch from a9a0ecc to d339708 Compare May 3, 2022 18:36
FloppyDisck
FloppyDisck suggested changes May 4, 2022
View reviewed changes
.gitmodules Outdated Show resolved Hide resolved
contracts/mint/Cargo.toml Show resolved Hide resolved
contracts/mint/src/handle.rs Outdated Show resolved Hide resolved
contracts/oracle/src/query.rs Outdated Show resolved Hide resolved
contracts/rewards_emission/src/state.rs Show resolved Hide resolved
packages/shade_protocol/Cargo.toml Show resolved Hide resolved
packages/shade_protocol/Cargo.toml Outdated Show resolved Hide resolved
packages/shade_protocol/src/dex.rs Show resolved Hide resolved
packages/shade_protocol/src/treasury.rs Show resolved Hide resolved
packages/shade_protocol/src/utils/mod.rs Outdated Show resolved Hide resolved
FloppyDisck
FloppyDisck suggested changes May 9, 2022
View reviewed changes
contracts/oracle/Cargo.toml Outdated Show resolved Hide resolved
contracts/oracle/Cargo.toml Outdated Show resolved Hide resolved
contracts/oracle/src/query.rs Outdated Show resolved Hide resolved
@DrPresident DrPresident merged commit 699b940 into dev May 10, 2022
@DrPresident DrPresident deleted the treasury-adapters branch May 10, 2022 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FloppyDisck FloppyDisck FloppyDisck approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DrPresident @FloppyDisck