diff --git a/Lib9c b/Lib9c index 9f1661102..cd378f26a 160000 --- a/Lib9c +++ b/Lib9c @@ -1 +1 @@ -Subproject commit 9f1661102a74ef38c4715061c7e8a36d8c544366 +Subproject commit cd378f26a8d187c08ea928a15ec988d394fc14a3 diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs index efb84a914..db6713754 100644 --- a/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs +++ b/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs @@ -32,6 +32,8 @@ using Xunit; using Lib9cUtils = Lib9c.DevExtensions.Utils; using CoconaUtils = Libplanet.Extensions.Cocona.Utils; +using Libplanet.Types.Assets; +using Nekoyume.TableData; namespace NineChronicles.Headless.Executable.Tests.Commands { @@ -41,6 +43,7 @@ public class ChainCommandTest : IDisposable // Because the purpose of ChainCommandTest is to store and read blockchain data. private readonly StringIOConsole _console; private readonly ChainCommand _command; + private readonly Dictionary _sheets; private readonly string _storePath; @@ -50,6 +53,7 @@ public ChainCommandTest() _command = new ChainCommand(_console); _storePath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + _sheets = TableSheetsImporter.ImportSheets(); } [Theory] @@ -91,14 +95,28 @@ public void Inspect(StoreType storeType) policyActionsRegistry: blockPolicy.PolicyActionsRegistry, stateStore, new NCActionLoader()); + var sheets = TableSheetsImporter.ImportSheets(); Block genesisBlock = BlockChain.ProposeGenesisBlock( transactions: new IAction[] { - new Initialize( - validatorSet: new ValidatorSet( - new[] { new Validator(proposer.PublicKey, BigInteger.One) }.ToList() + new InitializeStates( + validatorSet: new ValidatorSet(new List + { + new Validator(proposer.PublicKey, 10_000_000_000_000_000_000) + }), + rankingState: new RankingState0(), + shopState: new ShopState(), + gameConfigState: new GameConfigState(sheets[nameof(GameConfigSheet)]), + redeemCodeState: new RedeemCodeState( + Bencodex.Types.Dictionary.Empty + .Add("address", RedeemCodeState.Address.Serialize()) + .Add("map", Bencodex.Types.Dictionary.Empty) ), - states: ImmutableDictionary.Create() + activatedAccountsState: new ActivatedAccountsState(), + goldCurrencyState: new GoldCurrencyState(Currency.Uncapped("ncg", 2, null)), + goldDistributions: new GoldDistribution[] { }, + tableSheets: sheets, + pendingActivationStates: new PendingActivationState[] { } ) }.Select((sa, nonce) => Transaction.Create(nonce, new PrivateKey(), null, new[] { sa.PlainValue })) .ToImmutableList()); @@ -151,15 +169,25 @@ public void Truncate(StoreType storeType) policyActionsRegistry: blockPolicy.PolicyActionsRegistry, stateStore, new NCActionLoader()); + var validatorSet = new ValidatorSet( + new[] { new Validator(proposer.PublicKey, 10_000_000_000_000_000_000) }.ToList()); + var gameConfigState = new GameConfigState(_sheets[nameof(GameConfigSheet)]); + var redeemCodeListSheet = new RedeemCodeListSheet(); Block genesisBlock = BlockChain.ProposeGenesisBlock( transactions: new IAction[] { - new Initialize( - validatorSet: new ValidatorSet( - new[] { new Validator(proposer.PublicKey, BigInteger.One) }.ToList() - ), - states: ImmutableDictionary.Create() - ) + new InitializeStates( + validatorSet: validatorSet, + rankingState: new RankingState0(), + shopState: new ShopState(), + tableSheets: _sheets, + gameConfigState: gameConfigState, + redeemCodeState: new RedeemCodeState(redeemCodeListSheet), + adminAddressState: null, + activatedAccountsState: new ActivatedAccountsState(ImmutableHashSet
.Empty), + goldCurrencyState: new GoldCurrencyState(Currency.Uncapped("ncg", 2, null), 0), + goldDistributions: Array.Empty(), + pendingActivationStates: Array.Empty()) }.Select((sa, nonce) => Transaction.Create(nonce, new PrivateKey(), null, new[] { sa.PlainValue })) .ToImmutableList()); BlockChain chain = BlockChain.Create( @@ -407,18 +435,16 @@ private Block MineGenesisBlock() AdminState adminState = new AdminState(new Address(genesisConfig.AdminAddress), genesisConfig.AdminValidUntil); Block genesisBlock = BlockHelper.ProposeGenesisBlock( + new ValidatorSet(new List + { + new Validator(GenesisHelper.ValidatorKey.PublicKey, 10_000_000_000_000_000_000) + }), tableSheets, goldDistributions, pendingActivationStates.ToArray(), adminState, authorizedMinersState, ImmutableHashSet
.Empty, - new Dictionary - { - { - GenesisHelper.ValidatorKey.PublicKey, BigInteger.One - } - }, genesisConfig.ActivationKeyCount != 0, null, new PrivateKey(ByteUtil.ParseHex(genesisConfig.PrivateKey)) @@ -439,7 +465,7 @@ private Block MineGenesisBlock() block.Hash, DateTimeOffset.UtcNow, validator.PublicKey, - null, + 10_000_000_000_000_000_000, VoteFlag.PreCommit).Sign(validator))) : null; } diff --git a/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs b/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs index 26b8984ca..9d5054fe8 100644 --- a/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs +++ b/NineChronicles.Headless.Executable.Tests/Commands/GenesisHelper.cs @@ -79,19 +79,18 @@ public static Block MineGenesisBlock( AdminState adminState = new AdminState(new Address(genesisConfig.AdminAddress), genesisConfig.AdminValidUntil); Block genesisBlock = BlockHelper.ProposeGenesisBlock( + new ValidatorSet( + genesisValidatorSet?.Select(kv => new Validator(kv.Key, kv.Value)).ToList() + ?? new List + { + new Validator(ValidatorKey.PublicKey, 10_000_000_000_000_000_000) + }), tableSheets, goldDistributions, pendingActivationStates.ToArray(), adminState, authorizedMinersState, ImmutableHashSet
.Empty, - genesisValidatorSet ?? new Dictionary - { - { - ValidatorKey.PublicKey, - BigInteger.One - } - }, genesisConfig.ActivationKeyCount != 0, null, new PrivateKey(ByteUtil.ParseHex(genesisConfig.PrivateKey)) @@ -109,7 +108,7 @@ public static void AppendEmptyBlock(BlockChain blockChain) block.Hash, new[] { - new VoteMetadata(block.Index, 0, block.Hash, block.Timestamp, ValidatorKey.PublicKey, null, VoteFlag.PreCommit).Sign(ValidatorKey), + new VoteMetadata(block.Index, 0, block.Hash, block.Timestamp, ValidatorKey.PublicKey, 10_000_000_000_000_000_000, VoteFlag.PreCommit).Sign(ValidatorKey), }.ToImmutableArray()); blockChain.Append(block, blockCommit); } diff --git a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj index a00edfe40..60b2742bb 100644 --- a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj +++ b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj @@ -19,6 +19,11 @@ + + + + + diff --git a/NineChronicles.Headless.Executable.Tests/TableSheetsImporter.cs b/NineChronicles.Headless.Executable.Tests/TableSheetsImporter.cs new file mode 100644 index 000000000..bc25dc417 --- /dev/null +++ b/NineChronicles.Headless.Executable.Tests/TableSheetsImporter.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using System.IO; + +namespace NineChronicles.Headless.Executable.Tests +{ + public static class TableSheetsImporter + { + public static Dictionary ImportSheets() => + Lib9c.Tests.TableSheetsImporter.ImportSheets(Path + .GetFullPath("../../") + .Replace( + Path.Combine("NineChronicles.Headless.Executable.Tests", "bin"), + Path.Combine("Lib9c", "Lib9c", "TableCSV"))); + } +} diff --git a/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs b/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs index cf4b68141..9f9483d3a 100644 --- a/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs +++ b/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs @@ -11,6 +11,7 @@ using Libplanet.Crypto; using Libplanet.Types.Assets; using Libplanet.Types.Blocks; +using Libplanet.Types.Consensus; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; @@ -266,15 +267,17 @@ public void Mine( // Mine genesis block _console.Out.WriteLine("\nMining genesis block...\n"); Block block = BlockHelper.ProposeGenesisBlock( + validatorSet: new ValidatorSet( + initialValidatorSet.Select( + v => new Libplanet.Types.Consensus.Validator( + new PublicKey(ByteUtil.ParseHex(v.PublicKey)), + new BigInteger(v.Power))).ToList()), tableSheets: tableSheets, goldDistributions: initialDepositList.ToArray(), pendingActivationStates: Array.Empty(), // FIXME Should remove default value after fixing parameter type on Lib9c side. adminState: adminState ?? new AdminState(default, 0L), privateKey: initialMinter, - initialValidators: initialValidatorSet.ToDictionary( - item => new PublicKey(ByteUtil.ParseHex(item.PublicKey)), - item => new BigInteger(item.Power)), actionBases: adminMeads.Concat(initialMeads).Concat(initialPledges).Concat(GetAdditionalActionBases()), goldCurrency: currency ); diff --git a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs index 0c7ce24a5..76d04beb5 100644 --- a/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs +++ b/NineChronicles.Headless.Executable/Commands/ReplayCommand.Privates.cs @@ -11,6 +11,8 @@ using Libplanet.Types.Tx; using Serilog; using Libplanet.Types.Evidence; +using Libplanet.Types.Blocks; +using Libplanet.Types.Assets; namespace NineChronicles.Headless.Executable.Commands { @@ -51,6 +53,8 @@ public ActionContext( public int BlockProtocolVersion { get; } + public BlockCommit? LastCommit { get; } + public bool Rehearsal { get; } public IWorld PreviousState { get; } @@ -68,9 +72,7 @@ public void UseGas(long gas) { } - public long GasUsed() => 0; - - public long GasLimit() => 0; + public FungibleAssetValue? MaxGasPrice => null; public IRandom GetRandom() => new Random(RandomSeed); } diff --git a/NineChronicles.Headless.Tests/Action/ActionContext.cs b/NineChronicles.Headless.Tests/Action/ActionContext.cs index 8f13f472c..fbcdd7c0a 100644 --- a/NineChronicles.Headless.Tests/Action/ActionContext.cs +++ b/NineChronicles.Headless.Tests/Action/ActionContext.cs @@ -3,6 +3,8 @@ using Libplanet.Action.State; using Libplanet.Crypto; using Libplanet.Extensions.ActionEvaluatorCommonComponents; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; using Libplanet.Types.Evidence; using Libplanet.Types.Tx; @@ -10,35 +12,21 @@ namespace NineChronicles.Headless.Tests.Action; public class ActionContext : IActionContext { - private long UsedGas { get; set; } - public Address Signer { get; init; } public TxId? TxId { get; init; } public Address Miner { get; init; } public long BlockIndex { get; init; } public int BlockProtocolVersion { get; init; } + public BlockCommit LastCommit { get; init; } public IWorld PreviousState { get; init; } public int RandomSeed { get; init; } public bool IsPolicyAction { get; init; } + public FungibleAssetValue? MaxGasPrice { get; set; } public IReadOnlyList Txs { get; init; } public IReadOnlyList Evidence { get; init; } - public void UseGas(long gas) - { - UsedGas += gas; - } public IRandom GetRandom() { return new Random(RandomSeed); } - - public long GasUsed() - { - return UsedGas; - } - - public long GasLimit() - { - return 0L; - } } diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs index 851646c29..fa2a18a1f 100644 --- a/NineChronicles.Headless.Tests/Common/Fixtures.cs +++ b/NineChronicles.Headless.Tests/Common/Fixtures.cs @@ -26,7 +26,7 @@ public static class Fixtures public static readonly Address AvatarAddress = new Address("983c3Fbfe8243a0e36D55C6C1aE26A7c8Bb6CBd4"); - public static readonly Address StakeStateAddress = StakeState.DeriveAddress(UserAddress); + public static readonly Address StakeStateAddress = LegacyStakeState.DeriveAddress(UserAddress); public static readonly TableSheets TableSheetsFX = new(TableSheetsImporter.ImportSheets()); diff --git a/NineChronicles.Headless.Tests/GraphQLTestUtils.cs b/NineChronicles.Headless.Tests/GraphQLTestUtils.cs index 88707debf..8595d8538 100644 --- a/NineChronicles.Headless.Tests/GraphQLTestUtils.cs +++ b/NineChronicles.Headless.Tests/GraphQLTestUtils.cs @@ -189,7 +189,7 @@ InitializeStates initializeStates 0, block.Hash, ValidatorPrivateKeys.Select( - k => new VoteMetadata(block.Index, 0, block.Hash, block.Timestamp, k.PublicKey, null, VoteFlag.PreCommit).Sign(k)) + k => new VoteMetadata(block.Index, 0, block.Hash, block.Timestamp, k.PublicKey, BigInteger.One, VoteFlag.PreCommit).Sign(k)) .ToImmutableArray()); blockchain.Append(block, blockCommit); diff --git a/NineChronicles.Headless.Tests/GraphTypes/ActionQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/ActionQueryTest.cs index 7953d2bdb..1b01ffb76 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/ActionQueryTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/ActionQueryTest.cs @@ -13,6 +13,7 @@ using Libplanet.Common; using Libplanet.Crypto; using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; using Libplanet.Types.Tx; using Nekoyume; using Nekoyume.Action; @@ -45,6 +46,7 @@ public ActionQueryTest() new Random().NextBytes(_nonce); (_activationKey, PendingActivationState pending) = ActivationKey.Create(_activationCodeSeed, _nonce); var initializeStates = new InitializeStates( + validatorSet: new ValidatorSet(new List { new Validator(MinerPrivateKey.PublicKey, 1) }), rankingState: new RankingState0(), shopState: new ShopState(), gameConfigState: new GameConfigState(), diff --git a/NineChronicles.Headless.Tests/GraphTypes/AddressQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/AddressQueryTest.cs index 03c3db385..77d1ca3ff 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/AddressQueryTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/AddressQueryTest.cs @@ -5,6 +5,7 @@ using GraphQL.Execution; using Libplanet.Crypto; using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; using Nekoyume.Action; using Nekoyume.Model.State; using NineChronicles.Headless.GraphTypes; @@ -21,24 +22,25 @@ public class AddressQueryTest public AddressQueryTest() { var initializeStates = new InitializeStates( - rankingState: new RankingState0(), - shopState: new ShopState(), - gameConfigState: new GameConfigState(), - redeemCodeState: new RedeemCodeState(Bencodex.Types.Dictionary.Empty - .Add("address", RedeemCodeState.Address.Serialize()) - .Add("map", Bencodex.Types.Dictionary.Empty) - ), - adminAddressState: new AdminState(new PrivateKey().Address, 1500000), - activatedAccountsState: new ActivatedAccountsState(), + validatorSet: new ValidatorSet(new List { new Validator(MinerPrivateKey.PublicKey, 1) }), + rankingState: new RankingState0(), + shopState: new ShopState(), + gameConfigState: new GameConfigState(), + redeemCodeState: new RedeemCodeState(Bencodex.Types.Dictionary.Empty + .Add("address", RedeemCodeState.Address.Serialize()) + .Add("map", Bencodex.Types.Dictionary.Empty) + ), + adminAddressState: new AdminState(new PrivateKey().Address, 1500000), + activatedAccountsState: new ActivatedAccountsState(), #pragma warning disable CS0618 - // Use of obsolete method Currency.Legacy(): https://github.com/planetarium/lib9c/discussions/1319 - goldCurrencyState: - new GoldCurrencyState(Currency.Legacy("NCG", 2, MinerPrivateKey.Address)), + // Use of obsolete method Currency.Legacy(): https://github.com/planetarium/lib9c/discussions/1319 + goldCurrencyState: + new GoldCurrencyState(Currency.Legacy("NCG", 2, MinerPrivateKey.Address)), #pragma warning restore CS0618 - goldDistributions: Array.Empty(), - tableSheets: new Dictionary(), - pendingActivationStates: new PendingActivationState[] { } - ); + goldDistributions: Array.Empty(), + tableSheets: new Dictionary(), + pendingActivationStates: new PendingActivationState[] { } + ); _standaloneContext = CreateStandaloneContext(initializeStates); } diff --git a/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs b/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs index eff90d826..7a4b15b46 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/GraphQLTestBase.cs @@ -69,6 +69,10 @@ public GraphQLTestBase(ITestOutputHelper output) AdminPrivateKey, null, new ActionBase[] { new InitializeStates( + validatorSet: new ValidatorSet(new List + { + new Validator(ProposerPrivateKey.PublicKey, 10_000_000_000_000_000_000) + }), rankingState: new RankingState0(), shopState: new ShopState(), gameConfigState: new GameConfigState(sheets[nameof(GameConfigSheet)]), @@ -84,14 +88,7 @@ public GraphQLTestBase(ITestOutputHelper output) tableSheets: sheets, pendingActivationStates: new PendingActivationState[] { } ), - }.ToPlainValues())).AddRange(new IAction[] - { - new Initialize( - new ValidatorSet( - new[] { new Validator(ProposerPrivateKey.PublicKey, BigInteger.One) } - .ToList()), - states: ImmutableDictionary.Create()) - }.Select((sa, nonce) => Transaction.Create(nonce + 1, AdminPrivateKey, null, new[] { sa.PlainValue }))), + }.ToPlainValues())), privateKey: AdminPrivateKey); var ncService = ServiceBuilder.CreateNineChroniclesNodeService(genesisBlock, ProposerPrivateKey); @@ -278,7 +275,7 @@ protected LibplanetNodeService CreateLibplanetNodeService( hash, DateTimeOffset.UtcNow, validator.PublicKey, - null, + 10_000_000_000_000_000_000, VoteFlag.PreCommit).Sign(validator)).ToImmutableArray()) : (BlockCommit?)null; } diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs index 075b60c14..c5dfc3757 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs @@ -114,7 +114,9 @@ public async Task RevokePrivateKey() Assert.Equal(address.ToString(), revokedPrivateKeyAddress); } - [Theory] + // FIXME: This test is not working because of the PoS reward distribution. + // Need to fix this test. + [Theory(Skip = "This feature cannot be tested under PoS reward distribution")] [InlineData(null, false)] [InlineData("", false)] [InlineData("memo", false)] @@ -205,7 +207,9 @@ public async Task Transfer(string? memo, bool error) } } - [Fact] + // FIXME: This test is not working because of the PoS reward distribution. + // Need to fix this test. + [Fact(Skip = "This feature cannot be tested under PoS reward distribution")] public async Task TransferGold() { NineChroniclesNodeService service = StandaloneContextFx.NineChroniclesNodeService!; @@ -870,6 +874,10 @@ private Block MakeGenesisBlock( AdminPrivateKey, null, new ActionBase[] { new InitializeStates( + validatorSet: new ValidatorSet(new List + { + new Validator(ProposerPrivateKey.PublicKey, 10_000_000_000_000_000_000) + }), rankingState: rankingState ?? new RankingState0(), shopState: new ShopState(), gameConfigState: new GameConfigState(_sheets[nameof(GameConfigSheet)]), @@ -892,14 +900,7 @@ private Block MakeGenesisBlock( 1 * Currencies.Mead } } - }.ToPlainValues())).AddRange(new IAction[] - { - new Initialize( - new ValidatorSet( - new[] { new Validator(ProposerPrivateKey.PublicKey, BigInteger.One) } - .ToList()), - states: ImmutableDictionary.Create()) - }.Select((sa, nonce) => Transaction.Create(nonce + 1, AdminPrivateKey, null, new[] { sa.PlainValue }))), + }.ToPlainValues())), privateKey: AdminPrivateKey); } } diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs index 0e8a91c3f..6edede92b 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs @@ -797,6 +797,10 @@ private NineChroniclesNodeService MakeNineChroniclesNodeService(PrivateKey priva new ActionBase[] { new InitializeStates( + validatorSet: new ValidatorSet(new List + { + new Validator(ProposerPrivateKey.PublicKey, 10_000_000_000_000_000_000) + }), rankingState: new RankingState0(), shopState: new ShopState(), gameConfigState: new GameConfigState(_sheets[nameof(GameConfigSheet)]), diff --git a/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeAchievementsTypeTest.cs b/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeAchievementsTypeTest.cs index 4712ce282..5efecab6d 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeAchievementsTypeTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeAchievementsTypeTest.cs @@ -12,7 +12,7 @@ public class StakeAchievementsTypeTest { [Theory] [MemberData(nameof(Members))] - public async Task AchievementsByLevel(StakeState.StakeAchievements achievements, int level, Dictionary expected) + public async Task AchievementsByLevel(LegacyStakeState.StakeAchievements achievements, int level, Dictionary expected) { string query = @$" {{ @@ -27,7 +27,7 @@ public async Task AchievementsByLevel(StakeState.StakeAchievements achievements, { new object[] { - new StakeState.StakeAchievements(new Dictionary + new LegacyStakeState.StakeAchievements(new Dictionary { [1] = 1, [2] = 3, diff --git a/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeStateTypeTest.cs b/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeStateTypeTest.cs index 59ebf1cee..0b50e926d 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeStateTypeTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/States/Models/StakeStateTypeTest.cs @@ -21,7 +21,7 @@ public class StakeStateTypeTest { [Theory] [MemberData(nameof(Members))] - public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long deposit, long blockIndex, Dictionary expected) + public async Task Query(StakeState stakeState, Address stakeStateAddress, long deposit, long blockIndex, Dictionary expected) { #pragma warning disable CS0618 // Use of obsolete method Currency.Legacy(): https://github.com/planetarium/lib9c/discussions/1319 @@ -60,7 +60,7 @@ public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long { new object[] { - new StakeStateV2( + new StakeState( new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 0), Fixtures.StakeStateAddress, 100, @@ -70,14 +70,14 @@ public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long ["address"] = Fixtures.StakeStateAddress.ToString(), ["deposit"] = "100.00", ["startedBlockIndex"] = 0L, - ["cancellableBlockIndex"] = StakeState.LockupInterval, + ["cancellableBlockIndex"] = LegacyStakeState.LockupInterval, ["receivedBlockIndex"] = 0L, - ["claimableBlockIndex"] = 0L + StakeState.RewardInterval, + ["claimableBlockIndex"] = 0L + LegacyStakeState.RewardInterval, } }, new object[] { - new StakeStateV2(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 100), + new StakeState(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 100), Fixtures.StakeStateAddress, 100, 0, @@ -86,14 +86,14 @@ public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long ["address"] = Fixtures.StakeStateAddress.ToString(), ["deposit"] = "100.00", ["startedBlockIndex"] = 100L, - ["cancellableBlockIndex"] = 100 + StakeState.LockupInterval, + ["cancellableBlockIndex"] = 100 + LegacyStakeState.LockupInterval, ["receivedBlockIndex"] = 0L, - ["claimableBlockIndex"] = 100 + StakeState.RewardInterval, + ["claimableBlockIndex"] = 100 + LegacyStakeState.RewardInterval, } }, new object[] { - new StakeStateV2(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 100), + new StakeState(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 100), Fixtures.StakeStateAddress, 100, 0, @@ -102,14 +102,14 @@ public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long ["address"] = Fixtures.StakeStateAddress.ToString(), ["deposit"] = "100.00", ["startedBlockIndex"] = 100L, - ["cancellableBlockIndex"] = StakeState.LockupInterval + 100, + ["cancellableBlockIndex"] = LegacyStakeState.LockupInterval + 100, ["receivedBlockIndex"] = 0L, - ["claimableBlockIndex"] = StakeState.RewardInterval + 100, + ["claimableBlockIndex"] = LegacyStakeState.RewardInterval + 100, } }, new object[] { - new StakeStateV2( + new StakeState( new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 10, 50412), Fixtures.StakeStateAddress, 100, @@ -126,7 +126,7 @@ public async Task Query(StakeStateV2 stakeState, Address stakeStateAddress, long }, new object[] { - new StakeStateV2(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 10, 50412), + new StakeState(new Contract("StakeRegularFixedRewardSheet_V1", "StakeRegularRewardSheet_V1", 50400, 201600), 10, 50412), Fixtures.StakeStateAddress, 100, ActionObsoleteConfig.V100290ObsoleteIndex, diff --git a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs index a1a9a1002..4aebb2e28 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -using System.Numerics; using System.Threading.Tasks; using Bencodex; using Bencodex.Types; @@ -11,20 +10,24 @@ using GraphQL.NewtonsoftJson; using Lib9c; using Libplanet.Action; -using Libplanet.Action.Sys; +using Libplanet.Action.Loader; using Libplanet.Blockchain; using Libplanet.Blockchain.Policies; using Libplanet.Crypto; using Libplanet.Store; using Libplanet.Store.Trie; +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; +using Nekoyume.Model.State; +using Nekoyume.TableData; using NineChronicles.Headless.GraphTypes; using NineChronicles.Headless.Tests.Common; +using NineChronicles.Headless.Tests.Common.Actions; using NineChronicles.Headless.Utils; using Xunit; using static NineChronicles.Headless.NCActionUtils; @@ -38,6 +41,7 @@ public class TransactionHeadlessQueryTest private readonly IStateStore _stateStore; private readonly NineChroniclesNodeService _service; private readonly PrivateKey _proposer = new PrivateKey(); + private readonly Dictionary _sheets = TableSheetsImporter.ImportSheets(); public TransactionHeadlessQueryTest() { @@ -48,14 +52,25 @@ public TransactionHeadlessQueryTest() policyActionsRegistry: policy.PolicyActionsRegistry, _stateStore, new NCActionLoader()); + var validatorSet = new ValidatorSet( + new[] { new Validator(_proposer.PublicKey, 10_000_000_000_000_000_000) }.ToList()); + var gameConfigState = new GameConfigState(_sheets[nameof(GameConfigSheet)]); + var redeemCodeListSheet = new RedeemCodeListSheet(); Block genesisBlock = BlockChain.ProposeGenesisBlock( transactions: new IAction[] { - new Initialize( - new ValidatorSet( - new[] { new Validator(_proposer.PublicKey, BigInteger.One) } - .ToList()), - states: ImmutableDictionary.Create()) + new InitializeStates( + validatorSet: validatorSet, + rankingState: new RankingState0(), + shopState: new ShopState(), + tableSheets: _sheets, + gameConfigState: gameConfigState, + redeemCodeState: new RedeemCodeState(redeemCodeListSheet), + adminAddressState: null, + activatedAccountsState: new ActivatedAccountsState(ImmutableHashSet
.Empty), + goldCurrencyState: new GoldCurrencyState(Currency.Uncapped("ncg", 2, null), 0), + goldDistributions: Array.Empty(), + pendingActivationStates: Array.Empty()) }.Select((sa, nonce) => Transaction.Create(nonce, new PrivateKey(), null, new[] { sa.PlainValue })) .ToImmutableList(), privateKey: new PrivateKey() @@ -428,7 +443,7 @@ private Task ExecuteAsync(string query) hash, DateTimeOffset.UtcNow, validator.PublicKey, - null, + 10_000_000_000_000_000_000, VoteFlag.PreCommit).Sign(validator))) : (BlockCommit?)null; } diff --git a/NineChronicles.Headless.Tests/GraphTypes/WorldBossScenarioTest.cs b/NineChronicles.Headless.Tests/GraphTypes/WorldBossScenarioTest.cs index a215ef71a..23f681372 100644 --- a/NineChronicles.Headless.Tests/GraphTypes/WorldBossScenarioTest.cs +++ b/NineChronicles.Headless.Tests/GraphTypes/WorldBossScenarioTest.cs @@ -9,6 +9,7 @@ using Libplanet.Crypto; using Libplanet.Mocks; using Libplanet.Types.Assets; +using Libplanet.Types.Consensus; using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.State; @@ -66,6 +67,7 @@ public WorldBossScenarioTest() }; _stateContext = new StateContext(GetMockState(), 1L, new StateMemoryCache()); var initializeStates = new InitializeStates( + validatorSet: new ValidatorSet(new List { new Validator(new PrivateKey().PublicKey, BigInteger.One) }), rankingState: new RankingState0(), shopState: new ShopState(), gameConfigState: new GameConfigState(), diff --git a/NineChronicles.Headless/GraphTypes/ActionMutation.cs b/NineChronicles.Headless/GraphTypes/ActionMutation.cs index 17e9f7e66..03cef46de 100644 --- a/NineChronicles.Headless/GraphTypes/ActionMutation.cs +++ b/NineChronicles.Headless/GraphTypes/ActionMutation.cs @@ -10,6 +10,13 @@ using System; using System.Collections.Generic; using Nekoyume.Module; +using Lib9c; +using Libplanet.Types.Assets; +using Nekoyume.Action.ValidatorDelegation; +using System.Numerics; +using Nekoyume.Action.Guild.Migration; +using Nekoyume.TypedAddress; +using Nekoyume.ValidatorDelegation; namespace NineChronicles.Headless.GraphTypes { diff --git a/NineChronicles.Headless/GraphTypes/ActionQuery.cs b/NineChronicles.Headless/GraphTypes/ActionQuery.cs index 4462dcbf2..f220ea3fa 100644 --- a/NineChronicles.Headless/GraphTypes/ActionQuery.cs +++ b/NineChronicles.Headless/GraphTypes/ActionQuery.cs @@ -3,18 +3,16 @@ using System.Linq; using System.Numerics; using Bencodex; -using Bencodex.Types; -using Google.Protobuf.WellKnownTypes; using GraphQL; using GraphQL.Types; using Libplanet.Crypto; using Libplanet.Types.Assets; using Libplanet.Explorer.GraphTypes; using Nekoyume.Action; -using Nekoyume.Model; -using Nekoyume.Model.State; -using Nekoyume.Module; using Nekoyume.TableData; +using Nekoyume.Action.ValidatorDelegation; +using Nekoyume.Action.Guild.Migration; +using Lib9c; namespace NineChronicles.Headless.GraphTypes { @@ -527,9 +525,55 @@ public ActionQuery(StandaloneContext standaloneContext) RuneId = runeId, TryCount = tryCount }; + return Encode(context, action); }); + Field( + name: "promoteValidator", + arguments: new QueryArguments( + new QueryArgument> + { + Description = "Public key of validator.", + Name = "publicKey", + }, + new QueryArgument> + { + Description = "A string value to be transferred.", + Name = "amount", + }), + resolve: context => + { + var currency = FungibleAssetValue.Parse( + Currencies.GuildGold, + context.GetArgument("amount")); + var publicKey = PublicKey.FromHex( + context.GetArgument("publicKey")); + + return Encode( + context, + new PromoteValidator( + publicKey, + currency)); + }); + + Field( + name: "migrateDelegationHeight", + arguments: new QueryArguments(new QueryArgument + { + Name = "height", + Description = "An migration height.", + }), + resolve: context => Encode( + context, + new MigrateDelegationHeight(context.GetArgument("amount")))); + + Field( + name: "migratePlanetariumGuild", + resolve: context => Encode( + context, + new MigratePlanetariumGuild())); + RegisterHackAndSlash(); RegisterHackAndSlashSweep(); RegisterDailyReward(); diff --git a/NineChronicles.Headless/GraphTypes/StateQuery.cs b/NineChronicles.Headless/GraphTypes/StateQuery.cs index e52d0edc3..e35cf04dd 100644 --- a/NineChronicles.Headless/GraphTypes/StateQuery.cs +++ b/NineChronicles.Headless/GraphTypes/StateQuery.cs @@ -29,6 +29,11 @@ using NineChronicles.Headless.GraphTypes.States.Models.Item; using NineChronicles.Headless.GraphTypes.States.Models.Item.Enum; using NineChronicles.Headless.GraphTypes.States.Models.Table; +using Nekoyume.Model.Guild; +using NineChronicles.Headless.Utils; +using Nekoyume.Module.Guild; +using Nekoyume.TypedAddress; +using Nekoyume.ValidatorDelegation; namespace NineChronicles.Headless.GraphTypes { @@ -250,7 +255,7 @@ public StateQuery() StakeStateType.StakeStateContext? GetStakeState(StateContext ctx, Address agentAddress) { var stakeStateAddress = StakeState.DeriveAddress(agentAddress); - if (ctx.WorldState.TryGetStakeStateV2(agentAddr: agentAddress, out StakeStateV2 stakeStateV2)) + if (ctx.WorldState.TryGetStakeState(agentAddr: agentAddress, out StakeState stakeStateV2)) { return new StakeStateType.StakeStateContext( stakeStateV2, @@ -389,7 +394,7 @@ public StateQuery() StakeRegularRewardSheet stakeRegularRewardSheet; StakeRegularFixedRewardSheet stakeRegularFixedRewardSheet; - if (context.Source.BlockIndex < StakeState.StakeRewardSheetV2Index) + if (context.Source.BlockIndex < LegacyStakeState.StakeRewardSheetV2Index) { stakeRegularRewardSheet = new StakeRegularRewardSheet(); //stakeRegularRewardSheet.Set(ClaimStakeReward8.V1.StakeRegularRewardSheetCsv); @@ -715,6 +720,63 @@ public StateQuery() return context.Source.StateMemoryCache.SheetCache.GetSheet(cacheKey); } ); + + Field( + name: "guild", + description: "State for guild.", + arguments: new QueryArguments( + new QueryArgument> + { + Name = "agentAddress", + Description = "Address of agent." + } + ), + resolve: context => + { + var agentAddress = new AgentAddress(context.GetArgument
("agentAddress")); + if (!(context.Source.WorldState.GetAgentState(agentAddress) is { } agentState)) + { + return null; + } + + var repository = new GuildRepository(new World(context.Source.WorldState), new HallowActionContext { }); + var joinedGuild = (Address?)repository.GetJoinedGuild(agentAddress); + + return joinedGuild; + } + ); + + Field( + name: "share", + description: "State for delegation share.", + arguments: new QueryArguments( + new QueryArgument> + { + Name = "agentAddress", + Description = "Address of agent." + }, + new QueryArgument> + { + Name = "validatorAddress", + Description = "Address of validator." + } + ), + resolve: context => + { + var agentAddress = new AgentAddress(context.GetArgument
("agentAddress")); + var validatorAddress = context.GetArgument
("validatorAddress"); + if (!(context.Source.WorldState.GetAgentState(agentAddress) is { } agentState)) + { + return null; + } + + var repository = new ValidatorRepository(new World(context.Source.WorldState), new HallowActionContext { }); + var delegatee = repository.GetValidatorDelegatee(validatorAddress); + var share = repository.GetBond(delegatee, agentAddress).Share; + + return share.ToString(); + } + ); } public static List GetRuneOptions( diff --git a/NineChronicles.Headless/GraphTypes/States/StakeAchievementsType.cs b/NineChronicles.Headless/GraphTypes/States/StakeAchievementsType.cs index 8bd98fdaf..61ed1f6f6 100644 --- a/NineChronicles.Headless/GraphTypes/States/StakeAchievementsType.cs +++ b/NineChronicles.Headless/GraphTypes/States/StakeAchievementsType.cs @@ -5,7 +5,7 @@ namespace NineChronicles.Headless.GraphTypes.States { - public class StakeAchievementsType : ObjectGraphType + public class StakeAchievementsType : ObjectGraphType { public StakeAchievementsType() { diff --git a/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs b/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs index bea0c8f7a..bae74bac2 100644 --- a/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs +++ b/NineChronicles.Headless/GraphTypes/States/StakeStateType.cs @@ -18,14 +18,14 @@ public class StakeStateType : ObjectGraphType { public class StakeStateContext : StateContext { - public StakeStateContext(StakeStateV2 stakeState, Address address, IWorldState worldState, long blockIndex, StateMemoryCache stateMemoryCache) + public StakeStateContext(StakeState stakeState, Address address, IWorldState worldState, long blockIndex, StateMemoryCache stateMemoryCache) : base(worldState, blockIndex, stateMemoryCache) { StakeState = stakeState; Address = address; } - public StakeStateV2 StakeState { get; } + public StakeState StakeState { get; } public Address Address { get; } } @@ -60,7 +60,7 @@ public StakeStateType() description: "The block index the user can claim rewards.", resolve: context => context.Source.StakeState.ClaimableBlockIndex); Field( - nameof(StakeState.Achievements), + nameof(LegacyStakeState.Achievements), description: "The staking achievements.", deprecationReason: "Since StakeStateV2, the achievement became removed.", resolve: _ => null); diff --git a/NineChronicles.Headless/Utils/HallowActionContext.cs b/NineChronicles.Headless/Utils/HallowActionContext.cs new file mode 100644 index 000000000..52eaeb53f --- /dev/null +++ b/NineChronicles.Headless/Utils/HallowActionContext.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using Libplanet.Action; +using Libplanet.Action.State; +using Libplanet.Crypto; +using Libplanet.Types.Assets; +using Libplanet.Types.Blocks; +using Libplanet.Types.Evidence; +using Libplanet.Types.Tx; + +namespace NineChronicles.Headless.Utils +{ + public class HallowActionContext : IActionContext + { + public Address Signer => throw new NotImplementedException(); + public TxId? TxId => throw new NotImplementedException(); + public Address Miner => throw new NotImplementedException(); + public long BlockIndex => throw new NotImplementedException(); + public int BlockProtocolVersion => throw new NotImplementedException(); + public IWorld PreviousState => throw new NotImplementedException(); + public bool IsPolicyAction => throw new NotImplementedException(); + public IReadOnlyList Txs => throw new NotImplementedException(); + public IReadOnlyList Evidence => throw new NotImplementedException(); + public BlockCommit LastCommit => throw new NotImplementedException(); + public int RandomSeed => throw new NotImplementedException(); + public FungibleAssetValue? MaxGasPrice => throw new NotImplementedException(); + public IRandom GetRandom() => throw new NotImplementedException(); + } +}