Feature/909 proxy delegatecall

.circleci/config.yml

@@ -206,6 +206,7 @@ jobs:
             ./scripts/ci_check_if_test_should_run_v2.sh ${FILES_TO_CHECK}
       - run:
           name: test
+          no_output_timeout: 20m
           # Flaky tests - run them twice
           command: yarn --cwd packages/protocol test:coverage || yarn --cwd packages/protocol test:coverage
       - store_artifacts:

packages/protocol/contracts/common/Proxy.sol

@@ -88,6 +88,7 @@ contract Proxy {
     payable
     onlyOwner
   {
+    require(isContract(implementation), "Invalid contract address");
     _setImplementation(implementation);
     bool success;
     bytes memory returnValue;
@@ -138,4 +139,20 @@ contract Proxy {
     }
     emit OwnerSet(newOwner);
   }
+
+
+  /**
+   * @dev isContract detect whether the address is 
+   *      a contract address or externally owned account (EOA)
+   * WARNING: Calling this function from a constructor will return 0
+  *           independently if the address given as parameter is a contract or EOA
+   * @return true if it is a contract address
+   */
+  function isContract(address addr) public view returns (bool) {
+    uint size;
+    /* solium-disable-next-line security/no-inline-assembly */
+    assembly { size := extcodesize(addr) }
+    return size > 0;
+  }
+
 }

packages/protocol/test/common/proxy.ts

@@ -116,6 +116,13 @@ contract('Proxy', (accounts: string[]) => {
       assert.equal(events[0].event, 'ImplementationSet')
     })
 
+    it('should not allow to call a non contract address', async () =>
+      assertRevert(
+        proxy._setAndInitializeImplementation(accounts[1], initializeData(42), {
+          from: accounts[1],
+        })
+      ))
+
     it('should not allow a non-owner to set an implementation', async () =>
       assertRevert(
         proxy._setAndInitializeImplementation(hasInitializer.address, initializeData(42), {