Skip to content

Update federation member API #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fassadlr merged 1 commit into from
Jun 20, 2022
Merged

Update federation member API #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Stratis.Bitcoin.Features.PoA/Models/FederationMemberModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ namespace Stratis.Bitcoin.Features.PoA.Models
{
public class FederationMemberModel
{
[JsonProperty("collateralAddress")]
public string CollateralAddress { get; set; }

[JsonProperty("pubkey")]
public string PubKey { get; set; }

[JsonProperty("collateralAmount")]
public decimal CollateralAmount { get; set; }

[JsonProperty("isMultiSig")]
public bool IsMultiSig { get; set; }

[JsonProperty("lastActiveTime")]
public DateTime? LastActiveTime { get; set; }

Expand Down
21 changes: 18 additions & 3 deletions src/Stratis.Bitcoin.Features.PoA/Voting/FederationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ public IActionResult GetCurrentMemberInfo()
PubKey = this.federationManager.CurrentFederationKey.PubKey.ToHex()
};

if (this.federationManager.GetCurrentFederationMember() is CollateralFederationMember collateralFederationMember)
{
federationMemberModel.CollateralAddress = collateralFederationMember.CollateralMainchainAddress;
federationMemberModel.CollateralAmount = collateralFederationMember.CollateralAmount.ToUnit(MoneyUnit.BTC);
federationMemberModel.IsMultiSig = collateralFederationMember.IsMultisigMember;
}

ChainedHeader chainTip = this.chainIndexer.Tip;
federationMemberModel.FederationSize = this.federationHistory.GetFederationForBlock(chainTip).Count;

Expand Down Expand Up @@ -167,13 +174,21 @@ public IActionResult GetMembers()
ConcurrentDictionary<IFederationMember, uint> activeTimes = this.federationHistory.GetFederationMembersByLastActiveTime();
foreach (IFederationMember federationMember in federationMembers)
{
federationMemberModels.Add(new FederationMemberModel()
var model = new FederationMemberModel()
{
PubKey = federationMember.PubKey.ToHex(),
CollateralAmount = (federationMember as CollateralFederationMember).CollateralAmount.ToUnit(MoneyUnit.BTC),
LastActiveTime = new DateTime(1970, 1, 1, 0, 0, 0).AddSeconds(activeTimes.FirstOrDefault(a => a.Key.PubKey == federationMember.PubKey).Value),
PeriodOfInActivity = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0).AddSeconds(activeTimes.FirstOrDefault(a => a.Key.PubKey == federationMember.PubKey).Value)
});
};

if (federationMember is CollateralFederationMember collateralFederationMember)
{
model.CollateralAddress = collateralFederationMember.CollateralMainchainAddress;
model.CollateralAmount = (federationMember as CollateralFederationMember).CollateralAmount.ToUnit(MoneyUnit.BTC);
model.IsMultiSig = collateralFederationMember.IsMultisigMember;
}

federationMemberModels.Add(model);
}

return Json(federationMemberModels);
Expand Down