revert on create2 failure in ProxyFactory proxy creation methods. Issue

#3392
OriginProtocol · Sep 20, 2019 · 674b1ce · 674b1ce
1 parent 3867b3b
commit 674b1ce
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/packages/contracts/contracts/proxy/ProxyFactory.s b/packages/contracts/contracts/proxy/ProxyFactory.s
@@ -49,6 +49,12 @@ contract ProxyFactory {
         assembly {
             proxy := create2(0x0, add(0x20, deploymentData), mload(deploymentData), salt)
         }
+
+        // create2 failed
+        if (proxy == address(0)) {
+            revert("proxy-deploy-failed");
+        }
+
         if (initializer.length > 0)
             // solium-disable-next-line security/no-inline-assembly
             assembly {
@@ -73,6 +79,12 @@ contract ProxyFactory {
         assembly {
             proxy := create2(0x0, add(0x20, deploymentData), mload(deploymentData), salt)
         }
+
+        // create2 failed
+        if (proxy == address(0)) {
+            revert("proxy-deploy-failed");
+        }
+
         if (initializer.length > 0) {
             uint256 value = msg.value;
             // solium-disable-next-line security/no-inline-assembly