Disallow zero predecessor config digest for staging (it MUST always b…

…e promotable) (#15407) * Disallow zero predecessor config digest for staging (it MUST always be promotable) * Update gethwrappers * Disallow zero predecessor config digest for staging (it MUST always be promotable) --------- Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
smartcontractkit · Nov 26, 2024 · a677d28 · a677d28
1 parent def2b4a
commit a677d28
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/contracts/gas-snapshots/llo-feeds.gas-snapshot b/contracts/gas-snapshots/llo-feeds.gas-snapshot
@@ -35,11 +35,11 @@ ConfiguratorSetProductionConfigTest:test_revertsIfNotEnoughSigners() (gas: 95951
 ConfiguratorSetProductionConfigTest:test_revertsIfOnchainConfigIsInvalid() (gas: 60885)
 ConfiguratorSetProductionConfigTest:test_revertsIfSetWithTooManySigners() (gas: 107412)
 ConfiguratorSetProductionConfigTest:test_supportsHigherVersionsIgnoringExcessOnchainConfig() (gas: 125099)
-ConfiguratorSetStagingConfigTest:test_correctlyUpdatesTheConfig() (gas: 265921)
+ConfiguratorSetStagingConfigTest:test_correctlyUpdatesTheConfig() (gas: 266041)
 ConfiguratorSetStagingConfigTest:test_revertsIfCalledByNonOwner() (gas: 266528)
 ConfiguratorSetStagingConfigTest:test_revertsIfFaultToleranceIsZero() (gas: 264142)
 ConfiguratorSetStagingConfigTest:test_revertsIfNotEnoughSigners() (gas: 95920)
-ConfiguratorSetStagingConfigTest:test_revertsIfOnchainConfigIsInvalid() (gas: 67763)
+ConfiguratorSetStagingConfigTest:test_revertsIfOnchainConfigIsInvalid() (gas: 85217)
 ConfiguratorSetStagingConfigTest:test_revertsIfSetWithTooManySigners() (gas: 107392)
 ConfiguratorTest:testSupportsInterface() (gas: 8367)
 ConfiguratorTest:testTypeAndVersion() (gas: 9683)

diff --git a/contracts/src/v0.8/llo-feeds/v0.5.0/configuration/Configurator.sol b/contracts/src/v0.8/llo-feeds/v0.5.0/configuration/Configurator.sol
@@ -161,6 +161,7 @@ contract Configurator is IConfigurator, ConfirmedOwner, TypeAndVersionInterface,
 
     ConfigurationState memory configurationState = s_configurationStates[configId];
     if (
+      predecessorConfigDigest == bytes32(0) ||
       predecessorConfigDigest !=
       s_configurationStates[configId].configDigest[configurationState.isGreenProduction ? 1 : 0]
     ) revert InvalidPredecessorConfigDigest(predecessorConfigDigest);

diff --git a/...8/llo-feeds/v0.5.0/configuration/test/configurator/ConfiguratorSetStagingConfigTest.t.sol b/...8/llo-feeds/v0.5.0/configuration/test/configurator/ConfiguratorSetStagingConfigTest.t.sol
@@ -115,6 +115,19 @@ contract ConfiguratorSetStagingConfigTest is BaseTest {
       OFFCHAIN_CONFIG_VERSION,
       offchainConfig
     );
+
+    onchainConfig = abi.encode(uint256(1), uint256(0));
+
+    vm.expectRevert(abi.encodeWithSelector(Configurator.InvalidPredecessorConfigDigest.selector, uint256(0)));
+    s_configurator.setStagingConfig(
+      CONFIG_ID_1,
+      signers,
+      offchainTransmitters,
+      f,
+      onchainConfig,
+      OFFCHAIN_CONFIG_VERSION,
+      offchainConfig
+    );
   }
 
   function test_correctlyUpdatesTheConfig() public {