From b1801ac272f088fd6525fa16e276b4bf1115d2cf Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Tue, 26 Sep 2023 19:42:51 +0300 Subject: [PATCH 1/6] bump chainspec Signed-off-by: Georgi Zlatarev --- runtime/calamari/src/lib.rs | 2 +- runtime/manta/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index 67db95afc..9a288d8e3 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -143,7 +143,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("calamari"), impl_name: create_runtime_str!("calamari"), authoring_version: 2, - spec_version: 4400, + spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 15, diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index 9d886819c..40066daea 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -145,7 +145,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("manta"), impl_name: create_runtime_str!("manta"), authoring_version: 1, - spec_version: 4400, + spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 4, From 8ed0971422910f2126134c029b60bb411ee42dcd Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Tue, 26 Sep 2023 19:51:18 +0300 Subject: [PATCH 2/6] Update changelog Signed-off-by: Georgi Zlatarev --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be31d7af3..a88fe5bc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # CHANGELOG +## v4.4.0-1 +### Added +- [\#1240](https://github.com/Manta-Network/Manta/pull/1240) :sparkle: org `arc-runner` patch 1 [MACA] +- [\#1241](https://github.com/Manta-Network/Manta/pull/1241) :bug: arc-runner patch 1.1 [MACA] +- [\#1238](https://github.com/Manta-Network/Manta/pull/1238) localdev tests [MA] +- [\#1242](https://github.com/Manta-Network/Manta/pull/1242) :rocket: arc runner migration patch 2.1 [MACA] +- [\#1244](https://github.com/Manta-Network/Manta/pull/1244) more lottery tests [MACA] +- [\#1250](https://github.com/Manta-Network/Manta/pull/1250) :wrench: allow all benchmarks to be triggered on feature branch +- [\#1249](https://github.com/Manta-Network/Manta/pull/1249) Add zombienet examples + +### Fixed +- [\#1234](https://github.com/Manta-Network/Manta/pull/1234) Serialize/deserialize vfr key [MACA] +- [\#1191](https://github.com/Manta-Network/Manta/pull/1191) Fix metadata diff checker workflow [MACA] +- [\#1243](https://github.com/Manta-Network/Manta/pull/1243) Add manta docker image to publish +- [\#1236](https://github.com/Manta-Network/Manta/pull/1236) Update Asset metadata call to not have dummy parameters [MACA] +- [\#1253](https://github.com/Manta-Network/Manta/pull/1253) Fix benchmark [CA] + ## v4.4.0 ### Added - [\#1083](https://github.com/Manta-Network/Manta/pull/1083) tx fees diff support [MACA] From ea2dbb6129ad7772b79fdd2964cf627fac6bcf46 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Sep 2023 04:50:46 +0300 Subject: [PATCH 3/6] BUmp tx version Signed-off-by: Georgi Zlatarev --- runtime/calamari/src/lib.rs | 2 +- runtime/manta/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index 9a288d8e3..37fb1fc44 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -146,7 +146,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, - transaction_version: 15, + transaction_version: 16, state_version: 0, }; diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index 40066daea..9c8af48fe 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -148,7 +148,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, - transaction_version: 4, + transaction_version: 5, state_version: 1, }; From 2f49fe3686eb33d3a957aa8233991e830e276ef9 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Sep 2023 10:36:26 +0300 Subject: [PATCH 4/6] Revert tx-version bump Signed-off-by: Georgi Zlatarev --- runtime/calamari/src/lib.rs | 2 +- runtime/manta/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs index 37fb1fc44..9a288d8e3 100644 --- a/runtime/calamari/src/lib.rs +++ b/runtime/calamari/src/lib.rs @@ -146,7 +146,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, - transaction_version: 16, + transaction_version: 15, state_version: 0, }; diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs index 9c8af48fe..40066daea 100644 --- a/runtime/manta/src/lib.rs +++ b/runtime/manta/src/lib.rs @@ -148,7 +148,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_version: 4401, impl_version: 1, apis: RUNTIME_API_VERSIONS, - transaction_version: 5, + transaction_version: 4, state_version: 1, }; From 480a62065be4ba2a34f2518460010bb15901e07b Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Sep 2023 10:54:35 +0300 Subject: [PATCH 5/6] Revert #1236 Signed-off-by: Georgi Zlatarev --- pallets/asset-manager/src/benchmarking.rs | 2 +- pallets/asset-manager/src/lib.rs | 25 +++++------------------ pallets/asset-manager/src/tests.rs | 8 ++++---- runtime/calamari/src/diff_tx_fees.rs | 2 +- runtime/manta/src/diff_tx_fees.rs | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/pallets/asset-manager/src/benchmarking.rs b/pallets/asset-manager/src/benchmarking.rs index c4f15ab41..37107fe22 100644 --- a/pallets/asset-manager/src/benchmarking.rs +++ b/pallets/asset-manager/src/benchmarking.rs @@ -96,7 +96,7 @@ benchmarks! { let metadata = AssetRegistryMetadata::::testing_default(); Pallet::::register_asset(RawOrigin::Root.into(), location, metadata.clone())?; let some_valid_asset_id = ::AssetId::from(assets_count); - }: _(RawOrigin::Root, some_valid_asset_id, metadata.metadata.clone()) + }: _(RawOrigin::Root, some_valid_asset_id, metadata.clone()) verify { assert_last_event::(crate::Event::AssetMetadataUpdated { asset_id: some_valid_asset_id, metadata }.into()); } diff --git a/pallets/asset-manager/src/lib.rs b/pallets/asset-manager/src/lib.rs index f9ea76f32..4554a726a 100644 --- a/pallets/asset-manager/src/lib.rs +++ b/pallets/asset-manager/src/lib.rs @@ -541,15 +541,14 @@ pub mod pallet { /// /// * `origin`: Caller of this extrinsic, the access control is specified by `ForceOrigin`. /// * `asset_id`: AssetId to be updated. - /// * `metadata`: new `metadata` to be associated with `asset_id`, note `is_frozen` - /// flag in metadata will have no effect and and cannot be changed. + /// * `metadata`: new `metadata` to be associated with `asset_id`. #[pallet::call_index(2)] #[pallet::weight(T::WeightInfo::update_asset_metadata())] #[transactional] pub fn update_asset_metadata( origin: OriginFor, asset_id: T::AssetId, - metadata: AssetStorageMetadata, + metadata: AssetRegistryMetadata, ) -> DispatchResult { T::ModifierOrigin::ensure_origin(origin)?; ensure!( @@ -562,25 +561,11 @@ pub mod pallet { ); >::AssetRegistry::update_asset_metadata( &asset_id, - metadata.clone(), + metadata.clone().into(), )?; - let mut registered_metadata = - AssetIdMetadata::::get(asset_id).ok_or(Error::::UpdateNonExistentAsset)?; - let new_metadata = AssetStorageMetadata { - name: metadata.name, - symbol: metadata.symbol, - decimals: metadata.decimals, - // is frozen flag doesn't do anything in metadata - is_frozen: registered_metadata.metadata.is_frozen, - }; - registered_metadata.metadata = new_metadata; - - AssetIdMetadata::::insert(asset_id, ®istered_metadata); - Self::deposit_event(Event::::AssetMetadataUpdated { - asset_id, - metadata: registered_metadata, - }); + AssetIdMetadata::::insert(asset_id, &metadata); + Self::deposit_event(Event::::AssetMetadataUpdated { asset_id, metadata }); Ok(()) } diff --git a/pallets/asset-manager/src/tests.rs b/pallets/asset-manager/src/tests.rs index 5515a528f..11812a2c3 100644 --- a/pallets/asset-manager/src/tests.rs +++ b/pallets/asset-manager/src/tests.rs @@ -82,7 +82,7 @@ fn wrong_modifier_origin_should_not_work() { AssetManager::update_asset_metadata( RuntimeOrigin::signed([3u8; 32].into()), 0, - asset_metadata.metadata + asset_metadata ), BadOrigin ); @@ -174,14 +174,14 @@ fn update_asset() { AssetManager::update_asset_metadata( RuntimeOrigin::root(), native_asset_id, - new_metadata.metadata.clone(), + new_metadata.clone(), ), Error::::CannotUpdateNativeAssetMetadata ); assert_ok!(AssetManager::update_asset_metadata( RuntimeOrigin::root(), asset_id, - new_metadata.metadata.clone(), + new_metadata.clone(), ),); assert_eq!(Assets::name(&asset_id), new_name); assert_eq!(Assets::symbol(&asset_id), new_symbol); @@ -213,7 +213,7 @@ fn update_asset() { AssetManager::update_asset_metadata( RuntimeOrigin::root(), next_asset_id, - new_metadata.metadata.clone() + new_metadata.clone(), ), Error::::UpdateNonExistentAsset ); diff --git a/runtime/calamari/src/diff_tx_fees.rs b/runtime/calamari/src/diff_tx_fees.rs index 86cc09aeb..ecfd8794d 100644 --- a/runtime/calamari/src/diff_tx_fees.rs +++ b/runtime/calamari/src/diff_tx_fees.rs @@ -1211,7 +1211,7 @@ fn calculate_all_current_extrinsic_tx_fee() -> ( let call = crate::RuntimeCall::AssetManager(pallet_asset_manager::Call::update_asset_metadata { asset_id: 1, - metadata: AssetRegistryMetadata::testing_default().into(), + metadata: AssetRegistryMetadata::testing_default(), }); let (dispatch_info, call_len) = get_call_details(&call); calamari_runtime_calls.push(( diff --git a/runtime/manta/src/diff_tx_fees.rs b/runtime/manta/src/diff_tx_fees.rs index 9a97ebbc7..dcf596c0a 100644 --- a/runtime/manta/src/diff_tx_fees.rs +++ b/runtime/manta/src/diff_tx_fees.rs @@ -1198,7 +1198,7 @@ fn calculate_all_current_extrinsic_tx_fee() -> ( let call = crate::RuntimeCall::AssetManager(pallet_asset_manager::Call::update_asset_metadata { asset_id: 1, - metadata: AssetRegistryMetadata::testing_default().into(), + metadata: AssetRegistryMetadata::testing_default(), }); let (dispatch_info, call_len) = get_call_details(&call); calamari_runtime_calls.push(( From ca51c006292ad2c461a36b95d18140ffea337831 Mon Sep 17 00:00:00 2001 From: Georgi Zlatarev Date: Wed, 27 Sep 2023 11:01:56 +0300 Subject: [PATCH 6/6] update changelog Signed-off-by: Georgi Zlatarev --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a88fe5bc0..93881d34b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ - [\#1234](https://github.com/Manta-Network/Manta/pull/1234) Serialize/deserialize vfr key [MACA] - [\#1191](https://github.com/Manta-Network/Manta/pull/1191) Fix metadata diff checker workflow [MACA] - [\#1243](https://github.com/Manta-Network/Manta/pull/1243) Add manta docker image to publish -- [\#1236](https://github.com/Manta-Network/Manta/pull/1236) Update Asset metadata call to not have dummy parameters [MACA] - [\#1253](https://github.com/Manta-Network/Manta/pull/1253) Fix benchmark [CA] ## v4.4.0