change Ref to DynamicParams, add decodedBytes setting

kumaryash90 · kumaryash90 · commit a0bd7ef14d0a · 2024-11-13T21:53:32.000+05:30
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
@@ -71,7 +71,7 @@ type CustomContractDeploymentFormData = {
   deployDeterministic: boolean;
   saltForCreate2: string;
   signerAsSalt: boolean;
-  deployParams: Record<string, string | ContractRef>;
+  deployParams: Record<string, string | DynamicValue>;
   moduleData: Record<string, Record<string, string>>;
   contractMetadata?: {
     name: string;
@@ -82,12 +82,15 @@ type CustomContractDeploymentFormData = {
   recipients?: Recipient[];
 };
 
-interface ContractRef {
-  ref: {
-    publisherAddress: string;
-    version: string;
-    contractId: string;
-  }[];
+interface DynamicValue {
+  dynamicValue: {
+    type: string;
+    refContracts?: {
+      publisherAddress: string;
+      version: string;
+      contractId: string;
+    }[];
+  };
 }
 
 export type CustomContractDeploymentForm =
@@ -219,14 +222,15 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           }
 
           // specify refs if present
-          const ref = metadata?.constructorParams?.[param.name]?.ref;
-          if (ref && acc[param.name] === "") {
-            acc[param.name] = { ref };
+          const dynamicValue =
+            metadata?.constructorParams?.[param.name]?.dynamicValue;
+          if (dynamicValue && acc[param.name] === "") {
+            acc[param.name] = { dynamicValue };
           }
 
           return acc;
         },
-        {} as Record<string, string | ContractRef>,
+        {} as Record<string, string | DynamicValue>,
       ),
     }),
     [deployParams, metadata?.constructorParams, activeAccount, walletChain?.id],
@@ -374,7 +378,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           if (
             shouldHide(paramKey) ||
             !extraMetadataParam?.hidden ||
-            extraMetadataParam?.ref
+            extraMetadataParam?.dynamicValue
           ) {
             return null;
           }
@@ -776,7 +780,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
                   if (
                     shouldHide(paramKey) ||
                     extraMetadataParam?.hidden ||
-                    extraMetadataParam?.ref
+                    extraMetadataParam?.dynamicValue
                   ) {
                     return null;
                   }
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/contract-params-fieldset.tsx
@@ -49,7 +49,7 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
       // Clear values accordingly when toggling between input types
       if (updated[index]) {
         form.setValue(
-          `constructorParams.${deployParams[index]?.name || "*"}.ref.refType`,
+          `constructorParams.${deployParams[index]?.name || "*"}.dynamicValue.type`,
           deployParams[index]?.type,
         );
 
@@ -62,11 +62,11 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
         );
       } else {
         form.setValue(
-          `constructorParams.${deployParams[index]?.name || "*"}.ref.refType`,
+          `constructorParams.${deployParams[index]?.name || "*"}.dynamicValue.type`,
           "",
         );
         form.setValue(
-          `constructorParams.${deployParams[index]?.name || "*"}.ref`,
+          `constructorParams.${deployParams[index]?.name || "*"}.dynamicValue`,
           "",
           {
             shouldDirty: true,
@@ -180,12 +180,14 @@ export const ContractParamsFieldset: React.FC<ContractParamsFieldsetProps> = ({
                         )}
 
                         {(param.type === "address" ||
-                          param.type === "address[]") && (
+                          param.type === "address[]" ||
+                          param.type === "bytes" ||
+                          param.type === "bytes[]") && (
                           <Checkbox
                             isChecked={isCustomInputEnabled[idx]}
                             onChange={() => handleToggleCustomInput(idx)}
                           >
-                            Use Custom Input
+                            Use Dynamic Input
                           </Checkbox>
                         )}
                       </Flex>
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/impl-params-fieldset.tsx
@@ -45,7 +45,7 @@ export const ImplementationParamsFieldset: React.FC<
       // Clear or set values accordingly when toggling between input types
       if (updated[index]) {
         form.setValue(
-          `implConstructorParams.${implParams[index]?.name || "*"}.ref.refType`,
+          `implConstructorParams.${implParams[index]?.name || "*"}.dynamicValue.type`,
           implParams[index]?.type,
         );
         form.setValue(
@@ -57,11 +57,11 @@ export const ImplementationParamsFieldset: React.FC<
         );
       } else {
         form.setValue(
-          `implConstructorParams.${implParams[index]?.name || "*"}.ref.refType`,
+          `implConstructorParams.${implParams[index]?.name || "*"}.dynamicValue.type`,
           "",
         );
         form.setValue(
-          `implConstructorParams.${implParams[index]?.name || "*"}.ref`,
+          `implConstructorParams.${implParams[index]?.name || "*"}.dynamicValue`,
           "",
           {
             shouldDirty: true,
@@ -116,9 +116,7 @@ export const ImplementationParamsFieldset: React.FC<
                         {!isCustomInputEnabled[idx] ? (
                           <>
                             <SolidityInput
-                              solidityType={
-                                param.type === "address" ? "string" : param.type
-                              }
+                              solidityType={param.type}
                               placeholder={
                                 isMobile ||
                                 paramTemplateValues?.[0]?.value ===
@@ -137,7 +135,10 @@ export const ImplementationParamsFieldset: React.FC<
                           <RefInputImplFieldset param={param} />
                         )}
 
-                        {param.type === "address" && (
+                        {(param.type === "address" ||
+                          param.type === "address[]" ||
+                          param.type === "bytes" ||
+                          param.type === "bytes[]") && (
                           <Checkbox
                             isChecked={isCustomInputEnabled[idx]}
                             onChange={() => handleToggleCustomInput(idx)}
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-fieldset.tsx
@@ -15,7 +15,7 @@ export const RefInputFieldset: React.FC<RefInputFieldsetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `constructorParams.${param.name ? param.name : "*"}.ref.contracts`,
+    name: `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
     control: form.control,
   });
 
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-impl-fieldset.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-impl-fieldset.tsx
@@ -15,7 +15,7 @@ export const RefInputImplFieldset: React.FC<RefInputImplFieldsetProps> = ({
   const form = useFormContext();
 
   const { fields, append, remove } = useFieldArray({
-    name: `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts`,
+    name: `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts`,
     control: form.control,
   });
 
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-impl.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input-impl.tsx
@@ -29,16 +29,16 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
 
   const publishedContractsQuery = usePublishedContractsQuery(
     form.watch(
-      `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+      `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
   );
 
   const allVersions = useAllVersions(
     form.watch(
-      `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+      `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
     form.watch(
-      `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.contractId`,
+      `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
     ),
   );
 
@@ -55,7 +55,7 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
           gap={1}
           isInvalid={
             !!form.getFieldState(
-              `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+              `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
               form.formState,
             ).error
           }
@@ -64,7 +64,7 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
           <Input
             placeholder="Address or ENS"
             {...form.register(
-              `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+              `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
             )}
           />
         </FormControl>
@@ -80,7 +80,7 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
             <Select
               isDisabled={(publishedContractsQuery?.data || []).length === 0}
               {...form.register(
-                `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.contractId`,
+                `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
               )}
               placeholder={
                 publishedContractsQuery.isFetched &&
@@ -108,7 +108,7 @@ export const RefContractImplInput: React.FC<RefContractImplInputProps> = ({
               w="full"
               isDisabled={!allVersions.data}
               {...form.register(
-                `implConstructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.version`,
+                `implConstructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.version`,
               )}
               borderRadius="lg"
             >
diff --git a/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input.tsx b/apps/dashboard/src/components/contract-components/contract-publish-form/ref-input.tsx
@@ -29,16 +29,16 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
 
   const publishedContractsQuery = usePublishedContractsQuery(
     form.watch(
-      `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+      `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
   );
 
   const allVersions = useAllVersions(
     form.watch(
-      `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+      `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
     ),
     form.watch(
-      `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.contractId`,
+      `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
     ),
   );
 
@@ -55,7 +55,7 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
           gap={1}
           isInvalid={
             !!form.getFieldState(
-              `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+              `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
               form.formState,
             ).error
           }
@@ -64,7 +64,7 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
           <Input
             placeholder="Address or ENS"
             {...form.register(
-              `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.publisherAddress`,
+              `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.publisherAddress`,
             )}
           />
         </FormControl>
@@ -80,7 +80,7 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
             <Select
               isDisabled={(publishedContractsQuery?.data || []).length === 0}
               {...form.register(
-                `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.contractId`,
+                `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.contractId`,
               )}
               placeholder={
                 publishedContractsQuery.isFetched &&
@@ -108,7 +108,7 @@ export const RefContractInput: React.FC<RefContractInputProps> = ({
               w="full"
               isDisabled={!allVersions.data}
               {...form.register(
-                `constructorParams.${param.name ? param.name : "*"}.ref.contracts.${index}.version`,
+                `constructorParams.${param.name ? param.name : "*"}.dynamicValue.refContracts.${index}.version`,
               )}
               borderRadius="lg"
             >
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts
@@ -129,9 +129,9 @@ export type DeployContractfromDeployMetadataOptions = {
   salt?: string;
 };
 
-interface Ref {
-  refType: "address" | "address[]";
-  contracts: {
+interface DynamicParams {
+  type: "address" | "address[]" | "bytes" | "bytes[]";
+  refContracts: {
     publisherAddress: string;
     version: string;
     contractId: string;
@@ -140,7 +140,7 @@ interface Ref {
 
 interface ImplementationConstructorParam {
   defaultValue?: string;
-  ref?: Ref;
+  dynamicValue?: DynamicParams;
 }
 
 type ProcessRefDeploymentsOptions = {
@@ -164,11 +164,11 @@ async function processRefDeployments(
       return paramValue.defaultValue;
     }
 
-    if ("ref" in paramValue && paramValue.ref) {
-      const ref = paramValue.ref;
-      const contracts = ref.contracts;
+    if ("dynamicValue" in paramValue && paramValue.dynamicValue) {
+      const dynamicValue = paramValue.dynamicValue;
+      const contracts = dynamicValue.refContracts;
 
-      if (ref.refType === "address") {
+      if (dynamicValue.type === "address") {
         // Call the fetchAndDeployContract function with the ref data
         const addr = await deployPublishedContract({
           client,
@@ -182,7 +182,7 @@ async function processRefDeployments(
         return addr;
       }
 
-      if (ref.refType === "address[]") {
+      if (dynamicValue.type === "address[]") {
         const addressArray = [];
 
         for (const c of contracts) {
diff --git a/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts b/packages/thirdweb/src/utils/any-evm/deploy-metadata.ts
@@ -159,13 +159,26 @@ type ParsedCompilerMetadata = {
   zk_version?: string;
 };
 
-type Ref = {
-  refType: "address" | "address[]";
-  contracts: Array<{
+type DynamicParams = {
+  type: "address" | "address[]" | "bytes" | "bytes[]";
+
+  // use for address types
+  refContracts?: Array<{
     contractId: string;
     publisherAddress: string;
     version: string;
   }>;
+
+  // use for bytes
+  decodedBytes?: Array<
+    Record<
+      string,
+      {
+        defaultValue?: string;
+        dynamicValue?: DynamicParams; // can have address type which may need ref
+      }
+    >
+  >;
 };
 
 export type CompilerMetadata = Prettify<
@@ -229,14 +242,14 @@ export type ExtendedMetadata = {
       description?: string;
       defaultValue?: string;
       hidden?: boolean;
-      ref?: Ref;
+      dynamicValue?: DynamicParams;
     }
   >;
   implConstructorParams?: Record<
     string,
     {
       defaultValue?: string;
-      ref?: Ref;
+      dynamicValue?: DynamicParams;
     }
   >;
   compositeAbi?: Abi;
