diff --git a/Cargo.lock b/Cargo.lock index 4bea9618af4..e25ca5098d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -183,7 +183,7 @@ source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a3 dependencies = [ "alloy-eips", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.6.4", "alloy-rlp", ] @@ -192,7 +192,7 @@ name = "alloy-eips" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.4", "alloy-rlp", "serde", "thiserror", @@ -203,7 +203,7 @@ name = "alloy-json-rpc" version = "0.1.0" source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a39a4bfa56677367b2#974d488bab5e21e9f17452a39a4bfa56677367b2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.6.4", "serde", "serde_json", "thiserror", @@ -216,7 +216,7 @@ source = "git+https://github.com/alloy-rs/alloy.git?rev=974d488bab5e21e9f17452a3 dependencies = [ "alloy-eips", "alloy-json-rpc", - "alloy-primitives", + "alloy-primitives 0.6.4", "alloy-rlp", "serde", ] @@ -243,6 +243,28 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "hex-literal", + "itoa", + "k256 0.13.3", + "keccak-asm", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + [[package]] name = "alloy-rlp" version = "0.3.5" @@ -2864,6 +2886,7 @@ name = "execution_layer" version = "0.1.0" dependencies = [ "alloy-consensus", + "alloy-primitives 0.7.7", "alloy-rlp", "arc-swap", "builder_client", @@ -6943,9 +6966,9 @@ dependencies = [ [[package]] name = "ruint" -version = "1.12.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f308135fef9fc398342da5472ce7c484529df23743fb7c734e0f3d472971e62" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" dependencies = [ "alloy-rlp", "ark-ff 0.3.0", @@ -6967,9 +6990,9 @@ dependencies = [ [[package]] name = "ruint-macro" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86854cf50259291520509879a5c294c3c9a4c334e9ff65071c51e42ef1e2343" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rusqlite" @@ -8782,6 +8805,8 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" name = "types" version = "0.2.1" dependencies = [ + "alloy-primitives 0.7.7", + "alloy-rlp", "arbitrary", "beacon_chain", "bls", diff --git a/Cargo.toml b/Cargo.toml index d13f4f7a760..34f33b3936e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,6 +94,7 @@ resolver = "2" edition = "2021" [workspace.dependencies] +alloy-primitives = { version = "0.7.7" } anyhow = "1" arbitrary = { version = "1", features = ["derive"] } async-channel = "1.9.0" diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml index ff147ad3b4c..282e8e0591b 100644 --- a/beacon_node/execution_layer/Cargo.toml +++ b/beacon_node/execution_layer/Cargo.toml @@ -6,6 +6,7 @@ edition = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +alloy-primitives = { workspace = true } types = { workspace = true } tokio = { workspace = true } slog = { workspace = true } @@ -48,6 +49,6 @@ hash-db = "0.15.2" pretty_reqwest_error = { workspace = true } arc-swap = "1.6.0" eth2_network_config = { workspace = true } -alloy-rlp = "0.3" +alloy-rlp = "0.3.4" alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "974d488bab5e21e9f17452a39a4bfa56677367b2" } lighthouse_version = { workspace = true } diff --git a/beacon_node/execution_layer/src/block_hash.rs b/beacon_node/execution_layer/src/block_hash.rs index 0d0cfaf352c..10edb7b2fd4 100644 --- a/beacon_node/execution_layer/src/block_hash.rs +++ b/beacon_node/execution_layer/src/block_hash.rs @@ -1,13 +1,13 @@ use crate::{ - json_structures::JsonWithdrawal, + json_structures::{EncodableJsonWithdrawal, JsonWithdrawal}, keccak::{keccak256, KeccakHasher}, }; -use ethers_core::utils::rlp::RlpStream; +use alloy_rlp::Encodable; use keccak_hash::KECCAK_EMPTY_LIST_RLP; use triehash::ordered_trie_root; use types::{ - map_execution_block_header_fields_base, Address, EthSpec, ExecutionBlockHash, - ExecutionBlockHeader, ExecutionPayloadRef, Hash256, Hash64, Uint256, + EncodableExecutionBlockHeader, EthSpec, ExecutionBlockHash, ExecutionBlockHeader, + ExecutionPayloadRef, Hash256, }; /// Calculate the block hash of an execution block. @@ -60,36 +60,16 @@ pub fn calculate_execution_block_hash( /// RLP encode a withdrawal. pub fn rlp_encode_withdrawal(withdrawal: &JsonWithdrawal) -> Vec { - let mut rlp_stream = RlpStream::new(); - rlp_stream.begin_list(4); - rlp_stream.append(&withdrawal.index); - rlp_stream.append(&withdrawal.validator_index); - rlp_stream.append(&withdrawal.address); - rlp_stream.append(&withdrawal.amount); - rlp_stream.out().into() + let mut out: Vec = vec![]; + EncodableJsonWithdrawal::from(withdrawal).encode(&mut out); + out } /// RLP encode an execution block header. pub fn rlp_encode_block_header(header: &ExecutionBlockHeader) -> Vec { - let mut rlp_header_stream = RlpStream::new(); - rlp_header_stream.begin_unbounded_list(); - map_execution_block_header_fields_base!(&header, |_, field| { - rlp_header_stream.append(field); - }); - if let Some(withdrawals_root) = &header.withdrawals_root { - rlp_header_stream.append(withdrawals_root); - } - if let Some(blob_gas_used) = &header.blob_gas_used { - rlp_header_stream.append(blob_gas_used); - } - if let Some(excess_blob_gas) = &header.excess_blob_gas { - rlp_header_stream.append(excess_blob_gas); - } - if let Some(parent_beacon_block_root) = &header.parent_beacon_block_root { - rlp_header_stream.append(parent_beacon_block_root); - } - rlp_header_stream.finalize_unbounded_list(); - rlp_header_stream.out().into() + let mut out: Vec = vec![]; + EncodableExecutionBlockHeader::from(header).encode(&mut out); + out } #[cfg(test)] @@ -97,6 +77,7 @@ mod test { use super::*; use hex::FromHex; use std::str::FromStr; + use types::{Address, Hash256, Hash64}; fn test_rlp_encoding( header: &ExecutionBlockHeader, diff --git a/beacon_node/execution_layer/src/engine_api/json_structures.rs b/beacon_node/execution_layer/src/engine_api/json_structures.rs index fbffc47e29e..f654ba4a0ea 100644 --- a/beacon_node/execution_layer/src/engine_api/json_structures.rs +++ b/beacon_node/execution_layer/src/engine_api/json_structures.rs @@ -1,4 +1,5 @@ use super::*; +use alloy_rlp::RlpEncodable; use serde::{Deserialize, Serialize}; use strum::EnumString; use superstruct::superstruct; @@ -463,6 +464,24 @@ impl From for Withdrawal { } } } +#[derive(Debug, PartialEq, Clone, RlpEncodable)] +pub struct EncodableJsonWithdrawal<'a> { + pub index: u64, + pub validator_index: u64, + pub address: &'a [u8], + pub amount: u64, +} + +impl<'a> From<&'a JsonWithdrawal> for EncodableJsonWithdrawal<'a> { + fn from(json_withdrawal: &'a JsonWithdrawal) -> Self { + Self { + index: json_withdrawal.index, + validator_index: json_withdrawal.validator_index, + address: json_withdrawal.address.as_bytes(), + amount: json_withdrawal.amount, + } + } +} #[superstruct( variants(V1, V2, V3), diff --git a/beacon_node/execution_layer/src/keccak.rs b/beacon_node/execution_layer/src/keccak.rs index c4c96892728..62e354d5030 100644 --- a/beacon_node/execution_layer/src/keccak.rs +++ b/beacon_node/execution_layer/src/keccak.rs @@ -16,7 +16,7 @@ use hash_db::Hasher; use types::Hash256; pub fn keccak256(bytes: &[u8]) -> Hash256 { - Hash256::from(ethers_core::utils::keccak256(bytes)) + Hash256::from(alloy_primitives::utils::keccak256(bytes).as_ref()) } /// Keccak hasher. diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml index 28207f828a5..f623f3d101f 100644 --- a/consensus/types/Cargo.toml +++ b/consensus/types/Cargo.toml @@ -9,6 +9,7 @@ name = "benches" harness = false [dependencies] +alloy-primitives = { workspace = true, features = ["rlp"] } merkle_proof = { workspace = true } bls = { workspace = true, features = ["arbitrary"] } kzg = { workspace = true } @@ -50,6 +51,7 @@ metastruct = "0.1.0" serde_json = { workspace = true } smallvec = { workspace = true } maplit = { workspace = true } +alloy-rlp = { version = "0.3.4", features = ["derive"] } milhouse = { workspace = true } rpds = { workspace = true } diff --git a/consensus/types/src/execution_block_header.rs b/consensus/types/src/execution_block_header.rs index 945222a9258..2e5a498214c 100644 --- a/consensus/types/src/execution_block_header.rs +++ b/consensus/types/src/execution_block_header.rs @@ -18,6 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. use crate::{Address, EthSpec, ExecutionPayloadRef, Hash256, Hash64, Uint256}; +use alloy_rlp::RlpEncodable; use metastruct::metastruct; /// Execution block header as used for RLP encoding and Keccak hashing. @@ -89,3 +90,74 @@ impl ExecutionBlockHeader { } } } + +#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable)] +#[rlp(trailing)] +pub struct EncodableExecutionBlockHeader<'a> { + pub parent_hash: &'a [u8], + pub ommers_hash: &'a [u8], + pub beneficiary: &'a [u8], + pub state_root: &'a [u8], + pub transactions_root: &'a [u8], + pub receipts_root: &'a [u8], + pub logs_bloom: &'a [u8], + pub difficulty: alloy_primitives::U256, + pub number: alloy_primitives::U256, + pub gas_limit: alloy_primitives::U256, + pub gas_used: alloy_primitives::U256, + pub timestamp: u64, + pub extra_data: &'a [u8], + pub mix_hash: &'a [u8], + pub nonce: &'a [u8], + pub base_fee_per_gas: alloy_primitives::U256, + pub withdrawals_root: Option<&'a [u8]>, + pub blob_gas_used: Option, + pub excess_blob_gas: Option, + pub parent_beacon_block_root: Option<&'a [u8]>, +} + +impl<'a> From<&'a ExecutionBlockHeader> for EncodableExecutionBlockHeader<'a> { + fn from(header: &'a ExecutionBlockHeader) -> Self { + let mut encodable = Self { + parent_hash: header.parent_hash.as_bytes(), + ommers_hash: header.ommers_hash.as_bytes(), + beneficiary: header.beneficiary.as_bytes(), + state_root: header.state_root.as_bytes(), + transactions_root: header.transactions_root.as_bytes(), + receipts_root: header.receipts_root.as_bytes(), + logs_bloom: header.logs_bloom.as_slice(), + difficulty: U256Shim(header.difficulty).into(), + number: U256Shim(header.number).into(), + gas_limit: U256Shim(header.gas_limit).into(), + gas_used: U256Shim(header.gas_used).into(), + timestamp: header.timestamp, + extra_data: header.extra_data.as_slice(), + mix_hash: header.mix_hash.as_bytes(), + nonce: header.nonce.as_bytes(), + base_fee_per_gas: U256Shim(header.base_fee_per_gas).into(), + withdrawals_root: None, + blob_gas_used: header.blob_gas_used, + excess_blob_gas: header.excess_blob_gas, + parent_beacon_block_root: None, + }; + if let Some(withdrawals_root) = &header.withdrawals_root { + encodable.withdrawals_root = Some(withdrawals_root.as_bytes()); + } + if let Some(parent_beacon_block_root) = &header.parent_beacon_block_root { + encodable.parent_beacon_block_root = Some(parent_beacon_block_root.as_bytes()) + } + encodable + } +} + +// TODO(alloy) this shim can be removed once we fully migrate +// from ethereum types to alloy primitives +struct U256Shim(Uint256); + +impl From for alloy_primitives::U256 { + fn from(value: U256Shim) -> Self { + let mut buffer: [u8; 32] = [0; 32]; + value.0.to_little_endian(&mut buffer); + Self::from_le_slice(&buffer) + } +} diff --git a/consensus/types/src/execution_transaction.rs b/consensus/types/src/execution_transaction.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/consensus/types/src/lib.rs b/consensus/types/src/lib.rs index b5c500f0b22..89c14fa0ad6 100644 --- a/consensus/types/src/lib.rs +++ b/consensus/types/src/lib.rs @@ -157,7 +157,7 @@ pub use crate::epoch_cache::{EpochCache, EpochCacheError, EpochCacheKey}; pub use crate::eth1_data::Eth1Data; pub use crate::eth_spec::EthSpecId; pub use crate::execution_block_hash::ExecutionBlockHash; -pub use crate::execution_block_header::ExecutionBlockHeader; +pub use crate::execution_block_header::{EncodableExecutionBlockHeader, ExecutionBlockHeader}; pub use crate::execution_layer_withdrawal_request::ExecutionLayerWithdrawalRequest; pub use crate::execution_payload::{ ExecutionPayload, ExecutionPayloadBellatrix, ExecutionPayloadCapella, ExecutionPayloadDeneb, diff --git a/testing/web3signer_tests/tls/lighthouse/cert.pem b/testing/web3signer_tests/tls/lighthouse/cert.pem index 24b0a2e5c0e..c7e11c899d1 100644 --- a/testing/web3signer_tests/tls/lighthouse/cert.pem +++ b/testing/web3signer_tests/tls/lighthouse/cert.pem @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFujCCA6KgAwIBAgIUXZijYo8W4/9dAq58ocFEbZDxohwwDQYJKoZIhvcNAQEL +MIIFujCCA6KgAwIBAgIUHh3hZe+HCC+SUxSoJHGJfEAlyugwDQYJKoZIhvcNAQEL BQAwazELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlZBMREwDwYDVQQHDAhTb21lQ2l0 eTESMBAGA1UECgwJTXlDb21wYW55MRMwEQYDVQQLDApNeURpdmlzaW9uMRMwEQYD -VQQDDApsaWdodGhvdXNlMCAXDTIzMDkyMDAyNTYzNloYDzIxMjMwODI3MDI1NjM2 +VQQDDApsaWdodGhvdXNlMCAXDTI0MDcyMjIxMzQyN1oYDzIxMjQwNjI4MjEzNDI3 WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECAwCVkExETAPBgNVBAcMCFNvbWVDaXR5 MRIwEAYDVQQKDAlNeUNvbXBhbnkxEzARBgNVBAsMCk15RGl2aXNpb24xEzARBgNV -BAMMCmxpZ2h0aG91c2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC1 -R1M9NnRwUsqFvJzNWPKuY1PW7llwRRWCixiWNvcxukGTa6AMLZDrYO1Y7qlw5m52 -aHSA2fs2KyeA61yajG/BsLn1vmTtJMZXgLsG0MIqvhgOoh+ZZbl8biO0gQJSRSDE -jf0ogUVM9TCEt6ydbGnzgs8EESqvyXcreaXfmLI7jiX/BkwCdf+Ru+H3MF96QgAw -Oz1d8/fxYJvIpT/DOx4NuMZouSAcUVXgwcVb6JXeTg0xVcL33lluquhYDR0gD5Fe -V0fPth+e9XMAH7udim8E5wn2Ep8CAVoeVq6K9mBM3NqP7+2YmU//jLbkd6UvKPaI -0vps1zF9Bo8QewiRbM0IRse99ikCVZcjOcZSitw3kwTg59NjZ0Vk9R/2YQt/gGWM -VcR//EtbOZGqzGrLPFKOcWO85Ggz746Saj15N+bqT20hXHyiwYL8DLgJkMR2W9Nr -67Vyi9SWSM6rdRQlezlHq/yNEh+JuY7eoC3VeVw9K1ZXP+OKAwbpcnvd3uLwV91f -kpT6kjc6d2h4bK8fhvF16Em42JypQCl0xMhgg/8MFO+6ZLy5otWAdsSYyO5k9CAa -3zLeqd89dS7HNLdLZ0Y5SFWm6y5Kqu89ErIENafX5DxupHWsruiBV7zhDHNPaGcf -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 -----END CERTIFICATE----- diff --git a/testing/web3signer_tests/tls/lighthouse/key.key b/testing/web3signer_tests/tls/lighthouse/key.key index d00b6c21229..45aef3bff7e 100644 --- a/testing/web3signer_tests/tls/lighthouse/key.key +++ b/testing/web3signer_tests/tls/lighthouse/key.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQC1R1M9NnRwUsqF -vJzNWPKuY1PW7llwRRWCixiWNvcxukGTa6AMLZDrYO1Y7qlw5m52aHSA2fs2KyeA -61yajG/BsLn1vmTtJMZXgLsG0MIqvhgOoh+ZZbl8biO0gQJSRSDEjf0ogUVM9TCE -t6ydbGnzgs8EESqvyXcreaXfmLI7jiX/BkwCdf+Ru+H3MF96QgAwOz1d8/fxYJvI -pT/DOx4NuMZouSAcUVXgwcVb6JXeTg0xVcL33lluquhYDR0gD5FeV0fPth+e9XMA -H7udim8E5wn2Ep8CAVoeVq6K9mBM3NqP7+2YmU//jLbkd6UvKPaI0vps1zF9Bo8Q -ewiRbM0IRse99ikCVZcjOcZSitw3kwTg59NjZ0Vk9R/2YQt/gGWMVcR//EtbOZGq -zGrLPFKOcWO85Ggz746Saj15N+bqT20hXHyiwYL8DLgJkMR2W9Nr67Vyi9SWSM6r -dRQlezlHq/yNEh+JuY7eoC3VeVw9K1ZXP+OKAwbpcnvd3uLwV91fkpT6kjc6d2h4 -bK8fhvF16Em42JypQCl0xMhgg/8MFO+6ZLy5otWAdsSYyO5k9CAa3zLeqd89dS7H -NLdLZ0Y5SFWm6y5Kqu89ErIENafX5DxupHWsruiBV7zhDHNPaGcfTPFe8xuDYsi1 -55veOfEiDh4g+X1qjL8x8OEDjgsM3QIDAQABAoICAEP5a1KMPUwzF0Lfr1Jm1JUk -pLb26C2rkf3B56XIFZgddeJwHHMEkQ9Z6JYM5Bd0KJ6Y23rHgiXVN7plRvOiznMs -MAbgblroC8GbAUZ0eCJr5nxyOXQdS1jHufbA21x7FGbvsSqDkrdhR2C0uPLMyMvp -VHP7dey1mEyCkHrP+KFRU5kVxOG1WnBMqdY1Ws/uuMBdLk0xItttdOzfXhH4dHQD -wc5aAJrtusyNDFLC25Og49yIgpPMWe+gAYCm5jFz9PgRtVlDOwcxlX5J5+GSm7+U -XM1bPSmU1TSEH233JbQcqo4HkynB71ftbVUtMhEFhLBYoFO4u5Ncpr+wys0xJY4f -3aJRV5+gtlmAmsKN66GoMA10KNlLp2z7XMlx1EXegOHthcKfgf5D6LKRz8qZhknm -FFgAOg9Bak1mt1DighhPUJ0vLYU6K+u0ZXwysYygOkBJ/yj63ApuPCSTQb7U0JlL -JMgesy1om3rVdN0Oc7hNaxq7VwswkzUTUKS2ZvGozF3MmdPHNm5weJTb3NsWv8Qo -HiK1I88tY9oZ5r91SC82hMErmG4ElXFLxic1B29h3fsIe/l+WjmZRXixD9ugV0gj -CvNa8QD9K3hljlNrR6eSXeO2QOyxAEUr2N1MBlxrnAWZCzXKiTvTx1aKDYhJT0DY -zae/etTLHVjzgdH6GS33AoIBAQDaaWYHa9wkJIJPX4siVCatwWKGTjVfDb5Q9upf -twkxCf58pmbzUOXW3dbaz6S0npR0V6Wqh3S8HW7xaHgDZDMLJ1WxLJrgqDKU3Pqc -k7xnA/krWqoRVSOOGkPnSrnZo6AVc6FR+iwJjfuUu0rFDwiyuqvuXpwNsVwvAOoL -xIbaEbGUHiFsZamm2YkoxrEjXGFkZxQX9+n9f+IAiMxMQc0wezRREc8e61/mTovJ -QJ7ZDd7zLUR7Yeqciy59NOsD57cGtnp1K28I2eKLA4taghgd5bJjPkUaHg9j5Xf6 -nsxU2QCp9kpwXvtMxN7pERKWFsnmu8tfJOiUWCpp8SLbIl6nAoIBAQDUefKKjRLa -6quNW0rOGn2kx0K6sG7T45OhwvWXVjnPAjX3/2mAMALT1wc3t0iKDvpIEfMadW2S -O8x2FwyifdJXmkz943EZ/J5Tq1H0wr4NeClX4UlPIAx3CdFlCphqH6QfKtrpQ+Hf -+e8XzjVvdg8Y/RcbWgPgBtOh2oKT5QHDh13/994nH7GhVM7PjLUVvZVmNWaC77zr -bXcvJFF/81PAPWC2JoV6TL/CXvda2tG2clxbSfykfUBPBpeyEijMoxC4UMuCHhbp -NpLfKJQp9XNqbBG2K4jgLQ8Ipk6Vtia/hktLgORf/pbQ4PxEv7OP5e1AOreDg/CW -RnQtBb+/8czbAoIBABfDA8Cm8WpVNoAgKujvMs4QjgGCnLfcrOnuEw2awjs9lRxG -lki+cmLv+6IOmSK1Zf1KU9G7ru2QXjORZA0qZ4s9GkuOSMNMSUR8zh8ey46Bligr -UvlTw+x/2wdcz99nt9DdpZ1flE7tzYMe5UGPIykeufnS/TNYKmlKtivVk75B0ooE -xSof3Vczr4JqK3dnY4ki1cLNy/0yXookV+Wr+wDdRpHTWC9K+EH8JaUdjKqcobbf -I+Ywfu/NDJ++lBr2qKjoTWZV9VyHJ+hr2Etef/Uwujml2qq+vnnlyynPAPfyK+pR -y0NycfCmMoI0w0rk685YfAW75DnPZb3k6B/jG10CggEBAMxf2DoI5EAKRaUcUOHa -fUxIFhl4p8HMPy7zVkORPt2tZLf8xz/z7mRRirG+7FlPetJj4ZBrr09fkZVtKkwJ -9o8o7jGv2hSC9s/IFHb38tMF586N9nPTgenmWbF09ZHuiXEpSZPiJZvIzn/5a1Ch -IHiKyPUYKm4MYvhmM/+J4Z5v0KzrgJXlWHi0GJFu6KfWyaOcbdQ4QWG6009XAcWv -Cbn5z9KlTvKKbFDMA+UyYVG6wrdUfVzC1V6uGq+/49qiZuzDWlz4EFWWlsNsRsft -Pmz5Mjglu+zVqoZJYYGDydWjmT0w53qmae7U2hJOyqr5ILINSIOKH5qMfiboRr6c -GM0CggEAJTQD/jWjHDIZFRO4SmurNLoyY7bSXJsYAhl77j9Cw/G4vcE+erZYAhp3 -LYu2nrnA8498T9F3H1oKWnK7u4YXO8ViyQd73ql7iKrMjE98CjfGcTPCXwOcPAts -ZpM8ykgFTsJpXEFvIR5cyZ6XFSw2m/Z7CRDpmwQ8es4LpNnYA7V5Yu/zDE4h2/2T -NmftCiZvkxwgj6VyKumOxXBnGK6lB+b6YMTltRrgD/35zmJoKRdqyLb1szPJtQuh -HjRTa/BVPgA66xYFWhifRUiYKpc0bARTYofHeoDgu6yPzcHMuM70NQQGF+WWJySg -vc3Za4ClKSLmb3ZA9giTswYMev+3BQ== +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 +JW0s6PSlQuHlL3+1tQJ5fvM8kxP7gA== -----END PRIVATE KEY----- diff --git a/testing/web3signer_tests/tls/lighthouse/key.p12 b/testing/web3signer_tests/tls/lighthouse/key.p12 index 73468fa084b..56ace7eb08e 100644 Binary files a/testing/web3signer_tests/tls/lighthouse/key.p12 and b/testing/web3signer_tests/tls/lighthouse/key.p12 differ diff --git a/testing/web3signer_tests/tls/lighthouse/web3signer.pem b/testing/web3signer_tests/tls/lighthouse/web3signer.pem index 6266cadf9bc..8120a09f261 100644 --- a/testing/web3signer_tests/tls/lighthouse/web3signer.pem +++ b/testing/web3signer_tests/tls/lighthouse/web3signer.pem @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/testing/web3signer_tests/tls/web3signer/cert.pem b/testing/web3signer_tests/tls/web3signer/cert.pem index 6266cadf9bc..8120a09f261 100644 --- a/testing/web3signer_tests/tls/web3signer/cert.pem +++ b/testing/web3signer_tests/tls/web3signer/cert.pem @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/testing/web3signer_tests/tls/web3signer/key.key b/testing/web3signer_tests/tls/web3signer/key.key index d9697534064..ece249953cc 100644 --- a/testing/web3signer_tests/tls/web3signer/key.key +++ b/testing/web3signer_tests/tls/web3signer/key.key @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -oJ/aHbXf6PdOO9MYiI/es/dfKK8ywA== +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 +BNyfjpeCsAvh8Q1liLMQ7Spy9yY1 -----END PRIVATE KEY----- diff --git a/testing/web3signer_tests/tls/web3signer/key.p12 b/testing/web3signer_tests/tls/web3signer/key.p12 index 792dc197f86..a7d772c99ee 100644 Binary files a/testing/web3signer_tests/tls/web3signer/key.p12 and b/testing/web3signer_tests/tls/web3signer/key.p12 differ diff --git a/testing/web3signer_tests/tls/web3signer/known_clients.txt b/testing/web3signer_tests/tls/web3signer/known_clients.txt index c4722fe5876..6c8958cae07 100644 --- a/testing/web3signer_tests/tls/web3signer/known_clients.txt +++ b/testing/web3signer_tests/tls/web3signer/known_clients.txt @@ -1 +1 @@ -lighthouse 02:D0:A8:C0:6A:59:90:40:54:67:D4:BD:AE:5A:D4:F5:14:A9:79:38:98:E0:62:93:C1:77:13:FC:B4:60:65:CE +lighthouse DE:72:8C:AF:D4:1B:50:EF:66:BC:7D:E1:D8:02:87:DC:61:65:79:47:BD:E7:36:F8:10:7C:34:B2:5B:20:FD:6B