From 11588fdf8c0b682c9141b99d9e1a7d56c9e4aa68 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Thu, 13 Feb 2025 12:38:45 +0100 Subject: [PATCH] EVM Node: Rename Bifrost crates to prepare for Calypso You cannot have two crates using the same name in your dependency tree, even if they are used by two independent crates. As a consequence, it is necessary to rename the crates used by the Bifrost kernel, since Calypso will come with crates using the same names. A similar operation will be done in Calypso codebase as well. --- etherlink/kernel_bifrost/Cargo.toml | 12 ++--- etherlink/kernel_bifrost/ethereum/Cargo.toml | 2 +- .../kernel_bifrost/evm_execution/Cargo.toml | 2 +- .../indexable_storage/Cargo.toml | 2 +- etherlink/kernel_bifrost/kernel/Cargo.toml | 2 +- etherlink/kernel_bifrost/logging/Cargo.toml | 2 +- etherlink/kernel_bifrost/runtime/Cargo.toml | 2 +- etherlink/kernel_bifrost/storage/Cargo.toml | 2 +- etherlink/lib_wasm_runtime/Cargo.lock | 52 +++++++++---------- etherlink/lib_wasm_runtime/Cargo.toml | 4 +- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/etherlink/kernel_bifrost/Cargo.toml b/etherlink/kernel_bifrost/Cargo.toml index a2066616e461..e3ca64b843d3 100644 --- a/etherlink/kernel_bifrost/Cargo.toml +++ b/etherlink/kernel_bifrost/Cargo.toml @@ -60,12 +60,12 @@ libsecp256k1 = { version = "0.7", default-features = false, features = [ ] } # kernel crates -tezos_ethereum = { path = "./ethereum" } -evm-execution = { path = "./evm_execution" } -tezos-evm-logging = { path = "./logging" } -tezos-evm-runtime = { path = "./runtime" } -tezos-indexable-storage = { path = "./indexable_storage" } -tezos-storage = { path = "./storage" } +tezos_ethereum = { package = "tezos_ethereum_bifrost", path = "./ethereum" } +evm-execution = { package = "evm-execution-bifrost", path = "./evm_execution" } +tezos-evm-logging = { package = "tezos-evm-logging-bifrost", path = "./logging" } +tezos-evm-runtime = { package = "tezos-evm-runtime-bifrost", path = "./runtime" } +tezos-indexable-storage = { package = "tezos-indexable-storage-bifrost", path = "./indexable_storage" } +tezos-storage = { package = "tezos-storage-bifrost", path = "./storage" } # SDK # we disable BLS, because we don’t need it and it is a roadblock for the native execution diff --git a/etherlink/kernel_bifrost/ethereum/Cargo.toml b/etherlink/kernel_bifrost/ethereum/Cargo.toml index 289a3cd4682a..905185bc9e45 100644 --- a/etherlink/kernel_bifrost/ethereum/Cargo.toml +++ b/etherlink/kernel_bifrost/ethereum/Cargo.toml @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT [package] -name = "tezos_ethereum" +name = "tezos_ethereum_bifrost" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/etherlink/kernel_bifrost/evm_execution/Cargo.toml b/etherlink/kernel_bifrost/evm_execution/Cargo.toml index e0257f30c966..f7fda65b3532 100644 --- a/etherlink/kernel_bifrost/evm_execution/Cargo.toml +++ b/etherlink/kernel_bifrost/evm_execution/Cargo.toml @@ -6,7 +6,7 @@ # SPDX-License-Identifier: MIT [package] -name = "evm-execution" +name = "evm-execution-bifrost" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/etherlink/kernel_bifrost/indexable_storage/Cargo.toml b/etherlink/kernel_bifrost/indexable_storage/Cargo.toml index a1d92959bc84..add3af9186f7 100644 --- a/etherlink/kernel_bifrost/indexable_storage/Cargo.toml +++ b/etherlink/kernel_bifrost/indexable_storage/Cargo.toml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT [package] -name = "tezos-indexable-storage" +name = "tezos-indexable-storage-bifrost" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/etherlink/kernel_bifrost/kernel/Cargo.toml b/etherlink/kernel_bifrost/kernel/Cargo.toml index 6ad721fbf8a3..88f11500ad1d 100644 --- a/etherlink/kernel_bifrost/kernel/Cargo.toml +++ b/etherlink/kernel_bifrost/kernel/Cargo.toml @@ -6,7 +6,7 @@ # SPDX-License-Identifier: MIT [package] -name = 'evm_kernel' +name = 'evm_kernel_bifrost' version = '0.1.0' edition = '2021' build = "build.rs" diff --git a/etherlink/kernel_bifrost/logging/Cargo.toml b/etherlink/kernel_bifrost/logging/Cargo.toml index c0851ce37376..1fe53e106e4d 100644 --- a/etherlink/kernel_bifrost/logging/Cargo.toml +++ b/etherlink/kernel_bifrost/logging/Cargo.toml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT [package] -name = "tezos-evm-logging" +name = "tezos-evm-logging-bifrost" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/etherlink/kernel_bifrost/runtime/Cargo.toml b/etherlink/kernel_bifrost/runtime/Cargo.toml index 7a89c30ec8c1..7b153b7bdda0 100644 --- a/etherlink/kernel_bifrost/runtime/Cargo.toml +++ b/etherlink/kernel_bifrost/runtime/Cargo.toml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT [package] -name = "tezos-evm-runtime" +name = "tezos-evm-runtime-bifrost" version = "0.1.0" edition = "2021" diff --git a/etherlink/kernel_bifrost/storage/Cargo.toml b/etherlink/kernel_bifrost/storage/Cargo.toml index f4429eb742bb..1d90c1d95a94 100644 --- a/etherlink/kernel_bifrost/storage/Cargo.toml +++ b/etherlink/kernel_bifrost/storage/Cargo.toml @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT [package] -name = "tezos-storage" +name = "tezos-storage-bifrost" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/etherlink/lib_wasm_runtime/Cargo.lock b/etherlink/lib_wasm_runtime/Cargo.lock index 11315f629347..090dbdbb34c0 100644 --- a/etherlink/lib_wasm_runtime/Cargo.lock +++ b/etherlink/lib_wasm_runtime/Cargo.lock @@ -1162,7 +1162,7 @@ dependencies = [ ] [[package]] -name = "evm-execution" +name = "evm-execution-bifrost" version = "0.1.0" dependencies = [ "aurora-engine-modexp", @@ -1178,18 +1178,18 @@ dependencies = [ "sha2 0.10.8", "sha3", "substrate-bn", - "tezos-evm-logging", - "tezos-evm-runtime", - "tezos-indexable-storage", + "tezos-evm-logging-bifrost", + "tezos-evm-runtime-bifrost", + "tezos-indexable-storage-bifrost", "tezos-smart-rollup-core", "tezos-smart-rollup-debug", "tezos-smart-rollup-encoding", "tezos-smart-rollup-host", "tezos-smart-rollup-storage", - "tezos-storage", + "tezos-storage-bifrost", "tezos_crypto_rs", "tezos_data_encoding", - "tezos_ethereum", + "tezos_ethereum_bifrost", "thiserror", ] @@ -1213,7 +1213,7 @@ dependencies = [ ] [[package]] -name = "evm_kernel" +name = "evm_kernel_bifrost" version = "0.1.0" dependencies = [ "anyhow", @@ -1221,7 +1221,7 @@ dependencies = [ "ethbloom", "ethereum", "evm", - "evm-execution", + "evm-execution-bifrost", "hex", "libsecp256k1", "num-derive", @@ -1230,9 +1230,9 @@ dependencies = [ "rlp", "sha3", "softfloat", - "tezos-evm-logging", - "tezos-evm-runtime", - "tezos-indexable-storage", + "tezos-evm-logging-bifrost", + "tezos-evm-runtime-bifrost", + "tezos-indexable-storage-bifrost", "tezos-smart-rollup", "tezos-smart-rollup-core", "tezos-smart-rollup-debug", @@ -1241,10 +1241,10 @@ dependencies = [ "tezos-smart-rollup-host", "tezos-smart-rollup-installer-config", "tezos-smart-rollup-storage", - "tezos-storage", + "tezos-storage-bifrost", "tezos_crypto_rs", "tezos_data_encoding", - "tezos_ethereum", + "tezos_ethereum_bifrost", "thiserror", ] @@ -2513,13 +2513,13 @@ name = "octez-evm-node-wasm-runtime" version = "0.0.0-dev" dependencies = [ "env_logger", - "evm_kernel", + "evm_kernel_bifrost", "hex", "librustzcash", "log", "ocaml", "ocaml-build", - "tezos-evm-runtime", + "tezos-evm-runtime-bifrost", "tezos-smart-rollup-core", "tezos-smart-rollup-host", "tezos_crypto_rs", @@ -3714,7 +3714,7 @@ dependencies = [ ] [[package]] -name = "tezos-evm-logging" +name = "tezos-evm-logging-bifrost" version = "0.1.0" dependencies = [ "num-derive", @@ -3723,11 +3723,11 @@ dependencies = [ ] [[package]] -name = "tezos-evm-runtime" +name = "tezos-evm-runtime-bifrost" version = "0.1.0" dependencies = [ "sha3", - "tezos-evm-logging", + "tezos-evm-logging-bifrost", "tezos-smart-rollup-core", "tezos-smart-rollup-debug", "tezos-smart-rollup-encoding", @@ -3736,16 +3736,16 @@ dependencies = [ ] [[package]] -name = "tezos-indexable-storage" +name = "tezos-indexable-storage-bifrost" version = "0.1.0" dependencies = [ "rlp", - "tezos-evm-logging", - "tezos-evm-runtime", + "tezos-evm-logging-bifrost", + "tezos-evm-runtime-bifrost", "tezos-smart-rollup-host", "tezos-smart-rollup-mock", "tezos-smart-rollup-storage", - "tezos-storage", + "tezos-storage-bifrost", "thiserror", ] @@ -3899,7 +3899,7 @@ dependencies = [ ] [[package]] -name = "tezos-storage" +name = "tezos-storage-bifrost" version = "0.1.0" dependencies = [ "anyhow", @@ -3907,11 +3907,11 @@ dependencies = [ "primitive-types 0.12.2", "rlp", "sha3", - "tezos-evm-runtime", + "tezos-evm-runtime-bifrost", "tezos-smart-rollup-host", "tezos-smart-rollup-storage", "tezos_crypto_rs", - "tezos_ethereum", + "tezos_ethereum_bifrost", "thiserror", ] @@ -3968,7 +3968,7 @@ dependencies = [ ] [[package]] -name = "tezos_ethereum" +name = "tezos_ethereum_bifrost" version = "0.1.0" dependencies = [ "anyhow", diff --git a/etherlink/lib_wasm_runtime/Cargo.toml b/etherlink/lib_wasm_runtime/Cargo.toml index 4c0a3b61107d..d1e350bfb67a 100644 --- a/etherlink/lib_wasm_runtime/Cargo.toml +++ b/etherlink/lib_wasm_runtime/Cargo.toml @@ -19,7 +19,7 @@ tezos_crypto_rs = { version = "0.6", path = "../../sdk/rust/crypto", default-fea log = "0.4" env_logger = "0.11" librustzcash = { path = "../../src/rustzcash_deps" } -kernel-bifrost = { package = "evm_kernel", path = "../kernel_bifrost/kernel", default-features = false } -runtime-bifrost = { package = "tezos-evm-runtime", path = "../kernel_bifrost/runtime", default-features = false } +kernel-bifrost = { package = "evm_kernel_bifrost", path = "../kernel_bifrost/kernel", default-features = false } +runtime-bifrost = { package = "tezos-evm-runtime-bifrost", path = "../kernel_bifrost/runtime", default-features = false } tezos-smart-rollup-core = { path = "../../src/kernel_sdk/core" } tezos-smart-rollup-host = { path = "../../src/kernel_sdk/host" } -- GitLab