catalyst-network · TheNewAutonomy · Nov 16, 2019 · Nov 16, 2019 · Nov 16, 2019 · Nov 17, 2019
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -86,6 +86,15 @@
         "doc"
       ]
     },
+    {
+      "login": "sudhirtibrewal",
+      "name": "Sudhir Tibrewal",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/12657704?v=4",
+      "profile": "https://github.com/sudhirtibrewal",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "tkstanczak",
       "name": "Tomasz Kajetan Stańczak",
@@ -95,6 +104,15 @@
         "code",
         "ideas"
       ]
+    },
+    {
+      "login": "Scooletz",
+      "name": "Szymon Kulec",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/519707?v=4",
+      "profile": "http://blog.scooletz.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.gitignore b/.gitignore
@@ -351,3 +351,4 @@ Icon?
 Thumbs.db
 
 *.lock
+src/Catalyst.Core.Modules.Ledger.Tests/IntegrationTests/TruffleTest/build/
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,9 @@
 [submodule "submodules/nethermind"]
 	path = submodules/nethermind
 	url = https://github.com/catalyst-network/nethermind.git
-[submodule "submodules/protocol-protobuffs"]
-	path = submodules/protocol-protobuffs
-	url = https://github.com/catalyst-network/protocol-protobuffs.git
-[submodule "submodules/Cryptography.FFI.Rust"]
-	path = submodules/Cryptography.FFI.Rust
-	url = https://github.com/catalyst-network/Cryptography.FFI.Rust.git
+[submodule "submodules/Protocol"]
+	path = submodules/Protocol
+	url = https://github.com/catalyst-network/Protocol.git
 [submodule "docs/articles"]
 	path = docs/articles
 	url = https://github.com/catalyst-network/Catalyst.Framework.wiki.git
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -32,7 +32,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## [](https://github.com/catalyst-network/Community/Contributor-Code-of-Conduct/Contributor-Code-of-Conduct#enforcement)Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project lead at [[email protected]](mailto:[email protected]), which goes to @nshCore, or to [[email protected]](mailto:[email protected]), which goes to @RichardLit. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project lead at [[email protected]](mailto:[email protected]), which goes to @Switch1983, or to [[email protected]](mailto:[email protected]), which goes to @RichardLit. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/COPYING b/COPYING
@@ -1,7 +1,7 @@
 #region LICENSE
 
 /**
-* Copyright (c) 2019 Catalyst Network
+* Copyright (c) 2022 Catalyst Network
 *
 * This file is part of Catalyst.Node <https://github.com/catalyst-network/Catalyst.Node>
 *

diff --git a/GUIDELINES.md b/GUIDELINES.md
@@ -60,11 +60,11 @@ British English is preferred over other dialects throughout the solution. You ca
 /// <summary>
 /// </summary>
 /// <param name="dns"></param>
-/// <param name="repository"></param>
+/// <param name="service"></param>
 /// <param name="rootSection"></param>
 /// <param name="logger"></param>
 public PeerDiscovery(IDns dns,
-    IPeerRepository repository,
+    IPeerService service,
     IConfigurationRoot rootSection,
     ILogger logger)
 {

diff --git a/README.md b/README.md
diff --git a/SECURITY.md b/SECURITY.md
@@ -10,12 +10,5 @@ Currently supported versions
 
 ## Reporting a Vulnerability
 
-To report security issues send an email to [email protected] (not for support).
+To report security issues send an email to [email protected] (not for support) or [[email protected]](mailto:[email protected]), which goes to @TheNewAutonomy.
 
-The following keys may be used to communicate sensitive information to developers:
-
-| Name | Fingerprint |
-|------|-------------|
-| NshCore | 32BF 3146 B10F B31A 1B8C 861F 53D2 EAC7 1741 C4C0 |
-
-You can import a key by running the following command with that individual’s fingerprint: `gpg --recv-keys "<fingerprint>"` Ensure that you put quotes around fingerprints containing spaces.
diff --git a/docs/Catalyst.Documentation.csproj b/docs/Catalyst.Documentation.csproj
@@ -1,43 +1,43 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
       <_UnmanagedRegistrationCache Remove="obj\Catalyst.Documentation.csproj.UnmanagedRegistration.cache" />
     </ItemGroup>
 
     <ItemGroup>
-      <_ResolveComReferenceCache Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.csproj.ResolveComReference.cache" />
+      <_ResolveComReferenceCache Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.csproj.ResolveComReference.cache" />
     </ItemGroup>
 
     <ItemGroup>
-      <IntermediateAssembly Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.dll" />
+      <IntermediateAssembly Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.dll" />
     </ItemGroup>
 
     <ItemGroup>
-      <_DebugSymbolsIntermediatePath Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.pdb" />
+      <_DebugSymbolsIntermediatePath Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.pdb" />
     </ItemGroup>
 
     <ItemGroup>
-      <_DeploymentManifestEntryPoint Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.dll" />
+      <_DeploymentManifestEntryPoint Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.dll" />
     </ItemGroup>
 
     <ItemGroup>
-      <ApplicationManifest Remove="obj\Debug\netcoreapp3.0\Native.Catalyst.Documentation.manifest" />
+      <ApplicationManifest Remove="obj\Debug\netcoreapp3.1\Native.Catalyst.Documentation.manifest" />
     </ItemGroup>
 
     <ItemGroup>
-      <DeployManifest Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.application" />
+      <DeployManifest Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.application" />
     </ItemGroup>
 
     <ItemGroup>
-      <ClsidMap Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.clsidmap" />
+      <ClsidMap Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.clsidmap" />
     </ItemGroup>
 
     <ItemGroup>
-      <RegFreeComManifest Remove="obj\Debug\netcoreapp3.0\Catalyst.Documentation.X.manifest" />
+      <RegFreeComManifest Remove="obj\Debug\netcoreapp3.1\Catalyst.Documentation.X.manifest" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/docs/docfx.json b/docs/docfx.json
@@ -361,7 +361,7 @@
       "ExtractSearchIndex"
     ],
     "globalMetadata": {
-      "_appFooter": "<span>Copyright © 2019 <a href='https://catalystnet.org'>Catalyst Network</a>",
+      "_appFooter": "<span>Copyright © 2022 <a href='https://catalystnet.org'>Catalyst Network</a>",
       "_appTitle": "Catalyst Framework Documentation",
       "_enableSearch": "true",
       "_appLogoPath": "images/logo.svg",

diff --git a/mssql-e2e-azure-pipelines.yml b/mssql-e2e-azure-pipelines.yml
@@ -58,6 +58,6 @@ steps:
     inputs:
       command: test
       projects: 'src/*[Tt]ests/*.csproj'
-      arguments: '--filter TestType=EndToEndTest_MSSQL --configuration $(BuildConfiguration)'
+      arguments: '--filter TestCategory=EndToEndTest_MSSQL --configuration $(BuildConfiguration)'
       failOnStandardError: 'true'
     timeoutInMinutes: 10
diff --git a/nuget-pre-release-azure-pipelines.yml b/nuget-pre-release-azure-pipelines.yml
@@ -26,7 +26,7 @@ stages:
           - publish: '$(Build.ArtifactStagingDirectory)/$(ArtifactName)'
             artifact: $(ArtifactName)
   - stage: 'BuildNativeFFI'
-    dependsOn: 'GetSource'
+    dependsOn: 'GetSaurce'
     condition: succeeded()
     jobs:
       - job: 'BuildBulletProofsFFI'

diff --git a/poa-azure-pipeline.yml b/poa-azure-pipeline.yml
@@ -2,16 +2,13 @@ strategy:
   matrix:
     Windows-VS2019:
       imageName: 'windows-2019'
-      netcore_sdk: 3.0.100
-      rustup_toolchain: stable
+      netcore_sdk: 3.1.201
     Osx-Mojave:
       imageName: 'macos-10.14'
-      netcore_sdk: 3.0.100
-      rustup_toolchain: stable
+      netcore_sdk: 3.1.201
     Ubuntu-1604:
       imageName: 'ubuntu-16.04'
-      netcore_sdk: 3.0.100
-      rustup_toolchain: stable
+      netcore_sdk: 3.1.201
   maxParallel: 3
 
 variables:
@@ -62,27 +59,22 @@ steps:
   - task: DotNetCoreInstaller@0
     displayName: 'Install .NetCore SDK'
     inputs:
-      version: 3.0.100
+      version: 3.1.201
 
   - bash: |
       git submodule update --init --force --recursive
     displayName: 'Clone submodules'
-  - script: |
-      curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
-      echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
-    displayName: Install rust
-    condition: ne( variables['Agent.OS'], 'Windows_NT' )
-  - script: |
-      curl -sSf -o rustup-init.exe https://win.rustup.rs
-      rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
-      echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
-    displayName: Windows install rust
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
+  - task: DotNetCoreCLI@2
+    displayName: 'Restore packages'
+    inputs:
+      command: restore
+      projects: 'src/*[Tt]ests/*.csproj'
+
   - task: DotNetCoreCLI@2
     displayName: 'Build solution'
     inputs:
-      projects: 'src/**/*.csproj'
+      projects: 'src/*[Tt]ests/*.csproj'
       arguments: '--configuration $(BuildConfiguration)'
       failOnStandardError: 'true'
 
@@ -97,7 +89,7 @@ steps:
       projects: 'src/*[Tt]ests/*.csproj'
       arguments: '--filter TestType!=IntegrationTest --configuration $(BuildConfiguration)'
       failOnStandardError: 'true'
-    timeoutInMinutes: 10
+    timeoutInMinutes: 20
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
 
   - task: DotNetCoreCLI@2
@@ -107,7 +99,7 @@ steps:
       projects: 'src/*[Tt]ests/*.csproj'
       arguments: '--filter TestType!=IntegrationTest --configuration $(BuildConfiguration) /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:UseSourceLink=true /p:Include="\"[Catalyst.Core.Lib*]Catalyst.Core.Lib*\"" /p:Threshold=0 /p:ThresholdType=line /p:ThresholdStat=total'
       failOnStandardError: 'true'
-    timeoutInMinutes: 10
+    timeoutInMinutes: 20
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
   - task: DotNetCoreCLI@2
@@ -117,7 +109,7 @@ steps:
       projects: 'src/*[Tt]ests/*.csproj'
       arguments: '--filter TestType=IntegrationTest --configuration $(BuildConfiguration)'
       failOnStandardError: 'true'
-    timeoutInMinutes: 10
+    timeoutInMinutes: 20
 
   - script: |
       reportgenerator "-reports:src/**/coverage.cobertura.xml" "-targetdir:$(Build.ArtifactStagingDirectory)" -reporttypes:HtmlInline_AzurePipelines;Cobertura;SonarQube;Badges "-assemblyfilters:+Catalyst.Core.Lib*;+Catalyst.Core.Modules.Kvm*;"
@@ -137,4 +129,4 @@ steps:
       summaryFileLocation: '$(Build.ArtifactStagingDirectory)/Cobertura.xml'
       reportDirectory: '$(Build.ArtifactStagingDirectory)'
       failOnStandardError: 'true'
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -351,3 +351,4 @@ Icon?
		Thumbs.db

		*.lock
		src/Catalyst.Core.Modules.Ledger.Tests/IntegrationTests/TruffleTest/build/