Replace GenericApplicationId with MultiAddress.

examples/amm/src/contract.rs

@@ -319,9 +319,6 @@ impl AmmContract {
                     "Unauthorized"
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Using chain balance is not authorized")
-            }
         }
     }
 

examples/fungible/src/contract.rs

@@ -136,9 +136,6 @@ impl FungibleTokenContract {
                     "The requested transfer is not correctly authenticated."
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Chain account is not supported")
-            }
         }
     }
 

examples/gen-nft/src/contract.rs

@@ -133,9 +133,6 @@ impl GenNftContract {
                     "The requested transfer is not correctly authenticated."
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Chain account is not supported")
-            }
         }
     }
 

examples/matching-engine/src/contract.rs

@@ -159,9 +159,6 @@ impl MatchingEngineContract {
                     "Unauthorized."
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Chain account is not supported")
-            }
         }
     }
 

examples/native-fungible/src/contract.rs

@@ -40,7 +40,8 @@ impl Contract for NativeFungibleTokenContract {
                 chain_id: self.runtime.chain_id(),
                 owner,
             };
-            self.runtime.transfer(MultiAddress::Chain, account, amount);
+            self.runtime
+                .transfer(MultiAddress::chain(), account, amount);
         }
     }
 
@@ -143,9 +144,6 @@ impl NativeFungibleTokenContract {
                     "The requested transfer is not correctly authenticated."
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Chain accounts are not supported")
-            }
         }
     }
 }

examples/native-fungible/tests/transfers.rs

@@ -33,7 +33,7 @@ async fn chain_balance_transfers() {
 
     let transfer_certificate = funding_chain
         .add_block(|block| {
-            block.with_native_token_transfer(MultiAddress::Chain, recipient, transfer_amount);
+            block.with_native_token_transfer(MultiAddress::chain(), recipient, transfer_amount);
         })
         .await;
 
@@ -69,7 +69,7 @@ async fn transfer_to_owner() {
 
     let transfer_certificate = funding_chain
         .add_block(|block| {
-            block.with_native_token_transfer(MultiAddress::Chain, recipient, transfer_amount);
+            block.with_native_token_transfer(MultiAddress::chain(), recipient, transfer_amount);
         })
         .await;
 
@@ -114,7 +114,7 @@ async fn transfer_to_multiple_owners() {
     let transfer_certificate = funding_chain
         .add_block(|block| {
             for (recipient, transfer_amount) in recipients.zip(transfer_amounts.clone()) {
-                block.with_native_token_transfer(MultiAddress::Chain, recipient, transfer_amount);
+                block.with_native_token_transfer(MultiAddress::chain(), recipient, transfer_amount);
             }
         })
         .await;
@@ -154,7 +154,7 @@ async fn emptied_account_disappears_from_queries() {
 
     let transfer_certificate = funding_chain
         .add_block(|block| {
-            block.with_native_token_transfer(MultiAddress::Chain, recipient, transfer_amount);
+            block.with_native_token_transfer(MultiAddress::chain(), recipient, transfer_amount);
         })
         .await;
 

examples/non-fungible/src/contract.rs

@@ -137,9 +137,6 @@ impl NonFungibleTokenContract {
                     "The requested transfer is not correctly authenticated."
                 )
             }
-            MultiAddress::Chain => {
-                panic!("Chain account is not supported")
-            }
         }
     }
 

linera-base/src/crypto/hash.rs

@@ -6,7 +6,7 @@
 
 #[cfg(with_testing)]
 use std::ops::RangeInclusive;
-use std::{borrow::Cow, fmt, io, str::FromStr};
+use std::{borrow::Cow, fmt, io, str::FromStr, sync::LazyLock};
 
 #[cfg(with_testing)]
 use alloy_primitives::FixedBytes;
@@ -28,6 +28,15 @@ use crate::{
     doc_scalar,
 };
 
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+struct Chain;
+
+impl BcsHashable<'_> for Chain {}
+
+/// The CryptoHash of `Chain` newtype struct.
+/// It's a marker for a generic `Chain` object.
+pub static CHAIN_CRYPTO_HASH: LazyLock<CryptoHash> = LazyLock::new(|| CryptoHash::new(&Chain));
+
 /// A Keccak256 value.
 #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Hash)]
 #[cfg_attr(with_testing, derive(Default))]

linera-base/src/data_types.rs

@@ -34,8 +34,7 @@ use crate::{
     crypto::{BcsHashable, CryptoHash},
     doc_scalar, hex_debug, http,
     identifiers::{
-        BlobId, BlobType, ChainId, Destination, EventId, GenericApplicationId, ModuleId,
-        MultiAddress, StreamId,
+        BlobId, BlobType, ChainId, Destination, EventId, ModuleId, MultiAddress, StreamId,
     },
     limited_writer::{LimitedWriter, LimitedWriterError},
     time::{Duration, SystemTime},
@@ -765,12 +764,14 @@ impl ApplicationPermissions {
     }
 
     /// Returns whether operations with the given application ID are allowed on this chain.
-    pub fn can_execute_operations(&self, app_id: &GenericApplicationId) -> bool {
-        match (app_id, &self.execute_operations) {
-            (_, None) => true,
-            (GenericApplicationId::System, Some(_)) => false,
-            (GenericApplicationId::User(app_id), Some(app_ids)) => app_ids.contains(app_id),
+    pub fn can_execute_operations(&self, app_id: &MultiAddress) -> bool {
+        if self.execute_operations.is_none() {
+            return true;
         }
+        if app_id.is_chain() {
+            return false;
+        }
+        self.execute_operations.as_ref().unwrap().contains(app_id)
     }
 
     /// Returns whether the given application is allowed to close this chain.