PolymeshAssociation
diff --git a/‎Cargo.toml‎
Lines changed: 24 additions & 13 deletions b/‎Cargo.toml‎
Lines changed: 24 additions & 13 deletions
diff --git a/‎integration/tests/multisig_permissions.rs‎
Lines changed: 5 additions & 0 deletions b/‎integration/tests/multisig_permissions.rs‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎pallets/asset/src/lib.rs‎
Lines changed: 6 additions & 17 deletions b/‎pallets/asset/src/lib.rs‎
Lines changed: 6 additions & 17 deletions
diff --git a/‎pallets/compliance-manager/src/lib.rs‎
Lines changed: 1 addition & 1 deletion b/‎pallets/compliance-manager/src/lib.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pallets/contracts/src/benchmarking.rs‎
Lines changed: 12 additions & 16 deletions b/‎pallets/contracts/src/benchmarking.rs‎
Lines changed: 12 additions & 16 deletions
diff --git a/‎pallets/identity/src/benchmarking.rs‎
Lines changed: 14 additions & 51 deletions b/‎pallets/identity/src/benchmarking.rs‎
Lines changed: 14 additions & 51 deletions
@@ -55,11 +55,7 @@ members = [
     "rpc/runtime-api",
     "pallets/common",
 ]
-exclude = [
-    "contracts",
-    "integration",
-    "metadata-tools"
-]
+exclude = ["contracts", "integration", "metadata-tools"]
 
 ## Keep common dependencies here.
 [workspace.dependencies]
@@ -113,8 +109,13 @@ polymesh-runtime-testnet = { path = "pallets/runtime/testnet" }
 polymesh-build-tool = { path = "pallets/runtime/build_tool", default-features = false }
 
 # SCALE Codec deps.
-codec = { package = "parity-scale-codec", version = "3.7.4", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.11.6", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.7.4", default-features = false, features = [
+    "derive",
+    "max-encoded-len",
+] }
+scale-info = { version = "2.11.6", default-features = false, features = [
+    "derive",
+] }
 
 # Substrate pallet/runtime deps.
 frame-benchmarking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
@@ -131,7 +132,9 @@ mmr-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch
 pallet-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
 pallet-authorship = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
 pallet-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
-pallet-balances = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false, features = ['insecure_zero_ed'] }
+pallet-balances = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false, features = [
+    'insecure_zero_ed',
+] }
 pallet-beefy = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
 pallet-beefy-mmr = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
 pallet-contracts = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v8-stable2512", default-features = false }
@@ -268,7 +271,10 @@ polymesh-runtime-testnet = { workspace = true }
 futures = "0.3.21"
 jsonrpsee = { version = "0.24.9", features = ["server"] }
 log = "0.4"
-serde = { version = "1.0.136", default-features = false, features = ["alloc", "derive"] }
+serde = { version = "1.0.136", default-features = false, features = [
+    "alloc",
+    "derive",
+] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 clap = { version = "4.0.9", features = ["derive"] }
 rustc-hex = "2.1.0"
@@ -302,13 +308,18 @@ sc-transaction-pool-api = { workspace = true }
 sc-offchain = { workspace = true }
 
 # Substrate
-codec = { package = "parity-scale-codec", version = "3.7.4", default-features = false, features = ["derive", "max-encoded-len"] }
+codec = { package = "parity-scale-codec", version = "3.7.4", default-features = false, features = [
+    "derive",
+    "max-encoded-len",
+] }
 frame-metadata-hash-extension = { workspace = true, default-features = false }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 pallet-babe = { workspace = true }
-pallet-balances = { workspace = true, default-features = false, features = ["insecure_zero_ed"] }
+pallet-balances = { workspace = true, default-features = false, features = [
+    "insecure_zero_ed",
+] }
 pallet-im-online = { workspace = true }
 pallet-indices = { workspace = true }
 pallet-session = { workspace = true }
@@ -353,7 +364,7 @@ disable_fees = [
     "polymesh-runtime-mainnet/disable_fees",
     "polymesh-runtime-testnet/disable_fees",
 ]
-running-ci = [ "polymesh-runtime-develop/running-ci" ]
+running-ci = ["polymesh-runtime-develop/running-ci"]
 runtime-benchmarks = [
     "frame-benchmarking/runtime-benchmarks",
     "frame-benchmarking-cli/runtime-benchmarks",
@@ -364,7 +375,7 @@ runtime-benchmarks = [
 ]
 
 # Only build a "ci" runtime.
-ci-runtime = [ "polymesh-runtime-develop/ci-runtime" ]
+ci-runtime = ["polymesh-runtime-develop/ci-runtime"]
 
 metadata-hash = [
     "polymesh-runtime-develop/metadata-hash",
 
@@ -182,11 +182,16 @@ impl MuliSigState {
             .await?
             .expect("Missing RotatePrimaryKey auth id");
 
+        #[cfg(feature = "previous_release")]
         let rotate_primary_call = self
             .api
             .call()
             .identity()
             .accept_primary_key(auth_id, None)?;
+
+        #[cfg(feature = "current_release")]
+        let rotate_primary_call = self.api.call().identity().accept_primary_key(auth_id)?;
+
         self.run_proposal(rotate_primary_call).await
     }
 
 
@@ -1800,10 +1800,8 @@ pub mod pallet {
         InvalidTransferFrozenAsset,
         /// Failed to transfer an NFT - compliance failed.
         InvalidTransferComplianceFailure,
-        /// Failed to transfer the asset - receiver cdd is not valid.
-        InvalidTransferInvalidReceiverCDD,
-        /// Failed to transfer the asset - sender cdd is not valid.
-        InvalidTransferInvalidSenderCDD,
+        /// Failed to transfer the asset - receiver DID is not active.
+        InvalidTransferInvalidReceiverDID,
         /// The ticker registration associated to the ticker was not found.
         TickerRegistrationNotFound,
         /// The given ticker is already linked to an asset.
@@ -3112,13 +3110,8 @@ impl<T: AssetConfig> Pallet<T> {
         );
 
         ensure!(
-            IdentityPallet::<T>::has_valid_cdd(receiver_portfolio.did),
-            Error::<T>::InvalidTransferInvalidReceiverCDD
-        );
-
-        ensure!(
-            IdentityPallet::<T>::has_valid_cdd(sender_portfolio.did),
-            Error::<T>::InvalidTransferInvalidSenderCDD
+            IdentityPallet::<T>::is_did_active(receiver_portfolio.did),
+            Error::<T>::InvalidTransferInvalidReceiverDID
         );
 
         // Verifies that the statistics restrictions are satisfied
@@ -3213,12 +3206,8 @@ impl<T: AssetConfig> Pallet<T> {
             }
         }
 
-        if !IdentityPallet::<T>::has_valid_cdd(receiver_portfolio.did) {
-            asset_transfer_errors.push(Error::<T>::InvalidTransferInvalidReceiverCDD.into());
-        }
-
-        if !IdentityPallet::<T>::has_valid_cdd(sender_portfolio.did) {
-            asset_transfer_errors.push(Error::<T>::InvalidTransferInvalidSenderCDD.into());
+        if !IdentityPallet::<T>::is_did_active(receiver_portfolio.did) {
+            asset_transfer_errors.push(Error::<T>::InvalidTransferInvalidReceiverDID.into());
         }
 
         if Frozen::<T>::get(asset_id) {
 
@@ -581,7 +581,7 @@ impl<T: Config> Pallet<T> {
         issuer: TrustedIssuer,
     ) -> DispatchResult {
         ensure!(
-            <Identity<T>>::is_identity_exists(&issuer.issuer),
+            <Identity<T>>::is_did_active(issuer.issuer),
             Error::<T>::DidNotExist
         );
 
 
@@ -26,7 +26,7 @@ use sp_runtime::Perbill;
 use sp_std::prelude::*;
 use wasm_instrument::parity_wasm::elements::{Instruction, ValueType};
 
-use pallet_identity::benchmarking::{cdd_provider, user, User, UserBuilder};
+use pallet_identity::benchmarking::{did_registrar, user, User, UserBuilder};
 use pallet_identity::ParentDid;
 use polymesh_primitives::asset::AssetId;
 use polymesh_primitives::constants::currency::POLY;
@@ -88,22 +88,18 @@ where
     }
 
     fn register_did(account_id: T::AccountId) -> DispatchResult {
-        let cdd_provider_origin = {
-            match T::CddServiceProviders::get_members().first() {
-                Some(cdd_did) => {
-                    let cdd_acc = pallet_identity::Pallet::<T>::get_primary_key(*cdd_did).unwrap();
-                    RawOrigin::Signed(cdd_acc).into()
+        let did_registrar_origin = {
+            match T::DidRegistrars::get_members().first() {
+                Some(did_registrar) => {
+                    let did_registrar_acc =
+                        pallet_identity::Pallet::<T>::get_primary_key(*did_registrar).unwrap();
+                    RawOrigin::Signed(did_registrar_acc).into()
                 }
-                None => cdd_provider::<T>("cdd", 0).origin.into(),
+                None => did_registrar::<T>("did_registrar", 0).origin.into(),
             }
         };
 
-        pallet_identity::Pallet::<T>::cdd_register_did_with_cdd(
-            cdd_provider_origin,
-            account_id.into(),
-            Vec::new(),
-            None,
-        )
+        pallet_identity::Pallet::<T>::register_did(did_registrar_origin, account_id)
     }
 }
 
@@ -188,7 +184,7 @@ where
         let caller = UserBuilder::<T>::default()
             .seed(SEED)
             .generate_did()
-            .become_cdd_provider()
+            .become_did_registrar()
             .build("Caller");
         T::Currency::make_free_balance_be(&caller.account(), 1_000_000 * POLY);
 
@@ -510,7 +506,7 @@ benchmarks! {
     link_contract_as_secondary_key {
         let alice = UserBuilder::<T>::default()
             .generate_did()
-            .become_cdd_provider()
+            .become_did_registrar()
             .build("Alice");
         T::Currency::make_free_balance_be(&alice.account(), 1_000_000 * POLY);
         let caller = alice.account();
@@ -525,7 +521,7 @@ benchmarks! {
     link_contract_as_primary_key {
         let alice = UserBuilder::<T>::default()
             .generate_did()
-            .become_cdd_provider()
+            .become_did_registrar()
             .build("Alice");
         T::Currency::make_free_balance_be(&alice.account(), 1_000_000 * POLY);
         let caller = alice.account();
 
@@ -16,7 +16,6 @@
 use crate::*;
 
 use frame_benchmarking::{account, benchmarks};
-use frame_system::RawOrigin;
 use polymesh_common_utilities::identity::TargetIdAuthorization;
 use polymesh_primitives::asset::AssetId;
 use polymesh_primitives::identity::limits::{
@@ -113,32 +112,32 @@ benchmarks! {
         let cdd_claim = Claim::CustomerDueDiligence(CddId::default());
 
         // Add CDD claim to the child identity.
-        let cdd = cdd_provider::<T>("cdd", 0).did.unwrap();
+        let cdd = did_registrar::<T>("cdd", 0).did.unwrap();
         Pallet::<T>::unverified_add_claim_with_scope(child_did, cdd_claim, None, cdd, None);
 
     }: _(parent.origin, child_did)
     verify {
-        assert!(Pallet::<T>::has_valid_cdd(child_did));
+        assert!(Pallet::<T>::is_did_active(child_did));
+    }
+
+    register_did {
+        let registrar = did_registrar::<T>("registrar", 0);
+        let target: T::AccountId = account("target", SEED, SEED);
+    }: _(registrar.origin, target.clone())
+    verify {
+        let did = Pallet::<T>::get_identity(&target).expect("target should have a DID");
+        assert!(Pallet::<T>::is_did_active(did));
     }
 
     cdd_register_did {
         // Number of secondary items.
         let i in 0 .. MAX_SECONDARY_KEYS;
 
-        let cdd = cdd_provider::<T>("cdd", 0);
+        let cdd = did_registrar::<T>("cdd", 0);
         let target: T::AccountId = account("target", SEED, SEED);
         let secondary_keys = generate_secondary_keys::<T>(i as usize);
     }: _(cdd.origin, target, secondary_keys)
 
-    invalidate_cdd_claims {
-        // NB: This function loops over all cdd claims issued by the cdd provider.
-        // Therefore, it's unbounded in complexity. However, this can only be called by governance.
-        // Hence, the weight is for best case scenario
-
-        let cdd = cdd_provider::<T>("cdd", 0);
-
-    }: _(RawOrigin::Root, cdd.did(), 0u32.into(), None)
-
     remove_secondary_keys {
         // Number of secondary items.
         let i in 0 .. MAX_SECONDARY_KEYS;
@@ -154,67 +153,31 @@ benchmarks! {
     }: _(target.origin, signatories.clone())
 
     accept_primary_key {
-        let cdd = cdd_provider::<T>("cdd", 0);
         let target = user::<T>("target", 0);
         let new_key = UserBuilder::<T>::default().build("key");
         let signatory = Signatory::Account(new_key.account());
 
-        let cdd_auth_id =  Pallet::<T>::add_auth(
-            cdd.did(), signatory.clone(),
-            AuthorizationData::AttestPrimaryKeyRotation(target.did()),
-            None,
-        )
-        .unwrap();
-        Pallet::<T>::change_cdd_requirement_for_mk_rotation(
-            RawOrigin::Root.into(),
-            true
-        ).unwrap();
-
         let owner_auth_id =  Pallet::<T>::add_auth(
             target.did(), signatory,
             AuthorizationData::RotatePrimaryKey,
             None,
         ).
         unwrap();
-    }: _(new_key.origin, owner_auth_id, Some(cdd_auth_id))
+    }: _(new_key.origin, owner_auth_id)
 
     rotate_primary_key_to_secondary {
-        let cdd = cdd_provider::<T>("cdd", 0);
         let target = user::<T>("target", 0);
         let new_key = UserBuilder::<T>::default().build("key");
         let signatory = Signatory::Account(new_key.account());
 
-        let cdd_auth_id =  Pallet::<T>::add_auth(
-            cdd.did(), signatory.clone(),
-            AuthorizationData::AttestPrimaryKeyRotation(target.did()),
-            None,
-        )
-        .unwrap();
         let rotate_auth_id =  Pallet::<T>::add_auth(
             target.did(), signatory.clone(),
             AuthorizationData::RotatePrimaryKeyToSecondary(Permissions::default()),
             None,
         )
         .unwrap();
-        Pallet::<T>::change_cdd_requirement_for_mk_rotation(
-            RawOrigin::Root.into(),
-            true
-        ).unwrap();
-
-    }: _(new_key.origin, rotate_auth_id, Some(cdd_auth_id))
 
-    change_cdd_requirement_for_mk_rotation {
-        assert!(
-            !CddAuthForPrimaryKeyRotation::<T>::get(),
-            "CDD auth for primary key rotation is enabled"
-        );
-    }: _(RawOrigin::Root, true)
-    verify {
-        assert!(
-            CddAuthForPrimaryKeyRotation::<T>::get(),
-            "CDD auth for primary key rotation did not change"
-        );
-    }
+    }: _(new_key.origin, rotate_auth_id)
 
     join_identity_as_key {
         let target = user::<T>("target", 0);