diff --git a/NineChronicles.DataProvider/RenderSubscriber.cs b/NineChronicles.DataProvider/RenderSubscriber.cs index d99470f7..3e3a8f1e 100644 --- a/NineChronicles.DataProvider/RenderSubscriber.cs +++ b/NineChronicles.DataProvider/RenderSubscriber.cs @@ -89,8 +89,8 @@ public partial class RenderSubscriber : BackgroundService private readonly List _auraSummonFailList = new List(); private readonly List _runeSummonList = new List(); private readonly List _runeSummonFailList = new List(); - private readonly List _agents; - private readonly List _avatars; + private readonly List
_agents; + private readonly List
_avatars; private readonly bool _render; private int _renderedBlockCount; private DateTimeOffset _blockTimeOffset; @@ -109,8 +109,8 @@ MySqlStore mySqlStore _nodeStatusRenderer = nodeService.NodeStatusRenderer; MySqlStore = mySqlStore; _renderedBlockCount = 0; - _agents = new List(); - _avatars = new List(); + _agents = new List
(); + _avatars = new List
(); _render = Convert.ToBoolean(Environment.GetEnvironmentVariable("NC_Render") ?? "true"); string dataPath = Environment.GetEnvironmentVariable("NC_BlockIndexFilePath") ?? Path.GetTempPath(); @@ -283,9 +283,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) runeCurrency); var acquiredRune = outputRuneBalance - prevRuneBalance; var actionType = claimStakeReward.ToString()!.Split('.').LastOrDefault()?.Replace(">", string.Empty); - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -322,9 +322,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = eventDungeonBattle.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -364,9 +364,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = eventConsumableItemCrafts.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -432,9 +432,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = has.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -465,9 +465,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = hasSweep.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -506,9 +506,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = combinationConsumable.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -543,9 +543,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = combinationEquipment.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -634,9 +634,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var enhancementCostSheet = outputState.GetSheet(); var avatarAddress = itemEnhancement.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -720,9 +720,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); AvatarState avatarState = outputState.GetAvatarState(buy.buyerAvatarAddress); var avatarAddress = buy.buyerAvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -796,9 +796,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = buy.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -932,9 +932,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = mc.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -960,9 +960,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = grinding.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -994,9 +994,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = unlockEquipmentRecipe.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1027,9 +1027,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = unlockWorld.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1060,9 +1060,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = hasRandomBuff.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1088,9 +1088,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = joinArena.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1116,9 +1116,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = battleArena.myAvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1155,9 +1155,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = eventMaterialItemCrafts.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1193,9 +1193,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = runeEnhancement.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1320,9 +1320,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = claimRaidReward.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1381,9 +1381,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = unlockRuneSlot.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1417,9 +1417,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = rapidCombination.avatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1493,9 +1493,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) } var avatarAddress = ev.Action.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1535,9 +1535,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = petEnhancement.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1572,9 +1572,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var inputState = new World(_blockChainStates.GetWorldState(ev.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = auraSummon.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1627,9 +1627,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var start = DateTimeOffset.UtcNow; var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = runeSummon.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1689,9 +1689,9 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken) var start = DateTimeOffset.UtcNow; var outputState = new World(_blockChainStates.GetWorldState(ev.OutputState)); var avatarAddress = activateCollection.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, ev.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -1797,10 +1797,10 @@ private void ProcessAgentData(ActionEvaluation ev) { try { - if (!_agents.Contains(ev.Signer.ToString())) + if (!_agents.Contains(ev.Signer)) { var start = DateTimeOffset.UtcNow; - _agents.Add(ev.Signer.ToString()); + _agents.Add(ev.Signer); _agentList.Add(AgentData.GetAgentInfo(ev.Signer)); var end = DateTimeOffset.UtcNow; Log.Debug("[DataProvider] Stored Agent Information in block #{index}. Time Taken: {time} ms.", ev.BlockIndex, (end - start).Milliseconds); diff --git a/NineChronicles.DataProvider/Subscriber/AdventureBossRenderSubscriber.cs b/NineChronicles.DataProvider/Subscriber/AdventureBossRenderSubscriber.cs index 5f395501..a2f9000f 100644 --- a/NineChronicles.DataProvider/Subscriber/AdventureBossRenderSubscriber.cs +++ b/NineChronicles.DataProvider/Subscriber/AdventureBossRenderSubscriber.cs @@ -94,9 +94,9 @@ partial void SubscribeAdventureBossWanted(ActionEvaluation evt) var start = DateTimeOffset.UtcNow; var outputState = new World(_blockChainStates.GetWorldState(evt.OutputState)); var avatarAddress = wanted.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, evt.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -133,9 +133,9 @@ partial void SubscribeAdventureBossChallenge(ActionEvaluation evt var prevState = new World(_blockChainStates.GetWorldState(evt.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(evt.OutputState)); var avatarAddress = rush.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, evt.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -201,9 +201,9 @@ partial void SubscribeAdventureBossUnlockFloor(ActionEvaluation evt var prevState = new World(_blockChainStates.GetWorldState(evt.PreviousState)); var outputState = new World(_blockChainStates.GetWorldState(evt.OutputState)); var avatarAddress = unlock.AvatarAddress; - if (!_avatars.Contains(avatarAddress.ToString())) + if (!_avatars.Contains(avatarAddress)) { - _avatars.Add(avatarAddress.ToString()); + _avatars.Add(avatarAddress); _avatarList.Add(AvatarData.GetAvatarInfo(outputState, evt.Signer, avatarAddress, _blockTimeOffset, BattleType.Adventure)); } @@ -235,9 +235,9 @@ partial void SubscribeAdventureBossClaim(ActionEvaluation