Transfer command uses AccountOwner type.

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(None, recipient, transfer_amount);
+            block.with_native_token_transfer(AccountOwner::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(None, recipient, transfer_amount);
+            block.with_native_token_transfer(AccountOwner::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(None, recipient, transfer_amount);
+                block.with_native_token_transfer(AccountOwner::Chain, recipient, transfer_amount);
             }
         })
         .await;
@@ -155,7 +155,7 @@ async fn emptied_account_disappears_from_queries() {
 
     let transfer_certificate = funding_chain
         .add_block(|block| {
-            block.with_native_token_transfer(None, recipient, transfer_amount);
+            block.with_native_token_transfer(AccountOwner::Chain, recipient, transfer_amount);
         })
         .await;
 
@@ -167,7 +167,11 @@ async fn emptied_account_disappears_from_queries() {
 
     recipient_chain
         .add_block(|block| {
-            block.with_native_token_transfer(Some(owner), Recipient::Burn, transfer_amount);
+            block.with_native_token_transfer(
+                AccountOwner::User(owner),
+                Recipient::Burn,
+                transfer_amount,
+            );
         })
         .await;
 

linera-chain/src/test.rs

@@ -7,7 +7,7 @@ use linera_base::{
     crypto::{AccountPublicKey, AccountSecretKey},
     data_types::{Amount, BlockHeight, Round, Timestamp},
     hashed::Hashed,
-    identifiers::{ChainId, Owner},
+    identifiers::{AccountOwner, ChainId, Owner},
 };
 use linera_execution::{
     committee::{Committee, Epoch, ValidatorState},
@@ -62,7 +62,7 @@ pub trait BlockTestExt: Sized {
     fn with_operation(self, operation: impl Into<Operation>) -> Self;
 
     /// Returns the block with a transfer operation appended at the end.
-    fn with_transfer(self, owner: Option<Owner>, recipient: Recipient, amount: Amount) -> Self;
+    fn with_transfer(self, owner: AccountOwner, recipient: Recipient, amount: Amount) -> Self;
 
     /// Returns the block with a simple transfer operation appended at the end.
     fn with_simple_transfer(self, chain_id: ChainId, amount: Amount) -> Self;
@@ -97,7 +97,7 @@ impl BlockTestExt for ProposedBlock {
         self
     }
 
-    fn with_transfer(self, owner: Option<Owner>, recipient: Recipient, amount: Amount) -> Self {
+    fn with_transfer(self, owner: AccountOwner, recipient: Recipient, amount: Amount) -> Self {
         self.with_operation(SystemOperation::Transfer {
             owner,
             recipient,
@@ -106,7 +106,7 @@ impl BlockTestExt for ProposedBlock {
     }
 
     fn with_simple_transfer(self, chain_id: ChainId, amount: Amount) -> Self {
-        self.with_transfer(None, Recipient::chain(chain_id), amount)
+        self.with_transfer(AccountOwner::Chain, Recipient::chain(chain_id), amount)
     }
 
     fn with_incoming_bundle(mut self, incoming_bundle: IncomingBundle) -> Self {

linera-chain/src/unit_tests/chain_tests.rs

@@ -17,7 +17,7 @@ use linera_base::{
         UserApplicationDescription,
     },
     hashed::Hashed,
-    identifiers::{ApplicationId, ChainId, MessageId, ModuleId},
+    identifiers::{AccountOwner, ApplicationId, ChainId, MessageId, ModuleId},
     ownership::ChainOwnership,
     vm::VmRuntime,
 };
@@ -168,7 +168,7 @@ async fn test_block_size_limit() {
     let invalid_block = valid_block
         .clone()
         .with_operation(SystemOperation::Transfer {
-            owner: None,
+            owner: AccountOwner::Chain,
             recipient: Recipient::root(0),
             amount: Amount::ONE,
         });

linera-client/src/benchmark.rs

@@ -594,7 +594,7 @@ where
                     amount,
                 ),
                 None => Operation::System(SystemOperation::Transfer {
-                    owner: None,
+                    owner: AccountOwner::Chain,
                     recipient: Recipient::chain(previous_chain_id),
                     amount,
                 }),

linera-client/src/unit_tests/chain_listener.rs

@@ -10,7 +10,7 @@ use futures::{lock::Mutex, FutureExt as _};
 use linera_base::{
     crypto::{AccountPublicKey, AccountSecretKey, Secp256k1SecretKey},
     data_types::{Amount, BlockHeight, TimeDelta, Timestamp},
-    identifiers::ChainId,
+    identifiers::{AccountOwner, ChainId},
     ownership::{ChainOwnership, TimeoutConfig},
 };
 use linera_core::{
@@ -160,7 +160,9 @@ async fn test_chain_listener() -> anyhow::Result<()> {
     // Transfer one token to chain 0. The listener should eventually become leader and receive
     // the message.
     let recipient0 = Recipient::chain(chain_id0);
-    client1.transfer(None, Amount::ONE, recipient0).await?;
+    client1
+        .transfer(AccountOwner::Chain, Amount::ONE, recipient0)
+        .await?;
     for i in 0.. {
         client0.synchronize_from_validators().boxed().await?;
         let balance = client0.local_balance().await?;

linera-core/benches/client_benchmarks.rs

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use criterion::{criterion_group, criterion_main, measurement::Measurement, BatchSize, Criterion};
-use linera_base::{data_types::Amount, identifiers::Account, time::Duration};
+use linera_base::{
+    data_types::Amount,
+    identifiers::{Account, AccountOwner},
+    time::Duration,
+};
 use linera_core::{
     client,
     test_utils::{MemoryStorageBuilder, NodeProvider, StorageBuilder, TestBuilder},
@@ -55,7 +59,7 @@ where
 
     let account = Account::owner(chain2.chain_id(), owner1);
     let cert = chain1
-        .transfer_to_account(None, amt, account)
+        .transfer_to_account(AccountOwner::Chain, amt, account)
         .await
         .unwrap()
         .unwrap();

linera-core/src/client/mod.rs

@@ -1610,7 +1610,7 @@ where
     #[instrument(level = "trace")]
     pub async fn transfer(
         &self,
-        owner: Option<Owner>,
+        owner: AccountOwner,
         amount: Amount,
         recipient: Recipient,
     ) -> Result<ClientOutcome<ConfirmedBlockCertificate>, ChainClientError> {
@@ -2432,7 +2432,7 @@ where
     #[instrument(level = "trace")]
     pub async fn transfer_to_account(
         &self,
-        owner: Option<Owner>,
+        owner: AccountOwner,
         amount: Amount,
         account: Account,
     ) -> Result<ClientOutcome<ConfirmedBlockCertificate>, ChainClientError> {
@@ -2444,7 +2444,7 @@ where
     #[instrument(level = "trace")]
     pub async fn burn(
         &self,
-        owner: Option<Owner>,
+        owner: AccountOwner,
         amount: Amount,
     ) -> Result<ClientOutcome<ConfirmedBlockCertificate>, ChainClientError> {
         self.transfer(owner, amount, Recipient::Burn).await
@@ -3159,7 +3159,7 @@ where
     #[instrument(level = "trace")]
     pub async fn transfer_to_account_unsafe_unconfirmed(
         &self,
-        owner: Option<Owner>,
+        owner: AccountOwner,
         amount: Amount,
         account: Account,
     ) -> Result<ClientOutcome<ConfirmedBlockCertificate>, ChainClientError> {