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

Test/me token registry resubscribe rebased #73

Merged
merged 27 commits into from
Dec 14, 2021
Merged

Test/me token registry resubscribe rebased #73

merged 27 commits into from
Dec 14, 2021

Conversation

zgorizzo69
Copy link
Collaborator

No description provided.

zgorizzo69 and others added 24 commits December 13, 2021 15:38
@zgorizzo69
test(curve update): add test for curve update
6e96436
@zgorizzo69
test(updatecurve): add tests
a438c4d
@zgorizzo69
test(curve): add test for reconfiguring
089361f
@zgorizzo69
test(curves): add reconfiguring
6c149b2
@zgorizzo69
fix(hubsetup): add hubsetup
dd0150b
@zgorizzo69
fix(hub): remove leaking var in helper and adapt tests
5f63f4a
@parv3213 @zgorizzo69
test(MeTokenRegistry): add subscribe() test cases
c66b1a0
@parv3213 @zgorizzo69
test(MeTokenRegistry): add setWarmup, setDuration, & setCooldown test…
eb791ab 
…cases
@parv3213 @zgorizzo69
test(MeTokenRegistry): incremental testcases
01f8468
@parv3213 @zgorizzo69
test(MeTokenRegistry): incremental testcases
381e452
@parv3213 @zgorizzo69
test(MeTokenRegistry): incremental testcases
0e08fde 
- tests failing
```
Error: Transaction reverted without a reason string
      at <UnrecognizedContract>.<unknown> (0xe592427a0aece92de3edee1f18e0157c05861564)
    ```
@parv3213 @zgorizzo69
fix(MeTokenRegistry): remove only
0e4fd3e
@parv3213 @zgorizzo69
fix(UniswapSingleTransferMigration): check balance pool before swap
994266f 
- as no need + revert to swap when amountIn = 0
@parv3213 @zgorizzo69
fix(MeTokenRegistry): convert if to require
3ca2903 
- as both condition are required otherwise `finishResubscribe` fails
@parv3213 @zgorizzo69
test(MeTokenRegistry): incremental testcases
5e6f8f7
@parv3213 @zgorizzo69
test(MeTokenRegistry): finish initResubscribe() tests
7f60dbb
@parv3213 @zgorizzo69
test(MeTokenRegistry): incremental testcases
4ba8506
@zgorizzo69
fix(test): fix metokenregistry tests
0615a7c
@parv3213
test(MeTokenRegistry): incremental testcases
0b0eb82 
-failing
fix(uniswapMigration): token spend approval on swap, ust.started logic
71aeef4
fix(singleAssetVault): require check on startMigration()
a665f1c
fix: lint
92aed01
@parv3213
Revert "fix(UniswapSingleTransferMigration): check balance pool befor…
4b87c30 
…e swap"

This reverts commit 994266f.
@parv3213
feat(UniswapSingleTransferMigration): code optimisation
ebbd13f
@parv3213
Copy link
Member

After finishResubscribe we are NOT setting endCooldown = 0. Is this expected?
https://github.com/meTokens/meTokens-core/blob/test/meTokenRegistry-resubscribe-rebased/contracts/registries/MeTokenRegistry.sol#L206
@zgorizzo69 @carlfarterson

@parv3213
Copy link
Member

I think this branch is ready to be reviewed and merged.
Things that are left out:

  1. There are four TODOs. Two are related to balancePooled & balanceLocked checks after FinishResubscribe(). Other two are for Test/me token registry resubscribe rebased #73 (comment).
  2. Testcases for updateBalancePooled & updateBalanceLocked are not written, but still they are covered as these were called from Foundry test-cases.

@zgorizzo69
Copy link
Collaborator Author

After finishResubscribe we are NOT setting endCooldown = 0. Is this expected? https://github.com/meTokens/meTokens-core/blob/test/meTokenRegistry-resubscribe-rebased/contracts/registries/MeTokenRegistry.sol#L206 @zgorizzo69 @carlfarterson

I think it is not set to 0 because it is the cooldown so the time after the end of the migration
btw we could remove newBalance

@pegahcarter
Copy link
Member

After finishResubscribe we are NOT setting endCooldown = 0. Is this expected? https://github.com/meTokens/meTokens-core/blob/test/meTokenRegistry-resubscribe-rebased/contracts/registries/MeTokenRegistry.sol#L206 @zgorizzo69 @carlfarterson

I think it is not set to 0 because it is the cooldown so the time after the end of the migration btw we could remove newBalance

That is correct :D

@pegahcarter pegahcarter merged commit 0102f0c into main Dec 14, 2021
@pegahcarter pegahcarter deleted the test/meTokenRegistry-resubscribe-rebased branch December 21, 2021 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pegahcarter pegahcarter pegahcarter 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.
3 participants
@zgorizzo69 @parv3213 @pegahcarter