Merge pull request #20 from OpenZeppelin/main

Release to wizard

Author: MCarlomagno

src/lib/models/deploy.ts

@@ -70,4 +70,11 @@ export interface UpdateDeploymentRequest {
   deploymentId: string;
   address: string;
   hash: string;
-}
+}
+
+export interface DeploymentResult {
+  deploymentId?: string;
+  address: string;
+  hash: string;
+  sender?: string;
+}

src/lib/state/state.svelte.ts

@@ -1,6 +1,6 @@
 import type { ApprovalProcess } from "$lib/models/approval-process";
 import type { GlobalState } from "$lib/models/ui";
-import type { ContractSources } from "$lib/models/solc";
+import { isDeploymentEnvironment, isSameNetwork } from "$lib/utils/helpers";
 
 /**
  * Global application state
@@ -84,3 +84,13 @@ export const addAPToDropdown = (approvalProcess: ApprovalProcess) => {
 export function setDeploymentCompleted(completed: boolean) {
   globalState.form.completed = completed;
 }
+
+export function findDeploymentEnvironment(via?: string, network?: string) {
+  if (!via || !network) return undefined;
+  return globalState.approvalProcesses.find((ap) => 
+    ap.network &&
+    isDeploymentEnvironment(ap) &&
+    isSameNetwork(ap.network, network) &&
+    ap.via?.toLocaleLowerCase() === via.toLocaleLowerCase()
+  );
+}

src/lib/utils/contracts.ts

@@ -1,6 +1,7 @@
 import type { ABIDescription, ABIParameter, CompilationResult } from "@remixproject/plugin-api";
 import { AbiCoder } from "ethers";
 import { attempt } from "./attempt";
+import type { Artifact } from "$lib/models/deploy";
 
 export function getContractFeatures(
   path: string,
@@ -28,6 +29,23 @@ export function getConstructorInputs(
   return constructor.inputs as ABIParameter[];
 }
 
+export function getConstructorInputsWizard(
+  path: string | undefined,
+  contracts: Artifact['output']['contracts'],
+): ABIParameter[] {
+  // if no compiled contracts found, then return empty inputs.
+  if (!contracts || !path) return [];
+
+  const contractName =
+  Object.keys(contracts[path]).length > 0
+    ? Object.keys(contracts[path])[0]
+    : "";
+  const abi: Array<ABIDescription> = contracts[path][contractName].abi;
+  const constructor = abi.find((fragment) => fragment.type === "constructor");
+  if (!constructor || !constructor.inputs) return [];
+  return constructor.inputs as ABIParameter[];
+}
+
 export async function encodeConstructorArgs(
   inputs: ABIParameter[],
   inputsWithValue: Record<string, string | number | boolean>

src/lib/utils/helpers.ts

@@ -1,5 +1,6 @@
 import type { ApprovalProcess } from "$lib/models/approval-process";
 import { getNetworkLiteral, type TenantNetworkResponse } from "$lib/models/network";
+import type { ContractSources } from "$lib/models/solc";
 
 export const abbreviateAddress = (address: string, size = 6) => {
   return `${address.slice(0, size)}...${address.slice(-size)}`;
@@ -14,3 +15,14 @@ export const isSameNetwork = (a: string | TenantNetworkResponse, b: string | Ten
 export const isDeploymentEnvironment = (approvalProcess: ApprovalProcess) => {
   return approvalProcess.component?.includes('deploy');
 }
+
+export const isMultisig = (viaType?: ApprovalProcess['viaType']) => {
+  if (!viaType) return false;
+  const multisigTypes = ['Safe', 'Multisig', 'Gnosis Safe', 'Gnosis Multisig'];
+  return multisigTypes.includes(viaType);
+}
+
+export const isUpgradeable = (sources?: ContractSources) => {
+  if (!sources) return false;
+  return Object.keys(sources).some((path) => path.includes('@openzeppelin/contracts-upgradeable'));
+}

src/lib/wizard/components/ApprovalProcess.svelte

@@ -7,6 +7,7 @@
   import type { Relayer } from "$lib/models/relayer";
   import { getNetworkLiteral } from "$lib/models/network";
   import Input from "./shared/Input.svelte";
+  import Message from "./shared/Message.svelte";
 
   let address = $state<string>(globalState.form.approvalProcessToCreate?.via || "");
 
@@ -167,11 +168,8 @@
     </div>
   {:else if approvalProcessType === "Relayer"}
     {#if disableRelayers}
-      <div class="alert alert-warning d-flex align-items-center mt-2">
-        <i class="fa fa-exclamation-triangle mr-2"></i>
-        <p class="m-0 lh-1">
-          <small class="lh-sm">API Key not allowed to manage Relayers</small>
-        </p>
+      <div class="mt-2">
+        <Message message="API Key not allowed to manage Relayers" type="warn" />
       </div>
     {:else}
       <Dropdown