Skip to content

Commit 105ced6

Browse files
authored
chore(l1): use Osaka in --dev command (#5094)
**Motivation** <!-- Why does this pull request exist? What are its goals? --> We use `ethrex --dev` as L1 in L2 tests and it'd be useful to test in an Osaka network. **Description** <!-- A clear and concise general description of the changes this PR introduces --> Use `GetPayloadV5` in dev block producer <!-- Link to issues: Resolves #111, Resolves #222 -->
1 parent c228e18 commit 105ced6

File tree

6 files changed

+22
-9
lines changed

6 files changed

+22
-9
lines changed

crates/blockchain/dev/block_producer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ pub async fn start_block_producer(
5353
let payload_id = fork_choice_response
5454
.payload_id
5555
.expect("Failed to produce block: payload_id is None in ForkChoiceResponse");
56-
let execution_payload_response = match engine_client.engine_get_payload_v4(payload_id).await
56+
let execution_payload_response = match engine_client.engine_get_payload_v5(payload_id).await
5757
{
5858
Ok(response) => {
59-
tracing::debug!("engine_getPayloadV4 response: {response:?}");
59+
tracing::debug!("engine_getPayloadV5 response: {response:?}");
6060
response
6161
}
6262
Err(error) => {
6363
tracing::error!(
64-
"Failed to produce block: error sending engine_getPayloadV4: {error}"
64+
"Failed to produce block: error sending engine_getPayloadV5: {error}"
6565
);
6666
tries += 1;
6767
continue;

crates/l2/tests/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ async fn test_send(
10941094
)
10951095
.await
10961096
.with_context(|| format!("Failed to build tx for {test}"))?;
1097-
tx.gas = tx.gas.map(|g| g * 2); // tx reverts in some cases otherwise
1097+
tx.gas = tx.gas.map(|g| g * 6 / 5); // (+20%) tx reverts in some cases otherwise
10981098
let tx_hash = send_generic_transaction(client, tx, &signer).await.unwrap();
10991099
ethrex_l2_sdk::wait_for_transaction_receipt(tx_hash, client, 10)
11001100
.await

crates/networking/rpc/clients/auth/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::{
22
engine::{
33
ExchangeCapabilitiesRequest,
44
fork_choice::ForkChoiceUpdatedV3,
5-
payload::{GetPayloadV4Request, NewPayloadV4Request},
5+
payload::{GetPayloadV5Request, NewPayloadV4Request},
66
},
77
types::{
88
fork_choice::{ForkChoiceResponse, ForkChoiceState, PayloadAttributesV3},
@@ -104,11 +104,11 @@ impl EngineClient {
104104
}
105105
}
106106

107-
pub async fn engine_get_payload_v4(
107+
pub async fn engine_get_payload_v5(
108108
&self,
109109
payload_id: u64,
110110
) -> Result<ExecutionPayloadResponse, EngineClientError> {
111-
let request = GetPayloadV4Request { payload_id }.into();
111+
let request = GetPayloadV5Request { payload_id }.into();
112112

113113
match self.send_request(request).await? {
114114
RpcResponse::Success(result) => serde_json::from_value(result.result)

fixtures/genesis/l1-dev.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"shanghaiTime": 0,
1818
"cancunTime": 0,
1919
"pragueTime": 0,
20+
"osakaTime": 0,
2021
"depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa",
2122
"blobSchedule": {
2223
"cancun": {

tooling/Cargo.lock

Lines changed: 13 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tooling/reorgs/src/simulator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ impl Node {
279279

280280
let payload_response = self
281281
.engine_client
282-
.engine_get_payload_v4(payload_id)
282+
.engine_get_payload_v5(payload_id)
283283
.await
284284
.unwrap();
285285

0 commit comments

Comments
 (0)