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

Improve stake & lock UX #16

Merged
merged 7 commits into from
Jul 29, 2024
Merged

Improve stake & lock UX #16

merged 7 commits into from
Jul 29, 2024

Conversation

bxmmm1
Copy link
Collaborator

@bxmmm1 bxmmm1 commented Jul 16, 2024

This PR will allow stake & lock in one transaction if the token supports Permit

@bxmmm1 bxmmm1 self-assigned this Jul 16, 2024
@WalidOfNow WalidOfNow marked this pull request as ready for review July 17, 2024 01:09
@bxmmm1 bxmmm1 merged commit 5cdbb45 into master Jul 29, 2024
1 check passed
bxmmm1 added a commit that referenced this pull request Jul 30, 2024
* Improve stake & lock UX

* Skip calling .permit() if the data might be bad.

* forge fmt

* update the if statement wrapping permit call

* flip the if statement

* >= for permit.deadline check

---------

Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>
bxmmm1 added a commit that referenced this pull request Jul 31, 2024
* Improve stake & lock UX

* Skip calling .permit() if the data might be bad.

* forge fmt

* update the if statement wrapping permit call

* flip the if statement

* >= for permit.deadline check

---------

Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>
bxmmm1 added a commit that referenced this pull request Jul 31, 2024
* feat: add deployment script for xPufETH on BSC (need adr updation)

* forge fmt

* Improve stake & lock UX (#16)

* Improve stake & lock UX

* Skip calling .permit() if the data might be bad.

* forge fmt

* update the if statement wrapping permit call

* flip the if statement

* >= for permit.deadline check

---------

Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>

* Move audit reports to another folder, update Readme

* Update README.md

* update multisig addresses

* Improve stake & lock UX (#16)

* Improve stake & lock UX

* Skip calling .permit() if the data might be bad.

* forge fmt

* update the if statement wrapping permit call

* flip the if statement

* >= for permit.deadline check

---------

Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>

* Move audit reports to another folder, update Readme

* Update README.md

* feat: add deployment script for xPufETH on BSC (need adr updation)

* forge fmt

* update multisig addresses

---------

Co-authored-by: ksatyarth2 <ksatyarth2@users.noreply.github.com>
Co-authored-by: Benjamin <benjaminxh+github@gmail.com>
Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>
bxmmm1 added a commit that referenced this pull request Aug 20, 2024
* feat: wip L2RewardManager contract

* mintAndBridge core logic

* adds connext mock

* wip: fixed flow for L2rewardManager contract

* fix: storage and ACL + optimise

* adds set claimer functionality

* feat: deploy script for L2rewardManager

* address comments

* wip: add bridge type

* address comments

* wip: set claimer and optimise

* feat: added tests on l2RewardManager

* add: tests for different exchange rate

* address comments

* fix: remove gitmodules & format the lint

* fix: formula for claim

* merge PRs and add sepolia deploy script

* add lockbox function and upgrade xPufETH (#11)

* add timelock function and upgrade xPufETH

* remove unused vars

* address comments

* try to fix codespell

* update github action

* ci..

* ci

* ci

* ci

* ci

* ci

* ci

* ci

* skip codespell for now

* ci fix -.-

* try to fix codespell

update github action

ci..

ci

ci

ci

ci

ci fix -.-

---------

Co-authored-by: Walid <walidofnow@Walids-MacBook-Pro-2.local>
Co-authored-by: Benjamin <benjaminxh+github@gmail.com>

* fix github action

* Comment out tests that cause troubles, rename mock contract

* refactoring WIP

* fmt

* refactor: rewardManager contract & fix tests

* fix: incorrect package imports

* fix compilation issues

* update RewardsManager test

* tweak compiler settings

* update ci config

* remove dead code, minor changes

* add getter for rewards claimer

* SlowMist audit fixes (#12)

* slowmist audit fixes

* add permit data check for pufLoker deposit

* Update batch registration script to limit max registrations (#18)

* Update batch registrations script

* bugfix

* fix empty txs

* forge fmt

* Update batch registration script to work with latest foundry (#20)

* xPufETH Base Deployment (#5)

* xPufETH base deployment script

* delete the old deployment script

* adds the multisigs addresses

* remove tenderly endpoint

* Improve stake & lock UX (#16)

* Improve stake & lock UX

* Skip calling .permit() if the data might be bad.

* forge fmt

* update the if statement wrapping permit call

* flip the if statement

* >= for permit.deadline check

---------

Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>

* Move audit reports to another folder, update Readme

* Update README.md

* Add claimingDelay

* update the event & tests

* update rewards claimer getter

* fix fuzz test

* fuzz test fix

* code style, comments

* add set claimer test

* wip fork tests l1

* forge fmt

* write a test that uses the same mock data as the backend

* mintAndBridge revert logic (#26)

* change directory structure for some files

* increase test coverage of l1rewardmanager

* update tets on the l2 reward manager

* upgrade script for L2reward manager (#32)

* add rewards depositing to vault flow

* codecov

* update CI

* ci update

* update CI

* ci file update

* remove verifyWithdrawalCredentials

---------

Co-authored-by: ksatyarth2 <erkumar@protonmail.ch>
Co-authored-by: Walid <walidofnow@Walids-MacBook-Pro-2.local>
Co-authored-by: Walid <walid.wah@gmail.com>
Co-authored-by: bxmmm1 <bxmmm1@users.noreply.github.com>
Co-authored-by: Kumar Satyarth <47723310+ksatyarth2@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants