diff --git a/.gitmodules b/.gitmodules index 1105b6dc..33235cdf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ -[submodule "submodules/Catalyst.Node"] - path = submodules/Catalyst.Node - url = https://github.com/catalyst-network/Catalyst.Node.git +[submodule "submodules/Catalyst.Framework"] + path = submodules/Catalyst.Framework + url = git@github.com:catalyst-network/Catalyst.Framework.git + diff --git a/Dockerfile b/Dockerfile index 9328f444..c400e155 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,4 +11,4 @@ FROM mcr.microsoft.com/dotnet/core/sdk:2.2 RUN apt update -y; apt-get install dnsutils lsof -y WORKDIR /app COPY --from=build-env /app/output . -CMD ["dotnet", "Catalyst.Dfs.SeedNode.dll", "--ipfs-password", "test"] +CMD ["dotnet", "Catalyst.Node.POA.CE.dll", "--dfs-password", "test"] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e0af77e..95abe572 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -64,14 +64,12 @@ steps: inputs: version: 3.0.100 - - 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% diff --git a/src/Catalyst.Cli.Tests/Catalyst.Cli.Tests.csproj b/src/Catalyst.Cli.Tests/Catalyst.Cli.Tests.csproj index e549b7f7..afbefe03 100644 --- a/src/Catalyst.Cli.Tests/Catalyst.Cli.Tests.csproj +++ b/src/Catalyst.Cli.Tests/Catalyst.Cli.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Catalyst.Cli/Catalyst.Cli.csproj b/src/Catalyst.Cli/Catalyst.Cli.csproj index b9b6c0af..eb2a04f6 100644 --- a/src/Catalyst.Cli/Catalyst.Cli.csproj +++ b/src/Catalyst.Cli/Catalyst.Cli.csproj @@ -23,10 +23,10 @@ - - - - - + + + + + diff --git a/src/Catalyst.Node.POA.CE.Tests/Catalyst.Node.POA.CE.Tests.csproj b/src/Catalyst.Node.POA.CE.Tests/Catalyst.Node.POA.CE.Tests.csproj index 86506894..85522d6b 100644 --- a/src/Catalyst.Node.POA.CE.Tests/Catalyst.Node.POA.CE.Tests.csproj +++ b/src/Catalyst.Node.POA.CE.Tests/Catalyst.Node.POA.CE.Tests.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/Config/GlobalConfigTests.cs b/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/Config/GlobalConfigTests.cs index 3f666bd4..6500179c 100644 --- a/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/Config/GlobalConfigTests.cs +++ b/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/Config/GlobalConfigTests.cs @@ -39,6 +39,7 @@ using Catalyst.Core.Modules.Dfs; using Catalyst.Core.Modules.KeySigner; using Catalyst.Core.Modules.Keystore; +using Catalyst.Core.Modules.Kvm; using Catalyst.Core.Modules.Ledger; using Catalyst.Core.Modules.Mempool; using Catalyst.Core.Modules.Rpc.Server; @@ -82,6 +83,7 @@ public void Registering_All_Configs_Should_Allow_Resolving_CatalystNode(NetworkT containerBuilder.RegisterType().As(); containerBuilder.RegisterType().As(); containerBuilder.RegisterInstance(Substitute.For()).As(); + containerBuilder.RegisterModule(new KvmModule()); containerBuilder.RegisterModule(new KeySignerModule()); containerBuilder.RegisterModule(new ConsensusModule()); containerBuilder.RegisterModule(new DfsModule()); diff --git a/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/PoaTestNode.cs b/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/PoaTestNode.cs index 8b83d504..8bcafe7b 100644 --- a/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/PoaTestNode.cs +++ b/src/Catalyst.Node.POA.CE.Tests/IntegrationTests/PoaTestNode.cs @@ -44,7 +44,6 @@ using Catalyst.Core.Lib.DAO; using Catalyst.Core.Lib.Extensions; using Catalyst.Core.Lib.FileSystem; -using Catalyst.Core.Lib.Mempool.Documents; using Catalyst.Core.Lib.P2P.Models; using Catalyst.Core.Lib.P2P.Repository; using Catalyst.Core.Modules.Dfs; @@ -52,6 +51,7 @@ using Catalyst.Core.Modules.Mempool; using Catalyst.Core.Modules.Rpc.Server; using Catalyst.Core.Modules.Web3; +using Catalyst.Protocol.Cryptography; using Catalyst.Protocol.Network; using Catalyst.Protocol.Peer; using Catalyst.TestUtils; @@ -102,7 +102,7 @@ public PoaTestNode(string name, { PeerId = p }).ToList(); - _peerRepository.AsQueryable().Returns(peersInRepo.AsQueryable()); +// _peerRepository.AsQueryable().Returns(peersInRepo.AsQueryable()); _peerRepository.GetAll().Returns(peersInRepo); _peerRepository.Get(Arg.Any()).Returns(ci => { @@ -142,7 +142,7 @@ public async Task RunAsync(CancellationToken cancellationSourceToken) await _node.RunAsync(cancellationSourceToken).ConfigureAwait(false); } - public async Task StartSockets() { await _node.StartSockets(); } + public async Task StartSocketsAsync() { await _node.StartSocketsAsync(); } public void Dispose() { Dispose(true); } @@ -158,7 +158,7 @@ protected void OverrideContainerBuilderRegistrations() _containerProvider.ContainerBuilder.RegisterType().As() .WithParameter("rootPath", _nodeDirectory.FullName); _containerProvider.ContainerBuilder.RegisterInstance(Substitute.For()).As(); - var keySigner = Substitute.For(); + var keySigner = Substitute.For(); keySigner.Verify(Arg.Any(), Arg.Any(), default).ReturnsForAnyArgs(true); keySigner.CryptoContext.SignatureLength.Returns(64); _containerProvider.ContainerBuilder.RegisterInstance(keySigner).As(); @@ -176,4 +176,14 @@ protected virtual void Dispose(bool disposing) _containerProvider?.Dispose(); } } + + public abstract class SubstituteKeySigner : IKeySigner + { + public abstract IKeyStore KeyStore { get; } + public abstract ICryptoContext CryptoContext { get; } + public ISignature Sign(ReadOnlySpan data, SigningContext signingContext) => Sign(data.ToArray(), signingContext); + public abstract ISignature Sign(byte[] data, SigningContext signingContext); + public bool Verify(ISignature signature, ReadOnlySpan data, SigningContext signingContext) => Verify(signature, data.ToArray(), signingContext); + public abstract bool Verify(ISignature signature, byte[] data, SigningContext signingContext); + } } diff --git a/src/Catalyst.Node.POA.CE.sln b/src/Catalyst.Node.POA.CE.sln index 91d764ce..05426bf4 100644 --- a/src/Catalyst.Node.POA.CE.sln +++ b/src/Catalyst.Node.POA.CE.sln @@ -7,31 +7,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Node.POA.CE", "Cat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Node.POA.CE.Tests", "Catalyst.Node.POA.CE.Tests\Catalyst.Node.POA.CE.Tests.csproj", "{5FB7FCBC-3848-4434-8E6F-D0C479FF9382}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalyst.Core", "Catalyst.Core", "{31CBF8EE-F057-4903-BD38-4DA20B39833F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Catalyst.Framework", "Catalyst.Framework", "{31CBF8EE-F057-4903-BD38-4DA20B39833F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Abstractions", "..\submodules\Catalyst.Node\src\Catalyst.Abstractions\Catalyst.Abstractions.csproj", "{01E07F92-FA02-4384-9014-F5AEF3C4E606}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Abstractions", "..\submodules\Catalyst.Framework\src\Catalyst.Abstractions\Catalyst.Abstractions.csproj", "{01E07F92-FA02-4384-9014-F5AEF3C4E606}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.TestUtils", "..\submodules\Catalyst.Node\src\Catalyst.TestUtils\Catalyst.TestUtils.csproj", "{8A29BD0D-4E17-4F74-91EC-78DE288F137B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.TestUtils", "..\submodules\Catalyst.Framework\src\Catalyst.TestUtils\Catalyst.TestUtils.csproj", "{8A29BD0D-4E17-4F74-91EC-78DE288F137B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nethermind", "nethermind", "{647A8E80-674D-454F-AAE9-3C321AAA4969}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Core", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.Core\Nethermind.Core.csproj", "{319E059F-4CFA-4F0C-A6E7-4E8C037AA8E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Core", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.Core\Nethermind.Core.csproj", "{319E059F-4CFA-4F0C-A6E7-4E8C037AA8E9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Store", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.Store\Nethermind.Store.csproj", "{30745734-D408-4344-897A-341A3370B9C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Store", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.Store\Nethermind.Store.csproj", "{30745734-D408-4344-897A-341A3370B9C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.HashLib", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.HashLib\Nethermind.HashLib.csproj", "{835D62C9-659E-486F-ADEA-FD0F88682127}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.HashLib", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.HashLib\Nethermind.HashLib.csproj", "{835D62C9-659E-486F-ADEA-FD0F88682127}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Logging", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.Logging\Nethermind.Logging.csproj", "{41A19F85-0ED8-4213-B6E9-CEA0BAF70E74}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Logging", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.Logging\Nethermind.Logging.csproj", "{41A19F85-0ED8-4213-B6E9-CEA0BAF70E74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Secp256k1", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.Secp256k1\Nethermind.Secp256k1.csproj", "{ADA7E764-5A1B-4E52-8299-6FD37D3015CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Secp256k1", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.Secp256k1\Nethermind.Secp256k1.csproj", "{ADA7E764-5A1B-4E52-8299-6FD37D3015CC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Evm", "..\submodules\Catalyst.Node\submodules\nethermind\src\Nethermind\Nethermind.Evm\Nethermind.Evm.csproj", "{94976265-3C58-4617-B68B-E7F02B25B27B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Evm", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Nethermind\Nethermind.Evm\Nethermind.Evm.csproj", "{94976265-3C58-4617-B68B-E7F02B25B27B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Cli", "Catalyst.Cli\Catalyst.Cli.csproj", "{7710C659-28F6-4624-983B-B13109CCCD12}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Cli.Tests", "Catalyst.Cli.Tests\Catalyst.Cli.Tests.csproj", "{8FE5DCE4-E06E-4A2B-9CBC-A434E2B2FA0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Dirichlet.Numerics", "..\submodules\Catalyst.Node\submodules\nethermind\src\Dirichlet\Nethermind.Dirichlet.Numerics\Nethermind.Dirichlet.Numerics.csproj", "{6201E2B9-4425-4B4F-A17C-853F3D75600C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethermind.Dirichlet.Numerics", "..\submodules\Catalyst.Framework\submodules\nethermind\src\Dirichlet\Nethermind.Dirichlet.Numerics\Nethermind.Dirichlet.Numerics.csproj", "{6201E2B9-4425-4B4F-A17C-853F3D75600C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{7D13EA5F-6C87-402C-AAEF-82A3C8C66D9A}" ProjectSection(SolutionItems) = preProject @@ -46,45 +46,46 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt ..\README.md = ..\README.md ..\scripts\run-node.sh = ..\scripts\run-node.sh ..\SECURITY.md = ..\SECURITY.md + ..\azure-pipelines.yml = ..\azure-pipelines.yml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Protocol", "..\submodules\Catalyst.Node\src\Catalyst.Protocol\Catalyst.Protocol.csproj", "{F8847400-418A-470A-9E27-988990451481}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Protocol", "..\submodules\Catalyst.Framework\src\Catalyst.Protocol\Catalyst.Protocol.csproj", "{F8847400-418A-470A-9E27-988990451481}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Lib", "..\submodules\Catalyst.Node\src\Catalyst.Core.Lib\Catalyst.Core.Lib.csproj", "{433D58C3-E99F-4864-A660-D7AB1DB66F30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Lib", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Lib\Catalyst.Core.Lib.csproj", "{433D58C3-E99F-4864-A660-D7AB1DB66F30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Authentication", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Authentication\Catalyst.Core.Modules.Authentication.csproj", "{9DBECEF8-7534-4BB8-A89C-F3196FC15FD5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Authentication", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Authentication\Catalyst.Core.Modules.Authentication.csproj", "{9DBECEF8-7534-4BB8-A89C-F3196FC15FD5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Consensus", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Consensus\Catalyst.Core.Modules.Consensus.csproj", "{E3AE0FC0-AE86-437E-96EE-F0725A8B774B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Consensus", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Consensus\Catalyst.Core.Modules.Consensus.csproj", "{E3AE0FC0-AE86-437E-96EE-F0725A8B774B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Cryptography.BulletProofs", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Cryptography.BulletProofs\Catalyst.Core.Modules.Cryptography.BulletProofs.csproj", "{8205DDC7-19E1-4215-AA4E-8EA864898098}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Cryptography.BulletProofs", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Cryptography.BulletProofs\Catalyst.Core.Modules.Cryptography.BulletProofs.csproj", "{8205DDC7-19E1-4215-AA4E-8EA864898098}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Dfs", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Dfs\Catalyst.Core.Modules.Dfs.csproj", "{BCFB2216-F5E4-4D0A-8E41-01C055363723}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Dfs", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Dfs\Catalyst.Core.Modules.Dfs.csproj", "{BCFB2216-F5E4-4D0A-8E41-01C055363723}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.KeySigner", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.KeySigner\Catalyst.Core.Modules.KeySigner.csproj", "{DFAC3518-3D42-4F90-8CE9-1638B6B2400C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.KeySigner", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.KeySigner\Catalyst.Core.Modules.KeySigner.csproj", "{DFAC3518-3D42-4F90-8CE9-1638B6B2400C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Keystore", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Keystore\Catalyst.Core.Modules.Keystore.csproj", "{2081AC8C-CC09-4C66-9D23-E4E8300BDB29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Keystore", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Keystore\Catalyst.Core.Modules.Keystore.csproj", "{2081AC8C-CC09-4C66-9D23-E4E8300BDB29}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Kvm", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Kvm\Catalyst.Core.Modules.Kvm.csproj", "{C02C7AED-277A-4BBE-8456-E1C487442C6B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Kvm", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Kvm\Catalyst.Core.Modules.Kvm.csproj", "{C02C7AED-277A-4BBE-8456-E1C487442C6B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Ledger", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Ledger\Catalyst.Core.Modules.Ledger.csproj", "{A646BEAD-40CB-4B3D-84A5-96BA120AF47B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Ledger", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Ledger\Catalyst.Core.Modules.Ledger.csproj", "{A646BEAD-40CB-4B3D-84A5-96BA120AF47B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Mempool", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Mempool\Catalyst.Core.Modules.Mempool.csproj", "{DD52F60D-2F43-49C7-A6A8-8C235317807C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Mempool", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Mempool\Catalyst.Core.Modules.Mempool.csproj", "{DD52F60D-2F43-49C7-A6A8-8C235317807C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Rpc.Client", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Rpc.Client\Catalyst.Core.Modules.Rpc.Client.csproj", "{0DE76285-45A9-4C3F-8472-70253711C2A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Rpc.Client", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Rpc.Client\Catalyst.Core.Modules.Rpc.Client.csproj", "{0DE76285-45A9-4C3F-8472-70253711C2A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Rpc.Server", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Rpc.Server\Catalyst.Core.Modules.Rpc.Server.csproj", "{FDF986C5-7FE3-419E-82D4-9F31134E3171}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Rpc.Server", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Rpc.Server\Catalyst.Core.Modules.Rpc.Server.csproj", "{FDF986C5-7FE3-419E-82D4-9F31134E3171}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Web3", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Web3\Catalyst.Core.Modules.Web3.csproj", "{CBE80931-25B7-44D5-A0C9-7A433BCEE03C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.Web3", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Web3\Catalyst.Core.Modules.Web3.csproj", "{CBE80931-25B7-44D5-A0C9-7A433BCEE03C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Simulator", "..\submodules\Catalyst.Node\src\Catalyst.Simulator\Catalyst.Simulator.csproj", "{F67FC4C0-8C19-465B-ADF8-51B90F48AB74}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Simulator", "..\submodules\Catalyst.Framework\src\Catalyst.Simulator\Catalyst.Simulator.csproj", "{F67FC4C0-8C19-465B-ADF8-51B90F48AB74}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Modules.POA.P2P.Discovery.Consortium", "..\submodules\Catalyst.Node\src\Catalyst.Modules.POA.P2P.Discovery.Consortium\Catalyst.Modules.POA.P2P.Discovery.Consortium.csproj", "{71ABE85C-2BEB-43B5-A1F4-6C8294CE83A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Modules.POA.P2P.Discovery.Consortium", "..\submodules\Catalyst.Framework\src\Catalyst.Modules.POA.P2P.Discovery.Consortium\Catalyst.Modules.POA.P2P.Discovery.Consortium.csproj", "{71ABE85C-2BEB-43B5-A1F4-6C8294CE83A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Modules.POA.Consensus", "..\submodules\Catalyst.Node\src\Catalyst.Modules.POA.Consensus\Catalyst.Modules.POA.Consensus.csproj", "{6BECD71B-FBB7-433E-8F46-4B2233FC31E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Modules.POA.Consensus", "..\submodules\Catalyst.Framework\src\Catalyst.Modules.POA.Consensus\Catalyst.Modules.POA.Consensus.csproj", "{6BECD71B-FBB7-433E-8F46-4B2233FC31E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.P2P.Discovery.Hastings", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.P2P.Discovery.Hastings\Catalyst.Core.Modules.P2P.Discovery.Hastings.csproj", "{C232BF7E-4DF2-4C81-99CF-17D529DF264C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Catalyst.Core.Modules.P2P.Discovery.Hastings", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.P2P.Discovery.Hastings\Catalyst.Core.Modules.P2P.Discovery.Hastings.csproj", "{C232BF7E-4DF2-4C81-99CF-17D529DF264C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catalyst.Core.Modules.Hashing", "..\submodules\Catalyst.Node\src\Catalyst.Core.Modules.Hashing\Catalyst.Core.Modules.Hashing.csproj", "{12A520A9-F736-4CC5-832B-230E11A7DFBB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catalyst.Core.Modules.Hashing", "..\submodules\Catalyst.Framework\src\Catalyst.Core.Modules.Hashing\Catalyst.Core.Modules.Hashing.csproj", "{12A520A9-F736-4CC5-832B-230E11A7DFBB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Catalyst.Node.POA.CE/Catalyst.Node.POA.CE.csproj b/src/Catalyst.Node.POA.CE/Catalyst.Node.POA.CE.csproj index ed5526c8..df8e6b0e 100644 --- a/src/Catalyst.Node.POA.CE/Catalyst.Node.POA.CE.csproj +++ b/src/Catalyst.Node.POA.CE/Catalyst.Node.POA.CE.csproj @@ -24,21 +24,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/Catalyst.Node.POA.CE/CatalystNodePoa.cs b/src/Catalyst.Node.POA.CE/CatalystNodePoa.cs index f7ebefbf..3bad6d42 100644 --- a/src/Catalyst.Node.POA.CE/CatalystNodePoa.cs +++ b/src/Catalyst.Node.POA.CE/CatalystNodePoa.cs @@ -30,11 +30,11 @@ using Catalyst.Abstractions.Cryptography; using Catalyst.Abstractions.Dfs; using Catalyst.Abstractions.KeySigner; +using Catalyst.Abstractions.Ledger; using Catalyst.Abstractions.Mempool; using Catalyst.Abstractions.P2P; using Catalyst.Abstractions.Types; using Catalyst.Core.Lib.DAO; -using Catalyst.Core.Modules.Ledger; using Serilog; using TheDotNetLeague.MultiFormats.MultiBase; @@ -80,7 +80,7 @@ public CatalystNodePoa(IKeySigner keySigner, _publicKey = keySigner.CryptoContext.GetPublicKeyFromPrivateKey(privateKey); } - public async Task StartSockets() + public async Task StartSocketsAsync() { await _peerClient.StartAsync().ConfigureAwait(false); await _peer.StartAsync().ConfigureAwait(false); @@ -91,7 +91,7 @@ public async Task RunAsync(CancellationToken ct) _logger.Information("Starting the Catalyst Node"); _logger.Information($"***** using PublicKey: {_publicKey.Bytes.ToBase32()} *****"); - await StartSockets().ConfigureAwait(false); + await StartSocketsAsync().ConfigureAwait(false); Consensus.StartProducing(); bool exit; diff --git a/src/Catalyst.Node.POA.CE/Program.cs b/src/Catalyst.Node.POA.CE/Program.cs index b4134b88..49fd814c 100644 --- a/src/Catalyst.Node.POA.CE/Program.cs +++ b/src/Catalyst.Node.POA.CE/Program.cs @@ -46,6 +46,7 @@ using Catalyst.Core.Modules.Hashing; using Catalyst.Core.Modules.KeySigner; using Catalyst.Core.Modules.Keystore; +using Catalyst.Core.Modules.Kvm; using Catalyst.Core.Modules.Ledger; using Catalyst.Core.Modules.Mempool; using Catalyst.Core.Modules.P2P.Discovery.Hastings; @@ -60,8 +61,8 @@ namespace Catalyst.Node.POA.CE { internal class Options { - [Option("ipfs-password", HelpText = "The password for IPFS. Defaults to prompting for the password.")] - public string IpfsPassword { get; set; } + [Option("dfs-password", HelpText = "The password for dfs. Defaults to prompting for the password.")] + public string DfsPassword { get; set; } [Option("ssl-cert-password", HelpText = "The password for ssl cert. Defaults to prompting for the password.")] public string SslCertPassword { get; set; } @@ -107,6 +108,7 @@ private static async Task CustomBootLogic(Kernel kernel) private static readonly Dictionary> DefaultModulesByTypes = new Dictionary> { {typeof(CoreLibProvider), () => new CoreLibProvider()}, + {typeof(KvmModule), () => new KvmModule()}, {typeof(MempoolModule), () => new MempoolModule()}, {typeof(ConsensusModule), () => new ConsensusModule()}, {typeof(LedgerModule), () => new LedgerModule()}, @@ -182,7 +184,7 @@ await Kernel .WithPersistenceConfiguration() .BuildKernel(options.OverwriteConfig) .WithPassword(PasswordRegistryTypes.DefaultNodePassword, options.NodePassword) - .WithPassword(PasswordRegistryTypes.IpfsPassword, options.IpfsPassword) + .WithPassword(PasswordRegistryTypes.IpfsPassword, options.DfsPassword) .WithPassword(PasswordRegistryTypes.CertificatePassword, options.SslCertPassword) .StartCustomAsync(CustomBootLogic); @@ -190,7 +192,7 @@ await Kernel } catch (Exception e) { - Kernel.Logger.Fatal(e, "Catalyst.Node stopped unexpectedly"); + Kernel.Logger.Fatal(e, "Catalyst.Node.POA.CE stopped unexpectedly"); Environment.ExitCode = 1; } } diff --git a/submodules/Catalyst.Framework b/submodules/Catalyst.Framework new file mode 160000 index 00000000..9a45b9d1 --- /dev/null +++ b/submodules/Catalyst.Framework @@ -0,0 +1 @@ +Subproject commit 9a45b9d12291b9d6bd322286ee030b69aec8a4ca diff --git a/submodules/Catalyst.Node b/submodules/Catalyst.Node deleted file mode 160000 index cca201a4..00000000 --- a/submodules/Catalyst.Node +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cca201a45075613d5c5f6bb9b740933470ded02f