diff --git a/Cargo.lock b/Cargo.lock index 3efc937e02..e2aee1350b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1630,7 +1630,7 @@ dependencies = [ "op-alloy-consensus", "serde", "serde_json", - "spin 0.9.8", + "spin", "tracing", "tracing-subscriber", ] @@ -1642,7 +1642,7 @@ dependencies = [ "anyhow", "cfg-if", "linked_list_allocator", - "spin 0.9.8", + "spin", ] [[package]] @@ -1688,7 +1688,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "spin 0.9.8", + "spin", "tokio", "tracing", "tracing-subscriber", @@ -1818,11 +1818,11 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -2351,9 +2351,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", @@ -2489,8 +2489,8 @@ dependencies = [ [[package]] name = "revm" -version = "9.0.0" -source = "git+https://github.com/bluealloy/revm?rev=a832a4e#a832a4e9f17ce6876d98d5f53b7efbb18d27fb23" +version = "10.0.0" +source = "git+https://github.com/bluealloy/revm?tag=v37#99367b1db2c436359c0155ed8965c19fc5503a1b" dependencies = [ "auto_impl", "cfg-if", @@ -2503,8 +2503,8 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "5.0.0" -source = "git+https://github.com/bluealloy/revm?rev=a832a4e#a832a4e9f17ce6876d98d5f53b7efbb18d27fb23" +version = "6.0.0" +source = "git+https://github.com/bluealloy/revm?tag=v37#99367b1db2c436359c0155ed8965c19fc5503a1b" dependencies = [ "revm-primitives", "serde", @@ -2512,8 +2512,8 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "7.0.0" -source = "git+https://github.com/bluealloy/revm?rev=a832a4e#a832a4e9f17ce6876d98d5f53b7efbb18d27fb23" +version = "8.0.0" +source = "git+https://github.com/bluealloy/revm?tag=v37#99367b1db2c436359c0155ed8965c19fc5503a1b" dependencies = [ "aurora-engine-modexp", "blst", @@ -2530,8 +2530,8 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "4.0.0" -source = "git+https://github.com/bluealloy/revm?rev=a832a4e#a832a4e9f17ce6876d98d5f53b7efbb18d27fb23" +version = "5.0.0" +source = "git+https://github.com/bluealloy/revm?tag=v37#99367b1db2c436359c0155ed8965c19fc5503a1b" dependencies = [ "alloy-primitives", "auto_impl", @@ -2568,7 +2568,7 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -2965,12 +2965,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" diff --git a/Cargo.toml b/Cargo.toml index 1897618f93..a5c612152a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,9 +25,9 @@ async-trait = "0.1.80" alloy-primitives = { version = "0.7.6", default-features = false } alloy-rlp = { version = "0.3.5", default-features = false } alloy-consensus = { version = "0.1", default-features = false } -op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", default-features = false } +op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", version = "0.1.0", default-features = false } alloy-eips = { version = "0.1", default-features = false } -revm = { git = "https://github.com/bluealloy/revm", rev = "a832a4e", default-features = false } +revm = { git = "https://github.com/bluealloy/revm", tag = "v37", version = "10.0.0", default-features = false } [profile.dev] opt-level = 1 diff --git a/bin/client/Cargo.toml b/bin/client/Cargo.toml index b4264fcccd..9ef2474e2e 100644 --- a/bin/client/Cargo.toml +++ b/bin/client/Cargo.toml @@ -6,6 +6,7 @@ authors.workspace = true license.workspace = true repository.workspace = true homepage.workspace = true +publish = false [dependencies] # workspace diff --git a/bin/host/Cargo.toml b/bin/host/Cargo.toml index 60ed8e3bc9..0b9088f8db 100644 --- a/bin/host/Cargo.toml +++ b/bin/host/Cargo.toml @@ -6,6 +6,7 @@ license.workspace = true authors.workspace = true repository.workspace = true homepage.workspace = true +publish = false [dependencies] # workspace diff --git a/bin/host/src/fetcher/precompiles.rs b/bin/host/src/fetcher/precompiles.rs index d0b4f5f18d..e6c3bf1ba7 100644 --- a/bin/host/src/fetcher/precompiles.rs +++ b/bin/host/src/fetcher/precompiles.rs @@ -22,17 +22,17 @@ pub(crate) fn execute>(address: Address, input: T) -> Result { // Standard precompile execution - no access to environment required. - let (_, result) = std_precompile(&input.into(), u64::MAX) + let output = std_precompile(&input.into(), u64::MAX) .map_err(|e| anyhow!("Failed precompile execution: {e}"))?; - Ok(result.to_vec()) + Ok(output.bytes.into()) } Precompile::Env(env_precompile) => { // Use default environment for KZG point evaluation. - let (_, result) = env_precompile(&input.into(), u64::MAX, &Env::default()) + let output = env_precompile(&input.into(), u64::MAX, &Env::default()) .map_err(|e| anyhow!("Failed precompile execution: {e}"))?; - Ok(result.to_vec()) + Ok(output.bytes.into()) } _ => anyhow::bail!("Precompile not accelerated"), } diff --git a/crates/executor/src/lib.rs b/crates/executor/src/lib.rs index bcd3788da0..77524ca098 100644 --- a/crates/executor/src/lib.rs +++ b/crates/executor/src/lib.rs @@ -509,7 +509,7 @@ where env.gas_priority_fee = None; env.transact_to = match tx.to { TxKind::Call(to) => TransactTo::Call(to), - TxKind::Create => TransactTo::create(), + TxKind::Create => TransactTo::Create, }; env.value = tx.value; env.data = tx.input.clone(); @@ -536,7 +536,7 @@ where env.gas_priority_fee = None; env.transact_to = match tx.to { TxKind::Call(to) => TransactTo::Call(to), - TxKind::Create => TransactTo::create(), + TxKind::Create => TransactTo::Create, }; env.value = tx.value; env.data = tx.input.clone(); @@ -573,7 +573,7 @@ where env.gas_priority_fee = Some(U256::from(tx.max_priority_fee_per_gas)); env.transact_to = match tx.to { TxKind::Call(to) => TransactTo::Call(to), - TxKind::Create => TransactTo::create(), + TxKind::Create => TransactTo::Create, }; env.value = tx.value; env.data = tx.input.clone(); @@ -608,7 +608,7 @@ where env.gas_priority_fee = None; match tx.to { TxKind::Call(to) => env.transact_to = TransactTo::Call(to), - TxKind::Create => env.transact_to = TransactTo::create(), + TxKind::Create => env.transact_to = TransactTo::Create, } env.value = tx.value; env.data = tx.input.clone();