Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump all versions to 1.8.0 and remove old migrations. #5327

Merged
merged 6 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/bin/chainflip-broker-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["Chainflip team <https://github.com/chainflip-io>"]
name = "chainflip-broker-api"
version = "1.7.0"
version = "1.8.0"
edition = "2021"

[package.metadata.deb]
Expand Down
2 changes: 1 addition & 1 deletion api/bin/chainflip-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Chainflip team <https://github.com/chainflip-io>"]
edition = "2021"
build = "build.rs"
name = "chainflip-cli"
version = "1.7.0"
version = "1.8.0"

[lints]
workspace = true
Expand Down
2 changes: 1 addition & 1 deletion api/bin/chainflip-lp-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["Chainflip team <https://github.com/chainflip-io>"]
name = "chainflip-lp-api"
version = "1.7.0"
version = "1.8.0"
edition = "2021"

[package.metadata.deb]
Expand Down
2 changes: 1 addition & 1 deletion api/lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "chainflip-api"
version = "1.7.0"
version = "1.8.0"
edition = "2021"

[lints]
Expand Down
4 changes: 2 additions & 2 deletions engine-dylib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ authors = ["Chainflip team <https://github.com/chainflip-io>"]
build = "build.rs"
edition = "2021"
name = "cf-engine-dylib"
version = "1.7.0"
version = "1.8.0"

[lib]
crate-type = ["cdylib"]
name = "chainflip_engine_v1_7_0"
name = "chainflip_engine_v1_8_0"
path = "src/lib.rs"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion engine-proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
name = "engine-proc-macros"
# The version here is the version that will be used for the generated code, and therefore will be the
# suffix of the generated engine entrypoint. TODO: Fix this.
version = "1.7.0"
version = "1.8.0"

[lib]
proc-macro = true
Expand Down
10 changes: 5 additions & 5 deletions engine-runner-bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "engine-runner"
description = "The central runner for the chainflip engine, it requires two shared library versions to run."
# NB: When updating this version, you must update the debian assets appropriately too.
version = "1.7.0"
version = "1.8.0"
authors = ["Chainflip team <https://github.com/chainflip-io>"]
build = "build.rs"
edition = "2021"
Expand All @@ -22,19 +22,19 @@ assets = [
# to specify this. We do this in the `chainflip-engine.service` files, so the user does not need to set it
# manually.
[
"target/release/libchainflip_engine_v1_7_0.so",
"target/release/libchainflip_engine_v1_8_0.so",
# This is the path where the engine dylib is searched for on linux.
# As set in the build.rs file.
"usr/lib/chainflip-engine/libchainflip_engine_v1_7_0.so",
"usr/lib/chainflip-engine/libchainflip_engine_v1_8_0.so",
"755",
],
# The old version gets put into target/release by the package github actions workflow.
# It downloads the correct version from the releases page.
[
"target/release/libchainflip_engine_v1_6_8.so",
"target/release/libchainflip_engine_v1_7_0.so",
# This is the path where the engine dylib is searched for on linux.
# As set in the build.rs file.
"usr/lib/chainflip-engine/libchainflip_engine_v1_6_8.so",
"usr/lib/chainflip-engine/libchainflip_engine_v1_7_0.so",
"755",
],
]
Expand Down
4 changes: 2 additions & 2 deletions engine-runner-bin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use engine_upgrade_utils::{CStrArray, NEW_VERSION, OLD_VERSION};

// Declare the entrypoints into each version of the engine
mod old {
#[engine_proc_macros::link_engine_library_version("1.6.8")]
#[engine_proc_macros::link_engine_library_version("1.7.0")]
extern "C" {
pub fn cfe_entrypoint(
c_args: engine_upgrade_utils::CStrArray,
Expand All @@ -12,7 +12,7 @@ mod old {
}

mod new {
#[engine_proc_macros::link_engine_library_version("1.7.0")]
#[engine_proc_macros::link_engine_library_version("1.8.0")]
extern "C" {
fn cfe_entrypoint(
c_args: engine_upgrade_utils::CStrArray,
Expand Down
4 changes: 2 additions & 2 deletions engine-upgrade-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ pub mod build_helpers;
// rest of the places the version needs changing on build using the build scripts in each of the
// relevant crates.
// Should also check that the compatibility function below `args_compatible_with_old` is correct.
pub const OLD_VERSION: &str = "1.6.8";
pub const NEW_VERSION: &str = "1.7.0";
pub const OLD_VERSION: &str = "1.7.0";
pub const NEW_VERSION: &str = "1.8.0";

pub const ENGINE_LIB_PREFIX: &str = "chainflip_engine_v";
pub const ENGINE_ENTRYPOINT_PREFIX: &str = "cfe_entrypoint_v";
Expand Down
2 changes: 1 addition & 1 deletion engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Chainflip team <https://github.com/chainflip-io>"]
build = "build.rs"
edition = "2021"
name = "chainflip-engine"
version = "1.7.0"
version = "1.8.0"

[lib]
crate-type = ["lib"]
Expand Down
1 change: 0 additions & 1 deletion state-chain/cf-integration-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ mod authorities;
mod funding;
mod genesis;
mod governance;
mod migrations;
mod new_epoch;
mod solana;
mod swapping;
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion state-chain/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "<TODO>"
name = "chainflip-node"
publish = false
repository = "https://github.com/chainflip-io/chainflip-backend"
version = "1.7.0"
version = "1.8.0"

[[bin]]
name = "chainflip-node"
Expand Down
Loading
Loading