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-4269 - Make registered TokenPools swappable #15293

Merged
merged 21 commits into from
Nov 22, 2024

Conversation

kylesmartin
Copy link
Contributor

@kylesmartin kylesmartin commented Nov 18, 2024

No description provided.

Copy link
Contributor

github-actions bot commented Nov 18, 2024

Static analysis results are available

Hey @RensR, you can view Slither reports in the job summary here or download them as artifact here.
Please check them before merging and make sure you have addressed all issues.

contracts/src/v0.8/ccip/pools/TokenPool.sol Outdated Show resolved Hide resolved
contracts/src/v0.8/ccip/pools/TokenPool.sol Outdated Show resolved Hide resolved
contracts/src/v0.8/ccip/pools/TokenPool.sol Outdated Show resolved Hide resolved
@RensR RensR changed the title Make registered TokenPools swappable by modifying remotePoolAddress logic CCIP-4269 - Make registered TokenPools swappable Nov 19, 2024
Copy link
Contributor

github-actions bot commented Nov 19, 2024

Solidity Review Jira issue

Hey! We have taken the liberty to link this PR to a Jira issue for Solidity Review.

This is a new feature, that's currently in the pilot phase, so please make sure that the linkage is correct. In a contrary case, please update it manually in JIRA and replace Solidity Review issue key in the changeset file with the correct one.
Please reach out to the Test Tooling team and notify them about any issues you encounter.

Any changes to the Solidity Review Jira issue should be reflected in the changeset file. If you need to update the issue key, please do so manually in the following changeset file: contracts/.changeset/modern-mayflies-give.md

This PR has been linked to Solidity Review Jira issue: CCIP-3966

@smartcontractkit smartcontractkit deleted a comment from github-actions bot Nov 19, 2024
@RensR RensR force-pushed the CCIP-4269-make-pools-swappable branch from 76fb375 to f17e34d Compare November 20, 2024 12:01
@RensR RensR force-pushed the CCIP-4269-make-pools-swappable branch from f17e34d to 1369053 Compare November 20, 2024 12:38
# Conflicts:
#	contracts/gas-snapshots/ccip.gas-snapshot
#	contracts/src/v0.8/ccip/test/pools/TokenPool/TokenPoolSetup.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/HybridLockReleaseUSDCTokenPool/HybridLockReleaseUSDCTokenPool.lockOrBurn.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/HybridLockReleaseUSDCTokenPool/HybridLockReleaseUSDCTokenPool.releaseOrMint.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/HybridLockReleaseUSDCTokenPool/HybridLockReleaseUSDCTokenPool.transferLiquidity.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.burnLockedUSDC.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.cancelMigrationProposal.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.excludeTokensFromBurn.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.proposeMigration.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.provideLiquidity.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.releaseOrMint.t.sol
#	contracts/src/v0.8/ccip/test/pools/USDC/USDCBridgeMigrator/USDCBridgeMigrator.updateChainSelectorMechanism.t.sol
Copy link
Contributor

github-actions bot commented Nov 22, 2024

AER Report: CI Core ran successfully ✅

aer_workflow , commit

AER Report: Operator UI CI ran successfully ✅

aer_workflow , commit

@RensR RensR force-pushed the CCIP-4269-make-pools-swappable branch from 0647068 to 2519b3f Compare November 22, 2024 12:21
* use calldata over memory, extract isRemotePool

* support different decimals

* pass in decimals

* add tests

* fix liqman, tests, gen code

* fix offchain
Copy link
Contributor

I see you added a changeset file but it does not contain a tag. Please edit the text include at least one of the following tags:

  • #added For any new functionality added.
  • #breaking_change For any functionality that requires manual action for the node to boot.
  • #bugfix For bug fixes.
  • #changed For any change to the existing functionality.
  • #db_update For any feature that introduces updates to database schema.
  • #deprecation_notice For any upcoming deprecation functionality.
  • #internal For changesets that need to be excluded from the final changelog.
  • #nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
  • #removed For any functionality/config that is removed.
  • #updated For any functionality that is updated.
  • #wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

@RensR RensR marked this pull request as ready for review November 22, 2024 14:53
@RensR RensR requested review from a team as code owners November 22, 2024 14:53
makramkd
makramkd previously approved these changes Nov 22, 2024
… in constructor (#15337)

* support different decimals

* pass in decimals

* add tests

* gen wrappers

* update factory contract to use new arbitrary token decimals in constructor

* snapshot fix

---------

Co-authored-by: Rens Rooimans <[email protected]>
@RensR RensR added this pull request to the merge queue Nov 22, 2024
github-merge-queue bot pushed a commit that referenced this pull request Nov 22, 2024
* store hash of (dest chain selector, remote pool) to do lookup

* fill in coverage gaps and fix zero address check

* remove comment

* Update gethwrappers

* reduce test code

* add test multiple remote pools

* improve tests

* rename and rm EVM specific checks

* [Bot] Update changeset file with jira issues

* fix offchain tests

* use mapping over set

* move remotePools mapping to RemoteChainConfig

* use bytes32 set over bytes mapping

* fix ci

* allow multiple pools on remote chain config

* support different decimals (#15310)

* use calldata over memory, extract isRemotePool

* support different decimals

* pass in decimals

* add tests

* fix liqman, tests, gen code

* fix offchain

* add comment, changeset and fix lint

* turn off 1.4 test

* CCIP-4331 update factory contract to use new arbitrary token decimals in constructor (#15337)

* support different decimals

* pass in decimals

* add tests

* gen wrappers

* update factory contract to use new arbitrary token decimals in constructor

* snapshot fix

---------

Co-authored-by: Rens Rooimans <[email protected]>

---------

Co-authored-by: Rens Rooimans <[email protected]>
Co-authored-by: Josh <[email protected]>
Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
Co-authored-by: Josh Weintraub <[email protected]>
Merged via the queue into develop with commit 4665863 Nov 22, 2024
187 of 189 checks passed
@RensR RensR deleted the CCIP-4269-make-pools-swappable branch November 22, 2024 18:09
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.

6 participants