fix: use strict < for block in L2 mint allowance (OZ N-02)

Author: pcarranzav

contracts/gateway/L1GraphTokenGateway.sol

@@ -197,7 +197,7 @@ contract L1GraphTokenGateway is GraphTokenGateway, L1ArbitrumMessenger {
         external
         onlyGovernor
     {
-        require(_updateBlockNum <= block.number, "BLOCK_CANT_BE_FUTURE");
+        require(_updateBlockNum < block.number, "BLOCK_MUST_BE_PAST");
         require(_updateBlockNum > lastL2MintAllowanceUpdateBlock, "BLOCK_MUST_BE_INCREMENTING");
         accumulatedL2MintAllowanceSnapshot = accumulatedL2MintAllowanceAtBlock(_updateBlockNum);
         lastL2MintAllowanceUpdateBlock = _updateBlockNum;
@@ -223,7 +223,7 @@ contract L1GraphTokenGateway is GraphTokenGateway, L1ArbitrumMessenger {
         uint256 _l2MintAllowancePerBlock,
         uint256 _lastL2MintAllowanceUpdateBlock
     ) external onlyGovernor {
-        require(_lastL2MintAllowanceUpdateBlock <= block.number, "BLOCK_CANT_BE_FUTURE");
+        require(_lastL2MintAllowanceUpdateBlock < block.number, "BLOCK_MUST_BE_PAST");
         accumulatedL2MintAllowanceSnapshot = _accumulatedL2MintAllowanceSnapshot;
         l2MintAllowancePerBlock = _l2MintAllowancePerBlock;
         lastL2MintAllowanceUpdateBlock = _lastL2MintAllowanceUpdateBlock;

test/gateway/l1GraphTokenGateway.test.ts

@@ -382,18 +382,23 @@ describe('L1GraphTokenGateway', () => {
           .updateL2MintAllowance(toGRT('1'), await latestBlock())
         await expect(tx).revertedWith('Caller must be Controller governor')
       })
-      it('does not allow using a future block number', async function () {
+      it('does not allow using a future or current block number', async function () {
         const issuancePerBlock = toGRT('120')
         let issuanceUpdatedAtBlock = (await latestBlock()).add(2)
         const tx1 = l1GraphTokenGateway
           .connect(governor.signer)
           .updateL2MintAllowance(issuancePerBlock, issuanceUpdatedAtBlock)
-        await expect(tx1).revertedWith('BLOCK_CANT_BE_FUTURE')
+        await expect(tx1).revertedWith('BLOCK_MUST_BE_PAST')
         issuanceUpdatedAtBlock = (await latestBlock()).add(1) // This will be block.number in our next tx
         const tx2 = l1GraphTokenGateway
           .connect(governor.signer)
           .updateL2MintAllowance(issuancePerBlock, issuanceUpdatedAtBlock)
-        await expect(tx2)
+        await expect(tx2).revertedWith('BLOCK_MUST_BE_PAST')
+        issuanceUpdatedAtBlock = await latestBlock() // This will be block.number-1 in our next tx
+        const tx3 = l1GraphTokenGateway
+          .connect(governor.signer)
+          .updateL2MintAllowance(issuancePerBlock, issuanceUpdatedAtBlock)
+        await expect(tx3)
           .emit(l1GraphTokenGateway, 'L2MintAllowanceUpdated')
           .withArgs(toGRT('0'), issuancePerBlock, issuanceUpdatedAtBlock)
       })
@@ -474,18 +479,23 @@ describe('L1GraphTokenGateway', () => {
           .setL2MintAllowanceParametersManual(toGRT('0'), toGRT('1'), await latestBlock())
         await expect(tx).revertedWith('Caller must be Controller governor')
       })
-      it('does not allow using a future block number', async function () {
+      it('does not allow using a future or current block number', async function () {
         const issuancePerBlock = toGRT('120')
         let issuanceUpdatedAtBlock = (await latestBlock()).add(2)
         const tx1 = l1GraphTokenGateway
           .connect(governor.signer)
           .setL2MintAllowanceParametersManual(toGRT('0'), issuancePerBlock, issuanceUpdatedAtBlock)
-        await expect(tx1).revertedWith('BLOCK_CANT_BE_FUTURE')
+        await expect(tx1).revertedWith('BLOCK_MUST_BE_PAST')
         issuanceUpdatedAtBlock = (await latestBlock()).add(1) // This will be block.number in our next tx
         const tx2 = l1GraphTokenGateway
           .connect(governor.signer)
           .setL2MintAllowanceParametersManual(toGRT('0'), issuancePerBlock, issuanceUpdatedAtBlock)
-        await expect(tx2)
+        await expect(tx2).revertedWith('BLOCK_MUST_BE_PAST')
+        issuanceUpdatedAtBlock = await latestBlock() // This will be block.number-1 in our next tx
+        const tx3 = l1GraphTokenGateway
+          .connect(governor.signer)
+          .setL2MintAllowanceParametersManual(toGRT('0'), issuancePerBlock, issuanceUpdatedAtBlock)
+        await expect(tx3)
           .emit(l1GraphTokenGateway, 'L2MintAllowanceUpdated')
           .withArgs(toGRT('0'), issuancePerBlock, issuanceUpdatedAtBlock)
       })