Merge branch 'feat(contracts)/escrow-v2-general-escrow-event-update' of

https://github.com/kleros/kleros-v2 into feat(contracts)/escrow-v2-general-escrow-event-update
kleros · Jan 10, 2024 · 5565d55 · 5565d55
2 parents 15bd229 + 553e4e5
commit 5565d55
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 97 deletions.
diff --git a/contracts/.npmignore b/contracts/.npmignore
@@ -1,2 +1,7 @@
 # NOP, just force npm to disregard .gitignore
 # https://docs.npmjs.com/cli/v9/using-npm/developers#keeping-files-out-of-your-package
+
+.env*
+.flaskenv*
+!.env.project
+!.env.vault
diff --git a/contracts/README.md b/contracts/README.md
@@ -214,6 +214,8 @@ yarn sourcify --network <arbitrumSepolia|arbitrum|chiado|gnosischain|sepolia|mai
 
 ### Populating the policy registry and courts
 
+The policy registry and courts configuration can be found in `config/policies.*.json` and `config/courts.*.json`.
+
 #### 1/ Export the registry data from V1
 
 ```bash
@@ -226,10 +228,6 @@ done
 
 #### 2/ Import the data to V2 - Local Network
 
-:warning: By default this script populates from `*.mainnet.json`. To populate from `*.gnosischain.json`, set the variable `USE_GNOSIS` to true inside [scripts/populateCourts.ts](scripts/populateCourts.ts).
-
-:warning: It is possible to switch to testnet-friendly court parameters by setting the variable `TESTING_PARAMETERS` to true inside [scripts/populateCourts.ts](scripts/populateCourts.ts).
-
 Shell 1:
 
 ```bash

diff --git a/contracts/config/courts.v1.gnosischain.json b/contracts/config/courts.v1.gnosischain.json
@@ -1,7 +1,7 @@
 [
   {
     "id": 0,
-    "parent": "0",
+    "parent": 0,
     "hiddenVotes": true,
     "minStake": "1600000000000000000000",
     "alpha": "10000",
@@ -16,7 +16,7 @@
   },
   {
     "id": 1,
-    "parent": "0",
+    "parent": 0,
     "hiddenVotes": false,
     "minStake": "1600000000000000000000",
     "alpha": "5000",
@@ -31,7 +31,7 @@
   },
   {
     "id": 2,
-    "parent": "0",
+    "parent": 0,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "5000",
@@ -46,7 +46,7 @@
   },
   {
     "id": 3,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "1800",
@@ -61,7 +61,7 @@
   },
   {
     "id": 4,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "1800",
@@ -76,7 +76,7 @@
   },
   {
     "id": 5,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "1800",
@@ -91,7 +91,7 @@
   },
   {
     "id": 6,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2200",
@@ -106,7 +106,7 @@
   },
   {
     "id": 7,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2200",
@@ -121,7 +121,7 @@
   },
   {
     "id": 8,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2800",
@@ -136,7 +136,7 @@
   },
   {
     "id": 9,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2800",
@@ -151,7 +151,7 @@
   },
   {
     "id": 10,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2800",
@@ -166,7 +166,7 @@
   },
   {
     "id": 11,
-    "parent": "2",
+    "parent": 2,
     "hiddenVotes": false,
     "minStake": "5800000000000000000000",
     "alpha": "2800",
@@ -181,7 +181,7 @@
   },
   {
     "id": 12,
-    "parent": "0",
+    "parent": 0,
     "hiddenVotes": false,
     "minStake": "7400000000000000000000",
     "alpha": "5000",
@@ -196,7 +196,7 @@
   },
   {
     "id": 13,
-    "parent": "12",
+    "parent": 12,
     "hiddenVotes": false,
     "minStake": "7400000000000000000000",
     "alpha": "5000",
@@ -211,7 +211,7 @@
   },
   {
     "id": 14,
-    "parent": "12",
+    "parent": 12,
     "hiddenVotes": false,
     "minStake": "7400000000000000000000",
     "alpha": "5000",
@@ -226,7 +226,7 @@
   },
   {
     "id": 15,
-    "parent": "0",
+    "parent": 0,
     "hiddenVotes": true,
     "minStake": "3300000000000000000000",
     "alpha": "5000",
@@ -241,7 +241,7 @@
   },
   {
     "id": 16,
-    "parent": "15",
+    "parent": 15,
     "hiddenVotes": false,
     "minStake": "3300000000000000000000",
     "alpha": "2400",
@@ -256,7 +256,7 @@
   },
   {
     "id": 17,
-    "parent": "15",
+    "parent": 15,
     "hiddenVotes": false,
     "minStake": "3300000000000000000000",
     "alpha": "4250",