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

Open
wants to merge 56 commits into
base: ccip-gho
Choose a base branch
from
Open

CCIP 1.5 Migration #18

wants to merge 56 commits into from

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

@@ -7,13 +7,13 @@ index f5eb135186..e228732855 100644
// SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.19;
+pragma solidity ^0.8.0;


-import {IBurnMintERC20} from "../../shared/token/ERC20/IBurnMintERC20.sol";
+import {IBurnMintERC20} from "../../../shared/token/ERC20/IBurnMintERC20.sol";

Choose a reason for hiding this comment

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

I think this happens becuse you are diffing X Y instead of Y X

Copy link
Member Author

Choose a reason for hiding this comment

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

it's diffing the base token pool against the upgradable versions - the changes we added on top of chainlink's contracts, that seems right to me?

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