Merge pull request #3047 from planetarium/release/1.19.4

Release 1.19.4
planetarium · Nov 27, 2024 · cb3d878 · cb3d878
2 parents 51c8b73 + 0544f6f
commit cb3d878
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/Lib9c.Abstractions/Lib9c.Abstractions.csproj b/Lib9c.Abstractions/Lib9c.Abstractions.csproj
@@ -6,7 +6,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.19.0</VersionPrefix>
+    <VersionPrefix>1.19.4</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Lib9c.MessagePack/Lib9c.MessagePack.csproj b/Lib9c.MessagePack/Lib9c.MessagePack.csproj
@@ -8,7 +8,7 @@
     <Platforms>AnyCPU</Platforms>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.19.0</VersionPrefix>
+    <VersionPrefix>1.19.4</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Lib9c.Renderers/Lib9c.Renderers.csproj b/Lib9c.Renderers/Lib9c.Renderers.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <OutputPath>.bin</OutputPath>
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
-    <VersionPrefix>1.19.0</VersionPrefix>
+    <VersionPrefix>1.19.4</VersionPrefix>
     <RootNamespace>Lib9c</RootNamespace>
   </PropertyGroup>
 

diff --git a/Lib9c/Action/Guild/Migration/MigrateDelegation.cs b/Lib9c/Action/Guild/Migration/MigrateDelegation.cs
@@ -119,23 +119,28 @@ public override IWorld Execute(IActionContext context)
 
                 return repository.World;
             }
-            catch (FailedLoadStateException)
+            catch (Exception e)
             {
-                var pledgeAddress = ((Address)Target).GetPledgeAddress();
-
-                // Patron contract structure:
-                // [0] = PatronAddress
-                // [1] = IsApproved
-                // [2] = Mead amount to refill.
-                if (!world.TryGetLegacyState(pledgeAddress, out List list) || list.Count < 3 ||
-                    list[0] is not Binary || list[0].ToAddress() != MeadConfig.PatronAddress ||
-                    list[1] is not Bencodex.Types.Boolean approved || !approved)
+                if (e is FailedLoadStateException || e is NullReferenceException)
                 {
-                    throw new GuildMigrationFailedException("Unexpected pledge structure.");
+                    var pledgeAddress = ((Address)Target).GetPledgeAddress();
+
+                    // Patron contract structure:
+                    // [0] = PatronAddress
+                    // [1] = IsApproved
+                    // [2] = Mead amount to refill.
+                    if (!world.TryGetLegacyState(pledgeAddress, out List list) || list.Count < 3 ||
+                        list[0] is not Binary || list[0].ToAddress() != MeadConfig.PatronAddress ||
+                        list[1] is not Bencodex.Types.Boolean approved || !approved)
+                    {
+                        throw new GuildMigrationFailedException("Unexpected pledge structure.");
+                    }
+
+                    repository.JoinGuild(planetariumGuildAddress, Target);
+                    return repository.World;
                 }
 
-                repository.JoinGuild(planetariumGuildAddress, Target);
-                return repository.World;
+                throw;
             }
         }
     }

diff --git a/Lib9c/Lib9c.csproj b/Lib9c/Lib9c.csproj
@@ -9,7 +9,7 @@
     <IntermediateOutputPath>.obj</IntermediateOutputPath>
     <RootNamespace>Nekoyume</RootNamespace>
     <LangVersion>9</LangVersion>
-    <VersionPrefix>1.19.0</VersionPrefix>
+    <VersionPrefix>1.19.4</VersionPrefix>
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <Configurations>Debug;Release</Configurations>
     <Platforms>AnyCPU</Platforms>