Extract GetFeeAddress

planetarium · Dec 31, 2024 · 286c30d · 286c30d
1 parent 1b5b3c7
commit 286c30d
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 193 deletions.
diff --git a/Lib9c/Action/AuraSummon.cs b/Lib9c/Action/AuraSummon.cs
@@ -210,15 +210,7 @@ public override IWorld Execute(IActionContext context)
             // Transfer Cost NCG first for fast-fail
             if (summonRow.CostNcg > 0L)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(
                     context,

diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs
@@ -331,13 +331,7 @@ public override IWorld Execute(IActionContext context)
 
                 purchasedCountDuringInterval++;
 
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    feeAddress = ArenaHelper.DeriveArenaAddress(roundData.ChampionshipId, roundData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states
                     .TransferAsset(context, context.Signer, feeAddress, ticketBalance)

diff --git a/Lib9c/Action/Buy.cs b/Lib9c/Action/Buy.cs
@@ -12,6 +12,7 @@
 using Libplanet.Types.Assets;
 using Nekoyume.Action.Guild.Migration.LegacyModels;
 using Nekoyume.Arena;
+using Nekoyume.Extensions;
 using Nekoyume.Model.EnumType;
 using Nekoyume.Model.Mail;
 using Nekoyume.Model.State;
@@ -251,15 +252,7 @@ public override IWorld Execute(IActionContext context)
                 var taxedPrice = order.Price - tax;
 
                 // Transfer tax.
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states
                     .TransferAsset(context, context.Signer, feeAddress, tax);

diff --git a/Lib9c/Action/BuyProduct.cs b/Lib9c/Action/BuyProduct.cs
@@ -12,6 +12,7 @@
 using Nekoyume.Action.Guild.Migration.LegacyModels;
 using Nekoyume.Arena;
 using Nekoyume.Battle;
+using Nekoyume.Extensions;
 using Nekoyume.Model.EnumType;
 using Nekoyume.Model.Item;
 using Nekoyume.Model.Mail;
@@ -176,15 +177,7 @@ private IWorld Buy(IActionContext context, IProductInfo productInfo, Address sel
             var receipt = new ProductReceipt(productId, sellerAvatarAddress, buyerAvatarState.address, product.Price,
                 context.BlockIndex);
 
-            var feeAddress = Addresses.RewardPool;
-            // TODO: [GuildMigration] Remove this after migration
-            if (states.GetDelegationMigrationHeight() is long migrationHeight
-                && context.BlockIndex < migrationHeight)
-            {
-                var arenaSheet = states.GetSheet<ArenaSheet>();
-                var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-            }
+            var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
             states = states
                 .RemoveLegacyState(productAddress)
@@ -308,15 +301,7 @@ private static IWorld Buy_Order(PurchaseInfo purchaseInfo, IActionContext contex
             var taxedPrice = order.Price - tax;
 
             // Transfer tax.
-            var feeAddress = Addresses.RewardPool;
-            // TODO: [GuildMigration] Remove this after migration
-            if (states.GetDelegationMigrationHeight() is long migrationHeight
-                && context.BlockIndex < migrationHeight)
-            {
-                var arenaSheet = states.GetSheet<ArenaSheet>();
-                var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-            }
+            var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
             states = states.TransferAsset(
                 context,

diff --git a/Lib9c/Action/CombinationEquipment.cs b/Lib9c/Action/CombinationEquipment.cs
@@ -376,16 +376,7 @@ public override IWorld Execute(IActionContext context)
             if (costNcg > 0L)
             {
                 // Transfer tax.
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
-
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
                 states = states.TransferAsset(
                     context,
                     context.Signer,

diff --git a/Lib9c/Action/CostumeSummon.cs b/Lib9c/Action/CostumeSummon.cs
@@ -162,15 +162,7 @@ public override IWorld Execute(IActionContext context)
             // Transfer Cost NCG first for fast-fail
             if (summonRow.CostNcg > 0L)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(
                     context,

diff --git a/Lib9c/Action/CustomEquipmentCraft/CustomEquipmentCraft.cs b/Lib9c/Action/CustomEquipmentCraft/CustomEquipmentCraft.cs
@@ -193,15 +193,7 @@ public override IWorld Execute(IActionContext context)
 
                 if (ncgCost > 0)
                 {
-                    var feeAddress = Addresses.RewardPool;
-                    // TODO: [GuildMigration] Remove this after migration
-                    if (states.GetDelegationMigrationHeight() is long migrationHeight
-                        && context.BlockIndex < migrationHeight)
-                    {
-                        var arenaSheet = states.GetSheet<ArenaSheet>();
-                        var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                        feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                    }
+                    var feeAddress = states.GetFeeAddress(context.BlockIndex);
                     states = states.TransferAsset(context, context.Signer, feeAddress, ncgCost * states.GetGoldCurrency());
                 }
 

diff --git a/Lib9c/Action/ItemEnhancement.cs b/Lib9c/Action/ItemEnhancement.cs
@@ -373,15 +373,7 @@ public override IWorld Execute(IActionContext context)
             var requiredNcg = targetCostRow.Cost - startCostRow.Cost;
             if (requiredNcg > 0)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(ctx, ctx.Signer, feeAddress,
                     states.GetGoldCurrency() * requiredNcg);

diff --git a/Lib9c/Action/ItemEnhancement11.cs b/Lib9c/Action/ItemEnhancement11.cs
@@ -291,15 +291,7 @@ public override IWorld Execute(IActionContext context)
             var requiredNcg = row.Cost;
             if (requiredNcg > 0)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(ctx, ctx.Signer, feeAddress, states.GetGoldCurrency() * requiredNcg);
             }

diff --git a/Lib9c/Action/ItemEnhancement12.cs b/Lib9c/Action/ItemEnhancement12.cs
@@ -363,15 +363,7 @@ public override IWorld Execute(IActionContext context)
             var requiredNcg = targetCostRow.Cost - startCostRow.Cost;
             if (requiredNcg > 0)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(ctx, ctx.Signer, feeAddress,
                     states.GetGoldCurrency() * requiredNcg);

diff --git a/Lib9c/Action/ItemEnhancement13.cs b/Lib9c/Action/ItemEnhancement13.cs
@@ -366,15 +366,7 @@ public override IWorld Execute(IActionContext context)
             var requiredNcg = targetCostRow.Cost - startCostRow.Cost;
             if (requiredNcg > 0)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(ctx, ctx.Signer, feeAddress,
                     states.GetGoldCurrency() * requiredNcg);

diff --git a/Lib9c/Action/JoinArena.cs b/Lib9c/Action/JoinArena.cs
@@ -92,7 +92,7 @@ public override IWorld Execute(IActionContext context)
                     $"[{nameof(JoinArena)}] Aborted as the avatar state of the signer was failed to load.");
             }
 
-            // check the avatar already joined the arena. 
+            // check the avatar already joined the arena.
             if (states.GetArenaParticipant(championshipId, round, avatarAddress) is not null)
             {
                 throw new AlreadyJoinedArenaException(championshipId, round, avatarAddress);
@@ -174,13 +174,7 @@ public override IWorld Execute(IActionContext context)
                         $"required {fee}, but balance is {crystalBalance}");
                 }
 
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    feeAddress = ArenaHelper.DeriveArenaAddress(roundData.ChampionshipId, roundData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(context, context.Signer, feeAddress, fee);
             }

diff --git a/Lib9c/Action/JoinArena1.cs b/Lib9c/Action/JoinArena1.cs
@@ -146,13 +146,7 @@ public override IWorld Execute(IActionContext context)
                         $"required {fee}, but balance is {crystalBalance}");
                 }
 
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    feeAddress = ArenaHelper.DeriveArenaAddress(roundData.ChampionshipId, roundData.Round);
-                }
+var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(context, context.Signer, feeAddress, fee);
             }

diff --git a/Lib9c/Action/JoinArena3.cs b/Lib9c/Action/JoinArena3.cs
@@ -163,13 +163,7 @@ public override IWorld Execute(IActionContext context)
                         $"required {fee}, but balance is {crystalBalance}");
                 }
 
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    feeAddress = ArenaHelper.DeriveArenaAddress(roundData.ChampionshipId, roundData.Round);
-                }
+var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(context, context.Signer, feeAddress, fee);
             }

diff --git a/Lib9c/Action/PetEnhancement.cs b/Lib9c/Action/PetEnhancement.cs
@@ -139,15 +139,7 @@ public override IWorld Execute(IActionContext context)
                         currentNcg);
                 }
 
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(context, context.Signer, feeAddress, ncgCost);
             }

diff --git a/Lib9c/Action/Raid.cs b/Lib9c/Action/Raid.cs
@@ -151,15 +151,7 @@ public override IWorld Execute(IActionContext context)
                     }
                     var goldCurrency = states.GetGoldCurrency();
 
-                    var feeAddress = Addresses.RewardPool;
-                    // TODO: [GuildMigration] Remove this after migration
-                    if (states.GetDelegationMigrationHeight() is long migrationHeight
-                        && context.BlockIndex < migrationHeight)
-                    {
-                        var arenaSheet = states.GetSheet<ArenaSheet>();
-                        var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                        feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                    }
+                    var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                     states = states.TransferAsset(context, context.Signer, feeAddress,
                         WorldBossHelper.CalculateTicketPrice(row, raiderState, goldCurrency));

diff --git a/Lib9c/Action/RuneEnhancement.cs b/Lib9c/Action/RuneEnhancement.cs
@@ -153,15 +153,7 @@ public override IWorld Execute(IActionContext context)
             runeState.LevelUp(levelUpResult.LevelUpCount);
             states = states.SetRuneState(AvatarAddress, allRuneState);
 
-            var feeAddress = Addresses.RewardPool;
-            // TODO: [GuildMigration] Remove this after migration
-            if (states.GetDelegationMigrationHeight() is long migrationHeight
-                && context.BlockIndex < migrationHeight)
-            {
-                var arenaSheet = states.GetSheet<ArenaSheet>();
-                var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-            }
+            var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
             // Burn costs
             if (levelUpResult.NcgCost > 0)

diff --git a/Lib9c/Action/RuneSummon.cs b/Lib9c/Action/RuneSummon.cs
@@ -91,15 +91,7 @@ public override IWorld Execute(IActionContext context)
             // Transfer Cost NCG first for fast-fail
             if (summonRow.CostNcg > 0L)
             {
-                var feeAddress = Addresses.RewardPool;
-                // TODO: [GuildMigration] Remove this after migration
-                if (states.GetDelegationMigrationHeight() is long migrationHeight
-                    && context.BlockIndex < migrationHeight)
-                {
-                    var arenaSheet = states.GetSheet<ArenaSheet>();
-                    var arenaData = arenaSheet.GetRoundByBlockIndex(context.BlockIndex);
-                    feeAddress = ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-                }
+                var feeAddress = states.GetFeeAddress(context.BlockIndex);
 
                 states = states.TransferAsset(
                     context,

diff --git a/Lib9c/Action/UnlockCombinationSlot.cs b/Lib9c/Action/UnlockCombinationSlot.cs
@@ -75,7 +75,7 @@ public override IWorld Execute(IActionContext context)
                 throw new SlotAlreadyUnlockedException($"[{nameof(UnlockRuneSlot)}] Index : {SlotIndex}");
             }
 
-            var feeStoreAddress = GetFeeStoreAddress(states, context.BlockIndex);
+            var feeStoreAddress = states.GetFeeAddress(context.BlockIndex);
             var costSheet = sheets.GetSheet<UnlockCombinationSlotCostSheet>();
 
             if (!costSheet.ContainsKey(SlotIndex))
@@ -175,23 +175,5 @@ public override IWorld Execute(IActionContext context)
             allSlotState.UnlockSlot(AvatarAddress, SlotIndex);
             return states.SetCombinationSlotState(AvatarAddress, allSlotState);
         }
-
-        private Address GetFeeStoreAddress(IWorld states, long blockIndex)
-        {
-            if (states.GetDelegationMigrationHeight() is long migrationHeight
-                && blockIndex < migrationHeight)
-            {
-                var sheets = states.GetSheets(
-                    sheetTypes: new[]
-                    {
-                        typeof(ArenaSheet),
-                    });
-
-                var arenaSheet = sheets.GetSheet<ArenaSheet>();
-                var arenaData = arenaSheet.GetRoundByBlockIndex(blockIndex);
-                return ArenaHelper.DeriveArenaAddress(arenaData.ChampionshipId, arenaData.Round);
-            }
-            return Addresses.RewardPool;
-        }
     }
 }