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

add lockbox function and upgrade xPufETH #11

Merged
merged 16 commits into from
Jul 15, 2024
Merged

Conversation

WalidOfNow
Copy link
Contributor

No description provided.

@WalidOfNow WalidOfNow requested a review from ksatyarth2 July 1, 2024 15:01
@WalidOfNow WalidOfNow changed the title add timelock function and upgrade xPufETH add lockbox function and upgrade xPufETH Jul 3, 2024
@bxmmm1
Copy link
Collaborator

bxmmm1 commented Jul 12, 2024

Lincese on xPufETH is // SPDX-License-Identifier: UNLICENSED, we should change that

*/
contract UpgradeXpufETH is BaseScript {
address ACCCESS_MANAGER = 0x8c1686069474410E6243425f4a10177a94EBEE11;
address XPUFETH_PORXY = 0xD7D2802f6b19843ac4DfE25022771FD83b5A7464;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
address XPUFETH_PORXY = 0xD7D2802f6b19843ac4DfE25022771FD83b5A7464;
address XPUFETH_PROXY = 0xD7D2802f6b19843ac4DfE25022771FD83b5A7464;

abi.encodeWithSelector(UUPSUpgradeable.upgradeToAndCall.selector, address(xpufETHImplementation), "");

bytes memory timelockCalladata =
abi.encodeWithSelector(AccessManager.execute.selector, XPUFETH_PORXY, upgradeCalldata);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
abi.encodeWithSelector(AccessManager.execute.selector, XPUFETH_PORXY, upgradeCalldata);
abi.encodeWithSelector(AccessManager.execute.selector, XPUFETH_PROXY, upgradeCalldata);

@bxmmm1
Copy link
Collaborator

bxmmm1 commented Jul 12, 2024

CI is failing because of some typo, that should be fixed as well

@bxmmm1 bxmmm1 merged commit 81e8914 into master Jul 15, 2024
bxmmm1 added a commit that referenced this pull request Jul 24, 2024
* 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>
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.

2 participants