Change Fee Handler

pallets/identity/src/auth.rs

@@ -166,6 +166,7 @@ impl<T: Config> Pallet<T> {
             auth.expiry
                 .filter(|&expiry| <pallet_timestamp::Pallet<T>>::get() > expiry)
                 .is_none()
+                && auth.count > 0
         })
     }
 
@@ -224,4 +225,14 @@ impl<T: Config> Pallet<T> {
         }
         Ok(auth)
     }
+
+    /// Decreases the authorization count for the given target and auth_id.
+    pub fn decrease_authorization_count(target: &Signatory<T::AccountId>, auth_id: &u64) {
+        if let Some(mut auth) = Authorizations::<T>::get(target, auth_id) {
+            if auth.count > 0 {
+                auth.count -= 1;
+                Authorizations::<T>::insert(target, auth_id, auth);
+            }
+        }
+    }
 }

pallets/identity/src/lib.rs

@@ -677,10 +677,10 @@ pub mod pallet {
         #[pallet::call_index(2)]
         pub fn accept_primary_key(
             origin: OriginFor<T>,
-            rotation_auth_id: u64,
+            auth_id: u64,
             optional_cdd_auth_id: Option<u64>,
         ) -> DispatchResult {
-            Self::accept_primary_key_rotation(origin, rotation_auth_id, optional_cdd_auth_id)
+            Self::accept_primary_key_rotation(origin, auth_id, optional_cdd_auth_id)
         }
 
         /// Set if CDD authorization is required for updating primary key of an identity.

pallets/runtime/tests/src/committee_test.rs

@@ -63,7 +63,7 @@ fn motions_basic_environment_works_we() {
 
 fn make_proposal(value: u64) -> RuntimeCall {
     RuntimeCall::Identity(identity::Call::accept_primary_key {
-        rotation_auth_id: value,
+        auth_id: value,
         optional_cdd_auth_id: Some(value),
     })
 }

pallets/runtime/tests/src/fee_details.rs

@@ -40,7 +40,7 @@ fn cdd_checks() {
                     &RuntimeCall::MultiSig(multisig::Call::change_sigs_required {
                         sigs_required: 1
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Alice.to_account_id()))
             );
@@ -49,7 +49,7 @@ fn cdd_checks() {
             assert_noop!(
                 CddHandler::get_valid_payer(
                     &RuntimeCall::MultiSig(multisig::Call::accept_multisig_signer { auth_id: 0 }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 InvalidTransaction::Custom(TransactionError::InvalidAuthorization as u8)
             );
@@ -66,7 +66,7 @@ fn cdd_checks() {
                     &RuntimeCall::MultiSig(multisig::Call::accept_multisig_signer {
                         auth_id: alice_auth_id
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );
@@ -78,7 +78,7 @@ fn cdd_checks() {
                         auth_id: alice_auth_id,
                         auth_issuer_pays: true
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );
@@ -90,7 +90,7 @@ fn cdd_checks() {
                         auth_id: alice_auth_id,
                         auth_issuer_pays: false
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Alice.to_account_id()))
             );
@@ -110,7 +110,7 @@ fn cdd_checks() {
                         auth_id: alice_auth_id,
                         auth_issuer_pays: false
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Alice.to_account_id()))
             );
@@ -122,7 +122,7 @@ fn cdd_checks() {
                         auth_id: alice_auth_id,
                         auth_issuer_pays: true
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );
@@ -142,7 +142,7 @@ fn cdd_checks() {
                         auth_id: charlie_auth_id,
                         auth_issuer_pays: true
                     }),
-                    &charlie_account
+                    charlie_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Alice.to_account_id()))
             );
@@ -155,7 +155,7 @@ fn cdd_checks() {
                         auth_id: charlie_auth_id,
                         auth_issuer_pays: false
                     }),
-                    &charlie_account
+                    charlie_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );
@@ -174,7 +174,7 @@ fn cdd_checks() {
                     &RuntimeCall::MultiSig(multisig::Call::accept_multisig_signer {
                         auth_id: alice_auth_id
                     }),
-                    &alice_account
+                    alice_account.clone()
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );
@@ -185,7 +185,7 @@ fn cdd_checks() {
                     &RuntimeCall::MultiSig(multisig::Call::change_sigs_required {
                         sigs_required: 1
                     }),
-                    &charlie_account
+                    charlie_account
                 ),
                 Ok(Some(AccountKeyring::Charlie.to_account_id()))
             );

pallets/runtime/tests/src/identity_test.rs

@@ -461,7 +461,7 @@ fn frozen_secondary_keys_cdd_verification_test_we() {
             value: 1_000,
             memo: None,
         }),
-        &AccountKeyring::Bob.to_account_id(),
+        AccountKeyring::Bob.to_account_id(),
     );
     assert!(payer.is_ok());
 

pallets/runtime/tests/src/relayer_test.rs

@@ -675,7 +675,7 @@ fn do_relayer_accept_cdd_and_fees_test() {
     assert_eq!(
         CddHandler::get_valid_payer(
             &DevRuntimeCall::Relayer(pallet_relayer::Call::accept_paying_key { auth_id }),
-            &bob.acc()
+            bob.acc()
         ),
         Ok(Some(alice.acc()))
     );

pallets/runtime/tests/src/staking/mock.rs

@@ -347,7 +347,7 @@ impl pallet_preimage::Config for Test {
 impl polymesh_primitives::traits::CddAndFeeDetails<AccountId, Call> for Test {
     fn get_valid_payer(
         _: &Call,
-        _: &AccountId,
+        _: AccountId,
     ) -> Result<Option<AccountId>, sp_runtime::transaction_validity::InvalidTransaction> {
         Ok(None)
     }
@@ -356,6 +356,12 @@ impl polymesh_primitives::traits::CddAndFeeDetails<AccountId, Call> for Test {
     fn get_payer_from_context() -> Option<AccountId> {
         None
     }
+    fn decrease_authorization_count(
+        _caller: &AccountId,
+        _call: &Call,
+        _call_result: &DispatchResult,
+    ) {
+    }
 }
 
 impl SubsidiserTrait<AccountId, RuntimeCall> for Test {

pallets/runtime/tests/src/storage.rs

@@ -502,9 +502,8 @@ type CddHandler = TestStorage;
 impl CddAndFeeDetails<AccountId, RuntimeCall> for TestStorage {
     fn get_valid_payer(
         _: &RuntimeCall,
-        caller: &AccountId,
+        caller: AccountId,
     ) -> Result<Option<AccountId>, InvalidTransaction> {
-        let caller: AccountId = caller.clone();
         Ok(Some(caller))
     }
     fn clear_context() {
@@ -516,6 +515,12 @@ impl CddAndFeeDetails<AccountId, RuntimeCall> for TestStorage {
     fn get_payer_from_context() -> Option<AccountId> {
         Context::current_payer::<Identity>()
     }
+    fn decrease_authorization_count(
+        _caller: &AccountId,
+        _call: &RuntimeCall,
+        _call_result: &DispatchResult,
+    ) {
+    }
 }
 
 pub struct WeightToFee;

pallets/transaction-payment/src/lib.rs

@@ -760,7 +760,7 @@ where
 
     fn withdraw_fee(
         &self,
-        who: &T::AccountId,
+        who: T::AccountId,
         call: &T::RuntimeCall,
         info: &DispatchInfoOf<T::RuntimeCall>,
         len: usize,
@@ -858,6 +858,8 @@ where
         <<T as Config>::OnChargeTransaction as OnChargeTransaction<T>>::LiquidityInfo,
         // Polymesh: Subsidiser
         Option<Self::AccountId>,
+        // The call being charged.
+        T::RuntimeCall,
     );
     fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> {
         Ok(())
@@ -872,7 +874,7 @@ where
     ) -> TransactionValidity {
         let tip = self.ensure_valid_tip(who, info)?;
 
-        let (_fee, _, _) = self.withdraw_fee(who, call, info, len)?;
+        let (_fee, _, _) = self.withdraw_fee(who.clone(), call, info, len)?;
         // Polymesh: `tip` can only be used by GC/CDD members.
         Ok(ValidTransaction {
             priority: tip.saturated_into::<TransactionPriority>(),
@@ -888,21 +890,25 @@ where
         len: usize,
     ) -> Result<Self::Pre, TransactionValidityError> {
         let tip = self.ensure_valid_tip(who, info)?;
-        let (_fee, imbalance, subsidiser) = self.withdraw_fee(who, call, info, len)?;
-        Ok((tip, who.clone(), imbalance, subsidiser))
+        let (_fee, imbalance, subsidiser) = self.withdraw_fee(who.clone(), call, info, len)?;
+        Ok((tip, who.clone(), imbalance, subsidiser, call.clone()))
     }
 
     fn post_dispatch(
         pre: Option<Self::Pre>,
         info: &DispatchInfoOf<Self::Call>,
         post_info: &PostDispatchInfoOf<Self::Call>,
         len: usize,
-        _result: &DispatchResult,
+        result: &DispatchResult,
     ) -> Result<(), TransactionValidityError> {
-        let (tip, who, imbalance, subsidiser) = match pre {
+        let (tip, who, imbalance, subsidiser, call) = match pre {
             Some(pre) => pre,
             None => return Ok(()),
         };
+
+        // We want to decrease the counter of Authorization.count when the caller is not paying for the fee and the call failed
+        T::CddHandler::decrease_authorization_count(&who, &call, result);
+
         let actual_fee = Pallet::<T>::compute_actual_fee(len as u32, info, post_info, tip);
 
         // Fee returned to original payer.

primitives/src/traits.rs

@@ -31,13 +31,22 @@ pub use asset::*;
 
 // Polymesh note: This was specifically added for Polymesh
 pub trait CddAndFeeDetails<AccountId, Call> {
+    /// Returns the account that will pay for the call.
     fn get_valid_payer(
         call: &Call,
-        caller: &AccountId,
+        caller: AccountId,
     ) -> Result<Option<AccountId>, InvalidTransaction>;
+    /// Clears context. Should be called in post_dispatch
     fn clear_context();
+    /// Sets payer in context. Should be called by the signed extension that first charges fee.
     fn set_payer_context(payer: Option<AccountId>);
+    /// Fetches fee payer for further payments (forwarded calls)
     fn get_payer_from_context() -> Option<AccountId>;
+    /// Decreases the authorization count if any of the following extrinsics failed:
+    /// - pallet-identity (accept_primary_key, join_identity_as_key, rotate_primary_key_to_secondary)
+    /// - pallet-relayer (accept_paying_key)
+    /// - pallet-multisig (accept_multisig_signer)
+    fn decrease_authorization_count(caller: &AccountId, call: &Call, call_result: &DispatchResult);
 }
 
 pub trait CheckCdd<AccountId> {