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

Prepare release 4.3.2 #1262

Merged
merged 2 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 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 common/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ macro_rules! mock_assets_config {
macro_rules! mock_band_config {
($runtime:ty, $on_new_symbol_relayed_hook:ty, $on_symbol_disabled_hook:ty) => {
frame_support::parameter_types! {
pub const GetBandRateStalePeriod: u64 = 60*5*1000; // 5 minutes
pub const GetBandRateStalePeriod: u64 = 60*10*1000; // 10 minutes
pub const GetBandRateStaleBlockPeriod: u64 = 600;
}
impl band::Config for $runtime {
Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "framenode"
version = "4.3.1"
version = "4.3.2"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion node/chain_spec/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "framenode-chain-spec"
version = "4.3.1"
version = "4.3.2"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"

Expand Down
8 changes: 8 additions & 0 deletions pallets/bridge-proxy/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@ impl<T: Config> Pallet<T> {
network_id,
))
}

pub fn reset_locked_assets(
network_id: GenericNetworkId,
asset_id: AssetIdOf<T>,
) -> DispatchResult {
LockedAssets::<T>::remove(network_id, asset_id);
Ok(())
}
}

impl<T: Config> BridgeAssetLocker<T::AccountId> for Pallet<T> {
Expand Down
8 changes: 8 additions & 0 deletions pallets/eth-bridge/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,14 @@ impl<T: Config> Pallet<T> {
}
Ok(network_id)
}

pub fn remove_thischain_asset(
network_id: T::NetworkId,
asset_id: AssetIdOf<T>,
) -> DispatchResult {
RegisteredAsset::<T>::remove(network_id, asset_id);
Ok(())
}
}

impl<T: Config> BridgeApp<T::AccountId, EthAddress, T::AssetId, Balance> for Pallet<T> {
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "BSD-4-Clause"
homepage = "https://sora.org"
repository = "https://github.com/sora-xor/sora2-network"
name = "framenode-runtime"
version = "4.3.1"
version = "4.3.2"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
6 changes: 3 additions & 3 deletions runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("sora-substrate"),
impl_name: create_runtime_str!("sora-substrate"),
authoring_version: 1,
spec_version: 103,
spec_version: 104,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 103,
transaction_version: 104,
state_version: 0,
};

Expand Down Expand Up @@ -1969,7 +1969,7 @@ impl oracle_proxy::Config for Runtime {
}

parameter_types! {
pub const GetBandRateStalePeriod: Moment = 60*5*1000; // 5 minutes
pub const GetBandRateStalePeriod: Moment = 60*10*1000; // 10 minutes
vovac12 marked this conversation as resolved.
Show resolved Hide resolved
pub const GetBandRateStaleBlockPeriod: u32 = 600; // 1 hour in blocks
pub const BandMaxRelaySymbols: u32 = 100;
}
Expand Down
6 changes: 6 additions & 0 deletions runtime/src/migrations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ impl OnRuntimeUpgrade for DenominateVXor {
}
}

crate::EthBridge::remove_thischain_asset(0, common::VXOR)?;
crate::BridgeProxy::reset_locked_assets(
bridge_types::GenericNetworkId::EVMLegacy(0),
common::VXOR,
)?;

DispatchResult::Ok(())
});
if let Err(err) = result {
Expand Down
Loading