merge hotfix

Etherna · Nov 13, 2023 · ad38ed1 · ad38ed1
2 parents a6fbb33 + 97a1aaf
commit ad38ed1
Show file tree

Hide file tree

Showing 97 changed files with 408 additions and 414 deletions.
diff --git a/.idea/.idea.BeehiveManager/.idea/.gitignore b/.idea/.idea.BeehiveManager/.idea/.gitignore
diff --git a/.idea/.idea.BeehiveManager/.idea/.name b/.idea/.idea.BeehiveManager/.idea/.name
diff --git a/.idea/.idea.BeehiveManager/.idea/encodings.xml b/.idea/.idea.BeehiveManager/.idea/encodings.xml
diff --git a/.idea/.idea.BeehiveManager/.idea/indexLayout.xml b/.idea/.idea.BeehiveManager/.idea/indexLayout.xml
diff --git a/.idea/.idea.BeehiveManager/.idea/vcs.xml b/.idea/.idea.BeehiveManager/.idea/vcs.xml
diff --git a/BeehiveManager.sln b/BeehiveManager.sln
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		BeehiveManager.sln.licenseheader = BeehiveManager.sln.licenseheader
 		Dockerfile = Dockerfile
 		LICENSE = LICENSE
 		nuget.config = nuget.config

diff --git a/BeehiveManager.sln.DotSettings b/BeehiveManager.sln.DotSettings
@@ -0,0 +1,14 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2021-present Etherna SA
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.</s:String></wpf:ResourceDictionary>
diff --git a/BeehiveManager.sln.licenseheader b/BeehiveManager.sln.licenseheader
diff --git a/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj b/src/BeehiveManager.Domain/BeehiveManager.Domain.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Etherna.DomainEvents" Version="1.4.0" />
-    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.81" />
+    <PackageReference Include="MongODM.Core" Version="0.24.0-alpha.101" />
     <PackageReference Include="Nethereum.Web3" Version="4.14.0" />
   </ItemGroup>
 

diff --git a/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs b/src/BeehiveManager.Domain/Events/SetBeeNodeAddressesEvent.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Domain/IBeehiveDbContext.cs b/src/BeehiveManager.Domain/IBeehiveDbContext.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Domain/Models/BeeNode.cs b/src/BeehiveManager.Domain/Models/BeeNode.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Domain/Models/EntityModelBase.cs b/src/BeehiveManager.Domain/Models/EntityModelBase.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Domain/Models/ModelBase.cs b/src/BeehiveManager.Domain/Models/ModelBase.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs b/src/BeehiveManager.Domain/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/BeehiveDbContext.cs b/src/BeehiveManager.Persistence/BeehiveDbContext.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs b/src/BeehiveManager.Persistence/IEventDispatcherDbContext.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs b/src/BeehiveManager.Persistence/ModelMaps/BeeNodeMap.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs b/src/BeehiveManager.Persistence/ModelMaps/ModelBaseMap.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs b/src/BeehiveManager.Persistence/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs b/src/BeehiveManager.Persistence/Repositories/DomainRepository.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Services/BeehiveManager.Services.csproj b/src/BeehiveManager.Services/BeehiveManager.Services.csproj
@@ -13,10 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.188" />
+    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.216" />
     <PackageReference Include="Etherna.DomainEvents.AspNetCore" Version="1.4.0" />
-    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.81" />
-    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.14.0" />
+    <PackageReference Include="MongODM.Hangfire" Version="0.24.0-alpha.101" />
+    <PackageReference Include="Nethereum.JsonRpc.WebSocketClient" Version="4.17.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>
 

diff --git a/src/BeehiveManager.Services/Domain/BeeNodeService.cs b/src/BeehiveManager.Services/Domain/BeeNodeService.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Services/Domain/IBeeNodeService.cs b/src/BeehiveManager.Services/Domain/IBeeNodeService.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeCreatedThenAddNodeStatusHandler.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

diff --git a/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs b/src/BeehiveManager.Services/EventHandlers/OnBeeNodeDeletedThenRemoveNodeStatusHandler.cs
@@ -1,11 +1,11 @@
-//   Copyright 2021-present Etherna Sagl
-//
+//   Copyright 2021-present Etherna SA
+// 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-//
+// 
 //       http://www.apache.org/licenses/LICENSE-2.0
-//
+// 
 //   Unless required by applicable law or agreed to in writing, software
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.