Merge branch 'main' into storage-contracts2

primev · Aug 14, 2024 · acc9149 · acc9149
2 parents bf9bfd7 + fe35e71
commit acc9149
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 59 deletions.
diff --git a/...er_keystore/UTC--2024-05-05T06-55-55.229906000Z--a51f13769d1466e0b5483cb719e89add8d615052 b/...er_keystore/UTC--2024-05-05T06-55-55.229906000Z--a51f13769d1466e0b5483cb719e89add8d615052
diff --git a/contracts/scripts/core/DeployCore.s.sol b/contracts/scripts/core/DeployCore.s.sol
@@ -85,12 +85,12 @@ contract DeployTestnet is Script {
         providerRegistry.setPreconfirmationsContract(
             address(preconfManager)
         );
-        console.log("ProviderRegistryWithPreconfManager:", address(preconfManager));
+        console.log("_ProviderRegistryWithPreconfManager:", address(preconfManager));
 
         bidderRegistry.setPreconfirmationsContract(
             address(preconfManager)
         );
-        console.log("BidderRegistryWithPreconfManager:", address(preconfManager));
+        console.log("_BidderRegistryWithPreconfManager:", address(preconfManager));
 
         address oracleProxy = Upgrades.deployUUPSProxy(
             "Oracle.sol",
@@ -104,7 +104,7 @@ contract DeployTestnet is Script {
         console.log("Oracle:", address(oracle));
 
         preconfManager.updateOracleContract(address(oracle));
-        console.log("PreconfManagerWithOracle:", address(oracle));
+        console.log("_PreconfManagerWithOracle:", address(oracle));
 
         vm.stopBroadcast();
     }

diff --git a/infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2 b/infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2
@@ -168,6 +168,7 @@ job "{{ job.name }}" {
           echo "${LOGS}" \
           | sed -n '/{.*}/p' \
           | jq -c 'reduce .logs[] as $item ({}; . + {($item | split(": ")[0]): ($item | split(": ")[1])})' \
+          | jq -c 'with_entries(select(.key | startswith("_") | not))' \
           > local/www/contracts.json
 
           python3 -m http.server {{ job.ports[0]['http']['static'] }} --directory /local/www

diff --git a/p2p/gen/go/validatorapi/v1/validatorapi.pb.go b/p2p/gen/go/validatorapi/v1/validatorapi.pb.go
diff --git a/p2p/gen/openapi/validatorapi/v1/validatorapi.swagger.yaml b/p2p/gen/openapi/validatorapi/v1/validatorapi.swagger.yaml
@@ -26,6 +26,7 @@ paths:
             $ref: '#/definitions/googlerpcStatus'
       parameters:
         - name: epoch
+          description: Epoch number for which to get the validators
           in: query
           required: false
           type: string
@@ -52,11 +53,19 @@ definitions:
     additionalProperties: {}
   v1GetValidatorsResponse:
     type: object
+    example:
+      items:
+        "1":
+          BLSKey: "0x1234567890abcdef"
+          isOptedIn: true
     properties:
       items:
         type: object
         additionalProperties:
           $ref: '#/definitions/v1SlotInfo'
+        description: Map of slots numbers to validator bls key and isOptedIn boolean value
+    description: Response for GetValidators
+    title: GetValidatorsResponse
   v1SlotInfo:
     type: object
     properties:

diff --git a/p2p/rpc/validatorapi/v1/validatorapi.proto b/p2p/rpc/validatorapi/v1/validatorapi.proto
@@ -30,10 +30,12 @@ message GetValidatorsRequest {
     option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = {
         json_schema: {
             title: "GetValidatorsRequest";
-            description: "Request for GetValidators";
+            description: "Request for GetValidators to get info if the mev-commit validators will propose a block for a given epoch";
         }
     };
-    uint64 epoch = 1;
+    uint64 epoch = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
+        description: "Epoch number for which to get the validators"
+    }];
 }
 
 message SlotInfo {
@@ -42,5 +44,14 @@ message SlotInfo {
 }
 
 message GetValidatorsResponse {
-    map<uint64, SlotInfo> items = 1; 
+    option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_schema) = {
+        json_schema: {
+            title: "GetValidatorsResponse";
+            description: "Response for GetValidators";
+        }
+        example: "{\"items\": {\"1\": {\"BLSKey\": \"0x1234567890abcdef\", \"isOptedIn\": true}}}"
+    };
+    map<uint64, SlotInfo> items = 1 [(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
+        description: "Map of slots numbers to validator bls key and isOptedIn boolean value"
+    }]; 
 }