Script Hash (Big-endian Little-endian)
-
+
{this.state.outhash}
@@ -166,43 +213,43 @@ class Datatrans extends React.Component {
Address (big endian) Script Hash
-
+
{this.state.outbighash}
-
- {this.state.outbigadd}
+
+ {this.state.outbigadd}
- {/*
+
Address (little endian) Hex String
-
- transfer
+
+ {this.state.outlittlehash}
-
-
+
+ {this.state.outlittleadd}
-
+
-
+ {/*
Number Hex Number
- transfer
+ {this.state.outhexnum}
-
+
*/}
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Common/menudown.js b/neo3-gui/neo3-gui/ClientApp/src/components/Common/menudown.js
index c3e79b61..5afa79d2 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Common/menudown.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Common/menudown.js
@@ -7,7 +7,10 @@ import { message } from 'antd';
import { Modal, Button } from 'antd';
import axios from 'axios';
import { Radio } from 'antd';
+import Addressdetail from './addressdetail';
+import Setting from './setting';
import {
+ ReadOutlined,
LogoutOutlined,
SettingOutlined
} from '@ant-design/icons';
@@ -24,23 +27,13 @@ class menuDown extends React.Component {
constructor(props) {
super(props);
this.state = {
- showPass: false
+ showPass: false,
+ title:"设置",
};
}
componentDidMount() {
this.showPass();
}
-
- switchLang = (lng) => {
- const { t, i18n } = this.props;
- console.log("current lang:", Config.Language)
- if (Config.Language === lng) {
- return;
- }
- Config.Language = lng;
- i18n.changeLanguage(lng);
- }
-
showPass = () => {
let _path = location.href.search(/wallet/g);
if (_path <= -1) return;
@@ -53,15 +46,15 @@ class menuDown extends React.Component {
"id": "1234",
"method": "CloseWallet"
})
- .then(() => {
- message.success(t("wallet page.close wallet success"), 2);
- this.props.walletStore.logout();
- this.props.history.push('/');
- })
- .catch(function (error) {
- console.log(error);
- console.log("error");
- });
+ .then(() => {
+ message.success(t("wallet page.close wallet success"), 2);
+ this.props.walletStore.logout();
+ this.props.history.push('/');
+ })
+ .catch(function (error) {
+ console.log(error);
+ console.log("error");
+ });
}
showModal = () => {
this.setState({
@@ -74,6 +67,20 @@ class menuDown extends React.Component {
visible: false,
});
};
+ getInset = (ele) => {
+ const { t } = this.props;
+ return () =>{
+ this.setState({showElem: false})
+ switch(ele){
+ case 0:this.setState({title:t("address book"),children: });break;
+ case 1:this.setState({title:t("settings"),children: });break;
+ default:this.setState({title:t("settings"),children: });break;
+ }
+ this.setState({
+ visible: true,
+ });
+ }
+ }
openUrl(url) {
return () => {
shell.openExternal(url);
@@ -81,28 +88,26 @@ class menuDown extends React.Component {
}
render() {
const walletOpen = this.props.walletStore.isOpen;
- const { t, i18n } = this.props;
+ const { t } = this.props;
return (
- {t("network setting")}
-
-
- {t("mainnet")}
- {t("testnet")}
-
-
-
- {t("language setting")}
-
- this.switchLang("zh")}>中文
- this.switchLang("en")}>English
-
-
- {t("about")}
- {/* 更新完成，请重新启动Neo-GUI
*/}
- {t("current version")} 1.0.1
-
-
-
NeoGUI @ 2020 Neo-Project {t("copyright")}
-
- {/* 查看帮助 */}
- {t("report issues")}
- Neo{t("official website")}
-
-
+ {this.state.children}
)
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Common/setting.js b/neo3-gui/neo3-gui/ClientApp/src/components/Common/setting.js
new file mode 100644
index 00000000..e9bad786
--- /dev/null
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Common/setting.js
@@ -0,0 +1,94 @@
+/* eslint-disable */
+//just test replace wallet//
+import React from 'react';
+import axios from 'axios';
+import {Link} from 'react-router-dom';
+import { Layout, Row, Col, Modal,List, Button,Typography, message } from 'antd';
+
+import { observer, inject } from "mobx-react";
+
+import { withRouter } from "react-router-dom";
+import Sync from '../sync';
+import { Radio } from 'antd';
+import Intitle from '../Common/intitle';
+import Transaction from '../Transaction/transaction';
+import '../../static/css/wallet.css';
+import Topath from '../Common/topath';
+import { withTranslation } from 'react-i18next';
+import Config from "../../config";
+import {
+ LogoutOutlined,
+ SettingOutlined
+} from '@ant-design/icons';
+
+import {
+ CloseCircleOutlined
+} from '@ant-design/icons';
+
+const { shell } = window.electron;
+const { confirm } = Modal;
+const { Content } = Layout;
+
+@withTranslation()
+@inject("walletStore")
+@observer
+@withRouter
+class Setting extends React.Component{
+ constructor(props){
+ super(props);
+ this.state = {
+ size: 'default',
+ address:"",
+ addresslist:[],
+ iconLoading:false,
+ gas:0,
+ };
+ }
+
+ switchLang = (lng) => {
+ const { t, i18n } = this.props;
+ console.log("current lang:", Config.Language)
+ if (Config.Language === lng) {
+ return;
+ }
+ Config.Language = lng;
+ i18n.changeLanguage(lng);
+ }
+ openUrl (url) {
+ return ()=>{
+ shell.openExternal(url);
+ }
+ }
+ render = () =>{
+ const { addresslist,address } = this.state;
+ const { t, i18n } = this.props;
+ return (
+
+
{t("network setting")}
+
+ {t("mainnet")}
+ {t("testnet")}
+
+
+
{t("language setting")}
+
+ this.switchLang("zh")}>中文
+ this.switchLang("en")}>English
+
+
+
{t("about")}
+
{t("current version")} 1.0.1
+
+
+
-
{t('error code')}: {res.code}
-
{t('error msg')}: {res.message}
-
+
{t('error code')}: {res.code}
+
{t('error msg')}: {res.message}
+
-
{t('contract page.invoke result')}
+
{t('contract page.test result')}
手续费：{cost} GAS
:null} */}
diff --git a/neo3-gui/neo3-gui/ClientApp/src/components/Contract/invoke.js b/neo3-gui/neo3-gui/ClientApp/src/components/Contract/invoke.js
index 829cf87e..b1b0484c 100644
--- a/neo3-gui/neo3-gui/ClientApp/src/components/Contract/invoke.js
+++ b/neo3-gui/neo3-gui/ClientApp/src/components/Contract/invoke.js
@@ -2,6 +2,7 @@
import React from 'react';
import 'antd/dist/antd.css';
import axios from 'axios';
+import { observer, inject } from "mobx-react";
import { Input,
Icon,
Cascader,
@@ -15,74 +16,312 @@ import { Input,
Button,
} from 'antd';
+import Datatrans from '../Common/datatrans';
import { Layout } from 'antd';
import Intitle from '../Common/intitle'
import '../../static/css/wallet.css'
import Sync from '../sync'
+import { SwapOutlined } from '@ant-design/icons';
+
+import { withRouter } from "react-router-dom";
+import { withTranslation } from "react-i18next";
+
+const { TextArea } = Input;
const { Content } = Layout;
const {dialog} = window.remote;
+const {Option} = Select;
+const layout = {
+ labelCol: { span: 4 },
+ wrapperCol: { span: 20 },
+};
-
+@withTranslation()
+@inject("walletStore")
+@observer
+@withRouter
class Contractinvoke extends React.Component{
constructor(props){
super(props);
this.state = {
size: 'default',
path:"",
- disabled:false
+ disabled:false,
+ visible: false,
+ methods:[],
+ params:[],
+ methodname:""
};
}
toHome = () =>{
location.href=location.origin;
}
- toPage = (e) =>{
+ showDrawer = () => {
+ this.setState({
+ visible: true,
+ });
+ };
+ onClose = () => {
+ this.setState({
+ visible: false,
+ });
+ };
+ showDetail = () =>{
+ this.searchContract(res=>{
+ let list = new Array();
+ list = res.entryPoint?list.concat(res.entryPoint):list;
+ let methods = list.concat(res.methods);
+ this.setState({
+ hash:res.contractHash,
+ methods:methods
+ })
+ });
}
- selectNef = () =>{
- this.opendialog( res =>{
- this.setState({ path: res.filePaths }
- ,()=>{});
- })
- }
- opendialog = callback => {
- var _this = this;
- _this.setState({disabled:true})
- dialog.showOpenDialog({
- title: '保存钱包文件',
- defaultPath: '/',
- filters: [
- {
- name: 'JSON',
- extensions: ['json']
+ searchContract = callback => {
+ const { t } = this.props;
+ let _hash = (this.refs.sinput.input.value).trim();
+ if(!_hash){message.info(t("contract page.search input check"));return;}
+ axios.post('http://localhost:8081', {
+ "id":"1111",
+ "method": "GetContract",
+ "params": {
+ "contractHash":_hash
}
- ]
- }).then(function (res) {
- callback(res);
- }).catch(function (error){
+ })
+ .then(function (response) {
+ var _data = response.data;
+ console.log(_data);
+ if(_data.msgType === -1){
+ message.info(t("contract page.search fail"));
+ return;
+ }else if(_data.msgType === 3){
+ callback(_data.result.manifest.abi)
+ }
+ })
+ .catch(function (error) {
console.log(error);
+ console.log("error");
+ });
+ }
+ showPara = e => {
+ this.setState({
+ params:this.state.methods[e].parameters,
+ methodname:this.state.methods[e].name
+ })
+ }
+ makeParams = (data) =>{
+ let _params = {
+ "contractHash": this.state.hash,
+ "method": this.state.methodname,
+ "parameters":[],
+ "cosigners":[],
+ "sendTx": false
+ };
+
+ let inside = new Array();
+ this.state.params.map((item)=>{
+ item.value = data[item.name];
+ inside = inside.concat(item)
+ })
+ if(inside) _params.parameters = inside;
+
+ let cosigners = new Array();
+ data.cosigners?data.cosigners.map((item)=>{
+ let _list = {};
+ _list.account = item;
+ cosigners = cosigners.concat(_list)
+ }):null;
+ if(cosigners) _params.cosigners = cosigners;
+
+ return _params;
+ }
+ onFill = () => {
+ this.refs.formRef.setFieldsValue({
+ tresult:this.state.tresult
+ });
+ };
+ testInvoke = () => {
+ const { t } = this.props;
+ this.setState({
+ tresult:"",
+ },this.onFill());
+ this.refs.formRef.validateFields().then(data => {
+ let params = this.makeParams(data);
+
+ this.invokeContract(params,res=>{
+ this.setState({
+ tresult:JSON.stringify(res),
+ },this.onFill());
+ });
+ }).catch(function(res){
+ console.log(res)
+ message.error(t("input.checked"));
})
}
- out = fieldsValue =>{
- console.log(fieldsValue)
+ invoke = fieldsValue =>{
+ let params = this.makeParams(fieldsValue);
+ params.sendTx = true;
+ const { t } = this.props;
+ this.setState({
+ tresult:"",
+ },this.onFill());
+ this.invokeContract(params,res=>{
+ Modal.info({
+ title: t('contract page.invoke contract'),
+ width: 600,
+ content: (
+
+
TxID : {res.result.txId?res.result.txId:"--"}
+
GAS : {res.result.gasConsumed?res.result.gasConsumed:"--"}
+
+
{t('error code')}: {_data.error.code}
+
{t('error msg')}: {_data.error.message}
+
-
-
-
-
-
-
-
+
+
+
+
+
+