diff --git a/Lib9c.Abstractions/Lib9c.Abstractions.csproj b/Lib9c.Abstractions/Lib9c.Abstractions.csproj index 672b543412..1dbb1400b0 100644 --- a/Lib9c.Abstractions/Lib9c.Abstractions.csproj +++ b/Lib9c.Abstractions/Lib9c.Abstractions.csproj @@ -6,7 +6,7 @@ true .bin .obj - 1.19.0 + 1.19.4 diff --git a/Lib9c.MessagePack/Lib9c.MessagePack.csproj b/Lib9c.MessagePack/Lib9c.MessagePack.csproj index 6b5a8ee0e3..a7a0ae4068 100644 --- a/Lib9c.MessagePack/Lib9c.MessagePack.csproj +++ b/Lib9c.MessagePack/Lib9c.MessagePack.csproj @@ -8,7 +8,7 @@ AnyCPU .bin .obj - 1.19.0 + 1.19.4 diff --git a/Lib9c.Renderers/Lib9c.Renderers.csproj b/Lib9c.Renderers/Lib9c.Renderers.csproj index 4333aa1094..46e41affde 100644 --- a/Lib9c.Renderers/Lib9c.Renderers.csproj +++ b/Lib9c.Renderers/Lib9c.Renderers.csproj @@ -6,7 +6,7 @@ enable .bin .obj - 1.19.0 + 1.19.4 Lib9c diff --git a/Lib9c/Action/Guild/Migration/MigrateDelegation.cs b/Lib9c/Action/Guild/Migration/MigrateDelegation.cs index 65dbec9dde..14e77621ac 100644 --- 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 index 9c745a7114..a3a93f5922 100644 --- a/Lib9c/Lib9c.csproj +++ b/Lib9c/Lib9c.csproj @@ -9,7 +9,7 @@ .obj Nekoyume 9 - 1.19.0 + 1.19.4 true Debug;Release AnyCPU