Merge branch 'develop' into dependabot/npm_and_yarn/scripts/cli/shelljs-0.8.5

Author: JMoore96

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "polymesh"
-version = "4.1.0"
+version = "4.1.1"
 authors = ["Polymath"]
 build = "build.rs"
 edition = "2018"

Cargo.toml

@@ -415,7 +415,11 @@ decl_module! {
         ///
         /// ## Errors
         /// - `BadAdmin` if `origin` is not `Self::admin()` account.
-        #[weight = (500_000_000, DispatchClass::Operational, Pays::Yes)]
+        #[weight =(
+            500_000_000 + 7_000_000 * u64::try_from(exempted.len()).unwrap_or_default(),
+            DispatchClass::Operational,
+            Pays::Yes
+        )]
         pub fn change_bridge_exempted(origin, exempted: Vec<(IdentityId, bool)>) -> DispatchResult {
             Self::base_change_bridge_exempted(origin, exempted)
         }

pallets/bridge/src/lib.rs

@@ -127,7 +127,7 @@ decl_module! {
         /// - `AuthorizationError::Expired` if `auth_id` the authorization has expired.
         /// - `AuthorizationError::BadType` if `auth_id` was not a `AddRelayerPayingKey` authorization.
         /// - `NotAuthorizedForUserKey` if `origin` is not authorized to accept the authorization for the `user_key`.
-        /// - `NotAuthorizedForPayingKey` if the authorization was created by a signer that isn't authorized by the `paying_key`.
+        /// - `NotAuthorizedForPayingKey` if the authorization was created an identity different from the `paying_key`'s identity.
         /// - `UserKeyCddMissing` if the `user_key` is not attached to a CDD'd identity.
         /// - `PayingKeyCddMissing` if the `paying_key` is not attached to a CDD'd identity.
         /// - `UnauthorizedCaller` if `origin` is not authorized to call this extrinsic.
@@ -238,15 +238,18 @@ impl<T: Config> Module<T> {
     }
 
     fn base_accept_paying_key(origin: T::Origin, auth_id: u64) -> DispatchResult {
-        let user_key = ensure_signed(origin)?;
+        let caller_key = ensure_signed(origin)?;
         let user_did =
-            <Identity<T>>::get_identity(&user_key).ok_or(Error::<T>::UserKeyCddMissing)?;
-        let signer = Signatory::Account(user_key);
+            <Identity<T>>::get_identity(&caller_key).ok_or(Error::<T>::UserKeyCddMissing)?;
+        let signer = Signatory::Account(caller_key.clone());
 
         <Identity<T>>::accept_auth_with(&signer, auth_id, |data, auth_by| -> DispatchResult {
             let (user_key, paying_key, polyx_limit) =
                 extract_auth!(data, AddRelayerPayingKey(user_key, paying_key, polyx_limit));
 
+            // Allow: `origin == user_key`.
+            ensure!(user_key == caller_key, Error::<T>::NotAuthorizedForUserKey);
+
             Self::auth_accept_paying_key(
                 user_did,
                 auth_by,

pallets/relayer/src/lib.rs

@@ -2,10 +2,8 @@
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
 #![recursion_limit = "256"]
 
-pub mod fee_details;
-pub mod runtime;
-pub use fee_details::CddHandler;
 pub mod constants;
+pub mod runtime;
 #[cfg(feature = "std")]
 pub use pallet_staking::StakerStatus;
 

pallets/runtime/ci/src/fee_details.rs

@@ -1,11 +1,12 @@
 #![allow(clippy::not_unsafe_ptr_arg_deref)]
 
-use crate::{constants::time::*, fee_details::CddHandler};
+use crate::constants::time::*;
 use codec::Encode;
 
 #[cfg(feature = "migration-dry-run")]
 use frame_support::traits::OnRuntimeUpgrade;
 
+use core::convert::TryFrom;
 use frame_support::{
     construct_runtime, parameter_types,
     traits::{tokens::imbalance::SplitTwoWays, KeyOwnerProofSystem},
@@ -61,7 +62,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     // and set impl_version to 0. If only runtime
     // implementation changes and behavior does not, then leave spec_version as
     // is and increment impl_version.
-    spec_version: 3002,
+    spec_version: 3010,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,
@@ -196,6 +197,18 @@ parameter_types! {
 
 polymesh_runtime_common::misc_pallet_impls!();
 
+type CddHandler = polymesh_runtime_common::fee_details::DevCddHandler<Runtime>;
+
+impl<'a> TryFrom<&'a Call> for &'a pallet_test_utils::Call<Runtime> {
+    type Error = ();
+    fn try_from(call: &'a Call) -> Result<&'a pallet_test_utils::Call<Runtime>, ()> {
+        match call {
+            Call::TestUtils(x) => Ok(x),
+            _ => Err(()),
+        }
+    }
+}
+
 impl polymesh_common_utilities::traits::identity::Config for Runtime {
     type Event = Event;
     type Proposal = Call;

pallets/runtime/ci/src/lib.rs

@@ -10,12 +10,15 @@ polymesh-primitives = { path = "../../../primitives", default-features = false }
 
 pallet-asset = { path = "../../asset", default-features = false }
 pallet-balances = { path = "../../balances", default-features = false  }
+pallet-bridge = { path = "../../bridge", default-features = false }
 pallet-committee = { path = "../../committee", default-features = false }
 pallet-compliance-manager = { path = "../../compliance-manager", default-features = false }
 #pallet-contracts = { version = "4.0.0-dev", default-features = false }
 pallet-identity = { path = "../../identity", default-features = false  }
 pallet-multisig = { path = "../../multisig", default-features = false}
 pallet-portfolio = { path = "../../portfolio", default-features = false  }
+pallet-relayer = { path = "../../relayer", default-features = false }
+pallet-test-utils = { path = "../../test-utils", default-features = false }
 
 # RPC
 pallet-group-rpc-runtime-api = { path = "../../group/rpc/runtime-api", default-features = false}