Merge pull request #2471 from planetarium/20240510-bump-lib9c

Delete agent, avatar legacy account backward compatible code

NineChronicles.Headless.Executable/Commands/TxCommand.cs

@@ -190,34 +190,6 @@ public void MigrationActivatedAccountsState()
             _console.Out.WriteLine(ByteUtil.Hex(raw));
         }
 
-        [Command(Description = "Create MigrationAvatarState action and dump it.")]
-        public void MigrationAvatarState(
-            [Argument("directory-path", Description = "path of the directory contained hex-encoded avatar states.")]
-            string directoryPath,
-            [Argument("output-path", Description = "path of the output file dumped action.")]
-            string outputPath
-        )
-        {
-            var files = Directory.GetFiles(directoryPath, "*", SearchOption.AllDirectories);
-            var avatarStates = files.Select(a =>
-            {
-                var raw = File.ReadAllText(a);
-                return (Dictionary)_codec.Decode(ByteUtil.ParseHex(raw));
-            }).ToList();
-            var action = new MigrationAvatarState()
-            {
-                avatarStates = avatarStates
-            };
-
-            var encoded = new List(
-                (Text)nameof(Nekoyume.Action.MigrationAvatarState),
-                action.PlainValue
-            );
-
-            byte[] raw = _codec.Encode(encoded);
-            File.WriteAllText(outputPath, ByteUtil.Hex(raw));
-        }
-
         [Command(Description = "Create AddRedeemCode action and dump it.")]
         public void AddRedeemCode(
             [Argument("TABLE-PATH", Description = "A table file path for RedeemCodeListSheet")]

NineChronicles.Headless/BlockChainService.cs

@@ -199,7 +199,7 @@ public async UnaryResult<Dictionary<byte[], byte[]>> GetAvatarStatesByBlockHash(
             var addresses = addressBytesList.Select(a => new Address(a)).ToList();
             var taskList = addresses.Select(address => Task.Run(() =>
             {
-                var value = worldState.GetFullAvatarStateRaw(address);
+                var value = GetFullAvatarStateRaw(worldState, address);
                 result.TryAdd(address.ToByteArray(), _codec.Encode(value ?? Null.Value));
             }));
 
@@ -217,7 +217,7 @@ public async UnaryResult<Dictionary<byte[], byte[]>> GetAvatarStatesByStateRootH
             var result = new ConcurrentDictionary<byte[], byte[]>();
             var taskList = addresses.Select(address => Task.Run(() =>
             {
-                var value = worldState.GetFullAvatarStateRaw(address);
+                var value = GetFullAvatarStateRaw(worldState, address);
                 result.TryAdd(address.ToByteArray(), _codec.Encode(value ?? Null.Value));
             }));
 
@@ -447,5 +447,33 @@ public UnaryResult<bool> RemoveClient(byte[] addressBytes)
             _publisher.RemoveClient(address).Wait();
             return new UnaryResult<bool>(true);
         }
+
+        // Returning value is a list of [ Avatar, Inventory, QuestList, WorldInformation ]
+        private static IValue GetFullAvatarStateRaw(IWorldState worldState, Address address)
+        {
+            var serializedAvatarRaw = worldState.GetAccountState(Addresses.Avatar).GetState(address);
+            if (serializedAvatarRaw is not List)
+            {
+                Log.Warning(
+                    "Avatar state ({AvatarAddress}) should be " +
+                    "List but: {Raw}",
+                    address.ToHex(),
+                    serializedAvatarRaw);
+                return null;
+            }
+
+            var serializedInventoryRaw =
+                worldState.GetAccountState(Addresses.Inventory).GetState(address);
+            var serializedQuestListRaw =
+                worldState.GetAccountState(Addresses.QuestList).GetState(address);
+            var serializedWorldInformationRaw =
+                worldState.GetAccountState(Addresses.WorldInformation).GetState(address);
+
+            return new List(
+                serializedAvatarRaw,
+                serializedInventoryRaw!,
+                serializedQuestListRaw!,
+                serializedWorldInformationRaw!);
+        }
     }
 }