Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No submodule #464

Merged
merged 5 commits into from
Aug 24, 2024
Merged

No submodule #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81a7a77
No submodule
chenzhitong Aug 23, 2024
164cbe0
Update neoxp.csproj
chenzhitong Aug 23, 2024
e40b3b7
Update bctklib.csproj
chenzhitong Aug 23, 2024
4040e7a
Apply suggestions from code review
cschuchardt88 Aug 24, 2024
27eaa44
Revert "Apply suggestions from code review"
cschuchardt88 Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/code.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ jobs:
- name: Nerdbank.GitVersioning
uses: dotnet/[email protected]
id: nbgv

- name: Update submodule
run: |
git submodule update --init --recursive --remote

- name: Restore dependencies
if: matrix.language == 'csharp'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ jobs:
- name: Nerdbank.GitVersioning
uses: dotnet/[email protected]
id: nbgv

- name: Update submodule
run: |
git submodule update --init --recursive --remote

- name: Install dependencies
run: dotnet restore neo-express.sln
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/standalone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ jobs:
uses: dotnet/[email protected]
id: nbgv

- name: Update submodule
run: |
git submodule update --init --recursive --remote

- name: Build (${{ matrix.runtime }})
run: |
dotnet publish ./src/neoxp \
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Update submodule
run: |
git submodule update --init --recursive --remote

- name: Restore
run: dotnet restore neo-express.sln
Expand Down Expand Up @@ -54,10 +50,6 @@ jobs:
- name: Nerdbank.GitVersioning
uses: dotnet/[email protected]
id: nbgv

- name: Update submodule
run: |
git submodule update --init --recursive --remote

- name: Restore
run: dotnet restore neo-express.sln
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "src/neo"]
path = src/neo
url = https://github.com/neo-project/neo.git
25 changes: 0 additions & 25 deletions .neo/README.md
View file
Open in desktop

This file was deleted.

Binary file removed .neo/neo.png
View file
Open in desktop
Binary file not shown.
79 changes: 0 additions & 79 deletions neo-express.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test-build-tasks", "test\te
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test-collector", "test\test-collector\test-collector.csproj", "{A2003459-18D0-43BD-8CB9-CE3FA497A66B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo", "src\neo\src\Neo\Neo.csproj", "{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.VM", "src\neo\src\Neo.VM\Neo.VM.csproj", "{9EA61843-ED3D-47E9-A9C6-9EE7398B7565}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.IO", "src\neo\src\Neo.IO\Neo.IO.csproj", "{757E630C-EECE-462A-8BB2-F7B75D0DC753}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.Json", "src\neo\src\Neo.Json\Neo.Json.csproj", "{73CB5B44-185F-49F1-8784-29A1DB9D82FB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodule", "submodule", "{DB7A3448-0655-4FB0-8D90-4826AD141FFA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.Extensions", "src\neo\src\Neo.Extensions\Neo.Extensions.csproj", "{8D6F8416-CF73-4674-8CFE-267B789B068F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.Cryptography.BLS12_381", "src\neo\src\Neo.Cryptography.BLS12_381\Neo.Cryptography.BLS12_381.csproj", "{AB7B2276-F342-4063-BC1B-EFE473FE3021}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RpcClient", "src\neo\src\Plugins\RpcClient\RpcClient.csproj", "{D30CB5AB-811B-4A40-998E-FE85A8536164}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RpcServer", "src\neo\src\Plugins\RpcServer\RpcServer.csproj", "{5B04D19F-8819-4241-9901-513DDC173D11}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DBFTPlugin", "src\neo\src\Plugins\DBFTPlugin\DBFTPlugin.csproj", "{BE10D533-048E-4521-A89B-6DC1B003ECF5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPTTrie", "src\neo\src\Plugins\MPTTrie\MPTTrie.csproj", "{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.ConsoleService", "src\neo\src\Neo.ConsoleService\Neo.ConsoleService.csproj", "{723D17B6-A934-45CF-A496-4368A3E168C0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -114,50 +90,6 @@ Global
{A2003459-18D0-43BD-8CB9-CE3FA497A66B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2003459-18D0-43BD-8CB9-CE3FA497A66B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2003459-18D0-43BD-8CB9-CE3FA497A66B}.Release|Any CPU.Build.0 = Release|Any CPU
{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322}.Release|Any CPU.Build.0 = Release|Any CPU
{9EA61843-ED3D-47E9-A9C6-9EE7398B7565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EA61843-ED3D-47E9-A9C6-9EE7398B7565}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EA61843-ED3D-47E9-A9C6-9EE7398B7565}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9EA61843-ED3D-47E9-A9C6-9EE7398B7565}.Release|Any CPU.Build.0 = Release|Any CPU
{757E630C-EECE-462A-8BB2-F7B75D0DC753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{757E630C-EECE-462A-8BB2-F7B75D0DC753}.Debug|Any CPU.Build.0 = Debug|Any CPU
{757E630C-EECE-462A-8BB2-F7B75D0DC753}.Release|Any CPU.ActiveCfg = Release|Any CPU
{757E630C-EECE-462A-8BB2-F7B75D0DC753}.Release|Any CPU.Build.0 = Release|Any CPU
{73CB5B44-185F-49F1-8784-29A1DB9D82FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73CB5B44-185F-49F1-8784-29A1DB9D82FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73CB5B44-185F-49F1-8784-29A1DB9D82FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73CB5B44-185F-49F1-8784-29A1DB9D82FB}.Release|Any CPU.Build.0 = Release|Any CPU
{8D6F8416-CF73-4674-8CFE-267B789B068F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D6F8416-CF73-4674-8CFE-267B789B068F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D6F8416-CF73-4674-8CFE-267B789B068F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D6F8416-CF73-4674-8CFE-267B789B068F}.Release|Any CPU.Build.0 = Release|Any CPU
{AB7B2276-F342-4063-BC1B-EFE473FE3021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB7B2276-F342-4063-BC1B-EFE473FE3021}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB7B2276-F342-4063-BC1B-EFE473FE3021}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB7B2276-F342-4063-BC1B-EFE473FE3021}.Release|Any CPU.Build.0 = Release|Any CPU
{D30CB5AB-811B-4A40-998E-FE85A8536164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D30CB5AB-811B-4A40-998E-FE85A8536164}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D30CB5AB-811B-4A40-998E-FE85A8536164}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D30CB5AB-811B-4A40-998E-FE85A8536164}.Release|Any CPU.Build.0 = Release|Any CPU
{5B04D19F-8819-4241-9901-513DDC173D11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B04D19F-8819-4241-9901-513DDC173D11}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B04D19F-8819-4241-9901-513DDC173D11}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B04D19F-8819-4241-9901-513DDC173D11}.Release|Any CPU.Build.0 = Release|Any CPU
{BE10D533-048E-4521-A89B-6DC1B003ECF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE10D533-048E-4521-A89B-6DC1B003ECF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE10D533-048E-4521-A89B-6DC1B003ECF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE10D533-048E-4521-A89B-6DC1B003ECF5}.Release|Any CPU.Build.0 = Release|Any CPU
{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF}.Release|Any CPU.Build.0 = Release|Any CPU
{723D17B6-A934-45CF-A496-4368A3E168C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{723D17B6-A934-45CF-A496-4368A3E168C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{723D17B6-A934-45CF-A496-4368A3E168C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{723D17B6-A934-45CF-A496-4368A3E168C0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -175,17 +107,6 @@ Global
{8855D899-DA70-40E5-BA0B-DF5BC36D9D37} = {BCED0811-9E4F-4034-B297-D21311F81F98}
{366648BC-0003-419F-9C20-2FCD63FF4A77} = {24ECF210-FA12-4121-98DA-A18BE75219C6}
{A2003459-18D0-43BD-8CB9-CE3FA497A66B} = {24ECF210-FA12-4121-98DA-A18BE75219C6}
{E7FB0ED0-8FFF-4EF9-9003-B02C8B14F322} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{9EA61843-ED3D-47E9-A9C6-9EE7398B7565} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{757E630C-EECE-462A-8BB2-F7B75D0DC753} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{73CB5B44-185F-49F1-8784-29A1DB9D82FB} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{8D6F8416-CF73-4674-8CFE-267B789B068F} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{AB7B2276-F342-4063-BC1B-EFE473FE3021} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{D30CB5AB-811B-4A40-998E-FE85A8536164} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{5B04D19F-8819-4241-9901-513DDC173D11} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{BE10D533-048E-4521-A89B-6DC1B003ECF5} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{509DD0F8-56F2-4A65-B0FC-0C67D05D83DF} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
{723D17B6-A934-45CF-A496-4368A3E168C0} = {DB7A3448-0655-4FB0-8D90-4826AD141FFA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {14A0ACFA-EDC0-48D6-9C28-1EBCC3D544A5}
Expand Down
3 changes: 3 additions & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<ApplicationIcon>../neo-cli.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<NeoVersion>3.7.5</NeoVersion>
cschuchardt88 marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>
<ItemGroup>
<None Include="../neo-logo-72.png" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>
Expand Down
8 changes: 3 additions & 5 deletions src/bctklib/bctklib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.171" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Neo" Version="3.7.6" />
cschuchardt88 marked this conversation as resolved.
Show resolved Hide resolved
<PackageReference Include="Nerdbank.Streams" Version="2.11.74" />
<PackageReference Include="OneOf" Version="3.0.271" />
<PackageReference Include="rocksdb" Version="9.4.0.50294" />
<PackageReference Include="System.IO.Abstractions" Version="21.0.26" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\neo\src\Neo\Neo.csproj" />
<ProjectReference Include="..\neo\src\Plugins\MPTTrie\MPTTrie.csproj" />
<ProjectReference Include="..\neo\src\Plugins\RpcClient\RpcClient.csproj" />
<PackageReference Include="Neo.Cryptography.MPT" Version="$(NeoVersion)" />
<PackageReference Include="Neo.Network.RPC.RpcClient" Version="$(NeoVersion)" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions src/bctklib/smart-contract/TraceApplicationEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public override VMState Execute()
{
traceDebugSink.ProtocolSettings(ProtocolSettings.Network, ProtocolSettings.AddressVersion);
traceDebugSink.Script(CurrentContext?.Script ?? Array.Empty<byte>());
traceDebugSink.Trace(State, FeeConsumed, InvocationStack);
traceDebugSink.Trace(State, GasConsumed, InvocationStack);
WriteStorages(CurrentScriptHash);

return base.Execute();
Expand All @@ -82,17 +82,17 @@ protected override void PostExecuteInstruction(Instruction instruction)

if (State == VMState.HALT)
{
traceDebugSink.Results(State, FeeConsumed, ResultStack);
traceDebugSink.Results(State, GasConsumed, ResultStack);
}
traceDebugSink.Trace(State, FeeConsumed, InvocationStack);
traceDebugSink.Trace(State, GasConsumed, InvocationStack);
WriteStorages(CurrentScriptHash);
}

protected override void OnFault(Exception e)
{
base.OnFault(e);
traceDebugSink.Fault(e);
traceDebugSink.Trace(State, FeeConsumed, InvocationStack);
traceDebugSink.Trace(State, GasConsumed, InvocationStack);
}

private void WriteStorages(UInt160 scriptHash)
Expand Down
1 change: 0 additions & 1 deletion src/neo
Open in desktop
Submodule neo deleted from 450cb6
1 change: 0 additions & 1 deletion src/neoxp/Commands/ExecuteCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
namespace NeoExpress.Commands
{
using McMaster.Extensions.CommandLineUtils;
using Neo.Extensions;

[Command(Name = "execute", Description = "Invoke a custom script, the input text will be converted to script with a priority: hex, base64, file path.")]
class ExecuteCommand
Expand Down
1 change: 0 additions & 1 deletion src/neoxp/Commands/ExportCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using McMaster.Extensions.CommandLineUtils;
using Neo;
using Neo.BlockchainToolkit.Models;
using Neo.Extensions;
using NeoExpress.Models;
using Newtonsoft.Json;
using System.IO.Abstractions;
Expand Down
1 change: 0 additions & 1 deletion src/neoxp/Commands/ShowCommand.NFT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

using McMaster.Extensions.CommandLineUtils;
using Neo;
using Neo.Extensions;
using Neo.Wallets;
using System.ComponentModel.DataAnnotations;

Expand Down
22 changes: 11 additions & 11 deletions src/neoxp/ExpressChainManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using Neo.BlockchainToolkit;
using Neo.BlockchainToolkit.Models;
using Neo.BlockchainToolkit.Persistence;
using Neo.Plugins.RpcServer;
using Neo.Plugins;
using NeoExpress.Models;
using NeoExpress.Node;
using Nito.Disposables;
Expand All @@ -26,11 +26,11 @@ namespace NeoExpress
{
internal class ExpressChainManager
{
const string GLOBAL_PREFIX = "Global\\";
const string CHECKPOINT_EXTENSION = ".neoxp-checkpoint";
private const string GLOBAL_PREFIX = "Global\\";
private const string CHECKPOINT_EXTENSION = ".neoxp-checkpoint";

readonly IFileSystem fileSystem;
readonly ExpressChain chain;
private readonly IFileSystem fileSystem;
private readonly ExpressChain chain;
public ProtocolSettings ProtocolSettings { get; }

public ExpressChainManager(IFileSystem fileSystem, ExpressChain chain, uint? secondsPerBlock = null)
Expand All @@ -49,9 +49,9 @@ public ExpressChainManager(IFileSystem fileSystem, ExpressChain chain, uint? sec

public ExpressChain Chain => chain;

string ResolveCheckpointFileName(string path) => fileSystem.ResolveFileName(path, CHECKPOINT_EXTENSION, () => $"{DateTimeOffset.Now:yyyyMMdd-hhmmss}");
private string ResolveCheckpointFileName(string path) => fileSystem.ResolveFileName(path, CHECKPOINT_EXTENSION, () => $"{DateTimeOffset.Now:yyyyMMdd-hhmmss}");

static bool IsNodeRunning(ExpressConsensusNode node)
private static bool IsNodeRunning(ExpressConsensusNode node)
{
// Check to see if there's a neo-express blockchain currently running by
// attempting to open a mutex with the multisig account address for a name
Expand Down Expand Up @@ -226,7 +226,7 @@ public async Task RunAsync(IExpressStorage expressStorage, ExpressConsensusNode

using var persistencePlugin = new ExpressPersistencePlugin();
using var logPlugin = new ExpressLogPlugin(console);
using var dbftPlugin = new Neo.Plugins.DBFTPlugin.DBFTPlugin(GetConsensusSettings(chain));
using var dbftPlugin = new Neo.Consensus.DBFTPlugin(GetConsensusSettings(chain));
using var rpcServerPlugin = new ExpressRpcServerPlugin(GetRpcServerSettings(chain, node),
expressStorage, multiSigAccount.ScriptHash);
using var neoSystem = new Neo.NeoSystem(ProtocolSettings, storeProvider.Name);
Expand Down Expand Up @@ -255,7 +255,7 @@ public async Task RunAsync(IExpressStorage expressStorage, ExpressConsensusNode
});
await tcs.Task.ConfigureAwait(false);

static Neo.Plugins.DBFTPlugin.Settings GetConsensusSettings(ExpressChain chain)
static Neo.Consensus.Settings GetConsensusSettings(ExpressChain chain)
{
var settings = new Dictionary<string, string>()
{
Expand All @@ -264,7 +264,7 @@ static Neo.Plugins.DBFTPlugin.Settings GetConsensusSettings(ExpressChain chain)
};

var config = new ConfigurationBuilder().AddInMemoryCollection(settings!).Build();
return new Neo.Plugins.DBFTPlugin.Settings(config.GetSection("PluginConfiguration"));
return new Neo.Consensus.Settings(config.GetSection("PluginConfiguration"));
}

static RpcServerSettings GetRpcServerSettings(ExpressChain chain, ExpressConsensusNode node)
Expand Down Expand Up @@ -336,7 +336,7 @@ public IExpressStorage GetCheckpointStorageProvider(string checkPointPath)
return CheckpointExpressStorage.OpenCheckpoint(checkPointPath, scriptHash: multiSigAccount.ScriptHash);
}

OfflineNode GetOfflineNode(bool offlineTrace = false)
private OfflineNode GetOfflineNode(bool offlineTrace = false)
{
if (IsRunning())
throw new NotSupportedException("Cannot get offline node while chain is running");
Expand Down
1 change: 0 additions & 1 deletion src/neoxp/Models/DevWalletAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

using Neo;
using Neo.BlockchainToolkit.Models;
using Neo.Extensions;
using Neo.SmartContract;
using Neo.Wallets;

Expand Down
4 changes: 1 addition & 3 deletions src/neoxp/Node/Modules/ExpressRpcServerPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@

using Neo;
using Neo.BlockchainToolkit;
using Neo.Extensions;
using Neo.IO;
using Neo.Json;
using Neo.Network.P2P.Payloads;
using Neo.Network.RPC;
using Neo.Persistence;
using Neo.Plugins;
using Neo.Plugins.RpcServer;
using Neo.SmartContract;
using Neo.SmartContract.Native;
using Neo.VM;
Expand All @@ -28,7 +26,7 @@
using NeoExpress.Validators;
using System.Collections.Immutable;
using System.Numerics;
using RpcException = Neo.Plugins.RpcServer.RpcException;
using RpcException = Neo.Plugins.RpcException;
using Utility = Neo.Utility;

namespace NeoExpress.Node
Expand Down
Loading
Loading