From adc095c3bf4015191ebe6bd2cf805c6d5048060f Mon Sep 17 00:00:00 2001 From: Ganesh Vanahalli Date: Fri, 2 Feb 2024 11:37:30 -0600 Subject: [PATCH 1/3] Add contract to test pending block's time and number advance --- src/mocks/TestPendingBlkTimeAndNrAdvance.sol | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/mocks/TestPendingBlkTimeAndNrAdvance.sol diff --git a/src/mocks/TestPendingBlkTimeAndNrAdvance.sol b/src/mocks/TestPendingBlkTimeAndNrAdvance.sol new file mode 100644 index 00000000..2a32790d --- /dev/null +++ b/src/mocks/TestPendingBlkTimeAndNrAdvance.sol @@ -0,0 +1,22 @@ +// Copyright 2021-2022, Offchain Labs, Inc. +// For license information, see https://github.com/OffchainLabs/nitro-contracts/blob/main/LICENSE +// SPDX-License-Identifier: BUSL-1.1 + +pragma solidity ^0.8.0; + +import "../precompiles/ArbSys.sol"; + +contract TestPendingBlkTimeAndNrAdvance { + uint256 immutable deployedAt; + uint256 immutable deployedAtBlock; + + constructor() { + deployedAt = block.timestamp; + deployedAtBlock = ArbSys(address(100)).arbBlockNumber(); + } + + function test() external { + require(block.timestamp > deployedAt, "Time didn't advance"); + require(ArbSys(address(100)).arbBlockNumber() > deployedAtBlock, "Block didn't advance"); + } +} From e78e2c6b91df91ba7463726b18d329de7af0fec1 Mon Sep 17 00:00:00 2001 From: Ganesh Vanahalli Date: Fri, 2 Feb 2024 12:11:33 -0600 Subject: [PATCH 2/3] fix name --- ...TimeAndNrAdvance.sol => PendingBlkTimeAndNrAdvanceCheck.sol} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/mocks/{TestPendingBlkTimeAndNrAdvance.sol => PendingBlkTimeAndNrAdvanceCheck.sol} (93%) diff --git a/src/mocks/TestPendingBlkTimeAndNrAdvance.sol b/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol similarity index 93% rename from src/mocks/TestPendingBlkTimeAndNrAdvance.sol rename to src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol index 2a32790d..b48531d0 100644 --- a/src/mocks/TestPendingBlkTimeAndNrAdvance.sol +++ b/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol @@ -6,7 +6,7 @@ pragma solidity ^0.8.0; import "../precompiles/ArbSys.sol"; -contract TestPendingBlkTimeAndNrAdvance { +contract PendingBlkTimeAndNrAdvanceCheck { uint256 immutable deployedAt; uint256 immutable deployedAtBlock; From 3c31d2a0aa262724bbe4c12791195819663b096e Mon Sep 17 00:00:00 2001 From: Ganesh Vanahalli Date: Fri, 2 Feb 2024 12:15:03 -0600 Subject: [PATCH 3/3] refactor --- src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol b/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol index b48531d0..423175ba 100644 --- a/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol +++ b/src/mocks/PendingBlkTimeAndNrAdvanceCheck.sol @@ -15,7 +15,7 @@ contract PendingBlkTimeAndNrAdvanceCheck { deployedAtBlock = ArbSys(address(100)).arbBlockNumber(); } - function test() external { + function isAdvancing() external { require(block.timestamp > deployedAt, "Time didn't advance"); require(ArbSys(address(100)).arbBlockNumber() > deployedAtBlock, "Block didn't advance"); }