Rev namespace for abstract (#524)

Signed-off-by: Buckram <[email protected]>

Author: Buckram123

framework/contracts/native/registry/src/contract.rs

@@ -4,7 +4,7 @@ pub(crate) use abstract_std::objects::namespace::ABSTRACT_NAMESPACE;
 use abstract_std::{
     objects::namespace::Namespace,
     registry::{
-        state::{LOCAL_ACCOUNT_SEQUENCE, NAMESPACES},
+        state::{LOCAL_ACCOUNT_SEQUENCE, NAMESPACES, REV_NAMESPACES},
         Config,
     },
 };
@@ -46,11 +46,9 @@ pub fn instantiate(deps: DepsMut, _env: Env, _info: MessageInfo, msg: Instantiat
     cw_ownable::initialize_owner(deps.storage, deps.api, Some(&admin))?;
 
     // Save the abstract namespace to the Abstract admin account
-    NAMESPACES.save(
-        deps.storage,
-        &Namespace::new(ABSTRACT_NAMESPACE)?,
-        &ABSTRACT_ACCOUNT_ID,
-    )?;
+    let namespace = Namespace::new(ABSTRACT_NAMESPACE)?;
+    NAMESPACES.save(deps.storage, &namespace, &ABSTRACT_ACCOUNT_ID)?;
+    REV_NAMESPACES.save(deps.storage, &ABSTRACT_ACCOUNT_ID, &namespace)?;
 
     LOCAL_ACCOUNT_SEQUENCE.save(deps.storage, &0)?;
 

framework/contracts/native/registry/src/migrate.rs

@@ -1,5 +1,9 @@
 use abstract_std::{
-    objects::{module_version::assert_cw_contract_upgrade, namespace::Namespace, AccountId},
+    objects::{
+        module_version::assert_cw_contract_upgrade,
+        namespace::{Namespace, ABSTRACT_NAMESPACE},
+        AccountId, ABSTRACT_ACCOUNT_ID,
+    },
     registry::{
         state::{NAMESPACES, REV_NAMESPACES},
         MigrateMsg,
@@ -47,7 +51,14 @@ pub fn migrate(deps: DepsMut, env: Env, msg: MigrateMsg) -> VCResult {
             let namespaces_info = NAMESPACES_INFO
                 .range(deps.storage, None, None, Order::Ascending)
                 .collect::<StdResult<Vec<_>>>()?;
-            for (namespace, account_id) in namespaces_info {
+            for (namespace, account_id) in namespaces_info
+                .into_iter()
+                // Make sure abstract included
+                .chain(std::iter::once((
+                    Namespace::new(ABSTRACT_NAMESPACE)?,
+                    ABSTRACT_ACCOUNT_ID,
+                )))
+            {
                 NAMESPACES.save(deps.storage, &namespace, &account_id)?;
                 REV_NAMESPACES.save(deps.storage, &account_id, &namespace)?;
             }