Merge pull request #10 from OpenZeppelin/enforce-deterministic-when-multisig

Enforce deterministic deployment when using multisig

Author: MCarlomagno

src/lib/components/ApprovalProcess.svelte

@@ -5,6 +5,7 @@
   import { approvalProcessTypes, type ApprovalProcess, type ApprovalProcessType } from "$lib/models/approval-process";
   import type {  DropdownItem, GlobalState } from "$lib/models/ui";
   import type { Relayer } from "$lib/models/relayer";
+  import { getNetworkLiteral } from "$lib/models/network";
 
   function approvalProcessByNetworkAndComponent(ap: ApprovalProcess) {
     const networkName = typeof globalState.form.network === 'string' 
@@ -58,6 +59,7 @@
         viaType: "Relayer",
         via: relayer.value.address,
         relayerId: relayer.value.relayerId,
+        network: globalState.form.network && getNetworkLiteral(globalState.form.network),
       };
     }
   };
@@ -69,6 +71,7 @@
     globalState.form.approvalProcessToCreate = {
       viaType: approvalProcessType as "EOA" | "Safe" | "Relayer",
       via: element.value,
+      network: globalState.form.network && getNetworkLiteral(globalState.form.network),
     };
   };
 

src/lib/components/Deploy.svelte

@@ -65,6 +65,12 @@
     return { path, name };
   });
 
+  let enforceDeterministic = $derived.by(() => {
+    const selectedMultisig = globalState.form.approvalType === 'existing' && globalState.form.approvalProcessSelected?.viaType === "Safe";
+    const toCreateMultisig = globalState.form.approvalType === 'new' && globalState.form.approvalProcessToCreate?.viaType === "Safe";
+    return selectedMultisig || toCreateMultisig;
+  });
+
   $effect(() => {
     contractPath = contractInfo.path;
     contractName = contractInfo.name;
@@ -231,6 +237,12 @@
     setDeploymentCompleted(false);
     deploying = true;
 
+    if ((enforceDeterministic || isDeterministic) && !salt) {
+      logError("[Defender Deploy] Salt is required for deterministic deployments.");
+      deploying = false;
+      return;
+    }
+
     const [constructorBytecode, constructorError] = await encodeConstructorArgs(inputs, inputsWithValue);
     if (constructorError) {
       logError(`[Defender Deploy] Error encoding constructor arguments: ${constructorError.msg}`);
@@ -350,17 +362,21 @@
       class="form-check-input" 
       type="checkbox" 
       id="isDeterministic" 
-      checked={isDeterministic} 
+      checked={isDeterministic || enforceDeterministic} 
       onchange={() => (isDeterministic = !isDeterministic)}
+      disabled={enforceDeterministic}
     >
     <label class="form-check-label" for="isDeterministic">
       Deterministic
     </label>
+    {#if enforceDeterministic}
+      <i class="fa fa-question-circle ml-2" title="When using a Safe as the approval process, the salt is required to be deterministic."></i>
+    {/if}
   </div>
 </div>
 
 
-{#if isDeterministic}
+{#if isDeterministic || enforceDeterministic}
   <label for="salt">{`Salt`}</label>
   <input
     name="salt"