From 023000d4d8ba9167577a6e3ad4aaf1b0311b915d Mon Sep 17 00:00:00 2001 From: moreal Date: Mon, 5 Aug 2024 22:49:32 +0900 Subject: [PATCH 1/4] Bump headless --- .../Commands/BattleArenaRankingMigration.cs | 2 +- .../Commands/MySqlMigration.cs | 2 +- .../Commands/UserDataMigration.cs | 2 +- .../Commands/UserStakingMigration.cs | 2 +- NineChronicles.DataProvider.Executable/Program.cs | 1 - NineChronicles.DataProvider/GraphQLStartup.cs | 2 -- NineChronicles.Headless | 2 +- 7 files changed, 5 insertions(+), 8 deletions(-) diff --git a/NineChronicles.DataProvider.Executable/Commands/BattleArenaRankingMigration.cs b/NineChronicles.DataProvider.Executable/Commands/BattleArenaRankingMigration.cs index 6eba9d73..84780e65 100644 --- a/NineChronicles.DataProvider.Executable/Commands/BattleArenaRankingMigration.cs +++ b/NineChronicles.DataProvider.Executable/Commands/BattleArenaRankingMigration.cs @@ -114,7 +114,7 @@ public void Migration( Block genesis = _baseStore.GetBlock(gHash); var blockChainStates = new BlockChainStates(_baseStore, baseStateStore); var actionEvaluator = new ActionEvaluator( - _ => blockPolicy.BlockAction, + blockPolicy.PolicyActionsRegistry, baseStateStore, new NCActionLoader()); _baseChain = new BlockChain(blockPolicy, stagePolicy, _baseStore, baseStateStore, genesis, blockChainStates, actionEvaluator); diff --git a/NineChronicles.DataProvider.Executable/Commands/MySqlMigration.cs b/NineChronicles.DataProvider.Executable/Commands/MySqlMigration.cs index 4f971879..4033f96a 100644 --- a/NineChronicles.DataProvider.Executable/Commands/MySqlMigration.cs +++ b/NineChronicles.DataProvider.Executable/Commands/MySqlMigration.cs @@ -197,7 +197,7 @@ public async Task Migration( Block genesis = _baseStore.GetBlock(gHash); var blockChainStates = new BlockChainStates(_baseStore, baseStateStore); var actionEvaluator = new ActionEvaluator( - _ => blockPolicy.BlockAction, + blockPolicy.PolicyActionsRegistry, baseStateStore, new NCActionLoader()); _baseChain = new BlockChain( diff --git a/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs b/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs index 654e1205..fd0f250a 100644 --- a/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs +++ b/NineChronicles.DataProvider.Executable/Commands/UserDataMigration.cs @@ -196,7 +196,7 @@ string mysqlDatabase Block genesis = _baseStore.GetBlock(gHash); var blockChainStates = new BlockChainStates(_baseStore, baseStateStore); var actionEvaluator = new ActionEvaluator( - _ => blockPolicy.BlockAction, + blockPolicy.PolicyActionsRegistry, baseStateStore, new NCActionLoader()); _baseChain = new BlockChain(blockPolicy, stagePolicy, _baseStore, baseStateStore, genesis, blockChainStates, actionEvaluator); diff --git a/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs b/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs index 9fbe6cbf..664d8f23 100644 --- a/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs +++ b/NineChronicles.DataProvider.Executable/Commands/UserStakingMigration.cs @@ -128,7 +128,7 @@ public void Migration( Block genesis = _baseStore.GetBlock(gHash); var blockChainStates = new BlockChainStates(_baseStore, baseStateStore); var actionEvaluator = new ActionEvaluator( - _ => blockPolicy.BlockAction, + blockPolicy.PolicyActionsRegistry, baseStateStore, new NCActionLoader()); _baseChain = new BlockChain(blockPolicy, stagePolicy, _baseStore, baseStateStore, genesis, blockChainStates, actionEvaluator); diff --git a/NineChronicles.DataProvider.Executable/Program.cs b/NineChronicles.DataProvider.Executable/Program.cs index ec64c3ac..b68bbd1f 100644 --- a/NineChronicles.DataProvider.Executable/Program.cs +++ b/NineChronicles.DataProvider.Executable/Program.cs @@ -189,7 +189,6 @@ IActionEvaluatorConfiguration GetActionEvaluatorConfiguration(IConfiguration con { RpcRemoteSever = false }, - new ConcurrentDictionary(), new StateMemoryCache() ); diff --git a/NineChronicles.DataProvider/GraphQLStartup.cs b/NineChronicles.DataProvider/GraphQLStartup.cs index fae9376e..d4f2cc54 100644 --- a/NineChronicles.DataProvider/GraphQLStartup.cs +++ b/NineChronicles.DataProvider/GraphQLStartup.cs @@ -11,7 +11,6 @@ using NineChronicles.DataProvider.GraphTypes; using NineChronicles.Headless; using NineChronicles.Headless.GraphTypes; - using Sentry; public class GraphQLStartup { @@ -48,7 +47,6 @@ public void ConfigureServices(IServiceCollection services) services.AddGraphTypes(); services.AddSingleton(); services.AddSingleton(); - services.AddSingleton>(); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) diff --git a/NineChronicles.Headless b/NineChronicles.Headless index 22bb2979..db38abc0 160000 --- a/NineChronicles.Headless +++ b/NineChronicles.Headless @@ -1 +1 @@ -Subproject commit 22bb2979b07181201575c8f9592d1fdfaa3e9685 +Subproject commit db38abc0b94309ad744cf5214c9e69130d1b7acf From 38df7aa0ca2884732680bb8499ebbe9dd38ed1c9 Mon Sep 17 00:00:00 2001 From: moreal Date: Tue, 6 Aug 2024 15:44:48 +0900 Subject: [PATCH 2/4] Bump headless --- NineChronicles.Headless | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NineChronicles.Headless b/NineChronicles.Headless index db38abc0..350d493b 160000 --- a/NineChronicles.Headless +++ b/NineChronicles.Headless @@ -1 +1 @@ -Subproject commit db38abc0b94309ad744cf5214c9e69130d1b7acf +Subproject commit 350d493b57d191789e542ac2f1ed683df26d6808 From 299b6038e0b957f7f009d2ba7dcf792c091178f6 Mon Sep 17 00:00:00 2001 From: moreal Date: Wed, 7 Aug 2024 00:04:13 +0900 Subject: [PATCH 3/4] Bump headless --- NineChronicles.Headless | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NineChronicles.Headless b/NineChronicles.Headless index 350d493b..c258a6f1 160000 --- a/NineChronicles.Headless +++ b/NineChronicles.Headless @@ -1 +1 @@ -Subproject commit 350d493b57d191789e542ac2f1ed683df26d6808 +Subproject commit c258a6f1f6b18b5406473234f5d8a5e408896afc From baec22fdc87fc6b895ffe9908db9060180dcba65 Mon Sep 17 00:00:00 2001 From: moreal Date: Thu, 8 Aug 2024 16:23:35 +0900 Subject: [PATCH 4/4] Bump headless to 180 --- NineChronicles.Headless | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NineChronicles.Headless b/NineChronicles.Headless index c258a6f1..0fb89a2b 160000 --- a/NineChronicles.Headless +++ b/NineChronicles.Headless @@ -1 +1 @@ -Subproject commit c258a6f1f6b18b5406473234f5d8a5e408896afc +Subproject commit 0fb89a2b468a6d17bea8dfcd1e2ebbc6f044a3c0