Fix merge conflicts

Signed-off-by: Georgi Zlatarev <[email protected]>

.github/workflows/metadata_diff.yml

@@ -4,7 +4,6 @@ on:
     inputs:
       reference_binary:
         description: The link to the reference binary, which should be the previous release.
-        default: https://github.com/Manta-Network/Manta/releases/download/v4.0.5/manta
         required: true
       chain:
         description: The name of the chain under test. Usually, you would pass a local chain

.github/workflows/run_all_benchmarks.yml

@@ -92,37 +92,37 @@ jobs:
           ./scripts/benchmarking/run_all_benchmarks.sh -b -c $CHAIN_SPEC -s ./$FULL_DB_FOLDER
       - if: always()
         name: upload benchmarking binary
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: manta
           path: ./target/production/manta
       - if: always()
         name: upload frame weights
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: frame-weights-output
           path: ./scripts/benchmarking/frame-weights-output/
       - if: always()
         name: upload xcm weights
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: xcm-weights-output
           path: ./scripts/benchmarking/xcm-weights-output/
       - if: always()
         name: upload benchmarking errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: benchmarks-errors
           path: ./scripts/benchmarking/benchmarking_errors.txt
       - if: always()
         name: upload machine benchmark result
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: machine-benchmark
           path: ./scripts/benchmarking/machine_benchmark_result.txt
       - if: always()
         name: upload storage weights
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: rocksdb-weights
           path: ./scripts/benchmarking/rocksdb_weights.rs

.github/workflows/runtime_upgrade_test.yml

@@ -4,11 +4,9 @@ on:
     inputs:
       manta_base_url:
         description: The base manta binary url, that will be upgraded
-        default: https://github.com/Manta-Network/Manta/releases/download/v4.0.5/manta
         required: true
       polkadot_url:
         description: The polkadot binary url to be used for the relay chain
-        default: https://github.com/paritytech/polkadot/releases/download/v0.9.41/polkadot
         required: true
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v4.0.7
+### Changed
+- [\#1084](https://github.com/Manta-Network/Manta/pull/1084) Use safe-math in xcm `buy_weight` impl [MACA]
+- [\#1093](https://github.com/Manta-Network/Manta/pull/1093) Enable `democracy.external_propose_majority` on calamari [CA]
+- [\#1086](https://github.com/Manta-Network/Manta/pull/1086) Add SBT Registry [CADO]
+
+### Fixed
+- [\#1078](https://github.com/Manta-Network/Manta/pull/1078) Update stress benchmark test [CADO]
+
 ## v4.0.6
 ### Added
 - [\#1067](https://github.com/Manta-Network/Manta/pull/1067) Refactor manta genesis files, add `manta-testnet` [MA]

node/Cargo.toml

@@ -9,7 +9,7 @@ license = 'GPL-3.0'
 name = 'manta'
 repository = 'https://github.com/Manta-Network/Manta/'
 rust-version = '1.62'
-version = '4.0.6'
+version = '4.0.7'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

pallets/asset-manager/Cargo.toml

@@ -5,7 +5,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-asset-manager"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.6'
+version = '4.0.7'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }

pallets/collator-selection/Cargo.toml

@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'manta-collator-selection'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.6'
+version = '4.0.7'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

pallets/manta-pay/Cargo.toml

@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'pallet-manta-pay'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.6'
+version = '4.0.7'
 
 [package.metadata.docs.rs]
 # To build locally:

pallets/manta-sbt/Cargo.toml

@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'pallet-manta-sbt'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.0.6'
+version = '4.0.7'
 
 [[bin]]
 name = "precompute_coins"

pallets/manta-sbt/src/benchmark/mod.rs

@@ -15,8 +15,8 @@
 // along with Manta.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::{
-    benchmark::precomputed_coins::TO_PRIVATE, AccountId, Box, Call, Config, EvmAddressType,
-    MintType, Pallet, Pallet as MantaSBTPallet, TransferPost,
+    benchmark::precomputed_coins::TO_PRIVATE, AccountId, Box, Call, Config, Pallet,
+    Pallet as MantaSBTPallet, TransferPost,
 };
 use frame_benchmarking::{benchmarks, impl_benchmark_test_suite, vec, whitelisted_caller};
 use frame_support::traits::{Currency, Get};
@@ -66,41 +66,60 @@ benchmarks! {
             RawOrigin::Root.into(),
             Some(caller.clone())
         )?;
-        MantaSBTPallet::<T>::set_mint_chain_info(
+        MantaSBTPallet::<T>::new_mint_info(
             RawOrigin::Root.into(),
-            MintType::Bab,
             0_u32.into(),
-            None
+            None,
+            vec![].try_into().unwrap()
         )?;
+        let bab_id = 1;
     }: allowlist_evm_account (
         RawOrigin::Signed(caller),
-        EvmAddressType::Bab(H160::default())
+        bab_id,
+        H160::default()
     )
 
-    set_mint_chain_info {
-    }: set_mint_chain_info (
+    new_mint_info {
+    }: new_mint_info (
         RawOrigin::Root,
-        MintType::Bab,
         5u32.into(),
-        Some(10u32.into())
+        Some(10u32.into()),
+        vec![].try_into().unwrap()
+    )
+
+    update_mint_info {
+        MantaSBTPallet::<T>::new_mint_info(
+            RawOrigin::Root.into(),
+            0_u32.into(),
+            None,
+            vec![].try_into().unwrap()
+        )?;
+    }: update_mint_info (
+        RawOrigin::Root,
+        1,
+        5u32.into(),
+        None,
+        vec![].try_into().unwrap()
     )
 
     mint_sbt_eth {
+        let bab_id = 1;
         let caller: T::AccountId = whitelisted_caller();
         MantaSBTPallet::<T>::change_allowlist_account(
             RawOrigin::Root.into(),
             Some(caller.clone())
         )?;
-        let bab_alice = EvmAddressType::Bab(MantaSBTPallet::<T>::eth_address(&alice()));
-        MantaSBTPallet::<T>::set_mint_chain_info(
+        let bab_alice = MantaSBTPallet::<T>::eth_address(&alice());
+        MantaSBTPallet::<T>::new_mint_info(
             RawOrigin::Root.into(),
-            MintType::Bab,
             0_u32.into(),
-            None
+            None,
+            vec![].try_into().unwrap()
         )?;
 
         MantaSBTPallet::<T>::allowlist_evm_account(
             RawOrigin::Signed(caller.clone()).into(),
+            bab_id,
             bab_alice,
         )?;
         let mint_post = TransferPost::decode(&mut &*TO_PRIVATE).unwrap();
@@ -112,7 +131,7 @@ benchmarks! {
         Box::new(mint_post),
         0,
         signature,
-        bab_alice,
+        bab_id,
         Some(0),
         Some(0),
         Some(vec![0].try_into().unwrap())