From 5809bd5998c9ca56b723629742d057433b51a65d Mon Sep 17 00:00:00 2001 From: Owen Zhang <38493437+superboyiii@users.noreply.github.com> Date: Fri, 18 Dec 2020 16:36:22 +0800 Subject: [PATCH] Preview4 (#698) * Final merge for Preview4 (#693) * Sync to management SC (#689) * Sync to https://github.com/neo-project/neo/pull/2119 * Update nuget Co-authored-by: Shargon * Update to Neo v3.0.0-CI01105 (#692) * Update to Neo v3.0.0-CI01015 * Update neo-cli.csproj Co-authored-by: Shargon * Merge from master (#697) * Sync to management SC (#689) * Sync to https://github.com/neo-project/neo/pull/2119 * Update nuget Co-authored-by: Shargon * Update to Neo v3.0.0-CI01105 (#692) * Update to Neo v3.0.0-CI01015 * Update neo-cli.csproj * Update name nep17 (#695) * Fix Parse manifestFilePath * merge master * Update Name for NEP17 * fix format * show error message * fix * fix Co-authored-by: Shargon Co-authored-by: cloud8little <34291844+cloud8little@users.noreply.github.com> * Preview4 * sync gui * update changelog for preview 4 (#699) Co-authored-by: Shargon Co-authored-by: cloud8little <34291844+cloud8little@users.noreply.github.com> Co-authored-by: Qiao Jin <43407364+Qiao-Jin@users.noreply.github.com> --- CHANGELOG.md | 61 ++++++++++++++++++++--------- neo-cli/neo-cli.csproj | 4 +- neo-gui/GUI/DeployContractDialog.cs | 3 +- neo-gui/neo-gui.csproj | 2 +- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11f104f80..d5c790a9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,36 +3,59 @@ All notable changes to this project will be documented in this file. ## [3.0.0.preview2] - [3.0.0.preview3] ### Added -- ([#564](https://github.com/neo-project/neo-node/pull/564)) Add StackItem ToJson -- ([#575](https://github.com/neo-project/neo-node/pull/575)) Add NEP5 commands -- ([#568](https://github.com/neo-project/neo-node/pull/568)) Add vote commands -- ([#607](https://github.com/neo-project/neo-node/pull/607)) Add 'nativecontract' command - ([#608](https://github.com/neo-project/neo-node/pull/608)) Ensure json extension in wallet +- ([#607](https://github.com/neo-project/neo-node/pull/607)) Add 'nativecontract' command - ([#599](https://github.com/neo-project/neo-node/pull/599)) Add plugins description field +- ([#575](https://github.com/neo-project/neo-node/pull/575)) Add NEP5 commands +- ([#568](https://github.com/neo-project/neo-node/pull/568)) Add vote commands +- ([#564](https://github.com/neo-project/neo-node/pull/564)) Add StackItem ToJson ### Changed -- ([#567](https://github.com/neo-project/neo-node/pull/567)) Add plugins description field -- ([#536](https://github.com/neo-project/neo-node/pull/536)) Refactor node commands +- ([#634](https://github.com/neo-project/neo-node/pull/634)) Improve Show pool command +- ([#633](https://github.com/neo-project/neo-node/pull/633)) Included optional "from" in send and transfer commands +- ([#630](https://github.com/neo-project/neo-node/pull/630)) Get innerException message Recursively +- ([#626](https://github.com/neo-project/neo-node/pull/626)) Workflows: use checkout action v2 +- ([#625](https://github.com/neo-project/neo-node/pull/625)) Update protocol.json +- ([#622](https://github.com/neo-project/neo-node/pull/622)) Apply signers +- ([#621](https://github.com/neo-project/neo-node/pull/621)) Show invocation error +- ([#604](https://github.com/neo-project/neo-node/pull/604)) Add description and uninstall restriction for “SystemLog” +- ([#602](https://github.com/neo-project/neo-node/pull/602)) Remove StackItem.ToParameter() +- ([#593](https://github.com/neo-project/neo-node/pull/593)) Add fields to protocol.json - ([#585](https://github.com/neo-project/neo-node/pull/585)) Show address in list key command -- ([#582](https://github.com/neo-project/neo-node/pull/582)) Move SystemLog plugin into neo-cli as a native logger with on/off functionalities - ([#584](https://github.com/neo-project/neo-node/pull/584)) Fill default settings +- ([#582](https://github.com/neo-project/neo-node/pull/582)) Move SystemLog plugin into neo-cli as a native logger with on/off functionalities - ([#581](https://github.com/neo-project/neo-node/pull/581)) Parse vote commands' result - ([#579](https://github.com/neo-project/neo-node/pull/579)) Update cosigner - ([#578](https://github.com/neo-project/neo-node/pull/578)) Backup Wallet on change password -- ([#566](https://github.com/neo-project/neo-node/pull/566)) Show ScriptHash in `list address` - ([#577](https://github.com/neo-project/neo-node/pull/577)) Remove log logic -- ([#604](https://github.com/neo-project/neo-node/pull/604)) Add description and uninstall restriction for “SystemLog” -- ([#602](https://github.com/neo-project/neo-node/pull/602)) Remove StackItem.ToParameter() -- ([#593](https://github.com/neo-project/neo-node/pull/593)) Add fields to protocol.json -- ([#621](https://github.com/neo-project/neo-node/pull/621)) Show invocation error -- ([#622](https://github.com/neo-project/neo-node/pull/622)) Apply signers -- ([#625](https://github.com/neo-project/neo-node/pull/625)) Update protocol.json -- ([#626](https://github.com/neo-project/neo-node/pull/626)) Workflows: use checkout action v2 -- ([#630](https://github.com/neo-project/neo-node/pull/630)) Get innerException message Recursively -- ([#633](https://github.com/neo-project/neo-node/pull/633)) Included optional "from" in send and transfer commands -- ([#634](https://github.com/neo-project/neo-node/pull/634)) Improve Show pool command +- ([#567](https://github.com/neo-project/neo-node/pull/567)) Add plugins description field +- ([#566](https://github.com/neo-project/neo-node/pull/566)) Show ScriptHash in `list address` +- ([#536](https://github.com/neo-project/neo-node/pull/536)) Refactor node commands ### Fixed +- ([#613](https://github.com/neo-project/neo-node/pull/613)) Fix invoke command - ([#610](https://github.com/neo-project/neo-node/pull/610)) Fix engine.ResultStack.Pop() - ([#594](https://github.com/neo-project/neo-node/pull/594)) Fix relay tx -- ([#613](https://github.com/neo-project/neo-node/pull/613)) Fix invoke command \ No newline at end of file + +## [3.0.0.preview3] - [3.0.0.preview4] +### Added +- ([#679](https://github.com/neo-project/neo-node/pull/679)) Add services to plugin system + +### Changed +- ([#695](https://github.com/neo-project/neo-node/pull/695)) Update name nep17 +- ([#689](https://github.com/neo-project/neo-node/pull/689)) Sync to management SC +- ([#687](https://github.com/neo-project/neo-node/pull/687)) Change nep5 to nep17 +- ([#686](https://github.com/neo-project/neo-node/pull/686)) Add data +- ([#682](https://github.com/neo-project/neo-node/pull/682)) Max traceable blocks +- ([#676](https://github.com/neo-project/neo-node/pull/676)) Sync neo changes +- ([#673](https://github.com/neo-project/neo-node/pull/673)) invoke* use base64 script +- ([#654](https://github.com/neo-project/neo-node/pull/654)) Remove Get validators +- ([#643](https://github.com/neo-project/neo-node/pull/643)) Unify ApplicationEngine output +- ([#639](https://github.com/neo-project/neo-node/pull/639)) Unify encoding to be Strict UTF8 +- ([#628](https://github.com/neo-project/neo-node/pull/628)) Allow smart contract verification + +### Fixed +- ([#674](https://github.com/neo-project/neo-node/pull/674)) Fix to avoid duplicate error message +- ([#664](https://github.com/neo-project/neo-node/pull/664)) Fix invokecommand +- ([#654](https://github.com/neo-project/neo-node/pull/654)) Fix applicationengine.run +- ([#647](https://github.com/neo-project/neo-node/pull/647)) Fix script check \ No newline at end of file diff --git a/neo-cli/neo-cli.csproj b/neo-cli/neo-cli.csproj index ba64a5df1..c05ca91ea 100644 --- a/neo-cli/neo-cli.csproj +++ b/neo-cli/neo-cli.csproj @@ -3,7 +3,7 @@ 2016-2020 The Neo Project Neo.CLI - 3.0.0-preview3 + 3.0.0-preview4 The Neo Project netcoreapp3.0 neo-cli @@ -28,7 +28,7 @@ - + diff --git a/neo-gui/GUI/DeployContractDialog.cs b/neo-gui/GUI/DeployContractDialog.cs index 2d2ea774b..f7c0965bd 100644 --- a/neo-gui/GUI/DeployContractDialog.cs +++ b/neo-gui/GUI/DeployContractDialog.cs @@ -1,4 +1,5 @@ using Neo.SmartContract; +using Neo.SmartContract.Native; using Neo.VM; using System; using System.IO; @@ -18,7 +19,7 @@ public byte[] GetScript() byte[] script = textBox8.Text.HexToBytes(); string manifest = ""; using ScriptBuilder sb = new ScriptBuilder(); - sb.EmitSysCall(ApplicationEngine.System_Contract_Create, script, manifest); + sb.EmitAppCall(NativeContract.Management.Hash, "deploy", script, manifest); return sb.ToArray(); } diff --git a/neo-gui/neo-gui.csproj b/neo-gui/neo-gui.csproj index f1eded8bd..cc24cfd9d 100644 --- a/neo-gui/neo-gui.csproj +++ b/neo-gui/neo-gui.csproj @@ -3,7 +3,7 @@ 2016-2020 The Neo Project Neo.GUI - 3.0.0-preview3 + 3.0.0-preview4 The Neo Project WinExe netcoreapp3.0