diff --git a/contracts/src/v0.8/ccip/rmn/RMNRemote.sol b/contracts/src/v0.8/ccip/rmn/RMNRemote.sol index 1a7270d846..0e7acba656 100644 --- a/contracts/src/v0.8/ccip/rmn/RMNRemote.sol +++ b/contracts/src/v0.8/ccip/rmn/RMNRemote.sol @@ -8,9 +8,6 @@ import {OwnerIsCreator} from "../../shared/access/OwnerIsCreator.sol"; import {EnumerableSet} from "../../shared/enumerable/EnumerableSetWithBytes16.sol"; import {Internal} from "../libraries/Internal.sol"; -/// @dev this is included in the preimage of the digest that RMN nodes sign -bytes32 constant RMN_V1_6_ANY2EVM_REPORT = keccak256("RMN_V1_6_ANY2EVM_REPORT"); - /// @dev An active curse on this subject will cause isCursed() to return true. Use this subject if there is an issue with a /// remote chain, for which there exists a legacy lane contract deployed on the same chain as this RMN contract is /// deployed, relying on isCursed(). @@ -66,6 +63,9 @@ contract RMNRemote is OwnerIsCreator, ITypeAndVersion, IRMNV2 { Internal.MerkleRoot[] merkleRoots; // The dest lane updates } + /// @dev this is included in the preimage of the digest that RMN nodes sign + bytes32 public constant RMN_V1_6_ANY2EVM_REPORT = keccak256("RMN_V1_6_ANY2EVM_REPORT"); + string public constant override typeAndVersion = "RMNRemote 1.6.0-dev"; uint64 internal immutable i_localChainSelector; diff --git a/contracts/src/v0.8/ccip/test/rmn/RMNRemoteSetup.t.sol b/contracts/src/v0.8/ccip/test/rmn/RMNRemoteSetup.t.sol index 01bd5bd1b6..a49d9b6413 100644 --- a/contracts/src/v0.8/ccip/test/rmn/RMNRemoteSetup.t.sol +++ b/contracts/src/v0.8/ccip/test/rmn/RMNRemoteSetup.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {IRMNV2} from "../../interfaces/IRMNV2.sol"; import {Internal} from "../../libraries/Internal.sol"; -import {RMNRemote, RMN_V1_6_ANY2EVM_REPORT} from "../../rmn/RMNRemote.sol"; +import {RMNRemote} from "../../rmn/RMNRemote.sol"; import {BaseTest} from "../BaseTest.t.sol"; import {Vm} from "forge-std/Vm.sol"; @@ -107,7 +107,7 @@ contract RMNRemoteSetup is BaseTest { (, RMNRemote.Config memory config) = s_rmnRemote.getVersionedConfig(); bytes32 digest = keccak256( abi.encode( - RMN_V1_6_ANY2EVM_REPORT, + s_rmnRemote.RMN_V1_6_ANY2EVM_REPORT(), RMNRemote.Report({ destChainId: block.chainid, destChainSelector: s_rmnRemote.getLocalChainSelector(),