Skip to content

Commit 6c28d00

Browse files
committed
fix: adjust dispute template validation, pass arbitrableaddress as context to data mappings
1 parent f3981d7 commit 6c28d00

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

kleros-sdk/src/dataMappings/executeActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export const executeAction = async (mapping: ActionMapping, context = {}) => {
3131
return await fetchIpfsJsonAction(validateFetchIpfsJsonMapping(mapping));
3232
case "reality":
3333
mapping = validateRealityMapping(mapping);
34-
return await retrieveRealityData(mapping.realityQuestionID, context.arbitrable);
34+
return await retrieveRealityData(mapping.realityQuestionID, context.arbitrableAddress);
3535
default:
3636
throw new Error(`Unsupported action type: ${mapping.type}`);
3737
}

kleros-sdk/src/dataMappings/utils/disputeDetailsSchema.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,11 @@ const DisputeDetailsSchema = z.object({
5555
answers: z.array(AnswerSchema),
5656
policyURI: z.string(),
5757
attachment: AttachmentSchema.optional(),
58-
frontendUrl: z.string(),
58+
frontendUrl: z.string().optional(),
5959
metadata: MetadataSchema.optional(),
60-
arbitrableChainID: z.string(),
61-
arbitrableAddress: z.string(), // should be changed for ethAddressSchema eventually
6260
arbitratorChainID: z.string(),
63-
arbitratorAddress: z.string(), // should be changed for ethAddressSchema eventually
64-
category: z.string(),
61+
arbitratorAddress: z.string(), // should be changed for ethAddressSchema eventually, but some
62+
category: z.string().optional(),
6563
lang: z.string().optional(),
6664
specification: z.string().optional(),
6765
aliases: AliasSchema.optional(),

web/src/hooks/queries/usePopulatedDisputeData.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
4747
if (isEnabled && !isError) {
4848
try {
4949
const { isCrossChainDispute, crossChainTemplateId } = crossChainData;
50+
console.log({ crossChainData }); //crosschaindata's chainId is 0 here 🤔
5051

5152
const templateId = isCrossChainDispute
5253
? crossChainTemplateId
@@ -64,7 +65,8 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
6465

6566
const initialContext = {
6667
disputeID: disputeID,
67-
arbitrable: arbitrableAddress,
68+
arbitrableAddress: arbitrableAddress,
69+
arbitrableChainID: "whereDoWeGetThisValueFrom?",
6870
graphApiKey: import.meta.env.REACT_APP_GRAPH_API_KEY,
6971
externalDisputeID: externalDisputeID,
7072
};

web/src/pages/DisputeTemplateView/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ const DisputeTemplateView = () => {
166166

167167
setTimeout(() => {
168168
const initialContext = {
169-
arbitrator: debouncedParams._arbitrator,
170-
arbitrable: debouncedParams._arbitrable,
169+
arbitratorAddress: debouncedParams._arbitrator,
170+
arbitrableAddress: debouncedParams._arbitrable,
171171
arbitrableDisputeID: debouncedParams._arbitrableDisputeID,
172172
externalDisputeID: debouncedParams._externalDisputeID,
173173
templateID: debouncedParams._templateId,

0 commit comments

Comments
 (0)