Set the empty contract create value to Anyone

Author: teor2345

domains/client/domain-operator/src/tests.rs

@@ -393,7 +393,7 @@ async fn test_evm_domain_create_contracts_with_allow_list() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -579,7 +579,7 @@ async fn test_evm_domain_create_contracts_with_allow_list() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -769,7 +769,7 @@ async fn test_evm_domain_create_contracts_with_allow_list() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -4647,8 +4647,9 @@ async fn test_domain_sudo_calls() {
     produce_blocks!(ferdie, alice, 3).await.unwrap();
 
     // check initial contract allow list
-    assert!(
-        alice.evm_contract_creation_allowed_by() == Some(PermissionedActionAllowedBy::Anyone),
+    assert_eq!(
+        alice.evm_contract_creation_allowed_by(),
+        PermissionedActionAllowedBy::Anyone,
         "initial contract allow list should be anyone"
     );
 
@@ -4683,7 +4684,7 @@ async fn test_domain_sudo_calls() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -4713,7 +4714,7 @@ async fn test_domain_sudo_calls() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -4743,7 +4744,7 @@ async fn test_domain_sudo_calls() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();
@@ -4773,7 +4774,7 @@ async fn test_domain_sudo_calls() {
 
     // Wait until list is updated
     produce_blocks_until!(ferdie, alice, {
-        alice.evm_contract_creation_allowed_by().as_ref() == Some(&allow_list)
+        alice.evm_contract_creation_allowed_by() == allow_list
     })
     .await
     .unwrap();

domains/pallets/evm-tracker/src/lib.rs

@@ -31,6 +31,7 @@ use sp_domains::PermissionedActionAllowedBy;
 
 #[frame_support::pallet]
 mod pallet {
+    use codec::Codec;
     use frame_support::pallet_prelude::*;
     use frame_system::pallet_prelude::*;
     use sp_core::U256;
@@ -55,7 +56,16 @@ mod pallet {
     // be updated.
     #[pallet::storage]
     pub(super) type ContractCreationAllowedBy<T: Config> =
-        StorageValue<_, PermissionedActionAllowedBy<T::AccountId>, OptionQuery>;
+        StorageValue<_, PermissionedActionAllowedBy<T::AccountId>, ValueQuery, DefaultToAnyone>;
+
+    /// Default value for ContractCreationAllowedBy if it is not set.
+    pub struct DefaultToAnyone;
+
+    impl<AccountId: Codec + Clone> Get<PermissionedActionAllowedBy<AccountId>> for DefaultToAnyone {
+        fn get() -> PermissionedActionAllowedBy<AccountId> {
+            PermissionedActionAllowedBy::Anyone
+        }
+    }
 
     /// Pallet EVM account nonce tracker.
     #[pallet::pallet]
@@ -100,23 +110,17 @@ impl<T: Config> Pallet<T> {
 
     /// Returns true if the account is allowed to create contracts.
     pub fn is_allowed_to_create_contracts(signer: &T::AccountId) -> bool {
-        // Unlike domain instantiation, no storage value means "anyone can create contracts".
-        ContractCreationAllowedBy::<T>::get()
-            .map(|allowed_by| allowed_by.is_allowed(signer))
-            .unwrap_or(true)
+        ContractCreationAllowedBy::<T>::get().is_allowed(signer)
     }
 
     /// Returns true if the account is allowed to create contracts.
     pub fn is_allowed_to_create_unsigned_contracts() -> bool {
-        // Unlike domain instantiation, no storage value means "anyone can create contracts".
-        ContractCreationAllowedBy::<T>::get()
-            .map(|allowed_by| allowed_by.is_anyone_allowed())
-            .unwrap_or(true)
+        ContractCreationAllowedBy::<T>::get().is_anyone_allowed()
     }
 
     /// Returns the current contract creation allow list.
     /// Mainly used in tests.
-    pub fn contract_creation_allowed_by() -> Option<PermissionedActionAllowedBy<T::AccountId>> {
+    pub fn contract_creation_allowed_by() -> PermissionedActionAllowedBy<T::AccountId> {
         ContractCreationAllowedBy::<T>::get()
     }
 }

domains/test/primitives/src/lib.rs

@@ -42,7 +42,7 @@ sp_api::decl_runtime_apis! {
     pub trait EvmOnchainStateApi
     {
         /// Returns the current EVM contract creation allow list.
-        /// Returns `None` if this is not an EVM domain, or if the allow list isn't set (allow all).
+        /// Returns `None` if this is not an EVM domain.
         fn evm_contract_creation_allowed_by() -> Option<PermissionedActionAllowedBy<EthereumAccountId>>;
     }
 }

domains/test/runtime/evm/src/lib.rs

@@ -1651,7 +1651,7 @@ impl_runtime_apis! {
 
     impl domain_test_primitives::EvmOnchainStateApi<Block> for Runtime {
         fn evm_contract_creation_allowed_by() -> Option<PermissionedActionAllowedBy<EthereumAccountId>> {
-            EVMNoncetracker::contract_creation_allowed_by()
+            Some(EVMNoncetracker::contract_creation_allowed_by())
         }
     }
 

domains/test/service/src/domain.rs

@@ -432,11 +432,12 @@ where
     /// Returns `None` if this is not an EVM domain, or if the allow list isn't set (allow all).
     pub fn evm_contract_creation_allowed_by(
         &self,
-    ) -> Option<PermissionedActionAllowedBy<EthereumAccountId>> {
+    ) -> PermissionedActionAllowedBy<EthereumAccountId> {
         self.client
             .runtime_api()
             .evm_contract_creation_allowed_by(self.client.info().best_hash)
             .expect("Failed to get EVM contact creation allow list")
+            .expect("Should be an EVM domain")
     }
 }