Merge remote-tracking branch 'origin/chore/vrf-881-vrf-882' into chor…

…e/vrf-881-vrf-882

contracts/gas-snapshots/l2ep.gas-snapshot

@@ -140,7 +140,7 @@ ScrollSequencerUptimeFeed_UpdateStatus:test_RevertIfNotL2CrossDomainMessengerAdd
 ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenNoChange() (gas: 71618)
 ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndNoTimeChange() (gas: 92018)
 ScrollSequencerUptimeFeed_UpdateStatus:test_UpdateStatusWhenStatusChangeAndTimeChange() (gas: 92078)
-ScrollValidator_SetGasLimit:test_CorrectlyUpdatesTheGasLimit() (gas: 15503)
-ScrollValidator_Validate:test_PostSequencerOffline() (gas: 75094)
-ScrollValidator_Validate:test_PostSequencerStatusWhenThereIsNotStatusChange() (gas: 75156)
-ScrollValidator_Validate:test_RevertsIfCalledByAnAccountWithNoAccess() (gas: 15563)
+ScrollValidator_SetGasLimit:test_CorrectlyUpdatesTheGasLimit() (gas: 15637)
+ScrollValidator_Validate:test_PostSequencerOffline() (gas: 78367)
+ScrollValidator_Validate:test_PostSequencerStatusWhenThereIsNotStatusChange() (gas: 78423)
+ScrollValidator_Validate:test_RevertsIfCalledByAnAccountWithNoAccess() (gas: 15569)

contracts/src/v0.8/l2ep/dev/scroll/ScrollValidator.sol

@@ -7,6 +7,7 @@ import {ScrollSequencerUptimeFeedInterface} from "../interfaces/ScrollSequencerU
 
 import {SimpleWriteAccessController} from "../../../shared/access/SimpleWriteAccessController.sol";
 
+import {IL1MessageQueue} from "@scroll-tech/contracts/L1/rollup/IL1MessageQueue.sol";
 import {IL1ScrollMessenger} from "@scroll-tech/contracts/L1/IL1ScrollMessenger.sol";
 
 /// @title ScrollValidator - makes cross chain call to update the Sequencer Uptime Feed on L2
@@ -15,6 +16,8 @@ contract ScrollValidator is TypeAndVersionInterface, AggregatorValidatorInterfac
   address public immutable L1_CROSS_DOMAIN_MESSENGER_ADDRESS;
   // solhint-disable-next-line chainlink-solidity/prefix-immutable-variables-with-i
   address public immutable L2_UPTIME_FEED_ADDR;
+  // solhint-disable-next-line chainlink-solidity/prefix-immutable-variables-with-i
+  address public immutable L1_MSG_QUEUE_ADDR;
 
   // solhint-disable-next-line chainlink-solidity/all-caps-constant-storage-variables
   string public constant override typeAndVersion = "ScrollValidator 1.0.0";
@@ -28,13 +31,21 @@ contract ScrollValidator is TypeAndVersionInterface, AggregatorValidatorInterfac
   /// @param l1CrossDomainMessengerAddress address the L1CrossDomainMessenger contract address
   /// @param l2UptimeFeedAddr the address of the ScrollSequencerUptimeFeed contract address
   /// @param gasLimit the gasLimit to use for sending a message from L1 to L2
-  constructor(address l1CrossDomainMessengerAddress, address l2UptimeFeedAddr, uint32 gasLimit) {
+  constructor(
+    address l1CrossDomainMessengerAddress,
+    address l2UptimeFeedAddr,
+    address l1MessageQueueAddr,
+    uint32 gasLimit
+  ) {
     // solhint-disable-next-line custom-errors
     require(l1CrossDomainMessengerAddress != address(0), "Invalid xDomain Messenger address");
     // solhint-disable-next-line custom-errors
+    require(l1MessageQueueAddr != address(0), "Invalid L1 message queue address");
+    // solhint-disable-next-line custom-errors
     require(l2UptimeFeedAddr != address(0), "Invalid ScrollSequencerUptimeFeed contract address");
     L1_CROSS_DOMAIN_MESSENGER_ADDRESS = l1CrossDomainMessengerAddress;
     L2_UPTIME_FEED_ADDR = l2UptimeFeedAddr;
+    L1_MSG_QUEUE_ADDR = l1MessageQueueAddr;
     s_gasLimit = gasLimit;
   }
 
@@ -50,6 +61,12 @@ contract ScrollValidator is TypeAndVersionInterface, AggregatorValidatorInterfac
     return s_gasLimit;
   }
 
+  /// @notice makes this contract payable
+  /// @dev receives funds:
+  ///  - to use them (if configured) to pay for L2 execution on L1
+  ///  - when withdrawing funds from L2 xDomain alias address (pay for L2 execution on L2)
+  receive() external payable {}
+
   /// @notice validate method sends an xDomain L2 tx to update Uptime Feed contract on L2.
   /// @dev A message is sent using the L1CrossDomainMessenger. This method is accessed controlled.
   /// @param currentAnswer new aggregator answer - value of 1 considers the sequencer offline.
@@ -60,7 +77,9 @@ contract ScrollValidator is TypeAndVersionInterface, AggregatorValidatorInterfac
     int256 currentAnswer
   ) external override checkAccess returns (bool) {
     // Make the xDomain call
-    IL1ScrollMessenger(L1_CROSS_DOMAIN_MESSENGER_ADDRESS).sendMessage(
+    IL1ScrollMessenger(L1_CROSS_DOMAIN_MESSENGER_ADDRESS).sendMessage{
+      value: IL1MessageQueue(L1_MSG_QUEUE_ADDR).estimateCrossDomainMessageFee(s_gasLimit)
+    }(
       L2_UPTIME_FEED_ADDR,
       0,
       abi.encodeWithSelector(

contracts/src/v0.8/l2ep/test/mocks/scroll/MockScrollL1MessageQueue.sol

@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import {IL1MessageQueue} from "@scroll-tech/contracts/L1/rollup/IL1MessageQueue.sol";
+
+contract MockScrollL1MessageQueue is IL1MessageQueue {
+  /// @notice The start index of all pending inclusion messages.
+  function pendingQueueIndex() external pure returns (uint256) {
+    return 0;
+  }
+
+  /// @notice Return the index of next appended message.
+  function nextCrossDomainMessageIndex() external pure returns (uint256) {
+    return 0;
+  }
+
+  /// @notice Return the message of in `queueIndex`.
+  function getCrossDomainMessage(uint256 /* queueIndex */) external pure returns (bytes32) {
+    return "";
+  }
+
+  /// @notice Return the amount of ETH should pay for cross domain message.
+  function estimateCrossDomainMessageFee(uint256 /* gasLimit */) external pure returns (uint256) {
+    return 0;
+  }
+
+  /// @notice Return the amount of intrinsic gas fee should pay for cross domain message.
+  function calculateIntrinsicGasFee(bytes memory /* _calldata */) external pure returns (uint256) {
+    return 0;
+  }
+
+  /// @notice Return the hash of a L1 message.
+  function computeTransactionHash(
+    address /* sender */,
+    uint256 /* queueIndex */,
+    uint256 /* value */,
+    address /* target */,
+    uint256 /* gasLimit */,
+    bytes calldata /* data */
+  ) external pure returns (bytes32) {
+    return 0;
+  }
+
+  /// @notice Append a L1 to L2 message into this contract.
+  /// @param target The address of target contract to call in L2.
+  /// @param gasLimit The maximum gas should be used for relay this message in L2.
+  /// @param data The calldata passed to target contract.
+  function appendCrossDomainMessage(address target, uint256 gasLimit, bytes calldata data) external {}
+
+  /// @notice Append an enforced transaction to this contract.
+  /// @dev The address of sender should be an EOA.
+  /// @param sender The address of sender who will initiate this transaction in L2.
+  /// @param target The address of target contract to call in L2.
+  /// @param value The value passed
+  /// @param gasLimit The maximum gas should be used for this transaction in L2.
+  /// @param data The calldata passed to target contract.
+  function appendEnforcedTransaction(
+    address sender,
+    address target,
+    uint256 value,
+    uint256 gasLimit,
+    bytes calldata data
+  ) external {}
+
+  /// @notice Pop finalized messages from queue.
+  ///
+  /// @dev We can pop at most 256 messages each time. And if the message is not skipped,
+  ///      the corresponding entry will be cleared.
+  ///
+  /// @param startIndex The start index to pop.
+  /// @param count The number of messages to pop.
+  /// @param skippedBitmap A bitmap indicates whether a message is skipped.
+  function popCrossDomainMessage(uint256 startIndex, uint256 count, uint256 skippedBitmap) external {}
+
+  /// @notice Drop a skipped message from the queue.
+  function dropCrossDomainMessage(uint256 index) external {}
+}

contracts/src/v0.8/l2ep/test/v1_0_0/scroll/ScrollValidator.t.sol

@@ -3,6 +3,7 @@ pragma solidity 0.8.19;
 
 import {MockScrollL1CrossDomainMessenger} from "../../mocks/scroll/MockScrollL1CrossDomainMessenger.sol";
 import {MockScrollL2CrossDomainMessenger} from "../../mocks/scroll/MockScrollL2CrossDomainMessenger.sol";
+import {MockScrollL1MessageQueue} from "../../mocks/scroll/MockScrollL1MessageQueue.sol";
 import {ScrollSequencerUptimeFeed} from "../../../dev/scroll/ScrollSequencerUptimeFeed.sol";
 import {ScrollValidator} from "../../../dev/scroll/ScrollValidator.sol";
 import {L2EPTest} from "../L2EPTest.t.sol";
@@ -15,6 +16,7 @@ contract ScrollValidatorTest is L2EPTest {
   /// L2EP contracts
   MockScrollL1CrossDomainMessenger internal s_mockScrollL1CrossDomainMessenger;
   MockScrollL2CrossDomainMessenger internal s_mockScrollL2CrossDomainMessenger;
+  MockScrollL1MessageQueue internal s_mockScrollL1MessageQueue;
   ScrollSequencerUptimeFeed internal s_scrollSequencerUptimeFeed;
   ScrollValidator internal s_scrollValidator;
 
@@ -32,6 +34,7 @@ contract ScrollValidatorTest is L2EPTest {
   function setUp() public {
     s_mockScrollL1CrossDomainMessenger = new MockScrollL1CrossDomainMessenger();
     s_mockScrollL2CrossDomainMessenger = new MockScrollL2CrossDomainMessenger();
+    s_mockScrollL1MessageQueue = new MockScrollL1MessageQueue();
 
     s_scrollSequencerUptimeFeed = new ScrollSequencerUptimeFeed(
       address(s_mockScrollL1CrossDomainMessenger),
@@ -42,6 +45,7 @@ contract ScrollValidatorTest is L2EPTest {
     s_scrollValidator = new ScrollValidator(
       address(s_mockScrollL1CrossDomainMessenger),
       address(s_scrollSequencerUptimeFeed),
+      address(s_mockScrollL1MessageQueue),
       INIT_GAS_LIMIT
     );
   }

contracts/test/v0.8/dev/ScrollValidator.test.ts

@@ -9,6 +9,7 @@ describe('ScrollValidator', () => {
   const L2_SEQ_STATUS_RECORDER_ADDRESS =
     '0x491B1dDA0A8fa069bbC1125133A975BF4e85a91b'
   let scrollValidator: Contract
+  let l1MessageQueue: Contract
   let scrollUptimeFeedFactory: ContractFactory
   let mockScrollL1CrossDomainMessenger: Contract
   let deployer: SignerWithAddress
@@ -35,6 +36,13 @@ describe('ScrollValidator', () => {
     mockScrollL1CrossDomainMessenger =
       await mockScrollL1CrossDomainMessengerFactory.deploy()
 
+    // Scroll Message Queue contract on L1
+    const l1MessageQueueFactory = await ethers.getContractFactory(
+      'src/v0.8/l2ep/test/mocks/scroll/MockScrollL1MessageQueue.sol:MockScrollL1MessageQueue',
+      deployer,
+    )
+    l1MessageQueue = await l1MessageQueueFactory.deploy()
+
     // Contract under test
     const scrollValidatorFactory = await ethers.getContractFactory(
       'src/v0.8/l2ep/dev/scroll/ScrollValidator.sol:ScrollValidator',
@@ -44,6 +52,7 @@ describe('ScrollValidator', () => {
     scrollValidator = await scrollValidatorFactory.deploy(
       mockScrollL1CrossDomainMessenger.address,
       L2_SEQ_STATUS_RECORDER_ADDRESS,
+      l1MessageQueue.address,
       GAS_LIMIT,
     )
   })

core/chains/evm/config/chain_scoped.go

@@ -193,3 +193,7 @@ func (e *evmConfig) OperatorFactoryAddress() string {
 	}
 	return e.c.OperatorFactoryAddress.String()
 }
+
+func (e *evmConfig) LogPrunePageSize() uint32 {
+	return *e.c.LogPrunePageSize
+}

core/chains/evm/config/config.go

@@ -7,6 +7,7 @@ import (
 	gethcommon "github.com/ethereum/go-ethereum/common"
 
 	commonassets "github.com/smartcontractkit/chainlink-common/pkg/assets"
+
 	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/config"
@@ -36,6 +37,7 @@ type EVM interface {
 	LogBackfillBatchSize() uint32
 	LogKeepBlocksDepth() uint32
 	LogPollInterval() time.Duration
+	LogPrunePageSize() uint32
 	MinContractPayment() *commonassets.Link
 	MinIncomingConfirmations() uint32
 	NonceAutoSync() bool

core/chains/evm/config/toml/config.go

@@ -352,6 +352,7 @@ type Chain struct {
 	LogBackfillBatchSize     *uint32
 	LogPollInterval          *commonconfig.Duration
 	LogKeepBlocksDepth       *uint32
+	LogPrunePageSize         *uint32
 	MinIncomingConfirmations *uint32
 	MinContractPayment       *commonassets.Link
 	NonceAutoSync            *bool

core/chains/evm/config/toml/defaults.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	cconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
+
 	"github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils/big"
 )
@@ -136,6 +137,9 @@ func (c *Chain) SetFrom(f *Chain) {
 	if v := f.LogKeepBlocksDepth; v != nil {
 		c.LogKeepBlocksDepth = v
 	}
+	if v := f.LogPrunePageSize; v != nil {
+		c.LogPrunePageSize = v
+	}
 	if v := f.MinIncomingConfirmations; v != nil {
 		c.MinIncomingConfirmations = v
 	}

core/chains/evm/config/toml/defaults/fallback.toml

@@ -6,6 +6,7 @@ FinalityTagEnabled = false
 LogBackfillBatchSize = 1000
 LogPollInterval = '15s'
 LogKeepBlocksDepth = 100000
+LogPrunePageSize = 0
 MinContractPayment = '.00001 link'
 MinIncomingConfirmations = 3
 NonceAutoSync = true

core/chains/evm/forwarders/forwarder_manager_test.go

@@ -60,7 +60,7 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) {
 	t.Log(authorized)
 
 	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
-	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
+	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000, 0)
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
 	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 
@@ -113,7 +113,7 @@ func TestFwdMgr_AccountUnauthorizedToForward_SkipsForwarding(t *testing.T) {
 	ec.Commit()
 
 	evmClient := client.NewSimulatedBackendClient(t, ec, testutils.FixtureChainID)
-	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000)
+	lp := logpoller.NewLogPoller(logpoller.NewORM(testutils.FixtureChainID, db, lggr, pgtest.NewQConfig(true)), evmClient, lggr, 100*time.Millisecond, false, 2, 3, 2, 1000, 0)
 	fwdMgr := forwarders.NewFwdMgr(db, evmClient, lp, lggr, evmcfg.EVM(), evmcfg.Database())
 	fwdMgr.ORM = forwarders.NewORM(db, logger.Test(t), cfg.Database())
 

core/chains/evm/logpoller/helper_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/client"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter"
@@ -66,7 +67,7 @@ func SetupTH(t testing.TB, useFinalityTag bool, finalityDepth, backfillBatchSize
 	// Mark genesis block as finalized to avoid any nulls in the tests
 	head := esc.Backend().Blockchain().CurrentHeader()
 	esc.Backend().Blockchain().SetFinalized(head)
-	lp := logpoller.NewLogPoller(o, esc, lggr, 1*time.Hour, useFinalityTag, finalityDepth, backfillBatchSize, rpcBatchSize, keepFinalizedBlocksDepth)
+	lp := logpoller.NewLogPoller(o, esc, lggr, 1*time.Hour, useFinalityTag, finalityDepth, backfillBatchSize, rpcBatchSize, keepFinalizedBlocksDepth, 0)
 	emitterAddress1, _, emitter1, err := log_emitter.DeployLogEmitter(owner, ec)
 	require.NoError(t, err)
 	emitterAddress2, _, emitter2, err := log_emitter.DeployLogEmitter(owner, ec)