From 3a7ad612ad4fd8c32e27a7ef7d162e24c6679ff5 Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Tue, 4 Jul 2023 20:57:48 +0900 Subject: [PATCH 01/33] Valid MockStateDelta --- .Lib9c.Tests/Action/MockStateDelta.cs | 47 +++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/.Lib9c.Tests/Action/MockStateDelta.cs b/.Lib9c.Tests/Action/MockStateDelta.cs index dd7a78ef7..f8e86e879 100644 --- a/.Lib9c.Tests/Action/MockStateDelta.cs +++ b/.Lib9c.Tests/Action/MockStateDelta.cs @@ -171,7 +171,24 @@ public ValidatorSet GetValidatorSet() => public IAccountStateDelta MintAsset( IActionContext context, Address recipient, FungibleAssetValue value) { + if (value.Sign <= 0) + { + throw new ArgumentOutOfRangeException( + nameof(value), + "The value to mint has to be greater than zero." + ); + } + Currency currency = value.Currency; + if (!currency.AllowsToMint(context.Signer)) + { + throw new CurrencyPermissionException( + $"The account {context.Signer} has no permission to mint currency {currency}.", + context.Signer, + currency + ); + } + FungibleAssetValue balance = GetBalance(recipient, currency); (Address, Currency) assetKey = (recipient, currency); BigInteger rawBalance = (balance + value).RawValue; @@ -207,16 +224,42 @@ public IAccountStateDelta TransferAsset( Address sender, Address recipient, FungibleAssetValue value, - bool allowNegativeBalance = false) => - TransferAssetV0(sender, recipient, value, allowNegativeBalance); + bool allowNegativeBalance = false) => context.BlockProtocolVersion > 0 + ? TransferAssetV1(sender, recipient, value, allowNegativeBalance) + : TransferAssetV0(sender, recipient, value, allowNegativeBalance); /// [Pure] public IAccountStateDelta BurnAsset( IActionContext context, Address owner, FungibleAssetValue value) { + string msg; + + if (value.Sign <= 0) + { + throw new ArgumentOutOfRangeException( + nameof(value), + "The value to burn has to be greater than zero." + ); + } + Currency currency = value.Currency; + if (!currency.AllowsToMint(context.Signer)) + { + msg = $"The account {context.Signer} has no permission to burn assets of " + + $"the currency {currency}."; + throw new CurrencyPermissionException(msg, context.Signer, currency); + } + FungibleAssetValue balance = GetBalance(owner, currency); + + if (balance < value) + { + msg = $"The account {owner}'s balance of {currency} is insufficient to burn: " + + $"{balance} < {value}."; + throw new InsufficientBalanceException(msg, owner, balance); + } + (Address, Currency) assetKey = (owner, currency); BigInteger rawBalance = (balance - value).RawValue; if (currency.TotalSupplyTrackable) From f8dd1230accf09ddb67645948f445d588e7e57df Mon Sep 17 00:00:00 2001 From: Swen Mun Date: Wed, 5 Jul 2023 21:04:38 +0900 Subject: [PATCH 02/33] Fix fixtures --- .../Action/ManipulateStateTest.cs | 4 +- .../Action/CombinationEquipment10Test.cs | 6 ++- .../Action/CombinationEquipment11Test.cs | 6 ++- .../Action/CombinationEquipment12Test.cs | 2 +- .../Action/CombinationEquipment13Test.cs | 13 ++++--- .../Action/CombinationEquipment14Test.cs | 13 ++++--- .../Action/CombinationEquipment15Test.cs | 13 ++++--- .../Action/CombinationEquipment8Test.cs | 6 ++- .../Action/CombinationEquipment9Test.cs | 6 ++- .../Action/CombinationEquipmentTest.cs | 13 ++++--- .../Action/EventDungeonBattleV1Test.cs | 10 ++++- .../Action/EventDungeonBattleV2Test.cs | 11 +++++- .../Action/EventDungeonBattleV3Test.cs | 10 ++++- .../Action/EventDungeonBattleV4Test.cs | 10 ++++- .../Action/EventDungeonBattleV5Test.cs | 10 ++++- .Lib9c.Tests/Action/GrindingTest.cs | 29 +++++++++----- .Lib9c.Tests/Action/InitializeStatesTest.cs | 5 +++ .Lib9c.Tests/Action/JoinArena1Test.cs | 4 +- .Lib9c.Tests/Action/JoinArena2Test.cs | 4 +- .Lib9c.Tests/Action/JoinArena3Test.cs | 10 ++--- .Lib9c.Tests/Action/PetEnhancement0Test.cs | 12 ++++-- .Lib9c.Tests/Action/RuneEnhancement0Test.cs | 38 +++++++++++++++---- .Lib9c.Tests/Action/RuneEnhancementTest.cs | 38 +++++++++++++++---- .Lib9c.Tests/Action/UnlockWorld1Test.cs | 4 +- .Lib9c.Tests/Action/UnlockWorldTest.cs | 4 +- .Lib9c.Tests/Util/InitializeUtil.cs | 3 +- 26 files changed, 209 insertions(+), 75 deletions(-) diff --git a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs index c89216cef..6c1b9d9a7 100644 --- a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs @@ -28,10 +28,12 @@ public class ManipulateStateTest { private static readonly Address AdminAddr = new PrivateKey().ToAddress(); + // See also InitializeUtil.cs private static readonly Currency Ncg = Currency.Legacy( "NCG", 2, - new[] { AdminAddr }.ToImmutableHashSet()); + null + ); private static readonly Currency Crystal = CrystalCalculator.CRYSTAL; diff --git a/.Lib9c.Tests/Action/CombinationEquipment10Test.cs b/.Lib9c.Tests/Action/CombinationEquipment10Test.cs index f68a516d1..fd6d98e86 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment10Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment10Test.cs @@ -322,7 +322,11 @@ private void Execute(bool backward, int recipeId, int? subRecipeId, int mintNCG) .SetState(_avatarAddress, avatarState.SerializeV2()); } - previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + if (mintNCG > 0) + { + previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + } + var goldCurrencyState = previousState.GetGoldCurrency(); var previousNCG = previousState.GetBalance(_agentAddress, goldCurrencyState); Assert.Equal(mintNCG * currency, previousNCG); diff --git a/.Lib9c.Tests/Action/CombinationEquipment11Test.cs b/.Lib9c.Tests/Action/CombinationEquipment11Test.cs index 8b0cf530a..7a1923ba6 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment11Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment11Test.cs @@ -329,7 +329,11 @@ private void Execute(bool backward, int recipeId, int? subRecipeId, int mintNCG) .SetState(_avatarAddress, avatarState.SerializeV2()); } - previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + if (mintNCG > 0) + { + previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + } + var goldCurrencyState = previousState.GetGoldCurrency(); var previousNCG = previousState.GetBalance(_agentAddress, goldCurrencyState); Assert.Equal(mintNCG * currency, previousNCG); diff --git a/.Lib9c.Tests/Action/CombinationEquipment12Test.cs b/.Lib9c.Tests/Action/CombinationEquipment12Test.cs index af0eb4327..32b06904b 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment12Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment12Test.cs @@ -196,7 +196,7 @@ bool previousCostStateExist _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - if (ncgBalanceExist) + if (ncgBalanceExist && subRow.RequiredGold > 0) { state = state.MintAsset( context, diff --git a/.Lib9c.Tests/Action/CombinationEquipment13Test.cs b/.Lib9c.Tests/Action/CombinationEquipment13Test.cs index 99453efe0..3c36bde56 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment13Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment13Test.cs @@ -191,7 +191,7 @@ bool previousCostStateExist _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - if (ncgBalanceExist) + if (ncgBalanceExist && subRow.RequiredGold > 0) { state = state.MintAsset( context, @@ -412,10 +412,13 @@ public void ExecuteBySuperCraft( _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - state = state.MintAsset( - context, - _agentAddress, - subRow.RequiredGold * state.GetGoldCurrency()); + if (subRow.RequiredGold > 0) + { + state = state.MintAsset( + context, + _agentAddress, + subRow.RequiredGold * state.GetGoldCurrency()); + } var inventoryAddress = _avatarAddress.Derive(LegacyInventoryKey); var worldInformationAddress = diff --git a/.Lib9c.Tests/Action/CombinationEquipment14Test.cs b/.Lib9c.Tests/Action/CombinationEquipment14Test.cs index 8286a12bf..0906ad52c 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment14Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment14Test.cs @@ -192,7 +192,7 @@ bool previousCostStateExist _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - if (ncgBalanceExist) + if (ncgBalanceExist && subRow.RequiredGold > 0) { state = state.MintAsset( context, @@ -414,10 +414,13 @@ public void ExecuteBySuperCraft( _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - state = state.MintAsset( - context, - _agentAddress, - subRow.RequiredGold * state.GetGoldCurrency()); + if (subRow.RequiredGold > 0) + { + state = state.MintAsset( + context, + _agentAddress, + subRow.RequiredGold * state.GetGoldCurrency()); + } var inventoryAddress = _avatarAddress.Derive(LegacyInventoryKey); var worldInformationAddress = diff --git a/.Lib9c.Tests/Action/CombinationEquipment15Test.cs b/.Lib9c.Tests/Action/CombinationEquipment15Test.cs index 1fe5c5aa1..eeba01cb8 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment15Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment15Test.cs @@ -192,7 +192,7 @@ bool previousCostStateExist _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - if (ncgBalanceExist) + if (ncgBalanceExist && subRow.RequiredGold > 0) { state = state.MintAsset( context, @@ -414,10 +414,13 @@ public void ExecuteBySuperCraft( _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - state = state.MintAsset( - context, - _agentAddress, - subRow.RequiredGold * state.GetGoldCurrency()); + if (subRow.RequiredGold > 0) + { + state = state.MintAsset( + context, + _agentAddress, + subRow.RequiredGold * state.GetGoldCurrency()); + } var inventoryAddress = _avatarAddress.Derive(LegacyInventoryKey); var worldInformationAddress = diff --git a/.Lib9c.Tests/Action/CombinationEquipment8Test.cs b/.Lib9c.Tests/Action/CombinationEquipment8Test.cs index b0e467eca..08efb9b93 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment8Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment8Test.cs @@ -231,7 +231,11 @@ private void Execute(bool backward, int recipeId, int? subRecipeId, int mintNCG) .SetState(_avatarAddress, avatarState.SerializeV2()); } - previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + if (mintNCG > 0) + { + previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + } + var goldCurrencyState = previousState.GetGoldCurrency(); var previousNCG = previousState.GetBalance(_agentAddress, goldCurrencyState); Assert.Equal(mintNCG * currency, previousNCG); diff --git a/.Lib9c.Tests/Action/CombinationEquipment9Test.cs b/.Lib9c.Tests/Action/CombinationEquipment9Test.cs index c23642cb5..c44bb96a9 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment9Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment9Test.cs @@ -231,7 +231,11 @@ private void Execute(bool backward, int recipeId, int? subRecipeId, int mintNCG) .SetState(_avatarAddress, avatarState.SerializeV2()); } - previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + if (mintNCG > 0) + { + previousState = previousState.MintAsset(context, _agentAddress, mintNCG * currency); + } + var goldCurrencyState = previousState.GetGoldCurrency(); var previousNCG = previousState.GetBalance(_agentAddress, goldCurrencyState); Assert.Equal(mintNCG * currency, previousNCG); diff --git a/.Lib9c.Tests/Action/CombinationEquipmentTest.cs b/.Lib9c.Tests/Action/CombinationEquipmentTest.cs index e1c7c093b..fd8ff9a95 100644 --- a/.Lib9c.Tests/Action/CombinationEquipmentTest.cs +++ b/.Lib9c.Tests/Action/CombinationEquipmentTest.cs @@ -194,7 +194,7 @@ bool previousCostStateExist _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - if (ncgBalanceExist) + if (ncgBalanceExist && subRow.RequiredGold > 0) { state = state.MintAsset( context, @@ -416,10 +416,13 @@ public void ExecuteWithCheckingHammerPointState( _avatarState.inventory.AddItem(subMaterial, materialInfo.Count); } - state = state.MintAsset( - context, - _agentAddress, - subRow.RequiredGold * state.GetGoldCurrency()); + if (subRow.RequiredGold > 0) + { + state = state.MintAsset( + context, + _agentAddress, + subRow.RequiredGold * state.GetGoldCurrency()); + } var inventoryAddress = _avatarAddress.Derive(LegacyInventoryKey); var worldInformationAddress = diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs index 6e2105656..5e687fe32 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs @@ -163,7 +163,10 @@ public void Execute_Success_With_Ticket_Purchase( Assert.True(previousStates.GetSheet() .TryGetValue(eventScheduleId, out var newScheduleRow)); var ncgHas = newScheduleRow.GetDungeonTicketCostV1(numberOfTicketPurchases); - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas * _ncgCurrency); + if (ncgHas > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas * _ncgCurrency); + } var nextStates = Execute( previousStates, @@ -304,7 +307,10 @@ public void Execute_Throw_InsufficientBalanceException( Assert.True(_tableSheets.EventScheduleSheet .TryGetValue(eventScheduleId, out var scheduleRow)); var ncgHas = scheduleRow.GetDungeonTicketCostV1(numberOfTicketPurchases) - 1; - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas * _ncgCurrency); + if (ncgHas > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas * _ncgCurrency); + } Assert.Throws(() => Execute( diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs index 033784182..29ba33476 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs @@ -166,7 +166,11 @@ public void Execute_Success_With_Ticket_Purchase( var ncgHas = newScheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency); - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } var nextStates = Execute( previousStates, @@ -317,7 +321,10 @@ public void Execute_Throw_InsufficientBalanceException( var ncgHas = scheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency) - 1 * _ncgCurrency; - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } Assert.Throws(() => Execute( diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs index 479a47a17..5dac8e448 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs @@ -165,7 +165,10 @@ public void Execute_Success_With_Ticket_Purchase( var ncgHas = newScheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency); - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } var nextStates = Execute( previousStates, @@ -316,7 +319,10 @@ public void Execute_Throw_InsufficientBalanceException( var ncgHas = scheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency) - 1 * _ncgCurrency; - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } Assert.Throws(() => Execute( diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs index 7a94f2776..a668812d5 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs @@ -166,7 +166,10 @@ public void Execute_Success_With_Ticket_Purchase( var ncgHas = newScheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency); - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } var nextStates = Execute( previousStates, @@ -317,7 +320,10 @@ public void Execute_Throw_InsufficientBalanceException( var ncgHas = scheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency) - 1 * _ncgCurrency; - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } Assert.Throws(() => Execute( diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs index 90d09c584..58615c337 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs @@ -167,7 +167,10 @@ public void Execute_Success_With_Ticket_Purchase( var ncgHas = newScheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency); - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } var nextStates = Execute( previousStates, @@ -318,7 +321,10 @@ public void Execute_Throw_InsufficientBalanceException( var ncgHas = scheduleRow.GetDungeonTicketCost( numberOfTicketPurchases, _ncgCurrency) - 1 * _ncgCurrency; - previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + if (ncgHas.Sign > 0) + { + previousStates = previousStates.MintAsset(context, _agentAddress, ncgHas); + } Assert.Throws(() => Execute( diff --git a/.Lib9c.Tests/Action/GrindingTest.cs b/.Lib9c.Tests/Action/GrindingTest.cs index 176cc0361..7e807615a 100644 --- a/.Lib9c.Tests/Action/GrindingTest.cs +++ b/.Lib9c.Tests/Action/GrindingTest.cs @@ -174,21 +174,30 @@ Type exc if (stake) { - state = state - .SetState(stakeStateAddress, stakeState.SerializeV2()) - .MintAsset(context, stakeStateAddress, requiredGold * _ncgCurrency); + state = state.SetState(stakeStateAddress, stakeState.SerializeV2()); + + if (requiredGold > 0) + { + state = state.MintAsset( + context, + stakeStateAddress, + requiredGold * _ncgCurrency + ); + } } if (monsterCollect) { var mcAddress = MonsterCollectionState.DeriveAddress(_agentAddress, 0); - state = state - .SetState( - mcAddress, - new MonsterCollectionState(mcAddress, monsterCollectLevel, 1) - .Serialize() - ) - .MintAsset(context, mcAddress, requiredGold * _ncgCurrency); + state = state.SetState( + mcAddress, + new MonsterCollectionState(mcAddress, monsterCollectLevel, 1).Serialize() + ); + + if (requiredGold > 0) + { + state = state.MintAsset(context, mcAddress, requiredGold * _ncgCurrency); + } } } diff --git a/.Lib9c.Tests/Action/InitializeStatesTest.cs b/.Lib9c.Tests/Action/InitializeStatesTest.cs index d6ff9fd6d..44d212889 100644 --- a/.Lib9c.Tests/Action/InitializeStatesTest.cs +++ b/.Lib9c.Tests/Action/InitializeStatesTest.cs @@ -60,6 +60,7 @@ public void Execute() var genesisState = action.Execute(new ActionContext() { BlockIndex = 0, + Signer = minterKey.ToAddress(), Miner = default, PreviousState = new MockStateDelta(), }); @@ -127,6 +128,7 @@ public void ExecuteWithAuthorizedMinersState() { BlockIndex = 0, Miner = default, + Signer = minterKey.ToAddress(), PreviousState = new MockStateDelta(), }); @@ -175,6 +177,7 @@ public void ExecuteWithActivateAdminKey() { BlockIndex = 0, Miner = default, + Signer = minterKey.ToAddress(), PreviousState = new MockStateDelta(), }); @@ -226,6 +229,7 @@ public void ExecuteWithCredits() { BlockIndex = 0, Miner = default, + Signer = minterKey.ToAddress(), PreviousState = new MockStateDelta(), }); @@ -271,6 +275,7 @@ public void ExecuteWithoutAdminState() { BlockIndex = 0, Miner = default, + Signer = minterKey.ToAddress(), PreviousState = new MockStateDelta(), }); diff --git a/.Lib9c.Tests/Action/JoinArena1Test.cs b/.Lib9c.Tests/Action/JoinArena1Test.cs index 43845a3e8..336a54b96 100644 --- a/.Lib9c.Tests/Action/JoinArena1Test.cs +++ b/.Lib9c.Tests/Action/JoinArena1Test.cs @@ -204,7 +204,9 @@ public void Execute(long blockIndex, int championshipId, int round, string balan avatarState = AddMedal(avatarState, row, 80); var context = new ActionContext(); - var state = _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); + var state = (balance == "0") + ? _state + : _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); var action = new JoinArena1() { diff --git a/.Lib9c.Tests/Action/JoinArena2Test.cs b/.Lib9c.Tests/Action/JoinArena2Test.cs index bbe38ddf5..49de33a62 100644 --- a/.Lib9c.Tests/Action/JoinArena2Test.cs +++ b/.Lib9c.Tests/Action/JoinArena2Test.cs @@ -204,7 +204,9 @@ public void Execute(long blockIndex, int championshipId, int round, string balan avatarState = AddMedal(avatarState, row, 80); var context = new ActionContext(); - var state = _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); + var state = (balance == "0") + ? _state + : _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); var action = new JoinArena2() { diff --git a/.Lib9c.Tests/Action/JoinArena3Test.cs b/.Lib9c.Tests/Action/JoinArena3Test.cs index e2e98e943..24588a09c 100644 --- a/.Lib9c.Tests/Action/JoinArena3Test.cs +++ b/.Lib9c.Tests/Action/JoinArena3Test.cs @@ -207,7 +207,9 @@ public void Execute(long blockIndex, int championshipId, int round, string balan avatarState = AddMedal(avatarState, row, 80); var context = new ActionContext(); - var state = _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); + var state = (balance == "0") + ? _state + : _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); var action = new JoinArena() { @@ -518,7 +520,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2 { int championshipId = 1; int round = 1; - string balance = "0"; var arenaSheet = _state.GetSheet(); if (!arenaSheet.TryGetValue(championshipId, out var row)) { @@ -531,9 +532,8 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2 avatarState = AddMedal(avatarState, row, 80); var context = new ActionContext(); - var state = _state.MintAsset(context, _signer, FungibleAssetValue.Parse(_currency, balance)); - var ncgCurrency = state.GetGoldCurrency(); - state = state.MintAsset(context, _signer, 99999 * ncgCurrency); + var ncgCurrency = _state.GetGoldCurrency(); + var state = _state.MintAsset(context, _signer, 99999 * ncgCurrency); var unlockRuneSlot = new UnlockRuneSlot() { diff --git a/.Lib9c.Tests/Action/PetEnhancement0Test.cs b/.Lib9c.Tests/Action/PetEnhancement0Test.cs index b7b43259e..c660789aa 100644 --- a/.Lib9c.Tests/Action/PetEnhancement0Test.cs +++ b/.Lib9c.Tests/Action/PetEnhancement0Test.cs @@ -315,9 +315,15 @@ private static IAccountStateDelta Execute( currentPetLevel, targetPetLevel); - prevStates = prevStates - .MintAsset(context, agentAddr, ncgCost * ncgCurrency) - .MintAsset(context, avatarAddr, soulStoneCost * soulStoneCurrency); + if (ncgCost > 0) + { + prevStates = prevStates.MintAsset(context, agentAddr, ncgCost * ncgCurrency); + } + + if (soulStoneCost > 0) + { + prevStates = prevStates.MintAsset(context, avatarAddr, soulStoneCost * soulStoneCurrency); + } } if (removePetRow) diff --git a/.Lib9c.Tests/Action/RuneEnhancement0Test.cs b/.Lib9c.Tests/Action/RuneEnhancement0Test.cs index cda8340fe..0e21efc30 100644 --- a/.Lib9c.Tests/Action/RuneEnhancement0Test.cs +++ b/.Lib9c.Tests/Action/RuneEnhancement0Test.cs @@ -95,9 +95,20 @@ public void Execute(int seed) throw new RuneNotFoundException($"[{nameof(Execute)}] "); } - state = state.MintAsset(context, agentAddress, ncgBal); - state = state.MintAsset(context, agentAddress, crystalBal); - state = state.MintAsset(context, avatarState.address, runeBal); + if (ncgBal.Sign > 0) + { + state = state.MintAsset(context, agentAddress, ncgBal); + } + + if (crystalBal.Sign > 0) + { + state = state.MintAsset(context, agentAddress, crystalBal); + } + + if (runeBal.Sign > 0) + { + state = state.MintAsset(context, avatarState.address, runeBal); + } var action = new RuneEnhancement0() { @@ -144,9 +155,20 @@ public void Execute(int seed) var costCrystal = tryCount * cost.CrystalQuantity * crystalCurrency; var costRune = tryCount * cost.RuneStoneQuantity * runeCurrency; - nextState = nextState.MintAsset(context, agentAddress, costNcg); - nextState = nextState.MintAsset(context, agentAddress, costCrystal); - nextState = nextState.MintAsset(context, avatarState.address, costRune); + if (costNcg.Sign > 0) + { + nextState = nextState.MintAsset(context, agentAddress, costNcg); + } + + if (costCrystal.Sign > 0) + { + nextState = nextState.MintAsset(context, agentAddress, costCrystal); + } + + if (costRune.Sign > 0) + { + nextState = nextState.MintAsset(context, avatarState.address, costRune); + } var finalNcgBal = nextState.GetBalance(agentAddress, ncgCurrency); var finalCrystalBal = nextState.GetBalance(agentAddress, crystalCurrency); @@ -337,12 +359,12 @@ public void Execute_NotEnoughFungibleAssetValueException(bool ncg, bool crystal, var crystalCurrency = CrystalCalculator.CRYSTAL; var runeCurrency = Currency.Legacy(runeRow.Ticker, 0, minters: null); - if (ncg) + if (ncg && cost.NcgQuantity > 0) { state = state.MintAsset(context, agentAddress, cost.NcgQuantity * ncgCurrency); } - if (crystal) + if (crystal && cost.CrystalQuantity > 0) { state = state.MintAsset(context, agentAddress, cost.CrystalQuantity * crystalCurrency); } diff --git a/.Lib9c.Tests/Action/RuneEnhancementTest.cs b/.Lib9c.Tests/Action/RuneEnhancementTest.cs index a8597a806..6689636ed 100644 --- a/.Lib9c.Tests/Action/RuneEnhancementTest.cs +++ b/.Lib9c.Tests/Action/RuneEnhancementTest.cs @@ -105,9 +105,20 @@ public void Execute(int seed) throw new RuneNotFoundException($"[{nameof(Execute)}] "); } - state = state.MintAsset(context, agentAddress, ncgBal); - state = state.MintAsset(context, agentAddress, crystalBal); - state = state.MintAsset(context, avatarState.address, runeBal); + if (ncgBal.Sign > 0) + { + state = state.MintAsset(context, agentAddress, ncgBal); + } + + if (crystalBal.Sign > 0) + { + state = state.MintAsset(context, agentAddress, crystalBal); + } + + if (runeBal.Sign > 0) + { + state = state.MintAsset(context, avatarState.address, runeBal); + } var action = new RuneEnhancement() { @@ -154,9 +165,20 @@ public void Execute(int seed) var costCrystal = tryCount * cost.CrystalQuantity * crystalCurrency; var costRune = tryCount * cost.RuneStoneQuantity * runeCurrency; - nextState = nextState.MintAsset(context, agentAddress, costNcg); - nextState = nextState.MintAsset(context, agentAddress, costCrystal); - nextState = nextState.MintAsset(context, avatarState.address, costRune); + if (costNcg.Sign > 0) + { + nextState = nextState.MintAsset(context, agentAddress, costNcg); + } + + if (costCrystal.Sign > 0) + { + nextState = nextState.MintAsset(context, agentAddress, costCrystal); + } + + if (costRune.Sign > 0) + { + nextState = nextState.MintAsset(context, avatarState.address, costRune); + } var finalNcgBal = nextState.GetBalance(agentAddress, ncgCurrency); var finalCrystalBal = nextState.GetBalance(agentAddress, crystalCurrency); @@ -374,12 +396,12 @@ public void Execute_NotEnoughFungibleAssetValueException(bool ncg, bool crystal, var crystalCurrency = CrystalCalculator.CRYSTAL; var runeCurrency = Currency.Legacy(runeRow.Ticker, 0, minters: null); - if (ncg) + if (ncg && cost.NcgQuantity > 0) { state = state.MintAsset(context, agentAddress, cost.NcgQuantity * ncgCurrency); } - if (crystal) + if (crystal && cost.CrystalQuantity > 0) { state = state.MintAsset(context, agentAddress, cost.CrystalQuantity * crystalCurrency); } diff --git a/.Lib9c.Tests/Action/UnlockWorld1Test.cs b/.Lib9c.Tests/Action/UnlockWorld1Test.cs index 86bc0080e..db92cd174 100644 --- a/.Lib9c.Tests/Action/UnlockWorld1Test.cs +++ b/.Lib9c.Tests/Action/UnlockWorld1Test.cs @@ -87,7 +87,9 @@ Type exc ) { var context = new ActionContext(); - var state = _initialState.MintAsset(context, _agentAddress, balance * _currency); + var state = (balance > 0) + ? _initialState.MintAsset(context, _agentAddress, balance * _currency) + : _initialState; var worldIds = ids.ToList(); if (stateExist) diff --git a/.Lib9c.Tests/Action/UnlockWorldTest.cs b/.Lib9c.Tests/Action/UnlockWorldTest.cs index 08dd435e5..13730af75 100644 --- a/.Lib9c.Tests/Action/UnlockWorldTest.cs +++ b/.Lib9c.Tests/Action/UnlockWorldTest.cs @@ -89,7 +89,9 @@ Type exc ) { var context = new ActionContext(); - var state = _initialState.MintAsset(context, _agentAddress, balance * _currency); + var state = (balance > 0) + ? _initialState.MintAsset(context, _agentAddress, balance * _currency) + : _initialState; var worldIds = ids.ToList(); if (stateExist) diff --git a/.Lib9c.Tests/Util/InitializeUtil.cs b/.Lib9c.Tests/Util/InitializeUtil.cs index 6aa872f4a..e2a1499fa 100644 --- a/.Lib9c.Tests/Util/InitializeUtil.cs +++ b/.Lib9c.Tests/Util/InitializeUtil.cs @@ -50,7 +50,8 @@ IAccountStateDelta initialStatesWithAvatarStateV2 var goldCurrency = Currency.Legacy( "NCG", 2, - minters: new[] { adminAddr.Value }.ToImmutableHashSet()); + minters: default + ); var goldCurrencyState = new GoldCurrencyState(goldCurrency); states = states .SetState(goldCurrencyState.address, goldCurrencyState.Serialize()) From 572fe7dab40b9420b8fbdc5e58e28bd4c6c7da8d Mon Sep 17 00:00:00 2001 From: area363 Date: Thu, 13 Jul 2023 11:39:43 +0900 Subject: [PATCH 03/33] send NineChronicles bump PR to upstream (license issue) --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ebbf13ae..d965f2125 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -122,5 +122,5 @@ jobs: committer: > Submodule Updater targets: | - ${{ github.repository_owner }}/NineChronicles:refs/heads/release/* + planetarium/NineChronicles:refs/heads/release/* ${{ github.repository_owner }}/NineChronicles.Headless:refs/heads/release/* From 8c6e9a91b05d92cacaeb21232419313b1ab08365 Mon Sep 17 00:00:00 2001 From: area363 Date: Thu, 13 Jul 2023 11:42:05 +0900 Subject: [PATCH 04/33] send bump PR to market service --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d965f2125..dc2b021b9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -124,3 +124,4 @@ jobs: targets: | planetarium/NineChronicles:refs/heads/release/* ${{ github.repository_owner }}/NineChronicles.Headless:refs/heads/release/* + ${{ github.repository_owner }}/market-service:refs/heads/release/* From cd40d13f0f374e27df8eb041b58424458ce81b2d Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Thu, 20 Jul 2023 17:59:08 +0900 Subject: [PATCH 05/33] Clone skill target in buff, heal --- .Lib9c.Tests/Model/Skill/CombatTest.cs | 42 ++++++++++++++++++++++++++ Lib9c/Model/Skill/AreaAttack.cs | 2 +- Lib9c/Model/Skill/BlowAttack.cs | 2 +- Lib9c/Model/Skill/BuffRemovalAttack.cs | 2 +- Lib9c/Model/Skill/BuffSkill.cs | 2 +- Lib9c/Model/Skill/DoubleAttack.cs | 2 +- Lib9c/Model/Skill/HealSkill.cs | 9 +++--- Lib9c/Model/Skill/NormalAttack.cs | 2 +- Lib9c/Model/Skill/Skill.cs | 8 ++--- 9 files changed, 56 insertions(+), 15 deletions(-) diff --git a/.Lib9c.Tests/Model/Skill/CombatTest.cs b/.Lib9c.Tests/Model/Skill/CombatTest.cs index 162276101..8a4482d8c 100644 --- a/.Lib9c.Tests/Model/Skill/CombatTest.cs +++ b/.Lib9c.Tests/Model/Skill/CombatTest.cs @@ -1,5 +1,6 @@ namespace Lib9c.Tests.Model.Skill { + using System; using System.Collections.Generic; using System.Linq; using Lib9c.Tests.Action; @@ -136,5 +137,46 @@ public void Bleed() var skillInfo = Assert.Single(skill.SkillInfos); Assert.Equal(currentHP, skillInfo.Target!.CurrentHP); } + + [Theory] + // Buff + [InlineData(SkillType.Buff, true)] + [InlineData(SkillType.Buff, false)] + // Heal + [InlineData(SkillType.Heal, true)] + [InlineData(SkillType.Heal, false)] + public void Issue_2027(SkillType skillType, bool copyCharacter) + { + var healSkillRow = _tableSheets.SkillSheet.Values.First(r => r.SkillType == skillType); + var healSkill = SkillFactory.Get(healSkillRow, 1, 100, 0, StatType.NONE); + + // normal skill id. + var skillRow = _tableSheets.SkillSheet[100000]; + var prevHP = _player.CurrentHP; + var normalAttack = new NormalAttack(skillRow, prevHP / 2, 100, default, StatType.NONE); + normalAttack.Use(_enemy, 1, new List(), copyCharacter); + Assert.False(_player.IsDead); + var buffs = BuffFactory.GetBuffs( + _enemy.Stats, + healSkill, + _tableSheets.SkillBuffSheet, + _tableSheets.StatBuffSheet, + _tableSheets.SkillActionBuffSheet, + _tableSheets.ActionBuffSheet + ); + var skill = healSkill.Use(_player, 1, buffs, copyCharacter); + while (!_player.IsDead) + { + normalAttack.Use(_enemy, 1, new List(), copyCharacter); + } + + Assert.True(_player.IsDead); + var skillInfo = Assert.Single(skill.SkillInfos); + Assert.Equal(skillType == SkillType.Heal, skillInfo.Buff is null); + // character alive when use skill + Assert.False(skillInfo.IsDead); + // without Clone, target dead because _player also dead + Assert.Equal(!copyCharacter, skillInfo.Target!.IsDead); + } } } diff --git a/Lib9c/Model/Skill/AreaAttack.cs b/Lib9c/Model/Skill/AreaAttack.cs index d115d7fce..6da4cd3d8 100644 --- a/Lib9c/Model/Skill/AreaAttack.cs +++ b/Lib9c/Model/Skill/AreaAttack.cs @@ -23,7 +23,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; var damage = ProcessDamage(caster, simulatorWaveTurn, copyCharacter: copyCharacter); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new Model.BattleStatus.AreaAttack(SkillRow.Id, clone, damage, buff); } diff --git a/Lib9c/Model/Skill/BlowAttack.cs b/Lib9c/Model/Skill/BlowAttack.cs index 854380f93..b54b1ffa8 100644 --- a/Lib9c/Model/Skill/BlowAttack.cs +++ b/Lib9c/Model/Skill/BlowAttack.cs @@ -23,7 +23,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; var damage = ProcessDamage(caster, simulatorWaveTurn, copyCharacter: copyCharacter); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new Model.BattleStatus.BlowAttack(SkillRow.Id, clone, damage, buff); } diff --git a/Lib9c/Model/Skill/BuffRemovalAttack.cs b/Lib9c/Model/Skill/BuffRemovalAttack.cs index f770ad95f..0302fa0df 100644 --- a/Lib9c/Model/Skill/BuffRemovalAttack.cs +++ b/Lib9c/Model/Skill/BuffRemovalAttack.cs @@ -23,7 +23,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; var damage = ProcessDamage(caster, simulatorWaveTurn, copyCharacter: copyCharacter); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); var targets = SkillRow.SkillTargetType.GetTarget(caster); foreach (var target in targets) { diff --git a/Lib9c/Model/Skill/BuffSkill.cs b/Lib9c/Model/Skill/BuffSkill.cs index 674ad3239..78b6eb309 100644 --- a/Lib9c/Model/Skill/BuffSkill.cs +++ b/Lib9c/Model/Skill/BuffSkill.cs @@ -21,7 +21,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, int simulatorWaveTu IEnumerable buffs, bool copyCharacter) { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new BattleStatus.Buff(SkillRow.Id, clone, buff); } diff --git a/Lib9c/Model/Skill/DoubleAttack.cs b/Lib9c/Model/Skill/DoubleAttack.cs index cab0ff643..33a457ee0 100644 --- a/Lib9c/Model/Skill/DoubleAttack.cs +++ b/Lib9c/Model/Skill/DoubleAttack.cs @@ -23,7 +23,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; var damage = ProcessDamage(caster, simulatorWaveTurn, copyCharacter: copyCharacter); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new Model.BattleStatus.DoubleAttack(SkillRow.Id, clone, damage, buff); } diff --git a/Lib9c/Model/Skill/HealSkill.cs b/Lib9c/Model/Skill/HealSkill.cs index 17c87aabe..33747587b 100644 --- a/Lib9c/Model/Skill/HealSkill.cs +++ b/Lib9c/Model/Skill/HealSkill.cs @@ -22,13 +22,14 @@ public override BattleStatus.Skill Use(CharacterBase caster, IEnumerable buffs, bool copyCharacter) { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; - var heal = ProcessHeal(caster, simulatorWaveTurn); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var heal = ProcessHeal(caster, simulatorWaveTurn, copyCharacter); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new BattleStatus.HealSkill(SkillRow.Id, clone, heal, buff); } - protected IEnumerable ProcessHeal(CharacterBase caster, int simulatorWaveTurn) + protected IEnumerable ProcessHeal(CharacterBase caster, + int simulatorWaveTurn, bool copyCharacter) { var infos = new List(); @@ -42,7 +43,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { target.Heal(healPoint); infos.Add(new BattleStatus.Skill.SkillInfo(target.Id, target.IsDead, target.Thorn, healPoint, caster.IsCritical(false), - SkillRow.SkillCategory, simulatorWaveTurn, target: target)); + SkillRow.SkillCategory, simulatorWaveTurn, target: copyCharacter ? (CharacterBase)target.Clone() : target)); } return infos; diff --git a/Lib9c/Model/Skill/NormalAttack.cs b/Lib9c/Model/Skill/NormalAttack.cs index e50205ba7..b3c5fe7e3 100644 --- a/Lib9c/Model/Skill/NormalAttack.cs +++ b/Lib9c/Model/Skill/NormalAttack.cs @@ -23,7 +23,7 @@ public override BattleStatus.Skill Use(CharacterBase caster, { var clone = copyCharacter ? (CharacterBase) caster.Clone() : null; var damage = ProcessDamage(caster, simulatorWaveTurn, true, copyCharacter); - var buff = ProcessBuff(caster, simulatorWaveTurn, buffs); + var buff = ProcessBuff(caster, simulatorWaveTurn, buffs, copyCharacter); return new Model.BattleStatus.NormalAttack(SkillRow.Id, clone, damage, buff); } diff --git a/Lib9c/Model/Skill/Skill.cs b/Lib9c/Model/Skill/Skill.cs index f75297fd7..51d73c28c 100644 --- a/Lib9c/Model/Skill/Skill.cs +++ b/Lib9c/Model/Skill/Skill.cs @@ -68,11 +68,9 @@ public override int GetHashCode() } } - protected IEnumerable ProcessBuff( - CharacterBase caster, + protected IEnumerable ProcessBuff(CharacterBase caster, int simulatorWaveTurn, - IEnumerable buffs - ) + IEnumerable buffs, bool copyCharacter) { var infos = new List(); foreach (var buff in buffs) @@ -83,7 +81,7 @@ public override int GetHashCode() target.AddBuff(buff); infos.Add(new Model.BattleStatus.Skill.SkillInfo(target.Id, target.IsDead, target.Thorn, 0, false, SkillRow.SkillCategory, simulatorWaveTurn, ElementalType.Normal, SkillRow.SkillTargetType, - buff, target)); + buff, copyCharacter ? (CharacterBase)target.Clone() : target)); } } From 9834553f6692ba84bfa311da7c87ba1c6c9e80b9 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Thu, 20 Jul 2023 18:00:44 +0900 Subject: [PATCH 06/33] Fix missing log event --- Lib9c/Battle/StageSimulator.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib9c/Battle/StageSimulator.cs b/Lib9c/Battle/StageSimulator.cs index e01122b6b..6a895fa4b 100644 --- a/Lib9c/Battle/StageSimulator.cs +++ b/Lib9c/Battle/StageSimulator.cs @@ -130,7 +130,11 @@ public Player Simulate() ActionBuffSheet ); - skill.Use(Player, 0, buffs, LogEvent); + var usedSkill = skill.Use(Player, 0, buffs, LogEvent); + if (LogEvent) + { + Log.Add(usedSkill); + } } while (true) From 39a648e251f5b4965823f1d4088ea5c9f52ac167 Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Wed, 12 Jul 2023 17:19:34 +0900 Subject: [PATCH 07/33] Bump libplanet to 2.5.0 --- .Libplanet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Libplanet b/.Libplanet index 1d74e3706..2944cbdfc 160000 --- a/.Libplanet +++ b/.Libplanet @@ -1 +1 @@ -Subproject commit 1d74e3706ce2ef6607e142969c5dfa3ec41f1076 +Subproject commit 2944cbdfc0856cfea856725e91ccfa35e9d22e97 From 6f09be74536e67a7f3018cc12e49aa975015eae3 Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Wed, 12 Jul 2023 18:19:26 +0900 Subject: [PATCH 08/33] Accommodate libplanet changes --- .Lib9c.Benchmarks/Program.cs | 3 +- .Lib9c.Tests/Action/ActionContext.cs | 4 - .../Factory/ClaimStakeRewardFactoryTest.cs | 13 +-- .Lib9c.Tests/Action/MockStateDelta.cs | 110 +++++------------- .Lib9c.Tests/Action/RewardGoldTest.cs | 6 +- .Lib9c.Tests/Policy/BlockPolicyTest.cs | 21 ++-- .Lib9c.Tests/TestHelper/BlockChainHelper.cs | 3 +- .Lib9c.Tools/SubCommand/State.cs | 3 +- Lib9c.DevExtensions/Utils.cs | 3 +- .../Formatters/NCActionFormatter.cs | 9 -- Lib9c.Policy/Policy/DebugPolicy.cs | 2 - Lib9c.Utils/BlockHelper.cs | 3 +- Lib9c/Action/ActionBaseExtensions.cs | 5 - Lib9c/FeeCalculator.cs | 14 --- 14 files changed, 50 insertions(+), 149 deletions(-) delete mode 100644 Lib9c/FeeCalculator.cs diff --git a/.Lib9c.Benchmarks/Program.cs b/.Lib9c.Benchmarks/Program.cs index b8a4cf1a7..c1a01a6f0 100644 --- a/.Lib9c.Benchmarks/Program.cs +++ b/.Lib9c.Benchmarks/Program.cs @@ -89,8 +89,7 @@ static void Main(string[] args) var actionEvaluator = new ActionEvaluator( _ => policy.BlockAction, new BlockChainStates(store, stateStore), - new NCActionLoader(), - null); + new NCActionLoader()); var chain = new BlockChain( policy, stagePolicy, diff --git a/.Lib9c.Tests/Action/ActionContext.cs b/.Lib9c.Tests/Action/ActionContext.cs index 06ee89866..af7110a56 100644 --- a/.Lib9c.Tests/Action/ActionContext.cs +++ b/.Lib9c.Tests/Action/ActionContext.cs @@ -64,9 +64,5 @@ public IActionContext GetUnconsumedContext() public long GasUsed() => _gasUsed; public long GasLimit() => 0; - - public void PutLog(string log) - { - } } } diff --git a/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs b/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs index dc963525a..2bdd67ed4 100644 --- a/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs +++ b/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs @@ -22,17 +22,14 @@ public static IEnumerable GetAllClaimStakeRewardV1() var arr = Assembly.GetAssembly(typeof(ClaimRaidReward))?.GetTypes() .Where(type => type.IsClass && - type.GetInterfaces().Contains(typeof(IClaimStakeRewardV1))) - .Select(ActionTypeAttribute.ValueOf) - .ToArray() ?? Array.Empty(); + typeof(IClaimStakeRewardV1).IsAssignableFrom(type)) + .Select(type => + type.GetCustomAttribute()?.TypeIdentifier) + .OfType() + .ToArray() ?? Array.Empty(); foreach (var value in arr) { - if (value is null) - { - continue; - } - var str = (string)(Text)value; var verStr = str.Replace("claim_stake_reward", string.Empty); var ver = string.IsNullOrEmpty(verStr) diff --git a/.Lib9c.Tests/Action/MockStateDelta.cs b/.Lib9c.Tests/Action/MockStateDelta.cs index f8e86e879..0a984cafa 100644 --- a/.Lib9c.Tests/Action/MockStateDelta.cs +++ b/.Lib9c.Tests/Action/MockStateDelta.cs @@ -16,57 +16,28 @@ namespace Lib9c.Tests.Action using Libplanet.State; /// - /// /// A rough replica of https://github.com/planetarium/libplanet/blob/main/Libplanet/State/AccountStateDelta.cs - /// except this has its constructors exposed as public for testing with many of - /// checks removed. - /// - /// - /// Notable differences from the original are: - /// - /// - /// There is no authority check for and , - /// i.e. any can mint and burn. - /// - /// - /// There is no amount check for , , - /// i.e. 0 or even a negative amount is allowed. - /// - /// - /// The behaves as if any given - /// has value equal to 0. - /// - /// - /// + /// except this has its constructors exposed as public for testing. /// [Pure] public class MockStateDelta : IAccountStateDelta { + private readonly IAccountState _baseState; + public MockStateDelta() : this(MockState.Empty) { } - public MockStateDelta(IAccountState mockState) - : this( - mockState.GetStates, - mockState.GetBalance, - mockState.GetTotalSupply, - mockState.GetValidatorSet) + public MockStateDelta(IAccountState baseState) + : this(baseState, new MockDelta()) { } - private MockStateDelta( - AccountStateGetter accountStateGetter, - AccountBalanceGetter accountBalanceGetter, - TotalSupplyGetter totalSupplyGetter, - ValidatorSetGetter validatorSetGetter) + private MockStateDelta(IAccountState baseState, IAccountDelta delta) { - Delta = new MockDelta(); - StateGetter = accountStateGetter; - BalanceGetter = accountBalanceGetter; - TotalSupplyGetter = totalSupplyGetter; - ValidatorSetGetter = validatorSetGetter; + _baseState = baseState; + Delta = delta; TotalUpdatedFungibles = ImmutableDictionary<(Address, Currency), BigInteger>.Empty; } @@ -78,15 +49,7 @@ private MockStateDelta( TotalUpdatedFungibles.Keys.ToImmutableHashSet(); public IImmutableDictionary<(Address, Currency), BigInteger> TotalUpdatedFungibles - { get; protected set; } - - private AccountStateGetter StateGetter { get; set; } - - private AccountBalanceGetter BalanceGetter { get; set; } - - private TotalSupplyGetter TotalSupplyGetter { get; set; } - - private ValidatorSetGetter ValidatorSetGetter { get; set; } + { get; private set; } /// [Pure] @@ -118,7 +81,7 @@ private MockStateDelta( if (notFoundIndices.Count > 0) { - IReadOnlyList restValues = StateGetter( + IReadOnlyList restValues = _baseState.GetStates( notFoundIndices.Select(index => addresses[index]).ToArray()); foreach ((var v, var i) in notFoundIndices.Select((v, i) => (v, i))) { @@ -158,13 +121,13 @@ public FungibleAssetValue GetTotalSupply(Currency currency) return FungibleAssetValue.FromRawValue(currency, totalSupplyValue); } - return TotalSupplyGetter(currency); + return _baseState.GetTotalSupply(currency); } /// [Pure] public ValidatorSet GetValidatorSet() => - Delta.ValidatorSet ?? ValidatorSetGetter(); + Delta.ValidatorSet ?? _baseState.GetValidatorSet(); /// [Pure] @@ -293,28 +256,24 @@ private FungibleAssetValue GetBalance( IImmutableDictionary<(Address, Currency), BigInteger> balances) => balances.TryGetValue((address, currency), out BigInteger balance) ? FungibleAssetValue.FromRawValue(currency, balance) - : BalanceGetter(address, currency); + : _baseState.GetBalance(address, currency); [Pure] - private IAccountStateDelta UpdateStates( - IImmutableDictionary updatedStates - ) => + private MockStateDelta UpdateStates( + IImmutableDictionary updatedStates) => new MockStateDelta( - StateGetter, - BalanceGetter, - TotalSupplyGetter, - ValidatorSetGetter) - { - Delta = new MockDelta( + _baseState, + new MockDelta( updatedStates, Delta.Fungibles, Delta.TotalSupplies, - Delta.ValidatorSet), + Delta.ValidatorSet)) + { TotalUpdatedFungibles = TotalUpdatedFungibles, }; [Pure] - private IAccountStateDelta UpdateFungibleAssets( + private MockStateDelta UpdateFungibleAssets( IImmutableDictionary<(Address, Currency), BigInteger> updatedFungibleAssets, IImmutableDictionary<(Address, Currency), BigInteger> totalUpdatedFungibles ) => @@ -324,40 +283,33 @@ private IAccountStateDelta UpdateFungibleAssets( Delta.TotalSupplies); [Pure] - private IAccountStateDelta UpdateFungibleAssets( + private MockStateDelta UpdateFungibleAssets( IImmutableDictionary<(Address, Currency), BigInteger> updatedFungibleAssets, IImmutableDictionary<(Address, Currency), BigInteger> totalUpdatedFungibles, IImmutableDictionary updatedTotalSupply ) => new MockStateDelta( - StateGetter, - BalanceGetter, - TotalSupplyGetter, - ValidatorSetGetter) - { - Delta = new MockDelta( + _baseState, + new MockDelta( Delta.States, updatedFungibleAssets, updatedTotalSupply, - Delta.ValidatorSet), + Delta.ValidatorSet)) + { TotalUpdatedFungibles = totalUpdatedFungibles, }; [Pure] - private IAccountStateDelta UpdateValidatorSet( - ValidatorSet updatedValidatorSet - ) => + private MockStateDelta UpdateValidatorSet( + ValidatorSet updatedValidatorSet) => new MockStateDelta( - StateGetter, - BalanceGetter, - TotalSupplyGetter, - ValidatorSetGetter) - { - Delta = new MockDelta( + _baseState, + new MockDelta( Delta.States, Delta.Fungibles, Delta.TotalSupplies, - updatedValidatorSet), + updatedValidatorSet)) + { TotalUpdatedFungibles = TotalUpdatedFungibles, }; diff --git a/.Lib9c.Tests/Action/RewardGoldTest.cs b/.Lib9c.Tests/Action/RewardGoldTest.cs index c0635c4d1..608fff987 100644 --- a/.Lib9c.Tests/Action/RewardGoldTest.cs +++ b/.Lib9c.Tests/Action/RewardGoldTest.cs @@ -530,8 +530,7 @@ public async Task Genesis_StateRootHash(bool mainnet) blockChainStates: new BlockChainStates( new MemoryStore(), new TrieStateStore(new MemoryKeyValueStore())), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null); + actionTypeLoader: new NCActionLoader()); genesis = BlockChain.ProposeGenesisBlock( tempActionEvaluator, transactions: ImmutableList.Empty @@ -554,8 +553,7 @@ public async Task Genesis_StateRootHash(bool mainnet) actionEvaluator: new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: blockPolicySource.GetRenderers() ); diff --git a/.Lib9c.Tests/Policy/BlockPolicyTest.cs b/.Lib9c.Tests/Policy/BlockPolicyTest.cs index 49e5be0c9..0e0108633 100644 --- a/.Lib9c.Tests/Policy/BlockPolicyTest.cs +++ b/.Lib9c.Tests/Policy/BlockPolicyTest.cs @@ -66,8 +66,7 @@ public void ValidateNextBlockTx() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: new[] { blockPolicySource.BlockRenderer } ); @@ -177,8 +176,7 @@ public void ValidateNextBlockTx_Mead() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: new[] { blockPolicySource.BlockRenderer } ); @@ -266,8 +264,7 @@ public void BlockCommitFromNonValidator() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: new[] { blockPolicySource.BlockRenderer } ); @@ -321,8 +318,7 @@ public void MustNotIncludeBlockActionAtTransaction() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: actionLoader, - feeCalculator: null + actionTypeLoader: actionLoader ), renderers: new[] { blockPolicySource.BlockRenderer } ); @@ -375,8 +371,7 @@ public void EarnMiningGoldWhenSuccessMining() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: new[] { blockPolicySource.BlockRenderer } ); @@ -425,8 +420,7 @@ public void ValidateNextBlockWithManyTransactions() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ) ); @@ -527,8 +521,7 @@ public void ValidateNextBlockWithManyTransactionsPerSigner() new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ) ); diff --git a/.Lib9c.Tests/TestHelper/BlockChainHelper.cs b/.Lib9c.Tests/TestHelper/BlockChainHelper.cs index b5e8a8b53..b43164264 100644 --- a/.Lib9c.Tests/TestHelper/BlockChainHelper.cs +++ b/.Lib9c.Tests/TestHelper/BlockChainHelper.cs @@ -48,8 +48,7 @@ public static BlockChain MakeBlockChain( new ActionEvaluator( policyBlockActionGetter: _ => policy.BlockAction, blockChainStates: new BlockChainStates(store, stateStore), - actionTypeLoader: new NCActionLoader(), - feeCalculator: null + actionTypeLoader: new NCActionLoader() ), renderers: blockRenderers); } diff --git a/.Lib9c.Tools/SubCommand/State.cs b/.Lib9c.Tools/SubCommand/State.cs index ac52b815d..68ae873ad 100644 --- a/.Lib9c.Tools/SubCommand/State.cs +++ b/.Lib9c.Tools/SubCommand/State.cs @@ -120,8 +120,7 @@ IStateStore stateStore var actionEvaluator = new ActionEvaluator( _ => policy.BlockAction, new BlockChainStates(store, stateStore), - actionLoader, - null); + actionLoader); HashDigest stateRootHash = block.Index < 1 ? BlockChain.DetermineGenesisStateRootHash( actionEvaluator, diff --git a/Lib9c.DevExtensions/Utils.cs b/Lib9c.DevExtensions/Utils.cs index 4cb2c0132..8024cd0a3 100644 --- a/Lib9c.DevExtensions/Utils.cs +++ b/Lib9c.DevExtensions/Utils.cs @@ -88,8 +88,7 @@ Guid chainIdValue ActionEvaluator actionEvaluator = new ActionEvaluator( _ => policy.BlockAction, blockChainStates, - actionLoader, - null); + actionLoader); BlockChain chain; if (store.GetCanonicalChainId() is null) diff --git a/Lib9c.MessagePack/Formatters/NCActionFormatter.cs b/Lib9c.MessagePack/Formatters/NCActionFormatter.cs index 0eb5d8967..629838a6d 100644 --- a/Lib9c.MessagePack/Formatters/NCActionFormatter.cs +++ b/Lib9c.MessagePack/Formatters/NCActionFormatter.cs @@ -18,15 +18,6 @@ public class NCActionFormatter : IMessagePackFormatter { private readonly IActionLoader _actionLoader; - private static readonly IDictionary Types = typeof(ActionBase) - .Assembly - .GetTypes() - .Where(t => t.IsDefined(typeof(ActionTypeAttribute))) - .ToDictionary( - t => ActionTypeAttribute.ValueOf(t) - ?? throw new InvalidOperationException("Unreachable code."), - t => t); - public NCActionFormatter() { _actionLoader = new NCActionLoader(); diff --git a/Lib9c.Policy/Policy/DebugPolicy.cs b/Lib9c.Policy/Policy/DebugPolicy.cs index df4433fa0..0ef3d96a5 100644 --- a/Lib9c.Policy/Policy/DebugPolicy.cs +++ b/Lib9c.Policy/Policy/DebugPolicy.cs @@ -20,8 +20,6 @@ public DebugPolicy() public IAction BlockAction { get; } = new RewardGold(); - public IFeeCalculator? FeeCalculator { get; } - public TxPolicyViolationException ValidateNextBlockTx( BlockChain blockChain, Transaction transaction) { diff --git a/Lib9c.Utils/BlockHelper.cs b/Lib9c.Utils/BlockHelper.cs index a4d5c1d3f..11b444ef3 100644 --- a/Lib9c.Utils/BlockHelper.cs +++ b/Lib9c.Utils/BlockHelper.cs @@ -102,8 +102,7 @@ public static Block ProposeGenesisBlock( var actionEvaluator = new ActionEvaluator( _ => blockAction, new BlockChainStates(new MemoryStore(), new TrieStateStore(new MemoryKeyValueStore())), - actionLoader, - null); + actionLoader); return BlockChain.ProposeGenesisBlock( actionEvaluator, diff --git a/Lib9c/Action/ActionBaseExtensions.cs b/Lib9c/Action/ActionBaseExtensions.cs index 528ee53c1..665b81cce 100644 --- a/Lib9c/Action/ActionBaseExtensions.cs +++ b/Lib9c/Action/ActionBaseExtensions.cs @@ -71,11 +71,6 @@ public void UseGas(long gas) public long GasUsed() => 0; public long GasLimit() => 0; - - public void PutLog(string log) - { - // Method intentionally left empty. - } } private class AddressTraceStateDelta : IAccountStateDelta diff --git a/Lib9c/FeeCalculator.cs b/Lib9c/FeeCalculator.cs deleted file mode 100644 index 76c4ea228..000000000 --- a/Lib9c/FeeCalculator.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Lib9c; -using Libplanet.Action; -using Libplanet.Assets; - -namespace Nekoyume -{ - public class FeeCalculator : IFeeCalculator - { - public FungibleAssetValue CalculateFee(IAction action) - { - return 1 * Currencies.Mead; - } - } -} From 0213fcf378a59846a56f9d5e8ce4795b80105e3c Mon Sep 17 00:00:00 2001 From: Chanhyuck Ko Date: Wed, 19 Jul 2023 19:25:33 +0900 Subject: [PATCH 09/33] Build fix for Libplanet 3.0.0 Co-authored-by ilgyu --- .Lib9c.Benchmarks/Program.cs | 9 +-- .../Action/Craft/UnlocakCraftActionTest.cs | 5 +- .../Action/Craft/UnlockRecipeTest.cs | 4 +- .../Action/CreateOrReplaceAvatarTest.cs | 6 +- .../Action/FaucetCurrencyTest.cs | 6 +- .../Action/FaucetRuneTest.cs | 4 +- .../Action/ManipulateStateTest.cs | 6 +- .../Action/Stage/ClearStageTest.cs | 4 +- .Lib9c.DevExtensions.Tests/UtilsTest.cs | 2 +- ...ustomActionsDeserializableValidatorTest.cs | 11 ++- .../Action/AccountStateDeltaExtensionsTest.cs | 3 +- .../Action/AccountStateViewExtensionsTest.cs | 5 +- .../Action/ActionBaseExtensionsTest.cs | 3 +- .Lib9c.Tests/Action/ActionContext.cs | 11 +-- .../Action/ActionContextExtensionsTest.cs | 3 +- .Lib9c.Tests/Action/ActionEvaluationTest.cs | 5 +- .Lib9c.Tests/Action/ActivateAccount0Test.cs | 3 +- .Lib9c.Tests/Action/ActivateAccountTest.cs | 3 +- .../Action/AddActivatedAccount0Test.cs | 4 +- .../Action/AddActivatedAccountTest.cs | 5 +- .Lib9c.Tests/Action/AddRedeemCodeTest.cs | 4 +- .Lib9c.Tests/Action/ApprovePledgeTest.cs | 4 +- .Lib9c.Tests/Action/ArenahelperTest.cs | 5 +- .Lib9c.Tests/Action/BattleArena10Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena11Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena12Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena1Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena2Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena3Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena4Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena5Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena6Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena7Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena8Test.cs | 5 +- .Lib9c.Tests/Action/BattleArena9Test.cs | 5 +- .Lib9c.Tests/Action/BattleGrandFinale1Test.cs | 5 +- .Lib9c.Tests/Action/BattleGrandFinale2Test.cs | 5 +- .Lib9c.Tests/Action/BattleGrandFinale3Test.cs | 5 +- .Lib9c.Tests/Action/Buy10Test.cs | 5 +- .Lib9c.Tests/Action/Buy11Test.cs | 5 +- .Lib9c.Tests/Action/Buy2Test.cs | 5 +- .Lib9c.Tests/Action/Buy3Test.cs | 5 +- .Lib9c.Tests/Action/Buy4Test.cs | 5 +- .Lib9c.Tests/Action/Buy5Test.cs | 5 +- .Lib9c.Tests/Action/Buy6Test.cs | 5 +- .Lib9c.Tests/Action/Buy7Test.cs | 5 +- .Lib9c.Tests/Action/Buy8Test.cs | 5 +- .Lib9c.Tests/Action/Buy9Test.cs | 5 +- .Lib9c.Tests/Action/BuyMultipleTest.cs | 5 +- .Lib9c.Tests/Action/BuyProduct0Test.cs | 5 +- .Lib9c.Tests/Action/BuyProductTest.cs | 5 +- .Lib9c.Tests/Action/BuyTest.cs | 5 +- .../Action/CancelMonsterCollectTest.cs | 5 +- .../Action/CancelProductRegistrationTest.cs | 5 +- .Lib9c.Tests/Action/ChargeActionPoint0Test.cs | 3 +- .Lib9c.Tests/Action/ChargeActionPoint2Test.cs | 3 +- .Lib9c.Tests/Action/ChargeActionPointTest.cs | 3 +- .../ClaimMonsterCollectionReward0Test.cs | 5 +- .../ClaimMonsterCollectionReward2Test.cs | 5 +- .../ClaimMonsterCollectionRewardTest.cs | 5 +- .Lib9c.Tests/Action/ClaimRaidRewardTest.cs | 3 +- .Lib9c.Tests/Action/ClaimStakeReward1Test.cs | 5 +- .Lib9c.Tests/Action/ClaimStakeReward2Test.cs | 5 +- .Lib9c.Tests/Action/ClaimStakeReward3Test.cs | 6 +- .Lib9c.Tests/Action/ClaimStakeReward4Test.cs | 6 +- .Lib9c.Tests/Action/ClaimStakeRewardTest.cs | 6 +- .../Action/ClaimWorldBossKillRewardTest.cs | 5 +- .../Action/CombinationConsumable0Test.cs | 4 +- .../Action/CombinationConsumable2Test.cs | 4 +- .../Action/CombinationConsumable3Test.cs | 4 +- .../Action/CombinationConsumable4Test.cs | 4 +- .../Action/CombinationConsumable5Test.cs | 4 +- .../Action/CombinationConsumable6Test.cs | 4 +- .../Action/CombinationConsumable7Test.cs | 4 +- .../Action/CombinationConsumableTest.cs | 5 +- .../Action/CombinationEquipment0Test.cs | 6 +- .../Action/CombinationEquipment10Test.cs | 5 +- .../Action/CombinationEquipment11Test.cs | 5 +- .../Action/CombinationEquipment12Test.cs | 5 +- .../Action/CombinationEquipment13Test.cs | 5 +- .../Action/CombinationEquipment14Test.cs | 5 +- .../Action/CombinationEquipment15Test.cs | 5 +- .../Action/CombinationEquipment2Test.cs | 6 +- .../Action/CombinationEquipment3Test.cs | 6 +- .../Action/CombinationEquipment4Test.cs | 6 +- .../Action/CombinationEquipment5Test.cs | 6 +- .../Action/CombinationEquipment6Test.cs | 6 +- .../Action/CombinationEquipment7Test.cs | 6 +- .../Action/CombinationEquipment8Test.cs | 5 +- .../Action/CombinationEquipment9Test.cs | 5 +- .../Action/CombinationEquipmentTest.cs | 5 +- .Lib9c.Tests/Action/Coupons/CouponsFixture.cs | 2 +- .../Action/Coupons/IssueCouponsTest.cs | 2 +- .../Action/Coupons/RedeemCouponTest.cs | 2 +- .../Action/Coupons/TransferCouponsTest.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar0Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar2Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar3Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar6Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar7Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatar8Test.cs | 4 +- .Lib9c.Tests/Action/CreateAvatarTest.cs | 4 +- .../Action/CreatePendingActivationTest.cs | 7 +- .../Action/CreatePendingActivationsTest.cs | 2 - .Lib9c.Tests/Action/CreatePledgeTest.cs | 3 +- .Lib9c.Tests/Action/DailyReward0Test.cs | 3 +- .Lib9c.Tests/Action/DailyReward2Test.cs | 3 +- .Lib9c.Tests/Action/DailyReward3Test.cs | 3 +- .Lib9c.Tests/Action/DailyReward4Test.cs | 3 +- .Lib9c.Tests/Action/DailyReward5Test.cs | 3 +- .Lib9c.Tests/Action/DailyReward6Test.cs | 3 +- .Lib9c.Tests/Action/DailyRewardTest.cs | 3 +- .Lib9c.Tests/Action/EndPledgeTest.cs | 3 +- .../Action/EventConsumableItemCraftsTest.cs | 3 +- .../Action/EventDungeonBattleV1Test.cs | 5 +- .../Action/EventDungeonBattleV2Test.cs | 5 +- .../Action/EventDungeonBattleV3Test.cs | 5 +- .../Action/EventDungeonBattleV4Test.cs | 5 +- .../Action/EventDungeonBattleV5Test.cs | 5 +- .../Action/EventMaterialItemCraftsTest.cs | 3 +- .Lib9c.Tests/Action/ExceptionTest.cs | 2 +- .../Factory/ClaimStakeRewardFactoryTest.cs | 1 - .../Garages/DeliverToOthersGaragesTest.cs | 6 +- .../Action/Garages/LoadIntoMyGaragesTest.cs | 6 +- .../Action/Garages/UnloadFromMyGaragesTest.cs | 6 +- .Lib9c.Tests/Action/GoldDistributionTest.cs | 2 +- .Lib9c.Tests/Action/GrindingTest.cs | 5 +- .Lib9c.Tests/Action/HackAndSlash0Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash10Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash11Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash12Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash13Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash15Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash16Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash17Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash18Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlash19Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlash20Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlash21Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlash2Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash3Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash4Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash5Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash6Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash7Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash8Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlash9Test.cs | 3 +- .../Action/HackAndSlashRandomBuffTest.cs | 5 +- .Lib9c.Tests/Action/HackAndSlashSweep1Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlashSweep2Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlashSweep3Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlashSweep4Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlashSweep5Test.cs | 3 +- .Lib9c.Tests/Action/HackAndSlashSweep6Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlashSweep7Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlashSweep8Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlashSweep9Test.cs | 5 +- .Lib9c.Tests/Action/HackAndSlashTest14.cs | 3 +- .Lib9c.Tests/Action/InitializeStatesTest.cs | 3 +- .../InvalidTransferSiginerExceptionTest.cs | 2 +- .Lib9c.Tests/Action/ItemEnhancement0Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement10Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement2Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement3Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement4Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement5Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement6Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement7Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement8Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancement9Test.cs | 5 +- .Lib9c.Tests/Action/ItemEnhancementTest.cs | 5 +- .Lib9c.Tests/Action/JoinArena1Test.cs | 5 +- .Lib9c.Tests/Action/JoinArena2Test.cs | 5 +- .Lib9c.Tests/Action/JoinArena3Test.cs | 5 +- .Lib9c.Tests/Action/MarketValidationTest.cs | 5 +- .../Action/MigrateMonsterCollectionTest.cs | 5 +- .../MigrationActivatedAccountsStateTest.cs | 5 +- .../Action/MigrationAvatarStateTest.cs | 3 +- .../Action/MigrationLegacyShopTest.cs | 4 +- .Lib9c.Tests/Action/MimisbrunnrBattle0Test.cs | 3 +- .../Action/MimisbrunnrBattle10Test.cs | 3 +- .../Action/MimisbrunnrBattle11Test.cs | 3 +- .../Action/MimisbrunnrBattle12Test.cs | 5 +- .../Action/MimisbrunnrBattle13Test.cs | 5 +- .Lib9c.Tests/Action/MimisbrunnrBattle2Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle3Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle4Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle5Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle6Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle7Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle8Test.cs | 3 +- .Lib9c.Tests/Action/MimisbrunnrBattle9Test.cs | 3 +- .Lib9c.Tests/Action/MockDelta.cs | 12 ++-- .Lib9c.Tests/Action/MockState.cs | 12 ++-- .Lib9c.Tests/Action/MockStateDelta.cs | 12 ++-- .Lib9c.Tests/Action/MonsterCollect0Test.cs | 6 +- .Lib9c.Tests/Action/MonsterCollect2Test.cs | 6 +- .Lib9c.Tests/Action/MonsterCollectTest.cs | 6 +- .Lib9c.Tests/Action/PatchTableSheetTest.cs | 6 +- ...ingActivationDoesNotExistsExceptionTest.cs | 2 +- .Lib9c.Tests/Action/PetEnhancement0Test.cs | 5 +- .../Action/PrepareRewardAssetsTest.cs | 5 +- .Lib9c.Tests/Action/PurchaseInfoTest.cs | 2 +- .Lib9c.Tests/Action/Raid1Test.cs | 5 +- .Lib9c.Tests/Action/Raid2Test.cs | 5 +- .Lib9c.Tests/Action/Raid3Test.cs | 5 +- .Lib9c.Tests/Action/Raid4Test.cs | 5 +- .Lib9c.Tests/Action/Raid5Test.cs | 5 +- .Lib9c.Tests/Action/Raid6Test.cs | 5 +- .Lib9c.Tests/Action/RankingBattle0Test.cs | 5 +- .Lib9c.Tests/Action/RankingBattle10Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle11Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle2Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle3Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle4Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle5Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle6Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle7Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle8Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattle9Test.cs | 3 +- .Lib9c.Tests/Action/RankingBattleTest.cs | 3 +- .Lib9c.Tests/Action/RapidCombination0Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination2Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination3Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination4Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination5Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination6Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombination8Test.cs | 3 +- .Lib9c.Tests/Action/RapidCombinationTest.cs | 3 +- .Lib9c.Tests/Action/RapidCombinationTest7.cs | 3 +- .Lib9c.Tests/Action/ReRegisterProduct0Test.cs | 5 +- .Lib9c.Tests/Action/ReRegisterProductTest.cs | 5 +- .Lib9c.Tests/Action/RedeemCode0Test.cs | 6 +- .Lib9c.Tests/Action/RedeemCodeTest.cs | 6 +- .Lib9c.Tests/Action/RegisterProduct0Test.cs | 5 +- .Lib9c.Tests/Action/RegisterProductTest.cs | 5 +- .Lib9c.Tests/Action/RenewAdminStateTest.cs | 3 +- .Lib9c.Tests/Action/RequestPledgeTest.cs | 5 +- .Lib9c.Tests/Action/RewardGoldTest.cs | 12 ++-- .Lib9c.Tests/Action/RuneEnhancement0Test.cs | 4 +- .Lib9c.Tests/Action/RuneEnhancementTest.cs | 4 +- .Lib9c.Tests/Action/RuneHelperTest.cs | 2 +- .../Action/Scenario/ArenaScenarioTest.cs | 5 +- .../CombinationAndRapidCombinationTest.cs | 5 +- .Lib9c.Tests/Action/Scenario/ItemCraftTest.cs | 4 +- .../Action/Scenario/MarketScenarioTest.cs | 5 +- .../Action/Scenario/MeadScenarioTest.cs | 6 +- .../AdditionalOptionRateByFixedValueTest.cs | 4 +- .../Action/Scenario/Pet/CommonTest.cs | 4 +- .../Pet/DiscountMaterialCostCrystalTest.cs | 6 +- .../Pet/IncreaseBlockPerHourglassTest.cs | 4 +- .../Scenario/Pet/ReduceRequiredBlockTest.cs | 6 +- .../Action/Scenario/RapidCombinationTest.cs | 4 +- .../Action/Scenario/RuneScenarioTest.cs | 5 +- .../SellAndCancellationAndSellTest.cs | 5 +- .../StakeAndClaimStakeReward2ScenarioTest.cs | 5 +- .../StakeAndClaimStakeReward3ScenarioTest.cs | 6 +- .../StakeAndClaimStakeRewardScenarioTest.cs | 6 +- .../Scenario/WorldUnlockScenarioTest.cs | 3 +- .Lib9c.Tests/Action/SecureMiningRewardTest.cs | 7 +- .Lib9c.Tests/Action/Sell0Test.cs | 5 +- .Lib9c.Tests/Action/Sell10Test.cs | 5 +- .Lib9c.Tests/Action/Sell11Test.cs | 5 +- .Lib9c.Tests/Action/Sell2Test.cs | 5 +- .Lib9c.Tests/Action/Sell3Test.cs | 5 +- .Lib9c.Tests/Action/Sell4Test.cs | 5 +- .Lib9c.Tests/Action/Sell5Test.cs | 5 +- .Lib9c.Tests/Action/Sell6Test.cs | 5 +- .Lib9c.Tests/Action/Sell7Test.cs | 5 +- .Lib9c.Tests/Action/Sell8Test.cs | 5 +- .Lib9c.Tests/Action/Sell9Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation0Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation2Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation3Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation4Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation5Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation6Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation7Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellation8Test.cs | 5 +- .Lib9c.Tests/Action/SellCancellationTest.cs | 5 +- .Lib9c.Tests/Action/SellTest.cs | 5 +- .../Snapshot/TransferAsset0SnapshotTest.cs | 6 +- .Lib9c.Tests/Action/Stake0Test.cs | 5 +- .Lib9c.Tests/Action/StakeTest.cs | 5 +- .Lib9c.Tests/Action/TransferAsset2Test.cs | 5 +- .Lib9c.Tests/Action/TransferAsset3Test.cs | 5 +- .Lib9c.Tests/Action/TransferAssetTest.cs | 5 +- .Lib9c.Tests/Action/TransferAssetTest0.cs | 6 +- .Lib9c.Tests/Action/TransferAssets0Test.cs | 5 +- .Lib9c.Tests/Action/TransferAssetsTest.cs | 5 +- .../Action/UnlockEquipmentRecipe1Test.cs | 5 +- .../Action/UnlockEquipmentRecipeTest.cs | 5 +- .Lib9c.Tests/Action/UnlockRuneSlotTest.cs | 5 +- .Lib9c.Tests/Action/UnlockWorld1Test.cs | 5 +- .Lib9c.Tests/Action/UnlockWorldTest.cs | 5 +- .Lib9c.Tests/Action/UpdateSell0Test.cs | 5 +- .Lib9c.Tests/Action/UpdateSell2Test.cs | 5 +- .Lib9c.Tests/Action/UpdateSell3Test.cs | 5 +- .Lib9c.Tests/Action/UpdateSell4Test.cs | 5 +- .Lib9c.Tests/Action/UpdateSellTest.cs | 5 +- .../Action/ValidatorSetOperateTest.cs | 7 +- .Lib9c.Tests/Action/WorldBossHelperTest.cs | 2 +- .Lib9c.Tests/Battle/EnemyPlayerDigestTest.cs | 1 - .Lib9c.Tests/CrystalCalculatorTest.cs | 2 +- .Lib9c.Tests/CurrenciesTest.cs | 2 +- .../Extensions/EquipmentExtensionsTest.cs | 1 - .../Extensions/EventScheduleExtensionsTest.cs | 2 +- .../Extensions/SheetsExtensionsTest.cs | 6 +- .Lib9c.Tests/JsonStatesLoaderTest.cs | 2 +- .Lib9c.Tests/Model/ActivationKeyTest.cs | 2 +- .../Model/Arena/ArenaAvatarStateTest.cs | 1 - .../Model/Arena/ArenaInformationTest.cs | 1 - .Lib9c.Tests/Model/Arena/ArenaScoreTest.cs | 1 - .Lib9c.Tests/Model/Arena/PlayerDigestTest.cs | 2 - .Lib9c.Tests/Model/BattleLogTest.cs | 2 +- .Lib9c.Tests/Model/Coupons/CouponTest.cs | 2 +- .../GrandFinale/GrandFinaleInformationTest.cs | 3 +- .Lib9c.Tests/Model/Item/ShopItemTest.cs | 5 +- .Lib9c.Tests/Model/ItemNotificationTest.cs | 1 - .Lib9c.Tests/Model/Mail/GrindingMailTest.cs | 2 +- .../Model/Mail/MonsterCollectMailTest.cs | 2 +- .../UnloadFromMyGaragesRecipientMailTest.cs | 5 +- .Lib9c.Tests/Model/Order/FungibleOrderTest.cs | 4 +- .../Model/Order/NonFungibleOrderTest.cs | 4 +- .../Model/Order/OrderDigestListStateTest.cs | 2 +- .Lib9c.Tests/Model/Order/OrderDigestTest.cs | 2 +- .Lib9c.Tests/Model/Order/OrderFactoryTest.cs | 2 +- .Lib9c.Tests/Model/Skill/NormalAttackTest.cs | 1 - .../Model/State/ActivatedAccountsStateTest.cs | 2 +- .Lib9c.Tests/Model/State/AdminStateTest.cs | 1 - .Lib9c.Tests/Model/State/AgentStateTest.cs | 1 - .../Model/State/AuthorizedMinersStateTest.cs | 2 +- .Lib9c.Tests/Model/State/AvatarStateTest.cs | 2 +- .../Model/State/CrystalCostStateTest.cs | 1 - .../State/CrystalRandomSkillStateTest.cs | 3 +- .../Model/State/GoldCurrencyStateTest.cs | 4 +- .../Model/State/HammerPointStateTest.cs | 3 +- .Lib9c.Tests/Model/State/LazyStateTest.cs | 2 +- .../State/MonsterCollectionState0Test.cs | 2 +- .../Model/State/MonsterCollectionStateTest.cs | 2 +- .../Model/State/PendingActivationStateTest.cs | 2 +- .Lib9c.Tests/Model/State/PetStateTest.cs | 1 - .../Model/State/RankingMapStateTest.cs | 2 +- .Lib9c.Tests/Model/State/RankingState1Test.cs | 1 - .Lib9c.Tests/Model/State/RankingStateTest.cs | 1 - .../Model/State/ShardedShopStateTest.cs | 4 +- .../Model/State/ShardedShopStateV2Test.cs | 4 +- .Lib9c.Tests/Model/State/SheetStateTest.cs | 2 +- .Lib9c.Tests/Model/State/ShopStateTest.cs | 3 +- .Lib9c.Tests/Model/State/StakeStateTest.cs | 1 - .../Model/State/StateExtensionsTest.cs | 1 - .../Model/State/WeeklyArenaStateTest.cs | 3 - .../Model/WorldBossKillRewardRecordTest.cs | 2 +- .Lib9c.Tests/Policy/BlockPolicyTest.cs | 33 +++++---- .Lib9c.Tests/StagePolicyTest.cs | 17 +++-- .../Garages/LoadIntoMyGaragesCostSheetTest.cs | 4 +- .../GrandFinaleParticipantsSheetTest.cs | 2 +- .../StakeAchievementRewardSheetTest.cs | 5 +- .../StakeActionPointCoefficientSheetTest.cs | 6 +- .../StakeRegularFixedRewardSheetTest.cs | 5 +- .../TableData/StakeRegularRewardSheetTest.cs | 4 +- .Lib9c.Tests/TestHelper/BlockChainHelper.cs | 7 +- .../TestHelper/MakeInitialStateResult.cs | 8 +-- .Lib9c.Tests/Types/BencodexTypesListTest.cs | 1 - .Lib9c.Tests/Util/CraftUtil.cs | 4 +- .Lib9c.Tests/Util/CurrencyUtil.cs | 6 +- .Lib9c.Tests/Util/InitializeUtil.cs | 5 +- .Lib9c.Tests/Util/QuestUtil.cs | 4 +- .Lib9c.Tools/SubCommand/Account.cs | 9 ++- .Lib9c.Tools/SubCommand/Market.cs | 8 +-- .Lib9c.Tools/SubCommand/State.cs | 9 +-- .Lib9c.Tools/SubCommand/Tx.cs | 12 ++-- Lib9c.Abstractions/IActivateAccount.cs | 2 +- Lib9c.Abstractions/IAddActivatedAccountV1.cs | 2 +- Lib9c.Abstractions/IBattleArenaV1.cs | 2 +- Lib9c.Abstractions/IBattleGrandFinaleV1.cs | 2 +- Lib9c.Abstractions/IBuyMultipleV1.cs | 2 +- Lib9c.Abstractions/IBuyV1.cs | 2 +- Lib9c.Abstractions/IBuyV2.cs | 2 +- Lib9c.Abstractions/IChargeActionPointV1.cs | 2 +- .../IClaimMonsterCollectionRewardV1.cs | 2 +- .../IClaimMonsterCollectionRewardV2.cs | 2 +- Lib9c.Abstractions/IClaimRaidRewardV1.cs | 2 +- Lib9c.Abstractions/IClaimStakeRewardV1.cs | 2 +- .../IClaimWordBossKillRewardV1.cs | 2 +- .../ICombinationConsumableV1.cs | 2 +- Lib9c.Abstractions/ICombinationEquipmentV1.cs | 2 +- Lib9c.Abstractions/ICombinationEquipmentV2.cs | 2 +- Lib9c.Abstractions/ICombinationEquipmentV3.cs | 2 +- Lib9c.Abstractions/ICombinationEquipmentV4.cs | 2 +- Lib9c.Abstractions/ICreateAvatarV1.cs | 2 +- Lib9c.Abstractions/ICreateAvatarV2.cs | 2 +- Lib9c.Abstractions/IDailyRewardV1.cs | 2 +- .../IDeliverToOthersGaragesV1.cs | 5 +- .../IEventConsumableItemCraftsV1.cs | 2 +- Lib9c.Abstractions/IEventDungeonBattleV1.cs | 2 +- Lib9c.Abstractions/IEventDungeonBattleV2.cs | 2 +- .../IEventMaterialItemCraftsV1.cs | 2 +- Lib9c.Abstractions/IGrindingV1.cs | 2 +- .../IHackAndSlashRandomBuffV1.cs | 2 +- Lib9c.Abstractions/IHackAndSlashSweepV1.cs | 2 +- Lib9c.Abstractions/IHackAndSlashSweepV2.cs | 2 +- Lib9c.Abstractions/IHackAndSlashSweepV3.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV1.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV2.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV3.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV4.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV5.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV6.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV7.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV8.cs | 2 +- Lib9c.Abstractions/IHackAndSlashV9.cs | 2 +- Lib9c.Abstractions/IItemEnhancementV1.cs | 2 +- Lib9c.Abstractions/IItemEnhancementV2.cs | 2 +- Lib9c.Abstractions/IItemEnhancementV3.cs | 2 +- Lib9c.Abstractions/IJoinArenaV1.cs | 2 +- Lib9c.Abstractions/ILoadIntoMyGaragesV1.cs | 5 +- .../IMigrateMonsterCollectionV1.cs | 2 +- Lib9c.Abstractions/IMimisbrunnrBattleV1.cs | 2 +- Lib9c.Abstractions/IMimisbrunnrBattleV2.cs | 2 +- Lib9c.Abstractions/IMimisbrunnrBattleV3.cs | 2 +- Lib9c.Abstractions/IMimisbrunnrBattleV4.cs | 2 +- Lib9c.Abstractions/IMimisbrunnrBattleV5.cs | 2 +- Lib9c.Abstractions/IPrepareRewardAssetsV1.cs | 4 +- Lib9c.Abstractions/IRaidV1.cs | 2 +- Lib9c.Abstractions/IRaidV2.cs | 2 +- Lib9c.Abstractions/IRankingBattleV1.cs | 2 +- Lib9c.Abstractions/IRankingBattleV2.cs | 2 +- Lib9c.Abstractions/IRapidCombinationV1.cs | 2 +- Lib9c.Abstractions/IRedeemCodeV1.cs | 2 +- Lib9c.Abstractions/IRuneEnhancementV1.cs | 2 +- Lib9c.Abstractions/ISecureMiningReward.cs | 2 +- Lib9c.Abstractions/ISellCancellationV1.cs | 2 +- Lib9c.Abstractions/ISellCancellationV2.cs | 2 +- Lib9c.Abstractions/ISellCancellationV3.cs | 2 +- Lib9c.Abstractions/ISellV1.cs | 4 +- Lib9c.Abstractions/ISellV2.cs | 4 +- Lib9c.Abstractions/ITransferAssetV1.cs | 4 +- Lib9c.Abstractions/ITransferAssetsV1.cs | 4 +- Lib9c.Abstractions/IUnloadFromMyGaragesV1.cs | 5 +- .../IUnlockEquipmentRecipeV1.cs | 2 +- Lib9c.Abstractions/IUnlockRuneSlotV1.cs | 2 +- Lib9c.Abstractions/IUnlockWorldV1.cs | 2 +- Lib9c.Abstractions/IUpdateSellV1.cs | 4 +- Lib9c.Abstractions/IUpdateSellV2.cs | 2 +- .../Action/Craft/UnlockCraftAction.cs | 5 +- .../Action/Craft/UnlockRecipe.cs | 5 +- .../Action/CreateArenaDummy.cs | 4 +- .../Action/CreateOrReplaceAvatar.cs | 5 +- Lib9c.DevExtensions/Action/CreateTestbed.cs | 6 +- .../Action/Factory/FaucetFactory.cs | 2 +- Lib9c.DevExtensions/Action/FaucetCurrency.cs | 7 +- Lib9c.DevExtensions/Action/FaucetRune.cs | 5 +- .../Action/Interface/IFaucetCurrency.cs | 2 +- .../Action/Interface/IFaucetRune.cs | 2 +- Lib9c.DevExtensions/Action/ManipulateState.cs | 6 +- .../Action/Stage/ClearStage.cs | 5 +- Lib9c.DevExtensions/TestbedHelper.cs | 2 +- Lib9c.DevExtensions/Utils.cs | 4 +- Lib9c.MessagePack/AccountStateDelta.cs | 8 +-- .../Action/NCActionEvaluation.cs | 4 +- .../Formatters/AccountStateDeltaFormatter.cs | 2 +- .../Formatters/AddressFormatter.cs | 2 +- .../Formatters/FungibleAssetValueFormatter.cs | 2 +- ...ineChroniclesResolverGetFormatterHelper.cs | 5 +- Lib9c.Policy/NCStagePolicy.cs | 4 +- .../Policy/BlockPolicySource.Utils.cs | 5 +- Lib9c.Policy/Policy/BlockPolicySource.cs | 6 +- Lib9c.Policy/Policy/DebugPolicy.cs | 9 +-- Lib9c.Policy/Policy/IVariableSubPolicy.cs | 2 +- Lib9c.Policy/Policy/NCBlockPolicy.cs | 4 +- Lib9c.Policy/Policy/VariableSubPolicy.cs | 2 +- .../CustomActionsDeserializableValidator.cs | 2 +- Lib9c.Proposer/Proposer.cs | 8 +-- Lib9c.Renderers/ActionEvaluation.cs | 9 ++- Lib9c.Renderers/Renderers/ActionRenderer.cs | 6 +- Lib9c.Renderers/Renderers/BlockRenderer.cs | 2 +- Lib9c.Utils/BlockHelper.cs | 13 ++-- Lib9c.sln | 72 ++++++++++++++----- Lib9c/Action/AccountStateDeltaExtensions.cs | 7 +- Lib9c/Action/AccountStateExtensions.cs | 12 ++-- Lib9c/Action/ActionBase.cs | 10 +-- Lib9c/Action/ActionBaseExtensions.cs | 13 ++-- Lib9c/Action/ActionContextExtensions.cs | 2 +- Lib9c/Action/ActivateAccount.cs | 4 +- Lib9c/Action/ActivateAccount0.cs | 4 +- Lib9c/Action/AddActivatedAccount.cs | 4 +- Lib9c/Action/AddActivatedAccount0.cs | 4 +- Lib9c/Action/AddRedeemCode.cs | 2 +- Lib9c/Action/AddressExtension.cs | 2 +- Lib9c/Action/ApprovePledge.cs | 5 +- Lib9c/Action/AssetInfo.cs | 5 +- Lib9c/Action/BalanceDoesNotExistsException.cs | 4 +- Lib9c/Action/BattleArena.cs | 4 +- Lib9c/Action/BattleArena1.cs | 4 +- Lib9c/Action/BattleArena10.cs | 4 +- Lib9c/Action/BattleArena11.cs | 4 +- Lib9c/Action/BattleArena2.cs | 5 +- Lib9c/Action/BattleArena3.cs | 5 +- Lib9c/Action/BattleArena4.cs | 4 +- Lib9c/Action/BattleArena5.cs | 4 +- Lib9c/Action/BattleArena6.cs | 4 +- Lib9c/Action/BattleArena7.cs | 6 +- Lib9c/Action/BattleArena8.cs | 4 +- Lib9c/Action/BattleArena9.cs | 4 +- Lib9c/Action/BattleGrandFinale.cs | 4 +- Lib9c/Action/BattleGrandFinale1.cs | 4 +- Lib9c/Action/BattleGrandFinale2.cs | 4 +- Lib9c/Action/Buy.cs | 8 +-- Lib9c/Action/Buy0.cs | 6 +- Lib9c/Action/Buy10.cs | 6 +- Lib9c/Action/Buy11.cs | 6 +- Lib9c/Action/Buy2.cs | 7 +- Lib9c/Action/Buy3.cs | 8 +-- Lib9c/Action/Buy4.cs | 8 +-- Lib9c/Action/Buy5.cs | 6 +- Lib9c/Action/Buy6.cs | 6 +- Lib9c/Action/Buy7.cs | 6 +- Lib9c/Action/Buy8.cs | 8 +-- Lib9c/Action/Buy9.cs | 8 +-- Lib9c/Action/BuyMultiple.cs | 6 +- Lib9c/Action/BuyProduct.cs | 6 +- Lib9c/Action/BuyProduct0.cs | 6 +- Lib9c/Action/CancelMonsterCollect.cs | 6 +- Lib9c/Action/CancelProductRegistration.cs | 4 +- Lib9c/Action/ChargeActionPoint.cs | 5 +- Lib9c/Action/ChargeActionPoint0.cs | 5 +- Lib9c/Action/ChargeActionPoint2.cs | 5 +- Lib9c/Action/ClaimMonsterCollectionReward.cs | 5 +- Lib9c/Action/ClaimMonsterCollectionReward0.cs | 6 +- Lib9c/Action/ClaimMonsterCollectionReward2.cs | 5 +- Lib9c/Action/ClaimRaidReward.cs | 6 +- Lib9c/Action/ClaimStakeReward.cs | 6 +- Lib9c/Action/ClaimStakeReward1.cs | 4 +- Lib9c/Action/ClaimStakeReward2.cs | 4 +- Lib9c/Action/ClaimStakeReward3.cs | 7 +- Lib9c/Action/ClaimStakeReward4.cs | 6 +- Lib9c/Action/ClaimWordBossKillReward.cs | 5 +- Lib9c/Action/CombinationConsumable.cs | 5 +- Lib9c/Action/CombinationConsumable0.cs | 5 +- Lib9c/Action/CombinationConsumable2.cs | 5 +- Lib9c/Action/CombinationConsumable3.cs | 5 +- Lib9c/Action/CombinationConsumable4.cs | 5 +- Lib9c/Action/CombinationConsumable5.cs | 5 +- Lib9c/Action/CombinationConsumable6.cs | 5 +- Lib9c/Action/CombinationConsumable7.cs | 5 +- Lib9c/Action/CombinationEquipment.cs | 5 +- Lib9c/Action/CombinationEquipment0.cs | 6 +- Lib9c/Action/CombinationEquipment10.cs | 5 +- Lib9c/Action/CombinationEquipment11.cs | 5 +- Lib9c/Action/CombinationEquipment12.cs | 5 +- Lib9c/Action/CombinationEquipment13.cs | 5 +- Lib9c/Action/CombinationEquipment14.cs | 5 +- Lib9c/Action/CombinationEquipment15.cs | 5 +- Lib9c/Action/CombinationEquipment2.cs | 6 +- Lib9c/Action/CombinationEquipment3.cs | 6 +- Lib9c/Action/CombinationEquipment4.cs | 6 +- Lib9c/Action/CombinationEquipment5.cs | 6 +- Lib9c/Action/CombinationEquipment6.cs | 6 +- Lib9c/Action/CombinationEquipment7.cs | 6 +- Lib9c/Action/CombinationEquipment8.cs | 5 +- Lib9c/Action/CombinationEquipment9.cs | 5 +- Lib9c/Action/Coupons/IssueCoupons.cs | 4 +- Lib9c/Action/Coupons/RedeemCoupon.cs | 4 +- Lib9c/Action/Coupons/TransferCoupons.cs | 4 +- Lib9c/Action/CreateAvatar.cs | 2 +- Lib9c/Action/CreateAvatar0.cs | 5 +- Lib9c/Action/CreateAvatar2.cs | 5 +- Lib9c/Action/CreateAvatar3.cs | 2 +- Lib9c/Action/CreateAvatar4.cs | 2 +- Lib9c/Action/CreateAvatar5.cs | 2 +- Lib9c/Action/CreateAvatar6.cs | 2 +- Lib9c/Action/CreateAvatar7.cs | 2 +- Lib9c/Action/CreateAvatar8.cs | 2 +- Lib9c/Action/CreatePendingActivation.cs | 2 +- Lib9c/Action/CreatePendingActivations.cs | 5 +- Lib9c/Action/CreatePledge.cs | 5 +- Lib9c/Action/DailyReward.cs | 5 +- Lib9c/Action/DailyReward0.cs | 5 +- Lib9c/Action/DailyReward2.cs | 5 +- Lib9c/Action/DailyReward3.cs | 5 +- Lib9c/Action/DailyReward4.cs | 5 +- Lib9c/Action/DailyReward5.cs | 5 +- Lib9c/Action/DailyReward6.cs | 5 +- Lib9c/Action/EndPledge.cs | 5 +- Lib9c/Action/EventConsumableItemCrafts.cs | 5 +- Lib9c/Action/EventDungeonBattle.cs | 5 +- Lib9c/Action/EventDungeonBattleV1.cs | 5 +- Lib9c/Action/EventDungeonBattleV2.cs | 5 +- Lib9c/Action/EventDungeonBattleV3.cs | 5 +- Lib9c/Action/EventDungeonBattleV4.cs | 5 +- Lib9c/Action/EventMaterialItemCrafts.cs | 5 +- .../Action/Factory/ClaimStakeRewardFactory.cs | 2 +- Lib9c/Action/FailedLoadStateException.cs | 2 +- Lib9c/Action/FavProductInfo.cs | 4 +- .../Action/Garages/DeliverToOthersGarages.cs | 7 +- Lib9c/Action/Garages/GarageUtils.cs | 7 +- Lib9c/Action/Garages/LoadIntoMyGarages.cs | 7 +- Lib9c/Action/Garages/UnloadFromMyGarages.cs | 7 +- Lib9c/Action/GoldDistribution.cs | 2 +- Lib9c/Action/Grinding.cs | 6 +- Lib9c/Action/HackAndSlash.cs | 5 +- Lib9c/Action/HackAndSlash0.cs | 5 +- Lib9c/Action/HackAndSlash10.cs | 5 +- Lib9c/Action/HackAndSlash11.cs | 5 +- Lib9c/Action/HackAndSlash12.cs | 5 +- Lib9c/Action/HackAndSlash13.cs | 5 +- Lib9c/Action/HackAndSlash14.cs | 5 +- Lib9c/Action/HackAndSlash15.cs | 5 +- Lib9c/Action/HackAndSlash16.cs | 5 +- Lib9c/Action/HackAndSlash17.cs | 5 +- Lib9c/Action/HackAndSlash18.cs | 6 +- Lib9c/Action/HackAndSlash19.cs | 5 +- Lib9c/Action/HackAndSlash2.cs | 5 +- Lib9c/Action/HackAndSlash20.cs | 5 +- Lib9c/Action/HackAndSlash3.cs | 5 +- Lib9c/Action/HackAndSlash4.cs | 5 +- Lib9c/Action/HackAndSlash5.cs | 5 +- Lib9c/Action/HackAndSlash6.cs | 5 +- Lib9c/Action/HackAndSlash7.cs | 5 +- Lib9c/Action/HackAndSlash8.cs | 5 +- Lib9c/Action/HackAndSlash9.cs | 5 +- Lib9c/Action/HackAndSlashRandomBuff.cs | 6 +- Lib9c/Action/HackAndSlashSweep.cs | 5 +- Lib9c/Action/HackAndSlashSweep1.cs | 5 +- Lib9c/Action/HackAndSlashSweep2.cs | 5 +- Lib9c/Action/HackAndSlashSweep3.cs | 5 +- Lib9c/Action/HackAndSlashSweep4.cs | 5 +- Lib9c/Action/HackAndSlashSweep5.cs | 5 +- Lib9c/Action/HackAndSlashSweep6.cs | 5 +- Lib9c/Action/HackAndSlashSweep7.cs | 5 +- Lib9c/Action/HackAndSlashSweep8.cs | 5 +- Lib9c/Action/IBuy0.cs | 2 +- Lib9c/Action/IBuy5.cs | 2 +- Lib9c/Action/IHackAndSlashV10.cs | 2 +- Lib9c/Action/IProductInfo.cs | 4 +- Lib9c/Action/IPurchaseInfo.cs | 4 +- Lib9c/Action/IRegisterInfo.cs | 4 +- Lib9c/Action/ITransferAsset.cs | 4 +- Lib9c/Action/ITransferAssets.cs | 4 +- Lib9c/Action/InitializeStates.cs | 2 +- .../Action/InvalidTransferMinterException.cs | 2 +- .../InvalidTransferRecipientException.cs | 2 +- .../Action/InvalidTransferSignerException.cs | 3 +- ...idTransferUnactivatedRecipientException.cs | 2 +- Lib9c/Action/ItemEnhancement.cs | 6 +- Lib9c/Action/ItemEnhancement0.cs | 5 +- Lib9c/Action/ItemEnhancement10.cs | 5 +- Lib9c/Action/ItemEnhancement2.cs | 5 +- Lib9c/Action/ItemEnhancement3.cs | 5 +- Lib9c/Action/ItemEnhancement4.cs | 5 +- Lib9c/Action/ItemEnhancement5.cs | 5 +- Lib9c/Action/ItemEnhancement6.cs | 5 +- Lib9c/Action/ItemEnhancement7.cs | 5 +- Lib9c/Action/ItemEnhancement8.cs | 5 +- Lib9c/Action/ItemEnhancement9.cs | 5 +- Lib9c/Action/ItemProductInfo.cs | 4 +- Lib9c/Action/JoinArena.cs | 5 +- Lib9c/Action/JoinArena1.cs | 5 +- Lib9c/Action/JoinArena2.cs | 5 +- Lib9c/Action/MigrateMonsterCollection.cs | 5 +- .../Action/MigrationActivatedAccountsState.cs | 5 +- Lib9c/Action/MigrationAvatarState.cs | 2 +- Lib9c/Action/MigrationLegacyShop.cs | 5 +- Lib9c/Action/MigrationLegacyShop0.cs | 5 +- Lib9c/Action/MimisbrunnrBattle.cs | 5 +- Lib9c/Action/MimisbrunnrBattle0.cs | 5 +- Lib9c/Action/MimisbrunnrBattle10.cs | 5 +- Lib9c/Action/MimisbrunnrBattle11.cs | 5 +- Lib9c/Action/MimisbrunnrBattle12.cs | 5 +- Lib9c/Action/MimisbrunnrBattle2.cs | 5 +- Lib9c/Action/MimisbrunnrBattle3.cs | 5 +- Lib9c/Action/MimisbrunnrBattle4.cs | 5 +- Lib9c/Action/MimisbrunnrBattle5.cs | 5 +- Lib9c/Action/MimisbrunnrBattle6.cs | 5 +- Lib9c/Action/MimisbrunnrBattle7.cs | 5 +- Lib9c/Action/MimisbrunnrBattle8.cs | 5 +- Lib9c/Action/MimisbrunnrBattle9.cs | 5 +- Lib9c/Action/MonsterCollect.cs | 6 +- Lib9c/Action/MonsterCollect0.cs | 6 +- Lib9c/Action/MonsterCollect2.cs | 6 +- .../NotEnoughFungibleAssetValueException.cs | 2 +- Lib9c/Action/PatchTableSheet.cs | 4 +- ...PendingActivationDoesNotExistsException.cs | 6 +- Lib9c/Action/PermissionDeniedException.cs | 4 +- Lib9c/Action/PermissionException.cs | 2 +- Lib9c/Action/PetEnhancement.cs | 5 +- Lib9c/Action/PolicyExpiredException.cs | 2 +- Lib9c/Action/PrepareRewardAssets.cs | 6 +- Lib9c/Action/PurchaseInfo.cs | 4 +- Lib9c/Action/PurchaseInfo0.cs | 4 +- Lib9c/Action/Raid.cs | 6 +- Lib9c/Action/Raid1.cs | 6 +- Lib9c/Action/Raid2.cs | 6 +- Lib9c/Action/Raid3.cs | 6 +- Lib9c/Action/Raid4.cs | 6 +- Lib9c/Action/Raid5.cs | 6 +- Lib9c/Action/RankingBattle.cs | 4 +- Lib9c/Action/RankingBattle0.cs | 7 +- Lib9c/Action/RankingBattle10.cs | 4 +- Lib9c/Action/RankingBattle11.cs | 4 +- Lib9c/Action/RankingBattle2.cs | 4 +- Lib9c/Action/RankingBattle3.cs | 4 +- Lib9c/Action/RankingBattle4.cs | 4 +- Lib9c/Action/RankingBattle5.cs | 4 +- Lib9c/Action/RankingBattle6.cs | 4 +- Lib9c/Action/RankingBattle7.cs | 4 +- Lib9c/Action/RankingBattle8.cs | 4 +- Lib9c/Action/RankingBattle9.cs | 4 +- Lib9c/Action/RapidCombination.cs | 4 +- Lib9c/Action/RapidCombination0.cs | 4 +- Lib9c/Action/RapidCombination2.cs | 4 +- Lib9c/Action/RapidCombination3.cs | 4 +- Lib9c/Action/RapidCombination4.cs | 4 +- Lib9c/Action/RapidCombination5.cs | 4 +- Lib9c/Action/RapidCombination6.cs | 4 +- Lib9c/Action/RapidCombination7.cs | 4 +- Lib9c/Action/RapidCombination8.cs | 4 +- Lib9c/Action/ReRegisterProduct.cs | 4 +- Lib9c/Action/ReRegisterProduct0.cs | 4 +- Lib9c/Action/RedeemCode.cs | 4 +- Lib9c/Action/RedeemCode0.cs | 5 +- Lib9c/Action/RedeemCode2.cs | 4 +- Lib9c/Action/RegisterInfo.cs | 4 +- Lib9c/Action/RegisterProduct.cs | 7 +- Lib9c/Action/RegisterProduct0.cs | 7 +- Lib9c/Action/RenewAdminState.cs | 2 +- Lib9c/Action/RequestPledge.cs | 4 +- Lib9c/Action/RequiredBlockIndexException.cs | 2 - Lib9c/Action/RewardGold.cs | 6 +- Lib9c/Action/RuneEnhancement.cs | 6 +- Lib9c/Action/RuneEnhancement0.cs | 7 +- Lib9c/Action/SecureMiningReward.cs | 6 +- Lib9c/Action/Sell.cs | 6 +- Lib9c/Action/Sell0.cs | 7 +- Lib9c/Action/Sell10.cs | 6 +- Lib9c/Action/Sell11.cs | 6 +- Lib9c/Action/Sell2.cs | 6 +- Lib9c/Action/Sell3.cs | 6 +- Lib9c/Action/Sell4.cs | 6 +- Lib9c/Action/Sell5.cs | 6 +- Lib9c/Action/Sell6.cs | 6 +- Lib9c/Action/Sell7.cs | 6 +- Lib9c/Action/Sell8.cs | 6 +- Lib9c/Action/Sell9.cs | 6 +- Lib9c/Action/SellCancellation.cs | 4 +- Lib9c/Action/SellCancellation0.cs | 5 +- Lib9c/Action/SellCancellation2.cs | 5 +- Lib9c/Action/SellCancellation3.cs | 5 +- Lib9c/Action/SellCancellation4.cs | 5 +- Lib9c/Action/SellCancellation5.cs | 5 +- Lib9c/Action/SellCancellation6.cs | 5 +- Lib9c/Action/SellCancellation7.cs | 5 +- Lib9c/Action/SellCancellation8.cs | 5 +- Lib9c/Action/Stake.cs | 2 +- Lib9c/Action/Stake0.cs | 2 +- .../TotalSupplyDoesNotExistException.cs | 4 +- Lib9c/Action/TransferAsset.cs | 6 +- Lib9c/Action/TransferAsset0.cs | 6 +- Lib9c/Action/TransferAsset2.cs | 6 +- Lib9c/Action/TransferAsset3.cs | 6 +- Lib9c/Action/TransferAssets.cs | 6 +- Lib9c/Action/TransferAssets0.cs | 6 +- Lib9c/Action/UnlockEquipmentRecipe.cs | 6 +- Lib9c/Action/UnlockEquipmentRecipe1.cs | 6 +- Lib9c/Action/UnlockRuneSlot.cs | 5 +- Lib9c/Action/UnlockWorld.cs | 6 +- Lib9c/Action/UnlockWorld1.cs | 6 +- Lib9c/Action/UpdateSell.cs | 4 +- Lib9c/Action/UpdateSell0.cs | 6 +- Lib9c/Action/UpdateSell2.cs | 6 +- Lib9c/Action/UpdateSell3.cs | 5 +- Lib9c/Action/UpdateSell4.cs | 5 +- Lib9c/Action/UpdateSellInfo.cs | 4 +- Lib9c/Action/ValidatorSetOperate.cs | 4 +- .../ValidatorSetOperatorTypeExtension.cs | 3 +- ...aStateNotContainsAvatarAddressException.cs | 2 +- Lib9c/Addresses.cs | 3 +- Lib9c/Arena/ArenaHelper.cs | 4 +- Lib9c/Battle/RaidSimulator.cs | 2 +- Lib9c/Battle/RaidSimulatorV1.cs | 2 +- Lib9c/Battle/RaidSimulatorV2.cs | 2 +- Lib9c/Currencies.cs | 2 +- Lib9c/CurrencyExtensions.cs | 4 +- Lib9c/Exceptions/ItemNotFoundException.cs | 3 +- Lib9c/Exceptions/NotEnoughItemException.cs | 3 +- Lib9c/Exceptions/StateNullException.cs | 2 +- Lib9c/Extensions/EventScheduleExtensions.cs | 2 +- Lib9c/Extensions/SheetsExtensions.cs | 7 +- Lib9c/Helper/CrystalCalculator.cs | 7 +- Lib9c/Helper/PetHelper.cs | 2 +- Lib9c/Helper/RuneHelper.cs | 2 +- Lib9c/Helper/Validator.cs | 4 +- Lib9c/Helper/WorldBossHelper.cs | 2 +- Lib9c/MeadConfig.cs | 2 +- Lib9c/Model/ActivationKey.cs | 2 +- Lib9c/Model/Arena/ArenaInformation.cs | 4 +- Lib9c/Model/Arena/ArenaParticipants.cs | 2 +- Lib9c/Model/Arena/ArenaScore.cs | 2 +- Lib9c/Model/Event/EventDungeonInfo.cs | 4 +- .../GrandFinale/GrandFinaleInformation.cs | 2 +- Lib9c/Model/Item/IFungibleItem.cs | 2 +- Lib9c/Model/Item/Inventory.cs | 3 +- Lib9c/Model/Item/Material.cs | 2 +- Lib9c/Model/Item/ShopItem.cs | 4 +- Lib9c/Model/Item/TradableMaterial.cs | 2 +- Lib9c/Model/Mail/GrindingMail.cs | 2 +- .../Mail/UnloadFromMyGaragesRecipientMail.cs | 5 +- Lib9c/Model/Market/FavProduct.cs | 2 +- Lib9c/Model/Market/Product.cs | 5 +- Lib9c/Model/Market/ProductReceipt.cs | 4 +- Lib9c/Model/Market/ProductsState.cs | 3 +- Lib9c/Model/Order/FungibleOrder.cs | 4 +- Lib9c/Model/Order/NonFungibleOrder.cs | 4 +- Lib9c/Model/Order/Order.cs | 4 +- Lib9c/Model/Order/OrderDigest.cs | 4 +- Lib9c/Model/Order/OrderDigestListState.cs | 2 +- Lib9c/Model/Order/OrderFactory.cs | 4 +- Lib9c/Model/Order/OrderReceipt.cs | 2 +- Lib9c/Model/Quest/GoldQuest.cs | 3 +- Lib9c/Model/Quest/QuestList.cs | 2 +- Lib9c/Model/State/ActivatedAccountsState.cs | 3 +- Lib9c/Model/State/AdminState.cs | 2 +- Lib9c/Model/State/AgentState.cs | 2 +- Lib9c/Model/State/ArenaAvatarState.cs | 2 +- Lib9c/Model/State/ArenaInfo.cs | 2 +- Lib9c/Model/State/AuthorizedMinersState.cs | 2 +- Lib9c/Model/State/AvatarState.cs | 1 - Lib9c/Model/State/CombinationSlotState.cs | 2 +- Lib9c/Model/State/CreditsState.cs | 2 +- Lib9c/Model/State/CrystalCostState.cs | 4 +- Lib9c/Model/State/CrystalRandomSkillState.cs | 2 +- Lib9c/Model/State/GameConfigState.cs | 2 +- Lib9c/Model/State/GoldBalanceState.cs | 4 +- Lib9c/Model/State/GoldCurrencyState.cs | 4 +- Lib9c/Model/State/HammerPointState.cs | 2 +- Lib9c/Model/State/ItemSlotState.cs | 2 +- Lib9c/Model/State/MarketState.cs | 2 +- Lib9c/Model/State/MonsterCollectionResult.cs | 2 +- Lib9c/Model/State/MonsterCollectionState.cs | 2 +- Lib9c/Model/State/MonsterCollectionState0.cs | 2 +- Lib9c/Model/State/PendingActivationState.cs | 1 - Lib9c/Model/State/PetState.cs | 2 +- Lib9c/Model/State/RaiderState.cs | 2 +- Lib9c/Model/State/RankingMapState.cs | 2 +- Lib9c/Model/State/RankingState.cs | 2 +- Lib9c/Model/State/RankingState0.cs | 2 +- Lib9c/Model/State/RankingState1.cs | 2 +- Lib9c/Model/State/RedeemCodeState.cs | 2 +- Lib9c/Model/State/RuneSlotState.cs | 2 +- Lib9c/Model/State/RuneState.cs | 2 +- Lib9c/Model/State/ShardedShopState.cs | 2 +- Lib9c/Model/State/ShardedShopStateV2.cs | 2 +- Lib9c/Model/State/ShopState.cs | 2 +- Lib9c/Model/State/StakeState.cs | 2 +- Lib9c/Model/State/State.cs | 2 +- Lib9c/Model/State/StateExtensions.cs | 6 +- Lib9c/Model/State/WeeklyArenaState.cs | 2 +- .../Model/State/WorldBossKillRewardRecord.cs | 2 +- .../Garages/LoadIntoMyGaragesCostSheet.cs | 4 +- .../GrandFinaleParticipantsSheet.cs | 2 +- Lib9c/TableData/IStakeRewardRow.cs | 2 +- Lib9c/TableData/Item/MaterialItemSheet.cs | 3 +- Lib9c/TableData/RedeemCodeListSheet.cs | 2 +- .../TableData/StakeAchievementRewardSheet.cs | 2 +- .../TableData/StakeRegularFixedRewardSheet.cs | 2 +- .../TableData/WorldBossRankingRewardSheet.cs | 2 +- .../Secp256K1CryptoBackend.cs | 2 +- 868 files changed, 1778 insertions(+), 1936 deletions(-) diff --git a/.Lib9c.Benchmarks/Program.cs b/.Lib9c.Benchmarks/Program.cs index c1a01a6f0..e3a5231bc 100644 --- a/.Lib9c.Benchmarks/Program.cs +++ b/.Lib9c.Benchmarks/Program.cs @@ -5,16 +5,17 @@ using System.Linq; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Action.State; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Blocks; +using Libplanet.Common; +using Libplanet.Crypto; using Libplanet.RocksDBStore; -using Libplanet.State; using Libplanet.Store; using Libplanet.Store.Trie; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; using Nekoyume.Action.Loader; using Nekoyume.Blockchain; using Nekoyume.Blockchain.Policy; diff --git a/.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs b/.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs index 114f73585..fbf2ce11a 100644 --- a/.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/Craft/UnlocakCraftActionTest.cs @@ -3,9 +3,10 @@ using Lib9c.Tests; using Lib9c.Tests.Action; using Lib9c.Tests.Util; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs b/.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs index 374461182..164577427 100644 --- a/.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/Craft/UnlockRecipeTest.cs @@ -5,8 +5,8 @@ using Lib9c.Tests; using Lib9c.Tests.Action; using Lib9c.Tests.Util; -using Libplanet; -using Libplanet.State; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs index aeee7ce76..bbe87e7bf 100644 --- a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; -using Libplanet; -using Libplanet.Assets; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Types.Assets; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs b/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs index e92dd6912..96e85635f 100644 --- a/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs @@ -1,10 +1,10 @@ using System.Collections.Immutable; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; -using Libplanet; -using Libplanet.Assets; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Types.Assets; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Model.State; using Serilog; diff --git a/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs b/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs index 5075e11a3..3913bbd01 100644 --- a/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs @@ -4,9 +4,9 @@ using System.Linq; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; -using Libplanet; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs index 6c1b9d9a7..944052a5d 100644 --- a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs @@ -9,10 +9,10 @@ using Lib9c.Tests; using Lib9c.Tests.Action; using Lib9c.Tests.Util; -using Libplanet; -using Libplanet.Assets; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Types.Assets; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model; diff --git a/.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs b/.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs index bbbd81ce3..e880ec166 100644 --- a/.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/Stage/ClearStageTest.cs @@ -3,8 +3,8 @@ using Lib9c.Tests; using Lib9c.Tests.Action; using Lib9c.Tests.Util; -using Libplanet; -using Libplanet.State; +using Libplanet.Crypto; +using Libplanet.Action.State; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.DevExtensions.Tests/UtilsTest.cs b/.Lib9c.DevExtensions.Tests/UtilsTest.cs index 13668fbfc..d6c9043ff 100644 --- a/.Lib9c.DevExtensions.Tests/UtilsTest.cs +++ b/.Lib9c.DevExtensions.Tests/UtilsTest.cs @@ -2,7 +2,7 @@ using System.Collections.Immutable; using System.IO; using System.Linq; -using Libplanet; +using Libplanet.Crypto; using Xunit; namespace Lib9c.DevExtensions.Tests diff --git a/.Lib9c.Miner.Tests/CustomActionsDeserializableValidatorTest.cs b/.Lib9c.Miner.Tests/CustomActionsDeserializableValidatorTest.cs index 6f2fd6806..b3332b71d 100644 --- a/.Lib9c.Miner.Tests/CustomActionsDeserializableValidatorTest.cs +++ b/.Lib9c.Miner.Tests/CustomActionsDeserializableValidatorTest.cs @@ -1,13 +1,12 @@ using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; using Libplanet.Action.Loader; -using Libplanet.Assets; -using Libplanet.Blocks; +using Libplanet.Action.State; using Libplanet.Crypto; -using Libplanet.State; -using Libplanet.Tx; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Blockchain; namespace Lib9c.Proposer.Tests; @@ -64,7 +63,7 @@ private class MockTransaction : ITransaction public PublicKey PublicKey { get; init; } public BlockHash? GenesisHash { get; init; } public TxActionList Actions => - new(SystemAction is { } sa ? new List(sa) : new List(CustomActions!)); + new(SystemAction is { } sa ? new IValue[]{ sa } : CustomActions!); public FungibleAssetValue? MaxGasPrice => null; diff --git a/.Lib9c.Tests/Action/AccountStateDeltaExtensionsTest.cs b/.Lib9c.Tests/Action/AccountStateDeltaExtensionsTest.cs index 1ec70f5fb..47290b398 100644 --- a/.Lib9c.Tests/Action/AccountStateDeltaExtensionsTest.cs +++ b/.Lib9c.Tests/Action/AccountStateDeltaExtensionsTest.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.Coupons; diff --git a/.Lib9c.Tests/Action/AccountStateViewExtensionsTest.cs b/.Lib9c.Tests/Action/AccountStateViewExtensionsTest.cs index ccaece1c7..ba1bc3505 100644 --- a/.Lib9c.Tests/Action/AccountStateViewExtensionsTest.cs +++ b/.Lib9c.Tests/Action/AccountStateViewExtensionsTest.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Tests.Extensions; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/ActionBaseExtensionsTest.cs b/.Lib9c.Tests/Action/ActionBaseExtensionsTest.cs index 3ba3c24ab..f40a828fe 100644 --- a/.Lib9c.Tests/Action/ActionBaseExtensionsTest.cs +++ b/.Lib9c.Tests/Action/ActionBaseExtensionsTest.cs @@ -1,8 +1,7 @@ namespace Lib9c.Tests.Action { using System.Collections.Immutable; - using Libplanet; - using Libplanet.Action; + using Libplanet.Crypto; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Action/ActionContext.cs b/.Lib9c.Tests/Action/ActionContext.cs index af7110a56..c1f823297 100644 --- a/.Lib9c.Tests/Action/ActionContext.cs +++ b/.Lib9c.Tests/Action/ActionContext.cs @@ -1,12 +1,13 @@ namespace Lib9c.Tests.Action { using System.Security.Cryptography; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.Blocks; - using Libplanet.State; - using Libplanet.Tx; + using Libplanet.Action.State; + using Libplanet.Common; + using Libplanet.Crypto; + using Libplanet.Types.Assets; + using Libplanet.Types.Blocks; + using Libplanet.Types.Tx; public class ActionContext : IActionContext { diff --git a/.Lib9c.Tests/Action/ActionContextExtensionsTest.cs b/.Lib9c.Tests/Action/ActionContextExtensionsTest.cs index 77e51e30c..a50704a85 100644 --- a/.Lib9c.Tests/Action/ActionContextExtensionsTest.cs +++ b/.Lib9c.Tests/Action/ActionContextExtensionsTest.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ActionEvaluationTest.cs b/.Lib9c.Tests/Action/ActionEvaluationTest.cs index 3ee935c55..9a811172d 100644 --- a/.Lib9c.Tests/Action/ActionEvaluationTest.cs +++ b/.Lib9c.Tests/Action/ActionEvaluationTest.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using Bencodex.Types; using Lib9c.Formatters; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using MessagePack; using MessagePack.Resolvers; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Action/ActivateAccount0Test.cs b/.Lib9c.Tests/Action/ActivateAccount0Test.cs index 345e04105..244199825 100644 --- a/.Lib9c.Tests/Action/ActivateAccount0Test.cs +++ b/.Lib9c.Tests/Action/ActivateAccount0Test.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ActivateAccountTest.cs b/.Lib9c.Tests/Action/ActivateAccountTest.cs index 2fd01ed7f..7b9695ddf 100644 --- a/.Lib9c.Tests/Action/ActivateAccountTest.cs +++ b/.Lib9c.Tests/Action/ActivateAccountTest.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/AddActivatedAccount0Test.cs b/.Lib9c.Tests/Action/AddActivatedAccount0Test.cs index 94d6aa466..5d994f961 100644 --- a/.Lib9c.Tests/Action/AddActivatedAccount0Test.cs +++ b/.Lib9c.Tests/Action/AddActivatedAccount0Test.cs @@ -2,8 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Action/AddActivatedAccountTest.cs b/.Lib9c.Tests/Action/AddActivatedAccountTest.cs index d0d8365ff..06ea2ec31 100644 --- a/.Lib9c.Tests/Action/AddActivatedAccountTest.cs +++ b/.Lib9c.Tests/Action/AddActivatedAccountTest.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System; using System.Collections.Immutable; - using Bencodex.Types; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/AddRedeemCodeTest.cs b/.Lib9c.Tests/Action/AddRedeemCodeTest.cs index a97adb41a..04da203ef 100644 --- a/.Lib9c.Tests/Action/AddRedeemCodeTest.cs +++ b/.Lib9c.Tests/Action/AddRedeemCodeTest.cs @@ -2,8 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ApprovePledgeTest.cs b/.Lib9c.Tests/Action/ApprovePledgeTest.cs index 638b9a754..ab7755649 100644 --- a/.Lib9c.Tests/Action/ApprovePledgeTest.cs +++ b/.Lib9c.Tests/Action/ApprovePledgeTest.cs @@ -2,10 +2,8 @@ namespace Lib9c.Tests.Action { using System; using Bencodex.Types; - using Libplanet; - using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ArenahelperTest.cs b/.Lib9c.Tests/Action/ArenahelperTest.cs index fa510e4d6..72db196c7 100644 --- a/.Lib9c.Tests/Action/ArenahelperTest.cs +++ b/.Lib9c.Tests/Action/ArenahelperTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena10Test.cs b/.Lib9c.Tests/Action/BattleArena10Test.cs index d7ab6259d..59b9f8864 100644 --- a/.Lib9c.Tests/Action/BattleArena10Test.cs +++ b/.Lib9c.Tests/Action/BattleArena10Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena11Test.cs b/.Lib9c.Tests/Action/BattleArena11Test.cs index 0b26c0d75..c494ff6a9 100644 --- a/.Lib9c.Tests/Action/BattleArena11Test.cs +++ b/.Lib9c.Tests/Action/BattleArena11Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena12Test.cs b/.Lib9c.Tests/Action/BattleArena12Test.cs index 7b17c2420..a9601b2a7 100644 --- a/.Lib9c.Tests/Action/BattleArena12Test.cs +++ b/.Lib9c.Tests/Action/BattleArena12Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena1Test.cs b/.Lib9c.Tests/Action/BattleArena1Test.cs index 299f26643..251719db1 100644 --- a/.Lib9c.Tests/Action/BattleArena1Test.cs +++ b/.Lib9c.Tests/Action/BattleArena1Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena2Test.cs b/.Lib9c.Tests/Action/BattleArena2Test.cs index 225acf091..8f4901d81 100644 --- a/.Lib9c.Tests/Action/BattleArena2Test.cs +++ b/.Lib9c.Tests/Action/BattleArena2Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena3Test.cs b/.Lib9c.Tests/Action/BattleArena3Test.cs index af89ebec8..c0cef8bf6 100644 --- a/.Lib9c.Tests/Action/BattleArena3Test.cs +++ b/.Lib9c.Tests/Action/BattleArena3Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena4Test.cs b/.Lib9c.Tests/Action/BattleArena4Test.cs index 6a9cd955c..547107f6b 100644 --- a/.Lib9c.Tests/Action/BattleArena4Test.cs +++ b/.Lib9c.Tests/Action/BattleArena4Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena5Test.cs b/.Lib9c.Tests/Action/BattleArena5Test.cs index ca4773cea..e7b64be69 100644 --- a/.Lib9c.Tests/Action/BattleArena5Test.cs +++ b/.Lib9c.Tests/Action/BattleArena5Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena6Test.cs b/.Lib9c.Tests/Action/BattleArena6Test.cs index 3e515a98d..144bcd534 100644 --- a/.Lib9c.Tests/Action/BattleArena6Test.cs +++ b/.Lib9c.Tests/Action/BattleArena6Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena7Test.cs b/.Lib9c.Tests/Action/BattleArena7Test.cs index 67319ef4a..6cbcf3b74 100644 --- a/.Lib9c.Tests/Action/BattleArena7Test.cs +++ b/.Lib9c.Tests/Action/BattleArena7Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena8Test.cs b/.Lib9c.Tests/Action/BattleArena8Test.cs index f3fcb616b..ef0afc550 100644 --- a/.Lib9c.Tests/Action/BattleArena8Test.cs +++ b/.Lib9c.Tests/Action/BattleArena8Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleArena9Test.cs b/.Lib9c.Tests/Action/BattleArena9Test.cs index ca475a55c..b5e6e7bf5 100644 --- a/.Lib9c.Tests/Action/BattleArena9Test.cs +++ b/.Lib9c.Tests/Action/BattleArena9Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/BattleGrandFinale1Test.cs b/.Lib9c.Tests/Action/BattleGrandFinale1Test.cs index 37f8bd3f9..bf6fb473d 100644 --- a/.Lib9c.Tests/Action/BattleGrandFinale1Test.cs +++ b/.Lib9c.Tests/Action/BattleGrandFinale1Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/BattleGrandFinale2Test.cs b/.Lib9c.Tests/Action/BattleGrandFinale2Test.cs index 46e5363d2..e4fa7d288 100644 --- a/.Lib9c.Tests/Action/BattleGrandFinale2Test.cs +++ b/.Lib9c.Tests/Action/BattleGrandFinale2Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/BattleGrandFinale3Test.cs b/.Lib9c.Tests/Action/BattleGrandFinale3Test.cs index 799bedc2a..12b879bc2 100644 --- a/.Lib9c.Tests/Action/BattleGrandFinale3Test.cs +++ b/.Lib9c.Tests/Action/BattleGrandFinale3Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/Buy10Test.cs b/.Lib9c.Tests/Action/Buy10Test.cs index cff87a6b1..11410af01 100644 --- a/.Lib9c.Tests/Action/Buy10Test.cs +++ b/.Lib9c.Tests/Action/Buy10Test.cs @@ -10,10 +10,9 @@ namespace Lib9c.Tests.Action using Lib9c.DevExtensions.Model; using Lib9c.Model.Order; using Lib9c.Tests.TestHelper; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy11Test.cs b/.Lib9c.Tests/Action/Buy11Test.cs index 61adfcfa9..8e29e06c5 100644 --- a/.Lib9c.Tests/Action/Buy11Test.cs +++ b/.Lib9c.Tests/Action/Buy11Test.cs @@ -10,10 +10,9 @@ namespace Lib9c.Tests.Action using Lib9c.DevExtensions.Model; using Lib9c.Model.Order; using Lib9c.Tests.TestHelper; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy2Test.cs b/.Lib9c.Tests/Action/Buy2Test.cs index eb6739733..5aeb37272 100644 --- a/.Lib9c.Tests/Action/Buy2Test.cs +++ b/.Lib9c.Tests/Action/Buy2Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy3Test.cs b/.Lib9c.Tests/Action/Buy3Test.cs index f879fe65e..bc131c380 100644 --- a/.Lib9c.Tests/Action/Buy3Test.cs +++ b/.Lib9c.Tests/Action/Buy3Test.cs @@ -2,10 +2,9 @@ { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy4Test.cs b/.Lib9c.Tests/Action/Buy4Test.cs index cc30426a9..4210222b1 100644 --- a/.Lib9c.Tests/Action/Buy4Test.cs +++ b/.Lib9c.Tests/Action/Buy4Test.cs @@ -3,10 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy5Test.cs b/.Lib9c.Tests/Action/Buy5Test.cs index 728357650..5986afb61 100644 --- a/.Lib9c.Tests/Action/Buy5Test.cs +++ b/.Lib9c.Tests/Action/Buy5Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy6Test.cs b/.Lib9c.Tests/Action/Buy6Test.cs index 774caf115..c43688721 100644 --- a/.Lib9c.Tests/Action/Buy6Test.cs +++ b/.Lib9c.Tests/Action/Buy6Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy7Test.cs b/.Lib9c.Tests/Action/Buy7Test.cs index 29507030f..e565bbcdc 100644 --- a/.Lib9c.Tests/Action/Buy7Test.cs +++ b/.Lib9c.Tests/Action/Buy7Test.cs @@ -5,10 +5,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy8Test.cs b/.Lib9c.Tests/Action/Buy8Test.cs index 1a890c732..c11c8da02 100644 --- a/.Lib9c.Tests/Action/Buy8Test.cs +++ b/.Lib9c.Tests/Action/Buy8Test.cs @@ -7,10 +7,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Buy9Test.cs b/.Lib9c.Tests/Action/Buy9Test.cs index 83db8c3ff..27401158a 100644 --- a/.Lib9c.Tests/Action/Buy9Test.cs +++ b/.Lib9c.Tests/Action/Buy9Test.cs @@ -7,10 +7,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/BuyMultipleTest.cs b/.Lib9c.Tests/Action/BuyMultipleTest.cs index 35b0eabc1..d8d3a821a 100644 --- a/.Lib9c.Tests/Action/BuyMultipleTest.cs +++ b/.Lib9c.Tests/Action/BuyMultipleTest.cs @@ -6,10 +6,9 @@ using System.Linq; using System.Numerics; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/BuyProduct0Test.cs b/.Lib9c.Tests/Action/BuyProduct0Test.cs index 219cfc006..81f97d56d 100644 --- a/.Lib9c.Tests/Action/BuyProduct0Test.cs +++ b/.Lib9c.Tests/Action/BuyProduct0Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/BuyProductTest.cs b/.Lib9c.Tests/Action/BuyProductTest.cs index 9e0141177..b6c96ff91 100644 --- a/.Lib9c.Tests/Action/BuyProductTest.cs +++ b/.Lib9c.Tests/Action/BuyProductTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/BuyTest.cs b/.Lib9c.Tests/Action/BuyTest.cs index 0aac0cd3d..ef905ddcc 100644 --- a/.Lib9c.Tests/Action/BuyTest.cs +++ b/.Lib9c.Tests/Action/BuyTest.cs @@ -9,10 +9,9 @@ namespace Lib9c.Tests.Action using Lib9c.DevExtensions.Model; using Lib9c.Model.Order; using Lib9c.Tests.TestHelper; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/CancelMonsterCollectTest.cs b/.Lib9c.Tests/Action/CancelMonsterCollectTest.cs index c5ded9457..9d43a6212 100644 --- a/.Lib9c.Tests/Action/CancelMonsterCollectTest.cs +++ b/.Lib9c.Tests/Action/CancelMonsterCollectTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs b/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs index ab9e7b651..da8dc08d0 100644 --- a/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs +++ b/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/ChargeActionPoint0Test.cs b/.Lib9c.Tests/Action/ChargeActionPoint0Test.cs index e8c16294f..7130c6a1d 100644 --- a/.Lib9c.Tests/Action/ChargeActionPoint0Test.cs +++ b/.Lib9c.Tests/Action/ChargeActionPoint0Test.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ChargeActionPoint2Test.cs b/.Lib9c.Tests/Action/ChargeActionPoint2Test.cs index 7d2939aaa..79b0ee3ee 100644 --- a/.Lib9c.Tests/Action/ChargeActionPoint2Test.cs +++ b/.Lib9c.Tests/Action/ChargeActionPoint2Test.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ChargeActionPointTest.cs b/.Lib9c.Tests/Action/ChargeActionPointTest.cs index e8a6e9d47..545ab3cd4 100644 --- a/.Lib9c.Tests/Action/ChargeActionPointTest.cs +++ b/.Lib9c.Tests/Action/ChargeActionPointTest.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ClaimMonsterCollectionReward0Test.cs b/.Lib9c.Tests/Action/ClaimMonsterCollectionReward0Test.cs index cb64f9cc3..d66875bad 100644 --- a/.Lib9c.Tests/Action/ClaimMonsterCollectionReward0Test.cs +++ b/.Lib9c.Tests/Action/ClaimMonsterCollectionReward0Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/ClaimMonsterCollectionReward2Test.cs b/.Lib9c.Tests/Action/ClaimMonsterCollectionReward2Test.cs index d06edf77b..8271b4072 100644 --- a/.Lib9c.Tests/Action/ClaimMonsterCollectionReward2Test.cs +++ b/.Lib9c.Tests/Action/ClaimMonsterCollectionReward2Test.cs @@ -6,10 +6,9 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/ClaimMonsterCollectionRewardTest.cs b/.Lib9c.Tests/Action/ClaimMonsterCollectionRewardTest.cs index 12082b5e3..42afc3861 100644 --- a/.Lib9c.Tests/Action/ClaimMonsterCollectionRewardTest.cs +++ b/.Lib9c.Tests/Action/ClaimMonsterCollectionRewardTest.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/ClaimRaidRewardTest.cs b/.Lib9c.Tests/Action/ClaimRaidRewardTest.cs index aab35eccf..bce191ff4 100644 --- a/.Lib9c.Tests/Action/ClaimRaidRewardTest.cs +++ b/.Lib9c.Tests/Action/ClaimRaidRewardTest.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/ClaimStakeReward1Test.cs b/.Lib9c.Tests/Action/ClaimStakeReward1Test.cs index 9b2abd170..642c9cdd3 100644 --- a/.Lib9c.Tests/Action/ClaimStakeReward1Test.cs +++ b/.Lib9c.Tests/Action/ClaimStakeReward1Test.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ClaimStakeReward2Test.cs b/.Lib9c.Tests/Action/ClaimStakeReward2Test.cs index b22a09e64..3f69b9995 100644 --- a/.Lib9c.Tests/Action/ClaimStakeReward2Test.cs +++ b/.Lib9c.Tests/Action/ClaimStakeReward2Test.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ClaimStakeReward3Test.cs b/.Lib9c.Tests/Action/ClaimStakeReward3Test.cs index 25f28b1f6..08be99851 100644 --- a/.Lib9c.Tests/Action/ClaimStakeReward3Test.cs +++ b/.Lib9c.Tests/Action/ClaimStakeReward3Test.cs @@ -4,9 +4,9 @@ namespace Lib9c.Tests.Action { using System.Linq; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ClaimStakeReward4Test.cs b/.Lib9c.Tests/Action/ClaimStakeReward4Test.cs index c3946289a..a2c11cb94 100644 --- a/.Lib9c.Tests/Action/ClaimStakeReward4Test.cs +++ b/.Lib9c.Tests/Action/ClaimStakeReward4Test.cs @@ -4,9 +4,9 @@ namespace Lib9c.Tests.Action { using System.Linq; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs b/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs index 849869f1f..0caea6b53 100644 --- a/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs +++ b/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs @@ -4,9 +4,9 @@ namespace Lib9c.Tests.Action { using System.Linq; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/ClaimWorldBossKillRewardTest.cs b/.Lib9c.Tests/Action/ClaimWorldBossKillRewardTest.cs index ea8d8bddf..71af64a6e 100644 --- a/.Lib9c.Tests/Action/ClaimWorldBossKillRewardTest.cs +++ b/.Lib9c.Tests/Action/ClaimWorldBossKillRewardTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/CombinationConsumable0Test.cs b/.Lib9c.Tests/Action/CombinationConsumable0Test.cs index b8b358d22..cbad109f8 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable0Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable0Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable2Test.cs b/.Lib9c.Tests/Action/CombinationConsumable2Test.cs index b059df6cb..b66de46b6 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable2Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable2Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable3Test.cs b/.Lib9c.Tests/Action/CombinationConsumable3Test.cs index f0c64b9b7..29ebf29b8 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable3Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable3Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable4Test.cs b/.Lib9c.Tests/Action/CombinationConsumable4Test.cs index c013b5224..57beb321e 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable4Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable4Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable5Test.cs b/.Lib9c.Tests/Action/CombinationConsumable5Test.cs index 985ab27e9..46c99f08e 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable5Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable5Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable6Test.cs b/.Lib9c.Tests/Action/CombinationConsumable6Test.cs index 45ba7aa97..ab50812d7 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable6Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable6Test.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumable7Test.cs b/.Lib9c.Tests/Action/CombinationConsumable7Test.cs index 4a8144a3e..cc17b1b4b 100644 --- a/.Lib9c.Tests/Action/CombinationConsumable7Test.cs +++ b/.Lib9c.Tests/Action/CombinationConsumable7Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationConsumableTest.cs b/.Lib9c.Tests/Action/CombinationConsumableTest.cs index 239b76361..d9d7a6ed1 100644 --- a/.Lib9c.Tests/Action/CombinationConsumableTest.cs +++ b/.Lib9c.Tests/Action/CombinationConsumableTest.cs @@ -2,11 +2,10 @@ namespace Lib9c.Tests.Action { using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/CombinationEquipment0Test.cs b/.Lib9c.Tests/Action/CombinationEquipment0Test.cs index b88235a6b..aa526d8cf 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment0Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment0Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment10Test.cs b/.Lib9c.Tests/Action/CombinationEquipment10Test.cs index fd6d98e86..66f8f22c0 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment10Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment10Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/CombinationEquipment11Test.cs b/.Lib9c.Tests/Action/CombinationEquipment11Test.cs index 7a1923ba6..282575ee1 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment11Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment11Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/CombinationEquipment12Test.cs b/.Lib9c.Tests/Action/CombinationEquipment12Test.cs index 32b06904b..2f4f0bc44 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment12Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment12Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/CombinationEquipment13Test.cs b/.Lib9c.Tests/Action/CombinationEquipment13Test.cs index 3c36bde56..f8204bd31 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment13Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment13Test.cs @@ -4,11 +4,10 @@ using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/CombinationEquipment14Test.cs b/.Lib9c.Tests/Action/CombinationEquipment14Test.cs index 0906ad52c..624e935d0 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment14Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment14Test.cs @@ -4,11 +4,10 @@ using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/CombinationEquipment15Test.cs b/.Lib9c.Tests/Action/CombinationEquipment15Test.cs index eeba01cb8..c935d0e7c 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment15Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment15Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/CombinationEquipment2Test.cs b/.Lib9c.Tests/Action/CombinationEquipment2Test.cs index 24f7f02cc..e5639c619 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment2Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment2Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment3Test.cs b/.Lib9c.Tests/Action/CombinationEquipment3Test.cs index 83144d1e2..f2f48c4ce 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment3Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment3Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment4Test.cs b/.Lib9c.Tests/Action/CombinationEquipment4Test.cs index 3c106f844..b5a4b37f0 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment4Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment4Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment5Test.cs b/.Lib9c.Tests/Action/CombinationEquipment5Test.cs index f70ab45fe..347e8caac 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment5Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment5Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment6Test.cs b/.Lib9c.Tests/Action/CombinationEquipment6Test.cs index 0843a3163..b05ee0e4f 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment6Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment6Test.cs @@ -4,10 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment7Test.cs b/.Lib9c.Tests/Action/CombinationEquipment7Test.cs index 14062feed..e16bc3acd 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment7Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment7Test.cs @@ -4,10 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/CombinationEquipment8Test.cs b/.Lib9c.Tests/Action/CombinationEquipment8Test.cs index 08efb9b93..c72ec39ff 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment8Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment8Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/CombinationEquipment9Test.cs b/.Lib9c.Tests/Action/CombinationEquipment9Test.cs index c44bb96a9..019555514 100644 --- a/.Lib9c.Tests/Action/CombinationEquipment9Test.cs +++ b/.Lib9c.Tests/Action/CombinationEquipment9Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/CombinationEquipmentTest.cs b/.Lib9c.Tests/Action/CombinationEquipmentTest.cs index fd8ff9a95..bd52403ff 100644 --- a/.Lib9c.Tests/Action/CombinationEquipmentTest.cs +++ b/.Lib9c.Tests/Action/CombinationEquipmentTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/Coupons/CouponsFixture.cs b/.Lib9c.Tests/Action/Coupons/CouponsFixture.cs index 5d2a786c7..6a376939e 100644 --- a/.Lib9c.Tests/Action/Coupons/CouponsFixture.cs +++ b/.Lib9c.Tests/Action/Coupons/CouponsFixture.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Action.Coupons { using System; using System.Collections.Immutable; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.Coupons; public static class CouponsFixture diff --git a/.Lib9c.Tests/Action/Coupons/IssueCouponsTest.cs b/.Lib9c.Tests/Action/Coupons/IssueCouponsTest.cs index d2ea34c5e..66dd356d0 100644 --- a/.Lib9c.Tests/Action/Coupons/IssueCouponsTest.cs +++ b/.Lib9c.Tests/Action/Coupons/IssueCouponsTest.cs @@ -6,7 +6,7 @@ namespace Lib9c.Tests.Action.Coupons using System.Linq; using Bencodex.Types; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Action.Coupons; using Nekoyume.Model.Coupons; diff --git a/.Lib9c.Tests/Action/Coupons/RedeemCouponTest.cs b/.Lib9c.Tests/Action/Coupons/RedeemCouponTest.cs index ab92518e8..5171f18d5 100644 --- a/.Lib9c.Tests/Action/Coupons/RedeemCouponTest.cs +++ b/.Lib9c.Tests/Action/Coupons/RedeemCouponTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Action.Coupons using System.Collections.Immutable; using System.Linq; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Coupons; diff --git a/.Lib9c.Tests/Action/Coupons/TransferCouponsTest.cs b/.Lib9c.Tests/Action/Coupons/TransferCouponsTest.cs index 8942849c2..fc2d21cd9 100644 --- a/.Lib9c.Tests/Action/Coupons/TransferCouponsTest.cs +++ b/.Lib9c.Tests/Action/Coupons/TransferCouponsTest.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action.Coupons using System; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Action.Coupons; using Nekoyume.Model.Coupons; diff --git a/.Lib9c.Tests/Action/CreateAvatar0Test.cs b/.Lib9c.Tests/Action/CreateAvatar0Test.cs index b2ff4cd0e..48aa3fd8f 100644 --- a/.Lib9c.Tests/Action/CreateAvatar0Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar0Test.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreateAvatar2Test.cs b/.Lib9c.Tests/Action/CreateAvatar2Test.cs index ac63630b1..e782aef08 100644 --- a/.Lib9c.Tests/Action/CreateAvatar2Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar2Test.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreateAvatar3Test.cs b/.Lib9c.Tests/Action/CreateAvatar3Test.cs index 61dc124be..b14e79446 100644 --- a/.Lib9c.Tests/Action/CreateAvatar3Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar3Test.cs @@ -6,8 +6,8 @@ using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreateAvatar6Test.cs b/.Lib9c.Tests/Action/CreateAvatar6Test.cs index 0fa513262..ad4dbd024 100644 --- a/.Lib9c.Tests/Action/CreateAvatar6Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar6Test.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreateAvatar7Test.cs b/.Lib9c.Tests/Action/CreateAvatar7Test.cs index 2ea9ed7fa..d5e47bd07 100644 --- a/.Lib9c.Tests/Action/CreateAvatar7Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar7Test.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreateAvatar8Test.cs b/.Lib9c.Tests/Action/CreateAvatar8Test.cs index ada0b0c01..2ed1aa214 100644 --- a/.Lib9c.Tests/Action/CreateAvatar8Test.cs +++ b/.Lib9c.Tests/Action/CreateAvatar8Test.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/CreateAvatarTest.cs b/.Lib9c.Tests/Action/CreateAvatarTest.cs index 2d8b0b3f8..10a208b80 100644 --- a/.Lib9c.Tests/Action/CreateAvatarTest.cs +++ b/.Lib9c.Tests/Action/CreateAvatarTest.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/CreatePendingActivationTest.cs b/.Lib9c.Tests/Action/CreatePendingActivationTest.cs index 9653954de..e3d24d288 100644 --- a/.Lib9c.Tests/Action/CreatePendingActivationTest.cs +++ b/.Lib9c.Tests/Action/CreatePendingActivationTest.cs @@ -1,12 +1,9 @@ namespace Lib9c.Tests.Action { - using System.Collections.Generic; using System.Collections.Immutable; - using Bencodex.Types; - using Libplanet; - using Libplanet.Action; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Action/CreatePendingActivationsTest.cs b/.Lib9c.Tests/Action/CreatePendingActivationsTest.cs index 209484aea..41d7797fb 100644 --- a/.Lib9c.Tests/Action/CreatePendingActivationsTest.cs +++ b/.Lib9c.Tests/Action/CreatePendingActivationsTest.cs @@ -1,9 +1,7 @@ namespace Lib9c.Tests.Action { - using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/CreatePledgeTest.cs b/.Lib9c.Tests/Action/CreatePledgeTest.cs index c07b751e9..02f0e7068 100644 --- a/.Lib9c.Tests/Action/CreatePledgeTest.cs +++ b/.Lib9c.Tests/Action/CreatePledgeTest.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System; using System.Collections.Generic; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/DailyReward0Test.cs b/.Lib9c.Tests/Action/DailyReward0Test.cs index 1da153902..1008aab76 100644 --- a/.Lib9c.Tests/Action/DailyReward0Test.cs +++ b/.Lib9c.Tests/Action/DailyReward0Test.cs @@ -1,8 +1,7 @@ namespace Lib9c.Tests.Action { - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/DailyReward2Test.cs b/.Lib9c.Tests/Action/DailyReward2Test.cs index 1e0019ba6..2a31215a0 100644 --- a/.Lib9c.Tests/Action/DailyReward2Test.cs +++ b/.Lib9c.Tests/Action/DailyReward2Test.cs @@ -1,9 +1,8 @@ namespace Lib9c.Tests.Action { using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/DailyReward3Test.cs b/.Lib9c.Tests/Action/DailyReward3Test.cs index 5d560a066..55e3f1e82 100644 --- a/.Lib9c.Tests/Action/DailyReward3Test.cs +++ b/.Lib9c.Tests/Action/DailyReward3Test.cs @@ -1,9 +1,8 @@ namespace Lib9c.Tests.Action { using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/DailyReward4Test.cs b/.Lib9c.Tests/Action/DailyReward4Test.cs index cbfcc72b6..7775f782b 100644 --- a/.Lib9c.Tests/Action/DailyReward4Test.cs +++ b/.Lib9c.Tests/Action/DailyReward4Test.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Mail; diff --git a/.Lib9c.Tests/Action/DailyReward5Test.cs b/.Lib9c.Tests/Action/DailyReward5Test.cs index 6e8314e85..3d467c558 100644 --- a/.Lib9c.Tests/Action/DailyReward5Test.cs +++ b/.Lib9c.Tests/Action/DailyReward5Test.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Collections.Immutable; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/DailyReward6Test.cs b/.Lib9c.Tests/Action/DailyReward6Test.cs index 8ed43783c..d79de8f5f 100644 --- a/.Lib9c.Tests/Action/DailyReward6Test.cs +++ b/.Lib9c.Tests/Action/DailyReward6Test.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Collections.Immutable; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/DailyRewardTest.cs b/.Lib9c.Tests/Action/DailyRewardTest.cs index f89faaff8..9ad513573 100644 --- a/.Lib9c.Tests/Action/DailyRewardTest.cs +++ b/.Lib9c.Tests/Action/DailyRewardTest.cs @@ -1,8 +1,7 @@ namespace Lib9c.Tests.Action { - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/EndPledgeTest.cs b/.Lib9c.Tests/Action/EndPledgeTest.cs index 2e8df5e89..e678b8690 100644 --- a/.Lib9c.Tests/Action/EndPledgeTest.cs +++ b/.Lib9c.Tests/Action/EndPledgeTest.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Action/EventConsumableItemCraftsTest.cs b/.Lib9c.Tests/Action/EventConsumableItemCraftsTest.cs index 43c769d8d..0b188b4ba 100644 --- a/.Lib9c.Tests/Action/EventConsumableItemCraftsTest.cs +++ b/.Lib9c.Tests/Action/EventConsumableItemCraftsTest.cs @@ -1,9 +1,8 @@ namespace Lib9c.Tests.Action { using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs index 5e687fe32..94afaa176 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV1Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs index 29ba33476..04a2dad3b 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV2Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs index 5dac8e448..a5fb074d8 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV3Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs index a668812d5..39c4ca231 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV4Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs b/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs index 58615c337..a5a283e7f 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleV5Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Blockchain.Policy; diff --git a/.Lib9c.Tests/Action/EventMaterialItemCraftsTest.cs b/.Lib9c.Tests/Action/EventMaterialItemCraftsTest.cs index 01c91b6fb..c02a80e7f 100644 --- a/.Lib9c.Tests/Action/EventMaterialItemCraftsTest.cs +++ b/.Lib9c.Tests/Action/EventMaterialItemCraftsTest.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/ExceptionTest.cs b/.Lib9c.Tests/Action/ExceptionTest.cs index ef50da7d7..512c91da3 100644 --- a/.Lib9c.Tests/Action/ExceptionTest.cs +++ b/.Lib9c.Tests/Action/ExceptionTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Action using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Lib9c.Formatters; - using Libplanet; + using Libplanet.Crypto; using MessagePack; using MessagePack.Resolvers; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs b/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs index 2bdd67ed4..95b624a7c 100644 --- a/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs +++ b/.Lib9c.Tests/Action/Factory/ClaimStakeRewardFactoryTest.cs @@ -8,7 +8,6 @@ namespace Lib9c.Tests.Action.Factory using System.Reflection; using Bencodex.Types; using Lib9c.Abstractions; - using Libplanet; using Libplanet.Action; using Libplanet.Crypto; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs b/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs index fd45836d6..e0e451819 100644 --- a/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs +++ b/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs @@ -8,11 +8,11 @@ namespace Lib9c.Tests.Action.Garages using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Garages; diff --git a/.Lib9c.Tests/Action/Garages/LoadIntoMyGaragesTest.cs b/.Lib9c.Tests/Action/Garages/LoadIntoMyGaragesTest.cs index a127ded66..4c7a2b8d5 100644 --- a/.Lib9c.Tests/Action/Garages/LoadIntoMyGaragesTest.cs +++ b/.Lib9c.Tests/Action/Garages/LoadIntoMyGaragesTest.cs @@ -8,11 +8,11 @@ namespace Lib9c.Tests.Action.Garages using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Garages; diff --git a/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs b/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs index 3f293ec34..92b10355e 100644 --- a/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs +++ b/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs @@ -8,11 +8,11 @@ namespace Lib9c.Tests.Action.Garages using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Garages; diff --git a/.Lib9c.Tests/Action/GoldDistributionTest.cs b/.Lib9c.Tests/Action/GoldDistributionTest.cs index cf2e49b3d..0a3879e74 100644 --- a/.Lib9c.Tests/Action/GoldDistributionTest.cs +++ b/.Lib9c.Tests/Action/GoldDistributionTest.cs @@ -1,7 +1,7 @@ namespace Lib9c.Tests.Action { using System.IO; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Action/GrindingTest.cs b/.Lib9c.Tests/Action/GrindingTest.cs index 7e807615a..0fcc63255 100644 --- a/.Lib9c.Tests/Action/GrindingTest.cs +++ b/.Lib9c.Tests/Action/GrindingTest.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/HackAndSlash0Test.cs b/.Lib9c.Tests/Action/HackAndSlash0Test.cs index 710e9cf6e..d8f494a95 100644 --- a/.Lib9c.Tests/Action/HackAndSlash0Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash0Test.cs @@ -7,9 +7,8 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/HackAndSlash10Test.cs b/.Lib9c.Tests/Action/HackAndSlash10Test.cs index 15259b2b5..c86c04179 100644 --- a/.Lib9c.Tests/Action/HackAndSlash10Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash10Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash11Test.cs b/.Lib9c.Tests/Action/HackAndSlash11Test.cs index 1121f87e6..8fa667412 100644 --- a/.Lib9c.Tests/Action/HackAndSlash11Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash11Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash12Test.cs b/.Lib9c.Tests/Action/HackAndSlash12Test.cs index e71e20f6f..83f87d00d 100644 --- a/.Lib9c.Tests/Action/HackAndSlash12Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash12Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash13Test.cs b/.Lib9c.Tests/Action/HackAndSlash13Test.cs index 0e3d5c294..b9942fc3c 100644 --- a/.Lib9c.Tests/Action/HackAndSlash13Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash13Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash15Test.cs b/.Lib9c.Tests/Action/HackAndSlash15Test.cs index b5b8e209b..2c762d82c 100644 --- a/.Lib9c.Tests/Action/HackAndSlash15Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash15Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash16Test.cs b/.Lib9c.Tests/Action/HackAndSlash16Test.cs index 30c442311..e9d1f46d4 100644 --- a/.Lib9c.Tests/Action/HackAndSlash16Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash16Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash17Test.cs b/.Lib9c.Tests/Action/HackAndSlash17Test.cs index 61d8f8089..be49499dc 100644 --- a/.Lib9c.Tests/Action/HackAndSlash17Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash17Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash18Test.cs b/.Lib9c.Tests/Action/HackAndSlash18Test.cs index b913c4c4b..688a2d3bb 100644 --- a/.Lib9c.Tests/Action/HackAndSlash18Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash18Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash19Test.cs b/.Lib9c.Tests/Action/HackAndSlash19Test.cs index 861550298..d174fd9a5 100644 --- a/.Lib9c.Tests/Action/HackAndSlash19Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash19Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash20Test.cs b/.Lib9c.Tests/Action/HackAndSlash20Test.cs index 1c1e937fc..7b1ec3aa7 100644 --- a/.Lib9c.Tests/Action/HackAndSlash20Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash20Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash21Test.cs b/.Lib9c.Tests/Action/HackAndSlash21Test.cs index 7e93b3481..bdb648c3c 100644 --- a/.Lib9c.Tests/Action/HackAndSlash21Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash21Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash2Test.cs b/.Lib9c.Tests/Action/HackAndSlash2Test.cs index 94b88c046..82eafcb09 100644 --- a/.Lib9c.Tests/Action/HackAndSlash2Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash2Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash3Test.cs b/.Lib9c.Tests/Action/HackAndSlash3Test.cs index 5d73819aa..b837b06e7 100644 --- a/.Lib9c.Tests/Action/HackAndSlash3Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash3Test.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash4Test.cs b/.Lib9c.Tests/Action/HackAndSlash4Test.cs index cab895b2e..8b4b83abc 100644 --- a/.Lib9c.Tests/Action/HackAndSlash4Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash4Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash5Test.cs b/.Lib9c.Tests/Action/HackAndSlash5Test.cs index 4ca528e9a..f26102429 100644 --- a/.Lib9c.Tests/Action/HackAndSlash5Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash5Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash6Test.cs b/.Lib9c.Tests/Action/HackAndSlash6Test.cs index eb95090d7..92a16d146 100644 --- a/.Lib9c.Tests/Action/HackAndSlash6Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash6Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash7Test.cs b/.Lib9c.Tests/Action/HackAndSlash7Test.cs index 170155e22..a474ea71e 100644 --- a/.Lib9c.Tests/Action/HackAndSlash7Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash7Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash8Test.cs b/.Lib9c.Tests/Action/HackAndSlash8Test.cs index 295a8f113..fa54c828d 100644 --- a/.Lib9c.Tests/Action/HackAndSlash8Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash8Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlash9Test.cs b/.Lib9c.Tests/Action/HackAndSlash9Test.cs index 3c2005753..8c0894e53 100644 --- a/.Lib9c.Tests/Action/HackAndSlash9Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlash9Test.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/HackAndSlashRandomBuffTest.cs b/.Lib9c.Tests/Action/HackAndSlashRandomBuffTest.cs index 1cb022877..ac67a70f8 100644 --- a/.Lib9c.Tests/Action/HackAndSlashRandomBuffTest.cs +++ b/.Lib9c.Tests/Action/HackAndSlashRandomBuffTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep1Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep1Test.cs index 79d0fd77a..2bb30efbc 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep1Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep1Test.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep2Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep2Test.cs index 80fd82e00..ad32f64a7 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep2Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep2Test.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep3Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep3Test.cs index 4feb3d613..7cd7918cc 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep3Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep3Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep4Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep4Test.cs index 1056ee86c..1dd9884f5 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep4Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep4Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep5Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep5Test.cs index 04d6aa88a..6327db82e 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep5Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep5Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep6Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep6Test.cs index 4b5acb237..e51e412a9 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep6Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep6Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep7Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep7Test.cs index bfa7b32f2..beaccdd98 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep7Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep7Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep8Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep8Test.cs index ba0463b01..77abf5a2d 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep8Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep8Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/HackAndSlashSweep9Test.cs b/.Lib9c.Tests/Action/HackAndSlashSweep9Test.cs index 5a0f72cb5..283a0bcac 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweep9Test.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweep9Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/HackAndSlashTest14.cs b/.Lib9c.Tests/Action/HackAndSlashTest14.cs index 571cc2fdd..c3ad3e466 100644 --- a/.Lib9c.Tests/Action/HackAndSlashTest14.cs +++ b/.Lib9c.Tests/Action/HackAndSlashTest14.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/InitializeStatesTest.cs b/.Lib9c.Tests/Action/InitializeStatesTest.cs index 44d212889..fd0b9f74b 100644 --- a/.Lib9c.Tests/Action/InitializeStatesTest.cs +++ b/.Lib9c.Tests/Action/InitializeStatesTest.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/InvalidTransferSiginerExceptionTest.cs b/.Lib9c.Tests/Action/InvalidTransferSiginerExceptionTest.cs index b39f4be56..288f5157a 100644 --- a/.Lib9c.Tests/Action/InvalidTransferSiginerExceptionTest.cs +++ b/.Lib9c.Tests/Action/InvalidTransferSiginerExceptionTest.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Action { using System.IO; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Action/ItemEnhancement0Test.cs b/.Lib9c.Tests/Action/ItemEnhancement0Test.cs index 782ab3745..1a8e94a57 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement0Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement0Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement10Test.cs b/.Lib9c.Tests/Action/ItemEnhancement10Test.cs index 49a8044a1..2ce649177 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement10Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement10Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/ItemEnhancement2Test.cs b/.Lib9c.Tests/Action/ItemEnhancement2Test.cs index 04053e6a0..e1c0d66f7 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement2Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement2Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement3Test.cs b/.Lib9c.Tests/Action/ItemEnhancement3Test.cs index 44ae80e3a..72ccd55a7 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement3Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement3Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Globalization; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement4Test.cs b/.Lib9c.Tests/Action/ItemEnhancement4Test.cs index ee6a78854..2033c10e8 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement4Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement4Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement5Test.cs b/.Lib9c.Tests/Action/ItemEnhancement5Test.cs index a14388f08..af896dc57 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement5Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement5Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement6Test.cs b/.Lib9c.Tests/Action/ItemEnhancement6Test.cs index a9be9badd..fd1832490 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement6Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement6Test.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement7Test.cs b/.Lib9c.Tests/Action/ItemEnhancement7Test.cs index 2c0b98b41..87eb16328 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement7Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement7Test.cs @@ -6,11 +6,10 @@ using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement8Test.cs b/.Lib9c.Tests/Action/ItemEnhancement8Test.cs index 1a367d4f4..bb874bfda 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement8Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement8Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/ItemEnhancement9Test.cs b/.Lib9c.Tests/Action/ItemEnhancement9Test.cs index aa25ebe40..33643d534 100644 --- a/.Lib9c.Tests/Action/ItemEnhancement9Test.cs +++ b/.Lib9c.Tests/Action/ItemEnhancement9Test.cs @@ -6,11 +6,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/ItemEnhancementTest.cs b/.Lib9c.Tests/Action/ItemEnhancementTest.cs index 60d2ef1ae..d9e8c8cb3 100644 --- a/.Lib9c.Tests/Action/ItemEnhancementTest.cs +++ b/.Lib9c.Tests/Action/ItemEnhancementTest.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/Action/JoinArena1Test.cs b/.Lib9c.Tests/Action/JoinArena1Test.cs index 336a54b96..5a92415bc 100644 --- a/.Lib9c.Tests/Action/JoinArena1Test.cs +++ b/.Lib9c.Tests/Action/JoinArena1Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/JoinArena2Test.cs b/.Lib9c.Tests/Action/JoinArena2Test.cs index 49de33a62..4a329df5a 100644 --- a/.Lib9c.Tests/Action/JoinArena2Test.cs +++ b/.Lib9c.Tests/Action/JoinArena2Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/JoinArena3Test.cs b/.Lib9c.Tests/Action/JoinArena3Test.cs index 24588a09c..87f4c6e29 100644 --- a/.Lib9c.Tests/Action/JoinArena3Test.cs +++ b/.Lib9c.Tests/Action/JoinArena3Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/MarketValidationTest.cs b/.Lib9c.Tests/Action/MarketValidationTest.cs index df204a570..96a6faa23 100644 --- a/.Lib9c.Tests/Action/MarketValidationTest.cs +++ b/.Lib9c.Tests/Action/MarketValidationTest.cs @@ -2,11 +2,10 @@ namespace Lib9c.Tests.Action { using System; using System.Collections.Generic; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/MigrateMonsterCollectionTest.cs b/.Lib9c.Tests/Action/MigrateMonsterCollectionTest.cs index 279a2c8f9..82673d8c7 100644 --- a/.Lib9c.Tests/Action/MigrateMonsterCollectionTest.cs +++ b/.Lib9c.Tests/Action/MigrateMonsterCollectionTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/MigrationActivatedAccountsStateTest.cs b/.Lib9c.Tests/Action/MigrationActivatedAccountsStateTest.cs index 79bb17a33..7a4e33f17 100644 --- a/.Lib9c.Tests/Action/MigrationActivatedAccountsStateTest.cs +++ b/.Lib9c.Tests/Action/MigrationActivatedAccountsStateTest.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { - using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/MigrationAvatarStateTest.cs b/.Lib9c.Tests/Action/MigrationAvatarStateTest.cs index 50c9b6be8..628a36dde 100644 --- a/.Lib9c.Tests/Action/MigrationAvatarStateTest.cs +++ b/.Lib9c.Tests/Action/MigrationAvatarStateTest.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Action/MigrationLegacyShopTest.cs b/.Lib9c.Tests/Action/MigrationLegacyShopTest.cs index d3beaae31..8f21ff82d 100644 --- a/.Lib9c.Tests/Action/MigrationLegacyShopTest.cs +++ b/.Lib9c.Tests/Action/MigrationLegacyShopTest.cs @@ -3,8 +3,8 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle0Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle0Test.cs index fc3688ccc..5fa849e28 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle0Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle0Test.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle10Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle10Test.cs index 998eb5542..fb3b7bdc5 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle10Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle10Test.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle11Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle11Test.cs index 6971cdccf..abff420cd 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle11Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle11Test.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle12Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle12Test.cs index 627727bf6..50603b0aa 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle12Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle12Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle13Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle13Test.cs index c68795011..3f12ea00c 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle13Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle13Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Blockchain.Policy; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle2Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle2Test.cs index d97bdd755..ff472a5a9 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle2Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle2Test.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle3Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle3Test.cs index 662a9ec2a..ef81ceeb5 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle3Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle3Test.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle4Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle4Test.cs index 67340e333..ab17d20be 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle4Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle4Test.cs @@ -5,9 +5,8 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle5Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle5Test.cs index 92de1f769..f9727b58d 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle5Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle5Test.cs @@ -5,9 +5,8 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle6Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle6Test.cs index 17c0b35a2..2f9b7c3e9 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle6Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle6Test.cs @@ -5,9 +5,8 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle7Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle7Test.cs index 55745a6d8..35ff553a7 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle7Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle7Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle8Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle8Test.cs index 9a57bbec9..3497b86e8 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle8Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle8Test.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MimisbrunnrBattle9Test.cs b/.Lib9c.Tests/Action/MimisbrunnrBattle9Test.cs index 06a5d18d1..995732b6c 100644 --- a/.Lib9c.Tests/Action/MimisbrunnrBattle9Test.cs +++ b/.Lib9c.Tests/Action/MimisbrunnrBattle9Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/MockDelta.cs b/.Lib9c.Tests/Action/MockDelta.cs index 2e2788b35..9d83d3f3a 100644 --- a/.Lib9c.Tests/Action/MockDelta.cs +++ b/.Lib9c.Tests/Action/MockDelta.cs @@ -1,15 +1,15 @@ -#nullable enable - namespace Lib9c.Tests.Action { +#nullable enable + using System.Collections.Immutable; using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.Consensus; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; + using Libplanet.Types.Consensus; /// /// Almost a replica of https://github.com/planetarium/libplanet/blob/main/Libplanet/State/AccountDelta.cs diff --git a/.Lib9c.Tests/Action/MockState.cs b/.Lib9c.Tests/Action/MockState.cs index b97cc986f..16d71e0c5 100644 --- a/.Lib9c.Tests/Action/MockState.cs +++ b/.Lib9c.Tests/Action/MockState.cs @@ -1,17 +1,17 @@ -#nullable enable - namespace Lib9c.Tests.Action { +#nullable enable + using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.Consensus; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; + using Libplanet.Types.Consensus; /// /// A mock implementation of with various overloaded methods for diff --git a/.Lib9c.Tests/Action/MockStateDelta.cs b/.Lib9c.Tests/Action/MockStateDelta.cs index 0a984cafa..08e382a17 100644 --- a/.Lib9c.Tests/Action/MockStateDelta.cs +++ b/.Lib9c.Tests/Action/MockStateDelta.cs @@ -1,7 +1,7 @@ -#nullable enable - namespace Lib9c.Tests.Action { +#nullable enable + using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -9,11 +9,11 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Numerics; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.Consensus; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; + using Libplanet.Types.Consensus; /// /// A rough replica of https://github.com/planetarium/libplanet/blob/main/Libplanet/State/AccountStateDelta.cs diff --git a/.Lib9c.Tests/Action/MonsterCollect0Test.cs b/.Lib9c.Tests/Action/MonsterCollect0Test.cs index 35553cf01..e5656fcb3 100644 --- a/.Lib9c.Tests/Action/MonsterCollect0Test.cs +++ b/.Lib9c.Tests/Action/MonsterCollect0Test.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/MonsterCollect2Test.cs b/.Lib9c.Tests/Action/MonsterCollect2Test.cs index e68f583b4..94c9f6d5b 100644 --- a/.Lib9c.Tests/Action/MonsterCollect2Test.cs +++ b/.Lib9c.Tests/Action/MonsterCollect2Test.cs @@ -4,9 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/MonsterCollectTest.cs b/.Lib9c.Tests/Action/MonsterCollectTest.cs index 3335da48c..ba6b82e58 100644 --- a/.Lib9c.Tests/Action/MonsterCollectTest.cs +++ b/.Lib9c.Tests/Action/MonsterCollectTest.cs @@ -4,9 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/PatchTableSheetTest.cs b/.Lib9c.Tests/Action/PatchTableSheetTest.cs index 82e9d1319..742a15ddf 100644 --- a/.Lib9c.Tests/Action/PatchTableSheetTest.cs +++ b/.Lib9c.Tests/Action/PatchTableSheetTest.cs @@ -1,11 +1,9 @@ namespace Lib9c.Tests.Action { - using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/PendingActivationDoesNotExistsExceptionTest.cs b/.Lib9c.Tests/Action/PendingActivationDoesNotExistsExceptionTest.cs index c75ef01f0..874b7e9c5 100644 --- a/.Lib9c.Tests/Action/PendingActivationDoesNotExistsExceptionTest.cs +++ b/.Lib9c.Tests/Action/PendingActivationDoesNotExistsExceptionTest.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Action { using System.IO; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Action/PetEnhancement0Test.cs b/.Lib9c.Tests/Action/PetEnhancement0Test.cs index c660789aa..5e245e879 100644 --- a/.Lib9c.Tests/Action/PetEnhancement0Test.cs +++ b/.Lib9c.Tests/Action/PetEnhancement0Test.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/.Lib9c.Tests/Action/PrepareRewardAssetsTest.cs b/.Lib9c.Tests/Action/PrepareRewardAssetsTest.cs index 6c3f17181..302d1d21d 100644 --- a/.Lib9c.Tests/Action/PrepareRewardAssetsTest.cs +++ b/.Lib9c.Tests/Action/PrepareRewardAssetsTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Collections.Immutable; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/PurchaseInfoTest.cs b/.Lib9c.Tests/Action/PurchaseInfoTest.cs index 34e21b979..9f15a8daf 100644 --- a/.Lib9c.Tests/Action/PurchaseInfoTest.cs +++ b/.Lib9c.Tests/Action/PurchaseInfoTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Action using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/Raid1Test.cs b/.Lib9c.Tests/Action/Raid1Test.cs index 21e7669dd..e4036f326 100644 --- a/.Lib9c.Tests/Action/Raid1Test.cs +++ b/.Lib9c.Tests/Action/Raid1Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/Raid2Test.cs b/.Lib9c.Tests/Action/Raid2Test.cs index f8002dc12..99f5ba8f8 100644 --- a/.Lib9c.Tests/Action/Raid2Test.cs +++ b/.Lib9c.Tests/Action/Raid2Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/Raid3Test.cs b/.Lib9c.Tests/Action/Raid3Test.cs index edc6921fb..eece78e4e 100644 --- a/.Lib9c.Tests/Action/Raid3Test.cs +++ b/.Lib9c.Tests/Action/Raid3Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/Raid4Test.cs b/.Lib9c.Tests/Action/Raid4Test.cs index bfdcd584a..6fe6bc3c9 100644 --- a/.Lib9c.Tests/Action/Raid4Test.cs +++ b/.Lib9c.Tests/Action/Raid4Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/Raid5Test.cs b/.Lib9c.Tests/Action/Raid5Test.cs index a12255f12..ed9269b23 100644 --- a/.Lib9c.Tests/Action/Raid5Test.cs +++ b/.Lib9c.Tests/Action/Raid5Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/Raid6Test.cs b/.Lib9c.Tests/Action/Raid6Test.cs index 6ea883fd0..bc817441a 100644 --- a/.Lib9c.Tests/Action/Raid6Test.cs +++ b/.Lib9c.Tests/Action/Raid6Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RankingBattle0Test.cs b/.Lib9c.Tests/Action/RankingBattle0Test.cs index c26bb77cb..12ca1b075 100644 --- a/.Lib9c.Tests/Action/RankingBattle0Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle0Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle10Test.cs b/.Lib9c.Tests/Action/RankingBattle10Test.cs index 6ba3f2bc9..2d5fc8cf3 100644 --- a/.Lib9c.Tests/Action/RankingBattle10Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle10Test.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RankingBattle11Test.cs b/.Lib9c.Tests/Action/RankingBattle11Test.cs index 36c7bfaed..1f8e556a1 100644 --- a/.Lib9c.Tests/Action/RankingBattle11Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle11Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RankingBattle2Test.cs b/.Lib9c.Tests/Action/RankingBattle2Test.cs index 933f2620d..ff0c3f2cf 100644 --- a/.Lib9c.Tests/Action/RankingBattle2Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle2Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle3Test.cs b/.Lib9c.Tests/Action/RankingBattle3Test.cs index 30763237f..0fa4577de 100644 --- a/.Lib9c.Tests/Action/RankingBattle3Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle3Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle4Test.cs b/.Lib9c.Tests/Action/RankingBattle4Test.cs index e50c26a67..e8c14deed 100644 --- a/.Lib9c.Tests/Action/RankingBattle4Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle4Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle5Test.cs b/.Lib9c.Tests/Action/RankingBattle5Test.cs index 2b8986324..45835afc6 100644 --- a/.Lib9c.Tests/Action/RankingBattle5Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle5Test.cs @@ -6,9 +6,8 @@ using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle6Test.cs b/.Lib9c.Tests/Action/RankingBattle6Test.cs index d33b32b4a..f272cb2ef 100644 --- a/.Lib9c.Tests/Action/RankingBattle6Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle6Test.cs @@ -6,9 +6,8 @@ namespace Lib9c.Tests.Action using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle7Test.cs b/.Lib9c.Tests/Action/RankingBattle7Test.cs index 3e89fb2fa..561f1d1c6 100644 --- a/.Lib9c.Tests/Action/RankingBattle7Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle7Test.cs @@ -6,9 +6,8 @@ using System.IO; using System.Linq; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RankingBattle8Test.cs b/.Lib9c.Tests/Action/RankingBattle8Test.cs index 5954e7a7f..42e039490 100644 --- a/.Lib9c.Tests/Action/RankingBattle8Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle8Test.cs @@ -5,9 +5,8 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using MessagePack; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Action/RankingBattle9Test.cs b/.Lib9c.Tests/Action/RankingBattle9Test.cs index 45c07ebb1..0508acc62 100644 --- a/.Lib9c.Tests/Action/RankingBattle9Test.cs +++ b/.Lib9c.Tests/Action/RankingBattle9Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using MessagePack; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Action/RankingBattleTest.cs b/.Lib9c.Tests/Action/RankingBattleTest.cs index 18cd0423f..f17badd6a 100644 --- a/.Lib9c.Tests/Action/RankingBattleTest.cs +++ b/.Lib9c.Tests/Action/RankingBattleTest.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination0Test.cs b/.Lib9c.Tests/Action/RapidCombination0Test.cs index ad0499592..6803a989b 100644 --- a/.Lib9c.Tests/Action/RapidCombination0Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination0Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination2Test.cs b/.Lib9c.Tests/Action/RapidCombination2Test.cs index feeaa25f9..f90b9adbf 100644 --- a/.Lib9c.Tests/Action/RapidCombination2Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination2Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination3Test.cs b/.Lib9c.Tests/Action/RapidCombination3Test.cs index 14f066ca9..c6d46c539 100644 --- a/.Lib9c.Tests/Action/RapidCombination3Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination3Test.cs @@ -5,9 +5,8 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination4Test.cs b/.Lib9c.Tests/Action/RapidCombination4Test.cs index 5cfb75949..27ef87e61 100644 --- a/.Lib9c.Tests/Action/RapidCombination4Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination4Test.cs @@ -6,9 +6,8 @@ using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination5Test.cs b/.Lib9c.Tests/Action/RapidCombination5Test.cs index eecfdffa6..f60d9bdc3 100644 --- a/.Lib9c.Tests/Action/RapidCombination5Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination5Test.cs @@ -6,9 +6,8 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/RapidCombination6Test.cs b/.Lib9c.Tests/Action/RapidCombination6Test.cs index 36ed8b4d8..54c19fd08 100644 --- a/.Lib9c.Tests/Action/RapidCombination6Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination6Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/RapidCombination8Test.cs b/.Lib9c.Tests/Action/RapidCombination8Test.cs index 11d86cec4..9666c0614 100644 --- a/.Lib9c.Tests/Action/RapidCombination8Test.cs +++ b/.Lib9c.Tests/Action/RapidCombination8Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/RapidCombinationTest.cs b/.Lib9c.Tests/Action/RapidCombinationTest.cs index 6f48ebde2..a04e0ca5e 100644 --- a/.Lib9c.Tests/Action/RapidCombinationTest.cs +++ b/.Lib9c.Tests/Action/RapidCombinationTest.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/RapidCombinationTest7.cs b/.Lib9c.Tests/Action/RapidCombinationTest7.cs index 00a76bfc3..917bfd568 100644 --- a/.Lib9c.Tests/Action/RapidCombinationTest7.cs +++ b/.Lib9c.Tests/Action/RapidCombinationTest7.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs b/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs index c7d10c5fc..8d52d22a4 100644 --- a/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs +++ b/.Lib9c.Tests/Action/ReRegisterProduct0Test.cs @@ -5,10 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/ReRegisterProductTest.cs b/.Lib9c.Tests/Action/ReRegisterProductTest.cs index 8188e2dbc..c46f45d37 100644 --- a/.Lib9c.Tests/Action/ReRegisterProductTest.cs +++ b/.Lib9c.Tests/Action/ReRegisterProductTest.cs @@ -5,10 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RedeemCode0Test.cs b/.Lib9c.Tests/Action/RedeemCode0Test.cs index ad94638ab..aa2cf206c 100644 --- a/.Lib9c.Tests/Action/RedeemCode0Test.cs +++ b/.Lib9c.Tests/Action/RedeemCode0Test.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/RedeemCodeTest.cs b/.Lib9c.Tests/Action/RedeemCodeTest.cs index e0c53ed88..0820e7be5 100644 --- a/.Lib9c.Tests/Action/RedeemCodeTest.cs +++ b/.Lib9c.Tests/Action/RedeemCodeTest.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/RegisterProduct0Test.cs b/.Lib9c.Tests/Action/RegisterProduct0Test.cs index d6da256fa..8ed67b727 100644 --- a/.Lib9c.Tests/Action/RegisterProduct0Test.cs +++ b/.Lib9c.Tests/Action/RegisterProduct0Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RegisterProductTest.cs b/.Lib9c.Tests/Action/RegisterProductTest.cs index 00f2aa4f9..35a0a89c0 100644 --- a/.Lib9c.Tests/Action/RegisterProductTest.cs +++ b/.Lib9c.Tests/Action/RegisterProductTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/RenewAdminStateTest.cs b/.Lib9c.Tests/Action/RenewAdminStateTest.cs index e39425586..42e27c8ba 100644 --- a/.Lib9c.Tests/Action/RenewAdminStateTest.cs +++ b/.Lib9c.Tests/Action/RenewAdminStateTest.cs @@ -3,9 +3,8 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Immutable; using Bencodex.Types; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/RequestPledgeTest.cs b/.Lib9c.Tests/Action/RequestPledgeTest.cs index ef924c4df..0b55a5c50 100644 --- a/.Lib9c.Tests/Action/RequestPledgeTest.cs +++ b/.Lib9c.Tests/Action/RequestPledgeTest.cs @@ -1,11 +1,10 @@ namespace Lib9c.Tests.Action { using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/RewardGoldTest.cs b/.Lib9c.Tests/Action/RewardGoldTest.cs index 608fff987..1144a8440 100644 --- a/.Lib9c.Tests/Action/RewardGoldTest.cs +++ b/.Lib9c.Tests/Action/RewardGoldTest.cs @@ -8,18 +8,16 @@ namespace Lib9c.Tests.Action using System.Threading.Tasks; using Bencodex; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Action.Loader; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; - using Libplanet.Blocks; using Libplanet.Crypto; - using Libplanet.State; using Libplanet.Store; using Libplanet.Store.Trie; - using Libplanet.Tx; + using Libplanet.Types.Assets; + using Libplanet.Types.Blocks; + using Libplanet.Types.Tx; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Loader; @@ -538,7 +536,7 @@ public async Task Genesis_StateRootHash(bool mainnet) 0, new PrivateKey(), null, - new ActionBase[] { initializeStates })) + new ActionBase[] { initializeStates }.ToPlainValues())) ); } diff --git a/.Lib9c.Tests/Action/RuneEnhancement0Test.cs b/.Lib9c.Tests/Action/RuneEnhancement0Test.cs index 0e21efc30..75f1503ec 100644 --- a/.Lib9c.Tests/Action/RuneEnhancement0Test.cs +++ b/.Lib9c.Tests/Action/RuneEnhancement0Test.cs @@ -1,12 +1,10 @@ namespace Lib9c.Tests.Action { using System; - using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/RuneEnhancementTest.cs b/.Lib9c.Tests/Action/RuneEnhancementTest.cs index 6689636ed..d545b243f 100644 --- a/.Lib9c.Tests/Action/RuneEnhancementTest.cs +++ b/.Lib9c.Tests/Action/RuneEnhancementTest.cs @@ -1,12 +1,10 @@ namespace Lib9c.Tests.Action { using System; - using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/RuneHelperTest.cs b/.Lib9c.Tests/Action/RuneHelperTest.cs index b56ea7744..98a7be7cf 100644 --- a/.Lib9c.Tests/Action/RuneHelperTest.cs +++ b/.Lib9c.Tests/Action/RuneHelperTest.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Action { using System; using System.Linq; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs index 2fbb1c4e6..484ab70d4 100644 --- a/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs @@ -3,11 +3,10 @@ namespace Lib9c.Tests.Action.Scenario using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; diff --git a/.Lib9c.Tests/Action/Scenario/CombinationAndRapidCombinationTest.cs b/.Lib9c.Tests/Action/Scenario/CombinationAndRapidCombinationTest.cs index dc3d71aa6..10b46a079 100644 --- a/.Lib9c.Tests/Action/Scenario/CombinationAndRapidCombinationTest.cs +++ b/.Lib9c.Tests/Action/Scenario/CombinationAndRapidCombinationTest.cs @@ -3,10 +3,9 @@ using System.Globalization; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Scenario/ItemCraftTest.cs b/.Lib9c.Tests/Action/Scenario/ItemCraftTest.cs index 067b05e0d..704e0c4ac 100644 --- a/.Lib9c.Tests/Action/Scenario/ItemCraftTest.cs +++ b/.Lib9c.Tests/Action/Scenario/ItemCraftTest.cs @@ -10,8 +10,8 @@ namespace Lib9c.Tests.Action.Scenario using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs index a505bd105..cc7ea7e12 100644 --- a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs @@ -5,11 +5,10 @@ namespace Lib9c.Tests.Action.Scenario using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/Scenario/MeadScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/MeadScenarioTest.cs index 13cf75d84..9b14fd448 100644 --- a/.Lib9c.Tests/Action/Scenario/MeadScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/MeadScenarioTest.cs @@ -3,12 +3,10 @@ namespace Lib9c.Tests.Action.Scenario using System; using System.Linq; using System.Reflection; - using Libplanet; using Libplanet.Action; - using Libplanet.Action.Loader; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs index 9903f8994..3335e5e42 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs @@ -6,8 +6,8 @@ namespace Lib9c.Tests.Action.Scenario.Pet using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.EnumType; using Nekoyume.Model.Pet; diff --git a/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs index 4a19f5205..f84e3c406 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs @@ -5,8 +5,8 @@ namespace Lib9c.Tests.Action.Scenario.Pet using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.Pet; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs index 9d14c3e9e..8a2af5a8a 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs @@ -7,9 +7,9 @@ namespace Lib9c.Tests.Action.Scenario.Pet using System.Numerics; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.Pet; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs index f07fcb2a2..9a51864a5 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs @@ -7,8 +7,8 @@ namespace Lib9c.Tests.Action.Scenario.Pet using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs index be6321b7d..cd1b0ee19 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs @@ -8,16 +8,14 @@ namespace Lib9c.Tests.Action.Scenario.Pet using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; - using Nekoyume.Model.Item; using Nekoyume.Model.Pet; using Nekoyume.Model.State; using Nekoyume.TableData; using Xunit; - using Xunit.Abstractions; using static Lib9c.SerializeKeys; public class ReduceRequiredBlockTest diff --git a/.Lib9c.Tests/Action/Scenario/RapidCombinationTest.cs b/.Lib9c.Tests/Action/Scenario/RapidCombinationTest.cs index 5d7c95200..7015f39ad 100644 --- a/.Lib9c.Tests/Action/Scenario/RapidCombinationTest.cs +++ b/.Lib9c.Tests/Action/Scenario/RapidCombinationTest.cs @@ -5,8 +5,8 @@ namespace Lib9c.Tests.Action.Scenario using System.Linq; using Bencodex.Types; using Lib9c.Tests.Util; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/Scenario/RuneScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/RuneScenarioTest.cs index 5035219b5..e86aeed06 100644 --- a/.Lib9c.Tests/Action/Scenario/RuneScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/RuneScenarioTest.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action.Scenario using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/Scenario/SellAndCancellationAndSellTest.cs b/.Lib9c.Tests/Action/Scenario/SellAndCancellationAndSellTest.cs index 6d402baa7..d76c806ed 100644 --- a/.Lib9c.Tests/Action/Scenario/SellAndCancellationAndSellTest.cs +++ b/.Lib9c.Tests/Action/Scenario/SellAndCancellationAndSellTest.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action.Scenario using System; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward2ScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward2ScenarioTest.cs index 4bc39be44..50e73eed0 100644 --- a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward2ScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward2ScenarioTest.cs @@ -2,11 +2,10 @@ namespace Lib9c.Tests.Action.Scenario { using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward3ScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward3ScenarioTest.cs index 8a278ca4f..f7e5ee937 100644 --- a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward3ScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeReward3ScenarioTest.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action.Scenario using System.Collections.Generic; using System.Linq; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeRewardScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeRewardScenarioTest.cs index 7241e3ffc..ec8674b2f 100644 --- a/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeRewardScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/StakeAndClaimStakeRewardScenarioTest.cs @@ -3,10 +3,10 @@ namespace Lib9c.Tests.Action.Scenario using System.Collections.Generic; using System.Linq; using Lib9c.Tests.Util; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/Scenario/WorldUnlockScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/WorldUnlockScenarioTest.cs index 0bfaadb01..31d7c0a99 100644 --- a/.Lib9c.Tests/Action/Scenario/WorldUnlockScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/WorldUnlockScenarioTest.cs @@ -4,9 +4,8 @@ namespace Lib9c.Tests.Action.Scenario using System.Collections.Generic; using System.Linq; using System.Text; - using Libplanet; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SecureMiningRewardTest.cs b/.Lib9c.Tests/Action/SecureMiningRewardTest.cs index 25138740a..606a05950 100644 --- a/.Lib9c.Tests/Action/SecureMiningRewardTest.cs +++ b/.Lib9c.Tests/Action/SecureMiningRewardTest.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using System.Collections.Immutable; - using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Action/Sell0Test.cs b/.Lib9c.Tests/Action/Sell0Test.cs index 43d00320f..0ddab8694 100644 --- a/.Lib9c.Tests/Action/Sell0Test.cs +++ b/.Lib9c.Tests/Action/Sell0Test.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell10Test.cs b/.Lib9c.Tests/Action/Sell10Test.cs index df9650a45..286a4fbd0 100644 --- a/.Lib9c.Tests/Action/Sell10Test.cs +++ b/.Lib9c.Tests/Action/Sell10Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell11Test.cs b/.Lib9c.Tests/Action/Sell11Test.cs index 4cb0c7888..6c307e5fd 100644 --- a/.Lib9c.Tests/Action/Sell11Test.cs +++ b/.Lib9c.Tests/Action/Sell11Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell2Test.cs b/.Lib9c.Tests/Action/Sell2Test.cs index dd5c53906..777e5b8d8 100644 --- a/.Lib9c.Tests/Action/Sell2Test.cs +++ b/.Lib9c.Tests/Action/Sell2Test.cs @@ -2,10 +2,9 @@ { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell3Test.cs b/.Lib9c.Tests/Action/Sell3Test.cs index 18f3b1c0f..783c28936 100644 --- a/.Lib9c.Tests/Action/Sell3Test.cs +++ b/.Lib9c.Tests/Action/Sell3Test.cs @@ -2,10 +2,9 @@ { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell4Test.cs b/.Lib9c.Tests/Action/Sell4Test.cs index 1d4230b12..edaa1f8c6 100644 --- a/.Lib9c.Tests/Action/Sell4Test.cs +++ b/.Lib9c.Tests/Action/Sell4Test.cs @@ -4,10 +4,9 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell5Test.cs b/.Lib9c.Tests/Action/Sell5Test.cs index b4488c4b6..26bf1ea94 100644 --- a/.Lib9c.Tests/Action/Sell5Test.cs +++ b/.Lib9c.Tests/Action/Sell5Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell6Test.cs b/.Lib9c.Tests/Action/Sell6Test.cs index bed6dd8dc..015b9fa44 100644 --- a/.Lib9c.Tests/Action/Sell6Test.cs +++ b/.Lib9c.Tests/Action/Sell6Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell7Test.cs b/.Lib9c.Tests/Action/Sell7Test.cs index 23969f995..c8e670e9c 100644 --- a/.Lib9c.Tests/Action/Sell7Test.cs +++ b/.Lib9c.Tests/Action/Sell7Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell8Test.cs b/.Lib9c.Tests/Action/Sell8Test.cs index cb3d5a831..3bbb6e772 100644 --- a/.Lib9c.Tests/Action/Sell8Test.cs +++ b/.Lib9c.Tests/Action/Sell8Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Sell9Test.cs b/.Lib9c.Tests/Action/Sell9Test.cs index ad90294b8..f4a7122de 100644 --- a/.Lib9c.Tests/Action/Sell9Test.cs +++ b/.Lib9c.Tests/Action/Sell9Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation0Test.cs b/.Lib9c.Tests/Action/SellCancellation0Test.cs index 3cc640cc9..ad5d0f6b2 100644 --- a/.Lib9c.Tests/Action/SellCancellation0Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation0Test.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation2Test.cs b/.Lib9c.Tests/Action/SellCancellation2Test.cs index a13d176e7..b49430c8d 100644 --- a/.Lib9c.Tests/Action/SellCancellation2Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation2Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation3Test.cs b/.Lib9c.Tests/Action/SellCancellation3Test.cs index 0dba1bc63..e9948fffa 100644 --- a/.Lib9c.Tests/Action/SellCancellation3Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation3Test.cs @@ -2,10 +2,9 @@ { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation4Test.cs b/.Lib9c.Tests/Action/SellCancellation4Test.cs index 85156dbaf..36701f914 100644 --- a/.Lib9c.Tests/Action/SellCancellation4Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation4Test.cs @@ -2,10 +2,9 @@ { using System; using System.Linq; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation5Test.cs b/.Lib9c.Tests/Action/SellCancellation5Test.cs index 97d368aa0..e3efc82ca 100644 --- a/.Lib9c.Tests/Action/SellCancellation5Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation5Test.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Action using System; using System.Collections.Generic; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation6Test.cs b/.Lib9c.Tests/Action/SellCancellation6Test.cs index 562b94325..0d7a88eb8 100644 --- a/.Lib9c.Tests/Action/SellCancellation6Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation6Test.cs @@ -4,10 +4,9 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation7Test.cs b/.Lib9c.Tests/Action/SellCancellation7Test.cs index 2fb8427f0..e1b287fc7 100644 --- a/.Lib9c.Tests/Action/SellCancellation7Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation7Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellation8Test.cs b/.Lib9c.Tests/Action/SellCancellation8Test.cs index 804123c69..0099e84a9 100644 --- a/.Lib9c.Tests/Action/SellCancellation8Test.cs +++ b/.Lib9c.Tests/Action/SellCancellation8Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellCancellationTest.cs b/.Lib9c.Tests/Action/SellCancellationTest.cs index 8db512cba..9d024c43f 100644 --- a/.Lib9c.Tests/Action/SellCancellationTest.cs +++ b/.Lib9c.Tests/Action/SellCancellationTest.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/SellTest.cs b/.Lib9c.Tests/Action/SellTest.cs index b8e2d6c14..d9a511780 100644 --- a/.Lib9c.Tests/Action/SellTest.cs +++ b/.Lib9c.Tests/Action/SellTest.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/Snapshot/TransferAsset0SnapshotTest.cs b/.Lib9c.Tests/Action/Snapshot/TransferAsset0SnapshotTest.cs index f10cb1f4b..81d7a606f 100644 --- a/.Lib9c.Tests/Action/Snapshot/TransferAsset0SnapshotTest.cs +++ b/.Lib9c.Tests/Action/Snapshot/TransferAsset0SnapshotTest.cs @@ -4,10 +4,10 @@ namespace Lib9c.Tests.Action.Snapshot using System.Numerics; using System.Threading.Tasks; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; + using Libplanet.Common; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Helper; using VerifyTests; diff --git a/.Lib9c.Tests/Action/Stake0Test.cs b/.Lib9c.Tests/Action/Stake0Test.cs index b5db636ff..23efedd5d 100644 --- a/.Lib9c.Tests/Action/Stake0Test.cs +++ b/.Lib9c.Tests/Action/Stake0Test.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/StakeTest.cs b/.Lib9c.Tests/Action/StakeTest.cs index 989856494..a195d9c41 100644 --- a/.Lib9c.Tests/Action/StakeTest.cs +++ b/.Lib9c.Tests/Action/StakeTest.cs @@ -1,10 +1,9 @@ namespace Lib9c.Tests.Action { using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/TransferAsset2Test.cs b/.Lib9c.Tests/Action/TransferAsset2Test.cs index d19187dbe..0887201a5 100644 --- a/.Lib9c.Tests/Action/TransferAsset2Test.cs +++ b/.Lib9c.Tests/Action/TransferAsset2Test.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/TransferAsset3Test.cs b/.Lib9c.Tests/Action/TransferAsset3Test.cs index 5f3a883d3..bb8eecc58 100644 --- a/.Lib9c.Tests/Action/TransferAsset3Test.cs +++ b/.Lib9c.Tests/Action/TransferAsset3Test.cs @@ -7,11 +7,10 @@ namespace Lib9c.Tests.Action using System.Numerics; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/TransferAssetTest.cs b/.Lib9c.Tests/Action/TransferAssetTest.cs index 5afe13a20..08499d420 100644 --- a/.Lib9c.Tests/Action/TransferAssetTest.cs +++ b/.Lib9c.Tests/Action/TransferAssetTest.cs @@ -6,10 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/TransferAssetTest0.cs b/.Lib9c.Tests/Action/TransferAssetTest0.cs index 85f6a3332..050aea169 100644 --- a/.Lib9c.Tests/Action/TransferAssetTest0.cs +++ b/.Lib9c.Tests/Action/TransferAssetTest0.cs @@ -6,9 +6,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/TransferAssets0Test.cs b/.Lib9c.Tests/Action/TransferAssets0Test.cs index bef3f642d..8057fce51 100644 --- a/.Lib9c.Tests/Action/TransferAssets0Test.cs +++ b/.Lib9c.Tests/Action/TransferAssets0Test.cs @@ -8,11 +8,10 @@ namespace Lib9c.Tests.Action using System.Numerics; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/TransferAssetsTest.cs b/.Lib9c.Tests/Action/TransferAssetsTest.cs index c5ea63e10..8db9787ff 100644 --- a/.Lib9c.Tests/Action/TransferAssetsTest.cs +++ b/.Lib9c.Tests/Action/TransferAssetsTest.cs @@ -7,10 +7,9 @@ namespace Lib9c.Tests.Action using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/UnlockEquipmentRecipe1Test.cs b/.Lib9c.Tests/Action/UnlockEquipmentRecipe1Test.cs index dac2fc93a..9580b950a 100644 --- a/.Lib9c.Tests/Action/UnlockEquipmentRecipe1Test.cs +++ b/.Lib9c.Tests/Action/UnlockEquipmentRecipe1Test.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/UnlockEquipmentRecipeTest.cs b/.Lib9c.Tests/Action/UnlockEquipmentRecipeTest.cs index 84d253644..20faf57b1 100644 --- a/.Lib9c.Tests/Action/UnlockEquipmentRecipeTest.cs +++ b/.Lib9c.Tests/Action/UnlockEquipmentRecipeTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Action/UnlockRuneSlotTest.cs b/.Lib9c.Tests/Action/UnlockRuneSlotTest.cs index 102c28f05..806b66bf5 100644 --- a/.Lib9c.Tests/Action/UnlockRuneSlotTest.cs +++ b/.Lib9c.Tests/Action/UnlockRuneSlotTest.cs @@ -2,10 +2,9 @@ namespace Lib9c.Tests.Action { using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.EnumType; diff --git a/.Lib9c.Tests/Action/UnlockWorld1Test.cs b/.Lib9c.Tests/Action/UnlockWorld1Test.cs index db92cd174..a7c0855e7 100644 --- a/.Lib9c.Tests/Action/UnlockWorld1Test.cs +++ b/.Lib9c.Tests/Action/UnlockWorld1Test.cs @@ -4,11 +4,10 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/UnlockWorldTest.cs b/.Lib9c.Tests/Action/UnlockWorldTest.cs index 13730af75..49b6aae61 100644 --- a/.Lib9c.Tests/Action/UnlockWorldTest.cs +++ b/.Lib9c.Tests/Action/UnlockWorldTest.cs @@ -4,11 +4,10 @@ namespace Lib9c.Tests.Action using System.Collections.Generic; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.Tests/Action/UpdateSell0Test.cs b/.Lib9c.Tests/Action/UpdateSell0Test.cs index cb81413b2..615537644 100644 --- a/.Lib9c.Tests/Action/UpdateSell0Test.cs +++ b/.Lib9c.Tests/Action/UpdateSell0Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/UpdateSell2Test.cs b/.Lib9c.Tests/Action/UpdateSell2Test.cs index a3169bf68..782e2fa65 100644 --- a/.Lib9c.Tests/Action/UpdateSell2Test.cs +++ b/.Lib9c.Tests/Action/UpdateSell2Test.cs @@ -6,10 +6,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Action/UpdateSell3Test.cs b/.Lib9c.Tests/Action/UpdateSell3Test.cs index 1c28ef76f..27db78341 100644 --- a/.Lib9c.Tests/Action/UpdateSell3Test.cs +++ b/.Lib9c.Tests/Action/UpdateSell3Test.cs @@ -5,10 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/UpdateSell4Test.cs b/.Lib9c.Tests/Action/UpdateSell4Test.cs index a75c09c4d..453a015f1 100644 --- a/.Lib9c.Tests/Action/UpdateSell4Test.cs +++ b/.Lib9c.Tests/Action/UpdateSell4Test.cs @@ -5,10 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/UpdateSellTest.cs b/.Lib9c.Tests/Action/UpdateSellTest.cs index 403d2a520..e5f3b27d4 100644 --- a/.Lib9c.Tests/Action/UpdateSellTest.cs +++ b/.Lib9c.Tests/Action/UpdateSellTest.cs @@ -5,10 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Action/ValidatorSetOperateTest.cs b/.Lib9c.Tests/Action/ValidatorSetOperateTest.cs index abeaec337..d7735d8c8 100644 --- a/.Lib9c.Tests/Action/ValidatorSetOperateTest.cs +++ b/.Lib9c.Tests/Action/ValidatorSetOperateTest.cs @@ -1,13 +1,10 @@ namespace Lib9c.Tests.Action { using System; - using System.Collections.Immutable; using System.Numerics; - using Bencodex.Types; - using Libplanet; - using Libplanet.Consensus; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Consensus; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Action/WorldBossHelperTest.cs b/.Lib9c.Tests/Action/WorldBossHelperTest.cs index cfb095cca..10a92655d 100644 --- a/.Lib9c.Tests/Action/WorldBossHelperTest.cs +++ b/.Lib9c.Tests/Action/WorldBossHelperTest.cs @@ -1,6 +1,6 @@ namespace Lib9c.Tests.Action { - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/.Lib9c.Tests/Battle/EnemyPlayerDigestTest.cs b/.Lib9c.Tests/Battle/EnemyPlayerDigestTest.cs index 575129dd9..9706fd867 100644 --- a/.Lib9c.Tests/Battle/EnemyPlayerDigestTest.cs +++ b/.Lib9c.Tests/Battle/EnemyPlayerDigestTest.cs @@ -3,7 +3,6 @@ namespace Lib9c.Tests using System.Linq; using Bencodex.Types; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model; diff --git a/.Lib9c.Tests/CrystalCalculatorTest.cs b/.Lib9c.Tests/CrystalCalculatorTest.cs index 7fea6b446..c3e8d989b 100644 --- a/.Lib9c.Tests/CrystalCalculatorTest.cs +++ b/.Lib9c.Tests/CrystalCalculatorTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests using System.Collections; using System.Collections.Generic; using System.Linq; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/CurrenciesTest.cs b/.Lib9c.Tests/CurrenciesTest.cs index 7aca9bf95..4ecd9902a 100644 --- a/.Lib9c.Tests/CurrenciesTest.cs +++ b/.Lib9c.Tests/CurrenciesTest.cs @@ -5,7 +5,7 @@ namespace Lib9c.Tests using System.Collections.Generic; using System.Linq; using System.Numerics; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/Extensions/EquipmentExtensionsTest.cs b/.Lib9c.Tests/Extensions/EquipmentExtensionsTest.cs index 49808c2f8..0c3c79d61 100644 --- a/.Lib9c.Tests/Extensions/EquipmentExtensionsTest.cs +++ b/.Lib9c.Tests/Extensions/EquipmentExtensionsTest.cs @@ -3,7 +3,6 @@ namespace Lib9c.Tests.Extensions using System; using System.Linq; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Action; using Libplanet.Crypto; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Extensions/EventScheduleExtensionsTest.cs b/.Lib9c.Tests/Extensions/EventScheduleExtensionsTest.cs index 1988ecf56..4f5e853e4 100644 --- a/.Lib9c.Tests/Extensions/EventScheduleExtensionsTest.cs +++ b/.Lib9c.Tests/Extensions/EventScheduleExtensionsTest.cs @@ -1,7 +1,7 @@ namespace Lib9c.Tests.Extensions { using System; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.TableData.Event; using Xunit; diff --git a/.Lib9c.Tests/Extensions/SheetsExtensionsTest.cs b/.Lib9c.Tests/Extensions/SheetsExtensionsTest.cs index d5a419cbd..c8858d98b 100644 --- a/.Lib9c.Tests/Extensions/SheetsExtensionsTest.cs +++ b/.Lib9c.Tests/Extensions/SheetsExtensionsTest.cs @@ -1,12 +1,12 @@ -namespace Lib9c.Tests.Extensions +namespace Lib9c.Tests.Extensions { using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using Bencodex.Types; - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/.Lib9c.Tests/JsonStatesLoaderTest.cs b/.Lib9c.Tests/JsonStatesLoaderTest.cs index 520db3d01..9d824e01e 100644 --- a/.Lib9c.Tests/JsonStatesLoaderTest.cs +++ b/.Lib9c.Tests/JsonStatesLoaderTest.cs @@ -8,7 +8,7 @@ namespace Lib9c.Tests using System.Text; using Bencodex; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Xunit; public class JsonStatesLoaderTest diff --git a/.Lib9c.Tests/Model/ActivationKeyTest.cs b/.Lib9c.Tests/Model/ActivationKeyTest.cs index 708592a7f..75948036f 100644 --- a/.Lib9c.Tests/Model/ActivationKeyTest.cs +++ b/.Lib9c.Tests/Model/ActivationKeyTest.cs @@ -1,6 +1,6 @@ namespace Lib9c.Tests.Model { - using Libplanet; + using Libplanet.Common; using Libplanet.Crypto; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/Arena/ArenaAvatarStateTest.cs b/.Lib9c.Tests/Model/Arena/ArenaAvatarStateTest.cs index e7946ee11..6633ebf07 100644 --- a/.Lib9c.Tests/Model/Arena/ArenaAvatarStateTest.cs +++ b/.Lib9c.Tests/Model/Arena/ArenaAvatarStateTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.Arena { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/Arena/ArenaInformationTest.cs b/.Lib9c.Tests/Model/Arena/ArenaInformationTest.cs index f4424811f..ffc42af24 100644 --- a/.Lib9c.Tests/Model/Arena/ArenaInformationTest.cs +++ b/.Lib9c.Tests/Model/Arena/ArenaInformationTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.Arena { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.Arena; using Xunit; diff --git a/.Lib9c.Tests/Model/Arena/ArenaScoreTest.cs b/.Lib9c.Tests/Model/Arena/ArenaScoreTest.cs index 234f7d3f4..cd95f9306 100644 --- a/.Lib9c.Tests/Model/Arena/ArenaScoreTest.cs +++ b/.Lib9c.Tests/Model/Arena/ArenaScoreTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.Arena { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.Arena; using Xunit; diff --git a/.Lib9c.Tests/Model/Arena/PlayerDigestTest.cs b/.Lib9c.Tests/Model/Arena/PlayerDigestTest.cs index cdf92ddb0..8b477bf9a 100644 --- a/.Lib9c.Tests/Model/Arena/PlayerDigestTest.cs +++ b/.Lib9c.Tests/Model/Arena/PlayerDigestTest.cs @@ -5,10 +5,8 @@ namespace Lib9c.Tests.Model.Arena using System.Linq; using Bencodex.Types; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model; - using Nekoyume.Model.Arena; using Nekoyume.Model.Item; using Nekoyume.Model.Stat; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/BattleLogTest.cs b/.Lib9c.Tests/Model/BattleLogTest.cs index 9891b27fe..96e19611e 100644 --- a/.Lib9c.Tests/Model/BattleLogTest.cs +++ b/.Lib9c.Tests/Model/BattleLogTest.cs @@ -3,8 +3,8 @@ namespace Lib9c.Tests.Model using System; using System.Collections.Generic; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Action; + using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/Coupons/CouponTest.cs b/.Lib9c.Tests/Model/Coupons/CouponTest.cs index 178cdc474..695e1e6b8 100644 --- a/.Lib9c.Tests/Model/Coupons/CouponTest.cs +++ b/.Lib9c.Tests/Model/Coupons/CouponTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Model.Coupons using System; using System.Collections.Generic; using System.Linq; - using Libplanet; + using Libplanet.Common; using Nekoyume.Model.Coupons; using Xunit; diff --git a/.Lib9c.Tests/Model/GrandFinale/GrandFinaleInformationTest.cs b/.Lib9c.Tests/Model/GrandFinale/GrandFinaleInformationTest.cs index 8359cfee9..3132f7a13 100644 --- a/.Lib9c.Tests/Model/GrandFinale/GrandFinaleInformationTest.cs +++ b/.Lib9c.Tests/Model/GrandFinale/GrandFinaleInformationTest.cs @@ -1,7 +1,6 @@ -namespace Lib9c.Tests.Model.GrandFinale +namespace Lib9c.Tests.Model.GrandFinale { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.GrandFinale; using Xunit; diff --git a/.Lib9c.Tests/Model/Item/ShopItemTest.cs b/.Lib9c.Tests/Model/Item/ShopItemTest.cs index 58843b022..bc3b9e80d 100644 --- a/.Lib9c.Tests/Model/Item/ShopItemTest.cs +++ b/.Lib9c.Tests/Model/Item/ShopItemTest.cs @@ -1,4 +1,4 @@ -namespace Lib9c.Tests.Model.Item +namespace Lib9c.Tests.Model.Item { using System; using System.Collections.Generic; @@ -6,9 +6,8 @@ using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Xunit; using BxDictionary = Bencodex.Types.Dictionary; diff --git a/.Lib9c.Tests/Model/ItemNotificationTest.cs b/.Lib9c.Tests/Model/ItemNotificationTest.cs index 0eb64d5e8..3db69d4b4 100644 --- a/.Lib9c.Tests/Model/ItemNotificationTest.cs +++ b/.Lib9c.Tests/Model/ItemNotificationTest.cs @@ -3,7 +3,6 @@ namespace Lib9c.Tests.Model using System; using System.Collections.Generic; using System.Linq; - using Libplanet; using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Model/Mail/GrindingMailTest.cs b/.Lib9c.Tests/Model/Mail/GrindingMailTest.cs index 90a7956d7..bb5259680 100644 --- a/.Lib9c.Tests/Model/Mail/GrindingMailTest.cs +++ b/.Lib9c.Tests/Model/Mail/GrindingMailTest.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Model.Mail { using System; using Bencodex.Types; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Model.Mail; using Xunit; diff --git a/.Lib9c.Tests/Model/Mail/MonsterCollectMailTest.cs b/.Lib9c.Tests/Model/Mail/MonsterCollectMailTest.cs index b0cd9b8b1..0b6b55961 100644 --- a/.Lib9c.Tests/Model/Mail/MonsterCollectMailTest.cs +++ b/.Lib9c.Tests/Model/Mail/MonsterCollectMailTest.cs @@ -6,7 +6,7 @@ namespace Lib9c.Tests.Model.Mail using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.Mail; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/.Lib9c.Tests/Model/Mail/UnloadFromMyGaragesRecipientMailTest.cs b/.Lib9c.Tests/Model/Mail/UnloadFromMyGaragesRecipientMailTest.cs index feecddc94..d90dcea3c 100644 --- a/.Lib9c.Tests/Model/Mail/UnloadFromMyGaragesRecipientMailTest.cs +++ b/.Lib9c.Tests/Model/Mail/UnloadFromMyGaragesRecipientMailTest.cs @@ -8,8 +8,9 @@ namespace Lib9c.Tests.Model.Mail using System.Security.Cryptography; using Bencodex.Types; using Lib9c.Tests.Action.Garages; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Common; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Model.Mail; using Xunit; diff --git a/.Lib9c.Tests/Model/Order/FungibleOrderTest.cs b/.Lib9c.Tests/Model/Order/FungibleOrderTest.cs index 7443d96b0..0338ffe38 100644 --- a/.Lib9c.Tests/Model/Order/FungibleOrderTest.cs +++ b/.Lib9c.Tests/Model/Order/FungibleOrderTest.cs @@ -7,8 +7,8 @@ namespace Lib9c.Tests.Model.Order using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Model/Order/NonFungibleOrderTest.cs b/.Lib9c.Tests/Model/Order/NonFungibleOrderTest.cs index 77042c0bf..c9b72f198 100644 --- a/.Lib9c.Tests/Model/Order/NonFungibleOrderTest.cs +++ b/.Lib9c.Tests/Model/Order/NonFungibleOrderTest.cs @@ -8,8 +8,8 @@ namespace Lib9c.Tests.Model.Order using Bencodex.Types; using Lib9c.Model.Order; using Lib9c.Tests.Action; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/.Lib9c.Tests/Model/Order/OrderDigestListStateTest.cs b/.Lib9c.Tests/Model/Order/OrderDigestListStateTest.cs index f5b6eced1..70bfaa2f5 100644 --- a/.Lib9c.Tests/Model/Order/OrderDigestListStateTest.cs +++ b/.Lib9c.Tests/Model/Order/OrderDigestListStateTest.cs @@ -6,7 +6,7 @@ namespace Lib9c.Tests.Model.Order using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Action; using Xunit; diff --git a/.Lib9c.Tests/Model/Order/OrderDigestTest.cs b/.Lib9c.Tests/Model/Order/OrderDigestTest.cs index fc187cb3b..6e0474d94 100644 --- a/.Lib9c.Tests/Model/Order/OrderDigestTest.cs +++ b/.Lib9c.Tests/Model/Order/OrderDigestTest.cs @@ -5,7 +5,7 @@ namespace Lib9c.Tests.Model.Order using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Xunit; public class OrderDigestTest diff --git a/.Lib9c.Tests/Model/Order/OrderFactoryTest.cs b/.Lib9c.Tests/Model/Order/OrderFactoryTest.cs index 4555b2cff..d40bd9cba 100644 --- a/.Lib9c.Tests/Model/Order/OrderFactoryTest.cs +++ b/.Lib9c.Tests/Model/Order/OrderFactoryTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Model.Order using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tests/Model/Skill/NormalAttackTest.cs b/.Lib9c.Tests/Model/Skill/NormalAttackTest.cs index 42e53cb77..3ebd7afd3 100644 --- a/.Lib9c.Tests/Model/Skill/NormalAttackTest.cs +++ b/.Lib9c.Tests/Model/Skill/NormalAttackTest.cs @@ -4,7 +4,6 @@ namespace Lib9c.Tests.Model.Skill using System.Collections.Generic; using System.Linq; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Model/State/ActivatedAccountsStateTest.cs b/.Lib9c.Tests/Model/State/ActivatedAccountsStateTest.cs index d63ed975b..dfb652684 100644 --- a/.Lib9c.Tests/Model/State/ActivatedAccountsStateTest.cs +++ b/.Lib9c.Tests/Model/State/ActivatedAccountsStateTest.cs @@ -4,7 +4,7 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/AdminStateTest.cs b/.Lib9c.Tests/Model/State/AdminStateTest.cs index 23f188cd3..2531019b0 100644 --- a/.Lib9c.Tests/Model/State/AdminStateTest.cs +++ b/.Lib9c.Tests/Model/State/AdminStateTest.cs @@ -2,7 +2,6 @@ namespace Lib9c.Tests.Model.State { using System.IO; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/AgentStateTest.cs b/.Lib9c.Tests/Model/State/AgentStateTest.cs index 33070d423..27e4566ee 100644 --- a/.Lib9c.Tests/Model/State/AgentStateTest.cs +++ b/.Lib9c.Tests/Model/State/AgentStateTest.cs @@ -2,7 +2,6 @@ namespace Lib9c.Tests.Model.State { using System.IO; using System.Runtime.Serialization.Formatters.Binary; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/AuthorizedMinersStateTest.cs b/.Lib9c.Tests/Model/State/AuthorizedMinersStateTest.cs index ed29c5188..cc76a7fc4 100644 --- a/.Lib9c.Tests/Model/State/AuthorizedMinersStateTest.cs +++ b/.Lib9c.Tests/Model/State/AuthorizedMinersStateTest.cs @@ -3,7 +3,7 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/AvatarStateTest.cs b/.Lib9c.Tests/Model/State/AvatarStateTest.cs index 29ee6572e..c86d2078d 100644 --- a/.Lib9c.Tests/Model/State/AvatarStateTest.cs +++ b/.Lib9c.Tests/Model/State/AvatarStateTest.cs @@ -9,7 +9,7 @@ namespace Lib9c.Tests.Model.State using Bencodex; using Bencodex.Types; using Lib9c.Tests.Model.Item; - using Libplanet; + using Libplanet.Common; using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Model/State/CrystalCostStateTest.cs b/.Lib9c.Tests/Model/State/CrystalCostStateTest.cs index 16f618391..8efe51add 100644 --- a/.Lib9c.Tests/Model/State/CrystalCostStateTest.cs +++ b/.Lib9c.Tests/Model/State/CrystalCostStateTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.State { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/State/CrystalRandomSkillStateTest.cs b/.Lib9c.Tests/Model/State/CrystalRandomSkillStateTest.cs index 8f4289894..17990c37e 100644 --- a/.Lib9c.Tests/Model/State/CrystalRandomSkillStateTest.cs +++ b/.Lib9c.Tests/Model/State/CrystalRandomSkillStateTest.cs @@ -1,8 +1,7 @@ -namespace Lib9c.Tests.Model.State +namespace Lib9c.Tests.Model.State { using System.Collections.Generic; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/GoldCurrencyStateTest.cs b/.Lib9c.Tests/Model/State/GoldCurrencyStateTest.cs index 60f3d86a7..1b5d90b81 100644 --- a/.Lib9c.Tests/Model/State/GoldCurrencyStateTest.cs +++ b/.Lib9c.Tests/Model/State/GoldCurrencyStateTest.cs @@ -3,8 +3,8 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/HammerPointStateTest.cs b/.Lib9c.Tests/Model/State/HammerPointStateTest.cs index 3076d251b..ecaaef02b 100644 --- a/.Lib9c.Tests/Model/State/HammerPointStateTest.cs +++ b/.Lib9c.Tests/Model/State/HammerPointStateTest.cs @@ -1,8 +1,7 @@ -namespace Lib9c.Tests.Model.State +namespace Lib9c.Tests.Model.State { using System; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/LazyStateTest.cs b/.Lib9c.Tests/Model/State/LazyStateTest.cs index bbac986f7..ca77f5fbf 100644 --- a/.Lib9c.Tests/Model/State/LazyStateTest.cs +++ b/.Lib9c.Tests/Model/State/LazyStateTest.cs @@ -3,7 +3,7 @@ namespace Lib9c.Tests.Model.State using System.Collections.Generic; using Bencodex.Types; using Lib9c.Tests.TestHelper; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; using LazySampleState = Nekoyume.Model.State.LazyState< diff --git a/.Lib9c.Tests/Model/State/MonsterCollectionState0Test.cs b/.Lib9c.Tests/Model/State/MonsterCollectionState0Test.cs index ffc8bdeb2..0d64c2110 100644 --- a/.Lib9c.Tests/Model/State/MonsterCollectionState0Test.cs +++ b/.Lib9c.Tests/Model/State/MonsterCollectionState0Test.cs @@ -5,7 +5,7 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/.Lib9c.Tests/Model/State/MonsterCollectionStateTest.cs b/.Lib9c.Tests/Model/State/MonsterCollectionStateTest.cs index c681e41c4..91e20fe89 100644 --- a/.Lib9c.Tests/Model/State/MonsterCollectionStateTest.cs +++ b/.Lib9c.Tests/Model/State/MonsterCollectionStateTest.cs @@ -3,7 +3,7 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; using static Lib9c.SerializeKeys; diff --git a/.Lib9c.Tests/Model/State/PendingActivationStateTest.cs b/.Lib9c.Tests/Model/State/PendingActivationStateTest.cs index 198811e5e..ec0e172fb 100644 --- a/.Lib9c.Tests/Model/State/PendingActivationStateTest.cs +++ b/.Lib9c.Tests/Model/State/PendingActivationStateTest.cs @@ -3,7 +3,7 @@ namespace Lib9c.Tests.Model.State using System.IO; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; + using Libplanet.Common; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/PetStateTest.cs b/.Lib9c.Tests/Model/State/PetStateTest.cs index bdd0870d1..35a25793a 100644 --- a/.Lib9c.Tests/Model/State/PetStateTest.cs +++ b/.Lib9c.Tests/Model/State/PetStateTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.State { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/State/RankingMapStateTest.cs b/.Lib9c.Tests/Model/State/RankingMapStateTest.cs index 933069ac3..789f7819c 100644 --- a/.Lib9c.Tests/Model/State/RankingMapStateTest.cs +++ b/.Lib9c.Tests/Model/State/RankingMapStateTest.cs @@ -2,7 +2,7 @@ namespace Lib9c.Tests.Model.State { using System.Linq; using Bencodex.Types; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/RankingState1Test.cs b/.Lib9c.Tests/Model/State/RankingState1Test.cs index a5599539f..33c8b0456 100644 --- a/.Lib9c.Tests/Model/State/RankingState1Test.cs +++ b/.Lib9c.Tests/Model/State/RankingState1Test.cs @@ -5,7 +5,6 @@ namespace Lib9c.Tests.Model.State using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Model/State/RankingStateTest.cs b/.Lib9c.Tests/Model/State/RankingStateTest.cs index 27ad3ed62..40caf6e42 100644 --- a/.Lib9c.Tests/Model/State/RankingStateTest.cs +++ b/.Lib9c.Tests/Model/State/RankingStateTest.cs @@ -5,7 +5,6 @@ namespace Lib9c.Tests.Model.State using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Model/State/ShardedShopStateTest.cs b/.Lib9c.Tests/Model/State/ShardedShopStateTest.cs index 985c86b6b..ba735e004 100644 --- a/.Lib9c.Tests/Model/State/ShardedShopStateTest.cs +++ b/.Lib9c.Tests/Model/State/ShardedShopStateTest.cs @@ -3,8 +3,8 @@ namespace Lib9c.Tests.Model.State using System; using System.Linq; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/State/ShardedShopStateV2Test.cs b/.Lib9c.Tests/Model/State/ShardedShopStateV2Test.cs index c7da96c30..3856c1f96 100644 --- a/.Lib9c.Tests/Model/State/ShardedShopStateV2Test.cs +++ b/.Lib9c.Tests/Model/State/ShardedShopStateV2Test.cs @@ -7,8 +7,8 @@ namespace Lib9c.Tests.Model.State using Bencodex.Types; using Lib9c.Model.Order; using Lib9c.Tests.Action; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Model/State/SheetStateTest.cs b/.Lib9c.Tests/Model/State/SheetStateTest.cs index 453a1771e..cdbad1ef6 100644 --- a/.Lib9c.Tests/Model/State/SheetStateTest.cs +++ b/.Lib9c.Tests/Model/State/SheetStateTest.cs @@ -3,7 +3,7 @@ namespace Lib9c.Tests.Model.State using System.Collections.Generic; using System.Linq; using System.Reflection; - using Libplanet; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/Model/State/ShopStateTest.cs b/.Lib9c.Tests/Model/State/ShopStateTest.cs index 547c5456a..d31abcc9e 100644 --- a/.Lib9c.Tests/Model/State/ShopStateTest.cs +++ b/.Lib9c.Tests/Model/State/ShopStateTest.cs @@ -2,9 +2,8 @@ namespace Lib9c.Tests.Model.State { using System; using Bencodex.Types; - using Libplanet; - using Libplanet.Assets; using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/.Lib9c.Tests/Model/State/StakeStateTest.cs b/.Lib9c.Tests/Model/State/StakeStateTest.cs index 74685e0b9..654374b69 100644 --- a/.Lib9c.Tests/Model/State/StakeStateTest.cs +++ b/.Lib9c.Tests/Model/State/StakeStateTest.cs @@ -1,7 +1,6 @@ namespace Lib9c.Tests.Model.State { using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; diff --git a/.Lib9c.Tests/Model/State/StateExtensionsTest.cs b/.Lib9c.Tests/Model/State/StateExtensionsTest.cs index 70d315040..445795d1e 100644 --- a/.Lib9c.Tests/Model/State/StateExtensionsTest.cs +++ b/.Lib9c.Tests/Model/State/StateExtensionsTest.cs @@ -2,7 +2,6 @@ namespace Lib9c.Tests.Model.State { using System.Collections.Generic; using System.Numerics; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Model/State/WeeklyArenaStateTest.cs b/.Lib9c.Tests/Model/State/WeeklyArenaStateTest.cs index 6c3dfba94..74a5360dc 100644 --- a/.Lib9c.Tests/Model/State/WeeklyArenaStateTest.cs +++ b/.Lib9c.Tests/Model/State/WeeklyArenaStateTest.cs @@ -3,12 +3,9 @@ namespace Lib9c.Tests.Model.State using System; using System.Collections.Generic; using System.IO; - using System.Linq; using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; - using Nekoyume.Action; using Nekoyume.Model.State; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/Model/WorldBossKillRewardRecordTest.cs b/.Lib9c.Tests/Model/WorldBossKillRewardRecordTest.cs index 8b3b86d03..5fb56d0c2 100644 --- a/.Lib9c.Tests/Model/WorldBossKillRewardRecordTest.cs +++ b/.Lib9c.Tests/Model/WorldBossKillRewardRecordTest.cs @@ -1,7 +1,7 @@ namespace Lib9c.Tests.Model { using System.Collections.Generic; - using Libplanet.Assets; + using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Policy/BlockPolicyTest.cs b/.Lib9c.Tests/Policy/BlockPolicyTest.cs index 0e0108633..575185bb7 100644 --- a/.Lib9c.Tests/Policy/BlockPolicyTest.cs +++ b/.Lib9c.Tests/Policy/BlockPolicyTest.cs @@ -5,18 +5,17 @@ namespace Lib9c.Tests using System.Collections.Immutable; using System.Linq; using System.Numerics; - using Libplanet; + using Bencodex.Types; using Libplanet.Action; - using Libplanet.Action.Loader; - using Libplanet.Assets; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; - using Libplanet.Blocks; - using Libplanet.Consensus; using Libplanet.Crypto; using Libplanet.Store; using Libplanet.Store.Trie; - using Libplanet.Tx; + using Libplanet.Types.Assets; + using Libplanet.Types.Blocks; + using Libplanet.Types.Consensus; + using Libplanet.Types.Tx; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Loader; @@ -75,7 +74,7 @@ public void ValidateNextBlockTx() 0, new PrivateKey(), genesis.Hash, - new ActionBase[] { } + Array.Empty() ); // New private key which is not in activated addresses list is blocked. @@ -97,7 +96,7 @@ public void ValidateNextBlockTx() 0, newActivatedPrivateKey, genesis.Hash, - new ActionBase[] { } + Array.Empty() ); // Test success because the key is activated. @@ -117,14 +116,14 @@ public void ValidateNextBlockTx() 0, newActivatedPrivateKey, genesis.Hash, - singleAction + singleAction.ToPlainValues() ); Transaction txWithManyActions = Transaction.Create( 0, newActivatedPrivateKey, genesis.Hash, - manyActions + manyActions.ToPlainValues() ); // Transaction with more than two actions is rejected. @@ -192,7 +191,7 @@ public void ValidateNextBlockTx_Mead() 0, adminPrivateKey, genesis.Hash, - new ActionBase[] { } + Array.Empty() ); Assert.IsType(BlockPolicySource.ValidateNextBlockTxRaw(blockChain, actionTypeLoader, txEmpty)); @@ -201,7 +200,7 @@ public void ValidateNextBlockTx_Mead() 0, adminPrivateKey, genesis.Hash, - new ActionBase[] { action, action } + new ActionBase[] { action, action }.ToPlainValues() ); Assert.IsType(BlockPolicySource.ValidateNextBlockTxRaw(blockChain, actionTypeLoader, txByAdmin)); @@ -210,7 +209,7 @@ public void ValidateNextBlockTx_Mead() 0, new PrivateKey(), genesis.Hash, - new ActionBase[] { action } + new ActionBase[] { action }.ToPlainValues() ); Assert.IsType(BlockPolicySource.ValidateNextBlockTxRaw(blockChain, actionTypeLoader, txByStranger)); @@ -221,7 +220,7 @@ public void ValidateNextBlockTx_Mead() genesis.Hash, gasLimit: 1, maxGasPrice: new FungibleAssetValue(Currencies.Mead, 10, 10), - actions: new ActionBase[] { action } + actions: new ActionBase[] { action }.ToPlainValues() ); Assert.IsType(BlockPolicySource.ValidateNextBlockTxRaw(blockChain, actionTypeLoader, txByAdmin2)); @@ -232,7 +231,7 @@ public void ValidateNextBlockTx_Mead() genesis.Hash, gasLimit: 1, maxGasPrice: new FungibleAssetValue(Currencies.Mead, 0, 0), - actions: new ActionBase[] { action } + actions: new ActionBase[] { action }.ToPlainValues() ); Assert.Null(BlockPolicySource.ValidateNextBlockTxRaw(blockChain, actionTypeLoader, txByAdmin3)); } @@ -434,7 +433,7 @@ List GenerateTransactions(int count) nonce++, adminPrivateKey, genesis.Hash, - new ActionBase[] { } + Array.Empty() )); } @@ -535,7 +534,7 @@ List GenerateTransactions(int count) nonce++, adminPrivateKey, genesis.Hash, - new ActionBase[] { } + Array.Empty() )); } diff --git a/.Lib9c.Tests/StagePolicyTest.cs b/.Lib9c.Tests/StagePolicyTest.cs index 3a27c9edd..54f938f61 100644 --- a/.Lib9c.Tests/StagePolicyTest.cs +++ b/.Lib9c.Tests/StagePolicyTest.cs @@ -5,12 +5,11 @@ namespace Lib9c.Tests using System.Linq; using System.Threading.Tasks; using Lib9c.Tests.TestHelper; - using Libplanet; using Libplanet.Action; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; using Libplanet.Crypto; - using Libplanet.Tx; + using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Blockchain; using Nekoyume.Blockchain.Policy; @@ -41,7 +40,7 @@ public StagePolicyTest() n, acc, default, - new ActionBase[0] + new ActionBase[0].ToPlainValues() ) ) .ToArray() @@ -131,9 +130,9 @@ public void StageSameNonce() { NCStagePolicy stagePolicy = new NCStagePolicy(TimeSpan.FromHours(1), 2); BlockChain chain = MakeChainWithStagePolicy(stagePolicy); - var txA = Transaction.Create(0, _accounts[0], default, new ActionBase[0]); - var txB = Transaction.Create(0, _accounts[0], default, new ActionBase[0]); - var txC = Transaction.Create(0, _accounts[0], default, new ActionBase[0]); + var txA = Transaction.Create(0, _accounts[0], default, new ActionBase[0].ToPlainValues()); + var txB = Transaction.Create(0, _accounts[0], default, new ActionBase[0].ToPlainValues()); + var txC = Transaction.Create(0, _accounts[0], default, new ActionBase[0].ToPlainValues()); stagePolicy.Stage(chain, txA); stagePolicy.Stage(chain, txB); @@ -206,17 +205,17 @@ public void CalculateNextTxNonceCorrectWhenTxOverQuota() long nextTxNonce = chain.GetNextTxNonce(_accounts[0].ToAddress()); Assert.Equal(0, nextTxNonce); - var txA = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0]); + var txA = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0].ToPlainValues()); stagePolicy.Stage(chain, txA); nextTxNonce = chain.GetNextTxNonce(_accounts[0].ToAddress()); Assert.Equal(1, nextTxNonce); - var txB = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0]); + var txB = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0].ToPlainValues()); stagePolicy.Stage(chain, txB); nextTxNonce = chain.GetNextTxNonce(_accounts[0].ToAddress()); Assert.Equal(2, nextTxNonce); - var txC = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0]); + var txC = Transaction.Create(nextTxNonce, _accounts[0], default, new ActionBase[0].ToPlainValues()); stagePolicy.Stage(chain, txC); nextTxNonce = chain.GetNextTxNonce(_accounts[0].ToAddress()); diff --git a/.Lib9c.Tests/TableData/Garages/LoadIntoMyGaragesCostSheetTest.cs b/.Lib9c.Tests/TableData/Garages/LoadIntoMyGaragesCostSheetTest.cs index 4c5280451..f973e1ce0 100644 --- a/.Lib9c.Tests/TableData/Garages/LoadIntoMyGaragesCostSheetTest.cs +++ b/.Lib9c.Tests/TableData/Garages/LoadIntoMyGaragesCostSheetTest.cs @@ -5,8 +5,8 @@ namespace Lib9c.Tests.TableData.Garages using System.Linq; using System.Security.Cryptography; using System.Text; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Common; + using Libplanet.Types.Assets; using Nekoyume.TableData.Garages; using Xunit; diff --git a/.Lib9c.Tests/TableData/GrandFinale/GrandFinaleParticipantsSheetTest.cs b/.Lib9c.Tests/TableData/GrandFinale/GrandFinaleParticipantsSheetTest.cs index 660c2c2de..293533649 100644 --- a/.Lib9c.Tests/TableData/GrandFinale/GrandFinaleParticipantsSheetTest.cs +++ b/.Lib9c.Tests/TableData/GrandFinale/GrandFinaleParticipantsSheetTest.cs @@ -1,7 +1,7 @@ namespace Lib9c.Tests.TableData.GrandFinale { using System; - using Libplanet; + using Libplanet.Crypto; using Nekoyume.TableData.GrandFinale; using Xunit; diff --git a/.Lib9c.Tests/TableData/StakeAchievementRewardSheetTest.cs b/.Lib9c.Tests/TableData/StakeAchievementRewardSheetTest.cs index 2bdb66567..7b7ecec6b 100644 --- a/.Lib9c.Tests/TableData/StakeAchievementRewardSheetTest.cs +++ b/.Lib9c.Tests/TableData/StakeAchievementRewardSheetTest.cs @@ -1,8 +1,7 @@ namespace Lib9c.Tests.TableData { - using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/TableData/StakeActionPointCoefficientSheetTest.cs b/.Lib9c.Tests/TableData/StakeActionPointCoefficientSheetTest.cs index 7d3e48a3a..db15804aa 100644 --- a/.Lib9c.Tests/TableData/StakeActionPointCoefficientSheetTest.cs +++ b/.Lib9c.Tests/TableData/StakeActionPointCoefficientSheetTest.cs @@ -1,8 +1,8 @@ -namespace Lib9c.Tests.TableData +namespace Lib9c.Tests.TableData { using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/TableData/StakeRegularFixedRewardSheetTest.cs b/.Lib9c.Tests/TableData/StakeRegularFixedRewardSheetTest.cs index 5865e674f..d08fc5273 100644 --- a/.Lib9c.Tests/TableData/StakeRegularFixedRewardSheetTest.cs +++ b/.Lib9c.Tests/TableData/StakeRegularFixedRewardSheetTest.cs @@ -1,8 +1,7 @@ namespace Lib9c.Tests.TableData { - using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/TableData/StakeRegularRewardSheetTest.cs b/.Lib9c.Tests/TableData/StakeRegularRewardSheetTest.cs index bd8c0af05..676168478 100644 --- a/.Lib9c.Tests/TableData/StakeRegularRewardSheetTest.cs +++ b/.Lib9c.Tests/TableData/StakeRegularRewardSheetTest.cs @@ -1,8 +1,8 @@ namespace Lib9c.Tests.TableData { using System; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.TableData; using Xunit; diff --git a/.Lib9c.Tests/TestHelper/BlockChainHelper.cs b/.Lib9c.Tests/TestHelper/BlockChainHelper.cs index b43164264..0460d3207 100644 --- a/.Lib9c.Tests/TestHelper/BlockChainHelper.cs +++ b/.Lib9c.Tests/TestHelper/BlockChainHelper.cs @@ -1,4 +1,4 @@ -namespace Lib9c.Tests.TestHelper +namespace Lib9c.Tests.TestHelper { using System; using System.Collections.Generic; @@ -7,15 +7,14 @@ using Lib9c.DevExtensions.Action; using Lib9c.Renderers; using Lib9c.Tests.Action; - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; - using Libplanet.Blocks; using Libplanet.Crypto; using Libplanet.Store; using Libplanet.Store.Trie; + using Libplanet.Types.Assets; + using Libplanet.Types.Blocks; using Nekoyume; using Nekoyume.Action; using Nekoyume.Action.Loader; diff --git a/.Lib9c.Tests/TestHelper/MakeInitialStateResult.cs b/.Lib9c.Tests/TestHelper/MakeInitialStateResult.cs index 088160b4a..2d8e674fd 100644 --- a/.Lib9c.Tests/TestHelper/MakeInitialStateResult.cs +++ b/.Lib9c.Tests/TestHelper/MakeInitialStateResult.cs @@ -1,9 +1,9 @@ -namespace Lib9c.Tests.TestHelper +namespace Lib9c.Tests.TestHelper { using Lib9c.DevExtensions.Action; - using Libplanet; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; using Nekoyume.Model.State; public class MakeInitialStateResult diff --git a/.Lib9c.Tests/Types/BencodexTypesListTest.cs b/.Lib9c.Tests/Types/BencodexTypesListTest.cs index 9502526ef..f5f1c7bc6 100644 --- a/.Lib9c.Tests/Types/BencodexTypesListTest.cs +++ b/.Lib9c.Tests/Types/BencodexTypesListTest.cs @@ -4,7 +4,6 @@ namespace Lib9c.Tests.Types using System.Collections.Immutable; using System.Linq; using Bencodex.Types; - using Libplanet; using Libplanet.Crypto; using Nekoyume.Model.State; using Xunit; diff --git a/.Lib9c.Tests/Util/CraftUtil.cs b/.Lib9c.Tests/Util/CraftUtil.cs index fa242142b..67147821c 100644 --- a/.Lib9c.Tests/Util/CraftUtil.cs +++ b/.Lib9c.Tests/Util/CraftUtil.cs @@ -3,9 +3,9 @@ namespace Lib9c.Tests.Util using System; using System.Collections.Generic; using System.Globalization; - using Libplanet; using Libplanet.Action; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model; diff --git a/.Lib9c.Tests/Util/CurrencyUtil.cs b/.Lib9c.Tests/Util/CurrencyUtil.cs index 1ef366326..e17092418 100644 --- a/.Lib9c.Tests/Util/CurrencyUtil.cs +++ b/.Lib9c.Tests/Util/CurrencyUtil.cs @@ -1,9 +1,9 @@ namespace Lib9c.Tests.Util { - using Libplanet; using Libplanet.Action; - using Libplanet.Assets; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; + using Libplanet.Types.Assets; public static class CurrencyUtil { diff --git a/.Lib9c.Tests/Util/InitializeUtil.cs b/.Lib9c.Tests/Util/InitializeUtil.cs index e2a1499fa..a871ee00e 100644 --- a/.Lib9c.Tests/Util/InitializeUtil.cs +++ b/.Lib9c.Tests/Util/InitializeUtil.cs @@ -3,10 +3,9 @@ namespace Lib9c.Tests.Util using System.Collections.Immutable; using System.IO; using Lib9c.Tests.Action; - using Libplanet; - using Libplanet.Assets; + using Libplanet.Action.State; using Libplanet.Crypto; - using Libplanet.State; + using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/.Lib9c.Tests/Util/QuestUtil.cs b/.Lib9c.Tests/Util/QuestUtil.cs index a214719da..3062f25b2 100644 --- a/.Lib9c.Tests/Util/QuestUtil.cs +++ b/.Lib9c.Tests/Util/QuestUtil.cs @@ -1,7 +1,7 @@ namespace Lib9c.Tests.Util { - using Libplanet; - using Libplanet.State; + using Libplanet.Action.State; + using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.Quest; using Nekoyume.TableData; diff --git a/.Lib9c.Tools/SubCommand/Account.cs b/.Lib9c.Tools/SubCommand/Account.cs index 973ed9bfe..43ff4c5cc 100644 --- a/.Lib9c.Tools/SubCommand/Account.cs +++ b/.Lib9c.Tools/SubCommand/Account.cs @@ -2,15 +2,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Bencodex.Types; using Cocona; using Lib9c.DevExtensions; -using Libplanet; -using Libplanet.Assets; using Libplanet.Blockchain; -using Libplanet.Blocks; +using Libplanet.Crypto; using Libplanet.Store; -using Libplanet.Tx; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Action.Loader; using Nekoyume.Model.State; diff --git a/.Lib9c.Tools/SubCommand/Market.cs b/.Lib9c.Tools/SubCommand/Market.cs index 64d50e745..89b2b7cb0 100644 --- a/.Lib9c.Tools/SubCommand/Market.cs +++ b/.Lib9c.Tools/SubCommand/Market.cs @@ -6,13 +6,13 @@ using Cocona; using Lib9c.DevExtensions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action.Loader; -using Libplanet.Assets; using Libplanet.Blockchain; -using Libplanet.Blocks; +using Libplanet.Crypto; using Libplanet.Store; -using Libplanet.Tx; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Action.Loader; using Nekoyume.Model.Item; diff --git a/.Lib9c.Tools/SubCommand/State.cs b/.Lib9c.Tools/SubCommand/State.cs index 68ae873ad..25ae63536 100644 --- a/.Lib9c.Tools/SubCommand/State.cs +++ b/.Lib9c.Tools/SubCommand/State.cs @@ -11,16 +11,17 @@ using Bencodex.Types; using Cocona; using Lib9c.DevExtensions; -using Libplanet; using Libplanet.Action; using Libplanet.Action.Loader; -using Libplanet.Assets; +using Libplanet.Action.State; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Blocks; -using Libplanet.State; +using Libplanet.Common; +using Libplanet.Crypto; using Libplanet.Store; using Libplanet.Store.Trie; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; using Nekoyume.Action; using Serilog.Core; diff --git a/.Lib9c.Tools/SubCommand/Tx.cs b/.Lib9c.Tools/SubCommand/Tx.cs index 3c2246fc0..39bc2c857 100644 --- a/.Lib9c.Tools/SubCommand/Tx.cs +++ b/.Lib9c.Tools/SubCommand/Tx.cs @@ -2,11 +2,12 @@ using Bencodex.Types; using Cocona; using CsvHelper; -using Libplanet; -using Libplanet.Assets; -using Libplanet.Blocks; +using Libplanet.Action; +using Libplanet.Common; using Libplanet.Crypto; -using Libplanet.Tx; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; @@ -16,7 +17,6 @@ using System.IO; using System.Linq; using System.Numerics; -using Libplanet.Action; using Nekoyume.TableData; namespace Lib9c.Tools.SubCommand @@ -110,7 +110,7 @@ public void Sign( privateKey: new PrivateKey(ByteUtil.ParseHex(privateKey)), genesisHash: (genesisHash is null) ? default : BlockHash.FromString(genesisHash), timestamp: (timestamp is null) ? default : DateTimeOffset.Parse(timestamp), - actions: parsedActions + actions: parsedActions.ToPlainValues() ); byte[] raw = tx.Serialize(); diff --git a/Lib9c.Abstractions/IActivateAccount.cs b/Lib9c.Abstractions/IActivateAccount.cs index 653167f3d..04c41f6e2 100644 --- a/Lib9c.Abstractions/IActivateAccount.cs +++ b/Lib9c.Abstractions/IActivateAccount.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IAddActivatedAccountV1.cs b/Lib9c.Abstractions/IAddActivatedAccountV1.cs index ad386996f..df54a17aa 100644 --- a/Lib9c.Abstractions/IAddActivatedAccountV1.cs +++ b/Lib9c.Abstractions/IAddActivatedAccountV1.cs @@ -1,6 +1,6 @@ #nullable enable -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IBattleArenaV1.cs b/Lib9c.Abstractions/IBattleArenaV1.cs index 125dae6c5..4d27bd05b 100644 --- a/Lib9c.Abstractions/IBattleArenaV1.cs +++ b/Lib9c.Abstractions/IBattleArenaV1.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IBattleGrandFinaleV1.cs b/Lib9c.Abstractions/IBattleGrandFinaleV1.cs index 7547eb643..def985993 100644 --- a/Lib9c.Abstractions/IBattleGrandFinaleV1.cs +++ b/Lib9c.Abstractions/IBattleGrandFinaleV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IBuyMultipleV1.cs b/Lib9c.Abstractions/IBuyMultipleV1.cs index 9f7860470..18b59b1fa 100644 --- a/Lib9c.Abstractions/IBuyMultipleV1.cs +++ b/Lib9c.Abstractions/IBuyMultipleV1.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IBuyV1.cs b/Lib9c.Abstractions/IBuyV1.cs index 3b38ca62e..380e6472b 100644 --- a/Lib9c.Abstractions/IBuyV1.cs +++ b/Lib9c.Abstractions/IBuyV1.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IBuyV2.cs b/Lib9c.Abstractions/IBuyV2.cs index 85f6b457a..159486719 100644 --- a/Lib9c.Abstractions/IBuyV2.cs +++ b/Lib9c.Abstractions/IBuyV2.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IChargeActionPointV1.cs b/Lib9c.Abstractions/IChargeActionPointV1.cs index 2966464ba..cfa6587cd 100644 --- a/Lib9c.Abstractions/IChargeActionPointV1.cs +++ b/Lib9c.Abstractions/IChargeActionPointV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IClaimMonsterCollectionRewardV1.cs b/Lib9c.Abstractions/IClaimMonsterCollectionRewardV1.cs index 99f2d1999..984185a62 100644 --- a/Lib9c.Abstractions/IClaimMonsterCollectionRewardV1.cs +++ b/Lib9c.Abstractions/IClaimMonsterCollectionRewardV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IClaimMonsterCollectionRewardV2.cs b/Lib9c.Abstractions/IClaimMonsterCollectionRewardV2.cs index fd84533dd..e21de9cc9 100644 --- a/Lib9c.Abstractions/IClaimMonsterCollectionRewardV2.cs +++ b/Lib9c.Abstractions/IClaimMonsterCollectionRewardV2.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IClaimRaidRewardV1.cs b/Lib9c.Abstractions/IClaimRaidRewardV1.cs index 0dcf6f10d..e270eed8d 100644 --- a/Lib9c.Abstractions/IClaimRaidRewardV1.cs +++ b/Lib9c.Abstractions/IClaimRaidRewardV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IClaimStakeRewardV1.cs b/Lib9c.Abstractions/IClaimStakeRewardV1.cs index 51a411257..845ef4663 100644 --- a/Lib9c.Abstractions/IClaimStakeRewardV1.cs +++ b/Lib9c.Abstractions/IClaimStakeRewardV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IClaimWordBossKillRewardV1.cs b/Lib9c.Abstractions/IClaimWordBossKillRewardV1.cs index e22f1b59a..9f190b8d6 100644 --- a/Lib9c.Abstractions/IClaimWordBossKillRewardV1.cs +++ b/Lib9c.Abstractions/IClaimWordBossKillRewardV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICombinationConsumableV1.cs b/Lib9c.Abstractions/ICombinationConsumableV1.cs index 3c5b05185..fdb4628a6 100644 --- a/Lib9c.Abstractions/ICombinationConsumableV1.cs +++ b/Lib9c.Abstractions/ICombinationConsumableV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICombinationEquipmentV1.cs b/Lib9c.Abstractions/ICombinationEquipmentV1.cs index d979a527b..daa283a52 100644 --- a/Lib9c.Abstractions/ICombinationEquipmentV1.cs +++ b/Lib9c.Abstractions/ICombinationEquipmentV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICombinationEquipmentV2.cs b/Lib9c.Abstractions/ICombinationEquipmentV2.cs index f6018355a..201dffe34 100644 --- a/Lib9c.Abstractions/ICombinationEquipmentV2.cs +++ b/Lib9c.Abstractions/ICombinationEquipmentV2.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICombinationEquipmentV3.cs b/Lib9c.Abstractions/ICombinationEquipmentV3.cs index 46b0c4645..48e8fa10d 100644 --- a/Lib9c.Abstractions/ICombinationEquipmentV3.cs +++ b/Lib9c.Abstractions/ICombinationEquipmentV3.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICombinationEquipmentV4.cs b/Lib9c.Abstractions/ICombinationEquipmentV4.cs index 44e60dd77..9802e5b64 100644 --- a/Lib9c.Abstractions/ICombinationEquipmentV4.cs +++ b/Lib9c.Abstractions/ICombinationEquipmentV4.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICreateAvatarV1.cs b/Lib9c.Abstractions/ICreateAvatarV1.cs index cf34a0ea7..9c834d62b 100644 --- a/Lib9c.Abstractions/ICreateAvatarV1.cs +++ b/Lib9c.Abstractions/ICreateAvatarV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ICreateAvatarV2.cs b/Lib9c.Abstractions/ICreateAvatarV2.cs index 5c89d447b..9663d2d8c 100644 --- a/Lib9c.Abstractions/ICreateAvatarV2.cs +++ b/Lib9c.Abstractions/ICreateAvatarV2.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IDailyRewardV1.cs b/Lib9c.Abstractions/IDailyRewardV1.cs index 6002d1246..710fd0384 100644 --- a/Lib9c.Abstractions/IDailyRewardV1.cs +++ b/Lib9c.Abstractions/IDailyRewardV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IDeliverToOthersGaragesV1.cs b/Lib9c.Abstractions/IDeliverToOthersGaragesV1.cs index 4c40b6129..967174378 100644 --- a/Lib9c.Abstractions/IDeliverToOthersGaragesV1.cs +++ b/Lib9c.Abstractions/IDeliverToOthersGaragesV1.cs @@ -1,7 +1,8 @@ using System.Linq; using System.Security.Cryptography; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IEventConsumableItemCraftsV1.cs b/Lib9c.Abstractions/IEventConsumableItemCraftsV1.cs index 29f25e8d2..0d2bd5e4b 100644 --- a/Lib9c.Abstractions/IEventConsumableItemCraftsV1.cs +++ b/Lib9c.Abstractions/IEventConsumableItemCraftsV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IEventDungeonBattleV1.cs b/Lib9c.Abstractions/IEventDungeonBattleV1.cs index 72c42b35d..a02728837 100644 --- a/Lib9c.Abstractions/IEventDungeonBattleV1.cs +++ b/Lib9c.Abstractions/IEventDungeonBattleV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IEventDungeonBattleV2.cs b/Lib9c.Abstractions/IEventDungeonBattleV2.cs index 60085aff0..fbf5a0278 100644 --- a/Lib9c.Abstractions/IEventDungeonBattleV2.cs +++ b/Lib9c.Abstractions/IEventDungeonBattleV2.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IEventMaterialItemCraftsV1.cs b/Lib9c.Abstractions/IEventMaterialItemCraftsV1.cs index 0c5ba676f..73a956948 100644 --- a/Lib9c.Abstractions/IEventMaterialItemCraftsV1.cs +++ b/Lib9c.Abstractions/IEventMaterialItemCraftsV1.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IGrindingV1.cs b/Lib9c.Abstractions/IGrindingV1.cs index 88df7e3e7..f6c9eb012 100644 --- a/Lib9c.Abstractions/IGrindingV1.cs +++ b/Lib9c.Abstractions/IGrindingV1.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashRandomBuffV1.cs b/Lib9c.Abstractions/IHackAndSlashRandomBuffV1.cs index be1c82a07..07576c0cd 100644 --- a/Lib9c.Abstractions/IHackAndSlashRandomBuffV1.cs +++ b/Lib9c.Abstractions/IHackAndSlashRandomBuffV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashSweepV1.cs b/Lib9c.Abstractions/IHackAndSlashSweepV1.cs index 656b3cbed..9dcef17f1 100644 --- a/Lib9c.Abstractions/IHackAndSlashSweepV1.cs +++ b/Lib9c.Abstractions/IHackAndSlashSweepV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashSweepV2.cs b/Lib9c.Abstractions/IHackAndSlashSweepV2.cs index caaac34f8..a5b7679b5 100644 --- a/Lib9c.Abstractions/IHackAndSlashSweepV2.cs +++ b/Lib9c.Abstractions/IHackAndSlashSweepV2.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashSweepV3.cs b/Lib9c.Abstractions/IHackAndSlashSweepV3.cs index 9ab09f434..61ebd651b 100644 --- a/Lib9c.Abstractions/IHackAndSlashSweepV3.cs +++ b/Lib9c.Abstractions/IHackAndSlashSweepV3.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV1.cs b/Lib9c.Abstractions/IHackAndSlashV1.cs index 0299415b6..764219b9d 100644 --- a/Lib9c.Abstractions/IHackAndSlashV1.cs +++ b/Lib9c.Abstractions/IHackAndSlashV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV2.cs b/Lib9c.Abstractions/IHackAndSlashV2.cs index ad3837811..85c676bc6 100644 --- a/Lib9c.Abstractions/IHackAndSlashV2.cs +++ b/Lib9c.Abstractions/IHackAndSlashV2.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV3.cs b/Lib9c.Abstractions/IHackAndSlashV3.cs index 2e99aad23..ed73a33c2 100644 --- a/Lib9c.Abstractions/IHackAndSlashV3.cs +++ b/Lib9c.Abstractions/IHackAndSlashV3.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV4.cs b/Lib9c.Abstractions/IHackAndSlashV4.cs index e6f030520..4656cb897 100644 --- a/Lib9c.Abstractions/IHackAndSlashV4.cs +++ b/Lib9c.Abstractions/IHackAndSlashV4.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV5.cs b/Lib9c.Abstractions/IHackAndSlashV5.cs index 2455df968..a2bc1a2fe 100644 --- a/Lib9c.Abstractions/IHackAndSlashV5.cs +++ b/Lib9c.Abstractions/IHackAndSlashV5.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV6.cs b/Lib9c.Abstractions/IHackAndSlashV6.cs index 3ca34ccd9..33b902b93 100644 --- a/Lib9c.Abstractions/IHackAndSlashV6.cs +++ b/Lib9c.Abstractions/IHackAndSlashV6.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV7.cs b/Lib9c.Abstractions/IHackAndSlashV7.cs index a98155d99..837daa9b1 100644 --- a/Lib9c.Abstractions/IHackAndSlashV7.cs +++ b/Lib9c.Abstractions/IHackAndSlashV7.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV8.cs b/Lib9c.Abstractions/IHackAndSlashV8.cs index 955acab89..d207fe4d7 100644 --- a/Lib9c.Abstractions/IHackAndSlashV8.cs +++ b/Lib9c.Abstractions/IHackAndSlashV8.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IHackAndSlashV9.cs b/Lib9c.Abstractions/IHackAndSlashV9.cs index 70c69b139..7ba1bf74f 100644 --- a/Lib9c.Abstractions/IHackAndSlashV9.cs +++ b/Lib9c.Abstractions/IHackAndSlashV9.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IItemEnhancementV1.cs b/Lib9c.Abstractions/IItemEnhancementV1.cs index 358219227..def8e5445 100644 --- a/Lib9c.Abstractions/IItemEnhancementV1.cs +++ b/Lib9c.Abstractions/IItemEnhancementV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IItemEnhancementV2.cs b/Lib9c.Abstractions/IItemEnhancementV2.cs index cd758e87b..b03c08473 100644 --- a/Lib9c.Abstractions/IItemEnhancementV2.cs +++ b/Lib9c.Abstractions/IItemEnhancementV2.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IItemEnhancementV3.cs b/Lib9c.Abstractions/IItemEnhancementV3.cs index dd1ef5d1c..e779073b7 100644 --- a/Lib9c.Abstractions/IItemEnhancementV3.cs +++ b/Lib9c.Abstractions/IItemEnhancementV3.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IJoinArenaV1.cs b/Lib9c.Abstractions/IJoinArenaV1.cs index 3f19e0487..5a83caf83 100644 --- a/Lib9c.Abstractions/IJoinArenaV1.cs +++ b/Lib9c.Abstractions/IJoinArenaV1.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ILoadIntoMyGaragesV1.cs b/Lib9c.Abstractions/ILoadIntoMyGaragesV1.cs index 69cfb4b49..3e327d8d1 100644 --- a/Lib9c.Abstractions/ILoadIntoMyGaragesV1.cs +++ b/Lib9c.Abstractions/ILoadIntoMyGaragesV1.cs @@ -2,8 +2,9 @@ using System.Linq; using System.Security.Cryptography; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMigrateMonsterCollectionV1.cs b/Lib9c.Abstractions/IMigrateMonsterCollectionV1.cs index da5204d4b..ecdab2a10 100644 --- a/Lib9c.Abstractions/IMigrateMonsterCollectionV1.cs +++ b/Lib9c.Abstractions/IMigrateMonsterCollectionV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMimisbrunnrBattleV1.cs b/Lib9c.Abstractions/IMimisbrunnrBattleV1.cs index b0602ffd4..d225ef444 100644 --- a/Lib9c.Abstractions/IMimisbrunnrBattleV1.cs +++ b/Lib9c.Abstractions/IMimisbrunnrBattleV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMimisbrunnrBattleV2.cs b/Lib9c.Abstractions/IMimisbrunnrBattleV2.cs index e5070e35a..485d4de52 100644 --- a/Lib9c.Abstractions/IMimisbrunnrBattleV2.cs +++ b/Lib9c.Abstractions/IMimisbrunnrBattleV2.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMimisbrunnrBattleV3.cs b/Lib9c.Abstractions/IMimisbrunnrBattleV3.cs index 1602936a2..cf5cdac5c 100644 --- a/Lib9c.Abstractions/IMimisbrunnrBattleV3.cs +++ b/Lib9c.Abstractions/IMimisbrunnrBattleV3.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMimisbrunnrBattleV4.cs b/Lib9c.Abstractions/IMimisbrunnrBattleV4.cs index de2a21a16..1b26ec514 100644 --- a/Lib9c.Abstractions/IMimisbrunnrBattleV4.cs +++ b/Lib9c.Abstractions/IMimisbrunnrBattleV4.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IMimisbrunnrBattleV5.cs b/Lib9c.Abstractions/IMimisbrunnrBattleV5.cs index 467a41b40..93ab2cda6 100644 --- a/Lib9c.Abstractions/IMimisbrunnrBattleV5.cs +++ b/Lib9c.Abstractions/IMimisbrunnrBattleV5.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IPrepareRewardAssetsV1.cs b/Lib9c.Abstractions/IPrepareRewardAssetsV1.cs index e211bb46c..84e409390 100644 --- a/Lib9c.Abstractions/IPrepareRewardAssetsV1.cs +++ b/Lib9c.Abstractions/IPrepareRewardAssetsV1.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRaidV1.cs b/Lib9c.Abstractions/IRaidV1.cs index 71423c690..958673374 100644 --- a/Lib9c.Abstractions/IRaidV1.cs +++ b/Lib9c.Abstractions/IRaidV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRaidV2.cs b/Lib9c.Abstractions/IRaidV2.cs index 028da2d27..2688ede50 100644 --- a/Lib9c.Abstractions/IRaidV2.cs +++ b/Lib9c.Abstractions/IRaidV2.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRankingBattleV1.cs b/Lib9c.Abstractions/IRankingBattleV1.cs index 50703fe9d..f8f4c32ec 100644 --- a/Lib9c.Abstractions/IRankingBattleV1.cs +++ b/Lib9c.Abstractions/IRankingBattleV1.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRankingBattleV2.cs b/Lib9c.Abstractions/IRankingBattleV2.cs index 81462c313..713b4cfa6 100644 --- a/Lib9c.Abstractions/IRankingBattleV2.cs +++ b/Lib9c.Abstractions/IRankingBattleV2.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Action { diff --git a/Lib9c.Abstractions/IRapidCombinationV1.cs b/Lib9c.Abstractions/IRapidCombinationV1.cs index 89ba10fc6..4a7a11c4a 100644 --- a/Lib9c.Abstractions/IRapidCombinationV1.cs +++ b/Lib9c.Abstractions/IRapidCombinationV1.cs @@ -1,6 +1,6 @@ #nullable enable -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRedeemCodeV1.cs b/Lib9c.Abstractions/IRedeemCodeV1.cs index b5064c239..641b11326 100644 --- a/Lib9c.Abstractions/IRedeemCodeV1.cs +++ b/Lib9c.Abstractions/IRedeemCodeV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IRuneEnhancementV1.cs b/Lib9c.Abstractions/IRuneEnhancementV1.cs index 86b0f1a5a..7cdcd1f46 100644 --- a/Lib9c.Abstractions/IRuneEnhancementV1.cs +++ b/Lib9c.Abstractions/IRuneEnhancementV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISecureMiningReward.cs b/Lib9c.Abstractions/ISecureMiningReward.cs index ca8ee9299..1c6943e8d 100644 --- a/Lib9c.Abstractions/ISecureMiningReward.cs +++ b/Lib9c.Abstractions/ISecureMiningReward.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISellCancellationV1.cs b/Lib9c.Abstractions/ISellCancellationV1.cs index 32fea824e..7c21ad446 100644 --- a/Lib9c.Abstractions/ISellCancellationV1.cs +++ b/Lib9c.Abstractions/ISellCancellationV1.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISellCancellationV2.cs b/Lib9c.Abstractions/ISellCancellationV2.cs index d330b9199..2002c62f3 100644 --- a/Lib9c.Abstractions/ISellCancellationV2.cs +++ b/Lib9c.Abstractions/ISellCancellationV2.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISellCancellationV3.cs b/Lib9c.Abstractions/ISellCancellationV3.cs index 5d2f2e99f..605bab87e 100644 --- a/Lib9c.Abstractions/ISellCancellationV3.cs +++ b/Lib9c.Abstractions/ISellCancellationV3.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISellV1.cs b/Lib9c.Abstractions/ISellV1.cs index 6545efbc6..f31ac05ae 100644 --- a/Lib9c.Abstractions/ISellV1.cs +++ b/Lib9c.Abstractions/ISellV1.cs @@ -1,7 +1,7 @@ #nullable enable using System; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ISellV2.cs b/Lib9c.Abstractions/ISellV2.cs index cf0c910d5..813c37dc0 100644 --- a/Lib9c.Abstractions/ISellV2.cs +++ b/Lib9c.Abstractions/ISellV2.cs @@ -1,6 +1,6 @@ using System; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ITransferAssetV1.cs b/Lib9c.Abstractions/ITransferAssetV1.cs index 6227d0b43..91357511f 100644 --- a/Lib9c.Abstractions/ITransferAssetV1.cs +++ b/Lib9c.Abstractions/ITransferAssetV1.cs @@ -1,6 +1,6 @@ #nullable enable -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/ITransferAssetsV1.cs b/Lib9c.Abstractions/ITransferAssetsV1.cs index ef441c719..93a117cba 100644 --- a/Lib9c.Abstractions/ITransferAssetsV1.cs +++ b/Lib9c.Abstractions/ITransferAssetsV1.cs @@ -1,7 +1,7 @@ #nullable enable using System.Collections.Generic; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUnloadFromMyGaragesV1.cs b/Lib9c.Abstractions/IUnloadFromMyGaragesV1.cs index 9058a133a..6dab51adb 100644 --- a/Lib9c.Abstractions/IUnloadFromMyGaragesV1.cs +++ b/Lib9c.Abstractions/IUnloadFromMyGaragesV1.cs @@ -2,8 +2,9 @@ using System.Linq; using System.Security.Cryptography; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUnlockEquipmentRecipeV1.cs b/Lib9c.Abstractions/IUnlockEquipmentRecipeV1.cs index 1c18e6d43..7780cac43 100644 --- a/Lib9c.Abstractions/IUnlockEquipmentRecipeV1.cs +++ b/Lib9c.Abstractions/IUnlockEquipmentRecipeV1.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUnlockRuneSlotV1.cs b/Lib9c.Abstractions/IUnlockRuneSlotV1.cs index e53335614..63043d698 100644 --- a/Lib9c.Abstractions/IUnlockRuneSlotV1.cs +++ b/Lib9c.Abstractions/IUnlockRuneSlotV1.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUnlockWorldV1.cs b/Lib9c.Abstractions/IUnlockWorldV1.cs index bc8195947..1239260e5 100644 --- a/Lib9c.Abstractions/IUnlockWorldV1.cs +++ b/Lib9c.Abstractions/IUnlockWorldV1.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUpdateSellV1.cs b/Lib9c.Abstractions/IUpdateSellV1.cs index fddd0361f..eba2bba74 100644 --- a/Lib9c.Abstractions/IUpdateSellV1.cs +++ b/Lib9c.Abstractions/IUpdateSellV1.cs @@ -1,6 +1,6 @@ using System; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Lib9c.Abstractions { diff --git a/Lib9c.Abstractions/IUpdateSellV2.cs b/Lib9c.Abstractions/IUpdateSellV2.cs index db4c961e0..cd32f390b 100644 --- a/Lib9c.Abstractions/IUpdateSellV2.cs +++ b/Lib9c.Abstractions/IUpdateSellV2.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.Abstractions { diff --git a/Lib9c.DevExtensions/Action/Craft/UnlockCraftAction.cs b/Lib9c.DevExtensions/Action/Craft/UnlockCraftAction.cs index f7ec86b7b..34fc2c26d 100644 --- a/Lib9c.DevExtensions/Action/Craft/UnlockCraftAction.cs +++ b/Lib9c.DevExtensions/Action/Craft/UnlockCraftAction.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Exceptions; diff --git a/Lib9c.DevExtensions/Action/Craft/UnlockRecipe.cs b/Lib9c.DevExtensions/Action/Craft/UnlockRecipe.cs index 26bb7d3e1..0595898e0 100644 --- a/Lib9c.DevExtensions/Action/Craft/UnlockRecipe.cs +++ b/Lib9c.DevExtensions/Action/Craft/UnlockRecipe.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c.DevExtensions/Action/CreateArenaDummy.cs b/Lib9c.DevExtensions/Action/CreateArenaDummy.cs index 1220c36b3..e5cc56dda 100644 --- a/Lib9c.DevExtensions/Action/CreateArenaDummy.cs +++ b/Lib9c.DevExtensions/Action/CreateArenaDummy.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.DevExtensions.Model; -using Libplanet; +using Libplanet.Crypto; using Libplanet.Action; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Extensions; using Nekoyume.Model.Arena; diff --git a/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs b/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs index 3f631abaf..90e84332b 100644 --- a/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs +++ b/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs @@ -7,9 +7,10 @@ using System.Text.RegularExpressions; using Bencodex.Types; using Lib9c.DevExtensions.Action.Interface; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Extensions; diff --git a/Lib9c.DevExtensions/Action/CreateTestbed.cs b/Lib9c.DevExtensions/Action/CreateTestbed.cs index b982abec7..982d60a0a 100644 --- a/Lib9c.DevExtensions/Action/CreateTestbed.cs +++ b/Lib9c.DevExtensions/Action/CreateTestbed.cs @@ -7,10 +7,10 @@ using Bencodex.Types; using Lib9c.DevExtensions.Model; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c.DevExtensions/Action/Factory/FaucetFactory.cs b/Lib9c.DevExtensions/Action/Factory/FaucetFactory.cs index dfb2e5aca..316afb062 100644 --- a/Lib9c.DevExtensions/Action/Factory/FaucetFactory.cs +++ b/Lib9c.DevExtensions/Action/Factory/FaucetFactory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Lib9c.DevExtensions.Action.Interface; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Model.Faucet; namespace Lib9c.DevExtensions.Action.Factory diff --git a/Lib9c.DevExtensions/Action/FaucetCurrency.cs b/Lib9c.DevExtensions/Action/FaucetCurrency.cs index eff57dd5b..4282854da 100644 --- a/Lib9c.DevExtensions/Action/FaucetCurrency.cs +++ b/Lib9c.DevExtensions/Action/FaucetCurrency.cs @@ -4,8 +4,9 @@ using Bencodex.Types; using Lib9c.DevExtensions.Action.Interface; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.State; @@ -15,7 +16,7 @@ namespace Lib9c.DevExtensions.Action [ActionType("faucet_currency")] public class FaucetCurrency : GameAction, IFaucetCurrency { - public Libplanet.Address AgentAddress { get; set; } + public Address AgentAddress { get; set; } public int FaucetNcg { get; set; } public int FaucetCrystal { get; set; } diff --git a/Lib9c.DevExtensions/Action/FaucetRune.cs b/Lib9c.DevExtensions/Action/FaucetRune.cs index c70e42625..3c62c6109 100644 --- a/Lib9c.DevExtensions/Action/FaucetRune.cs +++ b/Lib9c.DevExtensions/Action/FaucetRune.cs @@ -5,7 +5,8 @@ using Bencodex.Types; using Lib9c.DevExtensions.Action.Interface; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model.Faucet; @@ -18,7 +19,7 @@ namespace Lib9c.DevExtensions.Action [ActionType("faucet_rune")] public class FaucetRune : GameAction, IFaucetRune { - public Libplanet.Address AvatarAddress { get; set; } + public Address AvatarAddress { get; set; } public List FaucetRuneInfos { get; set; } public override IAccountStateDelta Execute(IActionContext context) diff --git a/Lib9c.DevExtensions/Action/Interface/IFaucetCurrency.cs b/Lib9c.DevExtensions/Action/Interface/IFaucetCurrency.cs index 8aa09c449..c6c2b64d2 100644 --- a/Lib9c.DevExtensions/Action/Interface/IFaucetCurrency.cs +++ b/Lib9c.DevExtensions/Action/Interface/IFaucetCurrency.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Lib9c.DevExtensions.Action.Interface { diff --git a/Lib9c.DevExtensions/Action/Interface/IFaucetRune.cs b/Lib9c.DevExtensions/Action/Interface/IFaucetRune.cs index 78493ec70..4508d1440 100644 --- a/Lib9c.DevExtensions/Action/Interface/IFaucetRune.cs +++ b/Lib9c.DevExtensions/Action/Interface/IFaucetRune.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Model.Faucet; namespace Lib9c.DevExtensions.Action.Interface diff --git a/Lib9c.DevExtensions/Action/ManipulateState.cs b/Lib9c.DevExtensions/Action/ManipulateState.cs index 8c13a3e7b..f56578c11 100644 --- a/Lib9c.DevExtensions/Action/ManipulateState.cs +++ b/Lib9c.DevExtensions/Action/ManipulateState.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c.DevExtensions/Action/Stage/ClearStage.cs b/Lib9c.DevExtensions/Action/Stage/ClearStage.cs index 3111b7655..431b5efd7 100644 --- a/Lib9c.DevExtensions/Action/Stage/ClearStage.cs +++ b/Lib9c.DevExtensions/Action/Stage/ClearStage.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/Lib9c.DevExtensions/TestbedHelper.cs b/Lib9c.DevExtensions/TestbedHelper.cs index 6d20f7630..59989a7c4 100644 --- a/Lib9c.DevExtensions/TestbedHelper.cs +++ b/Lib9c.DevExtensions/TestbedHelper.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Text; -using Libplanet; +using Libplanet.Crypto; using Libplanet.Action; using Nekoyume; using Nekoyume.Action; diff --git a/Lib9c.DevExtensions/Utils.cs b/Lib9c.DevExtensions/Utils.cs index 8024cd0a3..5ea55e02d 100644 --- a/Lib9c.DevExtensions/Utils.cs +++ b/Lib9c.DevExtensions/Utils.cs @@ -9,11 +9,11 @@ using Bencodex; using Cocona; using Lib9c.DevExtensions.Action.Loader; -using Libplanet; +using Libplanet.Crypto; using Libplanet.Action; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Blocks; +using Libplanet.Types.Blocks; using Libplanet.Crypto; using Libplanet.RocksDBStore; using Libplanet.Store; diff --git a/Lib9c.MessagePack/AccountStateDelta.cs b/Lib9c.MessagePack/AccountStateDelta.cs index 79e91262c..0f716a71c 100644 --- a/Lib9c.MessagePack/AccountStateDelta.cs +++ b/Lib9c.MessagePack/AccountStateDelta.cs @@ -5,11 +5,11 @@ using System.Numerics; using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; -using Libplanet.Assets; -using Libplanet.Consensus; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; namespace Lib9c.Formatters { diff --git a/Lib9c.MessagePack/Action/NCActionEvaluation.cs b/Lib9c.MessagePack/Action/NCActionEvaluation.cs index 8e4014352..237275f29 100644 --- a/Lib9c.MessagePack/Action/NCActionEvaluation.cs +++ b/Lib9c.MessagePack/Action/NCActionEvaluation.cs @@ -4,8 +4,8 @@ using Bencodex.Types; using Lib9c.Formatters; using Lib9c.Renderers; -using Libplanet; -using Libplanet.State; +using Libplanet.Crypto; +using Libplanet.Action.State; using MessagePack; namespace Nekoyume.Action diff --git a/Lib9c.MessagePack/Formatters/AccountStateDeltaFormatter.cs b/Lib9c.MessagePack/Formatters/AccountStateDeltaFormatter.cs index d52a82088..cf78a6136 100644 --- a/Lib9c.MessagePack/Formatters/AccountStateDeltaFormatter.cs +++ b/Lib9c.MessagePack/Formatters/AccountStateDeltaFormatter.cs @@ -4,7 +4,7 @@ using System.Linq; using Bencodex; using Bencodex.Types; -using Libplanet.State; +using Libplanet.Action.State; using MessagePack; using MessagePack.Formatters; diff --git a/Lib9c.MessagePack/Formatters/AddressFormatter.cs b/Lib9c.MessagePack/Formatters/AddressFormatter.cs index 1b80247ce..ba40f798c 100644 --- a/Lib9c.MessagePack/Formatters/AddressFormatter.cs +++ b/Lib9c.MessagePack/Formatters/AddressFormatter.cs @@ -1,6 +1,6 @@ using System; using System.Buffers; -using Libplanet; +using Libplanet.Crypto; using MessagePack; using MessagePack.Formatters; diff --git a/Lib9c.MessagePack/Formatters/FungibleAssetValueFormatter.cs b/Lib9c.MessagePack/Formatters/FungibleAssetValueFormatter.cs index cd3570121..f2b0db577 100644 --- a/Lib9c.MessagePack/Formatters/FungibleAssetValueFormatter.cs +++ b/Lib9c.MessagePack/Formatters/FungibleAssetValueFormatter.cs @@ -2,7 +2,7 @@ using System.Buffers; using Bencodex; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using MessagePack; using MessagePack.Formatters; using Nekoyume.Model.State; diff --git a/Lib9c.MessagePack/Formatters/NineChroniclesResolverGetFormatterHelper.cs b/Lib9c.MessagePack/Formatters/NineChroniclesResolverGetFormatterHelper.cs index 461c8d265..bff06adcf 100644 --- a/Lib9c.MessagePack/Formatters/NineChroniclesResolverGetFormatterHelper.cs +++ b/Lib9c.MessagePack/Formatters/NineChroniclesResolverGetFormatterHelper.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Action.State; using Libplanet.Crypto; -using Libplanet.State; +using Libplanet.Types.Assets; using MessagePack.Formatters; using Nekoyume.Action; diff --git a/Lib9c.Policy/NCStagePolicy.cs b/Lib9c.Policy/NCStagePolicy.cs index bd1a39351..7b0c129bc 100644 --- a/Lib9c.Policy/NCStagePolicy.cs +++ b/Lib9c.Policy/NCStagePolicy.cs @@ -5,10 +5,10 @@ namespace Nekoyume.Blockchain using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; - using Libplanet; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; - using Libplanet.Tx; + using Libplanet.Crypto; + using Libplanet.Types.Tx; public class NCStagePolicy : IStagePolicy { diff --git a/Lib9c.Policy/Policy/BlockPolicySource.Utils.cs b/Lib9c.Policy/Policy/BlockPolicySource.Utils.cs index 456b4ac3c..a39e43934 100644 --- a/Lib9c.Policy/Policy/BlockPolicySource.Utils.cs +++ b/Lib9c.Policy/Policy/BlockPolicySource.Utils.cs @@ -5,11 +5,10 @@ using Libplanet.Action; using Libplanet.Action.Loader; using Libplanet.Blockchain; -using Libplanet.Blocks; -using Libplanet.Tx; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Model.State; -using static Libplanet.Blocks.BlockMarshaler; namespace Nekoyume.Blockchain.Policy { diff --git a/Lib9c.Policy/Policy/BlockPolicySource.cs b/Lib9c.Policy/Policy/BlockPolicySource.cs index 698b5d5ca..690233983 100644 --- a/Lib9c.Policy/Policy/BlockPolicySource.cs +++ b/Lib9c.Policy/Policy/BlockPolicySource.cs @@ -7,11 +7,8 @@ using Lib9c.Renderers; using Libplanet.Action; using Libplanet.Action.Loader; -using Libplanet.Blocks; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Tx; -using Libplanet; using Libplanet.Blockchain.Renderers; using Nekoyume.Action; using Nekoyume.Action.Loader; @@ -20,6 +17,9 @@ using Serilog; using Serilog.Events; using Lib9c; +using Libplanet.Crypto; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; #if UNITY_EDITOR || UNITY_STANDALONE using UniRx; diff --git a/Lib9c.Policy/Policy/DebugPolicy.cs b/Lib9c.Policy/Policy/DebugPolicy.cs index 0ef3d96a5..54985c7ae 100644 --- a/Lib9c.Policy/Policy/DebugPolicy.cs +++ b/Lib9c.Policy/Policy/DebugPolicy.cs @@ -1,13 +1,8 @@ -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Security.Cryptography; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Blocks; -using Libplanet.Tx; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using Nekoyume.Action; namespace Nekoyume.Blockchain.Policy diff --git a/Lib9c.Policy/Policy/IVariableSubPolicy.cs b/Lib9c.Policy/Policy/IVariableSubPolicy.cs index 741ede105..7c3f013f5 100644 --- a/Lib9c.Policy/Policy/IVariableSubPolicy.cs +++ b/Lib9c.Policy/Policy/IVariableSubPolicy.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics.Contracts; using System.Collections.Immutable; -using Libplanet.Blocks; +using Libplanet.Types.Blocks; namespace Nekoyume.Blockchain.Policy { diff --git a/Lib9c.Policy/Policy/NCBlockPolicy.cs b/Lib9c.Policy/Policy/NCBlockPolicy.cs index 2a5c53503..cfc2966d9 100644 --- a/Lib9c.Policy/Policy/NCBlockPolicy.cs +++ b/Lib9c.Policy/Policy/NCBlockPolicy.cs @@ -1,8 +1,8 @@ using Libplanet.Action; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Blocks; -using Libplanet.Tx; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; using System; namespace Nekoyume.Blockchain.Policy diff --git a/Lib9c.Policy/Policy/VariableSubPolicy.cs b/Lib9c.Policy/Policy/VariableSubPolicy.cs index aac30633c..7911a53ca 100644 --- a/Lib9c.Policy/Policy/VariableSubPolicy.cs +++ b/Lib9c.Policy/Policy/VariableSubPolicy.cs @@ -4,7 +4,7 @@ using System.Diagnostics.Contracts; using System.Linq; using System.Reflection; -using Libplanet.Blocks; +using Libplanet.Types.Blocks; namespace Nekoyume.Blockchain.Policy { diff --git a/Lib9c.Proposer/CustomActionsDeserializableValidator.cs b/Lib9c.Proposer/CustomActionsDeserializableValidator.cs index f21c87200..c4cc724fc 100644 --- a/Lib9c.Proposer/CustomActionsDeserializableValidator.cs +++ b/Lib9c.Proposer/CustomActionsDeserializableValidator.cs @@ -2,7 +2,7 @@ using System.Linq; using Bencodex.Types; using Libplanet.Action.Loader; -using Libplanet.Tx; +using Libplanet.Types.Tx; namespace Nekoyume.Blockchain { diff --git a/Lib9c.Proposer/Proposer.cs b/Lib9c.Proposer/Proposer.cs index 2839f0407..4d0260572 100644 --- a/Lib9c.Proposer/Proposer.cs +++ b/Lib9c.Proposer/Proposer.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using System.Threading; -using Libplanet; using Libplanet.Action; using Libplanet.Blockchain; -using Libplanet.Blocks; -using Libplanet.Consensus; using Libplanet.Crypto; -using Libplanet.Tx; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; +using Libplanet.Types.Tx; using Serilog; namespace Nekoyume.Blockchain diff --git a/Lib9c.Renderers/ActionEvaluation.cs b/Lib9c.Renderers/ActionEvaluation.cs index d5446d2ea..67592b1ba 100644 --- a/Lib9c.Renderers/ActionEvaluation.cs +++ b/Lib9c.Renderers/ActionEvaluation.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; -using Libplanet.Action; -using Libplanet.State; -using Libplanet.Tx; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Tx; using Nekoyume.Action; namespace Lib9c.Renderers @@ -30,4 +29,4 @@ public struct ActionEvaluation public Dictionary Extra { get; set; } } -} \ No newline at end of file +} diff --git a/Lib9c.Renderers/Renderers/ActionRenderer.cs b/Lib9c.Renderers/Renderers/ActionRenderer.cs index 3ed1949da..93fa914d4 100644 --- a/Lib9c.Renderers/Renderers/ActionRenderer.cs +++ b/Lib9c.Renderers/Renderers/ActionRenderer.cs @@ -1,10 +1,10 @@ using System; -using Libplanet; +using Libplanet.Crypto; using Libplanet.Action; using Libplanet.Action.Loader; using Libplanet.Blockchain.Renderers; -using Libplanet.Blocks; -using Libplanet.State; +using Libplanet.Types.Blocks; +using Libplanet.Action.State; using Nekoyume.Action; using Serilog; using Bencodex.Types; diff --git a/Lib9c.Renderers/Renderers/BlockRenderer.cs b/Lib9c.Renderers/Renderers/BlockRenderer.cs index bc69d149f..7a410f117 100644 --- a/Lib9c.Renderers/Renderers/BlockRenderer.cs +++ b/Lib9c.Renderers/Renderers/BlockRenderer.cs @@ -1,5 +1,5 @@ using Libplanet.Blockchain.Renderers; -using Libplanet.Blocks; +using Libplanet.Types.Blocks; #if UNITY_EDITOR || UNITY_STANDALONE using UniRx; #else diff --git a/Lib9c.Utils/BlockHelper.cs b/Lib9c.Utils/BlockHelper.cs index 11b444ef3..273b363d6 100644 --- a/Lib9c.Utils/BlockHelper.cs +++ b/Lib9c.Utils/BlockHelper.cs @@ -4,17 +4,16 @@ using System.Linq; using System.Numerics; using Bencodex.Types; -using Libplanet; using Libplanet.Action; using Libplanet.Action.Sys; -using Libplanet.Assets; using Libplanet.Blockchain; -using Libplanet.Blocks; -using Libplanet.Consensus; using Libplanet.Crypto; using Libplanet.Store; using Libplanet.Store.Trie; -using Libplanet.Tx; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; +using Libplanet.Types.Tx; using Nekoyume.Action; using Nekoyume.Action.Loader; using Nekoyume.Blockchain.Policy; @@ -108,10 +107,10 @@ public static Block ProposeGenesisBlock( actionEvaluator, transactions: ImmutableList.Empty .Add(Transaction.Create( - 0, privateKey, null, actions)) + 0, privateKey, null, actions.ToPlainValues())) .AddRange(systemActions.Select((sa, index) => Transaction.Create( - index + 1, privateKey, null, new [] { sa }))), + index + 1, privateKey, null, new [] { sa.PlainValue }))), privateKey: privateKey, timestamp: timestamp); } diff --git a/Lib9c.sln b/Lib9c.sln index 2295bc249..01508f9b6 100644 --- a/Lib9c.sln +++ b/Lib9c.sln @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31313.79 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33424.131 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c", "Lib9c\Lib9c.csproj", "{246AD406-4D3E-409B-8F91-D316A8520CFC}" EndProject @@ -27,27 +28,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.DevExtensions", "Lib9c.DevExtensions\Lib9c.DevExtensions.csproj", "{90723E02-D1AD-462F-B285-DA62E030AB3B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.DevExtensions", "Lib9c.DevExtensions\Lib9c.DevExtensions.csproj", "{90723E02-D1AD-462F-B285-DA62E030AB3B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.DevExtensions.Tests", ".Lib9c.DevExtensions.Tests\Lib9c.DevExtensions.Tests.csproj", "{805D6BE8-E2CC-46CB-B503-2A114064432C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.DevExtensions.Tests", ".Lib9c.DevExtensions.Tests\Lib9c.DevExtensions.Tests.csproj", "{805D6BE8-E2CC-46CB-B503-2A114064432C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Net", ".Libplanet\Libplanet.Net\Libplanet.Net.csproj", "{E879E951-62DF-4682-B78D-7E8A7165B58B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Net", ".Libplanet\Libplanet.Net\Libplanet.Net.csproj", "{E879E951-62DF-4682-B78D-7E8A7165B58B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Crypto.Secp256k1", "Libplanet.Crypto.Secp256k1\Libplanet.Crypto.Secp256k1.csproj", "{964DB502-1A12-4979-9A22-E6633AFEA5E8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Crypto.Secp256k1", "Libplanet.Crypto.Secp256k1\Libplanet.Crypto.Secp256k1.csproj", "{964DB502-1A12-4979-9A22-E6633AFEA5E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.MessagePack", "Lib9c.MessagePack\Lib9c.MessagePack.csproj", "{64B1F3F2-B554-4FB1-98A5-24AEBB300056}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.MessagePack", "Lib9c.MessagePack\Lib9c.MessagePack.csproj", "{64B1F3F2-B554-4FB1-98A5-24AEBB300056}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Abstractions", "Lib9c.Abstractions\Lib9c.Abstractions.csproj", "{2D8BB275-57B6-4707-A20F-6836F4EB0EE2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Abstractions", "Lib9c.Abstractions\Lib9c.Abstractions.csproj", "{2D8BB275-57B6-4707-A20F-6836F4EB0EE2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Proposer.Tests", ".Lib9c.Miner.Tests\Lib9c.Proposer.Tests.csproj", "{3DE5BBE5-5F81-4518-B828-C36DAC07F492}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Proposer.Tests", ".Lib9c.Miner.Tests\Lib9c.Proposer.Tests.csproj", "{3DE5BBE5-5F81-4518-B828-C36DAC07F492}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Policy", "Lib9c.Policy\Lib9c.Policy.csproj", "{7DF9FB47-1B56-4F4E-BA98-4F41C4B0CBF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Policy", "Lib9c.Policy\Lib9c.Policy.csproj", "{7DF9FB47-1B56-4F4E-BA98-4F41C4B0CBF8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Renderers", "Lib9c.Renderers\Lib9c.Renderers.csproj", "{321113A4-7CAA-462C-941E-366EBD4668EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Renderers", "Lib9c.Renderers\Lib9c.Renderers.csproj", "{321113A4-7CAA-462C-941E-366EBD4668EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Utils", "Lib9c.Utils\Lib9c.Utils.csproj", "{C1152E56-9CAF-4FF5-A587-DD899A21DEDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Utils", "Lib9c.Utils\Lib9c.Utils.csproj", "{C1152E56-9CAF-4FF5-A587-DD899A21DEDB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.Proposer", "Lib9c.Proposer\Lib9c.Proposer.csproj", "{7DC1D595-095D-462A-864D-0CE57915901A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Proposer", "Lib9c.Proposer\Lib9c.Proposer.csproj", "{7DC1D595-095D-462A-864D-0CE57915901A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Action", ".Libplanet\Libplanet.Action\Libplanet.Action.csproj", "{566832F1-47C7-47AD-8F48-E0EFC40BAF1A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Common", ".Libplanet\Libplanet.Common\Libplanet.Common.csproj", "{55DA19A9-F793-496B-9F53-D0788107BB4C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Crypto", ".Libplanet\Libplanet.Crypto\Libplanet.Crypto.csproj", "{E29043C5-43C9-4EBB-9632-8A80F9F35EE6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Types", ".Libplanet\Libplanet.Types\Libplanet.Types.csproj", "{BB4464CB-B9DD-45E5-9450-38A2922FB178}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Store", ".Libplanet\Libplanet.Store\Libplanet.Store.csproj", "{82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -91,14 +102,14 @@ Global {17AAB5B1-695B-4597-8B36-1DF5012EE686}.Debug|Any CPU.Build.0 = Debug|Any CPU {17AAB5B1-695B-4597-8B36-1DF5012EE686}.Release|Any CPU.ActiveCfg = Release|Any CPU {17AAB5B1-695B-4597-8B36-1DF5012EE686}.Release|Any CPU.Build.0 = Release|Any CPU - {90723E02-D1AD-462F-B285-DA62E030AB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90723E02-D1AD-462F-B285-DA62E030AB3B}.Release|Any CPU.Build.0 = Release|Any CPU {90723E02-D1AD-462F-B285-DA62E030AB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90723E02-D1AD-462F-B285-DA62E030AB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {805D6BE8-E2CC-46CB-B503-2A114064432C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {805D6BE8-E2CC-46CB-B503-2A114064432C}.Release|Any CPU.Build.0 = Release|Any CPU + {90723E02-D1AD-462F-B285-DA62E030AB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90723E02-D1AD-462F-B285-DA62E030AB3B}.Release|Any CPU.Build.0 = Release|Any CPU {805D6BE8-E2CC-46CB-B503-2A114064432C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {805D6BE8-E2CC-46CB-B503-2A114064432C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {805D6BE8-E2CC-46CB-B503-2A114064432C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {805D6BE8-E2CC-46CB-B503-2A114064432C}.Release|Any CPU.Build.0 = Release|Any CPU {E879E951-62DF-4682-B78D-7E8A7165B58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E879E951-62DF-4682-B78D-7E8A7165B58B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E879E951-62DF-4682-B78D-7E8A7165B58B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -135,6 +146,26 @@ Global {7DC1D595-095D-462A-864D-0CE57915901A}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DC1D595-095D-462A-864D-0CE57915901A}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DC1D595-095D-462A-864D-0CE57915901A}.Release|Any CPU.Build.0 = Release|Any CPU + {566832F1-47C7-47AD-8F48-E0EFC40BAF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {566832F1-47C7-47AD-8F48-E0EFC40BAF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {566832F1-47C7-47AD-8F48-E0EFC40BAF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {566832F1-47C7-47AD-8F48-E0EFC40BAF1A}.Release|Any CPU.Build.0 = Release|Any CPU + {55DA19A9-F793-496B-9F53-D0788107BB4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {55DA19A9-F793-496B-9F53-D0788107BB4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {55DA19A9-F793-496B-9F53-D0788107BB4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {55DA19A9-F793-496B-9F53-D0788107BB4C}.Release|Any CPU.Build.0 = Release|Any CPU + {E29043C5-43C9-4EBB-9632-8A80F9F35EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E29043C5-43C9-4EBB-9632-8A80F9F35EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E29043C5-43C9-4EBB-9632-8A80F9F35EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E29043C5-43C9-4EBB-9632-8A80F9F35EE6}.Release|Any CPU.Build.0 = Release|Any CPU + {BB4464CB-B9DD-45E5-9450-38A2922FB178}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB4464CB-B9DD-45E5-9450-38A2922FB178}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB4464CB-B9DD-45E5-9450-38A2922FB178}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB4464CB-B9DD-45E5-9450-38A2922FB178}.Release|Any CPU.Build.0 = Release|Any CPU + {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -145,6 +176,11 @@ Global {659722A9-132F-4B41-87BC-1B56A97A98FA} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} {17AAB5B1-695B-4597-8B36-1DF5012EE686} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} {E879E951-62DF-4682-B78D-7E8A7165B58B} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} + {566832F1-47C7-47AD-8F48-E0EFC40BAF1A} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} + {55DA19A9-F793-496B-9F53-D0788107BB4C} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} + {E29043C5-43C9-4EBB-9632-8A80F9F35EE6} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} + {BB4464CB-B9DD-45E5-9450-38A2922FB178} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} + {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1} = {AFA609F0-8CAE-4494-A4E2-EABD9E95D678} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {547C7D6E-6301-4BB4-AEF7-979CD504D913} diff --git a/Lib9c/Action/AccountStateDeltaExtensions.cs b/Lib9c/Action/AccountStateDeltaExtensions.cs index ccd32472a..32bc30184 100644 --- a/Lib9c/Action/AccountStateDeltaExtensions.cs +++ b/Lib9c/Action/AccountStateDeltaExtensions.cs @@ -5,11 +5,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; -using LruCacheNet; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.Coupons; using Nekoyume.Model.State; diff --git a/Lib9c/Action/AccountStateExtensions.cs b/Lib9c/Action/AccountStateExtensions.cs index 1f552bc85..f0ed86443 100644 --- a/Lib9c/Action/AccountStateExtensions.cs +++ b/Lib9c/Action/AccountStateExtensions.cs @@ -5,10 +5,6 @@ using System.Security.Cryptography; using System.Text; using Bencodex.Types; -using Libplanet; -using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; using LruCacheNet; using Nekoyume.Model.Arena; using Nekoyume.Helper; @@ -17,6 +13,10 @@ using Serilog; using static Lib9c.SerializeKeys; using System.Collections.Immutable; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.Model.Coupons; using Nekoyume.Model.Item; @@ -448,8 +448,8 @@ public static IImmutableDictionary GetCouponWallet(this IAccountSt return ImmutableDictionary.Empty; } - var serializedWallet = (Bencodex.Types.List)serializedValue; - return serializedWallet + var serializedWallet = (Bencodex.Types.List)serializedValue; + return serializedWallet .Select(serializedCoupon => new Coupon(serializedCoupon)) .ToImmutableDictionary(v => v.Id, v => v); } diff --git a/Lib9c/Action/ActionBase.cs b/Lib9c/Action/ActionBase.cs index 488a77a27..17fad2adf 100644 --- a/Lib9c/Action/ActionBase.cs +++ b/Lib9c/Action/ActionBase.cs @@ -1,18 +1,14 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Runtime.Serialization; -using System.Linq; -using System.Numerics; using System.Text; -using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Serilog; using Nekoyume.Model.State; -using Libplanet.Assets; #if UNITY_EDITOR || UNITY_STANDALONE using UniRx; diff --git a/Lib9c/Action/ActionBaseExtensions.cs b/Lib9c/Action/ActionBaseExtensions.cs index 665b81cce..de3495b9d 100644 --- a/Lib9c/Action/ActionBaseExtensions.cs +++ b/Lib9c/Action/ActionBaseExtensions.cs @@ -4,13 +4,14 @@ using System.Numerics; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.Blocks; -using Libplanet.Consensus; -using Libplanet.State; -using Libplanet.Tx; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; +using Libplanet.Types.Tx; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ActionContextExtensions.cs b/Lib9c/Action/ActionContextExtensions.cs index 6d24187e9..b47b79cbb 100644 --- a/Lib9c/Action/ActionContextExtensions.cs +++ b/Lib9c/Action/ActionContextExtensions.cs @@ -1,5 +1,5 @@ -using Libplanet; using Libplanet.Action; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ActivateAccount.cs b/Lib9c/Action/ActivateAccount.cs index 2d372e85c..dcd42fcb4 100644 --- a/Lib9c/Action/ActivateAccount.cs +++ b/Lib9c/Action/ActivateAccount.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/ActivateAccount0.cs b/Lib9c/Action/ActivateAccount0.cs index 43e000634..1b88f6313 100644 --- a/Lib9c/Action/ActivateAccount0.cs +++ b/Lib9c/Action/ActivateAccount0.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/AddActivatedAccount.cs b/Lib9c/Action/AddActivatedAccount.cs index 09ed8386f..063697bea 100644 --- a/Lib9c/Action/AddActivatedAccount.cs +++ b/Lib9c/Action/AddActivatedAccount.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/Lib9c/Action/AddActivatedAccount0.cs b/Lib9c/Action/AddActivatedAccount0.cs index c11cee1e7..ece888951 100644 --- a/Lib9c/Action/AddActivatedAccount0.cs +++ b/Lib9c/Action/AddActivatedAccount0.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/AddRedeemCode.cs b/Lib9c/Action/AddRedeemCode.cs index 5bfba2d87..a2ac953a0 100644 --- a/Lib9c/Action/AddRedeemCode.cs +++ b/Lib9c/Action/AddRedeemCode.cs @@ -3,7 +3,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/AddressExtension.cs b/Lib9c/Action/AddressExtension.cs index eda0dc1e3..65a573da5 100644 --- a/Lib9c/Action/AddressExtension.cs +++ b/Lib9c/Action/AddressExtension.cs @@ -1,6 +1,6 @@ using System.Security.Cryptography; using System.Text; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ApprovePledge.cs b/Lib9c/Action/ApprovePledge.cs index ff9c13ad6..f5793933d 100644 --- a/Lib9c/Action/ApprovePledge.cs +++ b/Lib9c/Action/ApprovePledge.cs @@ -1,8 +1,7 @@ using Bencodex.Types; -using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/AssetInfo.cs b/Lib9c/Action/AssetInfo.cs index bae68f710..f6825b11f 100644 --- a/Lib9c/Action/AssetInfo.cs +++ b/Lib9c/Action/AssetInfo.cs @@ -1,7 +1,6 @@ -using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/BalanceDoesNotExistsException.cs b/Lib9c/Action/BalanceDoesNotExistsException.cs index 4235b5f4d..fa7f9ee68 100644 --- a/Lib9c/Action/BalanceDoesNotExistsException.cs +++ b/Lib9c/Action/BalanceDoesNotExistsException.cs @@ -1,7 +1,7 @@ -using Libplanet; -using Libplanet.Assets; using System; using System.Runtime.Serialization; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Action { diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs index 1099b0956..abe5f6f31 100644 --- a/Lib9c/Action/BattleArena.cs +++ b/Lib9c/Action/BattleArena.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena1.cs b/Lib9c/Action/BattleArena1.cs index 2613ba448..3e725de7b 100644 --- a/Lib9c/Action/BattleArena1.cs +++ b/Lib9c/Action/BattleArena1.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena10.cs b/Lib9c/Action/BattleArena10.cs index 001b9193a..6cc31aa7b 100644 --- a/Lib9c/Action/BattleArena10.cs +++ b/Lib9c/Action/BattleArena10.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena11.cs b/Lib9c/Action/BattleArena11.cs index 04eecb0d8..229c29679 100644 --- a/Lib9c/Action/BattleArena11.cs +++ b/Lib9c/Action/BattleArena11.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena2.cs b/Lib9c/Action/BattleArena2.cs index 805c39313..3e50f46b8 100644 --- a/Lib9c/Action/BattleArena2.cs +++ b/Lib9c/Action/BattleArena2.cs @@ -4,10 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena3.cs b/Lib9c/Action/BattleArena3.cs index 9952575b0..92bec05c8 100644 --- a/Lib9c/Action/BattleArena3.cs +++ b/Lib9c/Action/BattleArena3.cs @@ -4,10 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena4.cs b/Lib9c/Action/BattleArena4.cs index 0eec37451..2fdf87bfd 100644 --- a/Lib9c/Action/BattleArena4.cs +++ b/Lib9c/Action/BattleArena4.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena5.cs b/Lib9c/Action/BattleArena5.cs index 503f9d95c..937a672e2 100644 --- a/Lib9c/Action/BattleArena5.cs +++ b/Lib9c/Action/BattleArena5.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena6.cs b/Lib9c/Action/BattleArena6.cs index 87d828a0e..3e60ce4f4 100644 --- a/Lib9c/Action/BattleArena6.cs +++ b/Lib9c/Action/BattleArena6.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena7.cs b/Lib9c/Action/BattleArena7.cs index 8fa871b38..00340eaca 100644 --- a/Lib9c/Action/BattleArena7.cs +++ b/Lib9c/Action/BattleArena7.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Text; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; @@ -17,7 +16,6 @@ using Nekoyume.Model.BattleStatus.Arena; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; -using Nekoyume.Model.Rune; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/BattleArena8.cs b/Lib9c/Action/BattleArena8.cs index 8b39baa27..e3f81bc6f 100644 --- a/Lib9c/Action/BattleArena8.cs +++ b/Lib9c/Action/BattleArena8.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleArena9.cs b/Lib9c/Action/BattleArena9.cs index 755ed3683..3c3138d85 100644 --- a/Lib9c/Action/BattleArena9.cs +++ b/Lib9c/Action/BattleArena9.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleGrandFinale.cs b/Lib9c/Action/BattleGrandFinale.cs index 9a52dc92e..c177f2154 100644 --- a/Lib9c/Action/BattleGrandFinale.cs +++ b/Lib9c/Action/BattleGrandFinale.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleGrandFinale1.cs b/Lib9c/Action/BattleGrandFinale1.cs index cdae6b209..d1fdebfe0 100644 --- a/Lib9c/Action/BattleGrandFinale1.cs +++ b/Lib9c/Action/BattleGrandFinale1.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/BattleGrandFinale2.cs b/Lib9c/Action/BattleGrandFinale2.cs index 8117ffe6c..97533c137 100644 --- a/Lib9c/Action/BattleGrandFinale2.cs +++ b/Lib9c/Action/BattleGrandFinale2.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Arena; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/Buy.cs b/Lib9c/Action/Buy.cs index 8a7c00292..8f932298c 100644 --- a/Lib9c/Action/Buy.cs +++ b/Lib9c/Action/Buy.cs @@ -6,12 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; -using Nekoyume.Arena; -using Nekoyume.Model.Arena; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Buy0.cs b/Lib9c/Action/Buy0.cs index 8bd941f16..24ff811c6 100644 --- a/Lib9c/Action/Buy0.cs +++ b/Lib9c/Action/Buy0.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy10.cs b/Lib9c/Action/Buy10.cs index 198abb1a0..6fa144f6f 100644 --- a/Lib9c/Action/Buy10.cs +++ b/Lib9c/Action/Buy10.cs @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Buy11.cs b/Lib9c/Action/Buy11.cs index 42237da7d..4d40f07a6 100644 --- a/Lib9c/Action/Buy11.cs +++ b/Lib9c/Action/Buy11.cs @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Buy2.cs b/Lib9c/Action/Buy2.cs index 46f52c6d8..84443e357 100644 --- a/Lib9c/Action/Buy2.cs +++ b/Lib9c/Action/Buy2.cs @@ -2,13 +2,12 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy3.cs b/Lib9c/Action/Buy3.cs index 074e3e969..4bbda4d29 100644 --- a/Lib9c/Action/Buy3.cs +++ b/Lib9c/Action/Buy3.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy4.cs b/Lib9c/Action/Buy4.cs index 7d885188a..87e579d35 100644 --- a/Lib9c/Action/Buy4.cs +++ b/Lib9c/Action/Buy4.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy5.cs b/Lib9c/Action/Buy5.cs index fc9c9d085..58428a046 100644 --- a/Lib9c/Action/Buy5.cs +++ b/Lib9c/Action/Buy5.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy6.cs b/Lib9c/Action/Buy6.cs index d0f7dd0dc..4000559ea 100644 --- a/Lib9c/Action/Buy6.cs +++ b/Lib9c/Action/Buy6.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy7.cs b/Lib9c/Action/Buy7.cs index 582faf1e7..b77e5db77 100644 --- a/Lib9c/Action/Buy7.cs +++ b/Lib9c/Action/Buy7.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy8.cs b/Lib9c/Action/Buy8.cs index 3adce537a..2eec6b38a 100644 --- a/Lib9c/Action/Buy8.cs +++ b/Lib9c/Action/Buy8.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Buy9.cs b/Lib9c/Action/Buy9.cs index ec8821836..1c083eb4d 100644 --- a/Lib9c/Action/Buy9.cs +++ b/Lib9c/Action/Buy9.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/BuyMultiple.cs b/Lib9c/Action/BuyMultiple.cs index 159018633..a53777c2f 100644 --- a/Lib9c/Action/BuyMultiple.cs +++ b/Lib9c/Action/BuyMultiple.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/BuyProduct.cs b/Lib9c/Action/BuyProduct.cs index 872c40897..49ae17586 100644 --- a/Lib9c/Action/BuyProduct.cs +++ b/Lib9c/Action/BuyProduct.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/BuyProduct0.cs b/Lib9c/Action/BuyProduct0.cs index e475b9e7a..a25a043cc 100644 --- a/Lib9c/Action/BuyProduct0.cs +++ b/Lib9c/Action/BuyProduct0.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CancelMonsterCollect.cs b/Lib9c/Action/CancelMonsterCollect.cs index 1b7f0a4e3..3b69f1ef6 100644 --- a/Lib9c/Action/CancelMonsterCollect.cs +++ b/Lib9c/Action/CancelMonsterCollect.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CancelProductRegistration.cs b/Lib9c/Action/CancelProductRegistration.cs index 09eeb2b8b..16cf0baec 100644 --- a/Lib9c/Action/CancelProductRegistration.cs +++ b/Lib9c/Action/CancelProductRegistration.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/ChargeActionPoint.cs b/Lib9c/Action/ChargeActionPoint.cs index 749bdffcb..114a287c2 100644 --- a/Lib9c/Action/ChargeActionPoint.cs +++ b/Lib9c/Action/ChargeActionPoint.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/ChargeActionPoint0.cs b/Lib9c/Action/ChargeActionPoint0.cs index 132332f1f..2803cd215 100644 --- a/Lib9c/Action/ChargeActionPoint0.cs +++ b/Lib9c/Action/ChargeActionPoint0.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/ChargeActionPoint2.cs b/Lib9c/Action/ChargeActionPoint2.cs index f8f5f577e..1ff088cec 100644 --- a/Lib9c/Action/ChargeActionPoint2.cs +++ b/Lib9c/Action/ChargeActionPoint2.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/ClaimMonsterCollectionReward.cs b/Lib9c/Action/ClaimMonsterCollectionReward.cs index 530b51390..38441bc15 100644 --- a/Lib9c/Action/ClaimMonsterCollectionReward.cs +++ b/Lib9c/Action/ClaimMonsterCollectionReward.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimMonsterCollectionReward0.cs b/Lib9c/Action/ClaimMonsterCollectionReward0.cs index 4228db348..52f445b96 100644 --- a/Lib9c/Action/ClaimMonsterCollectionReward0.cs +++ b/Lib9c/Action/ClaimMonsterCollectionReward0.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimMonsterCollectionReward2.cs b/Lib9c/Action/ClaimMonsterCollectionReward2.cs index e99e23d72..7523b52ca 100644 --- a/Lib9c/Action/ClaimMonsterCollectionReward2.cs +++ b/Lib9c/Action/ClaimMonsterCollectionReward2.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimRaidReward.cs b/Lib9c/Action/ClaimRaidReward.cs index 9569e44fc..efebb42bc 100644 --- a/Lib9c/Action/ClaimRaidReward.cs +++ b/Lib9c/Action/ClaimRaidReward.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimStakeReward.cs b/Lib9c/Action/ClaimStakeReward.cs index 6d6e71c97..a3e191359 100644 --- a/Lib9c/Action/ClaimStakeReward.cs +++ b/Lib9c/Action/ClaimStakeReward.cs @@ -4,10 +4,10 @@ using Bencodex.Types; using Lib9c; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/ClaimStakeReward1.cs b/Lib9c/Action/ClaimStakeReward1.cs index 152e6c7f7..20ed67fa9 100644 --- a/Lib9c/Action/ClaimStakeReward1.cs +++ b/Lib9c/Action/ClaimStakeReward1.cs @@ -1,9 +1,9 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimStakeReward2.cs b/Lib9c/Action/ClaimStakeReward2.cs index 414f4f116..7bd8ac2b8 100644 --- a/Lib9c/Action/ClaimStakeReward2.cs +++ b/Lib9c/Action/ClaimStakeReward2.cs @@ -1,9 +1,9 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ClaimStakeReward3.cs b/Lib9c/Action/ClaimStakeReward3.cs index 085056878..b32991500 100644 --- a/Lib9c/Action/ClaimStakeReward3.cs +++ b/Lib9c/Action/ClaimStakeReward3.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; -using Lib9c; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/ClaimStakeReward4.cs b/Lib9c/Action/ClaimStakeReward4.cs index 9709d7a54..f3e121963 100644 --- a/Lib9c/Action/ClaimStakeReward4.cs +++ b/Lib9c/Action/ClaimStakeReward4.cs @@ -4,10 +4,10 @@ using Bencodex.Types; using Lib9c; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/ClaimWordBossKillReward.cs b/Lib9c/Action/ClaimWordBossKillReward.cs index aa22df6b6..195e7077f 100644 --- a/Lib9c/Action/ClaimWordBossKillReward.cs +++ b/Lib9c/Action/ClaimWordBossKillReward.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable.cs b/Lib9c/Action/CombinationConsumable.cs index 58bebc132..5b48fd35b 100644 --- a/Lib9c/Action/CombinationConsumable.cs +++ b/Lib9c/Action/CombinationConsumable.cs @@ -8,9 +8,10 @@ using System.Security.Cryptography; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable0.cs b/Lib9c/Action/CombinationConsumable0.cs index 6fd7c864e..df744f1c0 100644 --- a/Lib9c/Action/CombinationConsumable0.cs +++ b/Lib9c/Action/CombinationConsumable0.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable2.cs b/Lib9c/Action/CombinationConsumable2.cs index 9a266ab45..97a475b1c 100644 --- a/Lib9c/Action/CombinationConsumable2.cs +++ b/Lib9c/Action/CombinationConsumable2.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable3.cs b/Lib9c/Action/CombinationConsumable3.cs index b89dd43ee..a5ebc4067 100644 --- a/Lib9c/Action/CombinationConsumable3.cs +++ b/Lib9c/Action/CombinationConsumable3.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable4.cs b/Lib9c/Action/CombinationConsumable4.cs index 57e23cb41..1ffd36c63 100644 --- a/Lib9c/Action/CombinationConsumable4.cs +++ b/Lib9c/Action/CombinationConsumable4.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable5.cs b/Lib9c/Action/CombinationConsumable5.cs index fd324fd3c..fde6ead38 100644 --- a/Lib9c/Action/CombinationConsumable5.cs +++ b/Lib9c/Action/CombinationConsumable5.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable6.cs b/Lib9c/Action/CombinationConsumable6.cs index 5a7497c77..04f96a42d 100644 --- a/Lib9c/Action/CombinationConsumable6.cs +++ b/Lib9c/Action/CombinationConsumable6.cs @@ -6,9 +6,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationConsumable7.cs b/Lib9c/Action/CombinationConsumable7.cs index 3c4605602..6ce54a881 100644 --- a/Lib9c/Action/CombinationConsumable7.cs +++ b/Lib9c/Action/CombinationConsumable7.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CombinationEquipment.cs b/Lib9c/Action/CombinationEquipment.cs index a3df734da..23dca2852 100644 --- a/Lib9c/Action/CombinationEquipment.cs +++ b/Lib9c/Action/CombinationEquipment.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CombinationEquipment0.cs b/Lib9c/Action/CombinationEquipment0.cs index c55950f4f..39cf09631 100644 --- a/Lib9c/Action/CombinationEquipment0.cs +++ b/Lib9c/Action/CombinationEquipment0.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment10.cs b/Lib9c/Action/CombinationEquipment10.cs index 36fc5e8e6..6e39365ad 100644 --- a/Lib9c/Action/CombinationEquipment10.cs +++ b/Lib9c/Action/CombinationEquipment10.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.Stat; diff --git a/Lib9c/Action/CombinationEquipment11.cs b/Lib9c/Action/CombinationEquipment11.cs index 2443490c8..6fa7a039a 100644 --- a/Lib9c/Action/CombinationEquipment11.cs +++ b/Lib9c/Action/CombinationEquipment11.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.Stat; diff --git a/Lib9c/Action/CombinationEquipment12.cs b/Lib9c/Action/CombinationEquipment12.cs index b2e89b426..347d970ba 100644 --- a/Lib9c/Action/CombinationEquipment12.cs +++ b/Lib9c/Action/CombinationEquipment12.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CombinationEquipment13.cs b/Lib9c/Action/CombinationEquipment13.cs index d9b7206cf..b9e311010 100644 --- a/Lib9c/Action/CombinationEquipment13.cs +++ b/Lib9c/Action/CombinationEquipment13.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CombinationEquipment14.cs b/Lib9c/Action/CombinationEquipment14.cs index a01868f40..4c7624b9c 100644 --- a/Lib9c/Action/CombinationEquipment14.cs +++ b/Lib9c/Action/CombinationEquipment14.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CombinationEquipment15.cs b/Lib9c/Action/CombinationEquipment15.cs index e2de556e0..75e9efcd7 100644 --- a/Lib9c/Action/CombinationEquipment15.cs +++ b/Lib9c/Action/CombinationEquipment15.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/CombinationEquipment2.cs b/Lib9c/Action/CombinationEquipment2.cs index d71e44e50..6db709174 100644 --- a/Lib9c/Action/CombinationEquipment2.cs +++ b/Lib9c/Action/CombinationEquipment2.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment3.cs b/Lib9c/Action/CombinationEquipment3.cs index c4e07efea..a64392666 100644 --- a/Lib9c/Action/CombinationEquipment3.cs +++ b/Lib9c/Action/CombinationEquipment3.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment4.cs b/Lib9c/Action/CombinationEquipment4.cs index 58770128b..404af7726 100644 --- a/Lib9c/Action/CombinationEquipment4.cs +++ b/Lib9c/Action/CombinationEquipment4.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment5.cs b/Lib9c/Action/CombinationEquipment5.cs index de1ed1a9b..481d89c94 100644 --- a/Lib9c/Action/CombinationEquipment5.cs +++ b/Lib9c/Action/CombinationEquipment5.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment6.cs b/Lib9c/Action/CombinationEquipment6.cs index 32338c86a..1d9eb7663 100644 --- a/Lib9c/Action/CombinationEquipment6.cs +++ b/Lib9c/Action/CombinationEquipment6.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/CombinationEquipment7.cs b/Lib9c/Action/CombinationEquipment7.cs index 1e484cb75..7e3baacf3 100644 --- a/Lib9c/Action/CombinationEquipment7.cs +++ b/Lib9c/Action/CombinationEquipment7.cs @@ -6,10 +6,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.Skill; diff --git a/Lib9c/Action/CombinationEquipment8.cs b/Lib9c/Action/CombinationEquipment8.cs index b505a354a..d95c2a186 100644 --- a/Lib9c/Action/CombinationEquipment8.cs +++ b/Lib9c/Action/CombinationEquipment8.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.Stat; diff --git a/Lib9c/Action/CombinationEquipment9.cs b/Lib9c/Action/CombinationEquipment9.cs index 5c9b92953..7daeb0493 100644 --- a/Lib9c/Action/CombinationEquipment9.cs +++ b/Lib9c/Action/CombinationEquipment9.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.Stat; diff --git a/Lib9c/Action/Coupons/IssueCoupons.cs b/Lib9c/Action/Coupons/IssueCoupons.cs index 85bc51ecf..c5bea21a1 100644 --- a/Lib9c/Action/Coupons/IssueCoupons.cs +++ b/Lib9c/Action/Coupons/IssueCoupons.cs @@ -2,9 +2,9 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Coupons; namespace Nekoyume.Action.Coupons diff --git a/Lib9c/Action/Coupons/RedeemCoupon.cs b/Lib9c/Action/Coupons/RedeemCoupon.cs index 9a6d36280..81605fc36 100644 --- a/Lib9c/Action/Coupons/RedeemCoupon.cs +++ b/Lib9c/Action/Coupons/RedeemCoupon.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Coupons; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Coupons/TransferCoupons.cs b/Lib9c/Action/Coupons/TransferCoupons.cs index d09459f55..c32fead38 100644 --- a/Lib9c/Action/Coupons/TransferCoupons.cs +++ b/Lib9c/Action/Coupons/TransferCoupons.cs @@ -2,9 +2,9 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; namespace Nekoyume.Action.Coupons { diff --git a/Lib9c/Action/CreateAvatar.cs b/Lib9c/Action/CreateAvatar.cs index f2a2a9f54..5d951a34e 100644 --- a/Lib9c/Action/CreateAvatar.cs +++ b/Lib9c/Action/CreateAvatar.cs @@ -8,7 +8,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Helper; using Nekoyume.Model.Item; using Nekoyume.Model.Skill; diff --git a/Lib9c/Action/CreateAvatar0.cs b/Lib9c/Action/CreateAvatar0.cs index cdea38577..2d29a2bd0 100644 --- a/Lib9c/Action/CreateAvatar0.cs +++ b/Lib9c/Action/CreateAvatar0.cs @@ -8,9 +8,10 @@ using System.Text.RegularExpressions; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Stat; using Nekoyume.Model.State; diff --git a/Lib9c/Action/CreateAvatar2.cs b/Lib9c/Action/CreateAvatar2.cs index ff0c350d9..b1d134044 100644 --- a/Lib9c/Action/CreateAvatar2.cs +++ b/Lib9c/Action/CreateAvatar2.cs @@ -8,9 +8,10 @@ using System.Text.RegularExpressions; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/CreateAvatar3.cs b/Lib9c/Action/CreateAvatar3.cs index 37f1a2317..e1b2193fc 100644 --- a/Lib9c/Action/CreateAvatar3.cs +++ b/Lib9c/Action/CreateAvatar3.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CreateAvatar4.cs b/Lib9c/Action/CreateAvatar4.cs index f8503ed56..81dd74053 100644 --- a/Lib9c/Action/CreateAvatar4.cs +++ b/Lib9c/Action/CreateAvatar4.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CreateAvatar5.cs b/Lib9c/Action/CreateAvatar5.cs index db63d197d..e72519999 100644 --- a/Lib9c/Action/CreateAvatar5.cs +++ b/Lib9c/Action/CreateAvatar5.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CreateAvatar6.cs b/Lib9c/Action/CreateAvatar6.cs index 485f2e75e..ff34a5e5e 100644 --- a/Lib9c/Action/CreateAvatar6.cs +++ b/Lib9c/Action/CreateAvatar6.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CreateAvatar7.cs b/Lib9c/Action/CreateAvatar7.cs index 18160c5cb..12fecd092 100644 --- a/Lib9c/Action/CreateAvatar7.cs +++ b/Lib9c/Action/CreateAvatar7.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/CreateAvatar8.cs b/Lib9c/Action/CreateAvatar8.cs index 75c06c215..aaca20541 100644 --- a/Lib9c/Action/CreateAvatar8.cs +++ b/Lib9c/Action/CreateAvatar8.cs @@ -8,7 +8,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Helper; using Nekoyume.Model.Item; using Nekoyume.Model.Skill; diff --git a/Lib9c/Action/CreatePendingActivation.cs b/Lib9c/Action/CreatePendingActivation.cs index c6f17bfe4..24131de73 100644 --- a/Lib9c/Action/CreatePendingActivation.cs +++ b/Lib9c/Action/CreatePendingActivation.cs @@ -3,7 +3,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/CreatePendingActivations.cs b/Lib9c/Action/CreatePendingActivations.cs index cda42a5e9..a3bd7c29f 100644 --- a/Lib9c/Action/CreatePendingActivations.cs +++ b/Lib9c/Action/CreatePendingActivations.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/CreatePledge.cs b/Lib9c/Action/CreatePledge.cs index b96ab2bf8..956ac2c53 100644 --- a/Lib9c/Action/CreatePledge.cs +++ b/Lib9c/Action/CreatePledge.cs @@ -2,9 +2,10 @@ using System.Linq; using Bencodex.Types; using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/DailyReward.cs b/Lib9c/Action/DailyReward.cs index 03047d375..08b7a3ae1 100644 --- a/Lib9c/Action/DailyReward.cs +++ b/Lib9c/Action/DailyReward.cs @@ -4,9 +4,10 @@ using System.Text; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/DailyReward0.cs b/Lib9c/Action/DailyReward0.cs index 759c60679..73367be4d 100644 --- a/Lib9c/Action/DailyReward0.cs +++ b/Lib9c/Action/DailyReward0.cs @@ -3,9 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/DailyReward2.cs b/Lib9c/Action/DailyReward2.cs index ab4e3ce43..79d1f7a4d 100644 --- a/Lib9c/Action/DailyReward2.cs +++ b/Lib9c/Action/DailyReward2.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/DailyReward3.cs b/Lib9c/Action/DailyReward3.cs index 09f754024..a039c5f91 100644 --- a/Lib9c/Action/DailyReward3.cs +++ b/Lib9c/Action/DailyReward3.cs @@ -3,9 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/DailyReward4.cs b/Lib9c/Action/DailyReward4.cs index 9fa054189..5723486a1 100644 --- a/Lib9c/Action/DailyReward4.cs +++ b/Lib9c/Action/DailyReward4.cs @@ -3,9 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/DailyReward5.cs b/Lib9c/Action/DailyReward5.cs index fa9ba9599..22f674c3a 100644 --- a/Lib9c/Action/DailyReward5.cs +++ b/Lib9c/Action/DailyReward5.cs @@ -4,9 +4,10 @@ using System.Text; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/DailyReward6.cs b/Lib9c/Action/DailyReward6.cs index ff0538496..d07d986fe 100644 --- a/Lib9c/Action/DailyReward6.cs +++ b/Lib9c/Action/DailyReward6.cs @@ -4,9 +4,10 @@ using System.Text; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/EndPledge.cs b/Lib9c/Action/EndPledge.cs index 09fa7916b..a3af17a72 100644 --- a/Lib9c/Action/EndPledge.cs +++ b/Lib9c/Action/EndPledge.cs @@ -1,8 +1,9 @@ using Bencodex.Types; using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/EventConsumableItemCrafts.cs b/Lib9c/Action/EventConsumableItemCrafts.cs index 67ddb3104..cfd2c2d1c 100644 --- a/Lib9c/Action/EventConsumableItemCrafts.cs +++ b/Lib9c/Action/EventConsumableItemCrafts.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/EventDungeonBattle.cs b/Lib9c/Action/EventDungeonBattle.cs index e2767e970..a740738c8 100644 --- a/Lib9c/Action/EventDungeonBattle.cs +++ b/Lib9c/Action/EventDungeonBattle.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/EventDungeonBattleV1.cs b/Lib9c/Action/EventDungeonBattleV1.cs index 9b6beb37a..db093108f 100644 --- a/Lib9c/Action/EventDungeonBattleV1.cs +++ b/Lib9c/Action/EventDungeonBattleV1.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/EventDungeonBattleV2.cs b/Lib9c/Action/EventDungeonBattleV2.cs index d31e847ae..4bc258bba 100644 --- a/Lib9c/Action/EventDungeonBattleV2.cs +++ b/Lib9c/Action/EventDungeonBattleV2.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/EventDungeonBattleV3.cs b/Lib9c/Action/EventDungeonBattleV3.cs index 4ddab87bb..47e72fc95 100644 --- a/Lib9c/Action/EventDungeonBattleV3.cs +++ b/Lib9c/Action/EventDungeonBattleV3.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/EventDungeonBattleV4.cs b/Lib9c/Action/EventDungeonBattleV4.cs index ea86b777c..f70986581 100644 --- a/Lib9c/Action/EventDungeonBattleV4.cs +++ b/Lib9c/Action/EventDungeonBattleV4.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Exceptions; using Nekoyume.Extensions; diff --git a/Lib9c/Action/EventMaterialItemCrafts.cs b/Lib9c/Action/EventMaterialItemCrafts.cs index 11d186c79..793ce61a8 100644 --- a/Lib9c/Action/EventMaterialItemCrafts.cs +++ b/Lib9c/Action/EventMaterialItemCrafts.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs b/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs index de7b67a4e..ad15a4ed5 100644 --- a/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs +++ b/Lib9c/Action/Factory/ClaimStakeRewardFactory.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action.Factory { diff --git a/Lib9c/Action/FailedLoadStateException.cs b/Lib9c/Action/FailedLoadStateException.cs index 4b09cea74..156969d0b 100644 --- a/Lib9c/Action/FailedLoadStateException.cs +++ b/Lib9c/Action/FailedLoadStateException.cs @@ -1,6 +1,6 @@ using System; using System.Runtime.Serialization; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/FavProductInfo.cs b/Lib9c/Action/FavProductInfo.cs index 4ec0bea6e..a5cdeeb3b 100644 --- a/Lib9c/Action/FavProductInfo.cs +++ b/Lib9c/Action/FavProductInfo.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Garages/DeliverToOthersGarages.cs b/Lib9c/Action/Garages/DeliverToOthersGarages.cs index 41db85b57..5e8d3d453 100644 --- a/Lib9c/Action/Garages/DeliverToOthersGarages.cs +++ b/Lib9c/Action/Garages/DeliverToOthersGarages.cs @@ -6,10 +6,11 @@ using System.Security.Cryptography; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.Model.Garages; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Garages/GarageUtils.cs b/Lib9c/Action/Garages/GarageUtils.cs index 94625227e..75ae92351 100644 --- a/Lib9c/Action/Garages/GarageUtils.cs +++ b/Lib9c/Action/Garages/GarageUtils.cs @@ -5,9 +5,10 @@ using System.Linq; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.Model.Garages; diff --git a/Lib9c/Action/Garages/LoadIntoMyGarages.cs b/Lib9c/Action/Garages/LoadIntoMyGarages.cs index 978f7770c..b212ed574 100644 --- a/Lib9c/Action/Garages/LoadIntoMyGarages.cs +++ b/Lib9c/Action/Garages/LoadIntoMyGarages.cs @@ -7,10 +7,11 @@ using System.Security.Cryptography; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.Model.Garages; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/Garages/UnloadFromMyGarages.cs b/Lib9c/Action/Garages/UnloadFromMyGarages.cs index eba0354a3..493e77c12 100644 --- a/Lib9c/Action/Garages/UnloadFromMyGarages.cs +++ b/Lib9c/Action/Garages/UnloadFromMyGarages.cs @@ -8,10 +8,11 @@ using Bencodex.Types; using Lib9c; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; diff --git a/Lib9c/Action/GoldDistribution.cs b/Lib9c/Action/GoldDistribution.cs index f3edcc7fa..5936a622a 100644 --- a/Lib9c/Action/GoldDistribution.cs +++ b/Lib9c/Action/GoldDistribution.cs @@ -7,7 +7,7 @@ using Bencodex.Types; using CsvHelper; using CsvHelper.Configuration.Attributes; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/Grinding.cs b/Lib9c/Action/Grinding.cs index 9c9f33d2c..81ba6735a 100644 --- a/Lib9c/Action/Grinding.cs +++ b/Lib9c/Action/Grinding.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/HackAndSlash.cs b/Lib9c/Action/HackAndSlash.cs index 926ee68fc..8689b6f24 100644 --- a/Lib9c/Action/HackAndSlash.cs +++ b/Lib9c/Action/HackAndSlash.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash0.cs b/Lib9c/Action/HackAndSlash0.cs index cde593cbf..13eaa4c49 100644 --- a/Lib9c/Action/HackAndSlash0.cs +++ b/Lib9c/Action/HackAndSlash0.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model; using Nekoyume.Model.BattleStatus; diff --git a/Lib9c/Action/HackAndSlash10.cs b/Lib9c/Action/HackAndSlash10.cs index b12ceb325..853895efc 100644 --- a/Lib9c/Action/HackAndSlash10.cs +++ b/Lib9c/Action/HackAndSlash10.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash11.cs b/Lib9c/Action/HackAndSlash11.cs index 55e27be66..5649d653a 100644 --- a/Lib9c/Action/HackAndSlash11.cs +++ b/Lib9c/Action/HackAndSlash11.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/HackAndSlash12.cs b/Lib9c/Action/HackAndSlash12.cs index 591537e36..61cadd734 100644 --- a/Lib9c/Action/HackAndSlash12.cs +++ b/Lib9c/Action/HackAndSlash12.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash13.cs b/Lib9c/Action/HackAndSlash13.cs index 5e7b2b029..044e8e421 100644 --- a/Lib9c/Action/HackAndSlash13.cs +++ b/Lib9c/Action/HackAndSlash13.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash14.cs b/Lib9c/Action/HackAndSlash14.cs index 829a1a1ff..6216e5efe 100644 --- a/Lib9c/Action/HackAndSlash14.cs +++ b/Lib9c/Action/HackAndSlash14.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash15.cs b/Lib9c/Action/HackAndSlash15.cs index d44b71fc0..85ff5463e 100644 --- a/Lib9c/Action/HackAndSlash15.cs +++ b/Lib9c/Action/HackAndSlash15.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash16.cs b/Lib9c/Action/HackAndSlash16.cs index ac19df8ba..06b46a021 100644 --- a/Lib9c/Action/HackAndSlash16.cs +++ b/Lib9c/Action/HackAndSlash16.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash17.cs b/Lib9c/Action/HackAndSlash17.cs index 6ccede443..bd4a61c71 100644 --- a/Lib9c/Action/HackAndSlash17.cs +++ b/Lib9c/Action/HackAndSlash17.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash18.cs b/Lib9c/Action/HackAndSlash18.cs index 21e01ebda..dbabaa1fa 100644 --- a/Lib9c/Action/HackAndSlash18.cs +++ b/Lib9c/Action/HackAndSlash18.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash19.cs b/Lib9c/Action/HackAndSlash19.cs index 0e249ca10..287029fed 100644 --- a/Lib9c/Action/HackAndSlash19.cs +++ b/Lib9c/Action/HackAndSlash19.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlash2.cs b/Lib9c/Action/HackAndSlash2.cs index ec0e113d1..14eb19277 100644 --- a/Lib9c/Action/HackAndSlash2.cs +++ b/Lib9c/Action/HackAndSlash2.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash20.cs b/Lib9c/Action/HackAndSlash20.cs index 095aac8d7..32ed1addb 100644 --- a/Lib9c/Action/HackAndSlash20.cs +++ b/Lib9c/Action/HackAndSlash20.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/HackAndSlash3.cs b/Lib9c/Action/HackAndSlash3.cs index 4d390fdee..8c669ba88 100644 --- a/Lib9c/Action/HackAndSlash3.cs +++ b/Lib9c/Action/HackAndSlash3.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash4.cs b/Lib9c/Action/HackAndSlash4.cs index e83493dd1..da49d3233 100644 --- a/Lib9c/Action/HackAndSlash4.cs +++ b/Lib9c/Action/HackAndSlash4.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash5.cs b/Lib9c/Action/HackAndSlash5.cs index c6a7b7023..01e03b9b4 100644 --- a/Lib9c/Action/HackAndSlash5.cs +++ b/Lib9c/Action/HackAndSlash5.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash6.cs b/Lib9c/Action/HackAndSlash6.cs index e0b812d38..228cbc75e 100644 --- a/Lib9c/Action/HackAndSlash6.cs +++ b/Lib9c/Action/HackAndSlash6.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash7.cs b/Lib9c/Action/HackAndSlash7.cs index e6ac1415a..ce36c8ddd 100644 --- a/Lib9c/Action/HackAndSlash7.cs +++ b/Lib9c/Action/HackAndSlash7.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash8.cs b/Lib9c/Action/HackAndSlash8.cs index 7489fb171..dbf4e617f 100644 --- a/Lib9c/Action/HackAndSlash8.cs +++ b/Lib9c/Action/HackAndSlash8.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlash9.cs b/Lib9c/Action/HackAndSlash9.cs index ad15f839f..6f9719fd4 100644 --- a/Lib9c/Action/HackAndSlash9.cs +++ b/Lib9c/Action/HackAndSlash9.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlashRandomBuff.cs b/Lib9c/Action/HackAndSlashRandomBuff.cs index 307c409fb..9a942f7cf 100644 --- a/Lib9c/Action/HackAndSlashRandomBuff.cs +++ b/Lib9c/Action/HackAndSlashRandomBuff.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Helper; using Nekoyume.Model.State; diff --git a/Lib9c/Action/HackAndSlashSweep.cs b/Lib9c/Action/HackAndSlashSweep.cs index 77cf460e1..246d34f7e 100644 --- a/Lib9c/Action/HackAndSlashSweep.cs +++ b/Lib9c/Action/HackAndSlashSweep.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep1.cs b/Lib9c/Action/HackAndSlashSweep1.cs index c7a59d675..b3f547421 100644 --- a/Lib9c/Action/HackAndSlashSweep1.cs +++ b/Lib9c/Action/HackAndSlashSweep1.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep2.cs b/Lib9c/Action/HackAndSlashSweep2.cs index b95b3d6fb..c6eaae9ef 100644 --- a/Lib9c/Action/HackAndSlashSweep2.cs +++ b/Lib9c/Action/HackAndSlashSweep2.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep3.cs b/Lib9c/Action/HackAndSlashSweep3.cs index 566ac9bdc..b487b0516 100644 --- a/Lib9c/Action/HackAndSlashSweep3.cs +++ b/Lib9c/Action/HackAndSlashSweep3.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep4.cs b/Lib9c/Action/HackAndSlashSweep4.cs index e0450739c..3e30874ef 100644 --- a/Lib9c/Action/HackAndSlashSweep4.cs +++ b/Lib9c/Action/HackAndSlashSweep4.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep5.cs b/Lib9c/Action/HackAndSlashSweep5.cs index 1619de661..b01b32301 100644 --- a/Lib9c/Action/HackAndSlashSweep5.cs +++ b/Lib9c/Action/HackAndSlashSweep5.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep6.cs b/Lib9c/Action/HackAndSlashSweep6.cs index b3191f9d0..8719f354c 100644 --- a/Lib9c/Action/HackAndSlashSweep6.cs +++ b/Lib9c/Action/HackAndSlashSweep6.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep7.cs b/Lib9c/Action/HackAndSlashSweep7.cs index e90319c36..f7b2914e2 100644 --- a/Lib9c/Action/HackAndSlashSweep7.cs +++ b/Lib9c/Action/HackAndSlashSweep7.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/HackAndSlashSweep8.cs b/Lib9c/Action/HackAndSlashSweep8.cs index 92c6b6fa6..d5f33babd 100644 --- a/Lib9c/Action/HackAndSlashSweep8.cs +++ b/Lib9c/Action/HackAndSlashSweep8.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/IBuy0.cs b/Lib9c/Action/IBuy0.cs index 72028340f..291430df5 100644 --- a/Lib9c/Action/IBuy0.cs +++ b/Lib9c/Action/IBuy0.cs @@ -1,6 +1,6 @@ using System; -using Libplanet; using Libplanet.Action; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/IBuy5.cs b/Lib9c/Action/IBuy5.cs index db6677d49..b60e28372 100644 --- a/Lib9c/Action/IBuy5.cs +++ b/Lib9c/Action/IBuy5.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Libplanet; using Libplanet.Action; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/IHackAndSlashV10.cs b/Lib9c/Action/IHackAndSlashV10.cs index b64351a59..a6c185e3d 100644 --- a/Lib9c/Action/IHackAndSlashV10.cs +++ b/Lib9c/Action/IHackAndSlashV10.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/IProductInfo.cs b/Lib9c/Action/IProductInfo.cs index cd18c993f..36fce2b24 100644 --- a/Lib9c/Action/IProductInfo.cs +++ b/Lib9c/Action/IProductInfo.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Market; namespace Nekoyume.Action diff --git a/Lib9c/Action/IPurchaseInfo.cs b/Lib9c/Action/IPurchaseInfo.cs index de46ad16d..09c167b8f 100644 --- a/Lib9c/Action/IPurchaseInfo.cs +++ b/Lib9c/Action/IPurchaseInfo.cs @@ -1,6 +1,6 @@ using System; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; namespace Nekoyume.Action diff --git a/Lib9c/Action/IRegisterInfo.cs b/Lib9c/Action/IRegisterInfo.cs index 9fc1b103b..5765173da 100644 --- a/Lib9c/Action/IRegisterInfo.cs +++ b/Lib9c/Action/IRegisterInfo.cs @@ -1,6 +1,6 @@ using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Market; namespace Nekoyume.Action diff --git a/Lib9c/Action/ITransferAsset.cs b/Lib9c/Action/ITransferAsset.cs index a56279457..13f9b9a75 100644 --- a/Lib9c/Action/ITransferAsset.cs +++ b/Lib9c/Action/ITransferAsset.cs @@ -1,6 +1,6 @@ #nullable enable -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ITransferAssets.cs b/Lib9c/Action/ITransferAssets.cs index 799229bf7..33d708f46 100644 --- a/Lib9c/Action/ITransferAssets.cs +++ b/Lib9c/Action/ITransferAssets.cs @@ -1,7 +1,7 @@ #nullable enable using System.Collections.Generic; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Action { diff --git a/Lib9c/Action/InitializeStates.cs b/Lib9c/Action/InitializeStates.cs index e2cadd889..53b75696d 100644 --- a/Lib9c/Action/InitializeStates.cs +++ b/Lib9c/Action/InitializeStates.cs @@ -5,7 +5,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/InvalidTransferMinterException.cs b/Lib9c/Action/InvalidTransferMinterException.cs index eafe35c13..abba2881d 100644 --- a/Lib9c/Action/InvalidTransferMinterException.cs +++ b/Lib9c/Action/InvalidTransferMinterException.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/InvalidTransferRecipientException.cs b/Lib9c/Action/InvalidTransferRecipientException.cs index 43002c7b1..a2a97e65e 100644 --- a/Lib9c/Action/InvalidTransferRecipientException.cs +++ b/Lib9c/Action/InvalidTransferRecipientException.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; using System; using System.Runtime.Serialization; diff --git a/Lib9c/Action/InvalidTransferSignerException.cs b/Lib9c/Action/InvalidTransferSignerException.cs index c01c42cae..1309a11bb 100644 --- a/Lib9c/Action/InvalidTransferSignerException.cs +++ b/Lib9c/Action/InvalidTransferSignerException.cs @@ -1,5 +1,4 @@ -using Libplanet; -using Libplanet.Tx; +using Libplanet.Crypto; using System; using System.Runtime.Serialization; diff --git a/Lib9c/Action/InvalidTransferUnactivatedRecipientException.cs b/Lib9c/Action/InvalidTransferUnactivatedRecipientException.cs index 5b4c9b7c6..84a823850 100644 --- a/Lib9c/Action/InvalidTransferUnactivatedRecipientException.cs +++ b/Lib9c/Action/InvalidTransferUnactivatedRecipientException.cs @@ -1,6 +1,6 @@ -using Libplanet; using System; using System.Runtime.Serialization; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ItemEnhancement.cs b/Lib9c/Action/ItemEnhancement.cs index c9b79a059..186fb9007 100644 --- a/Lib9c/Action/ItemEnhancement.cs +++ b/Lib9c/Action/ItemEnhancement.cs @@ -7,10 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/ItemEnhancement0.cs b/Lib9c/Action/ItemEnhancement0.cs index 12a396d2c..bb20b85a6 100644 --- a/Lib9c/Action/ItemEnhancement0.cs +++ b/Lib9c/Action/ItemEnhancement0.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement10.cs b/Lib9c/Action/ItemEnhancement10.cs index 19ef0a9fc..ea713f95c 100644 --- a/Lib9c/Action/ItemEnhancement10.cs +++ b/Lib9c/Action/ItemEnhancement10.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement2.cs b/Lib9c/Action/ItemEnhancement2.cs index 7a70ae236..4b36feb7d 100644 --- a/Lib9c/Action/ItemEnhancement2.cs +++ b/Lib9c/Action/ItemEnhancement2.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement3.cs b/Lib9c/Action/ItemEnhancement3.cs index fd21d7fc9..a8164fc3d 100644 --- a/Lib9c/Action/ItemEnhancement3.cs +++ b/Lib9c/Action/ItemEnhancement3.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement4.cs b/Lib9c/Action/ItemEnhancement4.cs index efc00324a..ecac56ec5 100644 --- a/Lib9c/Action/ItemEnhancement4.cs +++ b/Lib9c/Action/ItemEnhancement4.cs @@ -5,9 +5,10 @@ using System.Globalization; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement5.cs b/Lib9c/Action/ItemEnhancement5.cs index bf2ba3c4f..c60e948f0 100644 --- a/Lib9c/Action/ItemEnhancement5.cs +++ b/Lib9c/Action/ItemEnhancement5.cs @@ -5,9 +5,10 @@ using System.Globalization; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement6.cs b/Lib9c/Action/ItemEnhancement6.cs index 69d864e10..18e05c3e1 100644 --- a/Lib9c/Action/ItemEnhancement6.cs +++ b/Lib9c/Action/ItemEnhancement6.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement7.cs b/Lib9c/Action/ItemEnhancement7.cs index 463345f31..ffa0aba8d 100644 --- a/Lib9c/Action/ItemEnhancement7.cs +++ b/Lib9c/Action/ItemEnhancement7.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement8.cs b/Lib9c/Action/ItemEnhancement8.cs index 449504edb..f1b537764 100644 --- a/Lib9c/Action/ItemEnhancement8.cs +++ b/Lib9c/Action/ItemEnhancement8.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemEnhancement9.cs b/Lib9c/Action/ItemEnhancement9.cs index aad0bb981..fe05e9088 100644 --- a/Lib9c/Action/ItemEnhancement9.cs +++ b/Lib9c/Action/ItemEnhancement9.cs @@ -7,9 +7,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ItemProductInfo.cs b/Lib9c/Action/ItemProductInfo.cs index 3a410af0b..b9e64c872 100644 --- a/Lib9c/Action/ItemProductInfo.cs +++ b/Lib9c/Action/ItemProductInfo.cs @@ -1,8 +1,8 @@ using System; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/JoinArena.cs b/Lib9c/Action/JoinArena.cs index b702a6654..b71315dc3 100644 --- a/Lib9c/Action/JoinArena.cs +++ b/Lib9c/Action/JoinArena.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Arena; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/JoinArena1.cs b/Lib9c/Action/JoinArena1.cs index 9c57e6f08..d19cf2211 100644 --- a/Lib9c/Action/JoinArena1.cs +++ b/Lib9c/Action/JoinArena1.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Arena; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/JoinArena2.cs b/Lib9c/Action/JoinArena2.cs index 56293a825..175e34692 100644 --- a/Lib9c/Action/JoinArena2.cs +++ b/Lib9c/Action/JoinArena2.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Arena; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/MigrateMonsterCollection.cs b/Lib9c/Action/MigrateMonsterCollection.cs index 247c22284..0a09d93d0 100644 --- a/Lib9c/Action/MigrateMonsterCollection.cs +++ b/Lib9c/Action/MigrateMonsterCollection.cs @@ -1,9 +1,10 @@ using System; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Serilog; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/MigrationActivatedAccountsState.cs b/Lib9c/Action/MigrationActivatedAccountsState.cs index 690cd2e8f..02a165ba4 100644 --- a/Lib9c/Action/MigrationActivatedAccountsState.cs +++ b/Lib9c/Action/MigrationActivatedAccountsState.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/MigrationAvatarState.cs b/Lib9c/Action/MigrationAvatarState.cs index 53ce81cfe..6bf760d28 100644 --- a/Lib9c/Action/MigrationAvatarState.cs +++ b/Lib9c/Action/MigrationAvatarState.cs @@ -4,7 +4,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/MigrationLegacyShop.cs b/Lib9c/Action/MigrationLegacyShop.cs index f3a051541..e1a0e1599 100644 --- a/Lib9c/Action/MigrationLegacyShop.cs +++ b/Lib9c/Action/MigrationLegacyShop.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Serilog; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/MigrationLegacyShop0.cs b/Lib9c/Action/MigrationLegacyShop0.cs index 9a7289f36..8f41bc603 100644 --- a/Lib9c/Action/MigrationLegacyShop0.cs +++ b/Lib9c/Action/MigrationLegacyShop0.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Serilog; namespace Nekoyume.Action diff --git a/Lib9c/Action/MimisbrunnrBattle.cs b/Lib9c/Action/MimisbrunnrBattle.cs index 82ab9da82..1ba8c9418 100644 --- a/Lib9c/Action/MimisbrunnrBattle.cs +++ b/Lib9c/Action/MimisbrunnrBattle.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model; diff --git a/Lib9c/Action/MimisbrunnrBattle0.cs b/Lib9c/Action/MimisbrunnrBattle0.cs index 9e5bc4a82..6ff09d410 100644 --- a/Lib9c/Action/MimisbrunnrBattle0.cs +++ b/Lib9c/Action/MimisbrunnrBattle0.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/MimisbrunnrBattle10.cs b/Lib9c/Action/MimisbrunnrBattle10.cs index 11145bd4f..edfecdd0c 100644 --- a/Lib9c/Action/MimisbrunnrBattle10.cs +++ b/Lib9c/Action/MimisbrunnrBattle10.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/MimisbrunnrBattle11.cs b/Lib9c/Action/MimisbrunnrBattle11.cs index b23f55be2..701924655 100644 --- a/Lib9c/Action/MimisbrunnrBattle11.cs +++ b/Lib9c/Action/MimisbrunnrBattle11.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Model; diff --git a/Lib9c/Action/MimisbrunnrBattle12.cs b/Lib9c/Action/MimisbrunnrBattle12.cs index 83aaadefa..c7185e933 100644 --- a/Lib9c/Action/MimisbrunnrBattle12.cs +++ b/Lib9c/Action/MimisbrunnrBattle12.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Action/MimisbrunnrBattle2.cs b/Lib9c/Action/MimisbrunnrBattle2.cs index 4b4392091..9d72aca7d 100644 --- a/Lib9c/Action/MimisbrunnrBattle2.cs +++ b/Lib9c/Action/MimisbrunnrBattle2.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/MimisbrunnrBattle3.cs b/Lib9c/Action/MimisbrunnrBattle3.cs index dd17b0bb4..5d41dc1b7 100644 --- a/Lib9c/Action/MimisbrunnrBattle3.cs +++ b/Lib9c/Action/MimisbrunnrBattle3.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/MimisbrunnrBattle4.cs b/Lib9c/Action/MimisbrunnrBattle4.cs index a08b4d815..00a8ff713 100644 --- a/Lib9c/Action/MimisbrunnrBattle4.cs +++ b/Lib9c/Action/MimisbrunnrBattle4.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MimisbrunnrBattle5.cs b/Lib9c/Action/MimisbrunnrBattle5.cs index ac03c17dd..2ce529fa6 100644 --- a/Lib9c/Action/MimisbrunnrBattle5.cs +++ b/Lib9c/Action/MimisbrunnrBattle5.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MimisbrunnrBattle6.cs b/Lib9c/Action/MimisbrunnrBattle6.cs index 1d848f63f..9f53cac15 100644 --- a/Lib9c/Action/MimisbrunnrBattle6.cs +++ b/Lib9c/Action/MimisbrunnrBattle6.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MimisbrunnrBattle7.cs b/Lib9c/Action/MimisbrunnrBattle7.cs index 5a76f6e93..03a9a5027 100644 --- a/Lib9c/Action/MimisbrunnrBattle7.cs +++ b/Lib9c/Action/MimisbrunnrBattle7.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MimisbrunnrBattle8.cs b/Lib9c/Action/MimisbrunnrBattle8.cs index 169279441..77a6c777d 100644 --- a/Lib9c/Action/MimisbrunnrBattle8.cs +++ b/Lib9c/Action/MimisbrunnrBattle8.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MimisbrunnrBattle9.cs b/Lib9c/Action/MimisbrunnrBattle9.cs index 7b3a26d9b..91ee92fab 100644 --- a/Lib9c/Action/MimisbrunnrBattle9.cs +++ b/Lib9c/Action/MimisbrunnrBattle9.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/MonsterCollect.cs b/Lib9c/Action/MonsterCollect.cs index 956b4f541..1c59fcc16 100644 --- a/Lib9c/Action/MonsterCollect.cs +++ b/Lib9c/Action/MonsterCollect.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/MonsterCollect0.cs b/Lib9c/Action/MonsterCollect0.cs index e29060f2d..026cb0bac 100644 --- a/Lib9c/Action/MonsterCollect0.cs +++ b/Lib9c/Action/MonsterCollect0.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/MonsterCollect2.cs b/Lib9c/Action/MonsterCollect2.cs index d1a86025c..cfc1298c3 100644 --- a/Lib9c/Action/MonsterCollect2.cs +++ b/Lib9c/Action/MonsterCollect2.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/NotEnoughFungibleAssetValueException.cs b/Lib9c/Action/NotEnoughFungibleAssetValueException.cs index ed342db16..b94c22dba 100644 --- a/Lib9c/Action/NotEnoughFungibleAssetValueException.cs +++ b/Lib9c/Action/NotEnoughFungibleAssetValueException.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Numerics; using System.Runtime.Serialization; -using Libplanet.Assets; +using Libplanet.Types.Assets; namespace Nekoyume.Action { diff --git a/Lib9c/Action/PatchTableSheet.cs b/Lib9c/Action/PatchTableSheet.cs index 9330e0f16..b0e18e02c 100644 --- a/Lib9c/Action/PatchTableSheet.cs +++ b/Lib9c/Action/PatchTableSheet.cs @@ -2,9 +2,9 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/PendingActivationDoesNotExistsException.cs b/Lib9c/Action/PendingActivationDoesNotExistsException.cs index 74310f08c..66c7fd663 100644 --- a/Lib9c/Action/PendingActivationDoesNotExistsException.cs +++ b/Lib9c/Action/PendingActivationDoesNotExistsException.cs @@ -1,6 +1,6 @@ -using Libplanet; using System; using System.Runtime.Serialization; +using Libplanet.Crypto; namespace Nekoyume.Action { @@ -19,13 +19,13 @@ public PendingActivationDoesNotExistsException( ) : base(info, context) { PendingAddress = (Address)info.GetValue( - nameof(PendingAddress), + nameof(PendingAddress), typeof(Address) ); } public override void GetObjectData( - SerializationInfo info, + SerializationInfo info, StreamingContext context ) { diff --git a/Lib9c/Action/PermissionDeniedException.cs b/Lib9c/Action/PermissionDeniedException.cs index bee4740cf..ad76ef4e8 100644 --- a/Lib9c/Action/PermissionDeniedException.cs +++ b/Lib9c/Action/PermissionDeniedException.cs @@ -1,8 +1,8 @@ -using Libplanet; using Nekoyume.Model.State; using System; using System.Runtime.Serialization; -using Libplanet.Serialization; +using Libplanet.Common.Serialization; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Action/PermissionException.cs b/Lib9c/Action/PermissionException.cs index 70de49494..6fa965246 100644 --- a/Lib9c/Action/PermissionException.cs +++ b/Lib9c/Action/PermissionException.cs @@ -1,7 +1,7 @@ using Nekoyume.Model.State; using System; using System.Runtime.Serialization; -using Libplanet.Serialization; +using Libplanet.Common.Serialization; namespace Nekoyume.Action { diff --git a/Lib9c/Action/PetEnhancement.cs b/Lib9c/Action/PetEnhancement.cs index fa3684c34..f697b87f0 100644 --- a/Lib9c/Action/PetEnhancement.cs +++ b/Lib9c/Action/PetEnhancement.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Exceptions; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/PolicyExpiredException.cs b/Lib9c/Action/PolicyExpiredException.cs index 2946869c4..c7b991e57 100644 --- a/Lib9c/Action/PolicyExpiredException.cs +++ b/Lib9c/Action/PolicyExpiredException.cs @@ -1,7 +1,7 @@ using Nekoyume.Model.State; using System; using System.Runtime.Serialization; -using Libplanet.Serialization; +using Libplanet.Common.Serialization; namespace Nekoyume.Action { diff --git a/Lib9c/Action/PrepareRewardAssets.cs b/Lib9c/Action/PrepareRewardAssets.cs index 9b2e5cb25..69e04ae6d 100644 --- a/Lib9c/Action/PrepareRewardAssets.cs +++ b/Lib9c/Action/PrepareRewardAssets.cs @@ -2,10 +2,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/PurchaseInfo.cs b/Lib9c/Action/PurchaseInfo.cs index 6625e575a..f22069c60 100644 --- a/Lib9c/Action/PurchaseInfo.cs +++ b/Lib9c/Action/PurchaseInfo.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/PurchaseInfo0.cs b/Lib9c/Action/PurchaseInfo0.cs index 8f8c2a373..fe5ffc966 100644 --- a/Lib9c/Action/PurchaseInfo0.cs +++ b/Lib9c/Action/PurchaseInfo0.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/Raid.cs b/Lib9c/Action/Raid.cs index 734327dfd..410e385df 100644 --- a/Lib9c/Action/Raid.cs +++ b/Lib9c/Action/Raid.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/Raid1.cs b/Lib9c/Action/Raid1.cs index ebe3b924f..aa26de3e5 100644 --- a/Lib9c/Action/Raid1.cs +++ b/Lib9c/Action/Raid1.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/Raid2.cs b/Lib9c/Action/Raid2.cs index f7f89784c..0bf006f6d 100644 --- a/Lib9c/Action/Raid2.cs +++ b/Lib9c/Action/Raid2.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/Raid3.cs b/Lib9c/Action/Raid3.cs index 3c5fd76b3..f9a52e0d5 100644 --- a/Lib9c/Action/Raid3.cs +++ b/Lib9c/Action/Raid3.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/Raid4.cs b/Lib9c/Action/Raid4.cs index dc4db9b07..b0928ba16 100644 --- a/Lib9c/Action/Raid4.cs +++ b/Lib9c/Action/Raid4.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/Raid5.cs b/Lib9c/Action/Raid5.cs index a2bd6da27..b7d06c36c 100644 --- a/Lib9c/Action/Raid5.cs +++ b/Lib9c/Action/Raid5.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Extensions; using Nekoyume.Helper; diff --git a/Lib9c/Action/RankingBattle.cs b/Lib9c/Action/RankingBattle.cs index 1bb3da0c9..b6e24090f 100644 --- a/Lib9c/Action/RankingBattle.cs +++ b/Lib9c/Action/RankingBattle.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model; using Nekoyume.Extensions; diff --git a/Lib9c/Action/RankingBattle0.cs b/Lib9c/Action/RankingBattle0.cs index 65e3d8f8d..cbacc7b54 100644 --- a/Lib9c/Action/RankingBattle0.cs +++ b/Lib9c/Action/RankingBattle0.cs @@ -5,14 +5,13 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; -using Nekoyume.TableData; using Serilog; namespace Nekoyume.Action diff --git a/Lib9c/Action/RankingBattle10.cs b/Lib9c/Action/RankingBattle10.cs index 9f091741c..0446370e1 100644 --- a/Lib9c/Action/RankingBattle10.cs +++ b/Lib9c/Action/RankingBattle10.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model; using Nekoyume.Extensions; diff --git a/Lib9c/Action/RankingBattle11.cs b/Lib9c/Action/RankingBattle11.cs index 8b5db07ac..3671ac2c8 100644 --- a/Lib9c/Action/RankingBattle11.cs +++ b/Lib9c/Action/RankingBattle11.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model; using Nekoyume.Extensions; diff --git a/Lib9c/Action/RankingBattle2.cs b/Lib9c/Action/RankingBattle2.cs index b17faa986..9ff7f646a 100644 --- a/Lib9c/Action/RankingBattle2.cs +++ b/Lib9c/Action/RankingBattle2.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle3.cs b/Lib9c/Action/RankingBattle3.cs index 90ebde277..a696b754d 100644 --- a/Lib9c/Action/RankingBattle3.cs +++ b/Lib9c/Action/RankingBattle3.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle4.cs b/Lib9c/Action/RankingBattle4.cs index 12b88e23c..7b262c8c0 100644 --- a/Lib9c/Action/RankingBattle4.cs +++ b/Lib9c/Action/RankingBattle4.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle5.cs b/Lib9c/Action/RankingBattle5.cs index d8a9423c0..6aa29055d 100644 --- a/Lib9c/Action/RankingBattle5.cs +++ b/Lib9c/Action/RankingBattle5.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle6.cs b/Lib9c/Action/RankingBattle6.cs index f83452c0a..f78895373 100644 --- a/Lib9c/Action/RankingBattle6.cs +++ b/Lib9c/Action/RankingBattle6.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle7.cs b/Lib9c/Action/RankingBattle7.cs index 6ac2de855..70e6e150a 100644 --- a/Lib9c/Action/RankingBattle7.cs +++ b/Lib9c/Action/RankingBattle7.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle8.cs b/Lib9c/Action/RankingBattle8.cs index 822c65184..0eaa5a6c3 100644 --- a/Lib9c/Action/RankingBattle8.cs +++ b/Lib9c/Action/RankingBattle8.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RankingBattle9.cs b/Lib9c/Action/RankingBattle9.cs index ecb688cff..49c905e9e 100644 --- a/Lib9c/Action/RankingBattle9.cs +++ b/Lib9c/Action/RankingBattle9.cs @@ -6,9 +6,9 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Action; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RapidCombination.cs b/Lib9c/Action/RapidCombination.cs index e64ba60be..79ff3fc08 100644 --- a/Lib9c/Action/RapidCombination.cs +++ b/Lib9c/Action/RapidCombination.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Item; diff --git a/Lib9c/Action/RapidCombination0.cs b/Lib9c/Action/RapidCombination0.cs index 1110c1a72..2df755913 100644 --- a/Lib9c/Action/RapidCombination0.cs +++ b/Lib9c/Action/RapidCombination0.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RapidCombination2.cs b/Lib9c/Action/RapidCombination2.cs index c5f2e34ea..430edaad6 100644 --- a/Lib9c/Action/RapidCombination2.cs +++ b/Lib9c/Action/RapidCombination2.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RapidCombination3.cs b/Lib9c/Action/RapidCombination3.cs index ba173df8f..0f7d0e432 100644 --- a/Lib9c/Action/RapidCombination3.cs +++ b/Lib9c/Action/RapidCombination3.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RapidCombination4.cs b/Lib9c/Action/RapidCombination4.cs index db847fad3..de59e5d11 100644 --- a/Lib9c/Action/RapidCombination4.cs +++ b/Lib9c/Action/RapidCombination4.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RapidCombination5.cs b/Lib9c/Action/RapidCombination5.cs index 74a7b3e55..20d6dde2d 100644 --- a/Lib9c/Action/RapidCombination5.cs +++ b/Lib9c/Action/RapidCombination5.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RapidCombination6.cs b/Lib9c/Action/RapidCombination6.cs index 5422c1c17..d0ad37a45 100644 --- a/Lib9c/Action/RapidCombination6.cs +++ b/Lib9c/Action/RapidCombination6.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RapidCombination7.cs b/Lib9c/Action/RapidCombination7.cs index c4d3cb3d7..8082eb153 100644 --- a/Lib9c/Action/RapidCombination7.cs +++ b/Lib9c/Action/RapidCombination7.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RapidCombination8.cs b/Lib9c/Action/RapidCombination8.cs index a1e21b409..03d04e0e7 100644 --- a/Lib9c/Action/RapidCombination8.cs +++ b/Lib9c/Action/RapidCombination8.cs @@ -5,9 +5,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ReRegisterProduct.cs b/Lib9c/Action/ReRegisterProduct.cs index 065593133..ba2f40d95 100644 --- a/Lib9c/Action/ReRegisterProduct.cs +++ b/Lib9c/Action/ReRegisterProduct.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/ReRegisterProduct0.cs b/Lib9c/Action/ReRegisterProduct0.cs index 1fe188fe7..d7bad249d 100644 --- a/Lib9c/Action/ReRegisterProduct0.cs +++ b/Lib9c/Action/ReRegisterProduct0.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RedeemCode.cs b/Lib9c/Action/RedeemCode.cs index b2e6cfb97..2aaee6472 100644 --- a/Lib9c/Action/RedeemCode.cs +++ b/Lib9c/Action/RedeemCode.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RedeemCode0.cs b/Lib9c/Action/RedeemCode0.cs index 74df8d94a..80e3cf71a 100644 --- a/Lib9c/Action/RedeemCode0.cs +++ b/Lib9c/Action/RedeemCode0.cs @@ -4,10 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RedeemCode2.cs b/Lib9c/Action/RedeemCode2.cs index 9e270c2d4..06732272f 100644 --- a/Lib9c/Action/RedeemCode2.cs +++ b/Lib9c/Action/RedeemCode2.cs @@ -4,9 +4,9 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/RegisterInfo.cs b/Lib9c/Action/RegisterInfo.cs index f14602fff..605f76958 100644 --- a/Lib9c/Action/RegisterInfo.cs +++ b/Lib9c/Action/RegisterInfo.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RegisterProduct.cs b/Lib9c/Action/RegisterProduct.cs index 09601341d..358070c4a 100644 --- a/Lib9c/Action/RegisterProduct.cs +++ b/Lib9c/Action/RegisterProduct.cs @@ -3,12 +3,11 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; -using Nekoyume.Helper; using Nekoyume.Model.Item; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RegisterProduct0.cs b/Lib9c/Action/RegisterProduct0.cs index 748540beb..40692f60a 100644 --- a/Lib9c/Action/RegisterProduct0.cs +++ b/Lib9c/Action/RegisterProduct0.cs @@ -3,12 +3,11 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; -using Nekoyume.Helper; using Nekoyume.Model.Item; using Nekoyume.Model.Market; using Nekoyume.Model.State; diff --git a/Lib9c/Action/RenewAdminState.cs b/Lib9c/Action/RenewAdminState.cs index beb3c09d8..59d6af91e 100644 --- a/Lib9c/Action/RenewAdminState.cs +++ b/Lib9c/Action/RenewAdminState.cs @@ -4,7 +4,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/RequestPledge.cs b/Lib9c/Action/RequestPledge.cs index 6842b176f..3ae6de290 100644 --- a/Lib9c/Action/RequestPledge.cs +++ b/Lib9c/Action/RequestPledge.cs @@ -1,8 +1,8 @@ using Bencodex.Types; using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.State; namespace Nekoyume.Action diff --git a/Lib9c/Action/RequiredBlockIndexException.cs b/Lib9c/Action/RequiredBlockIndexException.cs index d7ea895f4..4d3605c0f 100644 --- a/Lib9c/Action/RequiredBlockIndexException.cs +++ b/Lib9c/Action/RequiredBlockIndexException.cs @@ -1,7 +1,5 @@ using System; using System.Runtime.Serialization; -using Libplanet; -using Libplanet.Blocks; namespace Nekoyume.Action { diff --git a/Lib9c/Action/RewardGold.cs b/Lib9c/Action/RewardGold.cs index 751978aa4..00839c982 100644 --- a/Lib9c/Action/RewardGold.cs +++ b/Lib9c/Action/RewardGold.cs @@ -4,10 +4,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/RuneEnhancement.cs b/Lib9c/Action/RuneEnhancement.cs index b5f2a06bb..678ec16d2 100644 --- a/Lib9c/Action/RuneEnhancement.cs +++ b/Lib9c/Action/RuneEnhancement.cs @@ -3,10 +3,10 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model.Rune; diff --git a/Lib9c/Action/RuneEnhancement0.cs b/Lib9c/Action/RuneEnhancement0.cs index 886e745f3..ac2443687 100644 --- a/Lib9c/Action/RuneEnhancement0.cs +++ b/Lib9c/Action/RuneEnhancement0.cs @@ -3,13 +3,12 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; -using Nekoyume.Model.EnumType; using Nekoyume.Model.Rune; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/SecureMiningReward.cs b/Lib9c/Action/SecureMiningReward.cs index ab3c963ee..7b80813a3 100644 --- a/Lib9c/Action/SecureMiningReward.cs +++ b/Lib9c/Action/SecureMiningReward.cs @@ -1,12 +1,12 @@ using System.Collections.Immutable; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; -using Libplanet.Assets; using Libplanet.Action; -using Libplanet.State; using Nekoyume.Model.State; using System.Linq; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Action { diff --git a/Lib9c/Action/Sell.cs b/Lib9c/Action/Sell.cs index 46d6f6150..65bca601e 100644 --- a/Lib9c/Action/Sell.cs +++ b/Lib9c/Action/Sell.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/Sell0.cs b/Lib9c/Action/Sell0.cs index 30551ea2c..821fe2cc8 100644 --- a/Lib9c/Action/Sell0.cs +++ b/Lib9c/Action/Sell0.cs @@ -2,13 +2,12 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/Sell10.cs b/Lib9c/Action/Sell10.cs index 747e4a4ad..21e136034 100644 --- a/Lib9c/Action/Sell10.cs +++ b/Lib9c/Action/Sell10.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/Sell11.cs b/Lib9c/Action/Sell11.cs index 552aef007..8dfded76c 100644 --- a/Lib9c/Action/Sell11.cs +++ b/Lib9c/Action/Sell11.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/Sell2.cs b/Lib9c/Action/Sell2.cs index b3a651650..59ae0a579 100644 --- a/Lib9c/Action/Sell2.cs +++ b/Lib9c/Action/Sell2.cs @@ -5,10 +5,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/Sell3.cs b/Lib9c/Action/Sell3.cs index 0d8ede127..b2a7f7dfe 100644 --- a/Lib9c/Action/Sell3.cs +++ b/Lib9c/Action/Sell3.cs @@ -5,10 +5,10 @@ using System.Numerics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Serilog; diff --git a/Lib9c/Action/Sell4.cs b/Lib9c/Action/Sell4.cs index d9a93d000..8e2faa8ab 100644 --- a/Lib9c/Action/Sell4.cs +++ b/Lib9c/Action/Sell4.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Sell5.cs b/Lib9c/Action/Sell5.cs index 8a0630bc0..71c6d9d0a 100644 --- a/Lib9c/Action/Sell5.cs +++ b/Lib9c/Action/Sell5.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Sell6.cs b/Lib9c/Action/Sell6.cs index c988b8ec8..ce604a16e 100644 --- a/Lib9c/Action/Sell6.cs +++ b/Lib9c/Action/Sell6.cs @@ -5,10 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Sell7.cs b/Lib9c/Action/Sell7.cs index a1945de28..ee143900f 100644 --- a/Lib9c/Action/Sell7.cs +++ b/Lib9c/Action/Sell7.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Sell8.cs b/Lib9c/Action/Sell8.cs index 6fac68d1c..cada6e520 100644 --- a/Lib9c/Action/Sell8.cs +++ b/Lib9c/Action/Sell8.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Sell9.cs b/Lib9c/Action/Sell9.cs index 02241e5fb..880b472a6 100644 --- a/Lib9c/Action/Sell9.cs +++ b/Lib9c/Action/Sell9.cs @@ -5,10 +5,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Action/SellCancellation.cs b/Lib9c/Action/SellCancellation.cs index 311ddcbd0..58cc5e8b9 100644 --- a/Lib9c/Action/SellCancellation.cs +++ b/Lib9c/Action/SellCancellation.cs @@ -6,9 +6,9 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation0.cs b/Lib9c/Action/SellCancellation0.cs index 8d4cfee6a..6fd07d312 100644 --- a/Lib9c/Action/SellCancellation0.cs +++ b/Lib9c/Action/SellCancellation0.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation2.cs b/Lib9c/Action/SellCancellation2.cs index 3d7bfa875..b9ebaede9 100644 --- a/Lib9c/Action/SellCancellation2.cs +++ b/Lib9c/Action/SellCancellation2.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation3.cs b/Lib9c/Action/SellCancellation3.cs index 7b472837c..1f6c05fbf 100644 --- a/Lib9c/Action/SellCancellation3.cs +++ b/Lib9c/Action/SellCancellation3.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation4.cs b/Lib9c/Action/SellCancellation4.cs index 637456971..372790e82 100644 --- a/Lib9c/Action/SellCancellation4.cs +++ b/Lib9c/Action/SellCancellation4.cs @@ -4,9 +4,10 @@ using System.Diagnostics; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation5.cs b/Lib9c/Action/SellCancellation5.cs index 59f8e27bf..876096c76 100644 --- a/Lib9c/Action/SellCancellation5.cs +++ b/Lib9c/Action/SellCancellation5.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation6.cs b/Lib9c/Action/SellCancellation6.cs index d3307a7b2..3d9af5980 100644 --- a/Lib9c/Action/SellCancellation6.cs +++ b/Lib9c/Action/SellCancellation6.cs @@ -5,9 +5,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation7.cs b/Lib9c/Action/SellCancellation7.cs index 7b6779d30..012c7401e 100644 --- a/Lib9c/Action/SellCancellation7.cs +++ b/Lib9c/Action/SellCancellation7.cs @@ -6,9 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/SellCancellation8.cs b/Lib9c/Action/SellCancellation8.cs index d71e33745..44b0fbf4e 100644 --- a/Lib9c/Action/SellCancellation8.cs +++ b/Lib9c/Action/SellCancellation8.cs @@ -6,9 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/Stake.cs b/Lib9c/Action/Stake.cs index bcee30566..81cc28892 100644 --- a/Lib9c/Action/Stake.cs +++ b/Lib9c/Action/Stake.cs @@ -5,7 +5,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using Serilog; diff --git a/Lib9c/Action/Stake0.cs b/Lib9c/Action/Stake0.cs index 11c63eece..9f7e276ef 100644 --- a/Lib9c/Action/Stake0.cs +++ b/Lib9c/Action/Stake0.cs @@ -4,7 +4,7 @@ using Bencodex.Types; using Lib9c.Abstractions; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Action/TotalSupplyDoesNotExistException.cs b/Lib9c/Action/TotalSupplyDoesNotExistException.cs index 7715b0924..cad8afa35 100644 --- a/Lib9c/Action/TotalSupplyDoesNotExistException.cs +++ b/Lib9c/Action/TotalSupplyDoesNotExistException.cs @@ -1,5 +1,5 @@ -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using System; using System.Runtime.Serialization; diff --git a/Lib9c/Action/TransferAsset.cs b/Lib9c/Action/TransferAsset.cs index d230590ec..f247af263 100644 --- a/Lib9c/Action/TransferAsset.cs +++ b/Lib9c/Action/TransferAsset.cs @@ -1,9 +1,9 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; diff --git a/Lib9c/Action/TransferAsset0.cs b/Lib9c/Action/TransferAsset0.cs index 82769ce46..97c868a08 100644 --- a/Lib9c/Action/TransferAsset0.cs +++ b/Lib9c/Action/TransferAsset0.cs @@ -1,9 +1,9 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; diff --git a/Lib9c/Action/TransferAsset2.cs b/Lib9c/Action/TransferAsset2.cs index d4f1d112a..15cd9e895 100644 --- a/Lib9c/Action/TransferAsset2.cs +++ b/Lib9c/Action/TransferAsset2.cs @@ -1,9 +1,9 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; diff --git a/Lib9c/Action/TransferAsset3.cs b/Lib9c/Action/TransferAsset3.cs index c03717a20..e498a35fd 100644 --- a/Lib9c/Action/TransferAsset3.cs +++ b/Lib9c/Action/TransferAsset3.cs @@ -1,15 +1,15 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Lib9c.Abstractions; -using Libplanet.State; +using Libplanet.Action.State; using Nekoyume.Helper; using Nekoyume.Model; using Serilog; diff --git a/Lib9c/Action/TransferAssets.cs b/Lib9c/Action/TransferAssets.cs index 12ba84e19..36a1e392f 100644 --- a/Lib9c/Action/TransferAssets.cs +++ b/Lib9c/Action/TransferAssets.cs @@ -1,9 +1,9 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; diff --git a/Lib9c/Action/TransferAssets0.cs b/Lib9c/Action/TransferAssets0.cs index 9d89ad1f3..55e5663c9 100644 --- a/Lib9c/Action/TransferAssets0.cs +++ b/Lib9c/Action/TransferAssets0.cs @@ -1,15 +1,15 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Lib9c.Abstractions; -using Libplanet.State; using Nekoyume.Model; using Serilog; diff --git a/Lib9c/Action/UnlockEquipmentRecipe.cs b/Lib9c/Action/UnlockEquipmentRecipe.cs index ff295308d..9371c37d7 100644 --- a/Lib9c/Action/UnlockEquipmentRecipe.cs +++ b/Lib9c/Action/UnlockEquipmentRecipe.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model; diff --git a/Lib9c/Action/UnlockEquipmentRecipe1.cs b/Lib9c/Action/UnlockEquipmentRecipe1.cs index 4f3ce71fe..456d909d3 100644 --- a/Lib9c/Action/UnlockEquipmentRecipe1.cs +++ b/Lib9c/Action/UnlockEquipmentRecipe1.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Helper; using Nekoyume.Model; diff --git a/Lib9c/Action/UnlockRuneSlot.cs b/Lib9c/Action/UnlockRuneSlot.cs index 501f857ee..ed9dfb776 100644 --- a/Lib9c/Action/UnlockRuneSlot.cs +++ b/Lib9c/Action/UnlockRuneSlot.cs @@ -4,9 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Model.EnumType; using Nekoyume.Model.Rune; diff --git a/Lib9c/Action/UnlockWorld.cs b/Lib9c/Action/UnlockWorld.cs index 67f74e636..d5ccb3370 100644 --- a/Lib9c/Action/UnlockWorld.cs +++ b/Lib9c/Action/UnlockWorld.cs @@ -4,10 +4,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UnlockWorld1.cs b/Lib9c/Action/UnlockWorld1.cs index fadbe59e2..017d9084f 100644 --- a/Lib9c/Action/UnlockWorld1.cs +++ b/Lib9c/Action/UnlockWorld1.cs @@ -3,10 +3,10 @@ using System.Linq; using Bencodex.Types; using Lib9c.Abstractions; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSell.cs b/Lib9c/Action/UpdateSell.cs index 9a2531216..3742293be 100644 --- a/Lib9c/Action/UpdateSell.cs +++ b/Lib9c/Action/UpdateSell.cs @@ -6,9 +6,9 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSell0.cs b/Lib9c/Action/UpdateSell0.cs index 50e2e21c3..f7572cc46 100644 --- a/Lib9c/Action/UpdateSell0.cs +++ b/Lib9c/Action/UpdateSell0.cs @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSell2.cs b/Lib9c/Action/UpdateSell2.cs index 1ed3c89ac..1d955deb2 100644 --- a/Lib9c/Action/UpdateSell2.cs +++ b/Lib9c/Action/UpdateSell2.cs @@ -6,10 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSell3.cs b/Lib9c/Action/UpdateSell3.cs index 8e3e30df6..eb524d023 100644 --- a/Lib9c/Action/UpdateSell3.cs +++ b/Lib9c/Action/UpdateSell3.cs @@ -6,9 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSell4.cs b/Lib9c/Action/UpdateSell4.cs index 93487a261..36ca37c70 100644 --- a/Lib9c/Action/UpdateSell4.cs +++ b/Lib9c/Action/UpdateSell4.cs @@ -6,9 +6,10 @@ using Bencodex.Types; using Lib9c.Abstractions; using Lib9c.Model.Order; -using Libplanet; using Libplanet.Action; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Battle; using Nekoyume.Model.Mail; using Nekoyume.Model.State; diff --git a/Lib9c/Action/UpdateSellInfo.cs b/Lib9c/Action/UpdateSellInfo.cs index eb4a6b45e..e10489c3e 100644 --- a/Lib9c/Action/UpdateSellInfo.cs +++ b/Lib9c/Action/UpdateSellInfo.cs @@ -1,10 +1,8 @@ using System; -using System.Collections.Generic; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.Item; using Nekoyume.Model.State; -using static Lib9c.SerializeKeys; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ValidatorSetOperate.cs b/Lib9c/Action/ValidatorSetOperate.cs index b9e655148..56743881c 100644 --- a/Lib9c/Action/ValidatorSetOperate.cs +++ b/Lib9c/Action/ValidatorSetOperate.cs @@ -4,9 +4,9 @@ using System.Numerics; using Bencodex.Types; using Libplanet.Action; -using Libplanet.State; -using Libplanet.Consensus; +using Libplanet.Action.State; using Libplanet.Crypto; +using Libplanet.Types.Consensus; namespace Nekoyume.Action { diff --git a/Lib9c/Action/ValidatorSetOperatorTypeExtension.cs b/Lib9c/Action/ValidatorSetOperatorTypeExtension.cs index 4fcae13df..53cc85992 100644 --- a/Lib9c/Action/ValidatorSetOperatorTypeExtension.cs +++ b/Lib9c/Action/ValidatorSetOperatorTypeExtension.cs @@ -1,6 +1,5 @@ using System; -using System.Linq; -using Libplanet.Consensus; +using Libplanet.Types.Consensus; namespace Nekoyume.Action { diff --git a/Lib9c/Action/WeeklyArenaStateNotContainsAvatarAddressException.cs b/Lib9c/Action/WeeklyArenaStateNotContainsAvatarAddressException.cs index 938180603..eebfc43d8 100644 --- a/Lib9c/Action/WeeklyArenaStateNotContainsAvatarAddressException.cs +++ b/Lib9c/Action/WeeklyArenaStateNotContainsAvatarAddressException.cs @@ -1,6 +1,6 @@ using System; using System.Runtime.Serialization; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Action { diff --git a/Lib9c/Addresses.cs b/Lib9c/Addresses.cs index c95d45765..34850f9f7 100644 --- a/Lib9c/Addresses.cs +++ b/Lib9c/Addresses.cs @@ -2,7 +2,8 @@ using System.Globalization; using System.Linq; using System.Security.Cryptography; -using Libplanet; +using Libplanet.Common; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Arena/ArenaHelper.cs b/Lib9c/Arena/ArenaHelper.cs index a808b0388..f1ecce85e 100644 --- a/Lib9c/Arena/ArenaHelper.cs +++ b/Lib9c/Arena/ArenaHelper.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.Helper; diff --git a/Lib9c/Battle/RaidSimulator.cs b/Lib9c/Battle/RaidSimulator.cs index 62d51829a..4b0de7659 100644 --- a/Lib9c/Battle/RaidSimulator.cs +++ b/Lib9c/Battle/RaidSimulator.cs @@ -1,5 +1,5 @@ using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model; using Nekoyume.Model.BattleStatus; diff --git a/Lib9c/Battle/RaidSimulatorV1.cs b/Lib9c/Battle/RaidSimulatorV1.cs index 06b524298..56bb47ce1 100644 --- a/Lib9c/Battle/RaidSimulatorV1.cs +++ b/Lib9c/Battle/RaidSimulatorV1.cs @@ -1,5 +1,5 @@ using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model; using Nekoyume.Model.BattleStatus; diff --git a/Lib9c/Battle/RaidSimulatorV2.cs b/Lib9c/Battle/RaidSimulatorV2.cs index 818731d84..b5ab9bea1 100644 --- a/Lib9c/Battle/RaidSimulatorV2.cs +++ b/Lib9c/Battle/RaidSimulatorV2.cs @@ -1,5 +1,5 @@ using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model; using Nekoyume.Model.BattleStatus; diff --git a/Lib9c/Currencies.cs b/Lib9c/Currencies.cs index 08c83297d..285f29856 100644 --- a/Lib9c/Currencies.cs +++ b/Lib9c/Currencies.cs @@ -3,7 +3,7 @@ using System; using System.Globalization; using System.Linq; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.TableData; namespace Lib9c diff --git a/Lib9c/CurrencyExtensions.cs b/Lib9c/CurrencyExtensions.cs index 8a6f20b50..79180e14a 100644 --- a/Lib9c/CurrencyExtensions.cs +++ b/Lib9c/CurrencyExtensions.cs @@ -2,8 +2,8 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume { diff --git a/Lib9c/Exceptions/ItemNotFoundException.cs b/Lib9c/Exceptions/ItemNotFoundException.cs index b6f122be6..528a86c8e 100644 --- a/Lib9c/Exceptions/ItemNotFoundException.cs +++ b/Lib9c/Exceptions/ItemNotFoundException.cs @@ -3,7 +3,8 @@ using System; using System.Runtime.Serialization; using System.Security.Cryptography; -using Libplanet; +using Libplanet.Common; +using Libplanet.Crypto; namespace Nekoyume.Exceptions { diff --git a/Lib9c/Exceptions/NotEnoughItemException.cs b/Lib9c/Exceptions/NotEnoughItemException.cs index 0053a13c4..eff8e728b 100644 --- a/Lib9c/Exceptions/NotEnoughItemException.cs +++ b/Lib9c/Exceptions/NotEnoughItemException.cs @@ -3,7 +3,8 @@ using System; using System.Runtime.Serialization; using System.Security.Cryptography; -using Libplanet; +using Libplanet.Common; +using Libplanet.Crypto; namespace Nekoyume.Exceptions { diff --git a/Lib9c/Exceptions/StateNullException.cs b/Lib9c/Exceptions/StateNullException.cs index 0c53162ad..ab338edb1 100644 --- a/Lib9c/Exceptions/StateNullException.cs +++ b/Lib9c/Exceptions/StateNullException.cs @@ -2,7 +2,7 @@ using System; using System.Runtime.Serialization; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Exceptions { diff --git a/Lib9c/Extensions/EventScheduleExtensions.cs b/Lib9c/Extensions/EventScheduleExtensions.cs index e22f0243b..435d481d6 100644 --- a/Lib9c/Extensions/EventScheduleExtensions.cs +++ b/Lib9c/Extensions/EventScheduleExtensions.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; using DecimalMath; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Exceptions; using Nekoyume.TableData; using Nekoyume.TableData.Event; diff --git a/Lib9c/Extensions/SheetsExtensions.cs b/Lib9c/Extensions/SheetsExtensions.cs index d1284736e..d0cd315f9 100644 --- a/Lib9c/Extensions/SheetsExtensions.cs +++ b/Lib9c/Extensions/SheetsExtensions.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Libplanet; -using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.TableData; diff --git a/Lib9c/Helper/CrystalCalculator.cs b/Lib9c/Helper/CrystalCalculator.cs index a486792fb..53dce8565 100644 --- a/Lib9c/Helper/CrystalCalculator.cs +++ b/Lib9c/Helper/CrystalCalculator.cs @@ -3,10 +3,9 @@ using System.Linq; using System.Numerics; using Lib9c; -using Libplanet; -using Libplanet.Action; -using Libplanet.Assets; -using Libplanet.State; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Extensions; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Helper/PetHelper.cs b/Lib9c/Helper/PetHelper.cs index dac5d9e06..4e3bf9482 100644 --- a/Lib9c/Helper/PetHelper.cs +++ b/Lib9c/Helper/PetHelper.cs @@ -1,6 +1,6 @@ using System; using Lib9c; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.Pet; using Nekoyume.Model.State; diff --git a/Lib9c/Helper/RuneHelper.cs b/Lib9c/Helper/RuneHelper.cs index 2898a4c92..ee25a43ff 100644 --- a/Lib9c/Helper/RuneHelper.cs +++ b/Lib9c/Helper/RuneHelper.cs @@ -3,7 +3,7 @@ using System.Linq; using Lib9c; using Libplanet.Action; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.TableData; diff --git a/Lib9c/Helper/Validator.cs b/Lib9c/Helper/Validator.cs index aca94aea3..8135deef0 100644 --- a/Lib9c/Helper/Validator.cs +++ b/Lib9c/Helper/Validator.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Extensions; using Nekoyume.Model.State; diff --git a/Lib9c/Helper/WorldBossHelper.cs b/Lib9c/Helper/WorldBossHelper.cs index b8879d91f..6a3fe605f 100644 --- a/Lib9c/Helper/WorldBossHelper.cs +++ b/Lib9c/Helper/WorldBossHelper.cs @@ -1,5 +1,5 @@ using System; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/MeadConfig.cs b/Lib9c/MeadConfig.cs index f91096aa7..912d0b6ff 100644 --- a/Lib9c/MeadConfig.cs +++ b/Lib9c/MeadConfig.cs @@ -1,4 +1,4 @@ -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume { diff --git a/Lib9c/Model/ActivationKey.cs b/Lib9c/Model/ActivationKey.cs index 4f0e98f2c..f900636c4 100644 --- a/Lib9c/Model/ActivationKey.cs +++ b/Lib9c/Model/ActivationKey.cs @@ -1,5 +1,5 @@ using System; -using Libplanet; +using Libplanet.Common; using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Arena/ArenaInformation.cs b/Lib9c/Model/Arena/ArenaInformation.cs index 3ba3030b0..60b17d40d 100644 --- a/Lib9c/Model/Arena/ArenaInformation.cs +++ b/Lib9c/Model/Arena/ArenaInformation.cs @@ -1,9 +1,7 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; -using Nekoyume.Arena; using Nekoyume.Model.State; -using Nekoyume.TableData; namespace Nekoyume.Model.Arena { diff --git a/Lib9c/Model/Arena/ArenaParticipants.cs b/Lib9c/Model/Arena/ArenaParticipants.cs index 65fd062e6..7c4c9a00b 100644 --- a/Lib9c/Model/Arena/ArenaParticipants.cs +++ b/Lib9c/Model/Arena/ArenaParticipants.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Arena/ArenaScore.cs b/Lib9c/Model/Arena/ArenaScore.cs index 25e74389a..ee54db997 100644 --- a/Lib9c/Model/Arena/ArenaScore.cs +++ b/Lib9c/Model/Arena/ArenaScore.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; using Nekoyume.Model.State; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.Arena diff --git a/Lib9c/Model/Event/EventDungeonInfo.cs b/Lib9c/Model/Event/EventDungeonInfo.cs index 9ffd2a7f3..5f596ee66 100644 --- a/Lib9c/Model/Event/EventDungeonInfo.cs +++ b/Lib9c/Model/Event/EventDungeonInfo.cs @@ -1,6 +1,6 @@ -using System; +using System; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/GrandFinale/GrandFinaleInformation.cs b/Lib9c/Model/GrandFinale/GrandFinaleInformation.cs index 297a70ed3..5d48db7fb 100644 --- a/Lib9c/Model/GrandFinale/GrandFinaleInformation.cs +++ b/Lib9c/Model/GrandFinale/GrandFinaleInformation.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Item/IFungibleItem.cs b/Lib9c/Model/Item/IFungibleItem.cs index 3bf0b4342..43ca7c2a8 100644 --- a/Lib9c/Model/Item/IFungibleItem.cs +++ b/Lib9c/Model/Item/IFungibleItem.cs @@ -1,5 +1,5 @@ using System.Security.Cryptography; -using Libplanet; +using Libplanet.Common; namespace Nekoyume.Model.Item { diff --git a/Lib9c/Model/Item/Inventory.cs b/Lib9c/Model/Item/Inventory.cs index 7f97e8b19..69b3a7c14 100644 --- a/Lib9c/Model/Item/Inventory.cs +++ b/Lib9c/Model/Item/Inventory.cs @@ -4,7 +4,8 @@ using System.Security.Cryptography; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; +using Libplanet.Common; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.Extensions; diff --git a/Lib9c/Model/Item/Material.cs b/Lib9c/Model/Item/Material.cs index 6dcf6b11f..edc7d7e47 100644 --- a/Lib9c/Model/Item/Material.cs +++ b/Lib9c/Model/Item/Material.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; +using Libplanet.Common; using Nekoyume.Model.State; using Nekoyume.TableData; diff --git a/Lib9c/Model/Item/ShopItem.cs b/Lib9c/Model/Item/ShopItem.cs index d13edb50a..4fd4db143 100644 --- a/Lib9c/Model/Item/ShopItem.cs +++ b/Lib9c/Model/Item/ShopItem.cs @@ -3,8 +3,8 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/Item/TradableMaterial.cs b/Lib9c/Model/Item/TradableMaterial.cs index f4763b06f..fb2b7e5fa 100644 --- a/Lib9c/Model/Item/TradableMaterial.cs +++ b/Lib9c/Model/Item/TradableMaterial.cs @@ -2,7 +2,7 @@ using System.Runtime.Serialization; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; +using Libplanet.Common; using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/Mail/GrindingMail.cs b/Lib9c/Model/Mail/GrindingMail.cs index 8e4079251..17eb3bf82 100644 --- a/Lib9c/Model/Mail/GrindingMail.cs +++ b/Lib9c/Model/Mail/GrindingMail.cs @@ -1,6 +1,6 @@ using System; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Model.Mail diff --git a/Lib9c/Model/Mail/UnloadFromMyGaragesRecipientMail.cs b/Lib9c/Model/Mail/UnloadFromMyGaragesRecipientMail.cs index 67db42c33..f07eb12fa 100644 --- a/Lib9c/Model/Mail/UnloadFromMyGaragesRecipientMail.cs +++ b/Lib9c/Model/Mail/UnloadFromMyGaragesRecipientMail.cs @@ -5,8 +5,9 @@ using System.Linq; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action.Garages; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Market/FavProduct.cs b/Lib9c/Model/Market/FavProduct.cs index 6caa9c076..b18e2fe54 100644 --- a/Lib9c/Model/Market/FavProduct.cs +++ b/Lib9c/Model/Market/FavProduct.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.State; namespace Nekoyume.Model.Market diff --git a/Lib9c/Model/Market/Product.cs b/Lib9c/Model/Market/Product.cs index 3a19d12eb..613383153 100644 --- a/Lib9c/Model/Market/Product.cs +++ b/Lib9c/Model/Market/Product.cs @@ -1,9 +1,8 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; -using Nekoyume.Model.Item; using Nekoyume.Model.State; namespace Nekoyume.Model.Market diff --git a/Lib9c/Model/Market/ProductReceipt.cs b/Lib9c/Model/Market/ProductReceipt.cs index 3ddb94137..b36ce503f 100644 --- a/Lib9c/Model/Market/ProductReceipt.cs +++ b/Lib9c/Model/Market/ProductReceipt.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Market/ProductsState.cs b/Lib9c/Model/Market/ProductsState.cs index dbf790f00..b33394ee6 100644 --- a/Lib9c/Model/Market/ProductsState.cs +++ b/Lib9c/Model/Market/ProductsState.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Lib9c; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Order/FungibleOrder.cs b/Lib9c/Model/Order/FungibleOrder.cs index 1de6dfba6..438b40331 100644 --- a/Lib9c/Model/Order/FungibleOrder.cs +++ b/Lib9c/Model/Order/FungibleOrder.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.Model.Item; diff --git a/Lib9c/Model/Order/NonFungibleOrder.cs b/Lib9c/Model/Order/NonFungibleOrder.cs index 786158230..cb351e660 100644 --- a/Lib9c/Model/Order/NonFungibleOrder.cs +++ b/Lib9c/Model/Order/NonFungibleOrder.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Battle; using Nekoyume.Model.Item; diff --git a/Lib9c/Model/Order/Order.cs b/Lib9c/Model/Order/Order.cs index 7d61e51d9..87e5c7f79 100644 --- a/Lib9c/Model/Order/Order.cs +++ b/Lib9c/Model/Order/Order.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/Lib9c/Model/Order/OrderDigest.cs b/Lib9c/Model/Order/OrderDigest.cs index 54c655684..538a45161 100644 --- a/Lib9c/Model/Order/OrderDigest.cs +++ b/Lib9c/Model/Order/OrderDigest.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/Order/OrderDigestListState.cs b/Lib9c/Model/Order/OrderDigestListState.cs index 261a228c9..a9214c829 100644 --- a/Lib9c/Model/Order/OrderDigestListState.cs +++ b/Lib9c/Model/Order/OrderDigestListState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/Order/OrderFactory.cs b/Lib9c/Model/Order/OrderFactory.cs index f638c4345..8df60f649 100644 --- a/Lib9c/Model/Order/OrderFactory.cs +++ b/Lib9c/Model/Order/OrderFactory.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Model/Order/OrderReceipt.cs b/Lib9c/Model/Order/OrderReceipt.cs index 1f24c9db2..66886798c 100644 --- a/Lib9c/Model/Order/OrderReceipt.cs +++ b/Lib9c/Model/Order/OrderReceipt.cs @@ -1,6 +1,6 @@ using System; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/Quest/GoldQuest.cs b/Lib9c/Model/Quest/GoldQuest.cs index 890622a35..da5e9a351 100644 --- a/Lib9c/Model/Quest/GoldQuest.cs +++ b/Lib9c/Model/Quest/GoldQuest.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Numerics; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.TableData; diff --git a/Lib9c/Model/Quest/QuestList.cs b/Lib9c/Model/Quest/QuestList.cs index f871501f6..1205b0716 100644 --- a/Lib9c/Model/Quest/QuestList.cs +++ b/Lib9c/Model/Quest/QuestList.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Runtime.Serialization; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.EnumType; using Nekoyume.Model.Item; using Nekoyume.Model.State; diff --git a/Lib9c/Model/State/ActivatedAccountsState.cs b/Lib9c/Model/State/ActivatedAccountsState.cs index 19aa2ba92..132d3da1a 100644 --- a/Lib9c/Model/State/ActivatedAccountsState.cs +++ b/Lib9c/Model/State/ActivatedAccountsState.cs @@ -1,11 +1,10 @@ using Bencodex; using Bencodex.Types; -using Libplanet; using System; -using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; using System.Runtime.Serialization; +using Libplanet.Crypto; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/AdminState.cs b/Lib9c/Model/State/AdminState.cs index d3c1572c5..d4576ad19 100644 --- a/Lib9c/Model/State/AdminState.cs +++ b/Lib9c/Model/State/AdminState.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using System; using System.Collections.Generic; using System.Linq; diff --git a/Lib9c/Model/State/AgentState.cs b/Lib9c/Model/State/AgentState.cs index 9ff1fbe54..a0a088fc2 100644 --- a/Lib9c/Model/State/AgentState.cs +++ b/Lib9c/Model/State/AgentState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using static Lib9c.SerializeKeys; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/ArenaAvatarState.cs b/Lib9c/Model/State/ArenaAvatarState.cs index 4bc311cf4..d16a93d89 100644 --- a/Lib9c/Model/State/ArenaAvatarState.cs +++ b/Lib9c/Model/State/ArenaAvatarState.cs @@ -1,9 +1,9 @@ using System; using Bencodex.Types; -using Libplanet; using Nekoyume.Action; using System.Collections.Generic; using System.Linq; +using Libplanet.Crypto; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/ArenaInfo.cs b/Lib9c/Model/State/ArenaInfo.cs index 2ccd8f4f0..14cefa460 100644 --- a/Lib9c/Model/State/ArenaInfo.cs +++ b/Lib9c/Model/State/ArenaInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Battle; using Nekoyume.Model.BattleStatus; using Nekoyume.Model.Item; diff --git a/Lib9c/Model/State/AuthorizedMinersState.cs b/Lib9c/Model/State/AuthorizedMinersState.cs index 6f386e1a1..68d0d567e 100644 --- a/Lib9c/Model/State/AuthorizedMinersState.cs +++ b/Lib9c/Model/State/AuthorizedMinersState.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/Lib9c/Model/State/AvatarState.cs b/Lib9c/Model/State/AvatarState.cs index c01ded7ae..2504237c7 100644 --- a/Lib9c/Model/State/AvatarState.cs +++ b/Lib9c/Model/State/AvatarState.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Security.Cryptography; using Bencodex.Types; -using Libplanet; using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Battle; diff --git a/Lib9c/Model/State/CombinationSlotState.cs b/Lib9c/Model/State/CombinationSlotState.cs index 45b67d12a..c6d60aef8 100644 --- a/Lib9c/Model/State/CombinationSlotState.cs +++ b/Lib9c/Model/State/CombinationSlotState.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/Lib9c/Model/State/CreditsState.cs b/Lib9c/Model/State/CreditsState.cs index 6a769a842..2c23686bf 100644 --- a/Lib9c/Model/State/CreditsState.cs +++ b/Lib9c/Model/State/CreditsState.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/Lib9c/Model/State/CrystalCostState.cs b/Lib9c/Model/State/CrystalCostState.cs index 74f8a4340..9ad124194 100644 --- a/Lib9c/Model/State/CrystalCostState.cs +++ b/Lib9c/Model/State/CrystalCostState.cs @@ -1,7 +1,7 @@ using System; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/CrystalRandomSkillState.cs b/Lib9c/Model/State/CrystalRandomSkillState.cs index 82999706a..93b7e2988 100644 --- a/Lib9c/Model/State/CrystalRandomSkillState.cs +++ b/Lib9c/Model/State/CrystalRandomSkillState.cs @@ -3,7 +3,7 @@ using Bencodex.Types; using Nekoyume.TableData.Crystal; using System.Linq; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.TableData; using Nekoyume.Model.Skill; diff --git a/Lib9c/Model/State/GameConfigState.cs b/Lib9c/Model/State/GameConfigState.cs index 2f1ab2af1..c7cd3b0e1 100644 --- a/Lib9c/Model/State/GameConfigState.cs +++ b/Lib9c/Model/State/GameConfigState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.TableData; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/GoldBalanceState.cs b/Lib9c/Model/State/GoldBalanceState.cs index 2d1ec533c..5dedc49ba 100644 --- a/Lib9c/Model/State/GoldBalanceState.cs +++ b/Lib9c/Model/State/GoldBalanceState.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Immutable; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/GoldCurrencyState.cs b/Lib9c/Model/State/GoldCurrencyState.cs index 848888059..65c426ce3 100644 --- a/Lib9c/Model/State/GoldCurrencyState.cs +++ b/Lib9c/Model/State/GoldCurrencyState.cs @@ -4,8 +4,8 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Crypto; +using Libplanet.Types.Assets; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/HammerPointState.cs b/Lib9c/Model/State/HammerPointState.cs index 2a9beaad6..b0e3d8ccc 100644 --- a/Lib9c/Model/State/HammerPointState.cs +++ b/Lib9c/Model/State/HammerPointState.cs @@ -1,6 +1,6 @@ using System; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.TableData.Crystal; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/ItemSlotState.cs b/Lib9c/Model/State/ItemSlotState.cs index 384419d17..351a3a73e 100644 --- a/Lib9c/Model/State/ItemSlotState.cs +++ b/Lib9c/Model/State/ItemSlotState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.EnumType; diff --git a/Lib9c/Model/State/MarketState.cs b/Lib9c/Model/State/MarketState.cs index c48af62dd..4eca60585 100644 --- a/Lib9c/Model/State/MarketState.cs +++ b/Lib9c/Model/State/MarketState.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/MonsterCollectionResult.cs b/Lib9c/Model/State/MonsterCollectionResult.cs index a26a19ac7..dcae54b3b 100644 --- a/Lib9c/Model/State/MonsterCollectionResult.cs +++ b/Lib9c/Model/State/MonsterCollectionResult.cs @@ -3,7 +3,7 @@ using System.Linq; using Bencodex.Types; using Lib9c; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.TableData; diff --git a/Lib9c/Model/State/MonsterCollectionState.cs b/Lib9c/Model/State/MonsterCollectionState.cs index 31334ea23..640c987e2 100644 --- a/Lib9c/Model/State/MonsterCollectionState.cs +++ b/Lib9c/Model/State/MonsterCollectionState.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/State/MonsterCollectionState0.cs b/Lib9c/Model/State/MonsterCollectionState0.cs index 3d568d00d..f6cf3b64b 100644 --- a/Lib9c/Model/State/MonsterCollectionState0.cs +++ b/Lib9c/Model/State/MonsterCollectionState0.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.TableData; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/State/PendingActivationState.cs b/Lib9c/Model/State/PendingActivationState.cs index 7e287c55e..f10ced760 100644 --- a/Lib9c/Model/State/PendingActivationState.cs +++ b/Lib9c/Model/State/PendingActivationState.cs @@ -4,7 +4,6 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; using Libplanet.Crypto; using Nekoyume.Action; diff --git a/Lib9c/Model/State/PetState.cs b/Lib9c/Model/State/PetState.cs index bd7ea3c21..6f4d5937d 100644 --- a/Lib9c/Model/State/PetState.cs +++ b/Lib9c/Model/State/PetState.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/RaiderState.cs b/Lib9c/Model/State/RaiderState.cs index 475e9403b..bcdb65e34 100644 --- a/Lib9c/Model/State/RaiderState.cs +++ b/Lib9c/Model/State/RaiderState.cs @@ -1,6 +1,6 @@ using System; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Helper; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/RankingMapState.cs b/Lib9c/Model/State/RankingMapState.cs index c703973d0..c2d81ceb4 100644 --- a/Lib9c/Model/State/RankingMapState.cs +++ b/Lib9c/Model/State/RankingMapState.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.Model.State { diff --git a/Lib9c/Model/State/RankingState.cs b/Lib9c/Model/State/RankingState.cs index 579c57f2f..8b7ed1e75 100644 --- a/Lib9c/Model/State/RankingState.cs +++ b/Lib9c/Model/State/RankingState.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/RankingState0.cs b/Lib9c/Model/State/RankingState0.cs index d302d016a..6e14d0e3b 100644 --- a/Lib9c/Model/State/RankingState0.cs +++ b/Lib9c/Model/State/RankingState0.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/RankingState1.cs b/Lib9c/Model/State/RankingState1.cs index 876864449..aa0c2c14e 100644 --- a/Lib9c/Model/State/RankingState1.cs +++ b/Lib9c/Model/State/RankingState1.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/RedeemCodeState.cs b/Lib9c/Model/State/RedeemCodeState.cs index 7554b3646..ca62beb5b 100644 --- a/Lib9c/Model/State/RedeemCodeState.cs +++ b/Lib9c/Model/State/RedeemCodeState.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Runtime.Serialization; using Bencodex.Types; -using Libplanet; +using Libplanet.Common; using Libplanet.Crypto; using Nekoyume.TableData; diff --git a/Lib9c/Model/State/RuneSlotState.cs b/Lib9c/Model/State/RuneSlotState.cs index 70842120c..f6a0027ad 100644 --- a/Lib9c/Model/State/RuneSlotState.cs +++ b/Lib9c/Model/State/RuneSlotState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.EnumType; using Nekoyume.Model.Rune; diff --git a/Lib9c/Model/State/RuneState.cs b/Lib9c/Model/State/RuneState.cs index 0279849eb..cf4507ce8 100644 --- a/Lib9c/Model/State/RuneState.cs +++ b/Lib9c/Model/State/RuneState.cs @@ -1,5 +1,5 @@ using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/ShardedShopState.cs b/Lib9c/Model/State/ShardedShopState.cs index b44646d60..a2bb45650 100644 --- a/Lib9c/Model/State/ShardedShopState.cs +++ b/Lib9c/Model/State/ShardedShopState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.Item; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/State/ShardedShopStateV2.cs b/Lib9c/Model/State/ShardedShopStateV2.cs index 8d1e22406..0ba3c8c8c 100644 --- a/Lib9c/Model/State/ShardedShopStateV2.cs +++ b/Lib9c/Model/State/ShardedShopStateV2.cs @@ -3,7 +3,7 @@ using System.Linq; using Bencodex.Types; using Lib9c.Model.Order; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Model.Item; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/State/ShopState.cs b/Lib9c/Model/State/ShopState.cs index 6e09398d3..6f16d3134 100644 --- a/Lib9c/Model/State/ShopState.cs +++ b/Lib9c/Model/State/ShopState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Model.Item; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/StakeState.cs b/Lib9c/Model/State/StakeState.cs index 5af685413..f1c0fb98e 100644 --- a/Lib9c/Model/State/StakeState.cs +++ b/Lib9c/Model/State/StakeState.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using static Lib9c.SerializeKeys; diff --git a/Lib9c/Model/State/State.cs b/Lib9c/Model/State/State.cs index b2fb24dad..93090cda4 100644 --- a/Lib9c/Model/State/State.cs +++ b/Lib9c/Model/State/State.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using static Lib9c.SerializeKeys; namespace Nekoyume.Model.State diff --git a/Lib9c/Model/State/StateExtensions.cs b/Lib9c/Model/State/StateExtensions.cs index 67b24f709..bfd5697c1 100644 --- a/Lib9c/Model/State/StateExtensions.cs +++ b/Lib9c/Model/State/StateExtensions.cs @@ -4,15 +4,13 @@ using System.Globalization; using System.Linq; using System.Numerics; -using System.Runtime.CompilerServices; using System.Security.Cryptography; using System.Text; using Bencodex.Types; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; using Libplanet.Crypto; +using Libplanet.Types.Assets; using Nekoyume.Action; -using Nekoyume.Model.Elemental; using Nekoyume.Model.Item; using Nekoyume.Model.Stat; diff --git a/Lib9c/Model/State/WeeklyArenaState.cs b/Lib9c/Model/State/WeeklyArenaState.cs index bd4e75dfa..9c5f385de 100644 --- a/Lib9c/Model/State/WeeklyArenaState.cs +++ b/Lib9c/Model/State/WeeklyArenaState.cs @@ -5,7 +5,7 @@ using System.Runtime.Serialization; using Bencodex; using Bencodex.Types; -using Libplanet; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.TableData; using LazyArenaInfo = diff --git a/Lib9c/Model/State/WorldBossKillRewardRecord.cs b/Lib9c/Model/State/WorldBossKillRewardRecord.cs index 7d17683a2..c7be17744 100644 --- a/Lib9c/Model/State/WorldBossKillRewardRecord.cs +++ b/Lib9c/Model/State/WorldBossKillRewardRecord.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; namespace Nekoyume.Model.State { diff --git a/Lib9c/TableData/Garages/LoadIntoMyGaragesCostSheet.cs b/Lib9c/TableData/Garages/LoadIntoMyGaragesCostSheet.cs index 588257c7b..213368885 100644 --- a/Lib9c/TableData/Garages/LoadIntoMyGaragesCostSheet.cs +++ b/Lib9c/TableData/Garages/LoadIntoMyGaragesCostSheet.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Security.Cryptography; using Lib9c; -using Libplanet; -using Libplanet.Assets; +using Libplanet.Common; +using Libplanet.Types.Assets; using static Nekoyume.TableData.TableExtensions; namespace Nekoyume.TableData.Garages diff --git a/Lib9c/TableData/GrandFinale/GrandFinaleParticipantsSheet.cs b/Lib9c/TableData/GrandFinale/GrandFinaleParticipantsSheet.cs index 82c658094..bbc7d5a25 100644 --- a/Lib9c/TableData/GrandFinale/GrandFinaleParticipantsSheet.cs +++ b/Lib9c/TableData/GrandFinale/GrandFinaleParticipantsSheet.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Libplanet; +using Libplanet.Crypto; namespace Nekoyume.TableData.GrandFinale { diff --git a/Lib9c/TableData/IStakeRewardRow.cs b/Lib9c/TableData/IStakeRewardRow.cs index 5db6f14b7..525ad1a39 100644 --- a/Lib9c/TableData/IStakeRewardRow.cs +++ b/Lib9c/TableData/IStakeRewardRow.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Action; namespace Nekoyume.TableData diff --git a/Lib9c/TableData/Item/MaterialItemSheet.cs b/Lib9c/TableData/Item/MaterialItemSheet.cs index ac91ead53..672364fab 100644 --- a/Lib9c/TableData/Item/MaterialItemSheet.cs +++ b/Lib9c/TableData/Item/MaterialItemSheet.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.Serialization; using System.Security.Cryptography; using Bencodex; using Bencodex.Types; -using Libplanet; +using Libplanet.Common; using Nekoyume.Model.Item; namespace Nekoyume.TableData diff --git a/Lib9c/TableData/RedeemCodeListSheet.cs b/Lib9c/TableData/RedeemCodeListSheet.cs index d00ca1a0c..b7f95fd12 100644 --- a/Lib9c/TableData/RedeemCodeListSheet.cs +++ b/Lib9c/TableData/RedeemCodeListSheet.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using Bencodex.Types; -using Libplanet; +using Libplanet.Common; using Libplanet.Crypto; using Nekoyume.Model.State; using static Nekoyume.TableData.TableExtensions; diff --git a/Lib9c/TableData/StakeAchievementRewardSheet.cs b/Lib9c/TableData/StakeAchievementRewardSheet.cs index a1f356a75..5c6d783c2 100644 --- a/Lib9c/TableData/StakeAchievementRewardSheet.cs +++ b/Lib9c/TableData/StakeAchievementRewardSheet.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using static Nekoyume.TableData.TableExtensions; using static Lib9c.SerializeKeys; diff --git a/Lib9c/TableData/StakeRegularFixedRewardSheet.cs b/Lib9c/TableData/StakeRegularFixedRewardSheet.cs index 39b5f2b58..68f768a71 100644 --- a/Lib9c/TableData/StakeRegularFixedRewardSheet.cs +++ b/Lib9c/TableData/StakeRegularFixedRewardSheet.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Bencodex.Types; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Model.State; using static Nekoyume.TableData.TableExtensions; using static Lib9c.SerializeKeys; diff --git a/Lib9c/TableData/WorldBossRankingRewardSheet.cs b/Lib9c/TableData/WorldBossRankingRewardSheet.cs index 693f49b98..066e76379 100644 --- a/Lib9c/TableData/WorldBossRankingRewardSheet.cs +++ b/Lib9c/TableData/WorldBossRankingRewardSheet.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Libplanet.Assets; +using Libplanet.Types.Assets; using Nekoyume.Helper; using static Nekoyume.TableData.TableExtensions; diff --git a/Libplanet.Crypto.Secp256k1/Secp256K1CryptoBackend.cs b/Libplanet.Crypto.Secp256k1/Secp256K1CryptoBackend.cs index 492998e5a..501e48b1f 100644 --- a/Libplanet.Crypto.Secp256k1/Secp256K1CryptoBackend.cs +++ b/Libplanet.Crypto.Secp256k1/Secp256K1CryptoBackend.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Security.Cryptography; -using Libplanet; using Secp256k1Net; +using Libplanet.Common; using Libplanet.Crypto; namespace Nekoyume.Blockchain From b0f4fa21ce2b982eed6350fc06397f56a1cff6da Mon Sep 17 00:00:00 2001 From: ilgyu Date: Fri, 21 Jul 2023 18:59:35 +0900 Subject: [PATCH 10/33] bump: Libplanet 3.0.1 --- .Libplanet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Libplanet b/.Libplanet index 2944cbdfc..6a4005d9c 160000 --- a/.Libplanet +++ b/.Libplanet @@ -1 +1 @@ -Subproject commit 2944cbdfc0856cfea856725e91ccfa35e9d22e97 +Subproject commit 6a4005d9c54b5f043d14a6adfa26be6b86f0c33c From 2a2881cbdebe95168ba197628d00a5df1a5a5627 Mon Sep 17 00:00:00 2001 From: ilgyu Date: Fri, 21 Jul 2023 19:43:34 +0900 Subject: [PATCH 11/33] fix: Fix using statements --- .../Action/CreateOrReplaceAvatarTest.cs | 3 +-- .Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs | 3 +-- .Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs | 3 +-- .Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs | 3 +-- Lib9c.DevExtensions/Action/CreateArenaDummy.cs | 5 ++--- Lib9c.DevExtensions/Action/CreateTestbed.cs | 3 +-- Lib9c.DevExtensions/Utils.cs | 3 +-- 7 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs index bbe87e7bf..c29ae8f77 100644 --- a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs @@ -6,10 +6,9 @@ using Bencodex.Types; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; +using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Types.Assets; -using Libplanet.Crypto; -using Libplanet.Action.State; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs b/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs index 96e85635f..5218acce4 100644 --- a/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs @@ -1,10 +1,9 @@ using System.Collections.Immutable; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; +using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Types.Assets; -using Libplanet.Crypto; -using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Model.State; using Serilog; diff --git a/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs b/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs index 3913bbd01..f3891e871 100644 --- a/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs @@ -4,9 +4,8 @@ using System.Linq; using Lib9c.DevExtensions.Action; using Lib9c.Tests.Action; -using Libplanet.Crypto; -using Libplanet.Crypto; using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Helper; diff --git a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs index 944052a5d..c7c41859f 100644 --- a/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs @@ -9,10 +9,9 @@ using Lib9c.Tests; using Lib9c.Tests.Action; using Lib9c.Tests.Util; +using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Types.Assets; -using Libplanet.Crypto; -using Libplanet.Action.State; using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model; diff --git a/Lib9c.DevExtensions/Action/CreateArenaDummy.cs b/Lib9c.DevExtensions/Action/CreateArenaDummy.cs index e5cc56dda..4ce182099 100644 --- a/Lib9c.DevExtensions/Action/CreateArenaDummy.cs +++ b/Lib9c.DevExtensions/Action/CreateArenaDummy.cs @@ -1,14 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Globalization; using System.Linq; using Bencodex.Types; using Lib9c.DevExtensions.Model; -using Libplanet.Crypto; using Libplanet.Action; -using Libplanet.Crypto; using Libplanet.Action.State; +using Libplanet.Crypto; using Nekoyume.Action; using Nekoyume.Extensions; using Nekoyume.Model.Arena; diff --git a/Lib9c.DevExtensions/Action/CreateTestbed.cs b/Lib9c.DevExtensions/Action/CreateTestbed.cs index 982d60a0a..c64c4918e 100644 --- a/Lib9c.DevExtensions/Action/CreateTestbed.cs +++ b/Lib9c.DevExtensions/Action/CreateTestbed.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Globalization; @@ -14,7 +14,6 @@ using Nekoyume.Model.State; using Nekoyume.TableData; using static Lib9c.SerializeKeys; -using Libplanet.Crypto; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; diff --git a/Lib9c.DevExtensions/Utils.cs b/Lib9c.DevExtensions/Utils.cs index 5ea55e02d..3f3ed4c78 100644 --- a/Lib9c.DevExtensions/Utils.cs +++ b/Lib9c.DevExtensions/Utils.cs @@ -9,15 +9,14 @@ using Bencodex; using Cocona; using Lib9c.DevExtensions.Action.Loader; -using Libplanet.Crypto; using Libplanet.Action; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; -using Libplanet.Types.Blocks; using Libplanet.Crypto; using Libplanet.RocksDBStore; using Libplanet.Store; using Libplanet.Store.Trie; +using Libplanet.Types.Blocks; using Nekoyume.Blockchain.Policy; using Nekoyume.Model; using Nekoyume.Model.State; From 3e2cb2717171f0623bca782a88e2cd7221bef7aa Mon Sep 17 00:00:00 2001 From: moreal Date: Wed, 26 Jul 2023 14:30:41 +0900 Subject: [PATCH 12/33] ci(gh-actions): check typos in GitHub Actions --- .github/workflows/lint.yml | 11 +++++++++++ _typos.toml | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/workflows/lint.yml create mode 100644 _typos.toml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..826c57353 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,11 @@ +name: lint + +on: [push, pull_request] + +jobs: + typos: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Check typos + uses: crate-ci/typos@v1.15.5 diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 000000000..d1445d382 --- /dev/null +++ b/_typos.toml @@ -0,0 +1,19 @@ +[default] +extend-ignore-re = [ + "\\\"([a-zA-Z0-9][a-zA-Z0-9])+\\\"", # for hexadecimal string values. + "2nd" +] + +[default.extend-identifiers] +fo = "fo" # FungibleOrder + +[default.extend-words] +ba = "ba" # byte array +oce = "oce" # OperationCanceledException +ist = "ist" # ItemSubType +Equipments = "Equipments" # FIXME: Equipment is noncount word but our team doesn't have the policy about it. + +[files] +extend-exclude = [ + ".Libplanet/*" +] From 2986395904ea0f9a05bfc6db1a623445c3ce75a5 Mon Sep 17 00:00:00 2001 From: moreal Date: Wed, 26 Jul 2023 14:31:50 +0900 Subject: [PATCH 13/33] chore: fix typos --- Lib9c.Policy/Policy/IVariableSubPolicy.cs | 2 +- Lib9c/Action/EventMaterialItemCrafts.cs | 4 ++-- Lib9c/Action/ValidatorSetOperate.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib9c.Policy/Policy/IVariableSubPolicy.cs b/Lib9c.Policy/Policy/IVariableSubPolicy.cs index 7c3f013f5..d62936c20 100644 --- a/Lib9c.Policy/Policy/IVariableSubPolicy.cs +++ b/Lib9c.Policy/Policy/IVariableSubPolicy.cs @@ -81,7 +81,7 @@ public interface IVariableSubPolicy /// to check. /// true if is target for any /// in . Otherwise, - /// fase. + /// false. /// /// Call to this method must only be used sparingly and should be avoided /// if possible. Usage of this method indicates dependency coupling between two diff --git a/Lib9c/Action/EventMaterialItemCrafts.cs b/Lib9c/Action/EventMaterialItemCrafts.cs index 793ce61a8..1ae6a452a 100644 --- a/Lib9c/Action/EventMaterialItemCrafts.cs +++ b/Lib9c/Action/EventMaterialItemCrafts.cs @@ -187,7 +187,7 @@ public override IAccountStateDelta Execute(IActionContext context) var materialItemSheet = states.GetSheet(); if (!materialItemSheet.TryGetValue( recipeRow.ResultMaterialItemId, - out var resulMaterialRow)) + out var resultMaterialRow)) { throw new SheetRowNotFoundException( addressesHex, @@ -228,7 +228,7 @@ public override IAccountStateDelta Execute(IActionContext context) // ~Remove Required Materials // Create Material - var materialResult = ItemFactory.CreateMaterial(resulMaterialRow); + var materialResult = ItemFactory.CreateMaterial(resultMaterialRow); avatarState.inventory.AddItem(materialResult, recipeRow.ResultMaterialItemCount); // ~Create Material diff --git a/Lib9c/Action/ValidatorSetOperate.cs b/Lib9c/Action/ValidatorSetOperate.cs index 56743881c..71e329d04 100644 --- a/Lib9c/Action/ValidatorSetOperate.cs +++ b/Lib9c/Action/ValidatorSetOperate.cs @@ -152,7 +152,7 @@ public override void LoadPlainValue(IValue plainValue) Operator = op; // FIXME: This is a temporary code for backward compatibility. - Operand = BackwardCompability(operandDict); + Operand = BackwardCompatibility(operandDict); Error = null; } @@ -172,7 +172,7 @@ protected override void LoadPlainValueInternal(IImmutableDictionary Date: Thu, 27 Jul 2023 13:29:34 +0900 Subject: [PATCH 14/33] feat: introduce `Lib9c.StateService` moved from `planetarium/NineChronicles.Headless` --- .../Lib9c.StateService.Shared.csproj | 9 + .../RemoteEvaluationRequest.cs | 6 + .../RemoteEvaluationResponse.cs | 6 + .../Controllers/RemoteEvaluationController.cs | 52 ++++ .Lib9c.StateService/Lib9c.StateService.csproj | 20 ++ .Lib9c.StateService/Program.cs | 40 +++ .../Properties/launchSettings.json | 41 +++ .Lib9c.StateService/appsettings-schema.json | 11 + .../appsettings.Development.json | 8 + .Lib9c.StateService/appsettings.json | 10 + .../ActionEvaluationSerializerTest.cs | 49 +++ ...tionEvaluatorCommonComponents.Tests.csproj | 29 ++ .../Usings.cs | 1 + .../AccountDelta.cs | 65 ++++ .../AccountStateDelta.cs | 293 ++++++++++++++++++ .../AccountStateDeltaMarshaller.cs | 60 ++++ .../ActionContext.cs | 81 +++++ .../ActionContextMarshaller.cs | 77 +++++ .../ActionEvaluation.cs | 27 ++ .../ActionEvaluationMarshaller.cs | 60 ++++ ...ons.ActionEvaluatorCommonComponents.csproj | 13 + .../PreEvaluationBlockMarshaller.cs | 39 +++ .../Random.cs | 14 + .../TransactionMarshaller.cs | 23 ++ ...ensions.RemoteActionEvaluator.Tests.csproj | 29 ++ .../Usings.cs | 1 + .../AssemblyInfo.cs | 3 + ...et.Extensions.RemoteActionEvaluator.csproj | 15 + .../RemoteActionEvaluator.cs | 83 +++++ ...t.Extensions.RemoteBlockChainStates.csproj | 19 ++ .../RemoteBlockChainStates.cs | 47 +++ .../RemoteBlockState.cs | 219 +++++++++++++ Lib9c.sln | 42 +++ 33 files changed, 1492 insertions(+) create mode 100644 .Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj create mode 100644 .Lib9c.StateService.Shared/RemoteEvaluationRequest.cs create mode 100644 .Lib9c.StateService.Shared/RemoteEvaluationResponse.cs create mode 100644 .Lib9c.StateService/Controllers/RemoteEvaluationController.cs create mode 100644 .Lib9c.StateService/Lib9c.StateService.csproj create mode 100644 .Lib9c.StateService/Program.cs create mode 100644 .Lib9c.StateService/Properties/launchSettings.json create mode 100644 .Lib9c.StateService/appsettings-schema.json create mode 100644 .Lib9c.StateService/appsettings.Development.json create mode 100644 .Lib9c.StateService/appsettings.json create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/ActionEvaluationSerializerTest.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests.csproj create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Usings.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountDelta.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDeltaMarshaller.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContext.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContextMarshaller.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluation.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluationMarshaller.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/PreEvaluationBlockMarshaller.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/Random.cs create mode 100644 .Libplanet.Extensions.ActionEvaluatorCommonComponents/TransactionMarshaller.cs create mode 100644 .Libplanet.Extensions.RemoteActionEvaluator.Tests/Libplanet.Extensions.RemoteActionEvaluator.Tests.csproj create mode 100644 .Libplanet.Extensions.RemoteActionEvaluator.Tests/Usings.cs create mode 100644 .Libplanet.Extensions.RemoteActionEvaluator/AssemblyInfo.cs create mode 100644 .Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj create mode 100644 .Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs create mode 100644 .Libplanet.Extensions.RemoteBlockChainStates/Libplanet.Extensions.RemoteBlockChainStates.csproj create mode 100644 .Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs create mode 100644 .Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs diff --git a/.Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj b/.Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj new file mode 100644 index 000000000..132c02c59 --- /dev/null +++ b/.Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/.Lib9c.StateService.Shared/RemoteEvaluationRequest.cs b/.Lib9c.StateService.Shared/RemoteEvaluationRequest.cs new file mode 100644 index 000000000..e5cee6ebb --- /dev/null +++ b/.Lib9c.StateService.Shared/RemoteEvaluationRequest.cs @@ -0,0 +1,6 @@ +namespace Lib9c.StateService.Shared; + +public class RemoteEvaluationRequest +{ + public byte[] PreEvaluationBlock { get; set; } +} diff --git a/.Lib9c.StateService.Shared/RemoteEvaluationResponse.cs b/.Lib9c.StateService.Shared/RemoteEvaluationResponse.cs new file mode 100644 index 000000000..8aed77d19 --- /dev/null +++ b/.Lib9c.StateService.Shared/RemoteEvaluationResponse.cs @@ -0,0 +1,6 @@ +namespace Lib9c.StateService.Shared; + +public class RemoteEvaluationResponse +{ + public byte[][] Evaluations { get; set; } +} diff --git a/.Lib9c.StateService/Controllers/RemoteEvaluationController.cs b/.Lib9c.StateService/Controllers/RemoteEvaluationController.cs new file mode 100644 index 000000000..75adcc99a --- /dev/null +++ b/.Lib9c.StateService/Controllers/RemoteEvaluationController.cs @@ -0,0 +1,52 @@ +using Bencodex; +using Bencodex.Types; +using Lib9c.StateService.Shared; +using Libplanet.Action; +using Libplanet.Action.State; +using Libplanet.Extensions.ActionEvaluatorCommonComponents; +using Microsoft.AspNetCore.Mvc; +using Nekoyume.Action; +using Nekoyume.Action.Loader; + +namespace Lib9c.StateService.Controllers; + +[ApiController] +[Route("/evaluation")] +public class RemoteEvaluationController : ControllerBase +{ + private readonly IBlockChainStates _blockChainStates; + private readonly ILogger _logger; + private readonly Codec _codec; + + public RemoteEvaluationController( + IBlockChainStates blockChainStates, + ILogger logger, + Codec codec) + { + _blockChainStates = blockChainStates; + _logger = logger; + _codec = codec; + } + + [HttpPost] + public ActionResult GetEvaluation([FromBody] RemoteEvaluationRequest request) + { + var decoded = _codec.Decode(request.PreEvaluationBlock); + if (decoded is not Dictionary dictionary) + { + return StatusCode(StatusCodes.Status400BadRequest); + } + + var preEvaluationBlock = PreEvaluationBlockMarshaller.Unmarshal(dictionary); + var actionEvaluator = + new ActionEvaluator( + context => new RewardGold(), + _blockChainStates, + new NCActionLoader()); + return Ok(new RemoteEvaluationResponse + { + Evaluations = actionEvaluator.Evaluate(preEvaluationBlock).Select(ActionEvaluationMarshaller.Serialize) + .ToArray(), + }); + } +} diff --git a/.Lib9c.StateService/Lib9c.StateService.csproj b/.Lib9c.StateService/Lib9c.StateService.csproj new file mode 100644 index 000000000..f4385886e --- /dev/null +++ b/.Lib9c.StateService/Lib9c.StateService.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + diff --git a/.Lib9c.StateService/Program.cs b/.Lib9c.StateService/Program.cs new file mode 100644 index 000000000..a08391d0a --- /dev/null +++ b/.Lib9c.StateService/Program.cs @@ -0,0 +1,40 @@ +using Bencodex; +using Libplanet.Action.State; +using Libplanet.Extensions.RemoteBlockChainStates; + +var builder = WebApplication.CreateBuilder(args); + +builder.Configuration.AddEnvironmentVariables(); + +// Add services to the container. + +builder.Services.AddControllers(); +// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(); + +builder.Services.AddSingleton(); + +builder.Services.AddSingleton(_ => +{ + const string DefaultEndpoint = "http://localhost:31280/graphql/explorer"; + var endpoint = builder.Configuration.GetValue("RemoteBlockChainStatesEndpoint") ?? DefaultEndpoint; + return new RemoteBlockChainStates(new Uri(endpoint)); +}); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(); +} + +app.UseHttpsRedirection(); + +app.UseAuthorization(); + +app.MapControllers(); + +app.Run(); diff --git a/.Lib9c.StateService/Properties/launchSettings.json b/.Lib9c.StateService/Properties/launchSettings.json new file mode 100644 index 000000000..6a1d8fda1 --- /dev/null +++ b/.Lib9c.StateService/Properties/launchSettings.json @@ -0,0 +1,41 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:25712", + "sslPort": 44330 + } + }, + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "http://localhost:5157", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "swagger", + "applicationUrl": "https://localhost:7140;http://localhost:5157", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/.Lib9c.StateService/appsettings-schema.json b/.Lib9c.StateService/appsettings-schema.json new file mode 100644 index 000000000..168a36a46 --- /dev/null +++ b/.Lib9c.StateService/appsettings-schema.json @@ -0,0 +1,11 @@ +{ + "type": "object", + "description": "appsettings.json to configure application.", + "properties": { + "RemoteBlockChainStatesEndpoint": { + "type": "string", + "description": "The headless' Libplanet.Explorer GraphQL endpoint. (e.g., http://localhost/graphql/explorer)" + } + }, + "required": ["RemoteBlockChainStatesEndpoint"] +} diff --git a/.Lib9c.StateService/appsettings.Development.json b/.Lib9c.StateService/appsettings.Development.json new file mode 100644 index 000000000..0c208ae91 --- /dev/null +++ b/.Lib9c.StateService/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/.Lib9c.StateService/appsettings.json b/.Lib9c.StateService/appsettings.json new file mode 100644 index 000000000..e3001fa1a --- /dev/null +++ b/.Lib9c.StateService/appsettings.json @@ -0,0 +1,10 @@ +{ + "$schema": "./appsettings-schema.json", + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/ActionEvaluationSerializerTest.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/ActionEvaluationSerializerTest.cs new file mode 100644 index 000000000..a10649ffe --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/ActionEvaluationSerializerTest.cs @@ -0,0 +1,49 @@ +using System.Collections.Immutable; +using Bencodex.Types; +using Libplanet.Action; +using Libplanet.Crypto; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests; + +public class ActionEvaluationSerializerTest +{ + [Fact] + public void Serialization() + { + var addresses = Enumerable.Repeat(0, 4).Select(_ => new PrivateKey().ToAddress()).ToImmutableList(); + AccountStateDelta outputStates = (AccountStateDelta)new AccountStateDelta() + .SetState(addresses[0], Null.Value) + .SetState(addresses[1], (Text)"foo") + .SetState(addresses[2], new List((Text)"bar")); + + var previousStates = new AccountStateDelta(); + + var actionEvaluation = new ActionEvaluation( + Null.Value, + new ActionContext(null, + addresses[0], + null, + addresses[1], + 0, + 0, + false, + previousStates, + new Random(123), + null, + true), + outputStates, + new Libplanet.Action.UnexpectedlyTerminatedActionException("", null, null, null, null, new NullAction(), null)); + var serialized = ActionEvaluationMarshaller.Serialize(actionEvaluation); + var deserialized = ActionEvaluationMarshaller.Deserialize(serialized); + + Assert.Equal(Null.Value, deserialized.Action); + Assert.Equal(123, deserialized.InputContext.Random.Seed); + Assert.Equal(0, deserialized.InputContext.BlockIndex); + Assert.Equal(0, deserialized.InputContext.BlockProtocolVersion); + Assert.Equal(addresses[0], deserialized.InputContext.Signer); + Assert.Equal(addresses[1], deserialized.InputContext.Miner); + Assert.Equal(Null.Value, deserialized.OutputState.GetState(addresses[0])); + Assert.Equal((Text)"foo", deserialized.OutputState.GetState(addresses[1])); + Assert.Equal(new List((Text)"bar"), deserialized.OutputState.GetState(addresses[2])); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests.csproj b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests.csproj new file mode 100644 index 000000000..1dfcb77eb --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests.csproj @@ -0,0 +1,29 @@ + + + + net6.0 + enable + enable + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Usings.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Usings.cs new file mode 100644 index 000000000..c802f4480 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests/Usings.cs @@ -0,0 +1 @@ +global using Xunit; diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountDelta.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountDelta.cs new file mode 100644 index 000000000..0f9ed087b --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountDelta.cs @@ -0,0 +1,65 @@ +using System.Collections.Immutable; +using System.Numerics; +using Bencodex.Types; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; +using Libplanet.Action.State; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents +{ + public class AccountDelta : IAccountDelta + { + public AccountDelta() + { + States = ImmutableDictionary.Empty; + Fungibles = ImmutableDictionary<(Address, Currency), BigInteger>.Empty; + TotalSupplies = ImmutableDictionary.Empty; + ValidatorSet = null; + } + + public AccountDelta( + IImmutableDictionary statesDelta, + IImmutableDictionary<(Address, Currency), BigInteger> fungiblesDelta, + IImmutableDictionary totalSuppliesDelta, + ValidatorSet? validatorSetDelta) + { + States = statesDelta; + Fungibles = fungiblesDelta; + TotalSupplies = totalSuppliesDelta; + ValidatorSet = validatorSetDelta; + } + + /// + public IImmutableSet
UpdatedAddresses => + StateUpdatedAddresses.Union(FungibleUpdatedAddresses); + + /// + public IImmutableSet
StateUpdatedAddresses => + States.Keys.ToImmutableHashSet(); + + /// + public IImmutableDictionary States { get; } + + /// + public IImmutableSet
FungibleUpdatedAddresses => + Fungibles.Keys.Select(pair => pair.Item1).ToImmutableHashSet(); + + /// + public IImmutableSet<(Address, Currency)> UpdatedFungibleAssets => + Fungibles.Keys.ToImmutableHashSet(); + + /// + public IImmutableDictionary<(Address, Currency), BigInteger> Fungibles { get; } + + /// + public IImmutableSet UpdatedTotalSupplyCurrencies => + TotalSupplies.Keys.ToImmutableHashSet(); + + /// + public IImmutableDictionary TotalSupplies { get; } + + /// + public ValidatorSet? ValidatorSet { get; } + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs new file mode 100644 index 000000000..8a37cb91d --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDelta.cs @@ -0,0 +1,293 @@ +using System.Collections.Immutable; +using System.Numerics; +using Bencodex; +using Bencodex.Types; +using Libplanet.Action; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public class AccountStateDelta : IAccountStateDelta +{ + private IImmutableDictionary _states; + private IImmutableDictionary<(Address, Currency), BigInteger> _fungibles; + private IImmutableDictionary _totalSupplies; + private ValidatorSet? _validatorSet; + private IAccountDelta _delta; + + public IImmutableSet
UpdatedAddresses => _delta.UpdatedAddresses; + + public IImmutableSet
StateUpdatedAddresses => _delta.StateUpdatedAddresses; + + public IImmutableSet<(Address, Currency)> UpdatedFungibleAssets => _delta.UpdatedFungibleAssets; + +#pragma warning disable LAA1002 + public IImmutableSet<(Address, Currency)> TotalUpdatedFungibleAssets { get; } +#pragma warning restore LAA1002 + + public IImmutableSet UpdatedTotalSupplyCurrencies => _delta.UpdatedTotalSupplyCurrencies; + + public AccountStateDelta() + : this( + ImmutableDictionary.Empty, + ImmutableDictionary<(Address, Currency), BigInteger>.Empty, + ImmutableDictionary.Empty, + null) + { + } + + public AccountStateDelta( + IImmutableDictionary states, + IImmutableDictionary<(Address, Currency), BigInteger> fungibles, + IImmutableDictionary totalSupplies, + ValidatorSet? validatorSet + ) + { + _delta = new AccountDelta( + states, + fungibles, + totalSupplies, + validatorSet); + _states = states; + _fungibles = fungibles; + _totalSupplies = totalSupplies; + _validatorSet = validatorSet; + } + + public AccountStateDelta(Dictionary states, List fungibles, List totalSupplies, IValue validatorSet) + { + // This assumes `states` consists of only Binary keys: + _states = states + .ToImmutableDictionary( + kv => new Address(((Binary)kv.Key).ByteArray), + kv => kv.Value); + + _fungibles = fungibles + .Cast() + .Select(dict => + new KeyValuePair<(Address, Currency), BigInteger>( + ( + new Address(((Binary)dict["address"]).ByteArray), + new Currency(dict["currency"]) + ), + ((Integer)dict["amount"]).Value + )) + .ToImmutableDictionary(); + + // This assumes `totalSupplies` consists of only Binary keys: + _totalSupplies = totalSupplies + .Cast() + .Select(dict => + new KeyValuePair( + new Currency(dict["currency"]), + new BigInteger((Integer)dict["amount"]))) + .ToImmutableDictionary(); + + _validatorSet = validatorSet is Null + ? null + : new ValidatorSet(validatorSet); + + _delta = new AccountDelta( + _states, + _fungibles, + _totalSupplies, + _validatorSet); + } + + public AccountStateDelta(IValue serialized) + : this((Dictionary)serialized) + { + } + + public AccountStateDelta(Dictionary dict) + : this( + (Dictionary)dict["states"], + (List)dict["balances"], + (List)dict["totalSupplies"], + dict["validatorSet"]) + { + } + + public AccountStateDelta(byte[] bytes) + : this((Dictionary)new Codec().Decode(bytes)) + { + } + + public IAccountDelta Delta => _delta; + + public IValue? GetState(Address address) => + _states.ContainsKey(address) + ? _states[address] + : throw new NotSupportedException(); + + public IReadOnlyList GetStates(IReadOnlyList
addresses) => + addresses.Select(GetState).ToArray(); + + public IAccountStateDelta SetState(Address address, IValue state) => + new AccountStateDelta(_states.SetItem(address, state), _fungibles, _totalSupplies, _validatorSet); + public FungibleAssetValue GetBalance(Address address, Currency currency) + { + if (!_fungibles.TryGetValue((address, currency), out BigInteger rawValue)) + { + throw new NotSupportedException(); + } + + return FungibleAssetValue.FromRawValue(currency, rawValue); + } + + public FungibleAssetValue GetTotalSupply(Currency currency) + { + if (!currency.TotalSupplyTrackable) + { + var msg = + $"The total supply value of the currency {currency} is not trackable" + + " because it is a legacy untracked currency which might have been" + + " established before the introduction of total supply tracking support."; + throw new TotalSupplyNotTrackableException(msg, currency); + } + + // Return dirty state if it exists. + if (_totalSupplies.TryGetValue(currency, out var totalSupplyValue)) + { + return FungibleAssetValue.FromRawValue(currency, totalSupplyValue); + } + + throw new NotSupportedException(); + } + + public IAccountStateDelta MintAsset( + IActionContext context, Address recipient, FungibleAssetValue value) + { + // FIXME: 트랜잭션 서명자를 알아내 currency.AllowsToMint() 확인해서 CurrencyPermissionException + // 던지는 처리를 해야하는데 여기서 트랜잭션 서명자를 무슨 수로 가져올지 잘 모르겠음. + + var currency = value.Currency; + + if (value <= currency * 0) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + + var nextAmount = GetBalance(recipient, value.Currency) + value; + + if (currency.TotalSupplyTrackable) + { + var currentTotalSupply = GetTotalSupply(currency); + if (currency.MaximumSupply < currentTotalSupply + value) + { + var msg = $"The amount {value} attempted to be minted added to the current" + + $" total supply of {currentTotalSupply} exceeds the" + + $" maximum allowed supply of {currency.MaximumSupply}."; + throw new SupplyOverflowException(msg, value); + } + + return new AccountStateDelta( + _states, + _fungibles.SetItem( + (recipient, value.Currency), + nextAmount.RawValue + ), + _totalSupplies.SetItem(currency, (currentTotalSupply + value).RawValue), + _validatorSet + ); + } + + return new AccountStateDelta( + _states, + _fungibles.SetItem( + (recipient, value.Currency), + nextAmount.RawValue + ), + _totalSupplies, + _validatorSet + ); + } + + public IAccountStateDelta TransferAsset( + IActionContext context, + Address sender, + Address recipient, + FungibleAssetValue value, + bool allowNegativeBalance = false) + { + if (value.Sign <= 0) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + + FungibleAssetValue senderBalance = GetBalance(sender, value.Currency); + if (senderBalance < value) + { + throw new InsufficientBalanceException( + $"There is no sufficient balance for {sender}: {senderBalance} < {value}", + sender, + senderBalance + ); + } + + Currency currency = value.Currency; + FungibleAssetValue senderRemains = senderBalance - value; + FungibleAssetValue recipientRemains = GetBalance(recipient, currency) + value; + var balances = _fungibles + .SetItem((sender, currency), senderRemains.RawValue) + .SetItem((recipient, currency), recipientRemains.RawValue); + return new AccountStateDelta(_states, balances, _totalSupplies, _validatorSet); + } + + public IAccountStateDelta BurnAsset( + IActionContext context, Address owner, FungibleAssetValue value) + { + // FIXME: 트랜잭션 서명자를 알아내 currency.AllowsToMint() 확인해서 CurrencyPermissionException + // 던지는 처리를 해야하는데 여기서 트랜잭션 서명자를 무슨 수로 가져올지 잘 모르겠음. + + var currency = value.Currency; + + if (value <= currency * 0) + { + throw new ArgumentOutOfRangeException(nameof(value)); + } + + FungibleAssetValue balance = GetBalance(owner, currency); + if (balance < value) + { + throw new InsufficientBalanceException( + $"There is no sufficient balance for {owner}: {balance} < {value}", + owner, + value + ); + } + + FungibleAssetValue nextValue = balance - value; + return new AccountStateDelta( + _states, + _fungibles.SetItem( + (owner, currency), + nextValue.RawValue + ), + currency.TotalSupplyTrackable + ? _totalSupplies.SetItem( + currency, + (GetTotalSupply(currency) - value).RawValue) + : _totalSupplies, + _validatorSet + ); + } + + public ValidatorSet GetValidatorSet() + { + return _validatorSet ?? throw new NotSupportedException(); + } + + public IAccountStateDelta SetValidator(Validator validator) + { + return new AccountStateDelta( + _states, + _fungibles, + _totalSupplies, + GetValidatorSet().Update(validator) + ); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDeltaMarshaller.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDeltaMarshaller.cs new file mode 100644 index 000000000..20375ca89 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/AccountStateDeltaMarshaller.cs @@ -0,0 +1,60 @@ +using Bencodex; +using Bencodex.Types; +using Libplanet.Action.State; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public static class AccountStateDeltaMarshaller +{ + private static readonly Codec Codec = new Codec(); + + public static byte[] Serialize(this IAccountStateDelta value) + { + return Codec.Encode(Marshal(value)); + } + + public static IEnumerable Marshal(IEnumerable stateDeltas) + { + foreach (var stateDelta in stateDeltas) + { + var bdict = Marshal(stateDelta); + yield return bdict; + } + } + + public static Dictionary Marshal(IAccountStateDelta stateDelta) + { + var state = new Dictionary(stateDelta.Delta.States.Select( + kv => new KeyValuePair( + new Binary(kv.Key.ByteArray), + kv.Value))); + var balance = new List(stateDelta.Delta.Fungibles.Select( + kv => Dictionary.Empty + .Add("address", new Binary(kv.Key.Item1.ByteArray)) + .Add("currency", kv.Key.Item2.Serialize()) + .Add("amount", new Integer(kv.Value)))); + var totalSupply = new List(stateDelta.Delta.TotalSupplies.Select( + kv => Dictionary.Empty + .Add("currency", kv.Key.Serialize()) + .Add("amount", new Integer(kv.Value)))); + var bdict = Dictionary.Empty + .Add("states", state) + .Add("balances", balance) + .Add("totalSupplies", totalSupply) + .Add("validatorSet", stateDelta.Delta.ValidatorSet is { } validatorSet + ? validatorSet.Bencoded + : Null.Value); + return bdict; + } + + public static AccountStateDelta Unmarshal(IValue marshalled) + { + return new AccountStateDelta(marshalled); + } + + public static AccountStateDelta Deserialize(byte[] serialized) + { + var decoded = Codec.Decode(serialized); + return Unmarshal(decoded); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContext.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContext.cs new file mode 100644 index 000000000..20c5ce953 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContext.cs @@ -0,0 +1,81 @@ +using System.Security.Cryptography; +using Libplanet.Action; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Blocks; +using Libplanet.Action.State; +using Libplanet.Types.Tx; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public class ActionContext : IActionContext +{ + public ActionContext( + BlockHash? genesisHash, + Address signer, + TxId? txId, + Address miner, + long blockIndex, + int blockProtocolVersion, + bool rehearsal, + AccountStateDelta previousState, + IRandom random, + HashDigest? previousStateRootHash, + bool blockAction) + { + GenesisHash = genesisHash; + Signer = signer; + TxId = txId; + Miner = miner; + BlockIndex = blockIndex; + BlockProtocolVersion = blockProtocolVersion; + Rehearsal = rehearsal; + PreviousState = previousState; + Random = random; + PreviousStateRootHash = previousStateRootHash; + BlockAction = blockAction; + } + + public BlockHash? GenesisHash { get; } + public Address Signer { get; init; } + public TxId? TxId { get; } + public Address Miner { get; init; } + public long BlockIndex { get; init; } + public int BlockProtocolVersion { get; init; } + public bool Rehearsal { get; init; } + public AccountStateDelta PreviousState { get; init; } + IAccountStateDelta IActionContext.PreviousState => PreviousState; + public IRandom Random { get; init; } + public HashDigest? PreviousStateRootHash { get; init; } + public bool BlockAction { get; init; } + + public void PutLog(string log) + { + throw new NotImplementedException(); + } + + public void UseGas(long gas) + { + throw new NotImplementedException(); + } + + public IActionContext GetUnconsumedContext() + { + return new ActionContext( + GenesisHash, + Signer, + TxId, + Miner, + BlockIndex, + BlockProtocolVersion, + Rehearsal, + PreviousState, + new Random(Random.Seed), + PreviousStateRootHash, + BlockAction); + } + + public long GasUsed() => 0; + + public long GasLimit() => 0; +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContextMarshaller.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContextMarshaller.cs new file mode 100644 index 000000000..5444f70a7 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionContextMarshaller.cs @@ -0,0 +1,77 @@ +using System.Security.Cryptography; +using Bencodex; +using Bencodex.Types; +using Libplanet.Action; +using Libplanet.Common; +using Libplanet.Crypto; +using Libplanet.Types.Blocks; +using Libplanet.Types.Tx; +using Boolean = Bencodex.Types.Boolean; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public static class ActionContextMarshaller +{ + private static readonly Codec Codec = new Codec(); + + public static byte[] Serialize(this IActionContext actionContext) + { + return Codec.Encode(Marshal(actionContext)); + } + + public static Dictionary Marshal(this IActionContext actionContext) + { + var dictionary = Bencodex.Types.Dictionary.Empty + .Add("block_action", actionContext.BlockAction) + .Add("miner", actionContext.Miner.ToHex()) + .Add("rehearsal", actionContext.Rehearsal) + .Add("block_index", actionContext.BlockIndex) + .Add("block_protocol_version", actionContext.BlockProtocolVersion) + .Add("random_seed", actionContext.Random.Seed) + .Add("signer", actionContext.Signer.ToHex()) + .Add("previous_states", AccountStateDeltaMarshaller.Marshal(actionContext.PreviousState)); + + if (actionContext.TxId is { } txId) + { + dictionary = dictionary.Add("tx_id", txId.ByteArray); + } + + return dictionary; + } + + public static ActionContext Unmarshal(Dictionary dictionary) + { + return new ActionContext( + genesisHash: dictionary.TryGetValue((Text)"genesis_hash", out IValue genesisHashValue) && + genesisHashValue is Binary genesisHashBinaryValue + ? new BlockHash(genesisHashBinaryValue.ByteArray) + : null, + blockIndex: (Integer)dictionary["block_index"], + blockProtocolVersion: (Integer)dictionary["block_protocol_version"], + signer: new Address(((Text)dictionary["signer"]).Value), + txId: dictionary.TryGetValue((Text)"tx_id", out IValue txIdValue) && + txIdValue is Binary txIdBinaryValue + ? new TxId(txIdBinaryValue.ByteArray) + : null, + blockAction: (Boolean)dictionary["block_action"], + miner: new Address(((Text)dictionary["miner"]).Value), + rehearsal: (Boolean)dictionary["rehearsal"], + previousStateRootHash: dictionary.ContainsKey("previous_state_root_hash") + ? new HashDigest(((Binary)dictionary["previous_state_root_hash"]).ByteArray) + : null, + previousState: AccountStateDeltaMarshaller.Unmarshal(dictionary["previous_states"]), + random: new Random((Integer)dictionary["random_seed"]) + ); + } + + public static ActionContext Deserialize(byte[] serialized) + { + var decoded = Codec.Decode(serialized); + if (!(decoded is Dictionary dictionary)) + { + throw new ArgumentException($"Expected 'Dictionary' but {decoded.GetType().Name}", nameof(serialized)); + } + + return Unmarshal(dictionary); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluation.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluation.cs new file mode 100644 index 000000000..0daefb29f --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluation.cs @@ -0,0 +1,27 @@ +using Bencodex.Types; +using Libplanet.Action; +using Libplanet.Action.State; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public class ActionEvaluation : IActionEvaluation +{ + public ActionEvaluation( + IValue action, + ActionContext inputContext, + AccountStateDelta outputState, + Exception? exception) + { + Action = action; + InputContext = inputContext; + OutputState = outputState; + Exception = exception; + } + + public IValue Action { get; } + public ActionContext InputContext { get; } + IActionContext IActionEvaluation.InputContext => InputContext; + public AccountStateDelta OutputState { get; } + IAccountStateDelta IActionEvaluation.OutputState => OutputState; + public Exception? Exception { get; } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluationMarshaller.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluationMarshaller.cs new file mode 100644 index 000000000..d77199fac --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/ActionEvaluationMarshaller.cs @@ -0,0 +1,60 @@ +using Bencodex; +using Bencodex.Types; +using Libplanet.Action; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public static class ActionEvaluationMarshaller +{ + private static readonly Codec Codec = new Codec(); + + public static byte[] Serialize(this IActionEvaluation actionEvaluation) + { + return Codec.Encode(Marshal(actionEvaluation)); + } + + public static IEnumerable Marshal(this IEnumerable actionEvaluations) + { + var actionEvaluationsArray = actionEvaluations.ToArray(); + var outputStates = AccountStateDeltaMarshaller.Marshal(actionEvaluationsArray.Select(aev => aev.OutputState)); + var previousStates = AccountStateDeltaMarshaller.Marshal(actionEvaluationsArray.Select(aev => aev.InputContext.PreviousState)); + foreach (var actionEvaluation in actionEvaluationsArray) + { + yield return Dictionary.Empty + .Add("action", actionEvaluation.Action) + .Add("output_states", AccountStateDeltaMarshaller.Marshal(actionEvaluation.OutputState)) + .Add("input_context", ActionContextMarshaller.Marshal(actionEvaluation.InputContext)) + .Add("exception", actionEvaluation.Exception?.GetType().FullName is { } typeName ? (Text)typeName : Null.Value); + } + } + + public static Dictionary Marshal(this IActionEvaluation actionEvaluation) + { + return Dictionary.Empty + .Add("action", actionEvaluation.Action) + .Add("output_states", AccountStateDeltaMarshaller.Marshal(actionEvaluation.OutputState)) + .Add("input_context", ActionContextMarshaller.Marshal(actionEvaluation.InputContext)) + .Add("exception", actionEvaluation.Exception?.GetType().FullName is { } typeName ? (Text)typeName : Null.Value); + } + + public static ActionEvaluation Unmarshal(IValue value) + { + if (value is not Dictionary dictionary) + { + throw new ArgumentException(nameof(value)); + } + + return new ActionEvaluation( + dictionary["action"], + ActionContextMarshaller.Unmarshal((Dictionary)dictionary["input_context"]), + AccountStateDeltaMarshaller.Unmarshal(dictionary["output_states"]), + dictionary["exception"] is Text typeName ? new Exception(typeName) : null + ); + } + + public static ActionEvaluation Deserialize(byte[] serialized) + { + var decoded = Codec.Decode(serialized); + return Unmarshal(decoded); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj new file mode 100644 index 000000000..9c6e17ed8 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/PreEvaluationBlockMarshaller.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/PreEvaluationBlockMarshaller.cs new file mode 100644 index 000000000..dc34196bf --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/PreEvaluationBlockMarshaller.cs @@ -0,0 +1,39 @@ +using Bencodex; +using Bencodex.Types; +using Libplanet.Types.Blocks; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public static class PreEvaluationBlockMarshaller +{ + private static readonly Codec Codec = new Codec(); + + // Copied form Libplanet/Blocks/BlockMarshaler.cs + // Block fields: + private static readonly byte[] HeaderKey = { 0x48 }; // 'H' + private static readonly byte[] TransactionsKey = { 0x54 }; // 'T' + + public static Dictionary Marshal(this IPreEvaluationBlock block) + { + return Dictionary.Empty + .Add(HeaderKey, BlockMarshaler.MarshalPreEvaluationBlockHeader(block)) + .Add(TransactionsKey, new List(block.Transactions.Select(TransactionMarshaller.Serialize))); + } + + public static IPreEvaluationBlock Unmarshal(Dictionary dictionary) + { + return new PreEvaluationBlock( + BlockMarshaler.UnmarshalPreEvaluationBlockHeader((Dictionary)dictionary[HeaderKey]), + BlockMarshaler.UnmarshalBlockTransactions(dictionary)); + } + + public static byte[] Serialize(this IPreEvaluationBlock block) + { + return Codec.Encode(Marshal(block)); + } + + public static IPreEvaluationBlock Deserialize(byte[] serialized) + { + return Unmarshal((Dictionary)Codec.Decode(serialized)); + } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Random.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Random.cs new file mode 100644 index 000000000..f1006cc56 --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/Random.cs @@ -0,0 +1,14 @@ +using Libplanet.Action; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public class Random : System.Random, IRandom +{ + public Random(int seed) + : base(seed) + { + Seed = seed; + } + + public int Seed { get; private set; } +} diff --git a/.Libplanet.Extensions.ActionEvaluatorCommonComponents/TransactionMarshaller.cs b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/TransactionMarshaller.cs new file mode 100644 index 000000000..a203f523d --- /dev/null +++ b/.Libplanet.Extensions.ActionEvaluatorCommonComponents/TransactionMarshaller.cs @@ -0,0 +1,23 @@ +using Bencodex; +using Bencodex.Types; +using Libplanet.Types.Tx; + +namespace Libplanet.Extensions.ActionEvaluatorCommonComponents; + +public static class TransactionMarshaller +{ + private static readonly Codec Codec = new Codec(); + + // Copied from Libplanet/Tx/TxMarshaler.cs + private static readonly Binary SignatureKey = new byte[] { 0x53 }; // 'S' + + public static Dictionary Marshal(this ITransaction transaction) + { + return transaction.MarshalUnsignedTx().Add(SignatureKey, transaction.Signature); + } + + public static byte[] Serialize(this ITransaction transaction) + { + return Codec.Encode(Marshal(transaction)); + } +} diff --git a/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Libplanet.Extensions.RemoteActionEvaluator.Tests.csproj b/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Libplanet.Extensions.RemoteActionEvaluator.Tests.csproj new file mode 100644 index 000000000..bf79b854e --- /dev/null +++ b/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Libplanet.Extensions.RemoteActionEvaluator.Tests.csproj @@ -0,0 +1,29 @@ + + + + net6.0 + enable + enable + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Usings.cs b/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Usings.cs new file mode 100644 index 000000000..c802f4480 --- /dev/null +++ b/.Libplanet.Extensions.RemoteActionEvaluator.Tests/Usings.cs @@ -0,0 +1 @@ +global using Xunit; diff --git a/.Libplanet.Extensions.RemoteActionEvaluator/AssemblyInfo.cs b/.Libplanet.Extensions.RemoteActionEvaluator/AssemblyInfo.cs new file mode 100644 index 000000000..632c7b018 --- /dev/null +++ b/.Libplanet.Extensions.RemoteActionEvaluator/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Libplanet.Extensions.RemoteActionEvaluator.Tests")] diff --git a/.Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj b/.Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj new file mode 100644 index 000000000..3e68102fe --- /dev/null +++ b/.Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj @@ -0,0 +1,15 @@ + + + + net6.0 + enable + enable + + + + + + + + + diff --git a/.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs b/.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs new file mode 100644 index 000000000..4fd8a3871 --- /dev/null +++ b/.Libplanet.Extensions.RemoteActionEvaluator/RemoteActionEvaluator.cs @@ -0,0 +1,83 @@ +using System.Collections.Immutable; +using System.Diagnostics.Contracts; +using System.Net.Http.Json; +using Bencodex.Types; +using Lib9c.StateService.Shared; +using Libplanet.Action; +using Libplanet.Action.Loader; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; +using Libplanet.Extensions.ActionEvaluatorCommonComponents; + +namespace Libplanet.Extensions.RemoteActionEvaluator; + +public class RemoteActionEvaluator : IActionEvaluator +{ + private readonly Uri _endpoint; + private readonly IBlockChainStates _blockChainStates; + + public RemoteActionEvaluator(Uri endpoint, IBlockChainStates blockChainStates) + { + _endpoint = endpoint; + _blockChainStates = blockChainStates; + } + + public IActionLoader ActionLoader => throw new NotSupportedException(); + + public IReadOnlyList Evaluate(IPreEvaluationBlock block) + { + using var httpClient = new HttpClient(); + var response = httpClient.PostAsJsonAsync(_endpoint, new RemoteEvaluationRequest + { + PreEvaluationBlock = PreEvaluationBlockMarshaller.Serialize(block), + }).Result; + var evaluationResponse = response.Content.ReadFromJsonAsync().Result; + + var actionEvaluations = evaluationResponse.Evaluations.Select(ActionEvaluationMarshaller.Deserialize) + .ToImmutableList(); + + return actionEvaluations; + } + + [Pure] + private static IReadOnlyList NullAccountStateGetter( + IReadOnlyList
addresses + ) => + new IValue?[addresses.Count]; + + [Pure] + private static FungibleAssetValue NullAccountBalanceGetter( + Address address, + Currency currency + ) => + currency * 0; + + [Pure] + private static FungibleAssetValue NullTotalSupplyGetter(Currency currency) + { + if (!currency.TotalSupplyTrackable) + { + throw WithDefaultMessage(currency); + } + + return currency * 0; + } + + [Pure] + private static ValidatorSet NullValidatorSetGetter() + { + return new ValidatorSet(); + } + + private static TotalSupplyNotTrackableException WithDefaultMessage(Currency currency) + { + var msg = + $"The total supply value of the currency {currency} is not trackable because it" + + " is a legacy untracked currency which might have been established before" + + " the introduction of total supply tracking support."; + return new TotalSupplyNotTrackableException(msg, currency); + } +} diff --git a/.Libplanet.Extensions.RemoteBlockChainStates/Libplanet.Extensions.RemoteBlockChainStates.csproj b/.Libplanet.Extensions.RemoteBlockChainStates/Libplanet.Extensions.RemoteBlockChainStates.csproj new file mode 100644 index 000000000..5eb43e180 --- /dev/null +++ b/.Libplanet.Extensions.RemoteBlockChainStates/Libplanet.Extensions.RemoteBlockChainStates.csproj @@ -0,0 +1,19 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + diff --git a/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs new file mode 100644 index 000000000..040b02207 --- /dev/null +++ b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockChainStates.cs @@ -0,0 +1,47 @@ +using Bencodex.Types; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; + +namespace Libplanet.Extensions.RemoteBlockChainStates +{ + public class RemoteBlockChainStates : IBlockChainStates + { + private readonly Uri _explorerEndpoint; + + public RemoteBlockChainStates(Uri explorerEndpoint) + { + _explorerEndpoint = explorerEndpoint; + } + + public IValue? GetState(Address address, BlockHash? offset) => + GetStates(new[] { address }, offset).First(); + + public IReadOnlyList GetStates(IReadOnlyList
addresses, BlockHash? offset) + { + return new RemoteBlockState(_explorerEndpoint, offset).GetStates(addresses); + } + + public FungibleAssetValue GetBalance(Address address, Currency currency, BlockHash? offset) + { + return new RemoteBlockState(_explorerEndpoint, offset).GetBalance(address, currency); + } + + public FungibleAssetValue GetTotalSupply(Currency currency, BlockHash? offset) + { + return new RemoteBlockState(_explorerEndpoint, offset).GetTotalSupply(currency); + } + + public ValidatorSet GetValidatorSet(BlockHash? offset) + { + return new RemoteBlockState(_explorerEndpoint, offset).GetValidatorSet(); + } + + public IBlockState GetBlockState(BlockHash? offset) + { + return new RemoteBlockState(_explorerEndpoint, offset); + } + } +} diff --git a/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs new file mode 100644 index 000000000..08e047e54 --- /dev/null +++ b/.Libplanet.Extensions.RemoteBlockChainStates/RemoteBlockState.cs @@ -0,0 +1,219 @@ +using Bencodex; +using Bencodex.Types; +using GraphQL; +using GraphQL.Client.Http; +using GraphQL.Client.Serializer.SystemTextJson; +using Libplanet.Action.State; +using Libplanet.Common; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; +using Libplanet.Crypto; + +namespace Libplanet.Extensions.RemoteBlockChainStates; + +public class RemoteBlockState : IBlockState +{ + private readonly Uri _explorerEndpoint; + private readonly GraphQLHttpClient _graphQlHttpClient; + + public RemoteBlockState(Uri explorerEndpoint, BlockHash? blockHash) + { + _explorerEndpoint = explorerEndpoint; + _graphQlHttpClient = + new GraphQLHttpClient(_explorerEndpoint, new SystemTextJsonSerializer()); + BlockHash = blockHash; + } + + public IValue? GetState(Address address) => + GetStates(new[] { address }).First(); + + public IReadOnlyList GetStates(IReadOnlyList
addresses) + { + var response = _graphQlHttpClient.SendQueryAsync( + new GraphQLRequest( + @"query GetStates($addresses: [Address!]!, $offsetBlockHash: ID!) + { + stateQuery + { + states(addresses: $addresses, offsetBlockHash: $offsetBlockHash) + } + }", + operationName: "GetStates", + variables: new + { + addresses = addresses.Select(x => x.ToString()).ToArray(), + offsetBlockHash = BlockHash is { } hash + ? ByteUtil.Hex(hash.ByteArray) + : throw new NotSupportedException(), + })).Result; + var codec = new Codec(); + return response.Data.StateQuery.States + .Select(nullableState => nullableState is { } state ? codec.Decode(state) : null).ToList(); + } + + public FungibleAssetValue GetBalance(Address address, Currency currency) + { + object? currencyInput = currency.TotalSupplyTrackable ? new + { + ticker = currency.Ticker, + decimalPlaces = currency.DecimalPlaces, + minters = currency.Minters?.Select(addr => addr.ToString()).ToArray(), + totalSupplyTrackable = currency.TotalSupplyTrackable, + maximumSupplyMajorUnit = currency.MaximumSupply.Value.MajorUnit, + maximumSupplyMinorUnit = currency.MaximumSupply.Value.MinorUnit, + } : new + { + ticker = currency.Ticker, + decimalPlaces = currency.DecimalPlaces, + minters = currency.Minters?.Select(addr => addr.ToString()).ToArray(), + totalSupplyTrackable = currency.TotalSupplyTrackable, + }; + var response = _graphQlHttpClient.SendQueryAsync( + new GraphQLRequest( + @"query GetBalance($owner: Address!, $currency: CurrencyInput!, $offsetBlockHash: ID!) + { + stateQuery + { + balance(owner: $owner, currency: $currency, offsetBlockHash: $offsetBlockHash) + { + string + } + } + }", + operationName: "GetBalance", + variables: new + { + owner = address.ToString(), + currency = currencyInput, + offsetBlockHash = BlockHash is { } hash + ? ByteUtil.Hex(hash.ByteArray) + : throw new NotSupportedException(), + })).Result; + + return FungibleAssetValue.Parse(currency, response.Data.StateQuery.Balance.String.Split()[0]); + } + + public FungibleAssetValue GetTotalSupply(Currency currency) + { + object? currencyInput = currency.TotalSupplyTrackable ? new + { + ticker = currency.Ticker, + decimalPlaces = currency.DecimalPlaces, + minters = currency.Minters.Select(addr => addr.ToString()).ToArray(), + totalSupplyTrackable = currency.TotalSupplyTrackable, + maximumSupplyMajorUnit = currency.MaximumSupply.Value.MajorUnit, + maximumSupplyMinorUnit = currency.MaximumSupply.Value.MinorUnit, + } : new + { + ticker = currency.Ticker, + decimalPlaces = currency.DecimalPlaces, + minters = currency.Minters.Select(addr => addr.ToString()).ToArray(), + totalSupplyTrackable = currency.TotalSupplyTrackable, + }; + var response = _graphQlHttpClient.SendQueryAsync( + new GraphQLRequest( + @"query GetTotalSupply(currency: CurrencyInput!, $offsetBlockHash: ID!) + { + stateQuery + { + totalSupply(currency: $currency, offsetBlockHash: $offsetBlockHash) + { + string + } + } + }", + operationName: "GetTotalSupply", + variables: new + { + currency = currencyInput, + offsetBlockHash = BlockHash is { } hash + ? ByteUtil.Hex(hash.ByteArray) + : throw new NotSupportedException(), + })).Result; + + return FungibleAssetValue.Parse(currency, response.Data.StateQuery.TotalSupply.String.Split()[0]); + } + + public ValidatorSet GetValidatorSet() + { + var response = _graphQlHttpClient.SendQueryAsync( + new GraphQLRequest( + @"query GetValidators($offsetBlockHash: ID!) + { + stateQuery + { + validators(offsetBlockHash: $offsetBlockHash) + { + publicKey + power + } + } + }", + operationName: "GetValidators", + variables: new + { + offsetBlockHash = BlockHash is { } hash + ? ByteUtil.Hex(hash.ByteArray) + : throw new NotSupportedException(), + })).Result; + + return new ValidatorSet(response.Data.StateQuery.Validators + .Select(x => + new Validator(new PublicKey(ByteUtil.ParseHex(x.PublicKey)), x.Power)) + .ToList()); + } + + public BlockHash? BlockHash { get; } + + private class GetStatesResponseType + { + public StateQueryWithStatesType StateQuery { get; set; } + } + + private class StateQueryWithStatesType + { + public byte[][] States { get; set; } + } + + private class GetBalanceResponseType + { + public StateQueryWithBalanceType StateQuery { get; set; } + } + + private class StateQueryWithBalanceType + { + public FungibleAssetValueWithStringType Balance { get; set; } + } + + private class FungibleAssetValueWithStringType + { + public string String { get; set; } + } + + private class GetTotalSupplyResponseType + { + public StateQueryWithTotalSupplyType StateQuery { get; set; } + } + + private class StateQueryWithTotalSupplyType + { + public FungibleAssetValueWithStringType TotalSupply { get; set; } + } + + private class GetValidatorsResponseType + { + public StateQueryWithValidatorsType StateQuery { get; set; } + } + + private class StateQueryWithValidatorsType + { + public ValidatorType[] Validators { get; set; } + } + + private class ValidatorType + { + public string PublicKey { get; set; } + public long Power { get; set; } + } +} diff --git a/Lib9c.sln b/Lib9c.sln index 01508f9b6..37a3e8594 100644 --- a/Lib9c.sln +++ b/Lib9c.sln @@ -60,6 +60,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Types", ".Libplan EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Store", ".Libplanet\Libplanet.Store\Libplanet.Store.csproj", "{82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Extensions.ActionEvaluatorCommonComponents", ".Libplanet.Extensions.ActionEvaluatorCommonComponents\Libplanet.Extensions.ActionEvaluatorCommonComponents.csproj", "{64C44AFB-1E14-44D3-B236-A4A37DF2C27A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests", ".Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests\Libplanet.Extensions.ActionEvaluatorCommonComponents.Tests.csproj", "{EACB2E8D-9A13-491C-BACD-5D79C6C13783}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Extensions.RemoteActionEvaluator", ".Libplanet.Extensions.RemoteActionEvaluator\Libplanet.Extensions.RemoteActionEvaluator.csproj", "{0ED5DBA2-C334-40F2-8EB6-2B4D15C1AB4B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Extensions.RemoteActionEvaluator.Tests", ".Libplanet.Extensions.RemoteActionEvaluator.Tests\Libplanet.Extensions.RemoteActionEvaluator.Tests.csproj", "{3608A63A-A52D-4EB5-A96D-36C8F11CE603}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Libplanet.Extensions.RemoteBlockChainStates", ".Libplanet.Extensions.RemoteBlockChainStates\Libplanet.Extensions.RemoteBlockChainStates.csproj", "{63544447-4FCD-48D1-898C-974FBA6834AD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.StateService", ".Lib9c.StateService\Lib9c.StateService.csproj", "{EB97AB26-1C8F-48F5-97FF-8A6DF8FAB879}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib9c.StateService.Shared", ".Lib9c.StateService.Shared\Lib9c.StateService.Shared.csproj", "{5D3489AE-A403-4ADD-94E9-48463A42643E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -166,6 +180,34 @@ Global {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU {82BCD815-0AB6-4EEF-A12B-CDB9CD98EEA1}.Release|Any CPU.Build.0 = Release|Any CPU + {64C44AFB-1E14-44D3-B236-A4A37DF2C27A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {64C44AFB-1E14-44D3-B236-A4A37DF2C27A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {64C44AFB-1E14-44D3-B236-A4A37DF2C27A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {64C44AFB-1E14-44D3-B236-A4A37DF2C27A}.Release|Any CPU.Build.0 = Release|Any CPU + {EACB2E8D-9A13-491C-BACD-5D79C6C13783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EACB2E8D-9A13-491C-BACD-5D79C6C13783}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EACB2E8D-9A13-491C-BACD-5D79C6C13783}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EACB2E8D-9A13-491C-BACD-5D79C6C13783}.Release|Any CPU.Build.0 = Release|Any CPU + {0ED5DBA2-C334-40F2-8EB6-2B4D15C1AB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0ED5DBA2-C334-40F2-8EB6-2B4D15C1AB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0ED5DBA2-C334-40F2-8EB6-2B4D15C1AB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0ED5DBA2-C334-40F2-8EB6-2B4D15C1AB4B}.Release|Any CPU.Build.0 = Release|Any CPU + {3608A63A-A52D-4EB5-A96D-36C8F11CE603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3608A63A-A52D-4EB5-A96D-36C8F11CE603}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3608A63A-A52D-4EB5-A96D-36C8F11CE603}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3608A63A-A52D-4EB5-A96D-36C8F11CE603}.Release|Any CPU.Build.0 = Release|Any CPU + {63544447-4FCD-48D1-898C-974FBA6834AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63544447-4FCD-48D1-898C-974FBA6834AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63544447-4FCD-48D1-898C-974FBA6834AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63544447-4FCD-48D1-898C-974FBA6834AD}.Release|Any CPU.Build.0 = Release|Any CPU + {EB97AB26-1C8F-48F5-97FF-8A6DF8FAB879}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB97AB26-1C8F-48F5-97FF-8A6DF8FAB879}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB97AB26-1C8F-48F5-97FF-8A6DF8FAB879}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB97AB26-1C8F-48F5-97FF-8A6DF8FAB879}.Release|Any CPU.Build.0 = Release|Any CPU + {5D3489AE-A403-4ADD-94E9-48463A42643E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D3489AE-A403-4ADD-94E9-48463A42643E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D3489AE-A403-4ADD-94E9-48463A42643E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D3489AE-A403-4ADD-94E9-48463A42643E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 5a4c0fe824d8adcf6c5afee586f41d4bda49fc3a Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Thu, 27 Jul 2023 18:13:18 +0900 Subject: [PATCH 15/33] Bump libplanet to 3.1.0 --- .Libplanet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Libplanet b/.Libplanet index 6a4005d9c..a98718721 160000 --- a/.Libplanet +++ b/.Libplanet @@ -1 +1 @@ -Subproject commit 6a4005d9c54b5f043d14a6adfa26be6b86f0c33c +Subproject commit a987187212c0fd2aea272fe3a12bb3c27697fde3 From 0df2b135bdbae9f5835d9f67443686e1b8179d9d Mon Sep 17 00:00:00 2001 From: Say Cheong Date: Thu, 27 Jul 2023 18:24:36 +0900 Subject: [PATCH 16/33] Accommodate API changes --- .Lib9c.Benchmarks/Program.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.Lib9c.Benchmarks/Program.cs b/.Lib9c.Benchmarks/Program.cs index e3a5231bc..596a89b98 100644 --- a/.Lib9c.Benchmarks/Program.cs +++ b/.Lib9c.Benchmarks/Program.cs @@ -152,7 +152,7 @@ static void Main(string[] args) Console.WriteLine("Total elapsed\t{0}", ended - started); } - // Copied from BlockChain.SetStates(). + // Copied from BlockChain.DetermineBlockStateRootHash(). private static void SetStates( Guid chainId, IStore store, @@ -162,18 +162,12 @@ private static void SetStates( bool buildStateReferences ) { - IImmutableSet
stateUpdatedAddresses = actionEvaluations - .SelectMany(a => a.OutputState.Delta.StateUpdatedAddresses) - .ToImmutableHashSet(); - IImmutableSet<(Address, Currency)> updatedFungibleAssets = actionEvaluations - .SelectMany(a => a.OutputState.Delta.UpdatedFungibleAssets) - .ToImmutableHashSet(); + IImmutableDictionary totalDelta = actionEvaluations.GetRawTotalDelta(); if (!stateStore.ContainsStateRoot(block.StateRootHash)) { HashDigest? prevStateRootHash = store.GetStateRootHash(block.PreviousHash); - var totalDelta = GetTotalDelta(actionEvaluations, ToStateKey, ToFungibleAssetKey); - stateStore.Commit(prevStateRootHash, totalDelta); + ITrie stateRoot = stateStore.Commit(prevStateRootHash, totalDelta); } } From 85fa84a52e64381ac75cd792837301b3920e6eb5 Mon Sep 17 00:00:00 2001 From: moreal Date: Thu, 27 Jul 2023 18:34:11 +0900 Subject: [PATCH 17/33] ci(gh-actions): build Docker image --- .github/workflows/push_docker_image.yaml | 100 +++++++++++++++++++++++ Dockerfile.amd64 | 32 ++++++++ Dockerfile.arm64v8 | 32 ++++++++ 3 files changed, 164 insertions(+) create mode 100644 .github/workflows/push_docker_image.yaml create mode 100644 Dockerfile.amd64 create mode 100644 Dockerfile.arm64v8 diff --git a/.github/workflows/push_docker_image.yaml b/.github/workflows/push_docker_image.yaml new file mode 100644 index 000000000..632139460 --- /dev/null +++ b/.github/workflows/push_docker_image.yaml @@ -0,0 +1,100 @@ +name: push docker image + +on: + push: + branches: + - main + - rc-* + - development + - previewnet + - release/* + tags: + - "*" + workflow_dispatch: + inputs: + imageTag: + description: 'Custom docker image tag if needed' + default: '' + +jobs: + build_and_push: + name: build_and_push (${{ matrix.docker.repo }}) + strategy: + matrix: + docker: + - repo: planetariumhq/lib9c-stateservice + dockerfile: Dockerfile + if: github.ref_type == 'branch' + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3 + with: + submodules: recursive + - name: login + run: | + docker login \ + --username '${{ secrets.DOCKER_USERNAME }}' \ + --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}' + - name: setup-qemu + run: | + docker run --rm --privileged multiarch/qemu-user-static \ + --reset \ + -p yes + - name: build-and-push-amd64 + run: | + docker build . \ + -f ${{ matrix.docker.dockerfile }}.amd64 \ + -t ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \ + --build-arg COMMIT=git-${{ github.sha }} + docker push ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 + - name: build-and-push-arm64v8 + run: | + docker build . \ + -f ${{ matrix.docker.dockerfile }}.arm64v8 \ + -t ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 \ + --build-arg COMMIT=git-${{ github.sha }} + docker push ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 + - name: merge-manifest-and-push + run: | + docker manifest create ${{ matrix.docker.repo }}:git-${{ github.sha }} \ + --amend ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \ + --amend ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 + docker manifest push ${{ matrix.docker.repo }}:git-${{ github.sha }} + + tag: + name: tag (${{ matrix.docker.repo }}) + strategy: + matrix: + docker: + - repo: planetariumhq/lib9c-stateservice + if: github.ref_type == 'tag' || github.event.inputs.imageTag != '' + runs-on: ubuntu-latest + steps: + - name: login + run: | + docker login \ + --username '${{ secrets.DOCKER_USERNAME }}' \ + --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}' + - name: push git tagged version + run: | + docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 + if [[ -z "${{ github.event.inputs.imageTag }}" ]]; then + export IMAGE_TAG=${{ github.ref_name }} + else + export IMAGE_TAG=${{ github.event.inputs.imageTag }} + fi + + docker tag \ + ${{ matrix.docker.repo }}:git-${{ github.sha }}-amd64 \ + ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64 + docker push ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64 + docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 + docker tag \ + ${{ matrix.docker.repo }}:git-${{ github.sha }}-arm64v8 \ + ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8 + docker push ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8 + docker manifest create ${{ matrix.docker.repo }}:$IMAGE_TAG \ + --amend ${{ matrix.docker.repo }}:$IMAGE_TAG-amd64 \ + --amend ${{ matrix.docker.repo }}:$IMAGE_TAG-arm64v8 + docker manifest push ${{ matrix.docker.repo }}:$IMAGE_TAG diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 new file mode 100644 index 000000000..3dbce3ebd --- /dev/null +++ b/Dockerfile.amd64 @@ -0,0 +1,32 @@ +FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +WORKDIR /app + +# Copy csproj and restore as distinct layers +COPY ./Lib9c/Lib9c.csproj ./Lib9c/ +COPY ./.Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj ./Libplanet.Extensions.RemoteActionEvaluator/ +RUN dotnet restore Lib9c +RUN dotnet restore Libplanet.Extensions.RemoteActionEvaluator + +# Copy everything else and build +COPY . ./ +RUN dotnet publish .Lib9c.StateService/Lib9c.StateService.csproj \ + -c Release \ + -r linux-x64 \ + -o out \ + --self-contained + +# Build runtime image +FROM mcr.microsoft.com/dotnet/aspnet:6.0 +WORKDIR /app +RUN apt-get update && apt-get install -y libc6-dev +COPY --from=build-env /app/out . + +# Install native deps & utilities for production +RUN apt-get update \ + && apt-get install -y --allow-unauthenticated \ + libc6-dev jq curl \ + && rm -rf /var/lib/apt/lists/* + +VOLUME /data + +ENTRYPOINT ["dotnet", "Lib9c.StateService.dll"] diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 new file mode 100644 index 000000000..32223cc5d --- /dev/null +++ b/Dockerfile.arm64v8 @@ -0,0 +1,32 @@ +FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env +WORKDIR /app + +# Copy csproj and restore as distinct layers +COPY ./Lib9c/Lib9c.csproj ./Lib9c/ +COPY ./.Libplanet.Extensions.RemoteActionEvaluator/Libplanet.Extensions.RemoteActionEvaluator.csproj ./Libplanet.Extensions.RemoteActionEvaluator/ +RUN dotnet restore Lib9c +RUN dotnet restore Libplanet.Extensions.RemoteActionEvaluator + +# Copy everything else and build +COPY . ./ +RUN dotnet publish .Lib9c.StateService/Lib9c.StateService.csproj \ + -c Release \ + -r linux-arm64 \ + -o out \ + --self-contained + +# Build runtime image +FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8 +WORKDIR /app +RUN apt-get update && apt-get install -y libc6-dev +COPY --from=build-env /app/out . + +# Install native deps & utilities for production +RUN apt-get update \ + && apt-get install -y --allow-unauthenticated \ + libc6-dev jq curl \ + && rm -rf /var/lib/apt/lists/* + +VOLUME /data + +ENTRYPOINT ["dotnet", "Lib9c.StateService.dll"] From 72bc2510482f4c7b16e1ce5ca260d1163998eca1 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Tue, 18 Jul 2023 17:44:26 +0900 Subject: [PATCH 18/33] Optimize QuestReward deserialize --- Lib9c/Model/Quest/QuestReward.cs | 17 ++++++++--------- Lib9c/Model/State/AvatarState.cs | 12 ++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Lib9c/Model/Quest/QuestReward.cs b/Lib9c/Model/Quest/QuestReward.cs index 3f21d31c8..e9e291bbb 100644 --- a/Lib9c/Model/Quest/QuestReward.cs +++ b/Lib9c/Model/Quest/QuestReward.cs @@ -10,29 +10,28 @@ namespace Nekoyume.Model.Quest [Serializable] public class QuestReward : IState { - public readonly Dictionary ItemMap; + public readonly IEnumerable> ItemMap; public QuestReward(Dictionary map) { - ItemMap = map - .ToDictionary(kv => kv.Key, kv => kv.Value - ); +#pragma warning disable LAA1002 + ItemMap = map.Select(kv => new Tuple(kv.Key, kv.Value)); } public QuestReward(Dictionary serialized) { - ItemMap = serialized.ToDictionary( - kv => kv.Key.ToInteger(), - kv => kv.Value.ToInteger() + ItemMap = serialized.Select( + kv => new Tuple(kv.Key.ToInteger(), kv.Value.ToInteger()) ); +#pragma warning restore LAA1002 } public IValue Serialize() => new Dictionary( #pragma warning disable LAA1002 ItemMap.Select(kv => new KeyValuePair( - (Text)kv.Key.ToString(CultureInfo.InvariantCulture), - (Text)kv.Value.ToString(CultureInfo.InvariantCulture) + (Text)kv.Item1.ToString(CultureInfo.InvariantCulture), + (Text)kv.Item2.ToString(CultureInfo.InvariantCulture) ) ) #pragma warning restore LAA1002 diff --git a/Lib9c/Model/State/AvatarState.cs b/Lib9c/Model/State/AvatarState.cs index 2504237c7..0e04e481b 100644 --- a/Lib9c/Model/State/AvatarState.cs +++ b/Lib9c/Model/State/AvatarState.cs @@ -487,11 +487,11 @@ public void UpdateFromAddCostume(Costume costume, bool canceled) public void UpdateFromQuestReward(Quest.Quest quest, MaterialItemSheet materialItemSheet) { var items = new List(); - foreach (var pair in quest.Reward.ItemMap.OrderBy(kv => kv.Key)) + foreach (var pair in quest.Reward.ItemMap.OrderBy(kv => kv.Item1)) { - var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Key); + var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Item1); var item = ItemFactory.CreateMaterial(row); - var map = inventory.AddItem(item, count: pair.Value); + var map = inventory.AddItem(item, count: pair.Item2); itemMap.Add(map); items.Add(item); } @@ -506,11 +506,11 @@ public void UpdateFromQuestReward(Quest.Quest quest, MaterialItemSheet materialI public void UpdateFromQuestReward2(Quest.Quest quest, MaterialItemSheet materialItemSheet) { var items = new List(); - foreach (var pair in quest.Reward.ItemMap.OrderBy(kv => kv.Key)) + foreach (var pair in quest.Reward.ItemMap.OrderBy(kv => kv.Item1)) { - var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Key); + var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Item2); var item = ItemFactory.CreateMaterial(row); - var map = inventory.AddItem2(item, count: pair.Value); + var map = inventory.AddItem2(item, count: pair.Item2); itemMap.Add(map); items.Add(item); } From 487e382cd04dface3eaa2f77120ac39174ed8af3 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Wed, 19 Jul 2023 15:08:15 +0900 Subject: [PATCH 19/33] Lazyload mail --- Lib9c/Model/Mail/Mail.cs | 48 ++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/Lib9c/Model/Mail/Mail.cs b/Lib9c/Model/Mail/Mail.cs index 52b9595eb..ea2f8777a 100644 --- a/Lib9c/Model/Mail/Mail.cs +++ b/Lib9c/Model/Mail/Mail.cs @@ -106,7 +106,24 @@ public static Mail Deserialize(Dictionary serialized) [Serializable] public class MailBox : IEnumerable, IState { - private List _mails = new List(); + private List _serialized; + private List _deserialized; + + private List _mails + { + get + { + if (_deserialized is null) + { + _deserialized = _serialized.Select( + d => Mail.Deserialize((Dictionary)d) + ).ToList(); + _serialized = null; + } + + return _deserialized; + } + } public int Count => _mails.Count; @@ -118,9 +135,7 @@ public MailBox() public MailBox(List serialized) : this() { - _mails = serialized.Select( - d => Mail.Deserialize((Dictionary)d) - ).ToList(); + _serialized = serialized; } public IEnumerator GetEnumerator() @@ -140,9 +155,9 @@ public void Add(Mail mail) public void CleanUp() { - if (_mails.Count > 30) + if (_serialized is null || _serialized.Count > 30) { - _mails = _mails + _deserialized = _mails .OrderByDescending(m => m.blockIndex) .ThenBy(m => m.id) .Take(30) @@ -155,17 +170,14 @@ public void CleanUpV1() { if (_mails.Count > 30) { - _mails = _mails - .OrderByDescending(m => m.blockIndex) - .Take(30) - .ToList(); + _deserialized = _mails.OrderByDescending(m => m.blockIndex).Take(30).ToList(); } } [Obsolete("No longer in use.")] public void CleanUpTemp(long blockIndex) { - _mails = _mails + _deserialized = _mails .Where(m => m.requiredBlockIndex >= blockIndex) .ToList(); } @@ -175,8 +187,16 @@ public void Remove(Mail mail) _mails.Remove(mail); } - public IValue Serialize() => new List(_mails - .OrderBy(i => i.id) - .Select(m => m.Serialize())); + public IValue Serialize() + { + if (_serialized is null) + { + return new List(_mails + .OrderBy(i => i.id) + .Select(m => m.Serialize())); + } + + return _serialized; + } } } From 15f956789e23f7497f2ade7db143166deb7eb0a7 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Wed, 19 Jul 2023 17:21:56 +0900 Subject: [PATCH 20/33] Fix QuestReward --- .Lib9c.Tests/Model/QuestRewardTest.cs | 19 ++++++++++--------- Lib9c/Model/State/AvatarState.cs | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.Lib9c.Tests/Model/QuestRewardTest.cs b/.Lib9c.Tests/Model/QuestRewardTest.cs index e35963da8..4902acadf 100644 --- a/.Lib9c.Tests/Model/QuestRewardTest.cs +++ b/.Lib9c.Tests/Model/QuestRewardTest.cs @@ -1,6 +1,8 @@ namespace Lib9c.Tests.Model { + using System; using System.Collections.Generic; + using System.Linq; using Bencodex.Types; using Nekoyume.Model.Quest; using Xunit; @@ -16,19 +18,18 @@ public void Serialize() [1] = 1, }); - Assert.Equal( - new Dictionary() - { - [1] = 1, - [2] = 1, - }, - reward.ItemMap - ); + var expected = new[] + { + new Tuple(1, 1), + new Tuple(2, 1), + }; + + Assert.Equal(expected.OrderBy(t => t.Item1), reward.ItemMap.OrderBy(t => t.Item1)); var serialized = reward.Serialize(); var des = new QuestReward((Dictionary)serialized); - Assert.Equal(reward.ItemMap, des.ItemMap); + Assert.Equal(reward.ItemMap.OrderBy(t => t.Item1), des.ItemMap.OrderBy(t => t.Item1)); Assert.Equal(serialized, des.Serialize()); } diff --git a/Lib9c/Model/State/AvatarState.cs b/Lib9c/Model/State/AvatarState.cs index 0e04e481b..a9ff513a8 100644 --- a/Lib9c/Model/State/AvatarState.cs +++ b/Lib9c/Model/State/AvatarState.cs @@ -508,7 +508,7 @@ public void UpdateFromQuestReward2(Quest.Quest quest, MaterialItemSheet material var items = new List(); foreach (var pair in quest.Reward.ItemMap.OrderBy(kv => kv.Item1)) { - var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Item2); + var row = materialItemSheet.OrderedList.First(itemRow => itemRow.Id == pair.Item1); var item = ItemFactory.CreateMaterial(row); var map = inventory.AddItem2(item, count: pair.Item2); itemMap.Add(map); From 939c43cb45f4e1ab99d4e32f2e159e0ae938266a Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Wed, 19 Jul 2023 17:22:15 +0900 Subject: [PATCH 21/33] Delete legacy BinaryFormatter test --- .Lib9c.Tests/Model/ItemGradeQuestTest.cs | 9 --------- .Lib9c.Tests/Model/ItemTypeCollectQuestTest.cs | 9 --------- 2 files changed, 18 deletions(-) diff --git a/.Lib9c.Tests/Model/ItemGradeQuestTest.cs b/.Lib9c.Tests/Model/ItemGradeQuestTest.cs index 0e80f0907..4805814fe 100644 --- a/.Lib9c.Tests/Model/ItemGradeQuestTest.cs +++ b/.Lib9c.Tests/Model/ItemGradeQuestTest.cs @@ -43,15 +43,6 @@ public void Serialize() var des = new ItemGradeQuest((Dictionary)quest.Serialize()); Assert.Equal(expected, des.ItemIds); - - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, quest); - - ms.Seek(0, SeekOrigin.Begin); - var deserialized = (ItemGradeQuest)formatter.Deserialize(ms); - - Assert.Equal(quest.ItemIds, deserialized.ItemIds); } } } diff --git a/.Lib9c.Tests/Model/ItemTypeCollectQuestTest.cs b/.Lib9c.Tests/Model/ItemTypeCollectQuestTest.cs index 77f920cc8..d89c74eaf 100644 --- a/.Lib9c.Tests/Model/ItemTypeCollectQuestTest.cs +++ b/.Lib9c.Tests/Model/ItemTypeCollectQuestTest.cs @@ -43,15 +43,6 @@ public void Serialize() var des = new ItemTypeCollectQuest((Dictionary)quest.Serialize()); Assert.Equal(expected, des.ItemIds); - - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, quest); - - ms.Seek(0, SeekOrigin.Begin); - var deserialized = (ItemTypeCollectQuest)formatter.Deserialize(ms); - - Assert.Equal(quest.ItemIds, deserialized.ItemIds); } } } From 86434b8373eda7ec5e73c41eeacd7c586d44cf77 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Wed, 19 Jul 2023 17:22:33 +0900 Subject: [PATCH 22/33] Fix mail lazyload --- Lib9c/Model/Mail/Mail.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Lib9c/Model/Mail/Mail.cs b/Lib9c/Model/Mail/Mail.cs index ea2f8777a..e584f4ecd 100644 --- a/Lib9c/Model/Mail/Mail.cs +++ b/Lib9c/Model/Mail/Mail.cs @@ -113,7 +113,7 @@ private List _mails { get { - if (_deserialized is null) + if (_serialized is { }) { _deserialized = _serialized.Select( d => Mail.Deserialize((Dictionary)d) @@ -131,6 +131,7 @@ private List _mails public MailBox() { + _deserialized = new List(); } public MailBox(List serialized) : this() From 8d5a71d3ca1d823173fd499b8f49b4c024c79180 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 09:28:24 +0900 Subject: [PATCH 23/33] Lazyload quest --- Lib9c/Model/Quest/Quest.cs | 88 +++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 16 deletions(-) diff --git a/Lib9c/Model/Quest/Quest.cs b/Lib9c/Model/Quest/Quest.cs index 2d30d9897..5d0d34afe 100644 --- a/Lib9c/Model/Quest/Quest.cs +++ b/Lib9c/Model/Quest/Quest.cs @@ -42,13 +42,61 @@ public abstract class Quest : IState ["combinationEquipmentQuest"] = d => new CombinationEquipmentQuest(d), }; - public bool Complete { get; protected set; } + public bool Complete + { + get + { + if (_serializedComplete.HasValue) + { + _complete = _serializedComplete.Value; + _serializedComplete = null; + } - public int Goal { get; set; } + return _complete; + } + protected set => _complete = value; + } - public int Id { get; } + public int Goal { + get + { + if (_serializedGoal.HasValue) + { + _goal = _serializedGoal.Value; + _serializedGoal = null; + } - public QuestReward Reward { get; } + return _goal; + } + } + + public int Id + { + get + { + if (_serializedId.HasValue) + { + _id = _serializedId.Value; + _serializedId = null; + } + + return _id; + } + } + + public QuestReward Reward + { + get + { + if (_serializedReward is { }) + { + _reward = new QuestReward(_serializedReward); + _serializedReward = null; + } + + return _reward; + } + } /// /// 이미 퀘스트 보상이 액션에서 지급되었는가? @@ -58,12 +106,20 @@ public abstract class Quest : IState public virtual float Progress => (float) _current / Goal; public const string GoalFormat = "({0}/{1})"; + private Dictionary _serializedReward; + private QuestReward _reward; + private Bencodex.Types.Boolean? _serializedComplete; + private Integer? _serializedGoal; + private int _goal; + private Integer? _serializedId; + private int _id; + private bool _complete; protected Quest(QuestSheet.Row data, QuestReward reward) { - Id = data.Id; - Goal = data.Goal; - Reward = reward; + _id = data.Id; + _goal = data.Goal; + _reward = reward; } public abstract void Check(); @@ -71,12 +127,12 @@ protected Quest(QuestSheet.Row data, QuestReward reward) protected Quest(Dictionary serialized) { - Complete = ((Bencodex.Types.Boolean) serialized["complete"]).Value; - Goal = (int) ((Integer) serialized["goal"]).Value; - _current = (int) ((Integer) serialized["current"]).Value; - Id = (int) ((Integer) serialized["id"]).Value; - Reward = new QuestReward((Dictionary) serialized["reward"]); + _serializedComplete = (Bencodex.Types.Boolean) serialized["complete"]; + _serializedGoal = (Integer) serialized["goal"]; + _serializedId = (Integer) serialized["id"]; + _serializedReward = (Dictionary) serialized["reward"]; IsPaidInAction = serialized["isPaidInAction"].ToNullableBoolean() ?? false; + _current = (int) ((Integer) serialized["current"]).Value; } public abstract string GetProgressText(); @@ -84,11 +140,11 @@ protected Quest(Dictionary serialized) public virtual IValue Serialize() => Dictionary.Empty .Add("typeId", (Text) TypeId) - .Add("complete", new Bencodex.Types.Boolean(Complete)) - .Add("goal", (Integer) Goal) + .Add("complete", _serializedComplete ?? new Bencodex.Types.Boolean(Complete)) + .Add("goal", _serializedGoal ?? Goal) .Add("current", (Integer) _current) - .Add("id", (Integer) Id) - .Add("reward", Reward.Serialize()) + .Add("id", _serializedId ?? Id) + .Add("reward", _serializedReward ?? Reward.Serialize()) .Add("isPaidInAction", new Bencodex.Types.Boolean(IsPaidInAction)); public static Quest Deserialize(Dictionary serialized) From 9eacb1c182a2ff5b32fa4ce88fe51457ab3583cf Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 10:20:27 +0900 Subject: [PATCH 24/33] Lazyload combination quests --- .../Model/Quest/CombinationEquipmentQuest.cs | 44 +++++++++++++++---- Lib9c/Model/Quest/CombinationQuest.cs | 44 +++++++++++++++---- 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/Lib9c/Model/Quest/CombinationEquipmentQuest.cs b/Lib9c/Model/Quest/CombinationEquipmentQuest.cs index 6868333bb..84c7b80c2 100644 --- a/Lib9c/Model/Quest/CombinationEquipmentQuest.cs +++ b/Lib9c/Model/Quest/CombinationEquipmentQuest.cs @@ -10,20 +10,48 @@ namespace Nekoyume.Model.Quest { public class CombinationEquipmentQuest : Quest { - public readonly int RecipeId; - public readonly int StageId; + public int RecipeId + { + get + { + if (_serializedRecipeId is { }) + { + _recipeId = _serializedRecipeId.ToInteger(); + _serializedRecipeId = null; + } + + return _recipeId; + } + } + + public int StageId { + get + { + if (_serializedStageId is { }) + { + _stageId = _serializedStageId.ToInteger(); + _serializedStageId = null; + } + + return _stageId; + } + } + private IValue _serializedRecipeId; + private int _recipeId; + private IValue _serializedStageId; + private int _stageId; public CombinationEquipmentQuest(QuestSheet.Row data, QuestReward reward, int stageId) : base(data, reward) { var row = (CombinationEquipmentQuestSheet.Row) data; - RecipeId = row.RecipeId; - StageId = stageId; + _recipeId = row.RecipeId; + _stageId = stageId; } public CombinationEquipmentQuest(Dictionary serialized) : base(serialized) { - RecipeId = serialized["recipe_id"].ToInteger(); - StageId = serialized["stage_id"].ToInteger(); + _serializedStageId = serialized["stage_id"]; + _serializedRecipeId = serialized["recipe_id"]; } //임시처리. 새 타입을 만들어서 위젯에 띄워줘야합니다. @@ -59,8 +87,8 @@ public void Update(int recipeId) public override IValue Serialize() { return ((Dictionary) base.Serialize()) - .Add("recipe_id", RecipeId.Serialize()) - .Add("stage_id", StageId.Serialize()); + .Add("recipe_id", _serializedRecipeId ?? RecipeId.Serialize()) + .Add("stage_id", _serializedStageId ?? StageId.Serialize()); } } } diff --git a/Lib9c/Model/Quest/CombinationQuest.cs b/Lib9c/Model/Quest/CombinationQuest.cs index fbe9bbbc7..dbda55a5e 100644 --- a/Lib9c/Model/Quest/CombinationQuest.cs +++ b/Lib9c/Model/Quest/CombinationQuest.cs @@ -11,22 +11,50 @@ namespace Nekoyume.Model.Quest [Serializable] public class CombinationQuest : Quest { - public readonly ItemType ItemType; - public readonly ItemSubType ItemSubType; + public ItemType ItemType + { + get + { + if (_serializedItemType is { }) + { + _itemType = (ItemType) (int) _serializedItemType; + _serializedItemType = null; + } + + return _itemType; + } + } + public ItemSubType ItemSubType + { + get + { + if (_serializedItemSubType is { }) + { + _itemSubType = (ItemSubType) (int) _serializedItemSubType; + _serializedItemSubType = null; + } + + return _itemSubType; + } + } + private Integer? _serializedItemType; + private ItemType _itemType; + private Integer? _serializedItemSubType; + private ItemSubType _itemSubType; public override QuestType QuestType => QuestType.Craft; public CombinationQuest(CombinationQuestSheet.Row data, QuestReward reward) : base(data, reward) { - ItemType = data.ItemType; - ItemSubType = data.ItemSubType; + _itemType = data.ItemType; + _itemSubType = data.ItemSubType; } public CombinationQuest(Dictionary serialized) : base(serialized) { - ItemType = (ItemType)(int)((Integer)serialized["itemType"]).Value; - ItemSubType = (ItemSubType)(int)((Integer)serialized["itemSubType"]).Value; + _serializedItemType = (Integer)serialized["itemType"]; + _serializedItemSubType = (Integer)serialized["itemSubType"]; } public override void Check() @@ -59,7 +87,7 @@ public void Update(List items) public override IValue Serialize() => ((Dictionary) base.Serialize()) - .Add("itemType", (int) ItemType) - .Add("itemSubType", (int) ItemSubType); + .Add("itemType", _serializedItemType ?? (int) ItemType) + .Add("itemSubType", _serializedItemSubType ?? (int) ItemSubType); } } From 4d7af57f94ac0bfd099210e2729b58c5d9e6e556 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 11:17:46 +0900 Subject: [PATCH 25/33] Lazyload market quest --- Lib9c/Model/Quest/GoldQuest.cs | 23 +++++++++++++++++++---- Lib9c/Model/Quest/TradeQuest.cs | 23 +++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/Lib9c/Model/Quest/GoldQuest.cs b/Lib9c/Model/Quest/GoldQuest.cs index da5e9a351..4074b9737 100644 --- a/Lib9c/Model/Quest/GoldQuest.cs +++ b/Lib9c/Model/Quest/GoldQuest.cs @@ -12,17 +12,32 @@ namespace Nekoyume.Model.Quest [Serializable] public class GoldQuest : Quest { - public readonly TradeType Type; + public TradeType Type + { + get + { + if (_serializedType is { }) + { + _type = (TradeType) (int) _serializedType; + _serializedType = null; + } + + return _type; + } + } + private TradeType _type; + private Integer? _serializedType; + public GoldQuest(GoldQuestSheet.Row data, QuestReward reward) : base(data, reward) { - Type = data.Type; + _type = data.Type; } public GoldQuest(Dictionary serialized) : base(serialized) { - Type = (TradeType)(int)((Integer)serialized["type"]).Value; + _serializedType = (Integer) serialized["type"]; } public override QuestType QuestType => QuestType.Exchange; @@ -62,6 +77,6 @@ public void Update(FungibleAssetValue gold) public override IValue Serialize() => ((Dictionary) base.Serialize()) - .Add("type", (int) Type); + .Add("type", _serializedType ?? (int) Type); } } diff --git a/Lib9c/Model/Quest/TradeQuest.cs b/Lib9c/Model/Quest/TradeQuest.cs index 206697b9c..13e5077c7 100644 --- a/Lib9c/Model/Quest/TradeQuest.cs +++ b/Lib9c/Model/Quest/TradeQuest.cs @@ -12,17 +12,32 @@ namespace Nekoyume.Model.Quest public class TradeQuest : Quest { public override QuestType QuestType => QuestType.Exchange; - public readonly TradeType Type; + + public TradeType Type + { + get + { + if (_serializedType is { }) + { + _type = (TradeType) (int) _serializedType; + _serializedType = null; + } + + return _type; + } + } + private TradeType _type; + private Integer? _serializedType; public TradeQuest(TradeQuestSheet.Row data, QuestReward reward) : base(data, reward) { - Type = data.Type; + _type = data.Type; } public TradeQuest(Dictionary serialized) : base(serialized) { - Type = (TradeType)(int)((Integer)serialized["type"]).Value; + _serializedType = (Integer) serialized["type"]; } public override void Check() @@ -46,6 +61,6 @@ public override string GetProgressText() => protected override string TypeId => "tradeQuest"; public override IValue Serialize() => ((Dictionary) base.Serialize()) - .Add("type", (int) Type); + .Add("type", _serializedType ?? (int) Type); } } From ca9c5a65ff04b50b4b5e393b0e4869b71ca23ea6 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 11:17:57 +0900 Subject: [PATCH 26/33] Lazyload ItemEnhancementQuest --- Lib9c/Model/Quest/ItemEnhancementQuest.cs | 54 ++++++++++++++++++----- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/Lib9c/Model/Quest/ItemEnhancementQuest.cs b/Lib9c/Model/Quest/ItemEnhancementQuest.cs index b93a56f24..2e7eb988d 100644 --- a/Lib9c/Model/Quest/ItemEnhancementQuest.cs +++ b/Lib9c/Model/Quest/ItemEnhancementQuest.cs @@ -11,22 +11,52 @@ namespace Nekoyume.Model.Quest [Serializable] public class ItemEnhancementQuest : Quest { - public readonly int Grade; - private readonly int _count; - public int Count => _count; - public override float Progress => (float) _current / _count; + public int Grade + { + get + { + if (_serializedGrade is { }) + { + _grade = (int) _serializedGrade; + _serializedGrade = null; + } + + return _grade; + } + } + + public int Count + { + get + { + if (_serializedCount is { }) + { + _count = (int) _serializedCount; + _serializedCount = null; + } + + return _count; + } + } + + private Integer? _serializedGrade; + private int _grade; + private Integer? _serializedCount; + // Do not use this field. it can be different check result + private int _count; + public override float Progress => (float) _current / Count; public ItemEnhancementQuest(ItemEnhancementQuestSheet.Row data, QuestReward reward) : base(data, reward) { _count = data.Count; - Grade = data.Grade; + _grade = data.Grade; } public ItemEnhancementQuest(Dictionary serialized) : base(serialized) { - Grade = (int)((Integer)serialized["grade"]).Value; - _count = (int)((Integer)serialized["count"]).Value; + _serializedGrade = (Integer) serialized["grade"]; + _serializedCount = (Integer) serialized["count"]; } public override QuestType QuestType => QuestType.Craft; @@ -36,15 +66,15 @@ public override void Check() if (Complete) return; - Complete = _count == _current; + Complete = Count == _current; } public override string GetProgressText() => string.Format( CultureInfo.InvariantCulture, GoalFormat, - Math.Min(_count, _current), - _count + Math.Min(Count, _current), + Count ); public void Update(Equipment equipment) @@ -64,7 +94,7 @@ public void Update(Equipment equipment) public override IValue Serialize() => ((Dictionary) base.Serialize()) - .Add("grade", Grade) - .Add("count", _count); + .Add("grade", _serializedGrade ?? Grade) + .Add("count", _serializedCount ?? Count); } } From c890ef0e22910985d8946fa7565de7844dd3476f Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 15:24:57 +0900 Subject: [PATCH 27/33] Lazyload ItemBase --- Lib9c/Model/Item/ItemBase.cs | 126 ++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 25 deletions(-) diff --git a/Lib9c/Model/Item/ItemBase.cs b/Lib9c/Model/Item/ItemBase.cs index a86dbda43..e3c25f429 100644 --- a/Lib9c/Model/Item/ItemBase.cs +++ b/Lib9c/Model/Item/ItemBase.cs @@ -13,50 +13,126 @@ public abstract class ItemBase : IItem { protected static readonly Codec Codec = new Codec(); - public int Id { get; } - public int Grade { get; } - public ItemType ItemType { get; } - public ItemSubType ItemSubType { get; } - public ElementalType ElementalType { get; } + private int _id; + private int _grade; + private ItemType _itemType; + private ItemSubType _itemSubType; + private ElementalType _elementalType; + private Text? _serializedId; + private Text? _serializedGrade; + private Text? _serializedItemType; + private Text? _serializedItemSubType; + private Text? _serializedElementalType; + + public int Id + { + get + { + if (_serializedId is { }) + { + _id = _serializedId.ToInteger(); + _serializedId = null; + } + + return _id; + } + } + + public int Grade + { + get + { + if (_serializedGrade is { }) + { + _grade = _serializedGrade.ToInteger(); + _serializedGrade = null; + } + + return _grade; + } + } + + public ItemType ItemType + { + get + { + if (_serializedItemType is { }) + { + _itemType = _serializedItemType.ToEnum(); + _serializedItemType = null; + } + + return _itemType; + } + } + + public ItemSubType ItemSubType + { + get + { + if (_serializedItemSubType is { }) + { + _itemSubType = _serializedItemSubType.ToEnum(); + _serializedItemSubType = null; + } + + return _itemSubType; + } + } + + public ElementalType ElementalType + { + get + { + if (_serializedElementalType is { }) + { + _elementalType = _serializedElementalType.ToEnum(); + _serializedElementalType = null; + } + + return _elementalType; + } + } + protected ItemBase(ItemSheet.Row data) { - Id = data.Id; - Grade = data.Grade; - ItemType = data.ItemType; - ItemSubType = data.ItemSubType; - ElementalType = data.ElementalType; + _id = data.Id; + _grade = data.Grade; + _itemType = data.ItemType; + _itemSubType = data.ItemSubType; + _elementalType = data.ElementalType; } protected ItemBase(ItemBase other) { - Id = other.Id; - Grade = other.Grade; - ItemType = other.ItemType; - ItemSubType = other.ItemSubType; - ElementalType = other.ElementalType; + _id = other.Id; + _grade = other.Grade; + _itemType = other.ItemType; + _itemSubType = other.ItemSubType; + _elementalType = other.ElementalType; } protected ItemBase(Dictionary serialized) { if (serialized.TryGetValue((Text) "id", out var id)) { - Id = id.ToInteger(); + _serializedId = (Text) id; } if (serialized.TryGetValue((Text) "grade", out var grade)) { - Grade = grade.ToInteger(); + _serializedGrade = (Text) grade; } if (serialized.TryGetValue((Text) "item_type", out var type)) { - ItemType = type.ToEnum(); + _serializedItemType = (Text) type; } if (serialized.TryGetValue((Text) "item_sub_type", out var subType)) { - ItemSubType = subType.ToEnum(); + _serializedItemSubType = (Text) subType; } if (serialized.TryGetValue((Text) "elemental_type", out var elementalType)) { - ElementalType = elementalType.ToEnum(); + _serializedElementalType = (Text) elementalType; } } @@ -94,11 +170,11 @@ public override int GetHashCode() public virtual IValue Serialize() => Dictionary.Empty - .Add("id", Id.Serialize()) - .Add("item_type", ItemType.Serialize()) - .Add("item_sub_type", ItemSubType.Serialize()) - .Add("grade", Grade.Serialize()) - .Add("elemental_type", ElementalType.Serialize()); + .Add("id", _serializedId ?? Id.Serialize()) + .Add("item_type", _serializedItemType ?? ItemType.Serialize()) + .Add("item_sub_type", _serializedItemSubType ?? ItemSubType.Serialize()) + .Add("grade", _serializedGrade ?? Grade.Serialize()) + .Add("elemental_type", _serializedElementalType ?? ElementalType.Serialize()); public override string ToString() { From 6e279bcefe023e4655e4095823291c6e596c9c93 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Fri, 21 Jul 2023 15:25:05 +0900 Subject: [PATCH 28/33] Lazyload ItemUsable --- .Lib9c.Tests/Action/BuyMultipleTest.cs | 63 ------------ .Lib9c.Tests/Model/Item/ArmorTest.cs | 18 ---- .Lib9c.Tests/Model/Item/BeltTest.cs | 18 ---- .Lib9c.Tests/Model/Item/ConsumableTest.cs | 18 ---- .Lib9c.Tests/Model/Item/EquipmentTest.cs | 22 ---- .Lib9c.Tests/Model/Item/InventoryTest.cs | 20 ---- .Lib9c.Tests/Model/Item/NecklaceTest.cs | 18 ---- .Lib9c.Tests/Model/Item/ShopItemTest.cs | 18 ---- Lib9c/Model/Item/ItemUsable.cs | 116 +++++++++++++++++----- 9 files changed, 89 insertions(+), 222 deletions(-) diff --git a/.Lib9c.Tests/Action/BuyMultipleTest.cs b/.Lib9c.Tests/Action/BuyMultipleTest.cs index d8d3a821a..7be32d6d8 100644 --- a/.Lib9c.Tests/Action/BuyMultipleTest.cs +++ b/.Lib9c.Tests/Action/BuyMultipleTest.cs @@ -2,10 +2,8 @@ { using System; using System.Collections.Generic; - using System.IO; using System.Linq; using System.Numerics; - using System.Runtime.Serialization.Formatters.Binary; using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Types.Assets; @@ -609,67 +607,6 @@ public void ExecuteThrowShopItemExpiredError() Assert.True(isAllFailed); } - [Fact] - public void SerializeWithDotnetAPI() - { - var sellerAvatarAddress = new PrivateKey().ToAddress(); - var sellerAgentAddress = new PrivateKey().ToAddress(); - CreateAvatarState(sellerAgentAddress, sellerAvatarAddress); - - IAccountStateDelta previousStates = _initialState; - var shopState = previousStates.GetShopState(); - - var productId = Guid.NewGuid(); - var equipment = ItemFactory.CreateItemUsable( - _tableSheets.EquipmentItemSheet.First, - Guid.NewGuid(), - 0); - shopState.Register(new ShopItem( - sellerAgentAddress, - sellerAvatarAddress, - productId, - new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0), - 100, - equipment)); - shopState.Register(new ShopItem( - sellerAgentAddress, - sellerAvatarAddress, - Guid.NewGuid(), - new FungibleAssetValue(_goldCurrencyState.Currency, 100, 0), - 100, - equipment)); - var products = shopState.Products.Values - .Select(p => new BuyMultiple.PurchaseInfo( - p.ProductId, - p.SellerAgentAddress, - p.SellerAvatarAddress)) - .ToList(); - - previousStates = previousStates - .SetState(Addresses.Shop, shopState.Serialize()); - - var action = new BuyMultiple - { - buyerAvatarAddress = _buyerAvatarAddress, - purchaseInfos = products, - }; - action.Execute(new ActionContext() - { - BlockIndex = 1, - PreviousState = previousStates, - Random = new TestRandom(), - Signer = _buyerAgentAddress, - }); - - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, action); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (BuyMultiple)formatter.Deserialize(ms); - Assert.Equal(action.PlainValue, deserialized.PlainValue); - } - private (AvatarState AvatarState, AgentState AgentState) CreateAvatarState( Address agentAddress, Address avatarAddress) { diff --git a/.Lib9c.Tests/Model/Item/ArmorTest.cs b/.Lib9c.Tests/Model/Item/ArmorTest.cs index 0e68c845e..7bd14187c 100644 --- a/.Lib9c.Tests/Model/Item/ArmorTest.cs +++ b/.Lib9c.Tests/Model/Item/ArmorTest.cs @@ -1,9 +1,7 @@ namespace Lib9c.Tests.Model.Item { using System; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; using Nekoyume.Model.Item; using Nekoyume.TableData; using Xunit; @@ -30,21 +28,5 @@ public void Serialize() Assert.Equal(costume, deserialized); } - - [Fact] - public void SerializeWithDotNetAPI() - { - Assert.NotNull(_armorRow); - - var costume = new Armor(_armorRow, Guid.NewGuid(), 0); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, costume); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (Armor)formatter.Deserialize(ms); - - Assert.Equal(costume, deserialized); - } } } diff --git a/.Lib9c.Tests/Model/Item/BeltTest.cs b/.Lib9c.Tests/Model/Item/BeltTest.cs index ec5d4a4fb..f949893ee 100644 --- a/.Lib9c.Tests/Model/Item/BeltTest.cs +++ b/.Lib9c.Tests/Model/Item/BeltTest.cs @@ -1,9 +1,7 @@ namespace Lib9c.Tests.Model.Item { using System; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; using Nekoyume.Model.Item; using Nekoyume.TableData; using Xunit; @@ -30,21 +28,5 @@ public void Serialize() Assert.Equal(costume, deserialized); } - - [Fact] - public void SerializeWithDotNetAPI() - { - Assert.NotNull(_beltRow); - - var costume = new Belt(_beltRow, Guid.NewGuid(), 0); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, costume); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (Belt)formatter.Deserialize(ms); - - Assert.Equal(costume, deserialized); - } } } diff --git a/.Lib9c.Tests/Model/Item/ConsumableTest.cs b/.Lib9c.Tests/Model/Item/ConsumableTest.cs index 5bca779ee..687105a02 100644 --- a/.Lib9c.Tests/Model/Item/ConsumableTest.cs +++ b/.Lib9c.Tests/Model/Item/ConsumableTest.cs @@ -1,8 +1,6 @@ namespace Lib9c.Tests.Model.Item { using System; - using System.IO; - using System.Runtime.Serialization.Formatters.Binary; using Nekoyume.Model.Item; using Nekoyume.TableData; using Xunit; @@ -29,22 +27,6 @@ public void Serialize() Assert.Equal(consumable, deserialized); } - [Fact] - public void SerializeWithDotNetAPI() - { - Assert.NotNull(_consumableRow); - - var consumable = new Consumable(_consumableRow, Guid.NewGuid(), 0); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, consumable); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (Consumable)formatter.Deserialize(ms); - - Assert.Equal(consumable, deserialized); - } - [Fact] public void Update() { diff --git a/.Lib9c.Tests/Model/Item/EquipmentTest.cs b/.Lib9c.Tests/Model/Item/EquipmentTest.cs index 9b981b7b3..3567ddc76 100644 --- a/.Lib9c.Tests/Model/Item/EquipmentTest.cs +++ b/.Lib9c.Tests/Model/Item/EquipmentTest.cs @@ -2,8 +2,6 @@ namespace Lib9c.Tests.Model.Item { using System; using System.Collections.Generic; - using System.IO; - using System.Runtime.Serialization.Formatters.Binary; using Nekoyume.Model.Item; using Nekoyume.TableData; using Xunit; @@ -43,26 +41,6 @@ public void Serialize() Assert.Equal(serialized, reSerialized); } - [Fact] - public void SerializeWithDotNetAPI() - { - Assert.NotNull(_equipmentRow); - - var costume = new Equipment(_equipmentRow, Guid.NewGuid(), 0); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, costume); - ms.Seek(0, SeekOrigin.Begin); - var serialized = ms.ToArray(); - var deserialized = (Equipment)formatter.Deserialize(ms); - ms.Seek(0, SeekOrigin.Begin); - formatter.Serialize(ms, deserialized); - var reSerialized = ms.ToArray(); - - Assert.Equal(costume, deserialized); - Assert.Equal(serialized, reSerialized); - } - [Fact] public void LevelUp() { diff --git a/.Lib9c.Tests/Model/Item/InventoryTest.cs b/.Lib9c.Tests/Model/Item/InventoryTest.cs index 24ce3abb3..b01f818be 100644 --- a/.Lib9c.Tests/Model/Item/InventoryTest.cs +++ b/.Lib9c.Tests/Model/Item/InventoryTest.cs @@ -2,9 +2,7 @@ { using System; using System.Collections.Generic; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; using Lib9c.Tests.Action; using Nekoyume.Model.Item; using Nekoyume.TableData; @@ -35,24 +33,6 @@ public void Serialize() Assert.Equal(inventory, deserialized); } - [Fact] - public void Serialize_With_DotNet_Api() - { - var inventory = new Inventory(); - var row = TableSheets.EquipmentItemSheet.First; - var itemUsable = ItemFactory.CreateItemUsable(row, Guid.NewGuid(), 0); - inventory.AddItem(itemUsable); - var row2 = TableSheets.MaterialItemSheet.First; - var material = ItemFactory.CreateMaterial(row2); - inventory.AddItem(material, 1, new OrderLock(Guid.NewGuid())); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, inventory); - ms.Seek(0, SeekOrigin.Begin); - var deserialized = (Inventory)formatter.Deserialize(ms); - Assert.Equal(inventory, deserialized); - } - // Add [Fact] public Inventory AddItem_Consumable() diff --git a/.Lib9c.Tests/Model/Item/NecklaceTest.cs b/.Lib9c.Tests/Model/Item/NecklaceTest.cs index 7507d1cc8..95c2b291b 100644 --- a/.Lib9c.Tests/Model/Item/NecklaceTest.cs +++ b/.Lib9c.Tests/Model/Item/NecklaceTest.cs @@ -1,9 +1,7 @@ namespace Lib9c.Tests.Model.Item { using System; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; using Nekoyume.Model.Item; using Nekoyume.TableData; using Xunit; @@ -30,21 +28,5 @@ public void Serialize() Assert.Equal(costume, deserialized); } - - [Fact] - public void SerializeWithDotNetAPI() - { - Assert.NotNull(_necklaceRow); - - var costume = new Necklace(_necklaceRow, Guid.NewGuid(), 0); - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, costume); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (Necklace)formatter.Deserialize(ms); - - Assert.Equal(costume, deserialized); - } } } diff --git a/.Lib9c.Tests/Model/Item/ShopItemTest.cs b/.Lib9c.Tests/Model/Item/ShopItemTest.cs index bc3b9e80d..f536f984e 100644 --- a/.Lib9c.Tests/Model/Item/ShopItemTest.cs +++ b/.Lib9c.Tests/Model/Item/ShopItemTest.cs @@ -2,9 +2,7 @@ namespace Lib9c.Tests.Model.Item { using System; using System.Collections.Generic; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; using Bencodex.Types; using Libplanet.Crypto; using Libplanet.Types.Assets; @@ -38,22 +36,6 @@ public void Serialize() } } - [Fact] - public void Serialize_With_DotNet_Api() - { - foreach (var shopItem in GetShopItems()) - { - var formatter = new BinaryFormatter(); - using var ms = new MemoryStream(); - formatter.Serialize(ms, shopItem); - ms.Seek(0, SeekOrigin.Begin); - - var deserialized = (ShopItem)formatter.Deserialize(ms); - - Assert.Equal(shopItem, deserialized); - } - } - // NOTE: `SerializeBackup1()` only tests with `ShopItem` containing `Equipment`. [Fact] public void SerializeBackup1() diff --git a/Lib9c/Model/Item/ItemUsable.cs b/Lib9c/Model/Item/ItemUsable.cs index 83f671912..60aa40962 100644 --- a/Lib9c/Model/Item/ItemUsable.cs +++ b/Lib9c/Model/Item/ItemUsable.cs @@ -14,12 +14,77 @@ namespace Nekoyume.Model.Item [Serializable] public abstract class ItemUsable : ItemBase, INonFungibleItem { - public Guid ItemId { get; } + public Guid ItemId + { + get + { + if (_serializedItemId is { }) + { + _itemId = _serializedItemId.ToGuid(); + _serializedItemId = null; + } + + return _itemId; + } + } + public Guid TradableId => ItemId; public Guid NonFungibleId => ItemId; - public StatsMap StatsMap { get; } - public List Skills { get; } - public List BuffSkills { get; } + + public StatsMap StatsMap + { + get + { + _statsMap ??= new StatsMap(); + if (_serializedStatsMap is { }) + { + _statsMap.Deserialize(_serializedStatsMap); + _serializedStatsMap = null; + } + + return _statsMap; + } + } + + public List Skills + { + get + { + _skills ??= new List(); + if (_serializedSkills is { }) + { + foreach (var value in _serializedSkills) + { + var serializedSkill = (Dictionary) value; + _skills.Add(SkillFactory.Deserialize(serializedSkill)); + } + + _serializedSkills = null; + } + + return _skills; + } + } + + public List BuffSkills + { + get + { + _buffSkills ??= new List(); + if (_serializedBuffSkills is { }) + { + foreach (var value in _serializedBuffSkills) + { + var serializedSkill = (Dictionary) value; + _buffSkills.Add((BuffSkill) SkillFactory.Deserialize(serializedSkill)); + } + + _serializedBuffSkills = null; + } + + return _buffSkills; + } + } public long RequiredBlockIndex { @@ -36,11 +101,19 @@ public long RequiredBlockIndex } private long _requiredBlockIndex; + private Guid _itemId; + private StatsMap _statsMap; + private List _skills; + private List _buffSkills; + private Binary? _serializedItemId; + private Dictionary _serializedStatsMap; + private List _serializedSkills; + private List _serializedBuffSkills; protected ItemUsable(ItemSheet.Row data, Guid id, long requiredBlockIndex) : base(data) { - ItemId = id; - StatsMap = new StatsMap(); + _itemId = id; + _statsMap = new StatsMap(); switch (data) { @@ -58,39 +131,28 @@ protected ItemUsable(ItemSheet.Row data, Guid id, long requiredBlockIndex) : bas break; } - Skills = new List(); - BuffSkills = new List(); + _skills = new List(); + _buffSkills = new List(); RequiredBlockIndex = requiredBlockIndex; } protected ItemUsable(Dictionary serialized) : base(serialized) { - StatsMap = new StatsMap(); - Skills = new List(); - BuffSkills = new List(); if (serialized.TryGetValue((Text) "itemId", out var itemId)) { - ItemId = itemId.ToGuid(); + _serializedItemId = (Binary) itemId; } if (serialized.TryGetValue((Text) "statsMap", out var statsMap)) { - StatsMap.Deserialize((Dictionary) statsMap); + _serializedStatsMap = (Dictionary) statsMap; } if (serialized.TryGetValue((Text) "skills", out var skills)) { - foreach (var value in (List) skills) - { - var skill = (Dictionary) value; - Skills.Add(SkillFactory.Deserialize(skill)); - } + _serializedSkills = (List) skills; } if (serialized.TryGetValue((Text) "buffSkills", out var buffSkills)) { - foreach (var value in (List) buffSkills) - { - var buffSkill = (Dictionary) value; - BuffSkills.Add((BuffSkill) SkillFactory.Deserialize(buffSkill)); - } + _serializedBuffSkills = (List) buffSkills; } if (serialized.TryGetValue((Text) "requiredBlockIndex", out var requiredBlockIndex)) { @@ -137,13 +199,13 @@ public void Update(long blockIndex) } public override IValue Serialize() => ((Dictionary)base.Serialize()) - .Add("itemId", ItemId.Serialize()) - .Add("statsMap", StatsMap.Serialize()) - .Add("skills", new List(Skills + .Add("itemId", _serializedItemId ?? ItemId.Serialize()) + .Add("statsMap", _serializedStatsMap ?? StatsMap.Serialize()) + .Add("skills", _serializedSkills ?? new List(Skills .OrderByDescending(i => i.Chance) .ThenByDescending(i => i.Power) .Select(s => s.Serialize()))) - .Add("buffSkills", new List(BuffSkills + .Add("buffSkills", _serializedBuffSkills ?? new List(BuffSkills .OrderByDescending(i => i.Chance) .ThenByDescending(i => i.Power) .Select(s => s.Serialize()))) From da4f4faedc1d9d84c647182165c19ec707ab96db Mon Sep 17 00:00:00 2001 From: sky1045 Date: Tue, 25 Jul 2023 11:20:57 +0900 Subject: [PATCH 29/33] Log HAS Playcount, Remove Debug log --- Lib9c/Action/HackAndSlash.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib9c/Action/HackAndSlash.cs b/Lib9c/Action/HackAndSlash.cs index 8689b6f24..30aa9d344 100644 --- a/Lib9c/Action/HackAndSlash.cs +++ b/Lib9c/Action/HackAndSlash.cs @@ -123,7 +123,7 @@ public IAccountStateDelta Execute( var addressesHex = $"[{signer.ToHex()}, {AvatarAddress.ToHex()}]"; var started = DateTimeOffset.UtcNow; - Log.Debug("{AddressesHex}HAS exec started", addressesHex); + Log.Verbose("{AddressesHex}HAS exec started", addressesHex); if (ApStoneCount > UsableApStoneCount) { @@ -534,8 +534,8 @@ public IAccountStateDelta Execute( ); } sw.Stop(); - Log.Verbose("{AddressesHex}HAS loop Simulate: {Elapsed}, Count: {PlayCount}", - addressesHex, sw.Elapsed, TotalPlayCount); + Log.Verbose("{AddressesHex} {Source} loop Simulate: {Elapsed}, Count: {PlayCount}", + addressesHex, "HackAndSlash", sw.Elapsed, TotalPlayCount); // Update CrystalRandomSkillState.Stars by clearedWaveNumber. (add) skillState?.Update(starCount, crystalStageBuffSheet); @@ -569,7 +569,7 @@ public IAccountStateDelta Execute( Log.Verbose("{AddressesHex}HAS Set States: {Elapsed}", addressesHex, sw.Elapsed); var totalElapsed = DateTimeOffset.UtcNow - started; - Log.Debug("{AddressesHex}HAS Total Executed Time: {Elapsed}", addressesHex, totalElapsed); + Log.Verbose("{AddressesHex}HAS Total Executed Time: {Elapsed}", addressesHex, totalElapsed); return states; } From 61e5c074389a0576f2bded6c319c3d1d5abed5f5 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 25 Jul 2023 14:46:30 +0900 Subject: [PATCH 30/33] Remove invalid state exception logging from AccountStateExtensions --- Lib9c/Action/AccountStateExtensions.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Lib9c/Action/AccountStateExtensions.cs b/Lib9c/Action/AccountStateExtensions.cs index f0ed86443..21bf76682 100644 --- a/Lib9c/Action/AccountStateExtensions.cs +++ b/Lib9c/Action/AccountStateExtensions.cs @@ -38,13 +38,6 @@ public static bool TryGetState(this IAccountState states, Address address, ou return true; } - Log.Error( - "Expected a {0}, but got invalid state ({1}): ({2}) {3}", - typeof(T).Name, - address.ToHex(), - raw?.GetType().Name, - raw - ); result = default; return false; } From ef950095eda804064382a9c15f83a02122e99261 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 25 Jul 2023 14:56:49 +0900 Subject: [PATCH 31/33] Fix playcount log level --- Lib9c/Action/HackAndSlash.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib9c/Action/HackAndSlash.cs b/Lib9c/Action/HackAndSlash.cs index 30aa9d344..cafd55054 100644 --- a/Lib9c/Action/HackAndSlash.cs +++ b/Lib9c/Action/HackAndSlash.cs @@ -534,7 +534,7 @@ public IAccountStateDelta Execute( ); } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} loop Simulate: {Elapsed}, Count: {PlayCount}", + Log.Debug("{AddressesHex} {Source} loop Simulate: {Elapsed}, Count: {PlayCount}", addressesHex, "HackAndSlash", sw.Elapsed, TotalPlayCount); // Update CrystalRandomSkillState.Stars by clearedWaveNumber. (add) From e120e033264d39c50142da2d5c14013ddb2a9060 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Tue, 25 Jul 2023 16:28:08 +0900 Subject: [PATCH 32/33] HAS break down --- Lib9c/Action/HackAndSlash.cs | 50 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/Lib9c/Action/HackAndSlash.cs b/Lib9c/Action/HackAndSlash.cs index cafd55054..ad2c5410b 100644 --- a/Lib9c/Action/HackAndSlash.cs +++ b/Lib9c/Action/HackAndSlash.cs @@ -123,7 +123,8 @@ public IAccountStateDelta Execute( var addressesHex = $"[{signer.ToHex()}, {AvatarAddress.ToHex()}]"; var started = DateTimeOffset.UtcNow; - Log.Verbose("{AddressesHex}HAS exec started", addressesHex); + const string source = "HackAndSlash"; + Log.Verbose("{AddressesHex} {Source} HAS exec started", addressesHex, source); if (ApStoneCount > UsableApStoneCount) { @@ -157,7 +158,7 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex}HAS Get AvatarState: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get AvatarState", sw.Elapsed.TotalMilliseconds); sw.Restart(); var sheets = states.GetSheets( @@ -186,7 +187,7 @@ public IAccountStateDelta Execute( typeof(RuneListSheet), }); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Get Sheets: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get Sheets", sw.Elapsed.TotalMilliseconds); sw.Restart(); var stakingLevel = 0; @@ -200,7 +201,7 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex}HAS Check StakeState: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Check StateState", sw.Elapsed.TotalMilliseconds); var worldSheet = sheets.GetSheet(); if (!worldSheet.TryGetValue(WorldId, out var worldRow, false)) @@ -223,7 +224,7 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex}HAS Get StageSheet: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get StageSheet", sw.Elapsed.TotalMilliseconds); sw.Restart(); var worldInformation = avatarState.worldInformation; @@ -263,15 +264,15 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex}HAS Validate World: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Validate World", sw.Elapsed.TotalMilliseconds); sw.Restart(); var equipmentList = avatarState.ValidateEquipmentsV2(Equipments, blockIndex); var foodIds = avatarState.ValidateConsumable(Foods, blockIndex); var costumeIds = avatarState.ValidateCostume(Costumes); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Validate Items: {Elapsed}", addressesHex, sw.Elapsed); - + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Validate Items", sw.Elapsed.TotalMilliseconds); + sw.Restart(); var materialItemSheet = sheets.GetSheet(); var apPlayCount = TotalPlayCount; var minimumCostAp = stageRow.CostAP; @@ -313,11 +314,12 @@ public IAccountStateDelta Execute( } Log.Verbose( - "{AddressesHex}TotalPlayCount: {TotalPlayCount}, " + + "{AddressesHex} {Source} TotalPlayCount: {TotalPlayCount}, " + "ApStoneCount: {ApStoneCount}, PlayCount by Ap stone: {ApStonePlayCount}, " + "Ap cost per 1 play: {MinimumCostAp}, " + "PlayCount by action point: {ApPlayCount}, Used AP: {UsedAp}", addressesHex, + source, TotalPlayCount, ApStoneCount, apStonePlayCount, @@ -347,12 +349,12 @@ public IAccountStateDelta Execute( var items = Equipments.Concat(Costumes); avatarState.EquipItems(items); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Unequip items: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Unequip items", sw.Elapsed.TotalMilliseconds); sw.Restart(); var questSheet = sheets.GetQuestSheet(); sw.Stop(); - Log.Verbose("{AddressesHex}HAS GetQuestSheet: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get QuestSheet", sw.Elapsed.TotalMilliseconds); // Update QuestList only when QuestSheet.Count is greater than QuestList.Count var questList = avatarState.questList; @@ -365,7 +367,7 @@ public IAccountStateDelta Execute( sheets.GetSheet(), sheets.GetSheet()); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Update QuestList: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update QuestList", sw.Elapsed.TotalMilliseconds); } sw.Restart(); @@ -404,7 +406,7 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex}HAS Get skillState : {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get skillState", sw.Elapsed.TotalMilliseconds); sw.Restart(); var worldUnlockSheet = sheets.GetSheet(); @@ -439,6 +441,8 @@ public IAccountStateDelta Execute( runeStates.Add(new RuneState(rawRuneState)); } } + sw.Stop(); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update slotState", sw.Elapsed.TotalMilliseconds); var stageWaveRow = sheets.GetSheet()[StageId]; var enemySkillSheet = sheets.GetSheet(); @@ -469,12 +473,12 @@ public IAccountStateDelta Execute( rewards, false); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Initialize Simulator: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Initialize Simulator", sw.Elapsed.TotalMilliseconds); sw.Restart(); simulator.Simulate(); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Simulator.Simulate(): {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Simulator.Simulate()", sw.Elapsed.TotalMilliseconds); sw.Restart(); if (simulator.Log.IsClear) @@ -491,7 +495,7 @@ public IAccountStateDelta Execute( stageCleared = true; } sw.Stop(); - Log.Verbose("{AddressesHex}HAS ClearStage: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "ClearStage", sw.Elapsed.TotalMilliseconds); } sw.Restart(); @@ -521,10 +525,12 @@ public IAccountStateDelta Execute( sw.Stop(); Log.Verbose( - "{AddressesHex}Update avatar by simulator({AvatarAddress}); " + + "{AddressesHex} {Source} {Process} by simulator({AvatarAddress}); " + "worldId: {WorldId}, stageId: {StageId}, result: {Result}, " + "clearWave: {ClearWave}, totalWave: {TotalWave}", addressesHex, + source, + "Update avatar", AvatarAddress, WorldId, StageId, @@ -534,8 +540,8 @@ public IAccountStateDelta Execute( ); } sw.Stop(); - Log.Debug("{AddressesHex} {Source} loop Simulate: {Elapsed}, Count: {PlayCount}", - addressesHex, "HackAndSlash", sw.Elapsed, TotalPlayCount); + Log.Debug("{AddressesHex} {Source} {Process}: {Elapsed}, Count: {PlayCount}", + addressesHex, source, "loop Simulate", sw.Elapsed.TotalMilliseconds, TotalPlayCount); // Update CrystalRandomSkillState.Stars by clearedWaveNumber. (add) skillState?.Update(starCount, crystalStageBuffSheet); @@ -544,7 +550,7 @@ public IAccountStateDelta Execute( avatarState.updatedAt = blockIndex; avatarState.mailBox.CleanUp(); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Update AvatarState: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update AvatarState", sw.Elapsed.TotalMilliseconds); sw.Restart(); if (isNotClearedStage) @@ -566,10 +572,10 @@ public IAccountStateDelta Execute( .SetState(worldInformationAddress, avatarState.worldInformation.Serialize()) .SetState(questListAddress, avatarState.questList.Serialize()); sw.Stop(); - Log.Verbose("{AddressesHex}HAS Set States: {Elapsed}", addressesHex, sw.Elapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Set States", sw.Elapsed.TotalMilliseconds); var totalElapsed = DateTimeOffset.UtcNow - started; - Log.Verbose("{AddressesHex}HAS Total Executed Time: {Elapsed}", addressesHex, totalElapsed); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Total Executed Time", totalElapsed.TotalMilliseconds); return states; } From afe06237d1c959721124f4cf39a9c92611bdb869 Mon Sep 17 00:00:00 2001 From: Robert <35055316+sky1045@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:41:01 +0900 Subject: [PATCH 33/33] Merge pull request #2034 from planetarium/fix/has-log-blockindex Add blockindex to has total log --- Lib9c/Action/HackAndSlash.cs | 59 ++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/Lib9c/Action/HackAndSlash.cs b/Lib9c/Action/HackAndSlash.cs index ad2c5410b..0fea9d3f2 100644 --- a/Lib9c/Action/HackAndSlash.cs +++ b/Lib9c/Action/HackAndSlash.cs @@ -124,7 +124,8 @@ public IAccountStateDelta Execute( var addressesHex = $"[{signer.ToHex()}, {AvatarAddress.ToHex()}]"; var started = DateTimeOffset.UtcNow; const string source = "HackAndSlash"; - Log.Verbose("{AddressesHex} {Source} HAS exec started", addressesHex, source); + Log.Verbose("{AddressesHex} {Source} from #{BlockIndex} exec started", + addressesHex, source, blockIndex); if (ApStoneCount > UsableApStoneCount) { @@ -158,7 +159,8 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get AvatarState", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Get AvatarState", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var sheets = states.GetSheets( @@ -187,7 +189,8 @@ public IAccountStateDelta Execute( typeof(RuneListSheet), }); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get Sheets", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Get Sheets", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var stakingLevel = 0; @@ -201,7 +204,8 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Check StateState", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Check StateState", blockIndex, sw.Elapsed.TotalMilliseconds); var worldSheet = sheets.GetSheet(); if (!worldSheet.TryGetValue(WorldId, out var worldRow, false)) @@ -224,7 +228,8 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get StageSheet", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Get StageSheet", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var worldInformation = avatarState.worldInformation; @@ -264,14 +269,16 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Validate World", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Validate World", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var equipmentList = avatarState.ValidateEquipmentsV2(Equipments, blockIndex); var foodIds = avatarState.ValidateConsumable(Foods, blockIndex); var costumeIds = avatarState.ValidateCostume(Costumes); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Validate Items", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Validate Items", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var materialItemSheet = sheets.GetSheet(); var apPlayCount = TotalPlayCount; @@ -317,6 +324,7 @@ public IAccountStateDelta Execute( "{AddressesHex} {Source} TotalPlayCount: {TotalPlayCount}, " + "ApStoneCount: {ApStoneCount}, PlayCount by Ap stone: {ApStonePlayCount}, " + "Ap cost per 1 play: {MinimumCostAp}, " + + "BlockIndex: {BlockIndex}, " + "PlayCount by action point: {ApPlayCount}, Used AP: {UsedAp}", addressesHex, source, @@ -349,12 +357,14 @@ public IAccountStateDelta Execute( var items = Equipments.Concat(Costumes); avatarState.EquipItems(items); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Unequip items", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Unequip items", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var questSheet = sheets.GetQuestSheet(); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get QuestSheet", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Get QuestSheet", blockIndex, sw.Elapsed.TotalMilliseconds); // Update QuestList only when QuestSheet.Count is greater than QuestList.Count var questList = avatarState.questList; @@ -367,7 +377,8 @@ public IAccountStateDelta Execute( sheets.GetSheet(), sheets.GetSheet()); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update QuestList", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Update QuestList", blockIndex, sw.Elapsed.TotalMilliseconds); } sw.Restart(); @@ -406,7 +417,8 @@ public IAccountStateDelta Execute( } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Get skillState", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Get skillState", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); var worldUnlockSheet = sheets.GetSheet(); @@ -442,7 +454,8 @@ public IAccountStateDelta Execute( } } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update slotState", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Update slotState", blockIndex, sw.Elapsed.TotalMilliseconds); var stageWaveRow = sheets.GetSheet()[StageId]; var enemySkillSheet = sheets.GetSheet(); @@ -473,12 +486,14 @@ public IAccountStateDelta Execute( rewards, false); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Initialize Simulator", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Initialize Simulator", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); simulator.Simulate(); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Simulator.Simulate()", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Simulator.Simulate()", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); if (simulator.Log.IsClear) @@ -495,7 +510,8 @@ public IAccountStateDelta Execute( stageCleared = true; } sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "ClearStage", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "ClearStage", blockIndex, sw.Elapsed.TotalMilliseconds); } sw.Restart(); @@ -526,6 +542,7 @@ public IAccountStateDelta Execute( sw.Stop(); Log.Verbose( "{AddressesHex} {Source} {Process} by simulator({AvatarAddress}); " + + "blockIndex: {BlockIndex} " + "worldId: {WorldId}, stageId: {StageId}, result: {Result}, " + "clearWave: {ClearWave}, totalWave: {TotalWave}", addressesHex, @@ -540,8 +557,8 @@ public IAccountStateDelta Execute( ); } sw.Stop(); - Log.Debug("{AddressesHex} {Source} {Process}: {Elapsed}, Count: {PlayCount}", - addressesHex, source, "loop Simulate", sw.Elapsed.TotalMilliseconds, TotalPlayCount); + Log.Debug("{AddressesHex} {Source} {Process} from #{BlockIndex}: {Elapsed}, Count: {PlayCount}", + addressesHex, source, "loop Simulate", blockIndex, sw.Elapsed.TotalMilliseconds, TotalPlayCount); // Update CrystalRandomSkillState.Stars by clearedWaveNumber. (add) skillState?.Update(starCount, crystalStageBuffSheet); @@ -550,7 +567,8 @@ public IAccountStateDelta Execute( avatarState.updatedAt = blockIndex; avatarState.mailBox.CleanUp(); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Update AvatarState", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Update AvatarState", blockIndex, sw.Elapsed.TotalMilliseconds); sw.Restart(); if (isNotClearedStage) @@ -572,10 +590,11 @@ public IAccountStateDelta Execute( .SetState(worldInformationAddress, avatarState.worldInformation.Serialize()) .SetState(questListAddress, avatarState.questList.Serialize()); sw.Stop(); - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Set States", sw.Elapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process} from #{BlockIndex}: {Elapsed}", + addressesHex, source, "Set States", blockIndex, sw.Elapsed.TotalMilliseconds); var totalElapsed = DateTimeOffset.UtcNow - started; - Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}", addressesHex, source, "Total Executed Time", totalElapsed.TotalMilliseconds); + Log.Verbose("{AddressesHex} {Source} HAS {Process}: {Elapsed}, blockIndex: {BlockIndex}", addressesHex, source, "Total Executed Time", totalElapsed.TotalMilliseconds, blockIndex); return states; }