resolve merge conflicts

EdHastingsCasperAssociation · Oct 10, 2024 · 74dd6e4 · 74dd6e4
1 parent cc67c68
commit 74dd6e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/storage/src/data_access_layer/balance.rs b/storage/src/data_access_layer/balance.rs
@@ -66,6 +66,7 @@ pub enum BalanceIdentifier {
     Internal(URefAddr),
     /// Penalized account identifier.
     PenalizedAccount(AccountHash),
+    /// Penalized payment identifier.
     PenalizedPayment,
 }
 

diff --git a/storage/src/data_access_layer/mint.rs b/storage/src/data_access_layer/mint.rs
@@ -72,6 +72,8 @@ pub enum TransferRequestArgs {
     Raw(RuntimeArgs),
     /// Provides explicit structured args.
     Explicit(TransferArgs),
+    /// Provides support for transfers using balance identifiers.
+    /// The source and target purses will get resolved on usage.
     Indirect(Box<BalanceIdentifierTransferArgs>),
 }