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.

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

Bqeth testing and usage script #289

Closed
wants to merge 127 commits into from
Closed
Show file tree
Hide file tree
Changes from 105 commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
5526814
Add simple hooks to GlobalAllowList to allow simple extensibility
cygnusv Apr 10, 2024
8693901
wip: managed allow list
piotr-roslaniec Apr 15, 2024
0205594
wip: add some tests
piotr-roslaniec Apr 15, 2024
f9ba98d
wip: change of plans
piotr-roslaniec Apr 15, 2024
8130996
Generalize modifier to set authorizations in GlobalAllowList
cygnusv Apr 15, 2024
6eca6cc
ManagedAllowList now inherits from GlobalAllowList
cygnusv Apr 15, 2024
720e83c
Rename allowances in ManagedAllowList
cygnusv Apr 16, 2024
9e42114
Fix tests for ManagedAllowList
cygnusv Apr 16, 2024
ee85f5e
Draft for Subscriptions and how can be used with AllowLists
cygnusv Apr 16, 2024
ab6db0a
wip: change of plans was a mistakerino
piotr-roslaniec Apr 15, 2024
e3d996f
wip: subscription manager draft
piotr-roslaniec Apr 16, 2024
d82db48
wip: add way too much comments
piotr-roslaniec Apr 18, 2024
c5d981f
wip: more tests, yes yes
piotr-roslaniec Apr 19, 2024
070ca81
wip: test test test
piotr-roslaniec Apr 19, 2024
d684c6c
wip: fix solhint
piotr-roslaniec Apr 19, 2024
8cef8bb
wip: add subscription tests draft
piotr-roslaniec Apr 19, 2024
e387159
wip: more subscription tests
piotr-roslaniec Apr 22, 2024
08fe8a4
apply pr suggestions
piotr-roslaniec Apr 23, 2024
dbe1ea2
apply pr suggestions
piotr-roslaniec Apr 23, 2024
98dc648
apply pr suggestions
piotr-roslaniec Apr 23, 2024
138d716
fix solhint failing silently on ci
piotr-roslaniec May 15, 2024
7da09ad
remove solidity oopsies
piotr-roslaniec May 15, 2024
f9298c4
Initial commit
vzotova May 17, 2024
df671df
Merge pull request #255 from piotr-roslaniec/managed-allow-list
vzotova May 17, 2024
c99e06b
Extracting fee model from Coordinator
vzotova May 15, 2024
e6cb43e
Moves global allow list test to the separate file
vzotova May 15, 2024
ee824b5
FlatRateFeeModel: restrict payment method
vzotova May 15, 2024
8ca37ec
Minor renames
vzotova May 17, 2024
2a08260
Apply suggestions from code review
vzotova May 22, 2024
fa27729
Return back storing accessControl in Coordinator
vzotova May 25, 2024
64b28e1
Adds fee model <-> allow list communication
vzotova May 22, 2024
dfb6bc0
Apply suggestions from code review
vzotova Jun 7, 2024
9620ac3
Initial commit with BqETHSubscription contract
vzotova May 28, 2024
7cae93d
FeeModel: adds yellow and red period and extending ritual
vzotova May 29, 2024
538c07a
Check access controller in subscription
vzotova May 31, 2024
7fd7116
BqETHSubscription: fix bugs and add tests
vzotova Jun 4, 2024
4d94e32
BqETHSubscription: handling yellow period
vzotova Jun 5, 2024
4db8af4
Apply suggestions from code review
vzotova Jun 7, 2024
34f8619
Extract base logic from BqETHSubscription
vzotova Jun 10, 2024
faf5a80
BqETHSubscription: draft of encryptor slots and fees
vzotova Jun 12, 2024
eb03033
BqETHSubscription: tests and fixes
vzotova Jun 13, 2024
fc02ffd
Merge pull request #265 from vzotova/subscription
cygnusv Jun 19, 2024
a729195
BqETHSubscription: initialize startOfSubscription during ritual initi…
vzotova Jun 20, 2024
1ed8fc9
BqETHSubscription: force to pay for used encryptor slots
vzotova Jun 24, 2024
449290b
Merge pull request #272 from vzotova/subscription-3
cygnusv Jun 25, 2024
54730e5
Apply suggestions from code review
vzotova Jun 25, 2024
64827c0
BqETHSubscription: upgradability
vzotova Jun 18, 2024
ce03444
BqETHSubscription: rename beneficiary to treasury
vzotova Jun 19, 2024
4e6dc15
Subscription: extract encryptor slots logic to abstract contracts
vzotova Jun 26, 2024
5ef008d
Merge pull request #273 from vzotova/subscription-4
cygnusv Jun 27, 2024
39d5678
Merge pull request #277 from vzotova/subscription-5
cygnusv Jun 27, 2024
3886874
Apply suggestions from code review
vzotova Jun 27, 2024
fc77d26
Removes BetaProgramInitiator
vzotova Jun 27, 2024
a6f8898
Coordinator: return back isEncryptionAuthorized
vzotova Jun 28, 2024
fbc8a32
GlobalAllowList: it's global allow list again
vzotova Jun 28, 2024
4b1dd5d
Skip some tests in test_managed_allow_list
vzotova Jun 28, 2024
9572617
BqETHSubscription: immutable accesscontroller
vzotova Jul 2, 2024
c87d99c
Coordinator: a deprecation notice comment for isEncryptionAuthorized
vzotova Jul 2, 2024
2b359ef
Merge pull request #279 from vzotova/subscription-6
cygnusv Jul 3, 2024
8ed6028
BqETHSubscription: base fee rate increase
vzotova Jul 3, 2024
f39bdbe
Apply suggestions from code review
vzotova Jul 4, 2024
e2ba487
First draft for BqETH deployment parameters
cygnusv Jul 1, 2024
3a92af4
Update BqETHSubscription deployment parameters
cygnusv Jul 4, 2024
021d50a
Repurpose old BetaProgramInitiator deployer script for BqETHSubscription
cygnusv Jul 5, 2024
f1229d3
Add BqETHSubscription contract to registry
manumonti Jul 5, 2024
85b337d
Updated ape modules
manumonti Jul 5, 2024
c3fd166
Remove BetaProgramInitiator contract
manumonti Jul 5, 2024
8ed941f
Fix compiler collision on OpenAccessAuthorizer
manumonti Jul 5, 2024
df82e7d
Update coordinator upgrade scripts
manumonti Jul 5, 2024
a2006ed
Add coordinator approve fee model script
manumonti Jul 5, 2024
b0fae91
BqETH will have 6 month periods, so period increase is 2.47% = sqrt(5%)
cygnusv Jul 8, 2024
9fa3dc4
Adds free fee model
vzotova Jul 5, 2024
a3257b4
Fix deployer.finalize() function for ape 0.8.8
manumonti Jul 5, 2024
34432e8
Add Free Fee Model deployment script
manumonti Jul 5, 2024
96bdc96
Add Free Fee Model contract to the Lynx registry
manumonti Jul 5, 2024
07eec03
Add coordinator approve free fee model script
manumonti Jul 5, 2024
951f4bd
BqETHSubscription: note for base fee potential overflow
vzotova Jul 8, 2024
5bd7af9
Merge pull request #283 from vzotova/subscription-7
cygnusv Jul 8, 2024
ae03fc8
Stop using deprecated method in favour of updated method. This will p…
derekpierre Jul 8, 2024
7b8f379
Fix contract registry to remove weird ABI values due to deprecated fu…
derekpierre Jul 8, 2024
1eb0cc8
Update Coordinator ABI
manumonti Jul 9, 2024
d0a809e
Rename coordinator approves BqETH fee model script
manumonti Jul 9, 2024
fac658c
Merge pull request #280 from cygnusv/deploy-bqeth
cygnusv Jul 11, 2024
6a97341
Merge pull request #286 from vzotova/free-fee-model
cygnusv Jul 11, 2024
486e167
Write initial bqeth subscription script
theref Jul 4, 2024
77091ca
Begin replacing hardcoded variables with programatic ones
theref Jul 5, 2024
b391ff3
Use dotenv for sensitive variables
theref Jul 5, 2024
5fe6e2e
Fix bug in env loading
theref Jul 5, 2024
c9e9177
Fix sender address and middleware
theref Jul 5, 2024
51329e1
Build tx before attempting to send
theref Jul 5, 2024
b3f65f0
Use future proof transaction functions
theref Jul 5, 2024
dd105d1
Fix calculation for approving token transfer
theref Jul 8, 2024
e073113
Refactor script
theref Jul 8, 2024
a5329c5
Improve logging
theref Jul 10, 2024
cf68459
Final tidy up of bqeth script
theref Jul 11, 2024
1c937a5
Add example .env contents for bqeth_script
theref Jul 12, 2024
6881165
Add encryptors function
manumonti Jul 15, 2024
f83b3ba
Print tx hash instead of full receipt
theref Jul 15, 2024
2fbf7d6
Remove ritual_id when initiating a ritual
theref Jul 15, 2024
f5458fc
BqETHSubscription: adopter set by special role
vzotova Jul 15, 2024
71a625d
Apply suggestions from code review
vzotova Jul 15, 2024
3f65b2b
Fix for #292
vzotova Jul 15, 2024
59404c5
Add remove encryptors function
manumonti Jul 15, 2024
ac4c1c9
Refactor collection of fees and improve logging
theref Jul 16, 2024
d2ae1da
Remove MAX_AUTH_ACTIONS restriction
cygnusv Jul 16, 2024
cc4d6f1
Merge pull request #293 from vzotova/subscription-9
cygnusv Jul 16, 2024
89ada1b
Abstract away the nonce using web3 middleware
theref Jul 16, 2024
a1935c0
Convert script to click based cli
theref Jul 16, 2024
c8c325b
Use a decorator to handle web3 context of accounts and contracts
theref Jul 16, 2024
bfe1542
Add documentation for cli
theref Jul 16, 2024
a55cbec
Revert "Remove MAX_AUTH_ACTIONS restriction"
manumonti Jul 16, 2024
b7b9a7d
Adapt BqETHSubscription deploy script to addition of adopterSetter
cygnusv Jul 16, 2024
a7de9b0
On mainnet, adopter setter will be NuCo
cygnusv Jul 16, 2024
ecdac75
BqETH subscription period is 183 days
cygnusv Jul 16, 2024
ab75978
Actually use bqeth deployment parameters!
cygnusv Jul 16, 2024
27d762c
Remove beta program initiator parameters
cygnusv Jul 16, 2024
2ed370f
Add max nodes param to bqeth deployment file
manumonti Jul 16, 2024
8966bd6
Add mainnet deployment artifacts for BqETH
manumonti Jul 17, 2024
edd31ed
Add Free Fee Model contract deployment script
manumonti Jul 17, 2024
8616609
Add mainnet deployment artifact of FreeFeeModel
manumonti Jul 17, 2024
262a3f6
Merge pull request #294 from cygnusv/final-params
cygnusv Jul 23, 2024
7bb50e8
Merge pull request #295 from manumonti/bqeth-mainnet-deployments
cygnusv Jul 23, 2024
690f2a3
Sort list of nodes after fetching from porter
theref Jul 23, 2024
fdd7aee
Decrease duration of ritual when subscription has already started
theref Jul 23, 2024
8bcf5ad
Run black formatter on bqeth screen
theref Jul 23, 2024
35c599d
Merge branch 'epic-subscription' into bqeth_script
theref Jul 23, 2024
aef0976
Address PR review requests
theref Aug 6, 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
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

This file was deleted.

Loading
Loading