chore: fix forwarder

AztecProtocol · Feb 4, 2025 · 6aac492 · 6aac492
1 parent 94f9c71
commit 6aac492
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/l1-contracts/src/periphery/Forwarder.sol b/l1-contracts/src/periphery/Forwarder.sol
@@ -11,7 +11,11 @@ contract Forwarder is Ownable, IForwarder {
 
   constructor(address __owner) Ownable(__owner) {}
 
-  function forward(address[] calldata _to, bytes[] calldata _data) external override onlyOwner {
+  function forward(address[] calldata _to, bytes[] calldata _data)
+    external
+    override(IForwarder)
+    onlyOwner
+  {
     require(
       _to.length == _data.length, IForwarder.ForwarderLengthMismatch(_to.length, _data.length)
     );

diff --git a/l1-contracts/test/Forwarder.t.sol b/l1-contracts/test/Forwarder.t.sol
@@ -66,9 +66,8 @@ contract ForwarderTest is Test {
   }
 
   function testRevertWhenCallToInvalidAddress(address _invalidAddress) public {
-    vm.assume(_invalidAddress != address(token1));
-    vm.assume(_invalidAddress != address(token2));
-    vm.assume(_invalidAddress != address(forwarder));
+    vm.assume(_invalidAddress.code.length == 0);
+    vm.assume(uint160(_invalidAddress) > uint160(0x0a));
 
     address[] memory targets = new address[](1);
     targets[0] = _invalidAddress;