[consensus] also expose which account ids have been locked so far

novifinancial · Nov 16, 2021 · 36dc6e5 · 36dc6e5
1 parent d4fa4ce
commit 36dc6e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/fastpay_core/src/authority.rs b/fastpay_core/src/authority.rs
@@ -368,6 +368,7 @@ impl Authority for AuthorityState {
                     .get_mut(&instance_id)
                     .ok_or(FastPayError::UnknownConsensusInstance(instance_id))?;
                 let info = ConsensusInfoResponse {
+                    locked_accounts: instance.locked_accounts.clone(),
                     proposed: instance.proposed.clone(),
                     locked: instance.locked.clone(),
                     received: instance.received.clone(),

diff --git a/fastpay_core/src/messages.rs b/fastpay_core/src/messages.rs
@@ -8,7 +8,7 @@ use super::{base_types::*, committee::Committee, error::FastPayError};
 mod messages_tests;
 
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
+use std::collections::{BTreeMap, HashSet};
 
 /// A message sent from the smart contract on the primary chain.
 #[derive(Eq, PartialEq, Clone, Debug, Serialize, Deserialize)]
@@ -208,6 +208,7 @@ pub enum ConsensusOrder {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[cfg_attr(test, derive(Eq, PartialEq))]
 pub struct ConsensusInfoResponse {
+    pub locked_accounts: BTreeMap<AccountId, AccountOwner>,
     pub proposed: Option<ConsensusProposal>,
     pub locked: Option<Certificate>,
     pub received: Certificate,

diff --git a/fastpay_core/tests/staged/fastpay.yaml b/fastpay_core/tests/staged/fastpay.yaml
@@ -99,6 +99,12 @@ ConsensusDecision:
       Confirm: UNIT
 ConsensusInfoResponse:
   STRUCT:
+    - locked_accounts:
+        MAP:
+          KEY:
+            TYPENAME: AccountId
+          VALUE:
+            TYPENAME: PublicKeyBytes
     - proposed:
         OPTION:
           TYPENAME: ConsensusProposal