diff --git a/Cargo.lock b/Cargo.lock index 09f2ff228..634ae01d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3357,7 +3357,7 @@ dependencies = [ [[package]] name = "gateway" -version = "1.1.0" +version = "1.1.1" dependencies = [ "axelar-wasm-std", "client", @@ -5162,7 +5162,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multisig" -version = "1.1.0" +version = "1.1.1" dependencies = [ "axelar-wasm-std", "client", @@ -5195,7 +5195,7 @@ dependencies = [ [[package]] name = "multisig-prover" -version = "1.1.0" +version = "1.1.1" dependencies = [ "anyhow", "assert_ok", diff --git a/Cargo.toml b/Cargo.toml index 2d73d7a10..f8b73745e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ ethers-core = "2.0.14" events = { version = "^1.0.0", path = "packages/events" } events-derive = { version = "^1.0.0", path = "packages/events-derive" } evm-gateway = { version = "^1.0.0", path = "packages/evm-gateway" } -gateway = { version = "^1.1.0", path = "contracts/gateway" } +gateway = { version = "^1.1.1", path = "contracts/gateway" } gateway-api = { version = "^1.0.0", path = "packages/gateway-api" } goldie = { version = "0.5" } hex = "0.4.3" @@ -46,8 +46,8 @@ itertools = "0.11.0" k256 = { version = "0.13.1", features = ["ecdsa"] } mockall = "0.12.1" msgs-derive = { version = "^1.0.0", path = "packages/msgs-derive" } -multisig = { version = "^1.1.0", path = "contracts/multisig" } -multisig-prover = { version = "^1.1.0", path = "contracts/multisig-prover" } +multisig = { version = "^1.1.1", path = "contracts/multisig" } +multisig-prover = { version = "^1.1.1", path = "contracts/multisig-prover" } num-traits = { version = "0.2.14", default-features = false } quote = "1.0.36" rand = "0.8.5" diff --git a/contracts/gateway/Cargo.toml b/contracts/gateway/Cargo.toml index 532eb18c7..204d90e39 100644 --- a/contracts/gateway/Cargo.toml +++ b/contracts/gateway/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gateway" -version = "1.1.0" +version = "1.1.1" rust-version = { workspace = true } edition = { workspace = true } description = "Gateway contract" diff --git a/contracts/multisig-prover/Cargo.toml b/contracts/multisig-prover/Cargo.toml index f5b6190d8..59ea5a93c 100644 --- a/contracts/multisig-prover/Cargo.toml +++ b/contracts/multisig-prover/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multisig-prover" -version = "1.1.0" +version = "1.1.1" rust-version = { workspace = true } edition = { workspace = true } description = "Multisig prover contract" diff --git a/contracts/multisig-prover/src/contract.rs b/contracts/multisig-prover/src/contract.rs index adbae987e..a2bf58512 100644 --- a/contracts/multisig-prover/src/contract.rs +++ b/contracts/multisig-prover/src/contract.rs @@ -19,7 +19,6 @@ pub const START_MULTISIG_REPLY_ID: u64 = 1; const CONTRACT_NAME: &str = env!("CARGO_PKG_NAME"); const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION"); -const BASE_VERSION: &str = "1.1.0"; #[cfg_attr(not(feature = "library"), entry_point)] pub fn instantiate( @@ -117,13 +116,20 @@ pub fn query( .map_err(axelar_wasm_std::error::ContractError::from) } +// It is valid to migrate from any of the below versions +const BASE_VERSION: &str = "1.1.0"; +const OLD_BASE_VERSION: &str = "1.0.0"; +const PATCH_VERSION: &str = "1.0.1"; #[cfg_attr(not(feature = "library"), entry_point)] pub fn migrate( deps: DepsMut, _env: Env, _msg: Empty, ) -> Result { - cw2::assert_contract_version(deps.storage, CONTRACT_NAME, BASE_VERSION)?; + cw2::assert_contract_version(deps.storage, CONTRACT_NAME, BASE_VERSION) + .or_else(|_| cw2::assert_contract_version(deps.storage, CONTRACT_NAME, PATCH_VERSION)) + .or_else(|_| cw2::assert_contract_version(deps.storage, CONTRACT_NAME, OLD_BASE_VERSION))?; + cw2::set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?; Ok(Response::default()) diff --git a/contracts/multisig/Cargo.toml b/contracts/multisig/Cargo.toml index 6186e6438..40ea941b4 100644 --- a/contracts/multisig/Cargo.toml +++ b/contracts/multisig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multisig" -version = "1.1.0" +version = "1.1.1" rust-version = { workspace = true } edition = { workspace = true } description = "Multisig contract"