fix: comments

defi-wonderland · Jul 24, 2024 · 83fc2d0 · 83fc2d0
1 parent 1ac841c
commit 83fc2d0
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 127 deletions.
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "package.json": "sort-package-json"
   },
   "dependencies": {
-    "@defi-wonderland/prophet-core-contracts": "0.0.0-4d4a4487",
+    "@defi-wonderland/prophet-core-contracts": "0.0.0-ad40b65b",
     "@openzeppelin/contracts": "4.9.5",
     "solmate": "https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c"
   },

diff --git a/solidity/contracts/modules/dispute/CircuitResolverModule.sol b/solidity/contracts/modules/dispute/CircuitResolverModule.sol
@@ -94,12 +94,25 @@ contract CircuitResolverModule is Module, ICircuitResolverModule {
   /// @inheritdoc IModule
   function validateParameters(bytes calldata _encodedParameters)
     external
-    pure
+    view
     override(Module, IModule)
     returns (bool _valid)
   {
     RequestParameters memory _params = decodeRequestData(_encodedParameters);
     _valid = address(_params.accountingExtension) != address(0) && address(_params.bondToken) != address(0)
-      && _params.bondSize != 0 && address(_params.verifier) != address(0) && _params.callData.length != 0;
+      && _params.bondSize != 0 && _targetHasBytecode(_params.verifier) && _params.callData.length != 0;
+  }
+
+  /**
+   * @notice Checks if a target address has bytecode
+   * @param _target The address to check
+   * @return _hasBytecode Whether the target has bytecode or not
+   */
+  function _targetHasBytecode(address _target) private view returns (bool _hasBytecode) {
+    uint256 _size;
+    assembly {
+      _size := extcodesize(_target)
+    }
+    _hasBytecode = _size > 0;
   }
 }
diff --git a/solidity/contracts/modules/finality/CallbackModule.sol b/solidity/contracts/modules/finality/CallbackModule.sol
@@ -41,7 +41,7 @@ contract CallbackModule is Module, ICallbackModule {
     returns (bool _valid)
   {
     RequestParameters memory _params = decodeRequestData(_encodedParameters);
-    _valid = address(_params.target) != address(0) && _params.data.length != 0 && _targetHasBytecode(_params.target);
+    _valid = _params.data.length != 0 && _targetHasBytecode(_params.target);
   }
 
   /**

diff --git a/solidity/contracts/modules/finality/MultipleCallbacksModule.sol b/solidity/contracts/modules/finality/MultipleCallbacksModule.sol
@@ -51,7 +51,7 @@ contract MultipleCallbacksModule is Module, IMultipleCallbacksModule {
     _valid = true;
 
     for (uint256 _i; _i < _params.targets.length; ++_i) {
-      if (_params.targets[_i] == address(0) || !_targetHasBytecode(_params.targets[_i])) {
+      if (!_targetHasBytecode(_params.targets[_i])) {
         _valid = false;
         break;
       }

diff --git a/solidity/test/unit/modules/dispute/CircuitResolverModule.t.sol b/solidity/test/unit/modules/dispute/CircuitResolverModule.t.sol
@@ -60,6 +60,14 @@ contract BaseTest is Test, Helpers {
 
     circuitResolverModule = new ForTest_CircuitResolverModule(oracle);
   }
+
+  function targetHasBytecode(address _target) public view returns (bool _hasBytecode) {
+    uint256 _size;
+    assembly {
+      _size := extcodesize(_target)
+    }
+    _hasBytecode = _size > 0;
+  }
 }
 
 contract CircuitResolverModule_Unit_ModuleData is BaseTest {
@@ -109,7 +117,7 @@ contract CircuitResolverModule_Unit_ModuleData is BaseTest {
   function test_validateParameters(ICircuitResolverModule.RequestParameters calldata _params) public {
     if (
       address(_params.accountingExtension) == address(0) || address(_params.bondToken) == address(0)
-        || _params.bondSize == 0 || address(_params.verifier) == address(0) || _params.callData.length == 0
+        || _params.bondSize == 0 || !targetHasBytecode(_params.verifier) || _params.callData.length == 0
     ) {
       assertFalse(circuitResolverModule.validateParameters(abi.encode(_params)));
     } else {