Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Fix OnShowPoolCommand after Mempool changes #288

Merged
merged 13 commits into from
Mar 6, 2019
+21 −11
Merged

Fix OnShowPoolCommand after Mempool changes #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
31a2497
Fix OnShowPoolCommand after Mempool changes
vncoelho Jan 14, 2019
831ed8c
Minor fix
vncoelho Jan 14, 2019
4c658ec
Fix sum of Count. still need to report total
vncoelho Jan 14, 2019
336dcdd
Fix II
vncoelho Jan 14, 2019
da047c2
Speed up
vncoelho Jan 14, 2019
bdd023c
Indent transaction information. Temporarily point to nightly build.
Jan 15, 2019
50918c9
Bump neo-cli version to 2.9.5.
Jan 15, 2019
3b0e7fb
Update Neo version with fix to MemPool on start-up.
Jan 16, 2019
d8432de
Update neo-cli.csproj
jsolman Jan 21, 2019
1b845bb
Merge branch 'master' into fix-OnShowPoolCommand
shargon Jan 22, 2019
c0559c0
Merge branch 'master' into fix-OnShowPoolCommand
vncoelho Mar 5, 2019
08d30ca
Add reference: Neo 2.10.0
erikzhang Mar 6, 2019
e8c5819
Cleanup
erikzhang Mar 6, 2019
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
28 changes: 19 additions & 9 deletions neo-cli/Shell/MainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
using System.Net;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using ECCurve = Neo.Cryptography.ECC.ECCurve;
using ECPoint = Neo.Cryptography.ECC.ECPoint;
Expand Down Expand Up @@ -495,7 +494,8 @@ private bool OnCreateWalletCommand(string[] args)
WalletAccount account = Program.Wallet.CreateAccount();
Console.WriteLine($"address: {account.Address}");
Console.WriteLine($" pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
system.RpcServer?.OpenWallet(Program.Wallet);
if (system.RpcServer != null)
system.RpcServer.Wallet = Program.Wallet;
}
break;
case ".json":
Expand All @@ -507,7 +507,8 @@ private bool OnCreateWalletCommand(string[] args)
Program.Wallet = wallet;
Console.WriteLine($"address: {account.Address}");
Console.WriteLine($" pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
system.RpcServer?.OpenWallet(Program.Wallet);
if (system.RpcServer != null)
system.RpcServer.Wallet = Program.Wallet;
}
break;
default:
Expand Down Expand Up @@ -863,7 +864,8 @@ private bool OnOpenWalletCommand(string[] args)
{
Console.WriteLine($"failed to open file \"{path}\"");
}
system.RpcServer?.OpenWallet(Program.Wallet);
if (system.RpcServer != null)
system.RpcServer.Wallet = Program.Wallet;
return true;
}

Expand Down Expand Up @@ -1000,11 +1002,19 @@ private bool OnShowCommand(string[] args)
private bool OnShowPoolCommand(string[] args)
{
bool verbose = args.Length >= 3 && args[2] == "verbose";
Transaction[] transactions = Blockchain.Singleton.GetMemoryPool().ToArray();
if (verbose)
foreach (Transaction tx in transactions)
Console.WriteLine($"{tx.Hash} {tx.GetType().Name}");
Console.WriteLine($"total: {transactions.Length}");
{
Blockchain.Singleton.MemPool.GetVerifiedAndUnverifiedTransactions(
out IEnumerable<Transaction> verifiedTransactions,
out IEnumerable<Transaction> unverifiedTransactions);
Console.WriteLine("Verified Transactions:");
foreach (Transaction tx in verifiedTransactions)
Console.WriteLine($" {tx.Hash} {tx.GetType().Name}");
Console.WriteLine("Unverified Transactions:");
foreach (Transaction tx in unverifiedTransactions)
Console.WriteLine($" {tx.Hash} {tx.GetType().Name}");
}
Console.WriteLine($"total: {Blockchain.Singleton.MemPool.Count}, verified: {Blockchain.Singleton.MemPool.VerifiedCount}, unverified: {Blockchain.Singleton.MemPool.UnVerifiedCount}");
return true;
}

Expand Down Expand Up @@ -1244,7 +1254,7 @@ private static Wallet OpenWallet(WalletIndexer indexer, string path, string pass
}
}

private static void WriteLineWithoutFlicker(string message = "", int maxWidth=80)
private static void WriteLineWithoutFlicker(string message = "", int maxWidth = 80)
{
if (message.Length > 0) Console.Write(message);
var spacesToErase = maxWidth - message.Length;
Expand Down
4 changes: 2 additions & 2 deletions neo-cli/neo-cli.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Copyright>2016-2019 The Neo Project</Copyright>
<AssemblyTitle>Neo.CLI</AssemblyTitle>
Expand Down Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Neo" Version="2.9.4" />
<PackageReference Include="Neo" Version="2.10.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
</ItemGroup>

Expand Down