From c96ceee1ad3305846489a4bfecfad702d25451f6 Mon Sep 17 00:00:00 2001 From: Chris O'Neil Date: Wed, 16 Oct 2024 23:10:00 +0100 Subject: [PATCH] chore: fix up evmlib and sn_evm references These crates were not being correctly referenced in some other crates, which meant some release configurations would not build properly. --- Cargo.lock | 8 ++++---- autonomi/Cargo.toml | 4 ++-- evm_testnet/Cargo.toml | 4 ++-- node-launchpad/Cargo.toml | 2 +- sn_evm/Cargo.toml | 2 +- sn_networking/Cargo.toml | 2 +- sn_node/Cargo.toml | 5 ++--- sn_node_manager/Cargo.toml | 2 +- sn_protocol/Cargo.toml | 2 +- test_utils/Cargo.toml | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62426ff43f..f74312c858 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2747,7 +2747,7 @@ dependencies = [ [[package]] name = "evm_testnet" -version = "0.1.0" +version = "0.1.1-rc.1" dependencies = [ "clap", "dirs-next", @@ -2758,7 +2758,7 @@ dependencies = [ [[package]] name = "evmlib" -version = "0.1.0" +version = "0.1.1-rc.1" dependencies = [ "alloy", "dirs-next", @@ -8144,7 +8144,7 @@ dependencies = [ [[package]] name = "sn_evm" -version = "0.1.0" +version = "0.1.1-rc.1" dependencies = [ "custom_debug", "evmlib", @@ -8756,7 +8756,7 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test_utils" -version = "0.4.7" +version = "0.4.8-rc.1" dependencies = [ "bytes", "color-eyre", diff --git a/autonomi/Cargo.toml b/autonomi/Cargo.toml index 56953227b1..4abb4697dc 100644 --- a/autonomi/Cargo.toml +++ b/autonomi/Cargo.toml @@ -41,7 +41,7 @@ sn_networking = { path = "../sn_networking", version = "0.19.0-rc.1" } sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.4-rc.1" } sn_protocol = { version = "0.17.12-rc.1", path = "../sn_protocol" } sn_registers = { path = "../sn_registers", version = "0.4.0-rc.1" } -sn_evm = { path = "../sn_evm" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } thiserror = "1.0.23" tokio = { version = "1.35.0", features = ["sync"] } tracing = { version = "~0.1.26" } @@ -66,7 +66,7 @@ wasm-bindgen-test = "0.3.43" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.7" -evmlib = { path = "../evmlib", version = "0.1", features = ["wasm-bindgen"] } +evmlib = { path = "../evmlib", version = "0.1.1-rc.1", features = ["wasm-bindgen"] } # See https://github.com/sebcrozet/instant/blob/7bd13f51f5c930239fddc0476a837870fb239ed7/README.md#using-instant-for-a-wasm-platform-where-performancenow-is-not-available instant = { version = "0.1", features = ["wasm-bindgen", "inaccurate"] } js-sys = "0.3.70" diff --git a/evm_testnet/Cargo.toml b/evm_testnet/Cargo.toml index a270c126fc..4dc12e3a74 100644 --- a/evm_testnet/Cargo.toml +++ b/evm_testnet/Cargo.toml @@ -11,8 +11,8 @@ version = "0.1.1-rc.1" [dependencies] clap = { version = "4.5", features = ["derive"] } dirs-next = "~2.0.0" -evmlib = { path = "../evmlib" } -sn_evm = { path = "../sn_evm" } +evmlib = { path = "../evmlib", version = "0.1.1-rc.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } tokio = { version = "1.40", features = ["rt-multi-thread", "signal"] } [lints] diff --git a/node-launchpad/Cargo.toml b/node-launchpad/Cargo.toml index 586ce7afb8..909546c73e 100644 --- a/node-launchpad/Cargo.toml +++ b/node-launchpad/Cargo.toml @@ -52,7 +52,7 @@ serde = { version = "1.0.188", features = ["derive"] } serde_json = "1.0.107" signal-hook = "0.3.17" sn_build_info = { path = "../sn_build_info", version = "0.1.16-rc.1" } -sn_evm = { path = "../sn_evm", version = "0.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } sn-node-manager = { version = "0.11.0-rc.1", path = "../sn_node_manager" } sn_peers_acquisition = { version = "0.5.4-rc.1", path = "../sn_peers_acquisition" } sn_protocol = { path = "../sn_protocol", version = "0.17.12-rc.1" } diff --git a/sn_evm/Cargo.toml b/sn_evm/Cargo.toml index 57cc6e63c9..ee66ed91b0 100644 --- a/sn_evm/Cargo.toml +++ b/sn_evm/Cargo.toml @@ -16,7 +16,7 @@ local = ["evmlib/local"] [dependencies] custom_debug = "~0.6.1" -evmlib = { path = "../evmlib" } +evmlib = { path = "../evmlib", version = "0.1.1-rc.1" } hex = "~0.4.3" lazy_static = "~1.4.0" libp2p = { version = "0.53", features = ["identify", "kad"] } diff --git a/sn_networking/Cargo.toml b/sn_networking/Cargo.toml index a291073300..fb922cef70 100644 --- a/sn_networking/Cargo.toml +++ b/sn_networking/Cargo.toml @@ -58,7 +58,7 @@ sn_build_info = { path = "../sn_build_info", version = "0.1.16-rc.1" } sn_protocol = { path = "../sn_protocol", version = "0.17.12-rc.1" } sn_transfers = { path = "../sn_transfers", version = "0.20.0-rc.1" } sn_registers = { path = "../sn_registers", version = "0.4.0-rc.1" } -sn_evm = { path = "../sn_evm", version = "0.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } sysinfo = { version = "0.30.8", default-features = false, optional = true } thiserror = "1.0.23" tiny-keccak = { version = "~2.0.2", features = ["sha3"] } diff --git a/sn_node/Cargo.toml b/sn_node/Cargo.toml index 5bb28f9e6e..d24112861f 100644 --- a/sn_node/Cargo.toml +++ b/sn_node/Cargo.toml @@ -60,7 +60,7 @@ sn_protocol = { path = "../sn_protocol", version = "0.17.12-rc.1" } sn_registers = { path = "../sn_registers", version = "0.4.0-rc.1" } sn_transfers = { path = "../sn_transfers", version = "0.20.0-rc.1" } sn_service_management = { path = "../sn_service_management", version = "0.4.0-rc.1" } -sn_evm = { path = "../sn_evm", version = "0.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } thiserror = "1.0.23" tokio = { version = "1.32.0", features = [ "io-util", @@ -82,7 +82,7 @@ strum = { version = "0.26.2", features = ["derive"] } color-eyre = "0.6.2" [dev-dependencies] -evmlib = { path = "../evmlib", version = "0.1" } +evmlib = { path = "../evmlib", version = "0.1.1-rc.1" } autonomi = { path = "../autonomi", version = "0.2.0-rc.1", features = ["registers"] } reqwest = { version = "0.12.2", default-features = false, features = [ "rustls-tls-manual-roots", @@ -94,7 +94,6 @@ sn_protocol = { path = "../sn_protocol", version = "0.17.12-rc.1", features = [ sn_transfers = { path = "../sn_transfers", version = "0.20.0-rc.1", features = [ "test-utils", ] } -sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } tempfile = "3.6.0" # Do not specify the version field. Release process expects even the local dev deps to be published. # Removing the version field is a workaround. diff --git a/sn_node_manager/Cargo.toml b/sn_node_manager/Cargo.toml index 9199ed355a..2e247010f8 100644 --- a/sn_node_manager/Cargo.toml +++ b/sn_node_manager/Cargo.toml @@ -52,7 +52,7 @@ sn_peers_acquisition = { path = "../sn_peers_acquisition", version = "0.5.4-rc.1 sn_protocol = { path = "../sn_protocol", version = "0.17.12-rc.1" } sn_service_management = { path = "../sn_service_management", version = "0.4.0-rc.1" } sn-releases = "0.2.6" -sn_evm = { path = "../sn_evm", version = "0.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } sn_transfers = { path = "../sn_transfers", version = "0.20.0-rc.1" } sysinfo = "0.30.12" thiserror = "1.0.23" diff --git a/sn_protocol/Cargo.toml b/sn_protocol/Cargo.toml index 3e7af67634..2109c53d60 100644 --- a/sn_protocol/Cargo.toml +++ b/sn_protocol/Cargo.toml @@ -31,7 +31,7 @@ sha2 = "0.10.7" sn_build_info = { path = "../sn_build_info", version = "0.1.16-rc.1" } sn_transfers = { path = "../sn_transfers", version = "0.20.0-rc.1" } sn_registers = { path = "../sn_registers", version = "0.4.0-rc.1" } -sn_evm = { path = "../sn_evm", version = "0.1" } +sn_evm = { path = "../sn_evm", version = "0.1.1-rc.1" } thiserror = "1.0.23" tiny-keccak = { version = "~2.0.2", features = [ "sha3" ] } tracing = { version = "~0.1.26" } diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index 2574bc52ea..e3cc909848 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -16,7 +16,7 @@ local = ["sn_peers_acquisition/local"] bytes = { version = "1.0.1", features = ["serde"] } color-eyre = "~0.6.2" dirs-next = "~2.0.0" -evmlib = { path = "../evmlib", version = "0.1" } +evmlib = { path = "../evmlib", version = "0.1.1-rc.1" } libp2p = { version = "0.54.1", features = ["identify", "kad"] } rand = "0.8.5" serde = { version = "1.0.133", features = ["derive"] }