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

[EPIC] New fee model architecture #270

Merged
merged 105 commits into from
Aug 14, 2024
Merged

[EPIC] New fee model architecture #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
0d6b9f9
Initial commit
vzotova May 17, 2024
658c149
Add simple hooks to GlobalAllowList to allow simple extensibility
cygnusv Apr 10, 2024
99706a0
wip: managed allow list
piotr-roslaniec Apr 15, 2024
da36209
wip: add some tests
piotr-roslaniec Apr 15, 2024
cf2e2c4
wip: change of plans
piotr-roslaniec Apr 15, 2024
9dadabb
Generalize modifier to set authorizations in GlobalAllowList
cygnusv Apr 15, 2024
5844546
ManagedAllowList now inherits from GlobalAllowList
cygnusv Apr 15, 2024
4f95871
Rename allowances in ManagedAllowList
cygnusv Apr 16, 2024
c97636b
Fix tests for ManagedAllowList
cygnusv Apr 16, 2024
182ec4d
Draft for Subscriptions and how can be used with AllowLists
cygnusv Apr 16, 2024
772b502
wip: change of plans was a mistakerino
piotr-roslaniec Apr 15, 2024
4b82837
wip: subscription manager draft
piotr-roslaniec Apr 16, 2024
76e57da
wip: add way too much comments
piotr-roslaniec Apr 18, 2024
8257adf
wip: more tests, yes yes
piotr-roslaniec Apr 19, 2024
746e285
wip: test test test
piotr-roslaniec Apr 19, 2024
6d41044
wip: fix solhint
piotr-roslaniec Apr 19, 2024
0e2b4fd
wip: add subscription tests draft
piotr-roslaniec Apr 19, 2024
b568607
wip: more subscription tests
piotr-roslaniec Apr 22, 2024
a37d13f
apply pr suggestions
piotr-roslaniec Apr 23, 2024
0865dc4
apply pr suggestions
piotr-roslaniec Apr 23, 2024
916e38f
apply pr suggestions
piotr-roslaniec Apr 23, 2024
0b216b0
fix solhint failing silently on ci
piotr-roslaniec May 15, 2024
0db349a
remove solidity oopsies
piotr-roslaniec May 15, 2024
2a14954
Extracting fee model from Coordinator
vzotova May 15, 2024
a277c33
Moves global allow list test to the separate file
vzotova May 15, 2024
803963c
FlatRateFeeModel: restrict payment method
vzotova May 15, 2024
1364cd1
Minor renames
vzotova May 17, 2024
0baee79
Apply suggestions from code review
vzotova May 22, 2024
925301e
Return back storing accessControl in Coordinator
vzotova May 25, 2024
378c818
Adds fee model <-> allow list communication
vzotova May 22, 2024
c3d695b
Apply suggestions from code review
vzotova Jun 7, 2024
4c42a95
Initial commit with BqETHSubscription contract
vzotova May 28, 2024
66ced18
FeeModel: adds yellow and red period and extending ritual
vzotova May 29, 2024
cc6cedc
Check access controller in subscription
vzotova May 31, 2024
1f03a82
BqETHSubscription: fix bugs and add tests
vzotova Jun 4, 2024
48eed61
BqETHSubscription: handling yellow period
vzotova Jun 5, 2024
cd77f41
Apply suggestions from code review
vzotova Jun 7, 2024
3f201d6
Extract base logic from BqETHSubscription
vzotova Jun 10, 2024
9db689c
BqETHSubscription: draft of encryptor slots and fees
vzotova Jun 12, 2024
f8830a2
BqETHSubscription: tests and fixes
vzotova Jun 13, 2024
82941ea
BqETHSubscription: initialize startOfSubscription during ritual initi…
vzotova Jun 20, 2024
500d57e
BqETHSubscription: force to pay for used encryptor slots
vzotova Jun 24, 2024
a739b07
Apply suggestions from code review
vzotova Jun 25, 2024
f9597e0
BqETHSubscription: upgradability
vzotova Jun 18, 2024
679a5cb
BqETHSubscription: rename beneficiary to treasury
vzotova Jun 19, 2024
5884fcc
Subscription: extract encryptor slots logic to abstract contracts
vzotova Jun 26, 2024
d10073e
Apply suggestions from code review
vzotova Jun 27, 2024
b3a3a94
Removes BetaProgramInitiator
vzotova Jun 27, 2024
09562cc
Coordinator: return back isEncryptionAuthorized
vzotova Jun 28, 2024
7048dd2
GlobalAllowList: it's global allow list again
vzotova Jun 28, 2024
082eb48
Skip some tests in test_managed_allow_list
vzotova Jun 28, 2024
638bf51
BqETHSubscription: immutable accesscontroller
vzotova Jul 2, 2024
5a643a7
Coordinator: a deprecation notice comment for isEncryptionAuthorized
vzotova Jul 2, 2024
ae20027
BqETHSubscription: base fee rate increase
vzotova Jul 3, 2024
ae2de07
Apply suggestions from code review
vzotova Jul 4, 2024
3c76b1e
BqETHSubscription: note for base fee potential overflow
vzotova Jul 8, 2024
be506d2
First draft for BqETH deployment parameters
cygnusv Jul 1, 2024
d5e9285
Update BqETHSubscription deployment parameters
cygnusv Jul 4, 2024
c01cd1a
Repurpose old BetaProgramInitiator deployer script for BqETHSubscription
cygnusv Jul 5, 2024
143b066
Add BqETHSubscription contract to registry
manumonti Jul 5, 2024
2af2aaa
Updated ape modules
manumonti Jul 5, 2024
6252ef1
Remove BetaProgramInitiator contract
manumonti Jul 5, 2024
1cbe227
Fix compiler collision on OpenAccessAuthorizer
manumonti Jul 5, 2024
7181854
Update coordinator upgrade scripts
manumonti Jul 5, 2024
5b57c0a
Add coordinator approve fee model script
manumonti Jul 5, 2024
36cfef2
BqETH will have 6 month periods, so period increase is 2.47% = sqrt(5%)
cygnusv Jul 8, 2024
1d29526
Adds free fee model
vzotova Jul 5, 2024
fd87a11
Fix deployer.finalize() function for ape 0.8.8
manumonti Jul 5, 2024
0bd3d04
Add Free Fee Model deployment script
manumonti Jul 5, 2024
98deced
Add Free Fee Model contract to the Lynx registry
manumonti Jul 5, 2024
0d8b75e
Add coordinator approve free fee model script
manumonti Jul 5, 2024
df95f18
Stop using deprecated method in favour of updated method. This will p…
derekpierre Jul 8, 2024
ab98e51
Fix contract registry to remove weird ABI values due to deprecated fu…
derekpierre Jul 8, 2024
85d92f5
Update Coordinator ABI
manumonti Jul 9, 2024
23cb717
Rename coordinator approves BqETH fee model script
manumonti Jul 9, 2024
b84fd28
BqETHSubscription: adopter set by special role
vzotova Jul 15, 2024
5823e61
Apply suggestions from code review
vzotova Jul 15, 2024
248436e
Fix for #292
vzotova Jul 15, 2024
ce74d73
Remove MAX_AUTH_ACTIONS restriction
cygnusv Jul 16, 2024
b100304
Revert "Remove MAX_AUTH_ACTIONS restriction"
manumonti Jul 16, 2024
9224788
Adapt BqETHSubscription deploy script to addition of adopterSetter
cygnusv Jul 16, 2024
c086b2e
On mainnet, adopter setter will be NuCo
cygnusv Jul 16, 2024
33d3f72
BqETH subscription period is 183 days
cygnusv Jul 16, 2024
470da44
Actually use bqeth deployment parameters!
cygnusv Jul 16, 2024
d801a1c
Remove beta program initiator parameters
cygnusv Jul 16, 2024
e6c8000
Add max nodes param to bqeth deployment file
manumonti Jul 16, 2024
550eb4e
Add Free Fee Model contract deployment script
manumonti Jul 17, 2024
3115e64
Add mainnet deployment artifacts for BqETH
manumonti Jul 17, 2024
9ae1ab5
Add mainnet deployment artifact of FreeFeeModel
manumonti Jul 17, 2024
51b28f9
remove BetaProgramInitiator from mainnet registry
KPrasch Aug 2, 2024
2b27417
removes BetaProgramInitiator registry entry for Tapir testnet.
KPrasch Aug 5, 2024
ffa513e
ape-driven generic subscription management CLI
KPrasch Aug 5, 2024
5caecf3
fix typo in BqETHSubscription comment
KPrasch Aug 5, 2024
bf992ac
Apply suggestions from code review
KPrasch Aug 7, 2024
f69c5dc
Introduces node sampling utility function
KPrasch Aug 2, 2024
f153f28
implement new node sampling utility in initiate_ritual.py
KPrasch Aug 2, 2024
afa29c6
basic error handle contract not found error in initiate_ritual.py
KPrasch Aug 2, 2024
7d04896
Add fee model contract address to initiate_ritual method parameters.
derekpierre Aug 2, 2024
3510879
parameterize ritual authoirity address
KPrasch Aug 5, 2024
2717fa5
support for handpicked nodes file
KPrasch Aug 6, 2024
09e801f
Apply RFCs in PR #297
KPrasch Aug 7, 2024
0b0bbc7
Improves handling of porter sampling in initiate_ritual.py
KPrasch Aug 7, 2024
f097743
implement registry lookup utlities and tighten click types for ritual…
KPrasch Aug 7, 2024
4ea9027
require network option
KPrasch Aug 7, 2024
05b960e
respond to RFCs in PR #297
KPrasch Aug 7, 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
1 change: 0 additions & 1 deletion .solhint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"check-send-result": "error",
"func-visibility": ["error", { "ignoreConstructors": true }],
"multiple-sends": "error",
"no-complex-fallback": "error",
"no-inline-assembly": "off",
"no-unused-import": "error",
"not-rely-on-block-hash": "error",
Expand Down
163 changes: 0 additions & 163 deletions contracts/contracts/coordination/BetaProgramInitiator.sol
View file
Open in desktop

This file was deleted.

Loading
Loading