From 07dfeb61828eb5030ba7d1c6ae926acccbf2a2bf Mon Sep 17 00:00:00 2001 From: kylezs Date: Tue, 1 Oct 2024 08:49:53 +0200 Subject: [PATCH 1/2] chore: bump asset-balances to match release --- state-chain/pallets/cf-asset-balances/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/state-chain/pallets/cf-asset-balances/src/lib.rs b/state-chain/pallets/cf-asset-balances/src/lib.rs index a703cee9b8..9c1bc4b052 100644 --- a/state-chain/pallets/cf-asset-balances/src/lib.rs +++ b/state-chain/pallets/cf-asset-balances/src/lib.rs @@ -26,7 +26,7 @@ mod mock; #[cfg(test)] mod tests; -pub const PALLET_VERSION: StorageVersion = StorageVersion::new(0); +pub const PALLET_VERSION: StorageVersion = StorageVersion::new(1); pub const REFUND_FEE_MULTIPLE: AssetAmount = 100; From 0f747295c5a9be8b6fa3c1537954c7ebe149ef87 Mon Sep 17 00:00:00 2001 From: kylezs Date: Tue, 1 Oct 2024 11:53:40 +0200 Subject: [PATCH 2/2] chore: use 1.6.7 dylib --- engine-runner-bin/Cargo.toml | 4 ++-- engine-runner-bin/src/main.rs | 2 +- engine-upgrade-utils/src/lib.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/engine-runner-bin/Cargo.toml b/engine-runner-bin/Cargo.toml index ee4204e07a..7423599587 100644 --- a/engine-runner-bin/Cargo.toml +++ b/engine-runner-bin/Cargo.toml @@ -31,10 +31,10 @@ assets = [ # 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_3.so", + "target/release/libchainflip_engine_v1_6_7.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_3.so", + "usr/lib/chainflip-engine/libchainflip_engine_v1_6_7.so", "755", ], ] diff --git a/engine-runner-bin/src/main.rs b/engine-runner-bin/src/main.rs index 0b087873c2..f1314404a3 100644 --- a/engine-runner-bin/src/main.rs +++ b/engine-runner-bin/src/main.rs @@ -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.3")] + #[engine_proc_macros::link_engine_library_version("1.6.7")] extern "C" { pub fn cfe_entrypoint( c_args: engine_upgrade_utils::CStrArray, diff --git a/engine-upgrade-utils/src/lib.rs b/engine-upgrade-utils/src/lib.rs index c774094dfa..b9c0296e15 100644 --- a/engine-upgrade-utils/src/lib.rs +++ b/engine-upgrade-utils/src/lib.rs @@ -10,7 +10,7 @@ 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.3"; +pub const OLD_VERSION: &str = "1.6.7"; pub const NEW_VERSION: &str = "1.7.0"; pub const ENGINE_LIB_PREFIX: &str = "chainflip_engine_v";