From 545e8fb8b0dd15d2853c7e1bda7f68d0ffe7cfc9 Mon Sep 17 00:00:00 2001
From: Shuai <bfshm@qq.com>
Date: Fri, 19 Aug 2022 14:44:25 +0800
Subject: [PATCH] v3.4.0

---
 neo                                           |   2 +-
 neo3-gui/neo3-gui.sln                         |  10 +-
 neo3-gui/neo3-gui.tests/JsonConverter_Test.cs |  94 +++
 neo3-gui/neo3-gui/ClientApp/package-lock.json |   4 +-
 neo3-gui/neo3-gui/ClientApp/package.json      |   2 +-
 .../src/components/Advanced/advanced.js       |   2 +-
 .../src/components/Advanced/signature.js      | 168 +++---
 .../ClientApp/src/components/Chain/asset.js   |   2 +-
 .../src/components/Chain/assetdetail.js       |   2 +-
 .../Common/Analyzers/BlockAnalyzer.cs         |   4 +-
 .../neo3-gui/Common/Consoles/MainService.cs   | 567 ------------------
 .../neo3-gui/Common/Json/JObjectConverter.cs  |  18 +-
 .../Common/Json/StackItemConverter.cs         | 335 +++++++++++
 neo3-gui/neo3-gui/Common/JsonRpcMiddleware.cs |   3 +-
 .../Common/Storage/ExecuteResultInfo.cs       |  10 +-
 .../Storage/LevelDBModules/LevelDbContext.cs  |   3 +-
 .../SQLiteModules/Nep5TransferEntity.cs       |   1 +
 .../Storage/SQLiteModules/SQLiteContext.cs    |   3 +-
 .../SQLiteModules/TransactionEntity.cs        |   1 -
 neo3-gui/neo3-gui/Common/Storage/TrackDB.cs   | 267 ++++-----
 neo3-gui/neo3-gui/Common/WebSocketExecutor.cs |   2 +-
 .../neo3-gui/Common/WebSocketHubMiddleware.cs |   2 +-
 neo3-gui/neo3-gui/Helpers.cs                  | 140 +++--
 .../Contracts/InvokeContractParameterModel.cs |   7 +-
 neo3-gui/neo3-gui/Models/JStackItem.cs        |  62 +-
 .../Models/Transactions/TransactionModel.cs   |   1 -
 .../Services/ApiServices/BlockApiService.cs   |   9 +-
 .../ApiServices/ContractApiService.cs         |  53 +-
 .../Services/ApiServices/GovernanceService.cs |   3 -
 .../ApiServices/TransactionApiService.cs      |  11 +-
 .../Services/ApiServices/VerifyApiService.cs  |   1 -
 .../Services/ApiServices/WalletApiService.cs  |   8 +-
 neo3-gui/neo3-gui/config.private.json         |   2 +-
 neo3-gui/neo3-gui/neo3-gui.csproj             |   6 +-
 34 files changed, 817 insertions(+), 988 deletions(-)
 create mode 100644 neo3-gui/neo3-gui.tests/JsonConverter_Test.cs
 create mode 100644 neo3-gui/neo3-gui/Common/Json/StackItemConverter.cs

diff --git a/neo b/neo
index 7d7c5955..8df287ec 160000
--- a/neo
+++ b/neo
@@ -1 +1 @@
-Subproject commit 7d7c59554466e7ee6bdbc09f478ba4c0cbeb604f
+Subproject commit 8df287ec3b1bda1f412c2e5e15eb962ff835e231
diff --git a/neo3-gui/neo3-gui.sln b/neo3-gui/neo3-gui.sln
index 6c60d558..b09e96ff 100644
--- a/neo3-gui/neo3-gui.sln
+++ b/neo3-gui/neo3-gui.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29409.12
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32630.192
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "neo3-gui", "neo3-gui\neo3-gui.csproj", "{2B09B051-9848-4631-81A1-34A81D2E8103}"
 EndProject
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "neo", "..\neo\src\neo\neo.c
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "neo3-gui.tests", "neo3-gui.tests\neo3-gui.tests.csproj", "{2F439926-5E57-46FB-979C-43037F95ECC8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Neo.Json", "..\neo\src\Neo.Json\Neo.Json.csproj", "{88C3A94F-B476-48E3-9205-D92B6FFFFCCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{2F439926-5E57-46FB-979C-43037F95ECC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F439926-5E57-46FB-979C-43037F95ECC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F439926-5E57-46FB-979C-43037F95ECC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88C3A94F-B476-48E3-9205-D92B6FFFFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88C3A94F-B476-48E3-9205-D92B6FFFFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88C3A94F-B476-48E3-9205-D92B6FFFFCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88C3A94F-B476-48E3-9205-D92B6FFFFCCF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/neo3-gui/neo3-gui.tests/JsonConverter_Test.cs b/neo3-gui/neo3-gui.tests/JsonConverter_Test.cs
new file mode 100644
index 00000000..261d328e
--- /dev/null
+++ b/neo3-gui/neo3-gui.tests/JsonConverter_Test.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Neo;
+using Neo.SmartContract;
+using Neo.VM;
+using Neo.VM.Types;
+
+namespace neo3_gui.tests
+{
+    [TestClass]
+    public class JsonConverter_Test
+    {
+        [TestMethod]
+        public void Test()
+        {
+            var data = "1234".HexToBytes();
+            StackItem item = new ByteString(data);
+            var json = item.SerializeJson();
+            Console.WriteLine(json);
+            StackItem item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json,item2.SerializeJson());
+
+            item = new Neo.VM.Types.Buffer(data);
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            item = new Integer(20);
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            item = true;
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            item = new Pointer(data, 1);
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            item = StackItem.Null;
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            var list = new List<StackItem>()
+            {
+                1, 2, true, false, data,StackItem.Null
+            };
+            item = new Neo.VM.Types.Array(list);
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            item = new Neo.VM.Types.Struct(list);
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+
+            var map = new Neo.VM.Types.Map();
+            map[1] = true;
+            map[2] = false;
+            map["a"] = "A";
+            map["b"] = StackItem.Null;
+
+            item=map;
+            json = item.SerializeJson();
+            Console.WriteLine(json);
+            item2 = json.DeserializeJson<StackItem>();
+            Assert.AreEqual(json, item2.SerializeJson());
+
+        }
+    }
+}
diff --git a/neo3-gui/neo3-gui/ClientApp/package-lock.json b/neo3-gui/neo3-gui/ClientApp/package-lock.json
index 3166736d..18686856 100644
--- a/neo3-gui/neo3-gui/ClientApp/package-lock.json
+++ b/neo3-gui/neo3-gui/ClientApp/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "neo-gui",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "neo-gui",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "dependencies": {
                 "@testing-library/jest-dom": "^4.2.4",
                 "@testing-library/react": "^9.3.2",
diff --git a/neo3-gui/neo3-gui/ClientApp/package.json b/neo3-gui/neo3-gui/ClientApp/package.json
index fc3dd351..39701365 100644
--- a/neo3-gui/neo3-gui/ClientApp/package.json
+++ b/neo3-gui/neo3-gui/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "neo-gui",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "private": true,
     "main": "main.js",
     "homepage": "./",
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/advanced.js b/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/advanced.js
index 8f1e2012..a3d0c950 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/advanced.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/advanced.js
@@ -60,7 +60,7 @@ class Advanced extends React.Component {
                 <Col span={6}>
                   <a
                     className="ml3"
-                    onClick={this.openUrl("https://neowish.ngd.network/neo3/")}
+                    onClick={this.openUrl("https://n3t5wish.ngd.network/")}
                   >
                     <PaperClipOutlined /> {t("advanced.test coin")}
                   </a>
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/signature.js b/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/signature.js
index bc0e3a78..a78e8e27 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/signature.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Advanced/signature.js
@@ -1,14 +1,10 @@
 /* eslint-disable */
-import React, { useState, useEffect, useRef,useContext } from 'react';
+import React from 'react';
 import 'antd/dist/antd.css';
-import axios from 'axios';
 import { Form, Input, Button } from 'antd';
-import { Layout, Row, Col, Tabs, message, PageHeader,Modal } from 'antd';
-import { walletStore } from "../../store/stores";
-import { withRouter } from "react-router-dom";
+import { Layout, Row, Col, Tabs, message, PageHeader, Modal } from 'antd';
 import Sync from '../sync';
 import "../../static/css/advanced.css";
-import { SwapOutlined, PaperClipOutlined } from '@ant-design/icons';
 import { withTranslation, useTranslation } from "react-i18next";
 import { Trans } from 'react-i18next';
 import { post } from "../../core/request";
@@ -30,14 +26,14 @@ function success(data) {
         <div className="show-pri">
             <p><Trans>blockchain.transaction hash</Trans>: </p>
             <p>{data.result}</p>
-        </div> 
+        </div>
     );
     if (method === 'AppendSignature') {
         title = (<Trans>advanced.signature success</Trans>)
         content = (
             <div className="show-pri">
                 <pre style={{ overflow: 'hidden', overflowX: 'auto', overflowY: 'scroll', maxHeight: '60vh', width: 'auto' }}>
-                    <code>{ JSON.stringify(JSON.parse(result), null, 2) }</code>
+                    <code>{JSON.stringify(JSON.parse(result), null, 2)}</code>
                 </pre>
                 <p>
                     <Button type="link" style={{ margin: 0, color: '#00B594' }} onClick={() => clickToCopy(result)}>
@@ -46,13 +42,13 @@ function success(data) {
                 </p>
             </div>
         );
-    } 
+    }
     Modal.success({
         width: 650,
         centered: true,
         title: title,
         content: content,
-        okText:<Trans>button.ok</Trans>
+        okText: <Trans>button.ok</Trans>
     });
 }
 
@@ -66,11 +62,11 @@ function error(data) {
     );
 
     if (data.error.code === 20014) {
-        title = (<Trans>wallet.transfer send error 20014</Trans>); 
+        title = (<Trans>wallet.transfer send error 20014</Trans>);
         content = (
             <div className="show-pri">
                 <pre style={{ overflow: 'hidden', overflowX: 'auto', overflowY: 'scroll', maxHeight: '60vh', width: 'auto' }}>
-                    <code>{ JSON.stringify(JSON.parse(data.error.message), null, 2) }</code>
+                    <code>{JSON.stringify(JSON.parse(data.error.message), null, 2)}</code>
                 </pre>
                 <p>
                     <Button type="link" style={{ margin: 0, color: '#00B594' }} onClick={() => clickToCopy(data.error.message)}>
@@ -96,7 +92,7 @@ function error(data) {
 
 @withTranslation()
 class Advancedsignature extends React.Component {
-    constructor(props){
+    constructor(props) {
         super(props);
         this.state = {
             visible: false,
@@ -104,32 +100,32 @@ class Advancedsignature extends React.Component {
         };
     }
     onSign = values => {
-        let params = {signContext:values.sign};
+        let params = { signContext: values.sign };
         var _this = this;
-        post("AppendSignature",params).then(res =>{
+        post("AppendSignature", params).then(res => {
             var _data = res.data;
-            if(_data.msgType === -1){
+            if (_data.msgType === -1) {
                 error(_data);
                 // changeBroad(values.sign)
                 // _this.refs.broadform.setFieldsValue({
                 //     broadcast:values.sign
                 // });
-            }else if(_data.msgType === 3){
+            } else if (_data.msgType === 3) {
                 success(_data);
                 // changeBroad(_data.result)
                 _this.refs.broadform.setFieldsValue({
-                    broadcast:_data.result
+                    broadcast: _data.result
                 });
             }
         })
     };
-    onBroad = values =>{
-        let params = {signContext:values.broadcast};
-        post("BroadcastTransaction",params).then(res =>{
+    onBroad = values => {
+        let params = { signContext: values.broadcast };
+        post("BroadcastTransaction", params).then(res => {
             var _data = res.data;
-            if(_data.msgType === -1){
+            if (_data.msgType === -1) {
                 error(_data);
-            }else if(_data.msgType === 3){
+            } else if (_data.msgType === 3) {
                 success(_data);
             }
         })
@@ -138,76 +134,76 @@ class Advancedsignature extends React.Component {
         const { t } = this.props;
         return (
             <Layout className="gui-container">
-            <Sync />
-            <Content className="mt3">
-              <Row gutter={[30, 0]} className="mb1" style={{ 'minHeight': 'calc( 100vh - 150px )' }}>
-                <Col span={24} className="bg-white pv4">
-                  <Tabs className="tran-title" defaultActiveKey="1">
-                    {/* <TabPane tab={t("advanced.signature text")} key="1">
+                <Sync />
+                <Content className="mt3">
+                    <Row gutter={[30, 0]} className="mb1" style={{ 'minHeight': 'calc( 100vh - 150px )' }}>
+                        <Col span={24} className="bg-white pv4">
+                            <Tabs className="tran-title" defaultActiveKey="1">
+                                {/* <TabPane tab={t("advanced.signature text")} key="1">
                       <div>文本签名</div>
                     </TabPane> */}
-                    <TabPane tab={t("advanced.signature trans")} key="2">
-                        <div>
-                        <Form
-                            name="form"
-                            onFinish={this.onSign}
-                        >
-                            <h4>{t("advanced.trans")} Json</h4>
-                            <Form.Item
-                                name="sign"
-                                rules={[
-                                    {
-                                    required: true,
-                                    message: 'Please input your json!',
-                                    },
-                                ]}
-                            >
-                                <TextArea />
-                            </Form.Item>
-                            <Form.Item>
-                                <Button type="primary" htmlType="submit">
-                                    {t('advanced.signature')}
-                                </Button>
-                            </Form.Item>
-                        </Form>
-                        <Form
-                            name="form"
-                            onFinish={this.onBroad}
-                            ref="broadform"
-                        >
-                            <h4>{t('advanced.signature result')}</h4>
-                            <Form.Item
-                                name="broadcast"
-                                rules={[
-                                    {
-                                    required: true,
-                                    message: 'Please input your json!',
-                                    },
-                                ]}
-                            >
-                                <TextArea/>
-                            </Form.Item>
-                    
-                            <Form.Item>
-                                <Button type="primary" htmlType="submit">
-                                    {t('advanced.broadcast')}
-                                </Button>
-                            </Form.Item>
-                        </Form>
-                        </div>
-                    </TabPane>
-                    {/* <TabPane tab={t("advanced.signature verify")} key="3">
+                                <TabPane tab={t("advanced.signature trans")} key="2">
+                                    <div>
+                                        <Form
+                                            name="form"
+                                            onFinish={this.onSign}
+                                        >
+                                            <h4>{t("advanced.trans")} Json</h4>
+                                            <Form.Item
+                                                name="sign"
+                                                rules={[
+                                                    {
+                                                        required: true,
+                                                        message: 'Please input your json!',
+                                                    },
+                                                ]}
+                                            >
+                                                <TextArea />
+                                            </Form.Item>
+                                            <Form.Item>
+                                                <Button type="primary" htmlType="submit">
+                                                    {t('advanced.signature')}
+                                                </Button>
+                                            </Form.Item>
+                                        </Form>
+                                        <Form
+                                            name="form"
+                                            onFinish={this.onBroad}
+                                            ref="broadform"
+                                        >
+                                            <h4>{t('advanced.signature result')}</h4>
+                                            <Form.Item
+                                                name="broadcast"
+                                                rules={[
+                                                    {
+                                                        required: true,
+                                                        message: 'Please input your json!',
+                                                    },
+                                                ]}
+                                            >
+                                                <TextArea />
+                                            </Form.Item>
+
+                                            <Form.Item>
+                                                <Button type="primary" htmlType="submit">
+                                                    {t('advanced.broadcast')}
+                                                </Button>
+                                            </Form.Item>
+                                        </Form>
+                                    </div>
+                                </TabPane>
+                                {/* <TabPane tab={t("advanced.signature verify")} key="3">
                       <div>验证签名</div>
                     </TabPane> */}
-                  </Tabs>
-                </Col>
-              </Row>
-            </Content>
-          </Layout>
+                            </Tabs>
+                        </Col>
+                    </Row>
+                </Content>
+            </Layout>
         );
     }
 }
-    
+
 
 // export { Advancedsignature }
 export default Advancedsignature;
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Chain/asset.js b/neo3-gui/neo3-gui/ClientApp/src/components/Chain/asset.js
index 1d0821f7..624eca55 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Chain/asset.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Chain/asset.js
@@ -30,7 +30,7 @@ export default function ChainAsset() {
     }).catch(function (error) {
       console.log(error);
     });
-  });
+  }, []);
   return (
     <Layout className="gui-container">
       <Sync />
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Chain/assetdetail.js b/neo3-gui/neo3-gui/ClientApp/src/components/Chain/assetdetail.js
index cc275ee9..59dccd8a 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Chain/assetdetail.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Chain/assetdetail.js
@@ -26,7 +26,7 @@ export default function AssetDetail() {
     }).catch(function (error) {
       console.log(error);
     });
-  });
+  }, []);
   return (
     <Layout className="gui-container">
       <Sync />
diff --git a/neo3-gui/neo3-gui/Common/Analyzers/BlockAnalyzer.cs b/neo3-gui/neo3-gui/Common/Analyzers/BlockAnalyzer.cs
index bcd22456..b649aebb 100644
--- a/neo3-gui/neo3-gui/Common/Analyzers/BlockAnalyzer.cs
+++ b/neo3-gui/neo3-gui/Common/Analyzers/BlockAnalyzer.cs
@@ -90,11 +90,11 @@ private void AnalysisAppExecuteResult(Blockchain.ApplicationExecuted appExec)
             execResult.GasConsumed = appExec.GasConsumed;
             try
             {
-                execResult.ResultStack = appExec.Stack.Select(q => q.ToJObject()).ToArray();
+                execResult.ResultStack = appExec.Stack;
             }
             catch (InvalidOperationException)
             {
-                execResult.ResultStack = "error: recursive reference";
+                //execResult.ResultStack = "error: recursive reference";
             }
 
             execResult.Notifications = appExec.Notifications.Select(n => n.ToNotificationInfo()).ToList();
diff --git a/neo3-gui/neo3-gui/Common/Consoles/MainService.cs b/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
index f129beae..b111df8f 100644
--- a/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
+++ b/neo3-gui/neo3-gui/Common/Consoles/MainService.cs
@@ -1,7 +1,6 @@
 using Akka.Actor;
 using Microsoft.Extensions.Configuration;
 using Neo.IO;
-using Neo.IO.Json;
 using Neo.Ledger;
 using Neo.Network.P2P;
 using Neo.Network.P2P.Capabilities;
@@ -133,35 +132,6 @@ public void Stop()
 
 
 
-        public void CreateWallet(string path, string password)
-        {
-            switch (Path.GetExtension(path))
-            {
-                case ".db3":
-                    {
-                        UserWallet wallet = UserWallet.Create(path, password, CliSettings.Default.Protocol);
-                        WalletAccount account = wallet.CreateAccount();
-                        Console.WriteLine($"address: {account.Address}");
-                        Console.WriteLine($" pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
-                        CurrentWallet = wallet;
-                    }
-                    break;
-                case ".json":
-                    {
-                        NEP6Wallet wallet = new NEP6Wallet(path, password, CliSettings.Default.Protocol);
-                        WalletAccount account = wallet.CreateAccount();
-                        wallet.Save();
-                        Console.WriteLine($"address: {account.Address}");
-                        Console.WriteLine($" pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
-                        CurrentWallet = wallet;
-                    }
-                    break;
-                default:
-                    Console.WriteLine("Wallet files in that format are not supported, please use a .json or .db3 file extension.");
-                    break;
-            }
-        }
-
         private IEnumerable<Block> GetBlocks(Stream stream, bool read_start = false)
         {
             using BinaryReader r = new BinaryReader(stream);
@@ -237,20 +207,10 @@ protected override bool OnCommand(string[] args)
             if (Plugin.SendMessage(args)) return true;
             switch (args[0].ToLower())
             {
-                case "sign":
-                    return OnSignCommand(args);
-                case "change":
-                    return OnChangeCommand(args);
-                case "create":
-                    return OnCreateCommand(args);
                 case "export":
                     return OnExportCommand(args);
-                case "help":
-                    return OnHelpCommand(args);
                 case "plugins":
                     return OnPluginsCommand(args);
-                case "import":
-                    return OnImportCommand(args);
                 case "list":
                     return OnListCommand(args);
                 case "open":
@@ -261,251 +221,12 @@ protected override bool OnCommand(string[] args)
                     return OnSendCommand(args);
                 case "show":
                     return OnShowCommand(args);
-                case "start":
-                    return OnStartCommand(args);
-                case "upgrade":
-                    return OnUpgradeCommand(args);
-
-                case "invoke":
-                    return OnInvokeCommand(args);
-                case "install":
-                    return OnInstallCommand(args);
-                case "uninstall":
-                    return OnUnInstallCommand(args);
                 default:
                     return base.OnCommand(args);
             }
         }
 
 
-
-        private bool OnInvokeCommand(string[] args)
-        {
-            var scriptHash = UInt160.Parse(args[1]);
-
-            List<ContractParameter> contractParameters = new List<ContractParameter>();
-            for (int i = 3; i < args.Length; i++)
-            {
-                contractParameters.Add(new ContractParameter()
-                {
-                    // TODO: support contract params of type other than string.
-                    Type = ContractParameterType.String,
-                    Value = args[i]
-                });
-            }
-
-            Transaction tx = new Transaction
-            {
-                Signers = new Signer[] { new Signer() { Account = UInt160.Zero } },
-                Attributes = new TransactionAttribute[0],
-                Witnesses = new Witness[0]
-            };
-
-            using (ScriptBuilder scriptBuilder = new ScriptBuilder())
-            {
-                scriptBuilder.EmitDynamicCall(scriptHash, args[2], contractParameters.ToArray());
-                tx.Script = scriptBuilder.ToArray();
-                Console.WriteLine($"Invoking script with: '{tx.Script.ToArray().ToHexString()}'");
-            }
-
-            using (ApplicationEngine engine = tx.Script.RunTestMode(null, tx))
-            {
-                Console.WriteLine($"VM State: {engine.State}");
-                Console.WriteLine($"Gas Consumed: {engine.GasConsumed}");
-                Console.WriteLine($"Evaluation Stack: {new JArray(engine.ResultStack.Select(p => p.ToJObject()))}");
-                Console.WriteLine();
-                if (engine.State.HasFlag(VMState.FAULT))
-                {
-                    Console.WriteLine("Engine faulted.");
-                    return true;
-                }
-            }
-
-            if (NoWallet()) return true;
-            try
-            {
-                tx = CurrentWallet.MakeTransaction(NeoSystem.StoreView, tx.Script);
-            }
-            catch (InvalidOperationException)
-            {
-                Console.WriteLine("Error: insufficient balance.");
-                return true;
-            }
-            if (!ReadUserInput("relay tx(no|yes)").IsYes())
-            {
-                return true;
-            }
-            return SignAndSendTx(tx);
-        }
-
-
-        private bool SignAndSendTx(Transaction tx)
-        {
-            ContractParametersContext context;
-            try
-            {
-                context = new ContractParametersContext(NeoSystem.StoreView, tx, CliSettings.Default.Protocol.Network);
-            }
-            catch (InvalidOperationException ex)
-            {
-                Console.WriteLine($"Error creating contract params: {ex}");
-                throw;
-            }
-            CurrentWallet.Sign(context);
-            string msg;
-            if (context.Completed)
-            {
-                tx.Witnesses = context.GetWitnesses();
-
-                NeoSystem.Blockchain.Tell(tx);
-                //NeoSystem.LocalNode.Tell(new LocalNode.Relay { Inventory = tx });
-
-                msg = $"Signed and relayed transaction with hash={tx.Hash}";
-                Console.WriteLine(msg);
-                return true;
-            }
-
-            msg = $"Failed sending transaction with hash={tx.Hash}";
-            Console.WriteLine(msg);
-            return true;
-        }
-
-
-
-        private bool OnSignCommand(string[] args)
-        {
-            if (NoWallet()) return true;
-
-            if (args.Length < 2)
-            {
-                Console.WriteLine("You must input JSON object pending signature data.");
-                return true;
-            }
-            var jsonObjectToSign = string.Join(string.Empty, args.Skip(1));
-            if (string.IsNullOrWhiteSpace(jsonObjectToSign))
-            {
-                Console.WriteLine("You must input JSON object pending signature data.");
-                return true;
-            }
-            try
-            {
-                ContractParametersContext context = ContractParametersContext.Parse(jsonObjectToSign, NeoSystem.StoreView);
-                if (!CurrentWallet.Sign(context))
-                {
-                    Console.WriteLine("The private key that can sign the data is not found.");
-                    return true;
-                }
-                Console.WriteLine($"Signed Output:{Environment.NewLine}{context}");
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine($"One or more errors occurred:{Environment.NewLine}{e.Message}");
-            }
-            return true;
-        }
-
-        private bool OnChangeCommand(string[] args)
-        {
-            switch (args[1].ToLower())
-            {
-                case "view":
-                    return OnChangeViewCommand(args);
-                default:
-                    return base.OnCommand(args);
-            }
-        }
-
-        private bool OnChangeViewCommand(string[] args)
-        {
-            if (args.Length != 3) return false;
-            if (!byte.TryParse(args[2], out byte viewnumber)) return false;
-            return true;
-        }
-
-        private bool OnCreateCommand(string[] args)
-        {
-            switch (args[1].ToLower())
-            {
-                case "address":
-                    return OnCreateAddressCommand(args);
-                case "wallet":
-                    return OnCreateWalletCommand(args);
-                default:
-                    return base.OnCommand(args);
-            }
-        }
-
-        private bool OnCreateAddressCommand(string[] args)
-        {
-            if (NoWallet()) return true;
-            if (args.Length > 3)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-
-            string path = "address.txt";
-            if (File.Exists(path))
-            {
-                if (!ReadUserInput($"The file '{path}' already exists, do you want to overwrite it? (yes|no)", false).IsYes())
-                {
-                    return true;
-                }
-            }
-
-            ushort count;
-            if (args.Length >= 3)
-                count = ushort.Parse(args[2]);
-            else
-                count = 1;
-
-            List<string> addresses = new List<string>();
-            using (var percent = new ConsolePercent(0, count))
-            {
-                Parallel.For(0, count, (i) =>
-                {
-                    WalletAccount account = CurrentWallet.CreateAccount();
-                    addresses.Add(account.Address);
-                    lock (addresses)
-                    {
-                        addresses.Add(account.Address);
-                        percent.Value++;
-                    }
-                });
-            }
-
-            if (CurrentWallet is NEP6Wallet wallet)
-                wallet.Save();
-
-            Console.WriteLine($"export addresses to {path}");
-            File.WriteAllLines(path, addresses);
-            return true;
-        }
-
-        private bool OnCreateWalletCommand(string[] args)
-        {
-            if (args.Length < 3)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-            string path = args[2];
-            string password = ReadUserInput("password", true);
-            if (password.Length == 0)
-            {
-                Console.WriteLine("cancelled");
-                return true;
-            }
-            string password2 = ReadUserInput("password", true);
-            if (password != password2)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-            CreateWallet(path, password);
-            return true;
-        }
-
         private bool OnExportCommand(string[] args)
         {
             switch (args[1].ToLower())
@@ -543,8 +264,6 @@ private bool OnExportBlocksCommand(string[] args)
             return true;
         }
 
-
-
         private bool OnExportKeyCommand(string[] args)
         {
             if (NoWallet()) return true;
@@ -600,45 +319,6 @@ private bool OnExportKeyCommand(string[] args)
             return true;
         }
 
-        private bool OnHelpCommand(string[] args)
-        {
-            Console.WriteLine("Normal Commands:");
-            Console.WriteLine("\tversion");
-            Console.WriteLine("\thelp [plugin-name]");
-            Console.WriteLine("\tclear");
-            Console.WriteLine("\texit");
-            Console.WriteLine("Wallet Commands:");
-            Console.WriteLine("\tcreate wallet <path>");
-            Console.WriteLine("\topen wallet <path>");
-            Console.WriteLine("\tclose wallet");
-            Console.WriteLine("\tupgrade wallet <path>");
-            Console.WriteLine("\tlist address");
-            Console.WriteLine("\tlist asset");
-            Console.WriteLine("\tlist key");
-            Console.WriteLine("\tshow gas");
-            Console.WriteLine("\tcreate address [n=1]");
-            Console.WriteLine("\timport key <wif|path>");
-            Console.WriteLine("\texport key [address] [path]");
-            Console.WriteLine("\timport multisigaddress m pubkeys...");
-            Console.WriteLine("\tsend <id|alias> <address> <value>");
-            Console.WriteLine("\tsign <jsonObjectToSign>");
-            Console.WriteLine("Contract Commands:");
-            Console.WriteLine("\tdeploy <nefFilePath> [manifestFile]");
-            Console.WriteLine("\tinvoke <scripthash> <command> [optionally quoted params separated by space]");
-            Console.WriteLine("Node Commands:");
-            Console.WriteLine("\tshow state");
-            Console.WriteLine("\tshow pool [verbose]");
-            Console.WriteLine("\trelay <jsonObjectToSign>");
-            Console.WriteLine("Plugin Commands:");
-            Console.WriteLine("\tplugins");
-            Console.WriteLine("\tinstall <pluginName>");
-            Console.WriteLine("\tuninstall <pluginName>");
-            Console.WriteLine("Advanced Commands:");
-            Console.WriteLine("\texport blocks <index>");
-            Console.WriteLine("\tstart consensus");
-            return true;
-        }
-
         private bool OnPluginsCommand(string[] args)
         {
             if (Plugin.Plugins.Count > 0)
@@ -653,110 +333,6 @@ private bool OnPluginsCommand(string[] args)
             return true;
         }
 
-        private bool OnImportCommand(string[] args)
-        {
-            switch (args[1].ToLower())
-            {
-                case "key":
-                    return OnImportKeyCommand(args);
-                case "multisigaddress":
-                    return OnImportMultisigAddress(args);
-                default:
-                    return base.OnCommand(args);
-            }
-        }
-
-        private bool OnImportMultisigAddress(string[] args)
-        {
-            if (NoWallet()) return true;
-
-            if (args.Length < 4)
-            {
-                Console.WriteLine("Error. Invalid parameters.");
-                return true;
-            }
-
-            int m = int.Parse(args[2]);
-            int n = args.Length - 3;
-
-            if (m < 1 || m > n || n > 1024)
-            {
-                Console.WriteLine("Error. Invalid parameters.");
-                return true;
-            }
-
-            ECPoint[] publicKeys = args.Skip(3).Select(p => ECPoint.Parse(p, ECCurve.Secp256r1)).ToArray();
-
-            Contract multiSignContract = Contract.CreateMultiSigContract(m, publicKeys);
-            KeyPair keyPair = CurrentWallet.GetAccounts().FirstOrDefault(p => p.HasKey && publicKeys.Contains(p.GetKey().PublicKey))?.GetKey();
-
-            WalletAccount account = CurrentWallet.CreateAccount(multiSignContract, keyPair);
-            if (CurrentWallet is NEP6Wallet wallet)
-                wallet.Save();
-
-            Console.WriteLine("Multisig. Addr.: " + multiSignContract.ScriptHash.ToAddress());
-
-            return true;
-        }
-
-        private bool OnImportKeyCommand(string[] args)
-        {
-            if (args.Length > 3)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-            byte[] prikey = null;
-            try
-            {
-                prikey = Wallet.GetPrivateKeyFromWIF(args[2]);
-            }
-            catch (FormatException) { }
-            if (prikey == null)
-            {
-                var file = new FileInfo(args[2]);
-
-                if (!file.Exists)
-                {
-                    Console.WriteLine($"Error: File '{file.FullName}' doesn't exists");
-                    return true;
-                }
-
-                if (file.Length > 1024 * 1024)
-                {
-                    if (!ReadUserInput($"The file '{file.FullName}' is too big, do you want to continue? (yes|no)", false).IsYes())
-                    {
-                        return true;
-                    }
-                }
-
-                string[] lines = File.ReadAllLines(args[2]).Where(u => !string.IsNullOrEmpty(u)).ToArray();
-                using (var percent = new ConsolePercent(0, lines.Length))
-                {
-                    for (int i = 0; i < lines.Length; i++)
-                    {
-                        if (lines[i].Length == 64)
-                            prikey = lines[i].HexToBytes();
-                        else
-                            prikey = Wallet.GetPrivateKeyFromWIF(lines[i]);
-                        CurrentWallet.CreateAccount(prikey);
-                        Array.Clear(prikey, 0, prikey.Length);
-                        percent.Value++;
-                    }
-                }
-            }
-            else
-            {
-                WalletAccount account = CurrentWallet.CreateAccount(prikey);
-                Array.Clear(prikey, 0, prikey.Length);
-                Console.WriteLine($"address: {account.Address}");
-                Console.WriteLine($" pubkey: {account.GetKey().PublicKey.EncodePoint(true).ToHexString()}");
-            }
-            if (CurrentWallet is NEP6Wallet wallet)
-                wallet.Save();
-            return true;
-        }
-
         private bool OnListCommand(string[] args)
         {
             switch (args[1].ToLower())
@@ -1097,155 +673,12 @@ private bool OnShowStateCommand(string[] args)
         }
 
 
-        private bool OnStartCommand(string[] args)
-        {
-            switch (args[1].ToLower())
-            {
-
-                default:
-                    return base.OnCommand(args);
-            }
-        }
-
-
-
         protected internal override void OnStop()
         {
             base.OnStop();
             Stop();
         }
 
-        private bool OnUpgradeCommand(string[] args)
-        {
-            switch (args[1].ToLower())
-            {
-                case "wallet":
-                    return OnUpgradeWalletCommand(args);
-                default:
-                    return base.OnCommand(args);
-            }
-        }
-
-        private bool OnInstallCommand(string[] args)
-        {
-            if (args.Length < 2)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-
-            bool isTemp;
-            string fileName;
-            var pluginName = args[1];
-
-            if (!File.Exists(pluginName))
-            {
-                if (string.IsNullOrEmpty(CliSettings.Default.PluginURL))
-                {
-                    Console.WriteLine("You must define `PluginURL` in your `config.json`");
-                    return true;
-                }
-
-                var address = string.Format(CliSettings.Default.PluginURL, pluginName, typeof(Plugin).Assembly.GetVersion());
-                fileName = Path.Combine(Path.GetTempPath(), $"{pluginName}.zip");
-                isTemp = true;
-
-                Console.WriteLine($"Downloading from {address}");
-                using (WebClient wc = new WebClient())
-                {
-                    wc.DownloadFile(address, fileName);
-                }
-            }
-            else
-            {
-                fileName = pluginName;
-                isTemp = false;
-            }
-
-            try
-            {
-                ZipFile.ExtractToDirectory(fileName, ".");
-            }
-            catch (IOException)
-            {
-                Console.WriteLine($"Plugin already exist.");
-                return true;
-            }
-            finally
-            {
-                if (isTemp)
-                {
-                    File.Delete(fileName);
-                }
-            }
-
-            Console.WriteLine($"Install successful, please restart neo-cli.");
-            return true;
-        }
-
-        private bool OnUnInstallCommand(string[] args)
-        {
-            if (args.Length < 2)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-
-            var pluginName = args[1];
-            var plugin = Plugin.Plugins.FirstOrDefault(p => p.Name == pluginName);
-            if (plugin is null)
-            {
-                Console.WriteLine("Plugin not found");
-                return true;
-            }
-
-            File.Delete(plugin.Path);
-            File.Delete(plugin.ConfigFile);
-            try
-            {
-                Directory.Delete(Path.GetDirectoryName(plugin.ConfigFile), false);
-            }
-            catch (IOException)
-            {
-            }
-            Console.WriteLine($"Uninstall successful, please restart neo-cli.");
-            return true;
-        }
-
-        private bool OnUpgradeWalletCommand(string[] args)
-        {
-            if (args.Length < 3)
-            {
-                Console.WriteLine("error");
-                return true;
-            }
-            string path = args[2];
-            if (Path.GetExtension(path) != ".db3")
-            {
-                Console.WriteLine("Can't upgrade the wallet file.");
-                return true;
-            }
-            if (!File.Exists(path))
-            {
-                Console.WriteLine("File does not exist.");
-                return true;
-            }
-            string password = ReadUserInput("password", true);
-            if (password.Length == 0)
-            {
-                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;
-            }
-            NEP6Wallet.Migrate(path_new, path, password, CliSettings.Default.Protocol).Save();
-            Console.WriteLine($"Wallet file upgrade complete. New wallet file has been auto-saved at: {path_new}");
-            return true;
-        }
 
         public void OpenWallet(string path, string password)
         {
diff --git a/neo3-gui/neo3-gui/Common/Json/JObjectConverter.cs b/neo3-gui/neo3-gui/Common/Json/JObjectConverter.cs
index d5ed72b4..66f42b09 100644
--- a/neo3-gui/neo3-gui/Common/Json/JObjectConverter.cs
+++ b/neo3-gui/neo3-gui/Common/Json/JObjectConverter.cs
@@ -6,14 +6,20 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Neo.IO.Json;
+using Neo.Json;
 
 namespace Neo.Common.Json
 {
-    public class JObjectConverter : JsonConverter<JObject>
+    public class JObjectConverter : JsonConverter<JToken>
     {
         public const int MaxJsonLength = 10 * 1024 * 1024;
-        public override JObject Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeof(JToken).IsAssignableFrom(typeToConvert);
+        }
+
+        public override JToken Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             var text = document.RootElement.Clone().ToString();
@@ -21,10 +27,10 @@ public override JObject Read(ref Utf8JsonReader reader, Type typeToConvert, Json
             {
                 return (JString)text;
             }
-            return JObject.Parse(text);
+            return JToken.Parse(text);
         }
 
-        public override void Write(Utf8JsonWriter writer, JObject value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, JToken value, JsonSerializerOptions options)
         {
             switch (value)
             {
@@ -47,7 +53,7 @@ public override void Write(Utf8JsonWriter writer, JObject value, JsonSerializerO
                     break;
                 case JObject obj:
                     writer.WriteStartObject();
-                    foreach (KeyValuePair<string, JObject> pair in value.Properties)
+                    foreach (KeyValuePair<string, JToken> pair in obj.Properties)
                     {
                         writer.WritePropertyName(pair.Key);
                         if (pair.Value is null)
diff --git a/neo3-gui/neo3-gui/Common/Json/StackItemConverter.cs b/neo3-gui/neo3-gui/Common/Json/StackItemConverter.cs
new file mode 100644
index 00000000..fdecc5e8
--- /dev/null
+++ b/neo3-gui/neo3-gui/Common/Json/StackItemConverter.cs
@@ -0,0 +1,335 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using Neo.VM.Types;
+using Org.BouncyCastle.Asn1.X509.Qualified;
+using Array = Neo.VM.Types.Array;
+using Boolean = Neo.VM.Types.Boolean;
+using Buffer = Neo.VM.Types.Buffer;
+
+namespace Neo.Common.Json
+{
+    public class StackItemConverter : JsonConverter<StackItem>
+    {
+        public const int MaxJsonLength = 10 * 1024 * 1024;
+
+        private const string JsonNameType = "t";
+        private const string JsonNameValue = "v";
+
+        public override StackItem Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            var currentElement = document.RootElement;
+            return ReadToStackItem(currentElement);
+
+        }
+
+        public override void Write(Utf8JsonWriter writer, StackItem value, JsonSerializerOptions options)
+        {
+            WriteToJson(value, writer);
+        }
+
+        public override bool CanConvert(Type typeToConvert)
+        {
+            return typeof(StackItem).IsAssignableFrom(typeToConvert);
+        }
+
+        public StackItem ReadToStackItem(JsonElement currentElement)
+        {
+            if (currentElement.TryGetProperty(JsonNameType, out var type))
+            {
+                var hasValue = currentElement.TryGetProperty(JsonNameValue, out var value);
+                switch (type.GetInt32())
+                {
+                    case (int)StackItemType.ByteString:
+                        return new ByteString(value.GetBytesFromBase64());
+                    case (int)StackItemType.Buffer:
+                        return new Buffer(value.GetBytesFromBase64());
+                    case (int)StackItemType.Boolean:
+                        return value.GetBoolean();
+                    case (int)StackItemType.Integer:
+                        return BigInteger.Parse(value.GetString()!);
+                    case (int)StackItemType.Pointer:
+                        return new Pointer(null, value.GetInt32());
+                    case (int)StackItemType.Any:
+                        return hasValue ? new ByteString(value.GetBytesFromBase64()) : StackItem.Null;
+                    case (int)StackItemType.Array:
+                        var array = new Array();
+                        foreach (var jsonElement in value.EnumerateArray())
+                        {
+                            array.Add(ReadToStackItem(jsonElement));
+                        }
+                        return array;
+                    case (int)StackItemType.Struct:
+                        var structs = new Struct();
+                        foreach (var jsonElement in value.EnumerateArray())
+                        {
+                            structs.Add(ReadToStackItem(jsonElement));
+                        }
+                        return structs;
+
+                    case (int)StackItemType.Map:
+                        var map = new Map();
+                        foreach (var jsonElement in value.EnumerateArray())
+                        {
+                            var key = jsonElement.GetProperty("key");
+                            var val = jsonElement.GetProperty("val");
+                            map[(PrimitiveType)ReadToStackItem(key)] = ReadToStackItem(val);
+                        }
+                        return map;
+                }
+            }
+            throw new Exception($"Unknown Json {currentElement}");
+        }
+        
+        public void WriteToJson(StackItem value, Utf8JsonWriter writer)
+        {
+            switch (value)
+            {
+                case ByteString:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteBase64String(JsonNameValue, value.GetSpan());
+                    writer.WriteEndObject();
+                    break;
+                case Buffer:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteBase64String(JsonNameValue, value.GetSpan());
+                    writer.WriteEndObject();
+                    break;
+                case Boolean:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteBoolean(JsonNameValue, value.GetBoolean());
+                    writer.WriteEndObject();
+                    break;
+                case Integer:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteString(JsonNameValue, value.GetInteger().ToString());
+                    writer.WriteEndObject();
+                    break;
+                case Pointer point:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteNumber(JsonNameValue, point.Position);
+                    writer.WriteEndObject();
+                    break;
+                case Struct structs:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WritePropertyName(JsonNameValue);
+                    writer.WriteStartArray();
+                    foreach (var item in structs)
+                    {
+                        WriteToJson(item, writer);
+                    }
+                    writer.WriteEndArray();
+                    writer.WriteEndObject();
+                    break;
+                case Array array:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WritePropertyName(JsonNameValue);
+                    writer.WriteStartArray();
+                    foreach (var item in array)
+                    {
+                        WriteToJson(item, writer);
+                    }
+                    writer.WriteEndArray();
+                    writer.WriteEndObject();
+                    break;
+                case Map map:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WritePropertyName(JsonNameValue);
+                    writer.WriteStartArray();
+                    foreach (var item in map)
+                    {
+                        writer.WriteStartObject();
+                        writer.WritePropertyName("key");
+                        WriteToJson(item.Key, writer);
+                        writer.WritePropertyName("val");
+                        WriteToJson(item.Value, writer);
+                        writer.WriteEndObject();
+
+                    }
+                    writer.WriteEndArray();
+                    writer.WriteEndObject();
+                    break;
+                case InteropInterface op:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteEndObject();
+                    break;
+                case Null:
+                    writer.WriteStartObject();
+                    writer.WriteNumber(JsonNameType, (int)value.Type);
+                    writer.WriteEndObject();
+                    break;
+                default:
+                    throw new Exception($"Unknown StackItem {value}");
+            }
+            if (writer.BytesCommitted > MaxJsonLength)
+            {
+                throw new InvalidCastException("json is too long to write!");
+            }
+        }
+
+        //private const string ByteStringType = "ByteString";
+        //private const string BufferType = "Buffer";
+        //private const string BooleanType = "Boolean";
+        //private const string IntegerType = "Integer";
+        //private const string PointerType = "Pointer";
+        //private const string StructType = "Struct";
+        //private const string ArrayType = "Array";
+        //private const string MapType = "Map";
+        //private const string AnyType = "Any";
+        //private const string InteropinterfaceType = "InteropInterface";
+
+        //public StackItem ReadToStackItemText(JsonElement currentElement)
+        //{
+        //    if (currentElement.TryGetProperty(JsonNameType, out var type))
+        //    {
+        //        var hasValue = currentElement.TryGetProperty(JsonNameValue, out var value);
+        //        switch (type.GetString())
+        //        {
+        //            case ByteStringType:
+        //                return new ByteString(value.GetBytesFromBase64());
+        //            case BufferType:
+        //                return new Buffer(value.GetBytesFromBase64());
+        //            case BooleanType:
+        //                return value.GetBoolean();
+        //            case IntegerType:
+        //                return BigInteger.Parse(value.GetString()!);
+        //            case PointerType:
+        //                return new Pointer(null, value.GetInt32());
+        //            case AnyType:
+        //                return hasValue ? new ByteString(value.GetBytesFromBase64()) : StackItem.Null;
+        //            case ArrayType:
+        //                var array = new Array();
+        //                foreach (var jsonElement in value.EnumerateArray())
+        //                {
+        //                    array.Add(ReadToStackItem(jsonElement));
+        //                }
+        //                return array;
+        //            case StructType:
+        //                var structs = new Struct();
+        //                foreach (var jsonElement in value.EnumerateArray())
+        //                {
+        //                    structs.Add(ReadToStackItem(jsonElement));
+        //                }
+        //                return structs;
+
+        //            case MapType:
+        //                var map = new Map();
+        //                foreach (var jsonElement in value.EnumerateArray())
+        //                {
+        //                    var key = jsonElement.GetProperty("key");
+        //                    var val = jsonElement.GetProperty("val");
+        //                    map[(PrimitiveType)ReadToStackItem(key)] = ReadToStackItem(val);
+        //                }
+        //                return map;
+        //        }
+        //    }
+        //    throw new Exception($"Unknown Json {currentElement}");
+        //}
+
+        //public void WriteToJsonText(StackItem value, Utf8JsonWriter writer)
+        //{
+        //    switch (value)
+        //    {
+        //        case ByteString:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, ByteStringType);
+        //            writer.WriteBase64String(JsonNameValue, value.GetSpan());
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Buffer:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, BufferType);
+        //            writer.WriteBase64String(JsonNameValue, value.GetSpan());
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Boolean:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, BooleanType);
+        //            writer.WriteBoolean(JsonNameValue, value.GetBoolean());
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Integer:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, IntegerType);
+        //            writer.WriteString(JsonNameValue, value.GetInteger().ToString());
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Pointer point:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, PointerType);
+        //            writer.WriteNumber(JsonNameValue, point.Position);
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Struct structs:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, StructType);
+        //            writer.WritePropertyName(JsonNameValue);
+        //            writer.WriteStartArray();
+        //            foreach (var item in structs)
+        //            {
+        //                WriteToJson(item, writer);
+        //            }
+        //            writer.WriteEndArray();
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Array array:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, ArrayType);
+        //            writer.WritePropertyName(JsonNameValue);
+        //            writer.WriteStartArray();
+        //            foreach (var item in array)
+        //            {
+        //                WriteToJson(item, writer);
+        //            }
+        //            writer.WriteEndArray();
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Map map:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, MapType);
+        //            writer.WritePropertyName(JsonNameValue);
+        //            writer.WriteStartArray();
+        //            foreach (var item in map)
+        //            {
+        //                writer.WriteStartObject();
+        //                writer.WritePropertyName("key");
+        //                WriteToJson(item.Key, writer);
+        //                writer.WritePropertyName("val");
+        //                WriteToJson(item.Value, writer);
+        //                writer.WriteEndObject();
+
+        //            }
+        //            writer.WriteEndArray();
+        //            writer.WriteEndObject();
+        //            break;
+        //        case InteropInterface op:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, InteropinterfaceType);
+        //            writer.WriteEndObject();
+        //            break;
+        //        case Null:
+        //            writer.WriteStartObject();
+        //            writer.WriteString(JsonNameType, AnyType);
+        //            writer.WriteEndObject();
+        //            break;
+        //        default:
+        //            throw new Exception($"Unknown StackItem {value}");
+        //    }
+        //}
+    }
+}
diff --git a/neo3-gui/neo3-gui/Common/JsonRpcMiddleware.cs b/neo3-gui/neo3-gui/Common/JsonRpcMiddleware.cs
index 4fb75fd5..2b2b426a 100644
--- a/neo3-gui/neo3-gui/Common/JsonRpcMiddleware.cs
+++ b/neo3-gui/neo3-gui/Common/JsonRpcMiddleware.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Neo.IO.Json;
 using Neo.Models;
 
 namespace Neo.Common
@@ -44,7 +43,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
                 message.Id = request.Id;
                 message.Method = request.Method;
                 var executor = _provider.GetService<WebSocketExecutor>();
-                var result = await executor.Excute(request);
+                var result = await executor.Execute(request);
                 if (result is WsError error)
                 {
                     message.MsgType = WsMessageType.Error;
diff --git a/neo3-gui/neo3-gui/Common/Storage/ExecuteResultInfo.cs b/neo3-gui/neo3-gui/Common/Storage/ExecuteResultInfo.cs
index d15b77bc..949cad32 100644
--- a/neo3-gui/neo3-gui/Common/Storage/ExecuteResultInfo.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/ExecuteResultInfo.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Neo.Common.Storage.SQLiteModules;
-using Neo.IO.Json;
 using Neo.SmartContract;
 using Neo.VM;
+using Neo.VM.Types;
 
 namespace Neo.Common.Storage
 {
@@ -24,7 +20,7 @@ public class ExecuteResultInfo
         /// <summary>
         /// execute result json array
         /// </summary>
-        public JObject ResultStack { get; set; }
+        public StackItem[] ResultStack { get; set; }
         public List<NotificationInfo> Notifications { get; set; }
     }
 
@@ -41,7 +37,7 @@ public class NotificationInfo
 
         public string EventName { get; set; }
 
-        public JObject State { get; set; }
+        public StackItem State { get; set; }
 
     }
 }
diff --git a/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs b/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
index 4b6894e0..69048fef 100644
--- a/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/LevelDBModules/LevelDbContext.cs
@@ -10,6 +10,7 @@
 using Neo.Common.Consoles;
 using Neo.IO;
 using Neo.Models;
+using Neo.VM.Types;
 
 namespace Neo.Common.Storage.LevelDBModules
 {
@@ -111,7 +112,7 @@ public void SaveTxExecuteLog(ExecuteResultInfo log)
                 }
                 catch (InvalidCastException e)
                 {
-                    log.ResultStack = e.ToString();
+                    log.ResultStack = new StackItem[] { e.ToString() };
                     writeBatch.Put(ExecuteLogKey(log.TxId), log.SerializeJsonBytes());
                 }
             }
diff --git a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/Nep5TransferEntity.cs b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/Nep5TransferEntity.cs
index d0499e60..ce3a949a 100644
--- a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/Nep5TransferEntity.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/Nep5TransferEntity.cs
@@ -27,6 +27,7 @@ public class Nep5TransferEntity
         public AddressEntity From { get; set; }
 
         public long? ToId { get; set; }
+
         public AddressEntity To { get; set; }
 
         public byte[] Amount { get; set; }
diff --git a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
index 6ce84829..8dde662b 100644
--- a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/SQLiteContext.cs
@@ -27,7 +27,7 @@ public class SQLiteContext : DbContext
         public DbSet<AssetBalanceEntity> AssetBalances { get; set; }
         public DbSet<AddressEntity> Addresses { get; set; }
         public DbSet<TransactionEntity> Transactions { get; set; }
-        public DbSet<InvokeRecordEntity> InvokeRecords { get; set; }
+        //public DbSet<InvokeRecordEntity> InvokeRecords { get; set; }
 
         public DbSet<ContractEntity> Contracts { get; set; }
         public DbSet<ContractUpdateRecordEntity> ContractUpdateRecords { get; set; }
@@ -42,6 +42,7 @@ static SQLiteContext()
 
         public SQLiteContext() : this(Path.Combine($"Data_Track", $"track.{CliSettings.Default.Protocol.Network}.db"))
         {
+            
         }
 
         public SQLiteContext(string filename)
diff --git a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/TransactionEntity.cs b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/TransactionEntity.cs
index ee5d3b73..92a4db50 100644
--- a/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/TransactionEntity.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/SQLiteModules/TransactionEntity.cs
@@ -13,7 +13,6 @@ namespace Neo.Common.Storage.SQLiteModules
     public class TransactionEntity
     {
         [Key]
-        //public long Id { get; set; }
         public string TxId { get; set; }
         public uint BlockHeight { get; set; }
 
diff --git a/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs b/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
index 7731f359..e38f7ba7 100644
--- a/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
+++ b/neo3-gui/neo3-gui/Common/Storage/TrackDB.cs
@@ -6,14 +6,11 @@
 using System.Linq.Expressions;
 using System.Numerics;
 using System.Threading.Tasks;
-using EFCore.BulkExtensions;
 using Microsoft.EntityFrameworkCore;
 using Neo.Common.Consoles;
 using Neo.Common.Storage.LevelDBModules;
 using Neo.Common.Storage.SQLiteModules;
-using Neo.IO;
 using Neo.Models;
-using Neo.SmartContract.Native;
 
 namespace Neo.Common.Storage
 {
@@ -27,6 +24,11 @@ public class TrackDB : IDisposable
         public TimeSpan LiveTime => DateTime.Now - _createTime;
 
         private static bool _hasConsistencyCheck = false;
+        private static bool _hasInitCahce = false;
+
+        private static readonly ConcurrentDictionary<long, ContractEntity> ContractCache = new();
+        private static readonly ConcurrentDictionary<UInt160, AddressEntity> AddressHashCache = new();
+        private static readonly ConcurrentDictionary<long, AddressEntity> AddressIdCache = new();
 
         static TrackDB()
         {
@@ -36,6 +38,16 @@ static TrackDB()
             }
         }
 
+        void InitCache()
+        {
+            var contracts = _sqldb.Contracts.ToList();
+            contracts.ForEach(c => ContractCache[c.Id] = c);
+
+            var addresses = _sqldb.Addresses.ToList();
+            addresses.ForEach(a => AddressIdCache[a.Id] = a);
+        }
+
+
         public TrackDB()
         {
             _magic = CliSettings.Default.Protocol.Network;
@@ -47,6 +59,12 @@ public TrackDB()
                 _hasConsistencyCheck = true;
                 InitConsistencyCheck();
             }
+
+            //if (!_hasInitCahce)
+            //{
+            //    _hasInitCahce = true;
+            //    //InitCache();
+            //}
         }
 
 
@@ -180,31 +198,6 @@ public void UpdateBalance(UInt160 addressHash, UInt160 assetHash, BigInteger bal
 
 
 
-        ///// <summary>
-        ///// update record will save after call <see cref="Commit"/> method;
-        ///// new record will save immediately
-        ///// </summary>
-        ///// <param name="addressHash"></param>
-        ///// <param name="assetInfo"></param>
-        ///// <param name="balance"></param>
-        ///// <param name="height"></param>
-        //public void UpdateBalanceIndex(UInt160 addressHash, AssetInfo assetInfo, BigInteger balance, uint height)
-        //{
-        //    if (addressHash == null) return;
-        //    var address = GetOrCreateAddress(addressHash);
-        //    var asset = GetActiveContract(assetInfo.Asset);
-        //    var balanceRecord = GetOrCreateBalance(address, asset, balance, height);
-
-        //    if (balanceRecord.BlockHeight >= height)
-        //    {
-        //        //no need update
-        //        return;
-        //    }
-        //    balanceRecord.Balance = balance.ToByteArray();
-        //    balanceRecord.BlockHeight = height;
-        //}
-
-
         /// <summary>
         ///  Paged by Transactions
         /// </summary>
@@ -271,7 +264,7 @@ public PageList<TransactionInfo> QueryTransactions(TransactionFilter filter, boo
             pageList.PageSize = filter.PageSize;
             if (filter.PageSize > 0)
             {
-                var list = query.OrderByDescending(g => g.Time)
+                var list = query.OrderByDescending(g => g.BlockHeight)
                     .Skip(pageIndex * filter.PageSize)
                     .Take(filter.PageSize).ToList();
 
@@ -310,45 +303,45 @@ public PageList<TransactionInfo> QueryTransactions(TransactionFilter filter, boo
         }
 
 
-        /// <summary>
-        /// query without transfers(High Performance)
-        /// </summary>
-        private readonly Expression<Func<TransactionEntity, TransactionInfo>> ToTransactionWithoutTransfer = (tx) => new TransactionInfo()
-        {
-            TxId = UInt256.Parse(tx.TxId),
-            BlockHeight = tx.BlockHeight,
-            Sender = tx.Sender != null ? UInt160.Parse(tx.Sender.Hash) : null,
-            Time = tx.Time.AsUtcTime(),
-        };
+        ///// <summary>
+        ///// query without transfers(High Performance)
+        ///// </summary>
+        //private readonly Expression<Func<TransactionEntity, TransactionInfo>> ToTransactionWithoutTransfer = (tx) => new TransactionInfo()
+        //{
+        //    TxId = UInt256.Parse(tx.TxId),
+        //    BlockHeight = tx.BlockHeight,
+        //    Sender = tx.Sender != null ? UInt160.Parse(tx.Sender.Hash) : null,
+        //    Time = tx.Time.AsUtcTime(),
+        //};
 
-        /// <summary>
-        ///  query with transfers(Low Performance)
-        /// </summary>
-        private readonly Expression<Func<TransactionEntity, TransactionInfo>> ToTransactionWithTransfer = (tx) => new TransactionInfo()
-        {
-            TxId = UInt256.Parse(tx.TxId),
-            BlockHeight = tx.BlockHeight,
-            Sender = tx.Sender != null ? UInt160.Parse(tx.Sender.Hash) : null,
-            Time = tx.Time.AsUtcTime(),
-            //Transfers = tx.Transfers.ToList(),
-            //    .Select(t=>new TransferInfo(){
-            //    From = t.FromId != null ? UInt160.Parse(GetAddress(t.FromId.Value).Hash) : null,
-            //    To = t.To != null ? UInt160.Parse(t.To.Hash) : null,
-            //    Amount = new BigInteger(t.Amount),
-            //    TxId = UInt256.Parse(t.TxId),
-            //    Asset = UInt160.Parse(t.Asset.Hash),
-            //    TimeStamp = t.Time.ToTimestampMS(),
-            //}),
-            //Transfers = tx.Transfers.Select(t => new TransferInfo()
-            //{
-            //    From = t.From != null ? UInt160.Parse(t.From.Hash) : null,
-            //    To = t.To != null ? UInt160.Parse(t.To.Hash) : null,
-            //    Amount = new BigInteger(t.Amount),
-            //    TxId = UInt256.Parse(t.TxId),
-            //    Asset = UInt160.Parse(t.Asset.Hash),
-            //    TimeStamp = t.Time.ToTimestampMS(),
-            //}).ToList()
-        };
+        ///// <summary>
+        /////  query with transfers(Low Performance)
+        ///// </summary>
+        //private readonly Expression<Func<TransactionEntity, TransactionInfo>> ToTransactionWithTransfer = (tx) => new TransactionInfo()
+        //{
+        //    TxId = UInt256.Parse(tx.TxId),
+        //    BlockHeight = tx.BlockHeight,
+        //    Sender = tx.Sender != null ? UInt160.Parse(tx.Sender.Hash) : null,
+        //    Time = tx.Time.AsUtcTime(),
+        //    //Transfers = tx.Transfers.ToList(),
+        //    //    .Select(t=>new TransferInfo(){
+        //    //    From = t.FromId != null ? UInt160.Parse(GetAddress(t.FromId.Value).Hash) : null,
+        //    //    To = t.To != null ? UInt160.Parse(t.To.Hash) : null,
+        //    //    Amount = new BigInteger(t.Amount),
+        //    //    TxId = UInt256.Parse(t.TxId),
+        //    //    Asset = UInt160.Parse(t.Asset.Hash),
+        //    //    TimeStamp = t.Time.ToTimestampMS(),
+        //    //}),
+        //    //Transfers = tx.Transfers.Select(t => new TransferInfo()
+        //    //{
+        //    //    From = t.From != null ? UInt160.Parse(t.From.Hash) : null,
+        //    //    To = t.To != null ? UInt160.Parse(t.To.Hash) : null,
+        //    //    Amount = new BigInteger(t.Amount),
+        //    //    TxId = UInt256.Parse(t.TxId),
+        //    //    Asset = UInt160.Parse(t.Asset.Hash),
+        //    //    TimeStamp = t.Time.ToTimestampMS(),
+        //    //}).ToList()
+        //};
 
 
 
@@ -432,29 +425,6 @@ public IEnumerable<BalanceInfo> FindAssetBalance(BalanceFilter filter)
         }
 
 
-        public IEnumerable<ContractEntity> GetAllContracts()
-        {
-            //return _sqldb.Contracts.ToList().Select(c => c.ToContractInfo());
-            return _sqldb.Contracts.ToList();
-        }
-
-
-        private ContractEntity GetActiveContract(UInt160 contract)
-        {
-            var contractHash = contract.ToBigEndianHex();
-            return GetActiveContract(contractHash);
-        }
-
-        private ContractEntity GetActiveContract(string contractHash)
-        {
-            return _sqldb.Contracts.FirstOrDefault(c => c.Hash == contractHash && c.DeleteTxId == null);
-        }
-        public ContractEntity GetContract(UInt160 asset)
-        {
-            var assetInfo = GetActiveContract(asset);
-            return assetInfo;
-        }
-
 
         #endregion
 
@@ -480,19 +450,19 @@ public void AddTransaction(TransactionInfo transaction)
         }
 
 
-        public void AddInvokeTransaction(UInt256 txId, UInt160 contract, string method)
-        {
-            var contractEntity = GetActiveContract(contract);
-            if (contractEntity != null)
-            {
-                _sqldb.InvokeRecords.Add(new InvokeRecordEntity()
-                {
-                    ContractId = contractEntity.Id,
-                    TxId = txId.ToBigEndianHex(),
-                    Methods = method,
-                });
-            }
-        }
+        //public void AddInvokeTransaction(UInt256 txId, UInt160 contract, string method)
+        //{
+        //    var contractEntity = GetActiveContract(contract);
+        //    if (contractEntity != null)
+        //    {
+        //        _sqldb.InvokeRecords.Add(new InvokeRecordEntity()
+        //        {
+        //            ContractId = contractEntity.Id,
+        //            TxId = txId.ToBigEndianHex(),
+        //            Methods = method,
+        //        });
+        //    }
+        //}
         #endregion
 
 
@@ -512,15 +482,6 @@ public void CreateContract(ContractEntity newContract)
             {
                 _sqldb.Contracts.Add(newContract);
                 _sqldb.SaveChanges();
-
-                //save create contract transaction record
-                //_sqldb.InvokeRecords.Add(new InvokeRecordEntity()
-                //{
-                //    ContractId = newContract.Id,
-                //    TxId = newContract.CreateTxId,
-                //    Methods = "Deployed"
-                //});
-                //_sqldb.SaveChanges();
             }
         }
 
@@ -565,31 +526,67 @@ public void MigrateContract(ContractEntity migrateContract)
                 old.Decimals = migrateContract.Decimals;
 
                 _sqldb.ContractUpdateRecords.Add(newUpdateRecord);
-                //_sqldb.InvokeRecords.Add(new InvokeRecordEntity()
-                //{
-                //    ContractId = old.Id,
-                //    TxId = migrateContract.MigrateTxId,
-                //    Methods = "Updated"
-                //});
                 _sqldb.SaveChanges();
             }
         }
 
+        public IEnumerable<ContractEntity> GetAllContracts()
+        {
+            return _sqldb.Contracts.ToList();
+        }
+
+        /// <summary>
+        /// Get NOT Deleted contract
+        /// </summary>
+        /// <param name="contract"></param>
+        /// <returns></returns>
+        public ContractEntity GetActiveContract(UInt160 contract)
+        {
+            var contractHash = contract.ToBigEndianHex();
+            return GetActiveContract(contractHash);
+        }
+
+        /// <summary>
+        /// Get NOT Deleted contract
+        /// </summary>
+        /// <param name="contractHash"></param>
+        /// <returns></returns>
+        private ContractEntity GetActiveContract(string contractHash)
+        {
+            return _sqldb.Contracts.FirstOrDefault(c => c.Hash == contractHash && c.DeleteTxId == null);
+        }
+
+        /// <summary>
+        /// Ger contract by ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public ContractEntity GetContract(long id)
+        {
+            if (ContractCache.ContainsKey(id))
+            {
+                return ContractCache[id];
+            }
+            var contract = _sqldb.Contracts.FirstOrDefault(c => c.Id == id);
+            if (contract != null)
+            {
+                ContractCache[id] = contract;
+            }
+            return contract;
+        }
 
         #endregion
 
         #region Private
 
 
-        private readonly ConcurrentDictionary<UInt160, AddressEntity> _addressCache = new();
-        private readonly ConcurrentDictionary<long, AddressEntity> _addressKeyCache = new();
 
         private AddressEntity GetOrCreateAddress(UInt160 address)
         {
             if (address == null) return null;
-            if (_addressCache.ContainsKey(address))
+            if (AddressHashCache.ContainsKey(address))
             {
-                return _addressCache[address];
+                return AddressHashCache[address];
             }
             var addr = address.ToBigEndianHex();
             var old = _sqldb.Addresses.FirstOrDefault(a => a.Hash == addr);
@@ -599,8 +596,8 @@ private AddressEntity GetOrCreateAddress(UInt160 address)
                 _sqldb.Addresses.Add(old);
                 _sqldb.SaveChanges();
             }
-            _addressCache[address] = old;
-            _addressKeyCache[old.Id] = old;
+            AddressHashCache[address] = old;
+            AddressIdCache[old.Id] = old;
             return old;
         }
 
@@ -682,34 +679,20 @@ private TransferInfo ToNep5TransferInfo(Nep5TransferEntity entity)
 
         #endregion
 
-        #region AddressAndContractCache
+        #region AddressCache
 
-        private readonly ConcurrentDictionary<long, ContractEntity> _contractCache = new();
-        public ContractEntity GetContract(long id)
-        {
-            if (_contractCache.ContainsKey(id))
-            {
-                return _contractCache[id];
-            }
-            var contract = _sqldb.Contracts.FirstOrDefault(c => c.Id == id);
-            if (contract != null)
-            {
-                _contractCache[id] = contract;
-            }
-            return contract;
-        }
 
 
         public AddressEntity GetAddress(long id)
         {
-            if (_addressKeyCache.ContainsKey(id))
+            if (AddressIdCache.ContainsKey(id))
             {
-                return _addressKeyCache[id];
+                return AddressIdCache[id];
             }
             var address = _sqldb.Addresses.FirstOrDefault(c => c.Id == id);
             if (address != null)
             {
-                _addressKeyCache[id] = address;
+                AddressIdCache[id] = address;
             }
             return address;
         }
diff --git a/neo3-gui/neo3-gui/Common/WebSocketExecutor.cs b/neo3-gui/neo3-gui/Common/WebSocketExecutor.cs
index 895b5e06..4474604c 100644
--- a/neo3-gui/neo3-gui/Common/WebSocketExecutor.cs
+++ b/neo3-gui/neo3-gui/Common/WebSocketExecutor.cs
@@ -47,7 +47,7 @@ public WebSocketExecutor(IServiceProvider provider)
             }
         }
 
-        public async Task<object> Excute(WsRequest request)
+        public async Task<object> Execute(WsRequest request)
         {
             if (request.Method.IsNull())
             {
diff --git a/neo3-gui/neo3-gui/Common/WebSocketHubMiddleware.cs b/neo3-gui/neo3-gui/Common/WebSocketHubMiddleware.cs
index 989e5b24..9a1d00d1 100644
--- a/neo3-gui/neo3-gui/Common/WebSocketHubMiddleware.cs
+++ b/neo3-gui/neo3-gui/Common/WebSocketHubMiddleware.cs
@@ -115,7 +115,7 @@ public async Task Excute(WebSocketConnection connection, string requestString)
                 session.Request = request;
 
                 var executor = _provider.GetService<WebSocketExecutor>();
-                var result = await executor.Excute(request);
+                var result = await executor.Execute(request);
                 if (result is WsError error)
                 {
                     message.MsgType = WsMessageType.Error;
diff --git a/neo3-gui/neo3-gui/Helpers.cs b/neo3-gui/neo3-gui/Helpers.cs
index 0fe41598..23e850ea 100644
--- a/neo3-gui/neo3-gui/Helpers.cs
+++ b/neo3-gui/neo3-gui/Helpers.cs
@@ -25,8 +25,6 @@
 using Neo.Common.Utility;
 using Neo.Cryptography.ECC;
 using Neo.IO;
-using Neo.IO.Json;
-using Neo.Ledger;
 using Neo.Models;
 using Neo.Models.Transactions;
 using Neo.Models.Wallets;
@@ -40,13 +38,9 @@
 using Neo.VM;
 using Neo.VM.Types;
 using Neo.Wallets;
-using Neo.Wallets.SQLite;
-using Boolean = Neo.VM.Types.Boolean;
-using Buffer = Neo.VM.Types.Buffer;
-using VmArray = Neo.VM.Types.Array;
 using JsonSerializer = System.Text.Json.JsonSerializer;
+using VmArray = Neo.VM.Types.Array;
 using Pointer = Neo.VM.Types.Pointer;
-using Neo.SmartContract.Iterators;
 
 namespace Neo
 {
@@ -69,6 +63,7 @@ public static class Helpers
                 new DatetimeJsonConverter(),
                 new ByteArrayConverter(),
                 new JObjectConverter(),
+                new StackItemConverter(),
             }
         };
 
@@ -1147,12 +1142,12 @@ public static Contract ToVerificationContract(this ECPoint point)
         public static bool ToBigInteger(this JStackItem item, out BigInteger amount)
         {
             amount = 0;
-            if (item.TypeCode == ContractParameterType.Integer)
+            if (item.TypeCode == StackItemType.Integer)
             {
                 amount = (BigInteger)item.Value;
                 return true;
             }
-            if (item.TypeCode == ContractParameterType.ByteArray)
+            if (item.TypeCode == StackItemType.Buffer || item.TypeCode == StackItemType.Buffer)
             {
                 amount = new BigInteger((byte[])item.Value);
                 return true;
@@ -1176,7 +1171,7 @@ public static NotificationInfo ToNotificationInfo(this NotifyEventArgs notify)
             var notification = new NotificationInfo();
             notification.EventName = notify.EventName;
             notification.Contract = notify.ScriptHash;
-            notification.State = notify.State.ToJson();
+            notification.State = notify.State;
             return notification;
         }
 
@@ -1315,53 +1310,83 @@ public static string GetExMessage(this Exception ex)
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public static JObject ToJObject(this StackItem item)
+        public static JStackItem ToJStackItem(this StackItem item)
         {
-            return ToJson(item, null);
+            return ToJStackItem(item, null);
         }
 
-
-        private static JObject ToJson(StackItem item, HashSet<StackItem> context)
+        private static JStackItem ToJStackItem(StackItem item, HashSet<StackItem> context)
         {
-            JObject json = new();
-            json["type"] = item.Type;
-            switch (item)
+            JStackItem json = new();
+            json.TypeCode = item.Type;
+            switch (item.Type)
             {
-                case VmArray array:
+                case StackItemType.Array:
                     context ??= new HashSet<StackItem>(ReferenceEqualityComparer.Instance);
-                    if (!context.Add(array)) throw new InvalidOperationException();
-                    json["value"] = new JArray(array.Select(p => ToJson(p, context)));
-                    break;
-                case Boolean boolean:
-                    json["value"] = boolean.GetBoolean();
+                    if (!context.Add(item)) throw new InvalidOperationException();
+                    json.Value = ((VmArray)item).Select(p => ToJStackItem(p, context));
                     break;
-                case Buffer buffer:
-                    json["value"] = buffer.InnerBuffer.ToBase64String();
+                case StackItemType.Boolean:
+                    json.Value = item.GetBoolean();
                     break;
-                case ByteString _:
-                    json["value"] = item.GetSpan().ToBase64String();
+                case StackItemType.Buffer:
+                case StackItemType.ByteString:
+                    json.Value = item.GetSpan().ToBase64String();
                     break;
-                case Integer integer:
-                    json["value"] = integer.GetInteger().ToString();
+                case StackItemType.Integer:
+                    json.Value = item.GetInteger().ToString();
                     break;
-                case Map map:
+                case StackItemType.Map:
                     context ??= new HashSet<StackItem>(ReferenceEqualityComparer.Instance);
-                    if (!context.Add(map)) throw new InvalidOperationException();
-                    json["value"] = new JArray(map.Select(p =>
-                    {
-                        JObject item = new();
-                        item["key"] = ToJson(p.Key, context);
-                        item["value"] = ToJson(p.Value, context);
-                        return item;
-                    }));
+                    if (!context.Add(item)) throw new InvalidOperationException();
+                    json.Value = ((Map)item).Select(p => new KeyValuePair<JStackItem, JStackItem>(ToJStackItem(p.Key, context), ToJStackItem(p.Value, context))).ToList();
+                    //json.Value = ((Map)item).Select(p =>
+                    //{
+                    //    JObject item = new();
+                    //    item["key"] = ToJson(p.Key, context);
+                    //    item["value"] = ToJson(p.Value, context);
+                    //    return item;
+                    //}));
                     break;
-                case Pointer pointer:
-                    json["value"] = pointer.Position;
+                case StackItemType.Pointer:
+                    json.Value = ((Pointer)item).Position;
                     break;
             }
             return json;
         }
 
+        //public static JStackItem ToJStackItem(this JToken json)
+        //{
+        //    JStackItem parameter = new JStackItem
+        //    {
+        //        TypeCode = json["type"].AsEnum<StackItemType>(),
+        //    };
+
+        //    if (json["value"] != null)
+        //        switch (parameter.TypeCode)
+        //        {
+        //            case StackItemType.Buffer:
+        //            case StackItemType.ByteString:
+        //                parameter.Value = Convert.FromBase64String(json["value"].AsString());
+        //                break;
+        //            case StackItemType.Boolean:
+        //                parameter.Value = json["value"].AsBoolean();
+        //                break;
+        //            case StackItemType.Integer:
+        //                parameter.Value = BigInteger.Parse(json["value"].AsString());
+        //                break;
+        //            case StackItemType.Array:
+        //                parameter.Value = ((JArray)json["value"]).Select(p => ToJStackItem(p)).ToList();
+        //                break;
+        //            case StackItemType.Map:
+        //                parameter.Value = ((JArray)json["value"]).Select(p => new KeyValuePair<JStackItem, JStackItem>(ToJStackItem(p["key"]), ToJStackItem(p["value"]))).ToList();
+        //                break;
+        //            default:
+        //                throw new ArgumentException();
+        //        }
+        //    return parameter;
+        //}
+
 
         /// <summary>
         /// /检查Nep Token
@@ -1475,5 +1500,40 @@ public static (ECPoint PublicKey, BigInteger Votes)[] GetCandidates(this DataCac
             //}
             return list.ToArray();
         }
+
+        /// <summary>
+        /// Convert To Enum
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="text"></param>
+        /// <param name="ignoreCase"></param>
+        /// <returns></returns>
+        /// <exception cref="InvalidCastException"></exception>
+        public static T ToEnum<T>(this string text, bool ignoreCase = false) where T : unmanaged, Enum
+        {
+            T result = Enum.Parse<T>(text, ignoreCase);
+            if (!Enum.IsDefined(result)) throw new InvalidCastException();
+            return result;
+        }
+
+        /// <summary>
+        /// Convert To Enum
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="text"></param>
+        /// <param name="defaultValue"></param>
+        /// <param name="ignoreCase"></param>
+        /// <returns></returns>
+        public static T AsEnum<T>(this string text, T defaultValue = default, bool ignoreCase = false) where T : unmanaged, Enum
+        {
+            try
+            {
+                return Enum.Parse<T>(text, ignoreCase);
+            }
+            catch
+            {
+                return defaultValue;
+            }
+        }
     }
 }
diff --git a/neo3-gui/neo3-gui/Models/Contracts/InvokeContractParameterModel.cs b/neo3-gui/neo3-gui/Models/Contracts/InvokeContractParameterModel.cs
index 19e9a5ec..2f56931a 100644
--- a/neo3-gui/neo3-gui/Models/Contracts/InvokeContractParameterModel.cs
+++ b/neo3-gui/neo3-gui/Models/Contracts/InvokeContractParameterModel.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Neo.IO.Json;
+using System.Text.Json;
 
 namespace Neo.Models.Contracts
 {
@@ -12,7 +9,7 @@ public class InvokeContractParameterModel
         public UInt160 ContractHash { get; set; }
         public string Method { get; set; }
 
-        public List<JObject> Parameters { get; set; }
+        public List<JsonElement> Parameters { get; set; }
         public List<CosignerModel> Cosigners { get; set; }
 
         public bool SendTx { get; set; }
diff --git a/neo3-gui/neo3-gui/Models/JStackItem.cs b/neo3-gui/neo3-gui/Models/JStackItem.cs
index 8770b6cb..df8f1f59 100644
--- a/neo3-gui/neo3-gui/Models/JStackItem.cs
+++ b/neo3-gui/neo3-gui/Models/JStackItem.cs
@@ -3,75 +3,25 @@
 using System.Linq;
 using System.Numerics;
 using System.Text;
-using System.Threading.Tasks;
-using Neo.Cryptography.ECC;
-using Neo.IO.Json;
-using Neo.SmartContract;
+using Neo.VM.Types;
 
 namespace Neo.Models
 {
     public class JStackItem
     {
-        public ContractParameterType TypeCode { get; set; }
-        public string Type { get; set; }
+        //public ContractParameterType TypeCode { get; set; }
+        public StackItemType TypeCode { get; set; }
+        public string Type => TypeCode.ToString();
         public object Value { get; set; }
 
         public string ValueString => Value is byte[] v ? GetUTF8String(v) : null;
         public string ValueAddress => Value is byte[] v ? v.TryToAddress() : null;
-        public UInt160 ValueHash160 => TypeCode != ContractParameterType.Hash160 && Value is byte[] { Length: 20 } v ? new UInt160(v) : null;
-        public UInt256 ValueHash256 => TypeCode != ContractParameterType.Hash256 && Value is byte[] { Length: 32 } v ? new UInt256(v) : null;
+        public UInt160 ValueHash160 => Value is byte[] { Length: 20 } v ? new UInt160(v) : null;
+        public UInt256 ValueHash256 => Value is byte[] { Length: 32 } v ? new UInt256(v) : null;
 
         private string GetUTF8String(byte[] bytes)
         {
             return bytes.IsValidUTF8ByteArray() ? Encoding.UTF8.GetString(bytes) : null;
         }
-
-        public static JStackItem FromJson(JObject json)
-        {
-            JStackItem parameter = new JStackItem
-            {
-                TypeCode = json["type"].TryGetEnum<ContractParameterType>(),
-                Type = json["type"].AsString(),
-            };
-            if (parameter.Type == "ByteString" || parameter.Type == "Buffer")
-            {
-                parameter.TypeCode = ContractParameterType.ByteArray;
-            }
-            if (json["value"] != null)
-                switch (parameter.TypeCode)
-                {
-                    case ContractParameterType.Signature:
-                    case ContractParameterType.ByteArray:
-                        parameter.Value = Convert.FromBase64String(json["value"].AsString());
-                        break;
-                    case ContractParameterType.Boolean:
-                        parameter.Value = json["value"].AsBoolean();
-                        break;
-                    case ContractParameterType.Integer:
-                        parameter.Value = BigInteger.Parse(json["value"].AsString());
-                        break;
-                    case ContractParameterType.Hash160:
-                        parameter.Value = UInt160.Parse(json["value"].AsString());
-                        break;
-                    case ContractParameterType.Hash256:
-                        parameter.Value = UInt256.Parse(json["value"].AsString());
-                        break;
-                    case ContractParameterType.PublicKey:
-                        parameter.Value = ECPoint.Parse(json["value"].AsString(), ECCurve.Secp256r1);
-                        break;
-                    case ContractParameterType.String:
-                        parameter.Value = json["value"].AsString();
-                        break;
-                    case ContractParameterType.Array:
-                        parameter.Value = ((JArray)json["value"]).Select(p => FromJson(p)).ToList();
-                        break;
-                    case ContractParameterType.Map:
-                        parameter.Value = ((JArray)json["value"]).Select(p => new KeyValuePair<JStackItem, JStackItem>(FromJson(p["key"]), FromJson(p["value"]))).ToList();
-                        break;
-                    default:
-                        throw new ArgumentException();
-                }
-            return parameter;
-        }
     }
 }
diff --git a/neo3-gui/neo3-gui/Models/Transactions/TransactionModel.cs b/neo3-gui/neo3-gui/Models/Transactions/TransactionModel.cs
index ee300abc..6b1ca02e 100644
--- a/neo3-gui/neo3-gui/Models/Transactions/TransactionModel.cs
+++ b/neo3-gui/neo3-gui/Models/Transactions/TransactionModel.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Neo.Common.Utility;
-using Neo.IO.Json;
 using Neo.Models.Contracts;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract.Native;
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/BlockApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/BlockApiService.cs
index a2b92301..14033fe9 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/BlockApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/BlockApiService.cs
@@ -1,19 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Numerics;
 using System.Threading.Tasks;
-using Akka.IO;
-using Neo.Common;
 using Neo.Common.Storage;
 using Neo.Common.Storage.SQLiteModules;
 using Neo.Common.Utility;
-using Neo.Ledger;
 using Neo.Models;
 using Neo.Models.Blocks;
-using Neo.Models.Wallets;
 using Neo.Network.P2P.Payloads;
-using Neo.SmartContract;
-using Neo.VM;
 
 namespace Neo.Services.ApiServices
 {
@@ -114,7 +107,7 @@ public async Task<object> GetAsset(UInt160 asset)
             }
             var totalSupply = AssetCache.GetTotalSupply(asset);
             using var db = new TrackDB();
-            var record = db.GetContract(asset);
+            var record = db.GetActiveContract(asset);
             var trans = db.QueryTransactions(new TransactionFilter()
             { Assets = new List<UInt160>() { asset }, PageSize = 0 });
             return new AssetInfoModel()
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
index d3c513a4..7e04d51f 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/ContractApiService.cs
@@ -3,28 +3,20 @@
 using System.IO;
 using System.Linq;
 using System.Numerics;
-using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
-using Akka.Util.Internal;
-using Neo.Common;
 using Neo.Common.Storage;
 using Neo.Common.Utility;
 using Neo.Cryptography.ECC;
 using Neo.IO;
-using Neo.IO.Json;
-using Neo.Ledger;
 using Neo.Models;
-using Neo.Models.Blocks;
 using Neo.Models.Contracts;
-using Neo.Network.P2P;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
 using Neo.SmartContract.Manifest;
 using Neo.SmartContract.Native;
 using Neo.VM;
 using Neo.VM.Types;
-using Neo.Wallets;
-using Neo.Wallets.SQLite;
 using Array = Neo.VM.Types.Array;
 
 namespace Neo.Services.ApiServices
@@ -261,7 +253,7 @@ public async Task<object> InvokeContract(InvokeContractParameterModel para)
             var result = new InvokeResultModel();
             result.VmState = engine.State;
             result.GasConsumed = new BigDecimal((BigInteger)engine.GasConsumed, NativeContract.GAS.Decimals);
-            result.ResultStack = engine.ResultStack.Select(p => JStackItem.FromJson(p.ToJObject())).ToList();
+            result.ResultStack = engine.ResultStack.Select(p => p.ToJStackItem()).ToList();
             result.Notifications = engine.Notifications?.Select(ConvertToEventModel).ToList();
             if (engine.State.HasFlag(VMState.FAULT))
             {
@@ -352,13 +344,13 @@ public static object ConvertValue(StackItem item, ContractParameterType type)
                     //            JsonToContractParameter(p["value"]))).ToList();
                     //    break;
                     default:
-                        return item.ToJson();
+                        return item.SerializeJson();
                 }
             }
             catch (Exception ex)
             {
                 Console.WriteLine(ex);
-                return item.ToJson();
+                return item.SerializeJson();
             }
         }
 
@@ -384,53 +376,58 @@ public static ContractParameterType ToContractParameterType(StackItemType type)
             }
         }
 
-        public static ContractParameter JsonToContractParameter(JObject json)
+   
+        public static ContractParameter JsonToContractParameter(JsonElement json)
         {
+            var type = json.GetProperty("type").GetString();
             ContractParameter parameter = new ContractParameter
             {
-                Type = json["type"].TryGetEnum<ContractParameterType>()
+                //Type = type.ToEnum<ContractParameterType>()
             };
-            if (json["value"] == null)
+            if (!json.TryGetProperty("value", out var jsonValue))
             {
                 return parameter;
             }
-            if (json["type"].AsString() == "Address")
+            var value = jsonValue.GetString();
+            if (type == "Address")
             {
                 parameter.Type = ContractParameterType.Hash160;
-                parameter.Value = json["value"].AsString().ToScriptHash();
+                parameter.Value = value.ToScriptHash();
                 return parameter;
             }
+
+            parameter.Type = type.ToEnum<ContractParameterType>();
             switch (parameter.Type)
             {
                 case ContractParameterType.Signature:
                 case ContractParameterType.ByteArray:
-                    parameter.Value = Convert.FromBase64String(json["value"].AsString());
+                    parameter.Value = Convert.FromBase64String(value);
                     break;
                 case ContractParameterType.Boolean:
-                    parameter.Value = json["value"].AsBoolean();
+                    parameter.Value = jsonValue.GetBoolean();
                     break;
                 case ContractParameterType.Integer:
-                    parameter.Value = BigInteger.Parse(json["value"].AsString());
+                    parameter.Value = BigInteger.Parse(value);
                     break;
                 case ContractParameterType.Hash160:
-                    parameter.Value = UInt160.Parse(json["value"].AsString());
+                    parameter.Value = UInt160.Parse(value);
                     break;
                 case ContractParameterType.Hash256:
-                    parameter.Value = UInt256.Parse(json["value"].AsString());
+                    parameter.Value = UInt256.Parse(value);
                     break;
                 case ContractParameterType.PublicKey:
-                    parameter.Value = ECPoint.Parse(json["value"].AsString(), ECCurve.Secp256r1);
+                    parameter.Value = ECPoint.Parse(value, ECCurve.Secp256r1);
                     break;
                 case ContractParameterType.String:
-                    parameter.Value = json["value"].AsString();
+                    parameter.Value = value;
                     break;
                 case ContractParameterType.Array:
-                    parameter.Value = ((JArray)json["value"]).Select(p => JsonToContractParameter(p)).ToList();
+                    parameter.Value = jsonValue.EnumerateArray().Select(JsonToContractParameter).ToList();
                     break;
                 case ContractParameterType.Map:
-                    parameter.Value = ((JArray)json["value"]).Select(p =>
-                       new KeyValuePair<ContractParameter, ContractParameter>(JsonToContractParameter(p["key"]),
-                           JsonToContractParameter(p["value"]))).ToList();
+                    parameter.Value = jsonValue.EnumerateArray().Select(p =>
+                       new KeyValuePair<ContractParameter, ContractParameter>(JsonToContractParameter(p.GetProperty("key")), JsonToContractParameter(p.GetProperty("value")))
+                    ).ToList();
                     break;
                 default:
                     throw new ArgumentException();
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/GovernanceService.cs b/neo3-gui/neo3-gui/Services/ApiServices/GovernanceService.cs
index 1d959579..7af87086 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/GovernanceService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/GovernanceService.cs
@@ -3,10 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Neo.Cryptography.ECC;
-using Neo.Ledger;
 using Neo.Models;
-using Neo.Network.P2P;
-using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
 using Neo.VM;
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/TransactionApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/TransactionApiService.cs
index 10ee3b73..8c213566 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/TransactionApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/TransactionApiService.cs
@@ -3,13 +3,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Akka.Actor;
-using Neo.Common;
 using Neo.Common.Consoles;
 using Neo.Common.Storage;
-using Neo.Common.Storage.LevelDBModules;
 using Neo.Common.Utility;
 using Neo.IO;
-using Neo.IO.Json;
 using Neo.Ledger;
 using Neo.Models;
 using Neo.Models.Transactions;
@@ -59,8 +56,7 @@ public async Task<object> GetTransaction(UInt256 txId)
                     {
                         Contract = n.Contract,
                         EventName = n.EventName,
-                        State = JStackItem.FromJson(n.State),
-
+                        State = n.State.ToJStackItem(),
                     }));
             }
             return model;
@@ -84,7 +80,7 @@ public async Task<object> GetRawTransaction(UInt256 txId, bool showJson = false)
             }
             if (showJson)
             {
-                JObject json = transaction.ToJson(CliSettings.Default.Protocol);
+                var json = transaction.ToJson(CliSettings.Default.Protocol);
                 TransactionState txState = snapshot.GetTransactionState(txId);
                 if (txState != null)
                 {
@@ -175,6 +171,7 @@ public async Task<object> QueryTransactions(int pageIndex = 1, int limit = 100,
             {
                 filter.Contracts = new List<UInt160>() { contract };
             }
+
             var trans = db.QueryTransactions(filter, true);
             var result = new PageList<TransactionPreviewModel>
             {
@@ -266,7 +263,7 @@ private List<TransactionPreviewModel> ConvertToTransactionPreviewModel(List<Tran
                 TxId = tx.TxId,
                 Timestamp = tx.Time.ToTimestampMS(),
                 BlockHeight = tx.BlockHeight,
-                Transfers = tx.Transfers?.Where(t => t.TxId == tx.TxId).Select(t => t.ToTransferModel()).ToList(),
+                Transfers = tx.Transfers?.Select(t => t.ToTransferModel()).ToList(),
             }).ToList();
 
             return model;
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/VerifyApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/VerifyApiService.cs
index 5e61efdd..a2882b85 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/VerifyApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/VerifyApiService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Neo.Common;
 using Neo.Common.Consoles;
 using Neo.Models;
 using Neo.Wallets;
diff --git a/neo3-gui/neo3-gui/Services/ApiServices/WalletApiService.cs b/neo3-gui/neo3-gui/Services/ApiServices/WalletApiService.cs
index 8f092278..f63f43c4 100644
--- a/neo3-gui/neo3-gui/Services/ApiServices/WalletApiService.cs
+++ b/neo3-gui/neo3-gui/Services/ApiServices/WalletApiService.cs
@@ -6,22 +6,16 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
-using Akka.Actor;
 using Akka.Util.Internal;
-using Neo.Common;
 using Neo.Common.Consoles;
 using Neo.Common.Storage;
 using Neo.Common.Utility;
 using Neo.Cryptography;
-using Neo.IO;
-using Neo.IO.Json;
-using Neo.Ledger;
+using Neo.Json;
 using Neo.Models;
 using Neo.Models.Transactions;
 using Neo.Models.Wallets;
-using Neo.Network.P2P;
 using Neo.Network.P2P.Payloads;
-using Neo.Persistence;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
 using Neo.VM;
diff --git a/neo3-gui/neo3-gui/config.private.json b/neo3-gui/neo3-gui/config.private.json
index f885d35d..f6b4d42e 100644
--- a/neo3-gui/neo3-gui/config.private.json
+++ b/neo3-gui/neo3-gui/config.private.json
@@ -16,7 +16,7 @@
     "PluginURL": "https://github.com/neo-project/neo-modules/releases/download/v{1}/{0}.zip"
   },
   "ProtocolConfiguration": {
-    "Network": 330,
+    "Network": 340,
     "MillisecondsPerBlock": 15000,
     "MaxTraceableBlocks": 2102400,
     "ValidatorsCount": 1,
diff --git a/neo3-gui/neo3-gui/neo3-gui.csproj b/neo3-gui/neo3-gui/neo3-gui.csproj
index 3b1c4115..5f7d4568 100644
--- a/neo3-gui/neo3-gui/neo3-gui.csproj
+++ b/neo3-gui/neo3-gui/neo3-gui.csproj
@@ -24,15 +24,11 @@
 
   <ItemGroup>
     <PackageReference Include="EFCore.BulkExtensions" Version="3.1.1" />
-    <PackageReference Include="Neo" Version="3.3.1" />
+    <PackageReference Include="Neo" Version="3.4.0" />
     <PackageReference Include="Neo.LevelDb.Dev" Version="3.0.0-pre4" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <!--<ProjectReference Include="..\..\neo\src\neo\neo.csproj" />-->
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="Plugins\LevelDBStore.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>