more

hyperlane-xyz · Nov 7, 2024 · 6876905 · 6876905
1 parent 99647fe
commit 6876905
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/solidity/contracts/hooks/OPL2ToL1Hook.sol b/solidity/contracts/hooks/OPL2ToL1Hook.sol
@@ -67,8 +67,12 @@ contract OPL2ToL1Hook is AbstractMessageIdAuthHook {
         bytes calldata metadata,
         bytes calldata message
     ) internal view override returns (uint256) {
+        bytes memory metadataWithGasLimit = metadata.overrideGasLimit(
+            MIN_GAS_LIMIT
+        );
         return
-            metadata.msgValue(0) + childHook.quoteDispatch(metadata, message);
+            metadata.msgValue(0) +
+            childHook.quoteDispatch(metadataWithGasLimit, message);
     }
 
     // ============ Internal functions ============
@@ -83,9 +87,12 @@ contract OPL2ToL1Hook is AbstractMessageIdAuthHook {
             (message.id(), metadata.msgValue(0))
         );
 
+        bytes memory metadataWithGasLimit = metadata.overrideGasLimit(
+            MIN_GAS_LIMIT
+        );
         childHook.postDispatch{
-            value: childHook.quoteDispatch(metadata, message)
-        }(metadata, message);
+            value: childHook.quoteDispatch(metadataWithGasLimit, message)
+        }(metadataWithGasLimit, message);
         l2Messenger.sendMessage{value: metadata.msgValue(0)}(
             TypeCasts.bytes32ToAddress(ism),
             payload,

diff --git a/solidity/contracts/token/HypValue.sol b/solidity/contracts/token/HypValue.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT AND Apache-2.0
 pragma solidity >=0.8.0;
 
 /*@@@@@@@       @@@@@@@@@