interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-writing ethereum.js. Added future/promises support.

This commit is contained in:
obscuren 2014-09-19 22:42:55 +02:00
parent ae1de6593c
commit 8585e59718
8 changed files with 2488 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

750
mist/assets/debugger/debugger.qml
View File

@ -7,427 +7,429 @@ import QtQuick.Controls.Styles 1.1
import Ethereum 1.0 import Ethereum 1.0
ApplicationWindow { ApplicationWindow {
id: win id: win
visible: false visible: false
title: "IceCREAM" title: "IceCREAM"
minimumWidth: 1280 minimumWidth: 1280
minimumHeight: 700 minimumHeight: 700
width: 1290 width: 1290
height: 750 height: 750
property alias codeText: codeEditor.text property alias codeText: codeEditor.text
property alias dataText: rawDataField.text property alias dataText: rawDataField.text
onClosing: { onClosing: {
//compileTimer.stop() dbg.Stop()
} }
MenuBar { menuBar: MenuBar {
Menu { Menu {
title: "Debugger" title: "Edit"
MenuItem { MenuItem {
text: "Run" text: "Focus code"
shortcut: "Ctrl+r" shortcut: "Ctrl+1"
onTriggered: debugCurrent() onTriggered: {
} codeEditor.focus = true
}
}
MenuItem {
text: "Focus data"
shortcut: "Ctrl+2"
onTriggered: {
rawDataField.focus = true
}
}
MenuItem { MenuItem {
text: "Next" text: "Command"
shortcut: "Ctrl+n" shortcut: "Ctrl+l"
onTriggered: dbg.next() onTriggered: {
} dbgCommand.focus = true
}
}
}
MenuItem { Menu {
text: "Continue" title: "Debugger"
shortcut: "Ctrl+g" MenuItem {
onTriggered: dbg.continue() text: "Run"
} shortcut: "Ctrl+r"
MenuItem { onTriggered: debugCurrent()
text: "Command" }
shortcut: "Ctrl+l"
onTriggered: {
dbgCommand.focus = true
}
}
MenuItem {
text: "Focus code"
shortcut: "Ctrl+1"
onTriggered: {
codeEditor.focus = true
}
}
MenuItem {
text: "Focus data"
shortcut: "Ctrl+2"
onTriggered: {
rawDataField.focus = true
}
}
/* MenuItem {
MenuItem { text: "Stop"
text: "Close window" onTriggered: dbp.stop()
shortcut: "Ctrl+w" }
onTriggered: {
win.close() MenuSeparator {}
}
} MenuItem {
*/ text: "Next"
} shortcut: "Ctrl+n"
} onTriggered: dbg.next()
}
MenuItem {
text: "Continue"
shortcut: "Ctrl+g"
onTriggered: dbg.continue()
}
}
}
SplitView { SplitView {
anchors.fill: parent anchors.fill: parent
property var asmModel: ListModel { property var asmModel: ListModel {
id: asmModel id: asmModel
} }
TableView { TableView {
id: asmTableView id: asmTableView
width: 200 width: 200
headerVisible: false headerVisible: false
TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 } TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 }
model: asmModel model: asmModel
/* /*
alternatingRowColors: false alternatingRowColors: false
itemDelegate: Item { itemDelegate: Item {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: "#DDD" color: "#DDD"
Text { Text {
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
leftMargin: 10 leftMargin: 10
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
} }
color: "#333" color: "#333"
elide: styleData.elideMode elide: styleData.elideMode
text: styleData.value text: styleData.value
font.pixelSize: 11 font.pixelSize: 11
MouseArea { MouseArea {
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
mouse.accepted = true mouse.accepted = true
} }
} }
} }
} }
} }
*/ */
} }
Rectangle { Rectangle {
color: "#00000000" color: "#00000000"
anchors.left: asmTableView.right anchors.left: asmTableView.right
anchors.right: parent.right anchors.right: parent.right
SplitView { SplitView {
orientation: Qt.Vertical orientation: Qt.Vertical
anchors.fill: parent anchors.fill: parent
Rectangle { Rectangle {
color: "#00000000" color: "#00000000"
height: 330 height: 330
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
TextArea { TextArea {
id: codeEditor id: codeEditor
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: settings.left anchors.right: settings.left
focus: true focus: true
/* /*
Timer { Timer {
id: compileTimer id: compileTimer
interval: 500 ; running: true ; repeat: true interval: 500 ; running: true ; repeat: true
onTriggered: { onTriggered: {
dbg.autoComp(codeEditor.text) dbg.autoComp(codeEditor.text)
} }
} }
*/ */
} }
Column { Column {
id: settings id: settings
spacing: 5 spacing: 5
width: 300 width: 300
height: parent.height height: parent.height
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
Label { Label {
text: "Arbitrary data" text: "Arbitrary data"
} }
TextArea { TextArea {
id: rawDataField id: rawDataField
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: 150 height: 150
} }
Label { Label {
text: "Amount" text: "Amount"
} }
TextField { TextField {
id: txValue id: txValue
width: 200 width: 200
placeholderText: "Amount" placeholderText: "Amount"
validator: RegExpValidator { regExp: /\d*/ } validator: RegExpValidator { regExp: /\d*/ }
} }
Label { Label {
text: "Amount of gas" text: "Amount of gas"
} }
TextField { TextField {
id: txGas id: txGas
width: 200 width: 200
validator: RegExpValidator { regExp: /\d*/ } validator: RegExpValidator { regExp: /\d*/ }
text: "10000" text: "10000"
placeholderText: "Gas" placeholderText: "Gas"
} }
Label { Label {
text: "Gas price" text: "Gas price"
} }
TextField { TextField {
id: txGasPrice id: txGasPrice
width: 200 width: 200
placeholderText: "Gas price" placeholderText: "Gas price"
text: "1000000000000" text: "1000000000000"
validator: RegExpValidator { regExp: /\d*/ } validator: RegExpValidator { regExp: /\d*/ }
} }
} }
} }
SplitView { SplitView {
orientation: Qt.Vertical orientation: Qt.Vertical
id: inspectorPane id: inspectorPane
height: 500 height: 500
SplitView { SplitView {
orientation: Qt.Horizontal orientation: Qt.Horizontal
height: 150 height: 150
TableView { TableView {
id: stackTableView id: stackTableView
property var stackModel: ListModel { property var stackModel: ListModel {
id: stackModel id: stackModel
} }
height: parent.height height: parent.height
width: 300 width: 300
TableViewColumn{ role: "value" ; title: "Temp" ; width: 200 } TableViewColumn{ role: "value" ; title: "Temp" ; width: 200 }
model: stackModel model: stackModel
} }
TableView { TableView {
id: memoryTableView id: memoryTableView
property var memModel: ListModel { property var memModel: ListModel {
id: memModel id: memModel
} }
height: parent.height height: parent.height
width: parent.width - stackTableView.width width: parent.width - stackTableView.width
TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50 } TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50 }
TableViewColumn{ role: "value" ; title: "Memory" ; width: 750 } TableViewColumn{ role: "value" ; title: "Memory" ; width: 750 }
model: memModel model: memModel
} }
} }
Rectangle { Rectangle {
height: 100 height: 100
width: parent.width width: parent.width
TableView { TableView {
id: storageTableView id: storageTableView
property var memModel: ListModel { property var memModel: ListModel {
id: storageModel id: storageModel
} }
height: parent.height height: parent.height
width: parent.width width: parent.width
TableViewColumn{ id: key ; role: "key" ; title: "#" ; width: storageTableView.width / 2} TableViewColumn{ id: key ; role: "key" ; title: "#" ; width: storageTableView.width / 2}
TableViewColumn{ role: "value" ; title: "Storage" ; width: storageTableView.width / 2} TableViewColumn{ role: "value" ; title: "Storage" ; width: storageTableView.width / 2}
model: storageModel model: storageModel
} }
} }
Rectangle { Rectangle {
height: 200 height: 200
width: parent.width * 0.66 width: parent.width * 0.66
TableView { TableView {
id: logTableView id: logTableView
property var logModel: ListModel { property var logModel: ListModel {
id: logModel id: logModel
} }
height: parent.height height: parent.height
width: parent.width width: parent.width
TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 } TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width - 2 }
model: logModel model: logModel
} }
} }
} }
} }
} }
} }
function exec() { function exec() {
dbg.execCommand(dbgCommand.text); dbg.execCommand(dbgCommand.text);
dbgCommand.text = ""; dbgCommand.text = "";
} }
statusBar: StatusBar { statusBar: StatusBar {
height: 30 height: 30
TextField { TextField {
id: dbgCommand id: dbgCommand
y: 1 y: 1
x: asmTableView.width x: asmTableView.width
width: 500 width: 500
placeholderText: "Debugger (type 'help')" placeholderText: "Debugger (type 'help')"
Keys.onReturnPressed: { Keys.onReturnPressed: {
exec() exec()
} }
} }
RowLayout { RowLayout {
anchors.left: dbgCommand.right anchors.left: dbgCommand.right
anchors.leftMargin: 10 anchors.leftMargin: 10
spacing: 5 spacing: 5
y: parent.height / 2 - this.height / 2 y: parent.height / 2 - this.height / 2
Text { Text {
objectName: "stackFrame" objectName: "stackFrame"
font.pixelSize: 10 font.pixelSize: 10
text: "<b>stack ptr</b>: 0" text: "<b>stack ptr</b>: 0"
} }
Text { Text {
objectName: "stackSize" objectName: "stackSize"
font.pixelSize: 10 font.pixelSize: 10
text: "<b>stack size</b>: 0" text: "<b>stack size</b>: 0"
} }
Text { Text {
objectName: "memSize" objectName: "memSize"
font.pixelSize: 10 font.pixelSize: 10
text: "<b>mem size</b>: 0" text: "<b>mem size</b>: 0"
} }
} }
} }
toolBar: ToolBar { toolBar: ToolBar {
height: 30 height: 30
RowLayout { RowLayout {
spacing: 10 spacing: 10
Button { Button {
property var enabled: true property var enabled: true
id: debugStart id: debugStart
onClicked: { onClicked: {
debugCurrent() debugCurrent()
} }
text: "Debug" text: "Debug"
} }
Button { Button {
property var enabled: true property var enabled: true
id: debugNextButton id: debugNextButton
onClicked: { onClicked: {
dbg.next() dbg.next()
} }
text: "Next" text: "Next"
} }
Button { Button {
id: debugContinueButton id: debugContinueButton
onClicked: { onClicked: {
dbg.continue() dbg.continue()
} }
text: "Continue" text: "Continue"
} }
} }
ComboBox { ComboBox {
id: snippets id: snippets
anchors.right: parent.right anchors.right: parent.right
model: ListModel { model: ListModel {
ListElement { text: "Snippets" ; value: "" } ListElement { text: "Snippets" ; value: "" }
ListElement { text: "Call Contract" ; value: "var[2] in;\nvar ret;\n\nin[0] = \"arg1\"\nin[1] = 0xdeadbeef\n\nvar success = call(0x0c542ddea93dae0c2fcb2cf175f03ad80d6be9a0, 0, 7000, in, ret)\n\nreturn ret" } ListElement { text: "Call Contract" ; value: "var[2] in;\nvar ret;\n\nin[0] = \"arg1\"\nin[1] = 0xdeadbeef\n\nvar success = call(0x0c542ddea93dae0c2fcb2cf175f03ad80d6be9a0, 0, 7000, in, ret)\n\nreturn ret" }
} }
onCurrentIndexChanged: { onCurrentIndexChanged: {
if(currentIndex != 0) { if(currentIndex != 0) {
var code = snippets.model.get(currentIndex).value; var code = snippets.model.get(currentIndex).value;
codeEditor.insert(codeEditor.cursorPosition, code) codeEditor.insert(codeEditor.cursorPosition, code)
} }
} }
} }
} }
function debugCurrent() { function debugCurrent() {
dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text) dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
} }
function setAsm(asm) { function setAsm(asm) {
asmModel.append({asm: asm}) asmModel.append({asm: asm})
} }
function clearAsm() { function clearAsm() {
asmModel.clear() asmModel.clear()
} }
function setInstruction(num) { function setInstruction(num) {
asmTableView.selection.clear() asmTableView.selection.clear()
asmTableView.selection.select(num) asmTableView.selection.select(num)
asmTableView.positionViewAtRow(num, ListView.Center) asmTableView.positionViewAtRow(num, ListView.Center)
} }
function setMem(mem) { function setMem(mem) {
memModel.append({num: mem.num, value: mem.value}) memModel.append({num: mem.num, value: mem.value})
} }
function clearMem(){ function clearMem(){
memModel.clear() memModel.clear()
} }
function setStack(stack) { function setStack(stack) {
stackModel.append({value: stack}) stackModel.append({value: stack})
} }
function addDebugMessage(message){ function addDebugMessage(message){
debuggerLog.append({value: message}) debuggerLog.append({value: message})
} }
function clearStack() { function clearStack() {
stackModel.clear() stackModel.clear()
} }
function clearStorage() { function clearStorage() {
storageModel.clear() storageModel.clear()
} }
function setStorage(storage) { function setStorage(storage) {
storageModel.append({key: storage.key, value: storage.value}) storageModel.append({key: storage.key, value: storage.value})
} }
function setLog(msg) { function setLog(msg) {
// Remove first item once we've reached max log items // Remove first item once we've reached max log items
if(logModel.count > 250) { if(logModel.count > 250) {
logModel.remove(0) logModel.remove(0)
} }
if(msg.len != 0) { if(msg.len != 0) {
if(logTableView.flickableItem.atYEnd) { if(logTableView.flickableItem.atYEnd) {
logModel.append({message: msg}) logModel.append({message: msg})
logTableView.positionViewAtRow(logTableView.rowCount - 1, ListView.Contain) logTableView.positionViewAtRow(logTableView.rowCount - 1, ListView.Contain)
} else { } else {
logModel.append({message: msg}) logModel.append({message: msg})
} }
} }
} }
function clearLog() { function clearLog() {
logModel.clear() logModel.clear()
} }
} }

149
mist/assets/ext/html_messaging.js Normal file
View File

@ -0,0 +1,149 @@
// The magic return variable. The magic return variable will be set during the execution of the QML call.
(function(window) {
function message(type, data) {
document.title = JSON.stringify({type: type, data: data});
return window.____returnData;
}
function isPromise(o) {
return typeof o === "object" && o.then
}
window.eth = {
_callbacks: {},
_onCallbacks: {},
prototype: Object(),
coinbase: function() {
return new Promise(function(resolve, reject) {
postData({call: "getCoinBase"}, function(coinbase) {
resolve(coinbase);
});
});
},
block: function(numberOrHash) {
return new Promise(function(resolve, reject) {
var func;
if(typeof numberOrHash == "string") {
func = "getBlockByHash";
} else {
func = "getBlockByNumber";
}
postData({call: func, args: [numberOrHash]}, function(block) {
if(block)
resolve(block);
else
reject("not found");
});
});
},
transact: function(params) {
if(params === undefined) {
params = {};
}
if(params.endowment !== undefined)
params.value = params.endowment;
if(params.code !== undefined)
params.data = params.code;
var promises = []
if(isPromise(params.to)) {
promises.push(params.to.then(function(_to) { params.to = _to; }));
}
if(isPromise(params.from)) {
promises.push(params.from.then(function(_from) { params.from = _from; }));
}
if(isPromise(params.data)) {
promises.push(params.data.then(function(_code) { params.data = _code; }));
} else {
if(typeof params.data === "object") {
data = "";
for(var i = 0; i < params.data.length; i++) {
data += params.data[i]
}
} else {
data = params.data;
}
}
// Make sure everything is string
var fields = ["value", "gas", "gasPrice"];
for(var i = 0; i < fields.length; i++) {
if(params[fields[i]] === undefined) {
params[fields[i]] = "";
}
params[fields[i]] = params[fields[i]].toString();
}
// Load promises then call the last "transact".
return Q.all(promises).then(function() {
return new Promise(function(resolve, reject) {
postData({call: "transact", args: params}, function(data) {
if(data[1])
reject(data[0]);
else
resolve(data[0]);
});
});
})
},
compile: function(code) {
return new Promise(function(resolve, reject) {
postData({call: "compile", args: [code]}, function(data) {
if(data[1])
reject(data[0]);
else
resolve(data[0]);
});
});
},
key: function() {
return new Promise(function(resolve, reject) {
postData({call: "getKey"}, function(k) {
resolve(k);
});
});
}
};
function postData(data, cb) {
data._seed = Math.floor(Math.random() * 1000000)
if(cb) {
eth._callbacks[data._seed] = cb;
}
if(data.args === undefined) {
data.args = [];
}
navigator.qt.postMessage(JSON.stringify(data));
}
navigator.qt.onmessage = function(ev) {
var data = JSON.parse(ev.data)
if(data._event !== undefined) {
eth.trigger(data._event, data.data);
} else {
if(data._seed) {
var cb = eth._callbacks[data._seed];
if(cb) {
cb.call(this, data.data)
// Remove the "trigger" callback
delete eth._callbacks[ev._seed];
}
}
}
}
})(this);

4
mist/assets/ext/pre.js
View File

@ -35,3 +35,7 @@ navigator.qt.onmessage = function(ev) {
} }
} }
} }
if(typeof(Promise) === "undefined") {
window.Promise = Q.Promise;
}

1909
mist/assets/ext/q.js Normal file
View File

File diff suppressed because it is too large Load Diff

13
mist/assets/ext/qml_messaging.js Normal file
View File

@ -0,0 +1,13 @@
function HandleMessage(data) {
var message;
try { message = JSON.parse(data) } catch(e) {};
if(message) {
switch(message.type) {
case "coinbase":
return eth.coinBase();
case "block":
return eth.blockByNumber(0);
}
}
}

29
mist/assets/qml/webapp.qml
View File

@ -7,6 +7,8 @@ import QtQuick.Layouts 1.0;
import QtQuick.Window 2.1; import QtQuick.Window 2.1;
import Ethereum 1.0 import Ethereum 1.0
import "../ext/qml_messaging.js" as Messaging
//ApplicationWindow { //ApplicationWindow {
Rectangle { Rectangle {
id: window id: window
@ -14,10 +16,6 @@ Rectangle {
property var iconSource: "../browser.png" property var iconSource: "../browser.png"
property var menuItem property var menuItem
//width: 1000
//height: 800
//minimumHeight: 300
property alias url: webview.url property alias url: webview.url
property alias webView: webview property alias webView: webview
@ -97,7 +95,6 @@ Rectangle {
bottom: parent.bottom bottom: parent.bottom
top: navBar.bottom top: navBar.bottom
} }
onTitleChanged: { window.title = title }
property var cleanPath: false property var cleanPath: false
onNavigationRequested: { onNavigationRequested: {
@ -113,7 +110,7 @@ Rectangle {
uri.replace(reg, function(match, pre, domain, path) { uri.replace(reg, function(match, pre, domain, path) {
uri = pre; uri = pre;
var lookup = ui.lookupDomain(domain.substring(0, domain.length - 4)); var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
var ip = []; var ip = [];
for(var i = 0, l = lookup.length; i < l; i++) { for(var i = 0, l = lookup.length; i < l; i++) {
ip.push(lookup.charCodeAt(i)) ip.push(lookup.charCodeAt(i))
@ -138,11 +135,22 @@ Rectangle {
} }
} }
function sendMessage(data) {
//this.experimental.evaluateJavaScript("window.____returnData="+JSON.stringify(data));
webview.experimental.postMessage(JSON.stringify(data))
}
onTitleChanged: {
var data = Messaging.HandleMessage(title);
if(data) {
sendMessage(data)
}
}
experimental.preferences.javascriptEnabled: true experimental.preferences.javascriptEnabled: true
experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.navigatorQtObjectEnabled: true
experimental.preferences.developerExtrasEnabled: true experimental.preferences.developerExtrasEnabled: true
experimental.userScripts: ["../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/ethereum.js"] experimental.userScripts: ["../ext/q.js", "../ext/pre.js", "../ext/big.js", "../ext/string.js", "../ext/html_messaging.js"]
experimental.onMessageReceived: { experimental.onMessageReceived: {
console.log("[onMessageReceived]: ", message.data) console.log("[onMessageReceived]: ", message.data)
// TODO move to messaging.js // TODO move to messaging.js
@ -150,6 +158,10 @@ Rectangle {
try { try {
switch(data.call) { switch(data.call) {
case "compile":
postData(data._seed, eth.compile(data.args[0]))
break
case "getCoinBase": case "getCoinBase":
postData(data._seed, eth.coinBase()) postData(data._seed, eth.coinBase())
@ -191,7 +203,8 @@ Rectangle {
case "transact": case "transact":
require(5) require(5)
var tx = eth.transact(data.args[0], data.args[1], data.args[2],data.args[3],data.args[4],data.args[5]) var tx = eth.transact(data.args)
console.log("transactx", tx)
postData(data._seed, tx) postData(data._seed, tx)
break break

10
mist/debugger.go
View File

@ -94,9 +94,7 @@ func (self *DebuggerWindow) ClearLog() {
} }
func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) { func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) {
if !self.Db.done { self.Stop()
self.Db.Q <- true
}
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
@ -186,6 +184,12 @@ func (self *DebuggerWindow) Continue() {
self.Next() self.Next()
} }
func (self *DebuggerWindow) Stop() {
if !self.Db.done {
self.Db.Q <- true
}
}
func (self *DebuggerWindow) ExecCommand(command string) { func (self *DebuggerWindow) ExecCommand(command string) {
if len(command) > 0 { if len(command) > 0 {
cmd := strings.Split(command, " ") cmd := strings.Split(command, " ")

9
mist/ui_lib.go
View File

@ -248,3 +248,12 @@ func (self *UiLib) Transact(object map[string]interface{}) (*ethpipe.JSReceipt,
dataStr, dataStr,
) )
} }
func (self *UiLib) Compile(code string) (string, error) {
bcode, err := ethutil.Compile(code, false)
if err != nil {
return err.Error(), err
}
return ethutil.Bytes2Hex(bcode), err
}