Merge branch 'development' into feature/rider-rule-setting

eugene-doobu · Oct 21, 2024 · 69dda16 · 69dda16
2 parents 8c1fa07 + f6382bf
commit 69dda16
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 32 deletions.
diff --git a/Lib9c.MessagePack/Formatters/ExceptionFormatter.cs b/Lib9c.MessagePack/Formatters/ExceptionFormatter.cs
@@ -55,13 +55,29 @@ public void Serialize(ref MessagePackWriter writer, T? value,
             for (int i = 0; i < count; i++)
             {
                 var name = reader.ReadString();
+                if (name == null)
+                {
+                    throw new MessagePackSerializationException("Exception Name is missing.");
+                }
+
                 if (name == "ExceptionType")
                 {
                     typeName = reader.ReadString();
                 }
                 else
                 {
-                    var type = Type.GetType(reader.ReadString());
+                    var readType = reader.ReadString();
+                    if (readType == null)
+                    {
+                        throw new MessagePackSerializationException("Exception type information is missing.");
+                    }
+
+                    var type  = Type.GetType(readType);
+                    if (type == null)
+                    {
+                        throw new MessagePackSerializationException("Exception type information is missing.");
+                    }
+
                     var value = MessagePackSerializer.Deserialize(type, ref reader, options);
                     info.AddValue(name, value);
                 }

diff --git a/Lib9c.MessagePack/Lib9c.MessagePack.csproj b/Lib9c.MessagePack/Lib9c.MessagePack.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MessagePack" Version="2.3.85" />
-    <PackageReference Include="MessagePack.Annotations" Version="2.3.85" />
-    <PackageReference Include="MessagePackAnalyzer" Version="2.3.85">
+    <PackageReference Include="MessagePack" Version="2.5.187" />
+    <PackageReference Include="MessagePack.Annotations" Version="2.5.187" />
+    <PackageReference Include="MessagePackAnalyzer" Version="2.5.187">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Lib9c/Action/ActionBase.cs b/Lib9c/Action/ActionBase.cs
@@ -19,9 +19,6 @@ namespace Nekoyume.Action
     [Serializable]
     public abstract class ActionBase : IAction
     {
-        // FIXME GoldCurrencyState 에 정의된 것과 다른데 괜찮을지 점검해봐야 합니다.
-        protected static readonly Currency GoldCurrencyMock = new Currency();
-
         public abstract IValue PlainValue { get; }
         public abstract void LoadPlainValue(IValue plainValue);
         public abstract IWorld Execute(IActionContext context);
@@ -45,18 +42,6 @@ protected string GetSignerAndOtherAddressesHex(IActionContext ctx, params Addres
             return sb.ToString();
         }
 
-        protected IWorld LogError(IActionContext context, string message, params object[] values)
-        {
-            string actionType = GetType().Name;
-            object[] prependedValues = new object[values.Length + 2];
-            prependedValues[0] = context.BlockIndex;
-            prependedValues[1] = context.Signer;
-            values.CopyTo(prependedValues, 2);
-            string msg = $"#{{BlockIndex}} {actionType} (by {{Signer}}): {message}";
-            Log.Error(msg, prependedValues);
-            return context.PreviousState;
-        }
-
         protected bool TryGetAdminState(IActionContext ctx, out AdminState state)
         {
             state = default;
@@ -97,18 +82,5 @@ protected void CheckObsolete(long obsoleteIndex, IActionContext ctx)
                 throw new ActionObsoletedException();
             }
         }
-
-        protected bool UseV100291Sheets(long blockIndex)
-        {
-            return blockIndex < ActionObsoleteConfig.V100301ExecutedBlockIndex;
-        }
-
-        protected void CheckActionAvailable(long startedIndex, IActionContext ctx)
-        {
-            if (ctx.BlockIndex <= startedIndex)
-            {
-                throw new ActionUnavailableException();
-            }
-        }
     }
 }