Bump semver

_more bindings Strengthen invariant test
ethereum-optimism · Apr 19, 2023 · cfb60fb · cfb60fb
1 parent 5b8ab37
commit cfb60fb
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 16 deletions.
diff --git a/op-bindings/bindings/l1crossdomainmessenger.go b/op-bindings/bindings/l1crossdomainmessenger.go
diff --git a/op-bindings/bindings/l1crossdomainmessenger_more.go b/op-bindings/bindings/l1crossdomainmessenger_more.go
diff --git a/op-bindings/bindings/l2crossdomainmessenger.go b/op-bindings/bindings/l2crossdomainmessenger.go
diff --git a/op-bindings/bindings/l2crossdomainmessenger_more.go b/op-bindings/bindings/l2crossdomainmessenger_more.go
diff --git a/op-bindings/bindings/optimismportal.go b/op-bindings/bindings/optimismportal.go
diff --git a/op-bindings/bindings/optimismportal_more.go b/op-bindings/bindings/optimismportal_more.go
diff --git a/packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol b/packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol
@@ -20,12 +20,12 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
     OptimismPortal public immutable PORTAL;
 
     /**
-     * @custom:semver 1.1.0
+     * @custom:semver 1.2.0
      *
      * @param _portal Address of the OptimismPortal contract on this network.
      */
     constructor(OptimismPortal _portal)
-        Semver(1, 1, 0)
+        Semver(1, 2, 0)
         CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER)
     {
         PORTAL = _portal;

diff --git a/packages/contracts-bedrock/contracts/L1/OptimismPortal.sol b/packages/contracts-bedrock/contracts/L1/OptimismPortal.sol
@@ -140,7 +140,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
     }
 
     /**
-     * @custom:semver 1.3.1
+     * @custom:semver 1.4.1
      *
      * @param _l2Oracle                  Address of the L2OutputOracle contract.
      * @param _guardian                  Address that can pause deposits and withdrawals.
@@ -152,7 +152,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
         address _guardian,
         bool _paused,
         SystemConfig _config
-    ) Semver(1, 3, 1) {
+    ) Semver(1, 4, 1) {
         L2_ORACLE = _l2Oracle;
         GUARDIAN = _guardian;
         SYSTEM_CONFIG = _config;

diff --git a/packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol b/packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol
@@ -17,12 +17,12 @@ import { L2ToL1MessagePasser } from "./L2ToL1MessagePasser.sol";
  */
 contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
     /**
-     * @custom:semver 1.1.0
+     * @custom:semver 1.2.0
      *
      * @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
      */
     constructor(address _l1CrossDomainMessenger)
-        Semver(1, 1, 0)
+        Semver(1, 2, 0)
         CrossDomainMessenger(_l1CrossDomainMessenger)
     {
         initialize();

diff --git a/packages/contracts-bedrock/contracts/test/invariants/CrossDomainMessenger.t.sol b/packages/contracts-bedrock/contracts/test/invariants/CrossDomainMessenger.t.sol
@@ -72,7 +72,9 @@ contract RelayActor is StdUtils {
         // the outer min gas limit.
         vm.startPrank(address(op));
         vm.expectCall(target, _message);
-        uint256 gas = doRevert ? 80_000 : xdm.baseGas(_message, _minGasLimit);
+        uint256 gas = doRevert
+            ? bound(_minGasLimit, 80_000, 120_000)
+            : xdm.baseGas(_message, _minGasLimit);
         try
             xdm.relayMessage{ gas: gas }(
                 Encoding.encodeVersionedNonce(0, _version),
@@ -133,7 +135,7 @@ contract XDM_MinGasLimits_Succeeds is XDM_MinGasLimits {
      * - The inner min gas limit is for the call from the `L1CrossDomainMessenger` to the target
      * contract.
      */
-    function invariant_minGasLimits() public {
+    function invariant_minGasLimits() external {
         uint256 length = actor.numHashes();
         for (uint256 i = 0; i < length; ++i) {
             bytes32 hash = actor.hashes(i);
@@ -164,7 +166,7 @@ contract XDM_MinGasLimits_Reverts is XDM_MinGasLimits {
      * - The inner min gas limit is for the call from the `L1CrossDomainMessenger` to the target
      * contract.
      */
-    function invariant_minGasLimits() public {
+    function invariant_minGasLimits() external {
         uint256 length = actor.numHashes();
         for (uint256 i = 0; i < length; ++i) {
             bytes32 hash = actor.hashes(i);

diff --git a/packages/contracts-bedrock/tasks/check-l2.ts b/packages/contracts-bedrock/tasks/check-l2.ts
@@ -245,7 +245,7 @@ const check = {
     await assertSemver(
       L2CrossDomainMessenger,
       'L2CrossDomainMessenger',
-      '1.1.0'
+      '1.2.0'
     )
 
     const xDomainMessageSenderSlot = await signer.provider.getStorageAt(