Merge pull request #2361 from planetarium/90-merge-main

90 merge main
planetarium · Dec 18, 2023 · d1d2ccb · d1d2ccb
2 parents d5c4b97 + bceff65
commit d1d2ccb
Show file tree

Hide file tree

Showing 12 changed files with 148 additions and 482 deletions.
diff --git a/Lib9c b/Lib9c
diff --git a/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs b/NineChronicles.Headless.Executable/Commands/GenesisCommand.cs
@@ -239,7 +239,7 @@ out List<CreatePledge> pledgeActions
         [Command(Description = "Mine a new genesis block")]
         public void Mine(
             [Argument("CONFIG", Description = "JSON config path to mine genesis block")]
-            string configPath)
+            string configPath = "./config.json")
         {
             var options = new JsonSerializerOptions
             {
@@ -275,7 +275,7 @@ public void Mine(
                     initialValidators: initialValidatorSet.ToDictionary(
                         item => new PublicKey(ByteUtil.ParseHex(item.PublicKey)),
                         item => new BigInteger(item.Power)),
-                    actionBases: adminMeads.Concat(initialMeads).Concat(initialPledges),
+                    actionBases: adminMeads.Concat(initialMeads).Concat(initialPledges).Concat(GetAdditionalActionBases()),
                     goldCurrency: currency
                 );
 
@@ -320,6 +320,19 @@ public void Mine(
             }
         }
 
+        /// <summary>
+        /// Actions to be appended on end of transaction actions.
+        /// You can add actions code to this method before generate genesis block.
+        /// </summary>
+        /// <returns></returns>
+        private static List<ActionBase> GetAdditionalActionBases()
+        {
+            return new List<ActionBase>
+            {
+
+            };
+        }
+
 #pragma warning disable S3459
         /// <summary>
         /// Game data to set into genesis block.

diff --git a/NineChronicles.Headless.Executable/Commands/MarketCommand.cs b/NineChronicles.Headless.Executable/Commands/MarketCommand.cs
@@ -50,10 +50,9 @@ public void Query(
             [Option(
                 'T',
                 Description = "Filter by item type.  This implicitly filters out transactions " +
-                              "made with " + nameof(Buy) + " action version prior to " + nameof(Buy5) +
-                              ".  This can be applied multiple times (meaning: match any of them).  " +
-                              "The list of available types can be found in " + nameof(ItemSubType) +
-                              " enum declared in Lib9c/Model/Item/ItemType.cs file.")]
+                              "made with " + nameof(Buy) + ".  This can be applied multiple times " +
+                              "(meaning: match any of them).  The list of available types can be found in " +
+                              nameof(ItemSubType) + " enum declared in Lib9c/Model/Item/ItemType.cs file.")]
             string[]? itemType = null,
             [Option('c', Description = "Optional chain ID.  Default is the canonical chain ID.")]
             Guid? chainId = null

diff --git a/NineChronicles.Headless.Tests/Controllers/GraphQLControllerTest.cs b/NineChronicles.Headless.Tests/Controllers/GraphQLControllerTest.cs
diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneMutationTest.cs
@@ -722,7 +722,7 @@ public async Task MonsterCollect()
                 }
             }";
 
-            ActionBase createAvatar = new CreateAvatar2
+            ActionBase createAvatar = new CreateAvatar
             {
                 index = 0,
                 hair = 0,
@@ -768,7 +768,7 @@ public async Task ClaimMonsterCollectionReward()
                 }}
             }}";
 
-            ActionBase createAvatar = new CreateAvatar2
+            ActionBase createAvatar = new CreateAvatar
             {
                 index = 0,
                 hair = 0,

diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneQueryTest.cs
@@ -735,7 +735,7 @@ public async Task MonsterCollectionStatus_MonsterCollectionState_Null(bool miner
             {
                 StandaloneContextFx.NineChroniclesNodeService.MinerPrivateKey = null;
             }
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -786,7 +786,7 @@ public async Task Avatar()
             var service = MakeNineChroniclesNodeService(userPrivateKey);
             StandaloneContextFx.NineChroniclesNodeService = service;
             StandaloneContextFx.BlockChain = service.Swarm!.BlockChain;
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -806,7 +806,7 @@ public async Task Avatar()
             var avatarAddress = userAddress.Derive(
                 string.Format(
                     CultureInfo.InvariantCulture,
-                    CreateAvatar2.DeriveFormat,
+                    CreateAvatar.DeriveFormat,
                     0
                 )
             );

diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
@@ -90,7 +90,7 @@ public async Task SubscribeTx()
             var observable = stream.Take(1);
 
             var targetAction = new Grinding { AvatarAddress = new Address(), EquipmentIds = new List<Guid>() };
-            var nonTargetAction = new DailyReward6 { avatarAddress = new Address() };
+            var nonTargetAction = new DailyReward { avatarAddress = new Address() };
 
             Task<ExecutionResult> task = Task.Run(async () => await observable);
             var (block, transactions) = AppendBlock(targetAction, nonTargetAction);

diff --git a/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs b/NineChronicles.Headless.Tests/GraphTypes/TransactionHeadlessQueryTest.cs
@@ -128,7 +128,7 @@ public async Task GetTx()
                 data
             );
 
-            var action = new CreateAvatar2
+            var action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,
@@ -165,7 +165,7 @@ public async Task CreateUnsignedTx(long? nonce)
             PublicKey publicKey = privateKey.PublicKey;
             Address signer = publicKey.Address;
             long expectedNonce = nonce ?? _blockChain.GetNextTxNonce(signer);
-            ActionBase action = new CreateAvatar2
+            ActionBase action = new CreateAvatar
             {
                 index = 0,
                 hair = 1,