Merge branch 'dev' into feat(web)/optimize-refetch

kleros · Feb 22, 2024 · eb1194b · eb1194b
2 parents 30b779e + be8f2be
commit eb1194b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -11,7 +11,7 @@ arbitrum = "https://arb1.arbitrum.io/rpc"
 sepolia = "https://sepolia.infura.io/v3/${INFURA_API_KEY}"
 goerli = "https://goerli.infura.io/v3/${INFURA_API_KEY}"
 mainnet = "https://mainnet.infura.io/v3/${INFURA_API_KEY}"
-chiado = "https://rpc.chiadochain.net"
-gnosischain = "https://xdai-rpc.gateway.pokt.network"
+chiado = "https://rpc.chiado.gnosis.gateway.fm"
+gnosischain = "https://rpc.gnosis.gateway.fm"
 
 # See more config options https://book.getfoundry.sh/reference/config.html
diff --git a/contracts/src/arbitration/SortitionModule.sol b/contracts/src/arbitration/SortitionModule.sol
@@ -320,7 +320,7 @@ contract SortitionModule is ISortitionModule, UUPSProxiable, Initializable {
             if (currenCourtID == Constants.GENERAL_COURT) {
                 finished = true;
             } else {
-                (currenCourtID, , , , , , ) = core.courts(currenCourtID);
+                (currenCourtID, , , , , , ) = core.courts(currenCourtID); // Get the parent court.
             }
         }
         emit StakeSet(_account, _courtID, _newStake);

diff --git a/subgraph/scripts/update.sh b/subgraph/scripts/update.sh
@@ -14,14 +14,14 @@ function update() #hardhatNetwork #graphNetwork #subgraphConfig #dataSourceIndex
     # Set the address
     address=$(cat "$artifact" | jq '.address')
     yq -i ".dataSources[$dataSourceIndex].source.address=$address" "$subgraphConfig"
-    
+
     # Set the start block
     blockNumber="$(cat "$artifact" | jq '.receipt.blockNumber')"
     yq -i ".dataSources[$dataSourceIndex].source.startBlock=$blockNumber" "$subgraphConfig"
 
     # Set the Graph network
     graphNetwork=$graphNetwork yq -i  ".dataSources[$dataSourceIndex].network=env(graphNetwork)" "$subgraphConfig"
-    
+
     # Set the ABIs path for this Hardhat network
     abiIndex=0
     for f in $(yq e .dataSources[$dataSourceIndex].mapping.abis[].file "$subgraphConfig" -o json -I 0 | jq -sr '.[]')
@@ -38,7 +38,7 @@ hardhatNetwork=${1:-arbitrumSepolia}
 # as per https://thegraph.com/docs/en/developing/supported-networks/
 graphNetwork=${2:-arbitrum\-sepolia}
 
-subgraphConfig="$SCRIPT_DIR/../${3:-core\/subgraph.yaml}"
+subgraphConfig="$SCRIPT_DIR/../${3:-core/subgraph.yaml}"
 echo "Updating $subgraphConfig"
 
 # backup