fix hh compile and bump publish-prod version (#1299)

## Motivation ## Solution
smartcontractkit · Aug 16, 2024 · 48e4152 · 48e4152
1 parent 5e1b6d1
commit 48e4152
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -21,7 +21,10 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(
   async (_, __, runSuper) => {
     const paths = await runSuper()
     const noTests = paths.filter((p: string) => !p.endsWith('.t.sol'))
-    return noTests.filter(
+    const noCCIPTests = noTests.filter(
+      (p: string) => !p.includes('/v0.8/ccip/test'),
+    )
+    return noCCIPTests.filter(
       (p: string) => !p.includes('src/v0.8/vendor/forge-std'),
     )
   },

diff --git a/contracts/package.json b/contracts/package.json
@@ -18,7 +18,7 @@
     "prepare": "chmod +x .husky/prepare.sh && ./.husky/prepare.sh",
     "prepublishOnly": "pnpm compile && ./scripts/prepublish_generate_abi_folder",
     "publish-beta": "pnpm publish --tag beta",
-    "publish-prod": "npm dist-tag add @chainlink/contracts-ccip@1.2.1 latest",
+    "publish-prod": "npm dist-tag add @chainlink/contracts-ccip@1.5.0 latest",
     "solhint:ccip": "solhint --max-warnings 0 \"./src/v0.8/ccip/**/*.sol\"",
     "solhint": "solhint --max-warnings 0 \"./src/v0.8/**/*.sol\""
   },

diff --git a/contracts/src/v0.8/ccip/test/BaseTest.t.sol b/contracts/src/v0.8/ccip/test/BaseTest.t.sol
@@ -61,8 +61,6 @@ contract BaseTest is Test {
   // OffRamp
   uint32 internal constant MAX_DATA_SIZE = 30_000;
   uint16 internal constant MAX_TOKENS_LENGTH = 5;
-  uint32 internal constant MAX_TOKEN_POOL_RELEASE_OR_MINT_GAS = 200_000;
-  uint32 internal constant MAX_TOKEN_POOL_TRANSFER_GAS = 50_000;
   uint16 internal constant GAS_FOR_CALL_EXACT_CHECK = 5000;
   uint32 internal constant PERMISSION_LESS_EXECUTION_THRESHOLD_SECONDS = 500;
   uint32 internal constant MAX_GAS_LIMIT = 4_000_000;

diff --git a/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMMultiOffRampSetup.t.sol b/contracts/src/v0.8/ccip/test/offRamp/EVM2EVMMultiOffRampSetup.t.sol
@@ -229,6 +229,9 @@ contract EVM2EVMMultiOffRampSetup is TokenSetup, PriceRegistrySetup, MultiOCR3Ba
     });
   }
 
+  uint32 internal constant MAX_TOKEN_POOL_RELEASE_OR_MINT_GAS = 200_000;
+  uint32 internal constant MAX_TOKEN_POOL_TRANSFER_GAS = 50_000;
+
   function _generateDynamicMultiOffRampConfig(address priceRegistry)
     internal
     pure