fix: adds contract existence StaticHyVM (#47)

oguimbal · Aug 14, 2023 · 7791799 · 7791799
1 parent 143fdf9
commit 7791799
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/StaticHyVM/StaticHyVM.sol b/src/StaticHyVM/StaticHyVM.sol
@@ -29,6 +29,7 @@ contract StaticHyVM {
     /// @return data Return data from delegate call
     function doDelegateCall(bytes calldata payload) public returns (bytes memory) {
         if (msg.sender != address(this)) revert OnlySelf();
+        if (hyvm.code.length == 0) revert AddressNotContract(hyvm);
 
         (bool success, bytes memory data) = hyvm.delegatecall(payload);
         if (!success) _bubbleError(data, "StaticHyVM: delegatecall failed");

diff --git a/test/StaticHyVM/StaticHyVM.t.sol b/test/StaticHyVM/StaticHyVM.t.sol
@@ -42,6 +42,14 @@ contract TestStaticHyVM is Test {
         staticHyvm.doDelegateCall("");
     }
 
+    function testCannotStaticExecIfHyVMNotContract() public {
+        // Sets the bytecode of the hyvm to be empty
+        // It will emulate the case where the address is not a contract
+        vm.etch(hyvm, bytes(""));
+        vm.expectRevert(abi.encodeWithSelector(StaticHyVM.AddressNotContract.selector, hyvm));
+        staticHyvm.staticExec(bytes(""));
+    }
+
     function testCannotStaticExecWriteFunction() public {
         bytecode = Utils.replaceSelectorBypassCalldataSizeCheck(bytecode, hex"c350518d");