chore: fixed the SDK tests, minor tweaks

Author: jaybuidl

kleros-sdk/test/dataMappings.test.ts

@@ -174,6 +174,7 @@ describe("full flow test", () => {
         { title: "Yes", description: "User is responsible", id: "0x01" },
         { title: "No", description: "User is not responsible", id: "0x02" },
       ],
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
       details: {
         ruling: "{{ruling}}",
         tied: "{{tied}}",
@@ -182,6 +183,9 @@ describe("full flow test", () => {
         toAddress: "{{toAddress}}",
         transferValue: "{{transferValue}}",
       },
+      arbitratorChainID: "421613",
+      arbitratorAddress: "0x0987654321098765432109876543210987654321",
+      version: "1.0",
     });
 
     const initialContext = { alchemyApiKey: "mocked_api_key" };
@@ -199,6 +203,7 @@ describe("full flow test", () => {
         { title: "Yes", description: "User is responsible", id: "0x01" },
         { title: "No", description: "User is not responsible", id: "0x02" },
       ],
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
       details: {
         ruling: "1",
         tied: "false",
@@ -207,6 +212,9 @@ describe("full flow test", () => {
         toAddress: "0x0987654321098765432109876543210987654321",
         transferValue: "100",
       },
+      arbitratorChainID: "421613",
+      arbitratorAddress: "0x0987654321098765432109876543210987654321",
+      version: "1.0",
     });
   });
 });
@@ -345,10 +353,7 @@ describe("populateTemplate", () => {
           reserved: false,
         },
       ],
-      policyURI: "https://example.com/policy",
-      frontendUrl: "https://example.com",
-      arbitrableChainID: "100",
-      arbitrableAddress: "0x1234567890123456789012345678901234567890",
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
       arbitratorChainID: "421613",
       arbitratorAddress: "0x0987654321098765432109876543210987654321",
       category: "General",
@@ -376,10 +381,7 @@ describe("populateTemplate", () => {
           reserved: false,
         },
       ],
-      policyURI: "https://example.com/policy",
-      frontendUrl: "https://example.com",
-      arbitrableChainID: "100",
-      arbitrableAddress: "0x1234567890123456789012345678901234567890",
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
       arbitratorChainID: "421613",
       arbitratorAddress: "0x0987654321098765432109876543210987654321",
       category: "General",
@@ -394,6 +396,22 @@ describe("populateTemplate", () => {
       title: "Test Title",
       description: "Test Description",
       question: "{{missingQuestion}}",
+      type: "single-select",
+      answers: [
+        {
+          title: "Yes",
+          description: "Affirmative",
+          id: "0x01",
+          reserved: false,
+        },
+      ],
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
+      arbitratorChainID: "421613",
+      arbitratorAddress: "0x0987654321098765432109876543210987654321",
+      category: "General",
+      lang: "en_US",
+      specification: "Spec",
+      version: "1.0",
     });
 
     const data = {
@@ -406,6 +424,22 @@ describe("populateTemplate", () => {
       title: "Test Title",
       description: "Test Description",
       question: "",
+      type: "single-select",
+      answers: [
+        {
+          title: "Yes",
+          description: "Affirmative",
+          id: "0x01",
+          reserved: false,
+        },
+      ],
+      policyURI: "/ipfs/QmUnPyGi31RoF4DRR8vT3u13YsppxtsbBKbdQAbcP8be4M/file.json",
+      arbitratorChainID: "421613",
+      arbitratorAddress: "0x0987654321098765432109876543210987654321",
+      category: "General",
+      lang: "en_US",
+      specification: "Spec",
+      version: "1.0",
     });
   });
 

subgraph/core/src/entities/Dispute.ts

@@ -32,27 +32,24 @@ export function createDisputeFromEvent(event: DisputeCreation): void {
   updateDisputeRequestData(event);
 }
 
+// source: contracts/src/arbitration/interfaces/IArbitrableV2.sol
 const DisputeRequest = "DisputeRequest(address,uint256,uint256,uint256,string)";
-
 const DisputeRequestSignature = crypto.keccak256(ByteArray.fromUTF8(DisputeRequest));
 
 // note : we are using bytes32 in place of string as strings cannot be decoded and it breaks the function.
-// It is okay for us, as we are interested in the uint256 in front
-// _externalDisputeId,_templateId,_tenplateUri
-const DisputeRequestTypestring = "(uint256,uint256,bytes32)";
+// It is okay for us, as we are only interested in the uint256 in frontend.
+const DisputeRequestTypestring = "(uint256,uint256,bytes32)"; // _externalDisputeId,_templateId,_templateUri
 
+// source: contracts/src/gateway/interfaces/IHomeGateway.sol
 const CrossChainDisputeIncoming =
   "CrossChainDisputeIncoming(address,uint256,address,uint256,uint256,uint256,uint256,string)";
-
 const CrossChainDisputeIncomingSignature = crypto.keccak256(ByteArray.fromUTF8(CrossChainDisputeIncoming));
 
-// arbitrator, _arbitrableChainId, _externalDisputeId, _templateId, _templateUri
 // note : arbitrable is an indexed arg, so it will topic[1]
-const CrossChainDisputeIncomingTypestring = "(address,uint256,uint256,uint256,string)";
+const CrossChainDisputeIncomingTypestring = "(address,uint256,uint256,uint256,string)"; // arbitrator, _arbitrableChainId, _externalDisputeId, _templateId, _templateUri
 
 export const updateDisputeRequestData = (event: DisputeCreation): void => {
   const dispute = Dispute.load(event.params._disputeID.toString());
-
   if (!dispute) return;
 
   const receipt = event.receipt;
@@ -62,16 +59,13 @@ export const updateDisputeRequestData = (event: DisputeCreation): void => {
 
   // note that the topic at 0th index is always the event signature
   const disputeRequestEventIndex = logs.findIndex((log) => log.topics[0] == DisputeRequestSignature);
-
   const crossChainDisputeEventIndex = logs.findIndex((log) => log.topics[0] == CrossChainDisputeIncomingSignature);
 
   if (crossChainDisputeEventIndex !== -1) {
     const crossChainDisputeEvent = logs[crossChainDisputeEventIndex];
 
     const decoded = ethereum.decode(CrossChainDisputeIncomingTypestring, crossChainDisputeEvent.data);
-
     if (!decoded) return;
-
     dispute.isCrossChain = true;
     dispute.arbitrableChainId = decoded.toTuple()[1].toBigInt();
     dispute.externalDisputeId = decoded.toTuple()[2].toBigInt();
@@ -84,16 +78,17 @@ export const updateDisputeRequestData = (event: DisputeCreation): void => {
     const decoded = ethereum.decode(DisputeRequestTypestring, disputeRequestEvent.data);
     if (!decoded) return;
     dispute.isCrossChain = false;
-    dispute.arbitrableChainId = getChainId(dataSource.network());
+    dispute.arbitrableChainId = getHomeChainId(dataSource.network());
     dispute.externalDisputeId = decoded.toTuple()[0].toBigInt();
     dispute.templateId = decoded.toTuple()[1].toBigInt();
     dispute.save();
     return;
   }
 };
 
-// workaround, since hashmap don't work in subgraphs
-function getChainId(name: string): BigInt {
+// workaround, since hashmap don't work in subgraphs.
+// https://thegraph.com/docs/en/developing/supported-networks/
+function getHomeChainId(name: string): BigInt {
   if (name == "arbitrum-one") return BigInt.fromI32(42161);
   else if (name == "arbitrum-sepolia") return BigInt.fromI32(421614);
   else return BigInt.fromI32(1);

web/src/context/Web3Provider.tsx

@@ -38,10 +38,9 @@ export const getDefaultChainRpcUrl = (protocol: AlchemyProtocol) => {
   return getChainRpcUrl(protocol, DEFAULT_CHAIN);
 };
 
-const alchemyTransport = (chain: Chain) =>
-  fallback([http(alchemyURL("https", chain.id)), webSocket(alchemyURL("wss", chain.id))]);
-
 export const getTransports = () => {
+  const alchemyTransport = (chain: Chain) =>
+    fallback([http(alchemyURL("https", chain.id)), webSocket(alchemyURL("wss", chain.id))]);
   const defaultTransport = (chain: Chain) =>
     fallback([http(chain.rpcUrls.default?.http?.[0]), webSocket(chain.rpcUrls.default?.webSocket?.[0])]);
 
@@ -68,7 +67,7 @@ const wagmiConfig = createConfig({
 configureSDK({
   client: {
     chain: isProduction ? arbitrum : arbitrumSepolia,
-    transport: isProduction ? alchemyTransport(arbitrum) : alchemyTransport(arbitrumSepolia),
+    transport: transports[isProduction ? arbitrum.id : arbitrumSepolia.id],
   },
 });