Ensure chain time is correct when using chain.mine with ganache 7

brownie/network/rpc/ganache.py

@@ -136,6 +136,10 @@ def sleep(seconds: int) -> int:
 def mine(timestamp: Optional[int] = None) -> None:
     params = [timestamp] if timestamp else []
     _request("evm_mine", params)
+    if timestamp and web3.clientVersion.lower().startswith("ganache/v7"):
+        # ganache v7 does not modify the internal time when mining new blocks
+        # so we also set the time to maintain consistency with v6 behavior
+        _request("evm_setTime", [(timestamp + 1) * 1000])
 
 
 def snapshot() -> int:

tests/network/state/test_blocks.py

@@ -55,13 +55,30 @@ def test_mine_timestamp(devnetwork, chain):
     assert chain.time() - 999999999999 < 3
 
 
+def test_mine_timestamp_next_block(devnetwork, chain):
+    chain.mine(timestamp=999999999999)
+    chain.mine()
+
+    assert chain[-1].timestamp >= 999999999999
+    assert chain.time() >= 999999999999
+
+
 def test_mine_timedelta(devnetwork, chain):
     now = chain.time()
     chain.mine(timedelta=12345)
 
     assert 0 <= chain[-1].timestamp - 12345 - now <= 1
 
 
+def test_mine_timedelta_next_block(devnetwork, chain):
+    now = chain.time()
+    chain.mine(timedelta=12345)
+    chain.mine()
+
+    assert chain[-1].timestamp >= now + 12345
+    assert chain.time() >= now + 12345
+
+
 def test_mine_multiple_timestamp(devnetwork, chain):
     chain.mine(5, timestamp=chain.time() + 123)
     timestamps = [i.timestamp for i in list(chain)[-5:]]