-
Notifications
You must be signed in to change notification settings - Fork 4
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
base: ccip-gho
Are you sure you want to change the base?
Conversation
…rade-remote-pool-fix
|
c020802
to
d27d468
Compare
contracts/src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/ccip/test/pools/GHO/fork/GhoTokenPoolMigrate1_4To1_5/ForkBase.t.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/ccip/test/pools/GHO/fork/GhoTokenPoolMigrate1_4To1_5/TokenPoolsUpgrade.t.sol
Show resolved
Hide resolved
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"; |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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?
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).