Static analysis fixes #1147

RensR · 2024-07-05T14:57:17Z

This PR addresses various static analysis findings, mostly to reduce gas and contract bytecode size. Both before and after use 3600 optimizations. Due to the saves space in the onRamp we can bump the number of optimizations.

Each commit addresses a different change, and each commit contains the gas snapshot to illustrate the impact of that particular change.

Before

| EVM2EVMMultiOffRamp             | 24.665    | -0.089      |
| EVM2EVMMultiOnRamp              | 20.885    | 3.691       |
| EVM2EVMOffRamp                  | 23.092    | 1.484       |
| EVM2EVMOnRamp                   | 24.432    | 0.144       |

2E:test_E2E_3MessagesSuccess_gas() (gas: 1.104.821)
MultiRampsE2E:test_E2E_3MessagesSuccess_gas() (gas: 1.424.394)

After

| EVM2EVMMultiOffRamp             | 24.538    | 0.038       |
| EVM2EVMMultiOnRamp              | 20.841    | 3.735       |
| EVM2EVMOffRamp                  | 22.968    | 1.608       |
| EVM2EVMOnRamp                   | 24.351    | 0.225       |

E2E:test_E2E_3MessagesSuccess_gas() (gas: 1.102.679)
MultiRampsE2E:test_E2E_3MessagesSuccess_gas() (gas: 1.422.669)

note: comment slightly outdated since the last merge. Overall diff should still be the same

RensR · 2024-07-05T14:59:18Z

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol

@@ -818,8 +832,8 @@ contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base {
    // We call the pool with exact gas to increase resistance against malicious tokens or token pools.
    // We protects against return data bombs by capping the return data size at MAX_RET_BYTES.
    (bool success, bytes memory returnData,) = CallWithExactGas._callWithExactGasSafeReturnData(
-      abi.encodeWithSelector(
-        IPoolV1.releaseOrMint.selector,
+      abi.encodeCall(


Saves gas AND adds type safety, no brainer

RensR · 2024-07-05T14:59:38Z

contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol

@@ -38,7 +38,7 @@ contract EVM2EVMOffRamp is IAny2EVMOffRamp, AggregateRateLimiter, ITypeAndVersio
  error AlreadyExecuted(uint64 sequenceNumber);
  error ZeroAddressNotAllowed();
  error CommitStoreAlreadyInUse();
-  error ExecutionError(bytes error);
+  error ExecutionError(bytes err);


To remove shadowing the error type

RensR · 2024-07-05T15:00:19Z

contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol

@@ -5,7 +5,7 @@ import {Internal} from "../../libraries/Internal.sol";

 // MessageHasher is a contract that provides a function to hash an EVM2EVMMessage.
 contract MessageHasher {
-  function hash(Internal.EVM2EVMMessage memory msg, bytes32 metadataHash) public pure returns (bytes32) {
-    return Internal._hash(msg, metadataHash);
+  function hash(Internal.EVM2EVMMessage memory message, bytes32 metadataHash) public pure returns (bytes32) {


remove shadowing msg

github-actions · 2024-07-05T15:06:15Z

LCOV of commit `17fdce9` during Solidity Foundry #6582

Summary coverage rate:
  lines......: 98.7% (1851 of 1876 lines)
  functions..: 96.3% (341 of 354 functions)
  branches...: 90.3% (791 of 876 branches)

Files changed coverage rate: n/a

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol

# Conflicts: # contracts/gas-snapshots/ccip.gas-snapshot # contracts/scripts/native_solc_compile_all_ccip # contracts/src/v0.8/ccip/libraries/Internal.sol # contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol # contracts/src/v0.8/ccip/onRamp/EVM2EVMMultiOnRamp.sol # contracts/src/v0.8/ccip/test/helpers/MessageHasher.sol # core/gethwrappers/ccip/generated/evm_2_evm_multi_offramp/evm_2_evm_multi_offramp.go # core/gethwrappers/ccip/generated/evm_2_evm_multi_onramp/evm_2_evm_multi_onramp.go # core/gethwrappers/ccip/generated/message_hasher/message_hasher.go # core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt

…/ccip into static-analysis

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol

elatoskinas · 2024-07-16T08:26:03Z

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol

@@ -284,8 +284,10 @@ contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base {
      for (uint256 msgIndex = 0; msgIndex < numMsgs; ++msgIndex) {
        uint256 newLimit = msgGasLimitOverrides[msgIndex];
        // Checks to ensure message cannot be executed with less gas than specified.
-        if (newLimit != 0 && newLimit < report.messages[msgIndex].gasLimit) {
-          revert InvalidManualExecutionGasLimit(report.sourceChainSelector, msgIndex, newLimit);
+        if (newLimit != 0) {


q: are the gas / contract size changes significant for splitting if statements? I find a && b && c much more readable in most cases

RensR added 10 commits July 3, 2024 12:41

encodeCall over encodeWithSelector

2a3faa0

add zero check in RegistryModuleOwnerCustom

5f40500

rn error to err

720824c

save minor gas & contract size

6c05b28

fix stale comment

df59755

unfold if statements using && into two ifs

3243255

inline single use func

c886fbb

inline single line func

ac21b6a

Increase compiler optimizations

6e2a846

Merge 6e2a846 into 2713d42

e1e6ee5

RensR temporarily deployed to sdlc July 5, 2024 14:57 — with GitHub Actions Inactive

RensR commented Jul 5, 2024

View reviewed changes

Update gethwrappers

4116e29

app-token-issuer-infra-releng bot temporarily deployed to sdlc July 5, 2024 15:03 Inactive

elatoskinas reviewed Jul 5, 2024

View reviewed changes

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol Show resolved Hide resolved

RensR added 4 commits July 15, 2024 10:43

comment fix

178e44a

undo some != 0 vs > 0 changes

d999821

Merge 1a917d2 into 1da6ea6

10204bb

RensR temporarily deployed to sdlc July 15, 2024 09:50 — with GitHub Actions Inactive

Update gethwrappers

54e6271

app-token-issuer-infra-releng bot temporarily deployed to sdlc July 15, 2024 09:57 Inactive

RensR temporarily deployed to sdlc July 15, 2024 10:02 — with GitHub Actions Inactive

Merge branch 'static-analysis' of https://github.com/smartcontractkit…

331f3ff

…/ccip into static-analysis

RensR force-pushed the static-analysis branch from 9d6a09d to 331f3ff Compare July 15, 2024 10:03

RensR temporarily deployed to sdlc July 15, 2024 10:03 — with GitHub Actions Inactive

lower opts

e24dd83

RensR temporarily deployed to sdlc July 15, 2024 10:50 — with GitHub Actions Inactive

RensR marked this pull request as ready for review July 15, 2024 11:13

RensR requested review from makramkd, RayXpub and a team as code owners July 15, 2024 11:13

RayXpub reviewed Jul 15, 2024

View reviewed changes

contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol Outdated Show resolved Hide resolved

rm offRamp &&

205a074

RensR temporarily deployed to sdlc July 15, 2024 13:06 — with GitHub Actions Inactive

RayXpub approved these changes Jul 15, 2024

View reviewed changes

0xsuryansh approved these changes Jul 15, 2024

View reviewed changes

elatoskinas reviewed Jul 16, 2024

View reviewed changes

Merge branch 'ccip-develop' into static-analysis

17fdce9

RensR temporarily deployed to sdlc July 16, 2024 08:54 — with GitHub Actions Inactive

elatoskinas approved these changes Jul 16, 2024

View reviewed changes

RensR merged commit f77e6f0 into ccip-develop Jul 16, 2024
107 checks passed

RensR deleted the static-analysis branch July 16, 2024 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Static analysis fixes #1147

Static analysis fixes #1147

RensR commented Jul 5, 2024 •

edited

Loading

RensR Jul 5, 2024

RensR Jul 5, 2024

RensR Jul 5, 2024

github-actions bot commented Jul 5, 2024 •

edited

Loading

elatoskinas Jul 16, 2024

Static analysis fixes #1147

Static analysis fixes #1147

Conversation

RensR commented Jul 5, 2024 • edited Loading

RensR Jul 5, 2024

Choose a reason for hiding this comment

RensR Jul 5, 2024

Choose a reason for hiding this comment

RensR Jul 5, 2024

Choose a reason for hiding this comment

github-actions bot commented Jul 5, 2024 • edited Loading

LCOV of commit 17fdce9 during Solidity Foundry #6582

elatoskinas Jul 16, 2024

Choose a reason for hiding this comment

RensR commented Jul 5, 2024 •

edited

Loading

github-actions bot commented Jul 5, 2024 •

edited

Loading

LCOV of commit `17fdce9` during Solidity Foundry #6582