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

CCIP 1.5 Migration #18

Merged
merged 60 commits into from
Nov 7, 2024
Merged

CCIP 1.5 Migration #18

merged 60 commits into from
Nov 7, 2024

Conversation

DhairyaSethi
Copy link
Member

@DhairyaSethi DhairyaSethi commented Oct 10, 2024

https://governance.aave.com/t/bgd-technical-maintenance-proposals/15274/51

CCIP is moving to 1.5, & existing GHO token pools on Ethereum & Arbitrum use 1.4. This PR intends add backward compatibility to existing token pools by explicitly allowing calls from the proxy pool in the onlyOnRamp modifier. The proxyPool contract acts as a wrapper between new on ramp (1.5) and our token pool.

This change is added in the base contract UpgradableTokenPool.
While making this contract upgradable, storage __gap practice was overlooked and hence a custom storage slot is introduced for the proxy pool contract which is only settable by the DAO (no separate role is added for this).

Copy link

height bot commented Oct 10, 2024

Link Height tasks by mentioning a task ID in the pull request title or commit messages, or description and comments with the keyword link (e.g. "Link T-123").

💡Tip: You can also use "Close T-X" to automatically close a task when the pull request is merged.

Base automatically changed from upgrade-remote-pool-fix to ccip-gho October 15, 2024 08:02
@miguelmtzinf miguelmtzinf self-requested a review October 22, 2024 07:49
@miguelmtzinf
Copy link

Changes look good to me. Thanks @DhairyaSethi

@miguelmtzinf miguelmtzinf self-requested a review October 31, 2024 09:20
brotherlymite added a commit to bgd-labs/aave-proposals-v3 that referenced this pull request Nov 7, 2024
* Add proposal for Gho Incident Report 20231113 (#1)

* chore: add payload and deploy script for update of GHO variable debt token

* forge install: gho-core

* chore: add gho-core to dependency

* test: Add tests for update of gho variable token

* test: Add tests for update of gho variable token

* fix: add modifier in method of interface

* fix: remove gho dependency from repo and fix test

* fix: Remove unnecesary dependency

* fix: Add latest details

---------

Co-authored-by: miguelmtzinf <miguelmtz.mail@gmail.com>

* fix: Make new impl constant (#3)

* fix: Amend AIP text (#4)

* fix: Make new impl constant

* fix: Fix AIP text

* test: Tweak default tests with borrow cap update (#5)

* fix: lint issue (#6)

* test: Add diffs from test running (#7)

* fix: Add payload address (#8)

* fix: Fix payload address in script (#9)

* fix: Remove unneeded diff file (#10)

* feat: install aave-ccip at latest commit on aave/ccip#18

* chore: upd remappings, lib/aave-helpers, .assets

* new: add proposal for eth & arb

* fix: arb test supply locked invariant

* fix: rename, add discussion link

* upd: aave-ccip module

* feat: add proxy pool deployments

* feat: add e2e tests

* chore: fix license, explicit senders for expectEmit

* ci: override rpc url in secrets

* test: proxy pool can off ramp

* chore: reorder deps

* nit: utilize existing ierc20 import, style guide, use arb assets for gho addy

* feat: add rate limit, use gho fascilitator for tests

* feat: set in bound rate limit as well

* chore: cleanup

* test: check proxy initialized version

* chore: inBetween => inFlight"

* chore: test name consistency

* test: dynamically fetch dest gas amt

* test: execMsg post migration using legacy off ramp

* test: ccip steward can disable rate limit

* chore: cleanup

* doc: add comment for fetching all offramps, use RISK_COUNCIL for clarity

* test: ownership transfer after migration

* chore: rm _readRiskAdmin, fix config

* fix: ci test setup to stay compatible with bdg upstream

* feat: rm aave-ccip dep

* rft: use deployed token pools

* tmp: fix ci for aave org, to rm for bdg

* fix: ci to bdg setup

* fix: update rate limit

* test: fuzz amounts

* chore: snapshot docs

* chore: const cap rate

* chore: fix type

* fix: Fix rate limit config constants

* fix: tests, impl correct solc

* fix: tests

* Update src/20241021_Multi_GHOCCIP150Upgrade/AaveV3Ethereum_GHOCCIP150Upgrade_20241021.sol

Co-authored-by: Harsh Pandey <harshsatishpandey@gmail.com>

* Update src/20241021_Multi_GHOCCIP150Upgrade/AaveV3Arbitrum_GHOCCIP150Upgrade_20241021.sol

Co-authored-by: Harsh Pandey <harshsatishpandey@gmail.com>

* doc: reference token pool contracts

* doc: upgrade spec

* doc: formatting

* Update src/20241021_Multi_GHOCCIP150Upgrade/GHOCCIP150Upgrade.md

Co-authored-by: miguelmtz <36620902+miguelmtzinf@users.noreply.github.com>

* Update src/20241021_Multi_GHOCCIP150Upgrade/GHOCCIP150Upgrade.md

Co-authored-by: miguelmtz <36620902+miguelmtzinf@users.noreply.github.com>

* test: Refresh block number with ghostewards aip executed

* fix: Remove unneeded script

---------

Co-authored-by: Parth Patel <parth4321patel@gmail.com>
Co-authored-by: DhairyaSethi <55102840+DhairyaSethi@users.noreply.github.com>
Co-authored-by: Harsh Pandey <harshsatishpandey@gmail.com>
@MichaelMorami
Copy link

We reviewed the planned upgrade to the tokenpool and the AIP that is destined to upgrade the implementation.
The code is approved by us to be deployed.
An official report/research diary of the review will be shared separately if needed

@miguelmtzinf
Copy link

Thanks for the review Certora team @MichaelMorami

@miguelmtzinf miguelmtzinf merged commit 46a4bdc into ccip-gho Nov 7, 2024
2 checks passed
@miguelmtzinf miguelmtzinf deleted the fix/legacy-on-ramp branch November 7, 2024 14:01
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.

4 participants