Merge pull request #27 from OpenZeppelin/plat-5814-wizard-deploy-cons…

…tructor-inputs-not-reacting-to-stablecoin Fix: react to all types of assets and contract name changed
OpenZeppelin · Dec 12, 2024 · 6325203 · 6325203
2 parents 4547cd6 + d150007
commit 6325203
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/src/lib/models/deploy.ts b/src/lib/models/deploy.ts
@@ -78,3 +78,13 @@ export interface DeploymentResult {
   hash: string;
   sender?: string;
 }
+
+export type ABITypeParameter = 'uint' | 'uint[]' | 'int' | 'int[]' | 'address' | 'address[]' | 'bool' | 'bool[]' | 'fixed' | 'fixed[]' | 'ufixed' | 'ufixed[]' | 'bytes' | 'bytes[]' | 'function' | 'function[]' | 'tuple' | 'tuple[]' | string;
+export interface ABIParameter {
+  /** The name of the parameter */
+  name: string;
+  /** The canonical type of the parameter */
+  type: ABITypeParameter;
+  /** Used for tuple types */
+  components?: ABIParameter[];
+}
diff --git a/src/lib/wizard/components/Deploy.svelte b/src/lib/wizard/components/Deploy.svelte
@@ -2,7 +2,7 @@
   import { API } from "$lib/api";
   import { deployContract, switchToNetwork } from "$lib/ethereum";
   import type { ApprovalProcess, CreateApprovalProcessRequest } from "$lib/models/approval-process";
-  import type { Artifact, DeployContractRequest, DeploymentResult, UpdateDeploymentRequest } from "$lib/models/deploy";
+  import type { ABIParameter, Artifact, DeployContractRequest, DeploymentResult, UpdateDeploymentRequest } from "$lib/models/deploy";
   import { getNetworkLiteral, isProductionNetwork } from "$lib/models/network";
   import { buildCompilerInput, type ContractSources } from "$lib/models/solc";
   import type { APIResponse } from "$lib/models/ui";
@@ -43,11 +43,6 @@
     }
   });
 
-  let inputs = $derived.by(() => {
-    if (!compilationResult) return [];
-    return getConstructorInputsWizard(globalState.contract?.target, compilationResult.output.contracts);
-  });
-
   let displayUpgradeableWarning = $derived.by(() => {
     return isUpgradeable(globalState.contract?.source?.sources as ContractSources);
   });
@@ -66,6 +61,9 @@
     : undefined
   );
 
+
+  let inputs: ABIParameter[] = $state([]);
+
   $effect(() => {
     if (globalState.contract?.source?.sources) {
       compile();
@@ -92,6 +90,10 @@
       return;
     }
     compilationResult = res.data;
+
+    if (globalState.contract?.target && compilationResult) {
+      inputs = getConstructorInputsWizard(globalState.contract.target, compilationResult.output.contracts);
+    }
   }
 
   function displayMessage(message: string, type: "success" | "error") {
@@ -266,8 +268,8 @@
     const deployRequest: DeployContractRequest = {
       network: getNetworkLiteral(globalState.form.network),
       approvalProcessId: approvalProcess.approvalProcessId,
-      contractName: globalState.contract!.target,
-      contractPath:  globalState.contract!.target,
+      contractName: globalState.contract.target,
+      contractPath:  globalState.contract.target,
       verifySourceCode: true,
       licenseType: 'MIT',
       artifactPayload: JSON.stringify(deploymentArtifact),
@@ -310,19 +312,18 @@
 </script>
 
 <div class="flex flex-col gap-2">
-
   {#if displayUpgradeableWarning}
     <Message type="warn" message="Upgradable contracts are not yet fully supported. This action will only deploy the implementation contract without initializing. <br />We recommend using <u><a href='https://github.com/OpenZeppelin/openzeppelin-upgrades' target='_blank'>openzeppelin-upgrades</a></u> package instead." />
   {/if}
 
   {#if inputs.length > 0}
-  <h6 class="text-sm">Constructor Arguments</h6>
-  {#each inputs as input}
-    <Input name={input.name} placeholder={`${input.name} (${input.type})`} onchange={handleInputChange} value={''} type="text"/>
-  {/each}
-{:else}
-  <Message type="info" message="No constructor arguments found" />
-{/if}
+    <h6 class="text-sm">Constructor Arguments</h6>
+    {#each inputs as input}
+      <Input name={input.name} placeholder={`${input.name} (${input.type})`} onchange={handleInputChange} value={''} type="text"/>
+    {/each}
+  {:else}
+    <Message type="info" message="No constructor arguments found" />
+  {/if}
 
   <div class="pt-2 flex">
     <input 
@@ -351,8 +352,6 @@
     <Message message={compilationError} type="error" />
   {/if}
 
-
-
   <Button disabled={!globalState.authenticated || busy} loading={busy} label="Deploy" onClick={triggerDeploy} />
 
   {#if successMessage || errorMessage}