feat: validate policies

kleros · Jan 11, 2019 · 71c0445 · 71c0445
1 parent 9b717a9
commit 71c0445
Show file tree

Hide file tree

Showing 12 changed files with 452 additions and 978 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
 REACT_APP_KLEROS_LIQUID_KOVAN_ADDRESS=0x8847c0947a613c3de443f73351c3815ad0d37f98
 REACT_APP_PINAKION_KOVAN_ADDRESS=0x1ee318dbc19267dbce08f54a66ab198f73ede356
-REACT_APP_POLICY_REGISTRY_KOVAN_ADDRESS=0x55aa06760990a6418a89d2177de367fe1cb5c3cb
+REACT_APP_POLICY_REGISTRY_KOVAN_ADDRESS=0xfc53d1d6ddc2c6cdd403cb7dbf0f26140d82e12d
 REACT_APP_WEB3_FALLBACK_URL=wss://mainnet.infura.io/ws
diff --git a/src/assets/contracts/policy-registry.json b/src/assets/contracts/policy-registry.json
diff --git a/src/assets/policies/0.json → ...GNbcKeCnkneHvyBwmsfwF7QZAuuQLrh3dqc4.json b/src/assets/policies/0.json → ...GNbcKeCnkneHvyBwmsfwF7QZAuuQLrh3dqc4.json
diff --git a/src/assets/policies/1.json → ...NebDnQ6Z32Ycw7ZyjQ3Tp8KYSMzjg2Uskxgm.json b/src/assets/policies/1.json → ...NebDnQ6Z32Ycw7ZyjQ3Tp8KYSMzjg2Uskxgm.json
diff --git a/src/assets/policies/2.json → ...SwkcGZvkTMFRpqvW2bxKDfNL2jHCnknrjGdW.json b/src/assets/policies/2.json → ...SwkcGZvkTMFRpqvW2bxKDfNL2jHCnknrjGdW.json
diff --git a/src/assets/policies/3.json → ...6CbfQrrNsJKZJXsbvDGvmiN7Nb2piafdBMPW.json b/src/assets/policies/3.json → ...6CbfQrrNsJKZJXsbvDGvmiN7Nb2piafdBMPW.json
diff --git a/src/bootstrap/dataloader.js b/src/bootstrap/dataloader.js
@@ -23,7 +23,14 @@ const funcs = {
         })
       )
       .catch(() => null),
-  load: URI => fetch(URI).then(res => res.json())
+  load: (URI, options) =>
+    archon.utils
+      .validateFileFromURI(URI, {
+        strictHashes: true,
+        ...options
+      })
+      .then(res => res.file)
+      .catch(() => null)
 }
 export const dataloaders = Object.keys(funcs).reduce((acc, f) => {
   acc[f] = new Dataloader(

diff --git a/src/components/court-card.js b/src/components/court-card.js
@@ -48,8 +48,8 @@ const CourtCard = ({ ID, onClick, onStakeClick: _onStakeClick }) => {
   const load = useDataloader.load()
   let name
   const policy = useCacheCall('PolicyRegistry', 'policies', ID)
-  if (policy) {
-    const policyJSON = load(policy.fileURI)
+  if (policy !== undefined) {
+    const policyJSON = load(policy)
     if (policyJSON) name = policyJSON.name
   }
   const stake = useCacheCall(

diff --git a/src/components/court-cascader-modal.js b/src/components/court-cascader-modal.js
@@ -88,8 +88,8 @@ const CourtCascaderModal = ({ onClick }) => {
     let option = options[0]
     for (let i = 0; i < subcourtIDs.length; i++) {
       const policy = call('PolicyRegistry', 'policies', subcourtIDs[i])
-      if (policy) {
-        const policyJSON = load(policy.fileURI)
+      if (policy !== undefined) {
+        const policyJSON = load(policy)
         if (policyJSON) {
           option.description = policyJSON.description
           option.label = policyJSON.name
@@ -108,8 +108,8 @@ const CourtCascaderModal = ({ onClick }) => {
             value: c
           }
           const policy = call('PolicyRegistry', 'policies', c)
-          if (policy) {
-            const policyJSON = load(policy.fileURI)
+          if (policy !== undefined) {
+            const policyJSON = load(policy)
             if (policyJSON) {
               child.description = policyJSON.description
               child.label = policyJSON.name

diff --git a/src/components/court-drawer.js b/src/components/court-drawer.js
@@ -67,8 +67,8 @@ const CourtDrawer = ({ ID, onClose }) => {
         summary: undefined
       }
       const policy = call('PolicyRegistry', 'policies', subcourt.ID)
-      if (policy) {
-        const policyJSON = load(policy.fileURI)
+      if (policy !== undefined) {
+        const policyJSON = load(policy)
         if (policyJSON) {
           subcourt.description = policyJSON.description
           subcourt.name = policyJSON.name

diff --git a/src/components/courts-list-card.js b/src/components/courts-list-card.js
@@ -26,8 +26,8 @@ const CourtsListCard = () => {
       subcourtIDs &&
       subcourtIDs.map(ID => {
         const policy = call('PolicyRegistry', 'policies', ID)
-        if (policy) {
-          const policyJSON = load(policy.fileURI)
+        if (policy !== undefined) {
+          const policyJSON = load(policy)
           if (policyJSON) return policyJSON.name
         }
         return undefined

diff --git a/src/components/pnk-stats-list-card.js b/src/components/pnk-stats-list-card.js
@@ -41,8 +41,8 @@ const PNKStatsListCard = () => {
           ID
         )
         const policy = call('PolicyRegistry', 'policies', ID)
-        if (policy) {
-          const policyJSON = load(policy.fileURI)
+        if (policy !== undefined) {
+          const policyJSON = load(policy)
           if (policyJSON) subcourt.name = policyJSON.name
         }
         return subcourt