From e80d4cad578b3cf0115549ae8076643e9dd69dab Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Thu, 19 May 2022 18:23:33 +0800 Subject: [PATCH 1/5] Set HF_2712_FixSyscallFees for mainnet --- neo-cli/config.json | 4 +++- neo-cli/config.mainnet.json | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/neo-cli/config.json b/neo-cli/config.json index 7d037a19d..2fed5e0a8 100644 --- a/neo-cli/config.json +++ b/neo-cli/config.json @@ -15,7 +15,6 @@ "MinDesiredConnections": 10, "MaxConnections": 40, "MaxConnectionsPerAddress": 3 - }, "UnlockWallet": { "Path": "", @@ -30,6 +29,9 @@ "MaxTransactionsPerBlock": 512, "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, + "Hardforks": { + "HF_2712_FixSyscallFees": 2000000 + }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, "StandbyCommittee": [ diff --git a/neo-cli/config.mainnet.json b/neo-cli/config.mainnet.json index bd4d47a19..2fed5e0a8 100644 --- a/neo-cli/config.mainnet.json +++ b/neo-cli/config.mainnet.json @@ -29,6 +29,9 @@ "MaxTransactionsPerBlock": 512, "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, + "Hardforks": { + "HF_2712_FixSyscallFees": 2000000 + }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, "StandbyCommittee": [ From eb20840e596f8b72022e7dd00bc7ada3cbd00d95 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Thu, 19 May 2022 18:27:45 +0800 Subject: [PATCH 2/5] format --- neo-cli/CLI/MainService.Node.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neo-cli/CLI/MainService.Node.cs b/neo-cli/CLI/MainService.Node.cs index df879e5a2..2f332a0ed 100644 --- a/neo-cli/CLI/MainService.Node.cs +++ b/neo-cli/CLI/MainService.Node.cs @@ -87,7 +87,7 @@ private void OnShowStateCommand() foreach (RemoteNode node in LocalNode.GetRemoteNodes().OrderByDescending(u => u.LastBlockIndex).Take(Console.WindowHeight - 2).ToArray()) { ConsoleHelper.Info(" ip: ", - $"{ node.Remote.Address,-15}\t", + $"{node.Remote.Address,-15}\t", "port: ", $"{node.Remote.Port,-5}\t", "listen: ", From 22c07ddd33a3e9b2e9b32f9c5a53074d4d00eb10 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Thu, 26 May 2022 11:50:21 +0800 Subject: [PATCH 3/5] Rename --- neo-cli/config.json | 2 +- neo-cli/config.mainnet.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neo-cli/config.json b/neo-cli/config.json index 2fed5e0a8..0b4c3a92f 100644 --- a/neo-cli/config.json +++ b/neo-cli/config.json @@ -30,7 +30,7 @@ "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, "Hardforks": { - "HF_2712_FixSyscallFees": 2000000 + "HF_Aspidochelone": 2000000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/neo-cli/config.mainnet.json b/neo-cli/config.mainnet.json index 2fed5e0a8..0b4c3a92f 100644 --- a/neo-cli/config.mainnet.json +++ b/neo-cli/config.mainnet.json @@ -30,7 +30,7 @@ "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, "Hardforks": { - "HF_2712_FixSyscallFees": 2000000 + "HF_Aspidochelone": 2000000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, From f834d83f90c851798b8b4fde2253c8db9fe51720 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Tue, 31 May 2022 17:48:36 +0800 Subject: [PATCH 4/5] Update HF_Aspidochelone --- neo-cli/config.json | 2 +- neo-cli/config.mainnet.json | 2 +- neo-cli/config.testnet.json | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/neo-cli/config.json b/neo-cli/config.json index 0b4c3a92f..53523ae0d 100644 --- a/neo-cli/config.json +++ b/neo-cli/config.json @@ -30,7 +30,7 @@ "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, "Hardforks": { - "HF_Aspidochelone": 2000000 + "HF_Aspidochelone": 1730000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/neo-cli/config.mainnet.json b/neo-cli/config.mainnet.json index 0b4c3a92f..53523ae0d 100644 --- a/neo-cli/config.mainnet.json +++ b/neo-cli/config.mainnet.json @@ -30,7 +30,7 @@ "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, "Hardforks": { - "HF_Aspidochelone": 2000000 + "HF_Aspidochelone": 1730000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/neo-cli/config.testnet.json b/neo-cli/config.testnet.json index 7ee048897..7408f897c 100644 --- a/neo-cli/config.testnet.json +++ b/neo-cli/config.testnet.json @@ -29,6 +29,9 @@ "MaxTransactionsPerBlock": 5000, "MemoryPoolMaxTransactions": 50000, "MaxTraceableBlocks": 2102400, + "Hardforks": { + "HF_Aspidochelone": 210000 + }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, "StandbyCommittee": [ From 13416e6f0443ed22092c8188246d72e0d7c6fed4 Mon Sep 17 00:00:00 2001 From: Erik Zhang Date: Tue, 31 May 2022 17:56:05 +0800 Subject: [PATCH 5/5] 3.3.0 --- neo-cli/neo-cli.csproj | 4 ++-- neo-gui/neo-gui.csproj | 2 +- .../Neo.ConsoleService.Tests.csproj | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj index 6570af833..97be2d62d 100644 --- a/neo-cli/neo-cli.csproj +++ b/neo-cli/neo-cli.csproj @@ -3,7 +3,7 @@ 2016-2022 The Neo Project Neo.CLI - 3.2.1 + 3.3.0 The Neo Project net6.0 neo-cli @@ -23,7 +23,7 @@ - + diff --git a/neo-gui/neo-gui.csproj b/neo-gui/neo-gui.csproj index 94a56ec90..0b614b883 100644 --- a/neo-gui/neo-gui.csproj +++ b/neo-gui/neo-gui.csproj @@ -3,7 +3,7 @@ 2016-2022 The Neo Project Neo.GUI - 3.2.1 + 3.3.0 The Neo Project WinExe net6.0-windows diff --git a/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj b/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj index 48273aad7..af2052090 100644 --- a/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj +++ b/tests/Neo.ConsoleService.Tests/Neo.ConsoleService.Tests.csproj @@ -6,9 +6,9 @@ - - - + + +