Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Distribute fees #3030

Merged
merged 13 commits into from
May 5, 2021
Merged

Distribute fees #3030

merged 13 commits into from
May 5, 2021

Conversation

michaelfig
Copy link
Member

With @Chris-Hibbert 's help, we leveraged the fee distribution and wired it into the chain bootstrap.

@michaelfig michaelfig added the cosmic-swingset package: cosmic-swingset label May 4, 2021
@michaelfig michaelfig added this to the Beta Phase 2: Reward Flows milestone May 4, 2021
@michaelfig michaelfig self-assigned this May 4, 2021
katelynsills
katelynsills approved these changes May 4, 2021
View reviewed changes
Copy link
Contributor

@katelynsills katelynsills left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ERTP type change aside, this looks good!

dtribble
dtribble requested changes May 4, 2021
View reviewed changes
Copy link
Member

@dtribble dtribble left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except for the non-trivial perf issue of awaiting the reuslt of getAllegedBrand That will result in O(n) cranks rather than O(1) cranks.

Chris-Hibbert
Chris-Hibbert approved these changes May 4, 2021
View reviewed changes
Copy link
Contributor

@Chris-Hibbert Chris-Hibbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will admit that I didn't get everything that was going on in vat-bank, but I've reviewed the rest and it looks good.

@michaelfig michaelfig force-pushed the mfig-distribute-fees branch from 1731e6b to 46e5b38 Compare May 4, 2021 23:29
michaelfig and others added 12 commits May 4, 2021 17:45
@michaelfig
refactor: use a Store instead of a Map to assert brands exist
8970dca
@michaelfig
fix(newSwap): move guard out of conditional; tests pass
dc67e67
@michaelfig
style: enable ts-check for treasury tests
b42da66
@michaelfig
feat: wire up vats.distributeFees
9e16332
@michaelfig
fix: have the treasury use the newSwap AMM implementation
ed6b84a
@michaelfig
fix: default and propagate the poolFee and protocolFee in treasury
d210bcf
@katelynsills @michaelfig
chore: revert ERTP types, change from numbers to bigints where lintin…
97ce4dd 
…g fails (#3031)
@Chris-Hibbert @michaelfig
fix: test and workaround for a reallocate issue in zoe
f56ff7a 
issue 3033 shows that reallocate fails unnecessarily if asked to
reallocate to seats that had no previous allocation, even if the new
allocations are empty.

This works around that for the collectFees contract until a fix can be prepared.
@michaelfig
refactor: fix type lint
b16ae45
@dtribble @michaelfig
fix: remove awaita from depositMultiple
a7da714
@dtribble @michaelfig
fix: add brand to depositMultiple mock bank
0d1f22d
@michaelfig
chore: remove some extraneous lines
8390512
@michaelfig michaelfig force-pushed the mfig-distribute-fees branch from 7f833f2 to 334a253 Compare May 5, 2021 00:06
@michaelfig michaelfig enabled auto-merge May 5, 2021 00:13
@michaelfig michaelfig merged commit d182e45 into master May 5, 2021
@michaelfig michaelfig deleted the mfig-distribute-fees branch May 5, 2021 00:21
@snyk-bot snyk-bot mentioned this pull request Sep 16, 2021
Open
@snyk-bot snyk-bot mentioned this pull request Jan 17, 2022
Open
@Kashuhackerone Kashuhackerone mentioned this pull request Aug 1, 2022
Open
This was referenced Oct 22, 2022
Open
Open
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@katelynsills katelynsills katelynsills approved these changes

@Chris-Hibbert Chris-Hibbert Chris-Hibbert approved these changes

@dtribble dtribble dtribble approved these changes

Assignees

@michaelfig michaelfig

Labels
cosmic-swingset package: cosmic-swingset
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@michaelfig @dtribble @katelynsills @Chris-Hibbert