Skip to content

Commit

Permalink
Remove CCIP 1.5 (#14739)
Browse files Browse the repository at this point in the history
* rm commit, e2e ramp tests

* move various tests to use 1.6 ramps

* rm ramps

* rm 1.5 fully

* clean up internal

* em rmn, mocks, etc

* Update ccip.gas-snapshot

* rm wrapper gen logic

* rm rmn

* Create sharp-avocados-arrive.md

* [Bot] Update changeset file with jira issues

* rm proxy pools

* fix solhint issues, fix CCIPReaderTester

* rm CCIPReaderTester

* rename internal

* turn off legacy test

---------

Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
  • Loading branch information
1 parent ca31213 commit 4842271
Show file tree
Hide file tree
Showing 89 changed files with 617 additions and 17,281 deletions.
8 changes: 8 additions & 0 deletions contracts/.changeset/sharp-avocados-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@chainlink/contracts': patch
---

#internal remove CCIP 1.5


PR issue: CCIP-3748
1 change: 0 additions & 1 deletion contracts/.solhintignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
./src/v0.8/llo-feeds/test
./src/v0.8/vrf/testhelpers
./src/v0.8/functions/tests
./src/v0.8/ccip/test

# Always ignore vendor
./src/v0.8/vendor
Expand Down
438 changes: 48 additions & 390 deletions contracts/gas-snapshots/ccip.gas-snapshot

Large diffs are not rendered by default.

35 changes: 7 additions & 28 deletions contracts/scripts/native_solc_compile_all_ccip
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ echo " └───────────────────────

SOLC_VERSION="0.8.24"
OPTIMIZE_RUNS=26000
OPTIMIZE_RUNS_OFFRAMP=18000
OPTIMIZE_RUNS_ONRAMP=4100
OPTIMIZE_RUNS_MULTI_OFFRAMP=800
OPTIMIZE_RUNS_OFFRAMP=800


SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
Expand All @@ -28,18 +26,10 @@ compileContract () {
local optimize_runs=$OPTIMIZE_RUNS

case $1 in
"ccip/offRamp/EVM2EVMOffRamp.sol")
"ccip/offRamp/OffRamp.sol")
echo "OffRamp uses $OPTIMIZE_RUNS_OFFRAMP optimizer runs."
optimize_runs=$OPTIMIZE_RUNS_OFFRAMP
;;
"ccip/offRamp/OffRamp.sol")
echo "MultiOffRamp uses $OPTIMIZE_RUNS_MULTI_OFFRAMP optimizer runs."
optimize_runs=$OPTIMIZE_RUNS_MULTI_OFFRAMP
;;
"ccip/onRamp/EVM2EVMOnRamp.sol")
echo "OnRamp uses $OPTIMIZE_RUNS_ONRAMP optimizer runs."
optimize_runs=$OPTIMIZE_RUNS_ONRAMP
;;
esac

solc --overwrite --optimize --optimize-runs $optimize_runs --metadata-hash none \
Expand All @@ -53,21 +43,16 @@ compileContract () {

# Solc produces and overwrites intermediary contracts.
# Contracts should be ordered in reverse-import-complexity-order to minimize overwrite risks.
compileContract ccip/offRamp/EVM2EVMOffRamp.sol
compileContract ccip/offRamp/OffRamp.sol
compileContract ccip/rmn/RMNRemote.sol
compileContract ccip/rmn/RMNHome.sol
compileContract ccip/FeeQuoter.sol
compileContract ccip/onRamp/OnRamp.sol
compileContract ccip/applications/PingPongDemo.sol
compileContract ccip/applications/SelfFundedPingPong.sol
compileContract ccip/applications/EtherSenderReceiver.sol
compileContract ccip/onRamp/OnRamp.sol
compileContract ccip/onRamp/EVM2EVMOnRamp.sol
compileContract ccip/CommitStore.sol
compileContract ccip/rmn/RMNRemote.sol
compileContract ccip/rmn/RMNHome.sol
compileContract ccip/rmn/ARMProxy.sol
compileContract ccip/MultiAggregateRateLimiter.sol
compileContract ccip/Router.sol
compileContract ccip/FeeQuoter.sol
compileContract ccip/RMN.sol
compileContract ccip/ARMProxy.sol
compileContract ccip/tokenAdminRegistry/TokenAdminRegistry.sol
compileContract ccip/tokenAdminRegistry/RegistryModuleOwnerCustom.sol
compileContract ccip/capability/CCIPHome.sol
Expand All @@ -80,18 +65,12 @@ compileContract ccip/pools/LockReleaseTokenPool.sol
compileContract ccip/pools/BurnMintTokenPool.sol
compileContract ccip/pools/BurnFromMintTokenPool.sol
compileContract ccip/pools/BurnWithFromMintTokenPool.sol
compileContract ccip/pools/LockReleaseTokenPoolAndProxy.sol
compileContract ccip/pools/BurnMintTokenPoolAndProxy.sol
compileContract ccip/pools/BurnWithFromMintTokenPoolAndProxy.sol
compileContract ccip/pools/BurnWithFromMintRebasingTokenPool.sol
compileContract ccip/pools/TokenPool.sol


# Test helpers
compileContract ccip/test/helpers/BurnMintERC677Helper.sol
compileContract ccip/test/helpers/CommitStoreHelper.sol
compileContract ccip/test/helpers/MessageHasher.sol
compileContract ccip/test/helpers/CCIPReaderTester.sol
compileContract ccip/test/helpers/USDCReaderTester.sol
compileContract ccip/test/helpers/ReportCodec.sol
compileContract ccip/test/helpers/receivers/MaybeRevertMessageReceiver.sol
Expand Down
92 changes: 0 additions & 92 deletions contracts/src/v0.8/ccip/AggregateRateLimiter.sol

This file was deleted.

Loading

0 comments on commit 4842271

Please sign in to comment.