{
setValue(e.target.value);
try {
- setAction((prev) => ({
- ...prev,
- value: BigInt(e.target.value),
- }));
+ const valueBN = BigInt(e.target.value);
+ if (valueBN < 0n) {
+ setErrors((e) => ({
+ ...e,
+ value: ProposalErrorCodes.NEGATIVE_AMOUNT,
+ }));
+ } else {
+ setAction((prev) => ({
+ ...prev,
+ value: valueBN,
+ }));
+ setErrors((e) => ({
+ ...e,
+ value: null,
+ }));
+ }
} catch (error) {
setErrors((e) => ({
...e,
@@ -194,11 +206,11 @@ export function CustomAction({
label="Enter ABI"
variant="black"
error={
- errors.ABI === ProposalErrorCodes.REQUIRED
+ errors?.ABI === ProposalErrorCodes.REQUIRED
? "ABI is required."
- : errors.ABI === ProposalErrorCodes.INVALID_ABI
+ : errors?.ABI === ProposalErrorCodes.INVALID_ABI
? "Invalid ABI"
- : errors.ABI
+ : errors?.ABI
}
id={`proposal-abi--${idx}`}
placeholder={JSON.stringify(
@@ -258,16 +270,16 @@ export function CustomAction({
}
/>
- {errors.functionSignature === ProposalErrorCodes.REQUIRED
+ {errors?.functionSignature === ProposalErrorCodes.REQUIRED
? "A Method Must Be chosen"
- : errors.functionSignature}
+ : errors?.functionSignature}
{abiItems?.inputs?.map((input, i) => {
return (
- {errors.target === ProposalErrorCodes.REQUIRED
+ {errors?.target === ProposalErrorCodes.REQUIRED
? "A Token Must Be Chosen"
- : errors.amount === ProposalErrorCodes.REQUIRED
+ : errors?.amount === ProposalErrorCodes.REQUIRED
? "Amount must be filled"
- : errors.amount === ProposalErrorCodes.INVALID_AMOUNT
+ : errors?.amount === ProposalErrorCodes.INVALID_AMOUNT
? "Invalid amount."
- : errors.amount}
+ : errors?.amount}
{warning && (
diff --git a/apps/hub/src/app/governance/types.ts b/apps/hub/src/app/governance/types.ts
index 20e0a44df..d469a94ef 100755
--- a/apps/hub/src/app/governance/types.ts
+++ b/apps/hub/src/app/governance/types.ts
@@ -41,7 +41,7 @@ export type CustomProposalActionErrors = {
isFriend?: null | ProposalErrorCodes;
to?: null | ProposalErrorCodes;
amount?: null | ProposalErrorCodes;
-};
+} | null;
export type CustomProposalErrors = {
title?: null | ProposalErrorCodes;
diff --git a/apps/hub/src/hooks/useCreateProposal.ts b/apps/hub/src/hooks/useCreateProposal.ts
index 90d96f901..d3c073379 100755
--- a/apps/hub/src/hooks/useCreateProposal.ts
+++ b/apps/hub/src/hooks/useCreateProposal.ts
@@ -54,6 +54,7 @@ interface CheckProposalField {
fieldOrType:
| "address"
| "abi"
+ | "string"
| "bool"
| `uint${string}`
| `int${string}`
@@ -83,7 +84,13 @@ export const checkProposalField: CheckProposalField = ({
baseUrl,
components,
}) => {
- if (required && !value) {
+ const notRequiredAbiTypes = ["bool", "string"];
+
+ if (
+ !notRequiredAbiTypes.includes(fieldOrType) &&
+ required &&
+ (value === undefined || value === null || value === "")
+ ) {
return ProposalErrorCodes.REQUIRED;
}
@@ -106,10 +113,16 @@ export const checkProposalField: CheckProposalField = ({
}
switch (fieldOrType) {
+ case "string":
+ if (value !== undefined && typeof value !== "string") {
+ return ProposalErrorCodes.INVALID_AMOUNT;
+ }
+ return null;
+
case "bool":
- // if (value !== "true" && value !== "false") {
- // return ProposalErrorCodes.INVALID_AMOUNT;
- // }
+ if (typeof value !== "boolean") {
+ return ProposalErrorCodes.INVALID_AMOUNT;
+ }
return null;
case "title":
@@ -291,114 +304,114 @@ export const useCreateProposal = ({
const actions: Address[] = [];
- e.actions = proposal.actions
- .map((action, idx): CustomProposalActionErrors => {
- const errors: CustomProposalActionErrors = {};
- errors.target = checkProposalField({
- fieldOrType: "address",
- value: action.target,
+ e.actions = proposal.actions.map((action, idx) => {
+ const errors: CustomProposalActionErrors = {};
+ errors.target = checkProposalField({
+ fieldOrType: "address",
+ value: action.target,
+ });
+
+ if (action.type === ProposalTypeEnum.CUSTOM_PROPOSAL) {
+ errors.ABI = checkProposalField({
+ fieldOrType: "abi",
+ value: action.ABI,
});
-
- if (action.type === ProposalTypeEnum.CUSTOM_PROPOSAL) {
- errors.ABI = checkProposalField({
- fieldOrType: "abi",
- value: action.ABI,
- });
- if (!action.functionSignature) {
- errors.functionSignature = ProposalErrorCodes.REQUIRED;
- } else {
- try {
- const parsedSignatureAbi = parseAbiItem(
- action.functionSignature,
+ if (!action.functionSignature) {
+ errors.functionSignature = ProposalErrorCodes.REQUIRED;
+ } else {
+ try {
+ const parsedSignatureAbi = parseAbiItem(action.functionSignature);
+ if (parsedSignatureAbi.type !== "function") {
+ console.error(
+ "parsedSignatureAbi is not a function",
+ parsedSignatureAbi,
);
- if (parsedSignatureAbi.type !== "function") {
- console.error(
- "parsedSignatureAbi is not a function",
- parsedSignatureAbi,
- );
-
- errors.functionSignature = ProposalErrorCodes.INVALID_ABI;
- } else {
- errors.calldata = parsedSignatureAbi.inputs.map(
- (input, index) => {
- try {
- if ("components" in input) {
- return checkProposalField({
- // @ts-expect-error this is not typed, will throw if not valid
- fieldOrType: input.type,
- value: action.calldata?.[index],
- components: input.components,
- });
- }
+ errors.functionSignature = ProposalErrorCodes.INVALID_ABI;
+ } else {
+ errors.calldata = parsedSignatureAbi.inputs.map(
+ (input, index) => {
+ try {
+ if ("components" in input) {
return checkProposalField({
// @ts-expect-error this is not typed, will throw if not valid
fieldOrType: input.type,
value: action.calldata?.[index],
+ components: input.components,
});
- } catch (error) {
- return null;
}
- },
- );
-
- actions[idx] = encodeFunctionData({
- abi: [parsedSignatureAbi],
- args: action.calldata,
- });
- }
- } catch (error) {
- errors.functionSignature = ProposalErrorCodes.INVALID_ABI;
+
+ return checkProposalField({
+ // @ts-expect-error this is not typed, will throw if not valid
+ fieldOrType: input.type,
+ value: action.calldata?.[index],
+ });
+ } catch (error) {
+ return null;
+ }
+ },
+ );
+
+ actions[idx] = encodeFunctionData({
+ abi: [parsedSignatureAbi],
+ args: action.calldata,
+ });
}
+ } catch (error) {
+ errors.functionSignature = ProposalErrorCodes.INVALID_ABI;
}
- } else if (
- action.type === ProposalTypeEnum.WHITELIST_REWARD_VAULT ||
- action.type === ProposalTypeEnum.BLACKLIST_REWARD_VAULT
- ) {
- errors.vault = checkProposalField({
- fieldOrType: "address",
- value: action.vault,
- });
- errors.isFriend = null; //checkProposalField("bool", action.isFriend);
- const whiteList =
- action.type === ProposalTypeEnum.WHITELIST_REWARD_VAULT
- ? true
- : false;
- if (!errors.vault) {
- actions[idx] = encodeFunctionData({
- abi: BERA_CHEF_ABI,
- functionName: "setVaultWhitelistedStatus",
- args: [action.vault!, whiteList, action.metadata ?? ""], // TODO: A third param was added for metadata. It is optional but we should include it in our action
- });
- }
- } else if (action.type === ProposalTypeEnum.ERC20_TRANSFER) {
- errors.amount = checkProposalField({
- fieldOrType: "uint256",
- value: action.amount,
+ }
+ } else if (
+ action.type === ProposalTypeEnum.WHITELIST_REWARD_VAULT ||
+ action.type === ProposalTypeEnum.BLACKLIST_REWARD_VAULT
+ ) {
+ errors.vault = checkProposalField({
+ fieldOrType: "address",
+ value: action.vault,
+ });
+ errors.isFriend = null; //checkProposalField("bool", action.isFriend);
+ const whiteList =
+ action.type === ProposalTypeEnum.WHITELIST_REWARD_VAULT
+ ? true
+ : false;
+ if (!errors.vault) {
+ actions[idx] = encodeFunctionData({
+ abi: BERA_CHEF_ABI,
+ functionName: "setVaultWhitelistedStatus",
+ args: [action.vault!, whiteList, action.metadata ?? ""], // TODO: A third param was added for metadata. It is optional but we should include it in our action
});
- errors.to = checkProposalField({
- fieldOrType: "address",
- value: action.to,
+ }
+ } else if (action.type === ProposalTypeEnum.ERC20_TRANSFER) {
+ errors.amount = checkProposalField({
+ fieldOrType: "uint256",
+ value: action.amount,
+ });
+ errors.to = checkProposalField({
+ fieldOrType: "address",
+ value: action.to,
+ });
+ if (!errors.amount && !errors.to) {
+ actions[idx] = encodeFunctionData({
+ abi: erc20Abi,
+ functionName: "transfer",
+ args: [action.to!, BigInt(action.amount!)],
});
- if (!errors.amount && !errors.to) {
- actions[idx] = encodeFunctionData({
- abi: erc20Abi,
- functionName: "transfer",
- args: [action.to!, BigInt(action.amount!)],
- });
- }
}
- return errors;
- })
- .filter((e) =>
- Object.values(e).some((v) => {
- if (Array.isArray(v)) {
- return v.filter((v) => v).length > 0;
- }
+ }
- return !!v;
- }),
- );
+ const hasErrors = Object.values(e).some((v) => {
+ if (Array.isArray(v)) {
+ return v.filter((v) => v).length > 0;
+ }
+
+ return !!v;
+ });
+
+ if (!hasErrors) {
+ return null;
+ }
+ return errors;
+ });
onError?.(e);
@@ -407,7 +420,11 @@ export const useCreateProposal = ({
.map((name) => e[name as keyof typeof e])
.some((v) => {
if (Array.isArray(v)) {
- return v.length > 0;
+ return v.filter((v) => v).length > 0;
+ }
+
+ if (v === null) {
+ return false;
}
return !!v;