Fix StaticCallProxy comment and add sanity checks to TestStaticCallTa…

…rget
0xProject · Jun 17, 2019 · e31c98d · e31c98d
1 parent 85e441a
commit e31c98d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/contracts/asset-proxy/contracts/src/StaticCallProxy.sol b/contracts/asset-proxy/contracts/src/StaticCallProxy.sol
@@ -174,7 +174,7 @@ contract StaticCallProxy {
                 // + 32 (assetData len)
                 // + 4 (proxyId)
                 // + 32 (callTarget)
-                // + 32 (assetDataOffset)
+                // + 32 (staticCallDataOffset)
                 let expectedResultHash := calldataload(add(assetDataOffset, 100))
 
                 if sub(callResultHash, expectedResultHash) {

diff --git a/contracts/asset-proxy/contracts/test/TestStaticCallTarget.sol b/contracts/asset-proxy/contracts/test/TestStaticCallTarget.sol
@@ -18,9 +18,13 @@
 
 pragma solidity ^0.5.5;
 
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+
 
 contract TestStaticCallTarget {
 
+    using LibBytes for bytes;
+
     uint256 internal _state;
 
     function updateState()
@@ -51,12 +55,17 @@ contract TestStaticCallTarget {
     function noInputFunction()
         external
         pure
-    {}
+    {
+        assert(msg.data.length == 4 && msg.data.readBytes4(0) == bytes4(keccak256("noInputFunction()")));
+    }
 
     function dynamicInputFunction(bytes calldata a)
         external
         pure
-    {}
+    {
+        bytes memory abiEncodedData = abi.encodeWithSignature("dynamicInputFunction(bytes)", a);
+        assert(msg.data.equals(abiEncodedData));
+    }
 
     function returnComplexType(uint256 a, uint256 b)
         external