From bc86f6a500bc98f7f7f86118f354312a3801bfb0 Mon Sep 17 00:00:00 2001 From: Owen <38493437+superboyiii@users.noreply.github.com> Date: Fri, 10 May 2024 16:21:05 +0800 Subject: [PATCH] v3.7.0 (#3222) --- README.md | 4 ++-- src/Directory.Build.props | 4 ++-- src/Neo.CLI/Dockerfile | 6 +++--- src/Neo.CLI/config.json | 3 ++- src/Neo.CLI/config.mainnet.json | 3 ++- src/Neo.CLI/config.testnet.json | 3 ++- src/Neo.GUI/GUI/BulkPayDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ChangePasswordDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ConsoleForm.Designer.cs | 8 ++++---- src/Neo.GUI/GUI/CreateMultiSigContractDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/CreateWalletDialog.designer.cs | 2 +- src/Neo.GUI/GUI/DeployContractDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/DeveloperToolsForm.Designer.cs | 2 +- src/Neo.GUI/GUI/ElectionDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ImportCustomContractDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ImportPrivateKeyDialog.designer.cs | 2 +- src/Neo.GUI/GUI/InformationBox.Designer.cs | 2 +- src/Neo.GUI/GUI/InputBox.Designer.cs | 2 +- src/Neo.GUI/GUI/InvokeContractDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/MainForm.Designer.cs | 2 +- src/Neo.GUI/GUI/OpenWalletDialog.designer.cs | 2 +- src/Neo.GUI/GUI/ParametersEditor.Designer.cs | 2 +- src/Neo.GUI/GUI/PayToDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/SigningDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/SigningTxDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/TransferDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/TxOutListBox.Designer.cs | 2 +- src/Neo.GUI/GUI/UpdateDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ViewContractDialog.Designer.cs | 2 +- src/Neo.GUI/GUI/ViewPrivateKeyDialog.designer.cs | 2 +- src/Neo.GUI/GUI/VotingDialog.Designer.cs | 2 +- 31 files changed, 41 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 37d1f00827..407bd6a837 100644 --- a/README.md +++ b/README.md @@ -105,8 +105,8 @@ ## Overview This repository contain main classes of the -[Neo](https://www.neo.org) blockchain. -Visit the [documentation](https://docs.neo.org/docs/en-us/index.html) to get started. +[Neo](https://neo.org) blockchain. +Visit the [tutorials](https://developers.neo.org) to get started. ## Project structure diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b04d3d34ae..18f77050d5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,8 +2,8 @@ - 2015-2023 The Neo Project - 3.6.2 + 2015-2024 The Neo Project + 3.7.0 12.0 The Neo Project neo.png diff --git a/src/Neo.CLI/Dockerfile b/src/Neo.CLI/Dockerfile index 7b67a6812d..5863e9a74d 100644 --- a/src/Neo.CLI/Dockerfile +++ b/src/Neo.CLI/Dockerfile @@ -1,13 +1,13 @@ -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS Build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS Build # Run this from the repository root folder COPY src . COPY NuGet.Config /Neo.CLI WORKDIR /Neo.CLI -RUN dotnet restore && dotnet publish -f net7.0 -c Release -o /app +RUN dotnet restore && dotnet publish -f net8.0 -c Release -o /app -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:7.0 AS Final +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0 AS Final RUN apt-get update && apt-get install -y \ screen \ libleveldb-dev \ diff --git a/src/Neo.CLI/config.json b/src/Neo.CLI/config.json index b4800b80ea..fb73c3f8d8 100644 --- a/src/Neo.CLI/config.json +++ b/src/Neo.CLI/config.json @@ -36,7 +36,8 @@ "MaxTraceableBlocks": 2102400, "Hardforks": { "HF_Aspidochelone": 1730000, - "HF_Basilisk": 4120000 + "HF_Basilisk": 4120000, + "HF_Cockatrice": 5420000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/src/Neo.CLI/config.mainnet.json b/src/Neo.CLI/config.mainnet.json index b4800b80ea..fb73c3f8d8 100644 --- a/src/Neo.CLI/config.mainnet.json +++ b/src/Neo.CLI/config.mainnet.json @@ -36,7 +36,8 @@ "MaxTraceableBlocks": 2102400, "Hardforks": { "HF_Aspidochelone": 1730000, - "HF_Basilisk": 4120000 + "HF_Basilisk": 4120000, + "HF_Cockatrice": 5420000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/src/Neo.CLI/config.testnet.json b/src/Neo.CLI/config.testnet.json index 19a9ca1442..6e566c7ce1 100644 --- a/src/Neo.CLI/config.testnet.json +++ b/src/Neo.CLI/config.testnet.json @@ -36,7 +36,8 @@ "MaxTraceableBlocks": 2102400, "Hardforks": { "HF_Aspidochelone": 210000, - "HF_Basilisk": 2680000 + "HF_Basilisk": 2680000, + "HF_Cockatrice": 3967000 }, "InitialGasDistribution": 5200000000000000, "ValidatorsCount": 7, diff --git a/src/Neo.GUI/GUI/BulkPayDialog.Designer.cs b/src/Neo.GUI/GUI/BulkPayDialog.Designer.cs index 41ad15e57a..12af8811ff 100644 --- a/src/Neo.GUI/GUI/BulkPayDialog.Designer.cs +++ b/src/Neo.GUI/GUI/BulkPayDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ChangePasswordDialog.Designer.cs b/src/Neo.GUI/GUI/ChangePasswordDialog.Designer.cs index 0d9c6ea80c..bcf044ecc9 100644 --- a/src/Neo.GUI/GUI/ChangePasswordDialog.Designer.cs +++ b/src/Neo.GUI/GUI/ChangePasswordDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ConsoleForm.Designer.cs b/src/Neo.GUI/GUI/ConsoleForm.Designer.cs index e3fd639db0..b93f503075 100644 --- a/src/Neo.GUI/GUI/ConsoleForm.Designer.cs +++ b/src/Neo.GUI/GUI/ConsoleForm.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of @@ -44,8 +44,8 @@ private void InitializeComponent() // // textBox1 // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Location = new System.Drawing.Point(12, 12); this.textBox1.Font = new System.Drawing.Font("Consolas", 11.0f); @@ -59,7 +59,7 @@ private void InitializeComponent() // // textBox2 // - this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.Location = new System.Drawing.Point(12, 385); this.textBox2.Font = new System.Drawing.Font("Consolas", 11.0f); diff --git a/src/Neo.GUI/GUI/CreateMultiSigContractDialog.Designer.cs b/src/Neo.GUI/GUI/CreateMultiSigContractDialog.Designer.cs index e91c25c9b7..1fa9aba600 100644 --- a/src/Neo.GUI/GUI/CreateMultiSigContractDialog.Designer.cs +++ b/src/Neo.GUI/GUI/CreateMultiSigContractDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/CreateWalletDialog.designer.cs b/src/Neo.GUI/GUI/CreateWalletDialog.designer.cs index c4f41b6573..1ea5451ff1 100644 --- a/src/Neo.GUI/GUI/CreateWalletDialog.designer.cs +++ b/src/Neo.GUI/GUI/CreateWalletDialog.designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/DeployContractDialog.Designer.cs b/src/Neo.GUI/GUI/DeployContractDialog.Designer.cs index 629b5e96dd..8d29fbc1d3 100644 --- a/src/Neo.GUI/GUI/DeployContractDialog.Designer.cs +++ b/src/Neo.GUI/GUI/DeployContractDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/DeveloperToolsForm.Designer.cs b/src/Neo.GUI/GUI/DeveloperToolsForm.Designer.cs index 31faf836d9..a18dcdb108 100644 --- a/src/Neo.GUI/GUI/DeveloperToolsForm.Designer.cs +++ b/src/Neo.GUI/GUI/DeveloperToolsForm.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ElectionDialog.Designer.cs b/src/Neo.GUI/GUI/ElectionDialog.Designer.cs index 512c24643a..5085e1db1f 100644 --- a/src/Neo.GUI/GUI/ElectionDialog.Designer.cs +++ b/src/Neo.GUI/GUI/ElectionDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ImportCustomContractDialog.Designer.cs b/src/Neo.GUI/GUI/ImportCustomContractDialog.Designer.cs index d06a03890e..43e1a0cad3 100644 --- a/src/Neo.GUI/GUI/ImportCustomContractDialog.Designer.cs +++ b/src/Neo.GUI/GUI/ImportCustomContractDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ImportPrivateKeyDialog.designer.cs b/src/Neo.GUI/GUI/ImportPrivateKeyDialog.designer.cs index e0df823ec7..06b1001288 100644 --- a/src/Neo.GUI/GUI/ImportPrivateKeyDialog.designer.cs +++ b/src/Neo.GUI/GUI/ImportPrivateKeyDialog.designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/InformationBox.Designer.cs b/src/Neo.GUI/GUI/InformationBox.Designer.cs index 8b41144a9b..92bf89bc78 100644 --- a/src/Neo.GUI/GUI/InformationBox.Designer.cs +++ b/src/Neo.GUI/GUI/InformationBox.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/InputBox.Designer.cs b/src/Neo.GUI/GUI/InputBox.Designer.cs index aa376ca91f..163438b8e7 100644 --- a/src/Neo.GUI/GUI/InputBox.Designer.cs +++ b/src/Neo.GUI/GUI/InputBox.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/InvokeContractDialog.Designer.cs b/src/Neo.GUI/GUI/InvokeContractDialog.Designer.cs index 04f845def9..44454c0306 100644 --- a/src/Neo.GUI/GUI/InvokeContractDialog.Designer.cs +++ b/src/Neo.GUI/GUI/InvokeContractDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/MainForm.Designer.cs b/src/Neo.GUI/GUI/MainForm.Designer.cs index 2f4da98d9c..4ea5e2e5f6 100644 --- a/src/Neo.GUI/GUI/MainForm.Designer.cs +++ b/src/Neo.GUI/GUI/MainForm.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/OpenWalletDialog.designer.cs b/src/Neo.GUI/GUI/OpenWalletDialog.designer.cs index 9db0ac01b8..a1cc1a1308 100644 --- a/src/Neo.GUI/GUI/OpenWalletDialog.designer.cs +++ b/src/Neo.GUI/GUI/OpenWalletDialog.designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ParametersEditor.Designer.cs b/src/Neo.GUI/GUI/ParametersEditor.Designer.cs index 5d6d92d268..6f0b2432e4 100644 --- a/src/Neo.GUI/GUI/ParametersEditor.Designer.cs +++ b/src/Neo.GUI/GUI/ParametersEditor.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/PayToDialog.Designer.cs b/src/Neo.GUI/GUI/PayToDialog.Designer.cs index 100d32f50d..2bf4e075c0 100644 --- a/src/Neo.GUI/GUI/PayToDialog.Designer.cs +++ b/src/Neo.GUI/GUI/PayToDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/SigningDialog.Designer.cs b/src/Neo.GUI/GUI/SigningDialog.Designer.cs index 8c03f84901..dabb436d23 100644 --- a/src/Neo.GUI/GUI/SigningDialog.Designer.cs +++ b/src/Neo.GUI/GUI/SigningDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/SigningTxDialog.Designer.cs b/src/Neo.GUI/GUI/SigningTxDialog.Designer.cs index 45ecb20563..a8bb11f2c2 100644 --- a/src/Neo.GUI/GUI/SigningTxDialog.Designer.cs +++ b/src/Neo.GUI/GUI/SigningTxDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/TransferDialog.Designer.cs b/src/Neo.GUI/GUI/TransferDialog.Designer.cs index 2d19a83fce..8d18bb5316 100644 --- a/src/Neo.GUI/GUI/TransferDialog.Designer.cs +++ b/src/Neo.GUI/GUI/TransferDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/TxOutListBox.Designer.cs b/src/Neo.GUI/GUI/TxOutListBox.Designer.cs index ad9f54d846..df23b5b8c0 100644 --- a/src/Neo.GUI/GUI/TxOutListBox.Designer.cs +++ b/src/Neo.GUI/GUI/TxOutListBox.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/UpdateDialog.Designer.cs b/src/Neo.GUI/GUI/UpdateDialog.Designer.cs index 6af087d42b..a443304ffa 100644 --- a/src/Neo.GUI/GUI/UpdateDialog.Designer.cs +++ b/src/Neo.GUI/GUI/UpdateDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ViewContractDialog.Designer.cs b/src/Neo.GUI/GUI/ViewContractDialog.Designer.cs index 5adbe25451..05706aa7ef 100644 --- a/src/Neo.GUI/GUI/ViewContractDialog.Designer.cs +++ b/src/Neo.GUI/GUI/ViewContractDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/ViewPrivateKeyDialog.designer.cs b/src/Neo.GUI/GUI/ViewPrivateKeyDialog.designer.cs index 2ba3d9773f..306904a85e 100644 --- a/src/Neo.GUI/GUI/ViewPrivateKeyDialog.designer.cs +++ b/src/Neo.GUI/GUI/ViewPrivateKeyDialog.designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of diff --git a/src/Neo.GUI/GUI/VotingDialog.Designer.cs b/src/Neo.GUI/GUI/VotingDialog.Designer.cs index 0ce4b7ee30..706b1a5bbf 100644 --- a/src/Neo.GUI/GUI/VotingDialog.Designer.cs +++ b/src/Neo.GUI/GUI/VotingDialog.Designer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2016-2023 The Neo Project. +// Copyright (C) 2016-2024 The Neo Project. // // The neo-gui is free software distributed under the MIT software // license, see the accompanying file LICENSE in the main directory of