Refactor (./contracts/test/invariant): Adding AddressAliasHelper

packages/contracts-bedrock/contracts/echidna/FuzzAddressAliasing.sol → packages/contracts-bedrock/contracts/test/invariants/AddressAliasHelper.t.sol

+// SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import {Test} from "forge-std/Test.sol";
+import {StdInvariant} from "forge-std/StdInvariant.sol";
+import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol";
 
-contract EchidnaFuzzAddressAliasing {
-    bool internal failedRoundtrip;
+contract AddressAliasHelper_Converter {
+    bool public failedRoundtrip;
 
     /**
-     * @notice Takes an address to be aliased with AddressAliasHelper and then unaliased
-     *         and updates the test contract's state indicating if the round trip encoding
-     *         failed.
+     * @dev Allows the actor to convert l1 tp l2 address and vice versa.
      */
-    function testRoundTrip(address addr) public {
+    function convertRoundTrip(address addr) external {
         // Alias our address
         address aliasedAddr = AddressAliasHelper.applyL1ToL2Alias(addr);
 
@@ -22,6 +23,22 @@ contract EchidnaFuzzAddressAliasing {
             failedRoundtrip = true;
         }
     }
+}
+
+contract AddressAliasHelper_AddressAliasing_Invariant is StdInvariant, Test {
+    AddressAliasHelper_Converter internal actor;
+
+    function setUp() public {
+        // Create a converter actor.
+        actor = new AddressAliasHelper_Converter();
+
+        targetContract(address(actor));
+
+        bytes4[] memory selectors = new bytes4[](1);
+        selectors[0] = actor.convertRoundTrip.selector;
+        FuzzSelector memory selector = FuzzSelector({addr: address(actor), selectors: selectors});
+        targetSelector(selector);
+    }
 
     /**
      * @custom:invariant Address aliases are always able to be undone.
@@ -29,8 +46,8 @@ contract EchidnaFuzzAddressAliasing {
      * Asserts that an address that has been aliased with `applyL1ToL2Alias` can always
      * be unaliased with `undoL1ToL2Alias`.
      */
-    function echidna_round_trip_aliasing() public view returns (bool) {
-        // ASSERTION: The round trip aliasing done in testRoundTrip(...) should never fail.
-        return !failedRoundtrip;
+    function invariant_round_trip_aliasing() external {
+        // // ASSERTION: The round trip aliasing done in testRoundTrip(...) should never fail.
+        assertEq(actor.failedRoundtrip(), false);
     }
 }

packages/contracts-bedrock/package.json

@@ -44,7 +44,7 @@
     "lint:fix": "yarn lint:contracts:fix && yarn lint:ts:fix",
     "lint": "yarn lint:fix && yarn lint:check",
     "typechain": "typechain --target ethers-v5 --out-dir dist/types --glob 'artifacts/!(build-info)/**/+([a-zA-Z0-9_]).json'",
-    "echidna:aliasing": "echidna-test --contract EchidnaFuzzAddressAliasing --config ./echidna.yaml .",
+    "invariant:aliasing": "forge test --match-path ./contracts/test/invariants/AddressAliasHelper.t.sol -vvv",
     "echidna:burn:gas": "echidna-test --contract EchidnaFuzzBurnGas --config ./echidna.yaml .",
     "echidna:burn:eth": "echidna-test --contract EchidnaFuzzBurnEth --config ./echidna.yaml .",
     "echidna:encoding": "echidna-test --contract EchidnaFuzzEncoding --config ./echidna.yaml .",