[Merged by Bors] - Rename random to prev_randao

.github/workflows/test-suite.yml

@@ -190,6 +190,9 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
+    - uses: actions/setup-go@v2
+      with:
+        go-version: '1.17'
     - name: Get latest version of stable Rust
       run: rustup update stable
     - name: Run exec engine integration tests in release

beacon_node/execution_layer/src/engine_api.rs

@@ -110,7 +110,7 @@ pub struct ExecutionBlock {
 #[derive(Clone, Copy, Debug)]
 pub struct PayloadAttributes {
     pub timestamp: u64,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     pub suggested_fee_recipient: Address,
 }
 

beacon_node/execution_layer/src/engine_api/http.rs

@@ -288,7 +288,7 @@ mod test {
             "stateRoot": HASH_01,
             "receiptsRoot": HASH_00,
             "logsBloom": LOGS_BLOOM_01,
-            "random": HASH_01,
+            "prevRandao": HASH_01,
             "blockNumber": "0x0",
             "gasLimit": "0x1",
             "gasUsed": "0x2",
@@ -441,7 +441,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::repeat_byte(0),
                             }),
                         )
@@ -458,7 +458,7 @@ mod test {
                     },
                     {
                         "timestamp":"0x5",
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "suggestedFeeRecipient": ADDRESS_00
                     }]
                 }),
@@ -495,7 +495,7 @@ mod test {
                             state_root: Hash256::repeat_byte(1),
                             receipts_root: Hash256::repeat_byte(0),
                             logs_bloom: vec![1; 256].into(),
-                            random: Hash256::repeat_byte(1),
+                            prev_randao: Hash256::repeat_byte(1),
                             block_number: 0,
                             gas_limit: 1,
                             gas_used: 2,
@@ -517,7 +517,7 @@ mod test {
                         "stateRoot": HASH_01,
                         "receiptsRoot": HASH_00,
                         "logsBloom": LOGS_BLOOM_01,
-                        "random": HASH_01,
+                        "prevRandao": HASH_01,
                         "blockNumber": "0x0",
                         "gasLimit": "0x1",
                         "gasUsed": "0x2",
@@ -596,7 +596,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::from_str("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b").unwrap(),
                             })
                         )
@@ -613,7 +613,7 @@ mod test {
                     },
                     {
                         "timestamp":"0x5",
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "suggestedFeeRecipient":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                     }]
                 })
@@ -643,7 +643,7 @@ mod test {
                             },
                             Some(PayloadAttributes {
                                 timestamp: 5,
-                                random: Hash256::zero(),
+                                prev_randao: Hash256::zero(),
                                 suggested_fee_recipient: Address::from_str("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b").unwrap(),
                             })
                         )
@@ -687,7 +687,7 @@ mod test {
                         "stateRoot":"0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
                         "receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                         "logsBloom": LOGS_BLOOM_00,
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "blockNumber":"0x1",
                         "gasLimit":"0x1c95111",
                         "gasUsed":"0x0",
@@ -710,7 +710,7 @@ mod test {
                             state_root: Hash256::from_str("0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45").unwrap(),
                             receipts_root: Hash256::from_str("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
                             logs_bloom: vec![0; 256].into(),
-                            random: Hash256::zero(),
+                            prev_randao: Hash256::zero(),
                             block_number: 1,
                             gas_limit: u64::from_str_radix("1c95111",16).unwrap(),
                             gas_used: 0,
@@ -735,7 +735,7 @@ mod test {
                             state_root: Hash256::from_str("0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45").unwrap(),
                             receipts_root: Hash256::from_str("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421").unwrap(),
                             logs_bloom: vec![0; 256].into(),
-                            random: Hash256::zero(),
+                            prev_randao: Hash256::zero(),
                             block_number: 1,
                             gas_limit: u64::from_str_radix("1c9c380",16).unwrap(),
                             gas_used: 0,
@@ -757,7 +757,7 @@ mod test {
                         "stateRoot":"0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
                         "receiptsRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                         "logsBloom": LOGS_BLOOM_00,
-                        "random": HASH_00,
+                        "prevRandao": HASH_00,
                         "blockNumber":"0x1",
                         "gasLimit":"0x1c9c380",
                         "gasUsed":"0x0",

beacon_node/execution_layer/src/engine_api/json_structures.rs

@@ -64,7 +64,7 @@ pub struct JsonExecutionPayloadV1<T: EthSpec> {
     pub receipts_root: Hash256,
     #[serde(with = "serde_logs_bloom")]
     pub logs_bloom: FixedVector<u8, T::BytesPerLogsBloom>,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     #[serde(with = "eth2_serde_utils::u64_hex_be")]
     pub block_number: u64,
     #[serde(with = "eth2_serde_utils::u64_hex_be")]
@@ -91,7 +91,7 @@ impl<T: EthSpec> From<ExecutionPayload<T>> for JsonExecutionPayloadV1<T> {
             state_root,
             receipts_root,
             logs_bloom,
-            random,
+            prev_randao,
             block_number,
             gas_limit,
             gas_used,
@@ -108,7 +108,7 @@ impl<T: EthSpec> From<ExecutionPayload<T>> for JsonExecutionPayloadV1<T> {
             state_root,
             receipts_root,
             logs_bloom,
-            random,
+            prev_randao,
             block_number,
             gas_limit,
             gas_used,
@@ -130,7 +130,7 @@ impl<T: EthSpec> From<JsonExecutionPayloadV1<T>> for ExecutionPayload<T> {
             state_root,
             receipts_root,
             logs_bloom,
-            random,
+            prev_randao,
             block_number,
             gas_limit,
             gas_used,
@@ -147,7 +147,7 @@ impl<T: EthSpec> From<JsonExecutionPayloadV1<T>> for ExecutionPayload<T> {
             state_root,
             receipts_root,
             logs_bloom,
-            random,
+            prev_randao,
             block_number,
             gas_limit,
             gas_used,
@@ -165,7 +165,7 @@ impl<T: EthSpec> From<JsonExecutionPayloadV1<T>> for ExecutionPayload<T> {
 pub struct JsonPayloadAttributesV1 {
     #[serde(with = "eth2_serde_utils::u64_hex_be")]
     pub timestamp: u64,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     pub suggested_fee_recipient: Address,
 }
 
@@ -174,13 +174,13 @@ impl From<PayloadAttributes> for JsonPayloadAttributesV1 {
         // Use this verbose deconstruction pattern to ensure no field is left unused.
         let PayloadAttributes {
             timestamp,
-            random,
+            prev_randao,
             suggested_fee_recipient,
         } = p;
 
         Self {
             timestamp,
-            random,
+            prev_randao,
             suggested_fee_recipient,
         }
     }
@@ -191,13 +191,13 @@ impl From<JsonPayloadAttributesV1> for PayloadAttributes {
         // Use this verbose deconstruction pattern to ensure no field is left unused.
         let JsonPayloadAttributesV1 {
             timestamp,
-            random,
+            prev_randao,
             suggested_fee_recipient,
         } = j;
 
         Self {
             timestamp,
-            random,
+            prev_randao,
             suggested_fee_recipient,
         }
     }

beacon_node/execution_layer/src/engines.rs

@@ -50,7 +50,7 @@ impl Logging {
 struct PayloadIdCacheKey {
     pub head_block_hash: ExecutionBlockHash,
     pub timestamp: u64,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     pub suggested_fee_recipient: Address,
 }
 
@@ -77,7 +77,7 @@ impl<T> Engine<T> {
         &self,
         head_block_hash: ExecutionBlockHash,
         timestamp: u64,
-        random: Hash256,
+        prev_randao: Hash256,
         suggested_fee_recipient: Address,
     ) -> Option<PayloadId> {
         self.payload_id_cache
@@ -86,7 +86,7 @@ impl<T> Engine<T> {
             .get(&PayloadIdCacheKey {
                 head_block_hash,
                 timestamp,
-                random,
+                prev_randao,
                 suggested_fee_recipient,
             })
             .cloned()
@@ -393,7 +393,7 @@ impl PayloadIdCacheKey {
         Self {
             head_block_hash: state.head_block_hash,
             timestamp: attributes.timestamp,
-            random: attributes.random,
+            prev_randao: attributes.prev_randao,
             suggested_fee_recipient: attributes.suggested_fee_recipient,
         }
     }

beacon_node/execution_layer/src/lib.rs

@@ -392,7 +392,7 @@ impl ExecutionLayer {
         &self,
         parent_hash: ExecutionBlockHash,
         timestamp: u64,
-        random: Hash256,
+        prev_randao: Hash256,
         finalized_block_hash: ExecutionBlockHash,
         proposer_index: u64,
     ) -> Result<ExecutionPayload<T>, Error> {
@@ -402,14 +402,14 @@ impl ExecutionLayer {
             self.log(),
             "Issuing engine_getPayload";
             "suggested_fee_recipient" => ?suggested_fee_recipient,
-            "random" => ?random,
+            "prev_randao" => ?prev_randao,
             "timestamp" => timestamp,
             "parent_hash" => ?parent_hash,
         );
         self.engines()
             .first_success(|engine| async move {
                 let payload_id = if let Some(id) = engine
-                    .get_payload_id(parent_hash, timestamp, random, suggested_fee_recipient)
+                    .get_payload_id(parent_hash, timestamp, prev_randao, suggested_fee_recipient)
                     .await
                 {
                     // The payload id has been cached for this engine.
@@ -428,7 +428,7 @@ impl ExecutionLayer {
                     };
                     let payload_attributes = PayloadAttributes {
                         timestamp,
-                        random,
+                        prev_randao,
                         suggested_fee_recipient,
                     };
 

beacon_node/execution_layer/src/test_utils/execution_block_generator.rs

@@ -326,7 +326,7 @@ impl<T: EthSpec> ExecutionBlockGenerator<T> {
                     receipts_root: Hash256::repeat_byte(42),
                     state_root: Hash256::repeat_byte(43),
                     logs_bloom: vec![0; 256].into(),
-                    random: attributes.random,
+                    prev_randao: attributes.prev_randao,
                     block_number: parent.block_number() + 1,
                     gas_limit: GAS_LIMIT,
                     gas_used: GAS_USED,

beacon_node/execution_layer/src/test_utils/mock_execution_layer.rs

@@ -111,7 +111,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
         let parent_hash = latest_execution_block.block_hash();
         let block_number = latest_execution_block.block_number() + 1;
         let timestamp = block_number;
-        let random = Hash256::from_low_u64_be(block_number);
+        let prev_randao = Hash256::from_low_u64_be(block_number);
         let finalized_block_hash = parent_hash;
 
         self.el
@@ -120,7 +120,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
                 ExecutionBlockHash::zero(),
                 Some(PayloadAttributes {
                     timestamp,
-                    random,
+                    prev_randao,
                     suggested_fee_recipient: Address::repeat_byte(42),
                 }),
             )
@@ -133,7 +133,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
             .get_payload::<T>(
                 parent_hash,
                 timestamp,
-                random,
+                prev_randao,
                 finalized_block_hash,
                 validator_index,
             )
@@ -143,7 +143,7 @@ impl<T: EthSpec> MockExecutionLayer<T> {
         assert_eq!(payload.parent_hash, parent_hash);
         assert_eq!(payload.block_number, block_number);
         assert_eq!(payload.timestamp, timestamp);
-        assert_eq!(payload.random, random);
+        assert_eq!(payload.prev_randao, prev_randao);
 
         let status = self.el.notify_new_payload(&payload).await.unwrap();
         assert_eq!(status, PayloadStatus::Valid);

consensus/state_processing/src/per_block_processing.rs

@@ -329,10 +329,10 @@ pub fn partially_verify_execution_payload<T: EthSpec>(
         );
     }
     block_verify!(
-        payload.random == *state.get_randao_mix(state.current_epoch())?,
+        payload.prev_randao == *state.get_randao_mix(state.current_epoch())?,
         BlockProcessingError::ExecutionRandaoMismatch {
             expected: *state.get_randao_mix(state.current_epoch())?,
-            found: payload.random,
+            found: payload.prev_randao,
         }
     );
 
@@ -368,7 +368,7 @@ pub fn process_execution_payload<T: EthSpec>(
         state_root: payload.state_root,
         receipts_root: payload.receipts_root,
         logs_bloom: payload.logs_bloom.clone(),
-        random: payload.random,
+        prev_randao: payload.prev_randao,
         block_number: payload.block_number,
         gas_limit: payload.gas_limit,
         gas_used: payload.gas_used,

consensus/types/src/execution_payload.rs

@@ -21,7 +21,7 @@ pub struct ExecutionPayload<T: EthSpec> {
     pub receipts_root: Hash256,
     #[serde(with = "ssz_types::serde_utils::hex_fixed_vec")]
     pub logs_bloom: FixedVector<u8, T::BytesPerLogsBloom>,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     #[serde(with = "eth2_serde_utils::quoted_u64")]
     pub block_number: u64,
     #[serde(with = "eth2_serde_utils::quoted_u64")]

consensus/types/src/execution_payload_header.rs

@@ -15,7 +15,7 @@ pub struct ExecutionPayloadHeader<T: EthSpec> {
     pub receipts_root: Hash256,
     #[serde(with = "ssz_types::serde_utils::hex_fixed_vec")]
     pub logs_bloom: FixedVector<u8, T::BytesPerLogsBloom>,
-    pub random: Hash256,
+    pub prev_randao: Hash256,
     #[serde(with = "eth2_serde_utils::quoted_u64")]
     pub block_number: u64,
     #[serde(with = "eth2_serde_utils::quoted_u64")]

lcli/src/create_payload_header.rs

@@ -23,7 +23,7 @@ pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
         base_fee_per_gas,
         timestamp: genesis_time,
         block_hash: eth1_block_hash,
-        random: eth1_block_hash.into_root(),
+        prev_randao: eth1_block_hash.into_root(),
         ..ExecutionPayloadHeader::default()
     };
     let mut file = File::create(file_name).map_err(|_| "Unable to create file".to_string())?;

testing/ef_tests/Makefile

@@ -1,4 +1,4 @@
-TESTS_TAG := v1.1.9
+TESTS_TAG := v1.1.10
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 

testing/execution_engine_integration/Cargo.toml

@@ -3,8 +3,6 @@ name = "execution_engine_integration"
 version = "0.1.0"
 edition = "2021"
 
-build = "build.rs"
-
 [dependencies]
 tempfile = "3.1.0"
 serde_json = "1.0.58"

testing/execution_engine_integration/Makefile

@@ -1,5 +1,5 @@
 test:
-	cargo test --release --locked
+	cargo run --release --locked
 
 clean:
 	rm -rf execution_clients