From 53fa5e988fc48fefb8791680b361082b0a5c98ce Mon Sep 17 00:00:00 2001 From: allnil Date: Mon, 14 Oct 2024 10:24:10 +0100 Subject: [PATCH] fix: refactor naming, pathes, fmt --- Cargo.lock | 48 +++++++++---------- Cargo.toml | 2 +- crates/primitives-traits/src/constants/mod.rs | 2 +- crates/rpc/rpc/src/debug.rs | 2 +- wvm-apps/wvm-exexed/Cargo.toml | 2 +- wvm-apps/wvm-exexed/crates/brotli/Cargo.toml | 2 +- wvm-apps/wvm-exexed/crates/brotli/src/lib.rs | 2 +- .../wvm-exexed/crates/precompiles/Cargo.toml | 2 +- .../crates/precompiles/src/inner/mod.rs | 4 +- .../precompiles/src/inner/string_block.rs | 2 +- ..._precompile.rs => wvm_block_precompile.rs} | 12 ++--- .../wvm-exexed/crates/precompiles/src/lib.rs | 2 +- .../wvm-exexed/crates/precompiles/src/node.rs | 2 +- ...wevm_node_config.rs => wvm_node_config.rs} | 0 .../wvm-exexed/crates/reth-exexed/Cargo.toml | 2 +- .../wvm-exexed/crates/reth-exexed/src/main.rs | 2 +- .../{wevm-borsh => wvm-borsh}/Cargo.toml | 2 +- .../{wevm-borsh => wvm-borsh}/src/address.rs | 0 .../{wevm-borsh => wvm-borsh}/src/b256.rs | 0 .../{wevm-borsh => wvm-borsh}/src/block.rs | 0 .../{wevm-borsh => wvm-borsh}/src/bloom.rs | 0 .../{wevm-borsh => wvm-borsh}/src/header.rs | 0 .../{wevm-borsh => wvm-borsh}/src/lib.rs | 0 .../{wevm-borsh => wvm-borsh}/src/request.rs | 0 .../src/signature.rs | 0 .../src/transaction.rs | 0 .../src/withdrawal.rs | 0 27 files changed, 45 insertions(+), 45 deletions(-) rename wvm-apps/wvm-exexed/crates/precompiles/src/inner/{wevm_block_precompile.rs => wvm_block_precompile.rs} (96%) rename wvm-apps/wvm-exexed/crates/precompiles/src/{wevm_node_config.rs => wvm_node_config.rs} (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/Cargo.toml (96%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/address.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/b256.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/block.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/bloom.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/header.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/lib.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/request.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/signature.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/transaction.rs (100%) rename wvm-apps/wvm-exexed/crates/{wevm-borsh => wvm-borsh}/src/withdrawal.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index aac6f365d800..f3512b35f896 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8286,7 +8286,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "wevm-borsh", + "wvm-borsh", ] [[package]] @@ -8831,7 +8831,7 @@ dependencies = [ "brotlic", "reth", "serde_json", - "wevm-borsh", + "wvm-borsh", ] [[package]] @@ -10351,7 +10351,7 @@ dependencies = [ "serde_json", "tokio", "tracing", - "wevm-borsh", + "wvm-borsh", ] [[package]] @@ -15072,26 +15072,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "wevm-borsh" -version = "1.0.8" -dependencies = [ - "alloy-eips 0.4.2", - "alloy-primitives", - "borsh 1.5.1", - "dotenv", - "eyre", - "reqwest 0.12.8", - "reth", - "reth-exex", - "reth-node-ethereum", - "reth-primitives", - "reth-tracing", - "serde", - "serde_json", - "tokio", -] - [[package]] name = "widestring" version = "1.1.0" @@ -15486,6 +15466,26 @@ dependencies = [ "tokio", ] +[[package]] +name = "wvm-borsh" +version = "1.0.8" +dependencies = [ + "alloy-eips 0.4.2", + "alloy-primitives", + "borsh 1.5.1", + "dotenv", + "eyre", + "reqwest 0.12.8", + "reth", + "reth-exex", + "reth-node-ethereum", + "reth-primitives", + "reth-tracing", + "serde", + "serde_json", + "tokio", +] + [[package]] name = "wvm-exexed" version = "1.0.0" @@ -15523,7 +15523,7 @@ dependencies = [ "serde_json", "tokio", "tracing", - "wevm-borsh", + "wvm-borsh", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3cf4a3ac59ef..adc6bf5ac834 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -154,7 +154,7 @@ members = [ "wvm-apps/wvm-exexed/crates/exex-etl/", "wvm-apps/wvm-exexed/crates/lambda/", "wvm-apps/wvm-exexed/crates/precompiles/", - "wvm-apps/wvm-exexed/crates/wevm-borsh/", + "wvm-apps/wvm-exexed/crates/wvm-borsh/", "wvm-apps/wvm-exexed/crates/brotli/", ] default-members = ["bin/reth"] diff --git a/crates/primitives-traits/src/constants/mod.rs b/crates/primitives-traits/src/constants/mod.rs index 019cb9186fcf..6344aa060b22 100644 --- a/crates/primitives-traits/src/constants/mod.rs +++ b/crates/primitives-traits/src/constants/mod.rs @@ -34,7 +34,7 @@ pub const EPOCH_SLOTS: u64 = 32; /// /// This is the time period of 1 seconds in which a randomly chosen validator has time to propose a /// block. -pub const SLOT_DURATION: Duration = Duration::from_secs(1); // Wevm #356: 1s per block +pub const SLOT_DURATION: Duration = Duration::from_secs(1); // wvm #356: 1s per block /// An EPOCH is a series of 32 slots (~6.4min). pub const EPOCH_DURATION: Duration = Duration::from_secs(12 * EPOCH_SLOTS); diff --git a/crates/rpc/rpc/src/debug.rs b/crates/rpc/rpc/src/debug.rs index fefb78257d6a..aea15135b36c 100644 --- a/crates/rpc/rpc/src/debug.rs +++ b/crates/rpc/rpc/src/debug.rs @@ -587,7 +587,7 @@ where } // Increment block_env number and timestamp for the next bundle block_env.number += U256::from(1); - block_env.timestamp += U256::from(1); // Wevm #356: 1s per block + block_env.timestamp += U256::from(1); // wvm #356: 1s per block all_bundles.push(results); } diff --git a/wvm-apps/wvm-exexed/Cargo.toml b/wvm-apps/wvm-exexed/Cargo.toml index d1797a98436d..76b8d26dd15d 100644 --- a/wvm-apps/wvm-exexed/Cargo.toml +++ b/wvm-apps/wvm-exexed/Cargo.toml @@ -37,7 +37,7 @@ brotlic.workspace = true lambda = { path = "crates/lambda" } arweave-upload = { path = "crates/arweave-upload" } precompiles = { path = "crates/precompiles" } -wevm-borsh = { path = "crates/wevm-borsh" } +wvm-borsh = { path = "crates/wvm-borsh" } exex-etl = { path = "crates/exex-etl" } rbrotli = { path = "crates/brotli" } borsh.workspace = true diff --git a/wvm-apps/wvm-exexed/crates/brotli/Cargo.toml b/wvm-apps/wvm-exexed/crates/brotli/Cargo.toml index fe14868ba8d7..66a787e6240d 100644 --- a/wvm-apps/wvm-exexed/crates/brotli/Cargo.toml +++ b/wvm-apps/wvm-exexed/crates/brotli/Cargo.toml @@ -11,4 +11,4 @@ reth.workspace = true brotlic.workspace = true borsh.workspace = true serde_json.workspace = true -wevm-borsh = { path = "../wevm-borsh", name = "wevm-borsh" } \ No newline at end of file +wvm-borsh = { path = "../wvm-borsh", name = "wvm-borsh" } \ No newline at end of file diff --git a/wvm-apps/wvm-exexed/crates/brotli/src/lib.rs b/wvm-apps/wvm-exexed/crates/brotli/src/lib.rs index 5cf7bd989d21..6a3b7a7a2191 100644 --- a/wvm-apps/wvm-exexed/crates/brotli/src/lib.rs +++ b/wvm-apps/wvm-exexed/crates/brotli/src/lib.rs @@ -22,7 +22,7 @@ pub fn from_brotli(data: Vec) -> Vec { mod brotlic_tests { use crate::{from_brotli, to_brotli}; use reth::primitives::SealedBlockWithSenders; - use wevm_borsh::block::BorshSealedBlockWithSenders; + use wvm_borsh::block::BorshSealedBlockWithSenders; #[test] pub fn test_brotlic_block() { diff --git a/wvm-apps/wvm-exexed/crates/precompiles/Cargo.toml b/wvm-apps/wvm-exexed/crates/precompiles/Cargo.toml index 8d6656971d73..72813c5731e8 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/Cargo.toml +++ b/wvm-apps/wvm-exexed/crates/precompiles/Cargo.toml @@ -25,7 +25,7 @@ arweave-upload = { path = "../arweave-upload" } tokio.workspace = true reqwest-graphql = "1.0.0" rbrotli = { path = "../brotli" } -wevm-borsh = { path = "../wevm-borsh", name = "wevm-borsh" } +wvm-borsh = { path = "../wvm-borsh", name = "wvm-borsh" } borsh.workspace = true alloy-primitives.workspace = true reth-evm-ethereum.workspace = true diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/mod.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/mod.rs index 388dbacdc82a..5f5abed3c80d 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/mod.rs +++ b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/mod.rs @@ -1,7 +1,7 @@ use crate::inner::{ arweave_precompile::ARWEAVE_UPLOAD_PC, arweave_read_precompile::ARWEAVE_READ_PC, kyve_precompile::KYVE_READ_PC, test_precompile::HELLO_WORLD_PC, - wevm_block_precompile::WVM_BLOCK_PC, + wvm_block_precompile::WVM_BLOCK_PC, }; use reth::revm::precompile::{u64_to_address, PrecompileWithAddress}; @@ -12,7 +12,7 @@ mod kyve_precompile; mod string_block; mod test_precompile; mod util; -mod wevm_block_precompile; +mod wvm_block_precompile; fn hex_to_u64(hex_str: &str) -> u64 { u64::from_str_radix(&hex_str[2..], 16).unwrap() diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/string_block.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/string_block.rs index 89eded07b9da..3559d15c05e3 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/string_block.rs +++ b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/string_block.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use wevm_borsh::block::BorshSealedBlockWithSenders; +use wvm_borsh::block::BorshSealedBlockWithSenders; #[derive(Debug, Deserialize, Serialize, PartialEq)] #[serde(rename_all = "camelCase")] diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/wevm_block_precompile.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/wvm_block_precompile.rs similarity index 96% rename from wvm-apps/wvm-exexed/crates/precompiles/src/inner/wevm_block_precompile.rs rename to wvm-apps/wvm-exexed/crates/precompiles/src/inner/wvm_block_precompile.rs index ec5b1d3eb062..55da25b90c79 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/src/inner/wevm_block_precompile.rs +++ b/wvm-apps/wvm-exexed/crates/precompiles/src/inner/wvm_block_precompile.rs @@ -10,9 +10,9 @@ use alloy_primitives::Bytes; use rbrotli::from_brotli; use reth::primitives::revm_primitives::{Precompile, PrecompileOutput, PrecompileResult}; use revm_primitives::{PrecompileError, PrecompileErrors}; -use wevm_borsh::block::BorshSealedBlockWithSenders; +use wvm_borsh::block::BorshSealedBlockWithSenders; -pub const WVM_BLOCK_PC: Precompile = Precompile::Standard(wevm_read_block_pc); +pub const WVM_BLOCK_PC: Precompile = Precompile::Standard(wvm_read_block_pc); pub const WVM_BLOCK_PC_READ_BASE: u64 = 10_000; @@ -65,7 +65,7 @@ async fn fetch_with_fallback( send_and_get_edge(fallback_gateway, query).await } -fn wevm_read_block_pc(input: &Bytes, gas_limit: u64) -> PrecompileResult { +fn wvm_read_block_pc(input: &Bytes, gas_limit: u64) -> PrecompileResult { let data_size = input.len(); let gas_used: u64 = (WVM_BLOCK_PC_READ_BASE as usize + data_size * 3) as u64; @@ -239,14 +239,14 @@ fn wevm_read_block_pc(input: &Bytes, gas_limit: u64) -> PrecompileResult { #[cfg(test)] mod arweave_read_pc_tests { - use crate::inner::wevm_block_precompile::wevm_read_block_pc; + use crate::inner::wvm_block_precompile::wvm_read_block_pc; use alloy_primitives::Bytes; use reth::primitives::revm_primitives::PrecompileOutput; #[test] pub fn test_read_wvm_block() { let input = Bytes::from("https://arweave.mainnet.irys.xyz;1127975;hash".as_bytes()); - let PrecompileOutput { gas_used, bytes } = wevm_read_block_pc(&input, 100_000).unwrap(); + let PrecompileOutput { gas_used, bytes } = wvm_read_block_pc(&input, 100_000).unwrap(); assert_eq!(bytes.len(), 66); assert_eq!( bytes.to_vec(), @@ -259,7 +259,7 @@ mod arweave_read_pc_tests { #[test] pub fn test_read_wvm_block_arweave_fallback() { let input = Bytes::from("https://arweave.net;1127975;hash".as_bytes()); - let PrecompileOutput { gas_used, bytes } = wevm_read_block_pc(&input, 100_000).unwrap(); + let PrecompileOutput { gas_used, bytes } = wvm_read_block_pc(&input, 100_000).unwrap(); assert_eq!(bytes.len(), 66); assert_eq!( bytes.to_vec(), diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/lib.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/lib.rs index 81a8bd517d13..21b149090448 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/src/lib.rs +++ b/wvm-apps/wvm-exexed/crates/precompiles/src/lib.rs @@ -2,6 +2,6 @@ extern crate core; pub mod inner; pub mod node; -pub mod wevm_node_config; +pub mod wvm_node_config; pub const WVM_DATA_PUBLISHERS: [&str; 1] = ["5JUE58yemNynRDeQDyVECKbGVCQbnX7unPrBRqCPVn5Z"]; diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/node.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/node.rs index b4b1f132fc30..80f8ce500ee6 100644 --- a/wvm-apps/wvm-exexed/crates/precompiles/src/node.rs +++ b/wvm-apps/wvm-exexed/crates/precompiles/src/node.rs @@ -1,4 +1,4 @@ -use crate::{inner::wvm_precompiles, wevm_node_config::WvmEthEvmConfig}; +use crate::{inner::wvm_precompiles, wvm_node_config::WvmEthEvmConfig}; use reth::{ api::{FullNodeTypes, NodeTypes, PayloadTypes}, builder::{ diff --git a/wvm-apps/wvm-exexed/crates/precompiles/src/wevm_node_config.rs b/wvm-apps/wvm-exexed/crates/precompiles/src/wvm_node_config.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/precompiles/src/wevm_node_config.rs rename to wvm-apps/wvm-exexed/crates/precompiles/src/wvm_node_config.rs diff --git a/wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml b/wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml index 2d7c52f2b2d5..54fc5b04960e 100644 --- a/wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml +++ b/wvm-apps/wvm-exexed/crates/reth-exexed/Cargo.toml @@ -16,7 +16,7 @@ reth-primitives.workspace = true eyre.workspace = true borsh.workspace = true serde_json.workspace = true -wevm-borsh = { path = "../wevm-borsh", name = "wevm-borsh" } +wvm-borsh = { path = "../wvm-borsh", name = "wvm-borsh" } exex-etl = { path = "../exex-etl" } lambda = { path = "../lambda" } arweave-upload = { path = "../arweave-upload" } diff --git a/wvm-apps/wvm-exexed/crates/reth-exexed/src/main.rs b/wvm-apps/wvm-exexed/crates/reth-exexed/src/main.rs index a5e58c82fb87..b8fcbe62d364 100644 --- a/wvm-apps/wvm-exexed/crates/reth-exexed/src/main.rs +++ b/wvm-apps/wvm-exexed/crates/reth-exexed/src/main.rs @@ -17,7 +17,7 @@ use reth_exex::{ExExContext, ExExEvent, ExExNotification}; use reth_node_ethereum::{node::EthereumAddOns, EthereumNode}; use reth_primitives::constants::SLOT_DURATION; use tracing::{error, info}; -use wevm_borsh::block::BorshSealedBlockWithSenders; +use wvm_borsh::block::BorshSealedBlockWithSenders; async fn exex_etl_processor( mut ctx: ExExContext, diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/Cargo.toml b/wvm-apps/wvm-exexed/crates/wvm-borsh/Cargo.toml similarity index 96% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/Cargo.toml rename to wvm-apps/wvm-exexed/crates/wvm-borsh/Cargo.toml index 875a6f86cdad..d5b161cf28c2 100644 --- a/wvm-apps/wvm-exexed/crates/wevm-borsh/Cargo.toml +++ b/wvm-apps/wvm-exexed/crates/wvm-borsh/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "wevm-borsh" +name = "wvm-borsh" version.workspace = true edition.workspace = true rust-version.workspace = true diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/address.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/address.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/address.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/address.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/b256.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/b256.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/b256.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/b256.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/block.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/block.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/block.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/block.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/bloom.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/bloom.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/bloom.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/bloom.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/header.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/header.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/header.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/header.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/lib.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/lib.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/lib.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/lib.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/request.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/request.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/request.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/request.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/signature.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/signature.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/signature.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/signature.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/transaction.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/transaction.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/transaction.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/transaction.rs diff --git a/wvm-apps/wvm-exexed/crates/wevm-borsh/src/withdrawal.rs b/wvm-apps/wvm-exexed/crates/wvm-borsh/src/withdrawal.rs similarity index 100% rename from wvm-apps/wvm-exexed/crates/wevm-borsh/src/withdrawal.rs rename to wvm-apps/wvm-exexed/crates/wvm-borsh/src/withdrawal.rs