Add missing _msgData() override for AllowanceHolderContext and MultiCallContext

Author: duncancmt

src/allowanceholder/AllowanceHolderContext.sol

@@ -11,6 +11,14 @@ abstract contract AllowanceHolderContext is Context {
         return super._isForwarded() || super._msgSender() == address(_ALLOWANCE_HOLDER);
     }
 
+    function _msgData() internal view viertual override returns (bytes calldata) {
+        if (super._msgSender() == address(_ALLOWANCE_HOLDER)) {
+            return msg.data[:msg.data.length - 20];
+        } else {
+            return msg.data;
+        }
+    }
+
     function _msgSender() internal view virtual override returns (address sender) {
         sender = super._msgSender();
         if (sender == address(_ALLOWANCE_HOLDER)) {

src/multicall/MultiCallContext.sol

@@ -33,6 +33,21 @@ abstract contract MultiCallContext is Context {
         return super._isForwarded() || super._msgSender() == address(_MULTICALL);
     }
 
+    function _msgData() internal view override virtual returns (bytes calldata r) {
+        address sender = super._msgSender();
+        assembly ("memory-safe") {
+            r.offset := 0x00
+            r.length :=
+                xor(
+                    calldatasize(),
+                    mul(
+                        xor(calldatasize(), sub(calldatasize(), 0x14)),
+                        eq(_MULTICALL_ADDRESS, and(0xffffffffffffffffffffffffffffffffffffffff, sender))
+                    )
+                )
+        }
+    }
+
     function _msgSender() internal view virtual override returns (address sender) {
         sender = super._msgSender();
         assembly ("memory-safe") {