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

Clean protocol.json #388

Merged
merged 1 commit into from
Jun 15, 2019
Merged

Clean protocol.json #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions neo-cli/Shell/MainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,10 +920,10 @@ private bool OnShowPoolCommand(string[] args)
out IEnumerable<Transaction> unverifiedTransactions);
Console.WriteLine("Verified Transactions:");
foreach (Transaction tx in verifiedTransactions)
Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee {tx.IsLowPriority}");
Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee");
Console.WriteLine("Unverified Transactions:");
foreach (Transaction tx in unverifiedTransactions)
Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee {tx.IsLowPriority}");
Console.WriteLine($" {tx.Hash} {tx.GetType().Name} {tx.NetworkFee} GAS_NetFee");
}
Console.WriteLine($"total: {Blockchain.Singleton.MemPool.Count}, verified: {Blockchain.Singleton.MemPool.VerifiedCount}, unverified: {Blockchain.Singleton.MemPool.UnVerifiedCount}");
return true;
Expand Down Expand Up @@ -1152,12 +1152,12 @@ private bool OnUpgradeWalletCommand(string[] args)
Console.WriteLine("cancelled");
return true;
}
string path_new = Path.ChangeExtension(path, ".json");
if (File.Exists(path_new))
{
Console.WriteLine($"File '{path_new}' already exists");
return true;
}
string path_new = Path.ChangeExtension(path, ".json");
NEP6Wallet.Migrate(path_new, path, password).Save();
Console.WriteLine($"Wallet file upgrade complete. New wallet file has been auto-saved at: {path_new}");
return true;
Expand Down
1 change: 0 additions & 1 deletion neo-cli/protocol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"Magic": 5195086,
"AddressVersion": 23,
"SecondsPerBlock": 15,
"LowPriorityThreshold": 0.001,
"StandbyValidators": [
"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
"02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",
Expand Down
1 change: 0 additions & 1 deletion neo-cli/protocol.mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"Magic": 5195086,
"AddressVersion": 23,
"SecondsPerBlock": 15,
"LowPriorityThreshold": 0.001,
"StandbyValidators": [
"03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
"02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",
Expand Down
1 change: 0 additions & 1 deletion neo-cli/protocol.testnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"Magic": 1414481230,
"AddressVersion": 23,
"SecondsPerBlock": 15,
"LowPriorityThreshold": 0,
"StandbyValidators": [
"0327da12b5c40200e9f65569476bbff2218da4f32548ff43b6387ec1416a231ee8",
"026ce35b29147ad09e4afe4ec4a7319095f08198fa8babbe3c56e970b143528d22",
Expand Down