Skip to content

G
Geth-Modification
Commit b64ad7a2 authored by obscuren's avatar obscuren
Browse files
Options

Merge branch 'develop' into miner

parents da2fae0e 3f6baa45
Hide whitespace changes
Inline Side-by-side
Showing with 1651 additions and 1097 deletions
.travis.yml
View file @ b64ad7a2
...@@ -11,8 +11,8 @@ install: ...@@ -11,8 +11,8 @@ install:
# - go get golang.org/x/tools/cmd/vet # - go get golang.org/x/tools/cmd/vet
- if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
- go get github.com/mattn/goveralls - go get github.com/mattn/goveralls
- go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - go get gopkg.in/check.v1
- ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get -d $ETH_DEPS; fi - DEPS=$(go list -f '{{.Imports}}' ./... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$DEPS" ]; then go get -d -v $DEPS; fi
before_script: before_script:
- gofmt -l -w . - gofmt -l -w .
- goimports -l -w . - goimports -l -w .
...@@ -20,7 +20,9 @@ before_script: ...@@ -20,7 +20,9 @@ before_script:
# - go vet ./... # - go vet ./...
# - go test -race ./... # - go test -race ./...
script: script:
- ./gocoverage.sh && if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi - ./gocoverage.sh
after_success:
- if [ "$COVERALLS_TOKEN" ]; then goveralls -coverprofile=profile.cov -service=travis-ci -repotoken $COVERALLS_TOKEN; fi
env: env:
global: global:
- PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig
......
Dockerfile
View file @ b64ad7a2
...@@ -21,13 +21,10 @@ RUN apt-get install -y qt54quickcontrols qt54webengine ...@@ -21,13 +21,10 @@ RUN apt-get install -y qt54quickcontrols qt54webengine
## Build and install latest Go ## Build and install latest Go
RUN git clone https://go.googlesource.com/go golang RUN git clone https://go.googlesource.com/go golang
RUN cd golang && git checkout go1.4.1 RUN cd golang && git checkout go1.4.1
RUN cd golang/src && ./all.bash && go version RUN cd golang/src && ./make.bash && go version
## Fetch and install QML # this is a workaround, to make sure that docker's cache is invalidated whenever the git repo changes
RUN go get -u -v -d github.com/obscuren/qml ADD https://api.github.com/repos/ethereum/go-ethereum/git/refs/heads/develop file_does_not_exist
WORKDIR $GOPATH/src/github.com/obscuren/qml
RUN git checkout v1
RUN go install -v
## Fetch and install go-ethereum ## Fetch and install go-ethereum
RUN go get -u -v -d github.com/ethereum/go-ethereum/... RUN go get -u -v -d github.com/ethereum/go-ethereum/...
......
README.md
View file @ b64ad7a2
...@@ -29,7 +29,7 @@ For further, detailed, build instruction please see the [Wiki](https://github.co ...@@ -29,7 +29,7 @@ For further, detailed, build instruction please see the [Wiki](https://github.co
Automated (dev) builds Automated (dev) builds
====================== ======================
* [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/latest/app/)] * [[OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg)]
* [Windows] Coming soon™ * [Windows] Coming soon™
* [Linux] Coming soon™ * [Linux] Coming soon™
......
cmd/mist/assets/examples/coin.html
View file @ b64ad7a2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<h1>JevCoin <code id="address"></code></h1> <h1>JevCoin <code id="contract_addr"></code></h1>
<div> <div>
<strong>Balance</strong> <strong>Balance</strong>
<span id="balance"></strong> <span id="balance"></strong>
...@@ -58,29 +58,25 @@ ...@@ -58,29 +58,25 @@
}], }],
"outputs": [] "outputs": []
}, { }, {
"name":"changed", "name":"received",
"type":"event", "type":"event",
"inputs": [ "inputs": [
{"name":"to","type":"address","indexed":true},
{"name":"from","type":"address","indexed":true}, {"name":"from","type":"address","indexed":true},
{"name":"amount","type":"uint256","indexed":true},
], ],
}]; }];
var address = localStorage.getItem("address"); var address = localStorage.getItem("address");
// deploy if not exist // deploy if not exist
if (address == null) { if (address == null) {
var code = "0x60056013565b610132806100356000396000f35b620f4240600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b61003361012d565b60006000f35b610047600435602435610062565b60006000f35b61005860043561010b565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054106100855761008a565b610107565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555081600160a060020a031633600160a060020a03167f1863989b4bb7c5c3941722099764574df7a459f9f9c6b6cdca35ddc9731792b860006000a35b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; var code = "0x60056013565b61012b806100346000396000f35b6103e8600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b610033610126565b60006000f35b610047600435602435610062565b60006000f35b610058600435610104565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054101561008657610100565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555033600160a060020a0316600052806020527ff11e547d796cc64acdf758e7cee90439494fd886a19159454aa61e473fdbafef60406000a15b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156";
address = web3.eth.transact({ address = web3.eth.transact({data: code});
data: code,
gasPrice: "1000000000000000",
gas: "10000",
});
localStorage.setItem("address", address); localStorage.setItem("address", address);
} }
document.querySelector("#address").innerHTML = address.toUpperCase(); document.querySelector("#contract_addr").innerHTML = address.toUpperCase();
var contract = web3.eth.contract(address, desc); var contract = web3.eth.contract(address, desc);
contract.changed({from: eth.accounts[0]}).changed(function() { contract.received({from: eth.coinbase}).changed(function() {
refresh(); refresh();
}); });
eth.watch('chain').changed(function() { eth.watch('chain').changed(function() {
...@@ -102,7 +98,6 @@ ...@@ -102,7 +98,6 @@
function transact() { function transact() {
var to = document.querySelector("#address").value; var to = document.querySelector("#address").value;
if( to.length == 0 ) { if( to.length == 0 ) {
to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3";
} else { } else {
......
cmd/mist/assets/examples/coin.js 0 → 100644
View file @ b64ad7a2
var contract = web3.eth.contractFromAbi([{"constant":false,"inputs":[{"name":"_h","type":"hash256"}],"name":"confirm","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":_to","type":"address"},{"name":"_value","type":"uint256"},{"name":"_data","type":"bytes"}],"name":"execute","outputs":[{"name":"_r","type":"hash256"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"}],"name":"kill","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"}],"name":"changeOwner","outputs":[],"type":"function"},{"inputs":[{"indexed":false,"name":"value","type":"uint256"}],"name":"CashIn","type":"event"},{"inputs":[{"indexed":true,"name":"out","type":"string32"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"}],"name":"SingleTransact","type":"event"},{"inputs":[{"indexed":true,"name":"out","type":"string32"},{"indexed":false,"name":"owner","type":"address"},{"indexed":false,"name":"operation","type":"hash256"},{"indexed":false,"name":"value","type":"uint256"},{"indexed":false,"name":"to","type":"address"}],"name":"MultiTransact","type":"event"}]);
cmd/mist/assets/qml/main.qml
View file @ b64ad7a2
...@@ -9,882 +9,1095 @@ import Ethereum 1.0 ...@@ -9,882 +9,1095 @@ import Ethereum 1.0
import "../ext/filter.js" as Eth import "../ext/filter.js" as Eth
import "../ext/http.js" as Http import "../ext/http.js" as Http
ApplicationWindow { ApplicationWindow {
id: root id: root
property var ethx : Eth.ethx //flags: Qt.FramelessWindowHint
// Use this to make the window frameless. But then you'll need to do move and resize by hand
width: 1200
height: 820 property var ethx : Eth.ethx
minimumWidth: 300
width: 1200
title: "Mist" height: 820
minimumHeight: 600
TextField { minimumWidth: 800
id: copyElementHax
visible: false title: "Mist"
}
TextField {
function copyToClipboard(text) { id: copyElementHax
copyElementHax.text = text visible: false
copyElementHax.selectAll() }
copyElementHax.copy()
} function copyToClipboard(text) {
copyElementHax.text = text
// Takes care of loading all default plugins copyElementHax.selectAll()
Component.onCompleted: { copyElementHax.copy()
var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true}); }
addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});
// Takes care of loading all default plugins
addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"}); Component.onCompleted: {
addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"}); var catalog = addPlugin("./views/catalog.qml", {noAdd: true, close: false, section: "begin"});
addPlugin("./views/pending_tx.qml", {noAdd: true, close: false, section: "legacy"}); var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
addPlugin("./views/info.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/miner.qml", {noAdd: true, close: false, section: "ethereum", active: true});
mainSplit.setView(wallet.view, wallet.menuItem); addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/whisper.qml", {noAdd: true, close: false, section: "legacy"});
newBrowserTab(eth.assetPath("html/home.html")); addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/pending_tx.qml", {noAdd: true, close: false, section: "legacy"});
// Command setup addPlugin("./views/info.qml", {noAdd: true, close: false, section: "legacy"});
gui.sendCommand(0)
} mainSplit.setView(catalog.view, catalog.menuItem);
function activeView(view, menuItem) { //newBrowserTab("http://ethereum-dapp-catalog.meteor.com");
mainSplit.setView(view, menuItem)
if (view.hideUrl) { // Command setup
urlPane.visible = false; gui.sendCommand(0)
mainView.anchors.top = rootView.top }
} else {
urlPane.visible = true; function activeView(view, menuItem) {
mainView.anchors.top = divider.bottom mainSplit.setView(view, menuItem)
} if (view.hideUrl) {
} urlPane.visible = false;
mainView.anchors.top = rootView.top
function addViews(view, path, options) { } else {
var views = mainSplit.addComponent(view, options) urlPane.visible = true;
views.menuItem.path = path mainView.anchors.top = divider.bottom
}
mainSplit.views.push(views); }
if(!options.noAdd) { function addViews(view, path, options) {
gui.addPlugin(path) var views = mainSplit.addComponent(view, options)
} views.menuItem.path = path
return views mainSplit.views.push(views);
}
if(!options.noAdd) {
function addPlugin(path, options) { gui.addPlugin(path)
try { }
if(typeof(path) === "string" && /^https?/.test(path)) {
console.log('load http') return views
Http.request(path, function(o) { }
if(o.status === 200) {
var view = Qt.createQmlObject(o.responseText, mainView, path) function addPlugin(path, options) {
addViews(view, path, options) try {
} if(typeof(path) === "string" && /^https?/.test(path)) {
}) console.log('load http')
Http.request(path, function(o) {
return if(o.status === 200) {
} var view = Qt.createQmlObject(o.responseText, mainView, path)
addViews(view, path, options)
var component = Qt.createComponent(path); }
if(component.status != Component.Ready) { })
if(component.status == Component.Error) {
ethx.note("error: ", component.errorString()); return
} }
return var component = Qt.createComponent(path);
} if(component.status != Component.Ready) {
if(component.status == Component.Error) {
var view = mainView.createView(component, options) ethx.note("error: ", component.errorString());
var views = addViews(view, path, options) }
return views return
} catch(e) { }
console.log(e)
} var view = mainView.createView(component, options)
} var views = addViews(view, path, options)
function newBrowserTab(url) { return views
var window = addPlugin("./views/browser.qml", {noAdd: true, close: true, section: "apps", active: true}); } catch(e) {
window.view.url = url; console.log(e)
window.menuItem.title = "Mist"; }
activeView(window.view, window.menuItem); }
}
function newBrowserTab(url) {
menuBar: MenuBar {
Menu { var urlMatches = url.toString().match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
title: "File" var requestedDomain = urlMatches && urlMatches[1];
MenuItem {
text: "Import App" var domainAlreadyOpen = false;
shortcut: "Ctrl+o"
onTriggered: { console.log("requested: " + requestedDomain )
generalFileDialog.show(true, importApp)
} for(var i = 0; i < mainSplit.views.length; i++) {
} if (mainSplit.views[i].view.url) {
var matches = mainSplit.views[i].view.url.toString().match(/^[a-z]*\:\/\/(?:www\.)?([^\/?#]+)(?:[\/?#]|$)/i);
MenuItem { var existingDomain = matches && matches[1];
text: "Add plugin" console.log("exists: " + existingDomain);
onTriggered: { if (requestedDomain == existingDomain) {
generalFileDialog.show(true, function(path) { domainAlreadyOpen = true;
addPlugin(path, {close: true, section: "apps"}) mainSplit.views[i].view.url = url;
}) activeView(mainSplit.views[i].view, mainSplit.views[i].menuItem);
} }
} }
}
MenuItem {
text: "New tab" if (!domainAlreadyOpen) {
shortcut: "Ctrl+t" var window = addPlugin("./views/browser.qml", {noAdd: true, close: true, section: "apps", active: true});
onTriggered: { window.view.url = url;
newBrowserTab("about:blank"); window.menuItem.title = "Mist";
} activeView(window.view, window.menuItem);
} }
}
MenuSeparator {}
MenuItem {
text: "Import key" menuBar: MenuBar {
shortcut: "Ctrl+i" Menu {
onTriggered: { title: "File"
generalFileDialog.show(true, function(path) { MenuItem {
gui.importKey(path) text: "Import App"
}) shortcut: "Ctrl+o"
} onTriggered: {
} generalFileDialog.show(true, importApp)
}
MenuItem { }
text: "Export keys"
shortcut: "Ctrl+e" MenuItem {
onTriggered: { text: "Add plugin"
generalFileDialog.show(false, function(path) { onTriggered: {
}) generalFileDialog.show(true, function(path) {
} addPlugin(path, {close: true, section: "apps"})
} })
}
} }
Menu { MenuItem {
title: "Developer" text: "New tab"
MenuItem { shortcut: "Ctrl+t"
iconSource: "../icecream.png" onTriggered: {
text: "Debugger" newBrowserTab("http://etherian.io");
shortcut: "Ctrl+d" }
onTriggered: eth.startDebugger() }
}
MenuSeparator {}
MenuItem {
text: "Import Tx" MenuItem {
onTriggered: { text: "Import key"
txImportDialog.visible = true shortcut: "Ctrl+i"
} onTriggered: {
} generalFileDialog.show(true, function(path) {
gui.importKey(path)
MenuItem { })
text: "Run JS file" }
onTriggered: { }
generalFileDialog.show(true, function(path) {
eth.evalJavascriptFile(path) MenuItem {
}) text: "Export keys"
} shortcut: "Ctrl+e"
} onTriggered: {
generalFileDialog.show(false, function(path) {
MenuItem { })
text: "Dump state" }
onTriggered: { }
generalFileDialog.show(false, function(path) {
// Empty hash for latest }
gui.dumpState("", path)
}) Menu {
} title: "Developer"
} MenuItem {
iconSource: "../icecream.png"
MenuSeparator {} text: "Debugger"
} shortcut: "Ctrl+d"
onTriggered: eth.startDebugger()
Menu { }
title: "Network"
MenuItem { MenuItem {
text: "Add Peer" text: "Import Tx"
shortcut: "Ctrl+p" onTriggered: {
onTriggered: { txImportDialog.visible = true
addPeerWin.visible = true }
} }
}
MenuItem { MenuItem {
text: "Show Peers" text: "Run JS file"
shortcut: "Ctrl+e" onTriggered: {
onTriggered: { generalFileDialog.show(true, function(path) {
peerWindow.visible = true eth.evalJavascriptFile(path)
} })
} }
} }
Menu { MenuItem {
title: "Help" text: "Dump state"
MenuItem { onTriggered: {
text: "About" generalFileDialog.show(false, function(path) {
onTriggered: { // Empty hash for latest
aboutWin.visible = true gui.dumpState("", path)
} })
} }
} }
Menu { MenuSeparator {}
title: "GLOBAL SHORTCUTS" }
visible: false
MenuItem { Menu {
visible: false title: "Network"
shortcut: "Ctrl+l" MenuItem {
onTriggered: { text: "Add Peer"
url.focus = true shortcut: "Ctrl+p"
} onTriggered: {
} addPeerWin.visible = true
} }
} }
MenuItem {
statusBar: StatusBar { text: "Show Peers"
//height: 32 shortcut: "Ctrl+e"
id: statusBar onTriggered: {
Label { peerWindow.visible = true
//y: 6 }
id: walletValueLabel }
}
font.pixelSize: 10
styleColor: "#797979" Menu {
} title: "Help"
MenuItem {
Label { text: "About"
//y: 6 onTriggered: {
objectName: "miningLabel" aboutWin.visible = true
visible: true }
font.pixelSize: 10 }
anchors.right: lastBlockLabel.left }
anchors.rightMargin: 5
} Menu {
title: "GLOBAL SHORTCUTS"
Label { visible: false
//y: 6 MenuItem {
id: lastBlockLabel visible: false
objectName: "lastBlockLabel" shortcut: "Ctrl+l"
visible: true onTriggered: {
text: "" url.focus = true
font.pixelSize: 10 }
anchors.right: peerGroup.left }
anchors.rightMargin: 5 }
} }
ProgressBar { statusBar: StatusBar {
visible: false //height: 32
id: downloadIndicator visible: false
value: 0
objectName: "downloadIndicator" id: statusBar
y: -4 Label {
x: statusBar.width / 2 - this.width / 2 //y: 6
width: 160 id: walletValueLabel
}
font.pixelSize: 10
Label { styleColor: "#797979"
visible: false }
objectName: "downloadLabel"
//y: 7 Label {
anchors.left: downloadIndicator.right //y: 6
anchors.leftMargin: 5 objectName: "miningLabel"
font.pixelSize: 10 visible: true
text: "0 / 0" font.pixelSize: 10
} anchors.right: lastBlockLabel.left
anchors.rightMargin: 5
}
RowLayout {
id: peerGroup Label {
//y: 7 id: lastBlockLabel
anchors.right: parent.right objectName: "lastBlockLabel"
MouseArea { visible: true
onDoubleClicked: peerWindow.visible = true text: "---"
anchors.fill: parent font.pixelSize: 10
} anchors.right: peerGroup.left
anchors.rightMargin: 5
Label { }
id: peerLabel
font.pixelSize: 10 ProgressBar {
text: "0 / 0" visible: false
} id: downloadIndicator
} value: 0
} objectName: "downloadIndicator"
y: -4
x: statusBar.width / 2 - this.width / 2
property var blockModel: ListModel { width: 160
id: blockModel }
}
Label {
SplitView { visible: false
property var views: []; objectName: "downloadLabel"
//y: 7
id: mainSplit anchors.left: downloadIndicator.right
anchors.fill: parent anchors.leftMargin: 5
resizing: false font.pixelSize: 10
text: "0 / 0"
function setView(view, menu) { }
for(var i = 0; i < views.length; i++) {
views[i].view.visible = false
views[i].menuItem.setSelection(false) RowLayout {
} id: peerGroup
view.visible = true //y: 7
menu.setSelection(true) anchors.right: parent.right
} MouseArea {
onDoubleClicked: peerWindow.visible = true
function addComponent(view, options) { anchors.fill: parent
view.visible = false }
view.anchors.fill = mainView
Label {
var menuItem = menu.createMenuItem(view, options); id: peerLabel
if( view.hasOwnProperty("menuItem") ) { font.pixelSize: 10
view.menuItem = menuItem; text: "0 / 0"
} }
}
if( view.hasOwnProperty("onReady") ) { }
view.onReady.call(view)
}
property var blockModel: ListModel {
if( options.active ) { id: blockModel
setView(view, menuItem) }
}
SplitView {
property var views: [];
return {view: view, menuItem: menuItem}
} id: mainSplit
anchors.fill: parent
/********************* //resizing: false // this is NOT where we remove that damning resizing handle..
* Main menu. handleDelegate: Item {
********************/ //This handle is a way to remove the line between the split views
Rectangle { Rectangle {
id: menu anchors.fill: parent
Layout.minimumWidth: 210 }
Layout.maximumWidth: 210 }
anchors.top: parent.top
color: "#ececec" function setView(view, menu) {
for(var i = 0; i < views.length; i++) {
Component { views[i].view.visible = false
id: menuItemTemplate views[i].menuItem.setSelection(false)
Rectangle { }
id: menuItem view.visible = true
property var view; menu.setSelection(true)
property var path; }
property var closable;
function addComponent(view, options) {
property alias title: label.text view.visible = false
property alias icon: icon.source view.anchors.fill = mainView
property alias secondaryTitle: secondary.text
function setSelection(on) { var menuItem = menu.createMenuItem(view, options);
sel.visible = on if( view.hasOwnProperty("menuItem") ) {
} view.menuItem = menuItem;
}
width: 206
height: 28 if( view.hasOwnProperty("onReady") ) {
color: "#00000000" view.onReady.call(view)
}
anchors {
left: parent.left if( options.active ) {
leftMargin: 4 setView(view, menuItem)
} }
Rectangle {
id: sel return {view: view, menuItem: menuItem}
visible: false }
anchors.fill: parent
color: "#00000000" /*********************
Rectangle { * Main menu.
id: r ********************/
anchors.fill: parent Rectangle {
border.color: "#CCCCCC" id: menu
border.width: 1 Layout.minimumWidth: 192
radius: 5 Layout.maximumWidth: 192
color: "#FFFFFFFF"
} FontLoader {
Rectangle { id: sourceSansPro
anchors { source: "fonts/SourceSansPro-Regular.ttf"
top: r.top }
bottom: r.bottom FontLoader {
right: r.right source: "fonts/SourceSansPro-Semibold.ttf"
} }
width: 10 FontLoader {
color: "#FFFFFFFF" source: "fonts/SourceSansPro-Bold.ttf"
}
Rectangle { FontLoader {
anchors { source: "fonts/SourceSansPro-Black.ttf"
left: parent.left }
right: parent.right FontLoader {
top: parent.top source: "fonts/SourceSansPro-Light.ttf"
} }
height: 1 FontLoader {
color: "#CCCCCC" source: "fonts/SourceSansPro-ExtraLight.ttf"
} }
FontLoader {
Rectangle { id: simpleLineIcons
anchors { source: "fonts/Simple-Line-Icons.ttf"
left: parent.left }
right: parent.right
bottom: parent.bottom Rectangle {
} color: "steelblue"
height: 1 anchors.fill: parent
color: "#CCCCCC"
} MouseArea {
} anchors.fill: parent
} property real lastMouseX: 0
property real lastMouseY: 0
MouseArea { onPressed: {
anchors.fill: parent lastMouseX = mouseX
onClicked: { lastMouseY = mouseY
activeView(view, menuItem); }
} onPositionChanged: {
} root.x += (mouseX - lastMouseX)
root.y += (mouseY - lastMouseY)
Image { }
id: icon /*onDoubleClicked: {
height: 20 //!maximized ? view.set_max() : view.set_normal()}
width: 20 visibility = "Minimized"
anchors { }*/
left: parent.left }
verticalCenter: parent.verticalCenter }
leftMargin: 3
}
MouseArea {
anchors.fill: parent anchors.top: parent.top
onClicked: { Rectangle {
menuItem.closeApp() width: parent.height
} height: parent.width
} anchors.centerIn: parent
} rotation: 90
Text { gradient: Gradient {
id: label GradientStop { position: 0.0; color: "#E2DEDE" }
anchors { GradientStop { position: 0.1; color: "#EBE8E8" }
left: icon.right GradientStop { position: 1.0; color: "#EBE8E8" }
verticalCenter: parent.verticalCenter }
leftMargin: 3 }
}
Component {
color: "#0D0A01" id: menuItemTemplate
font.pixelSize: 12 Rectangle {
} id: menuItem
property var view;
Text { property var path;
id: secondary property var closable;
anchors {
right: parent.right property alias title: label.text
rightMargin: 8 property alias icon: icon.source
verticalCenter: parent.verticalCenter property alias secondaryTitle: secondary.text
} function setSelection(on) {
color: "#AEADBE" sel.visible = on
font.pixelSize: 12
} if (this.closable == true) {
closeIcon.visible = on
}
function closeApp() { }
if(!this.closable) { return; }
function setAsBigButton(on) {
if(this.view.hasOwnProperty("onDestroy")) { newAppButton.visible = on
this.view.onDestroy.call(this.view) label.visible = !on
} buttonLabel.visible = on
}
this.view.destroy()
this.destroy() width: 192
for (var i = 0; i < mainSplit.views.length; i++) { height: 55
var view = mainSplit.views[i]; color: "#00000000"
if (view.menuItem === this) {
mainSplit.views.splice(i, 1); anchors {
break; left: parent.left
} leftMargin: 4
} }
gui.removePlugin(this.path)
activeView(mainSplit.views[0].view, mainSplit.views[0].menuItem); Rectangle {
} // New App Button
} id: newAppButton
} visible: false
anchors.fill: parent
function createMenuItem(view, options) { anchors.rightMargin: 8
if(options === undefined) { border.width: 0
options = {}; radius: 5
} height: 55
width: 180
var section; color: "#F3F1F3"
switch(options.section) { }
case "ethereum":
section = menuDefault; Rectangle {
break; id: sel
case "legacy": visible: false
section = menuLegacy; anchors.fill: parent
break; color: "#00000000"
default: Rectangle {
section = menuApps; id: r
break; anchors.fill: parent
} border.width: 0
radius: 5
var comp = menuItemTemplate.createObject(section) color: "#FAFAFA"
comp.view = view }
comp.title = view.title Rectangle {
anchors {
if(view.hasOwnProperty("iconSource")) { top: r.top
comp.icon = view.iconSource; bottom: r.bottom
} right: r.right
comp.closable = options.close; }
width: 10
return comp color: "#FAFAFA"
} border.width:0
ColumnLayout { Rectangle {
id: menuColumn // Small line on top of selection. What's this for?
y: 10 anchors {
width: parent.width left: parent.left
anchors.left: parent.left right: parent.right
anchors.right: parent.right top: parent.top
spacing: 3 }
height: 1
Text { color: "#FAFAFA"
text: "ETHEREUM" }
font.bold: true
anchors { Rectangle {
left: parent.left // Small line on bottom of selection. What's this for again?
leftMargin: 5 anchors {
} left: parent.left
color: "#888888" right: parent.right
} bottom: parent.bottom
}
ColumnLayout { height: 1
id: menuDefault color: "#FAFAFA"
spacing: 3 }
anchors { }
left: parent.left }
right: parent.right
} MouseArea {
} anchors.fill: parent
hoverEnabled: true
onClicked: {
Text { activeView(view, menuItem);
text: "NET" }
font.bold: true onEntered: {
anchors { if (parent.closable == true) {
left: parent.left closeIcon.visible = sel.visible
leftMargin: 5 }
}
color: "#888888" }
} onExited: {
closeIcon.visible = false
ColumnLayout { }
id: menuApps }
spacing: 3
anchors { Image {
left: parent.left id: icon
right: parent.right height: 24
} width: 24
} anchors {
left: parent.left
Text { verticalCenter: parent.verticalCenter
text: "DEBUG" leftMargin: 6
font.bold: true }
anchors { }
left: parent.left
leftMargin: 5 Text {
} id: buttonLabel
color: "#888888" visible: false
} text: "GO TO NEW APP"
font.family: sourceSansPro.name
ColumnLayout { font.weight: Font.DemiBold
id: menuLegacy anchors.horizontalCenter: parent.horizontalCenter
spacing: 3 anchors.verticalCenter: parent.verticalCenter
anchors { color: "#AAA0A0"
left: parent.left }
right: parent.right
} Text {
} id: label
} font.family: sourceSansPro.name
} font.weight: Font.DemiBold
anchors {
/********************* left: icon.right
* Main view verticalCenter: parent.verticalCenter
********************/ leftMargin: 6
Rectangle { // verticalCenterOffset: -10
id: rootView }
anchors.right: parent.right x:250
anchors.left: menu.right color: "#665F5F"
anchors.bottom: parent.bottom font.pixelSize: 14
anchors.top: parent.top }
color: "#00000000"
Rectangle { Text {
id: urlPane id: secondary
height: 40 font.family: sourceSansPro.name
color: "#00000000" font.weight: Font.Light
anchors { anchors {
left: parent.left left: icon.right
right: parent.right leftMargin: 6
leftMargin: 5 top: label.bottom
rightMargin: 5 }
top: parent.top color: "#6691C2"
topMargin: 5 font.pixelSize: 12
} }
TextField {
id: url Rectangle {
objectName: "url" id: closeIcon
placeholderText: "DApp URL" visible: false
anchors { width: 10
left: parent.left height: 10
right: parent.right color: "#FFFFFF"
top: parent.top anchors {
topMargin: 5 fill: icon
rightMargin: 5 }
leftMargin: 5
} MouseArea {
anchors.fill: parent
Keys.onReturnPressed: { onClicked: {
if(/^https?/.test(this.text)) { menuItem.closeApp()
newBrowserTab(this.text); }
} else { }
addPlugin(this.text, {close: true, section: "apps"})
} Text {
}
} font.family: simpleLineIcons.name
anchors {
} centerIn: parent
}
// Border color: "#665F5F"
Rectangle { font.pixelSize: 18
id: divider text: "\ue082"
anchors { }
left: parent.left }
right: parent.right
top: urlPane.bottom
}
z: -1 function closeApp() {
height: 1 if(!this.closable) { return; }
color: "#CCCCCC"
} if(this.view.hasOwnProperty("onDestroy")) {
this.view.onDestroy.call(this.view)
Rectangle { }
id: mainView
color: "#00000000" this.view.destroy()
anchors.right: parent.right this.destroy()
anchors.left: parent.left for (var i = 0; i < mainSplit.views.length; i++) {
anchors.bottom: parent.bottom var view = mainSplit.views[i];
anchors.top: divider.bottom if (view.menuItem === this) {
mainSplit.views.splice(i, 1);
function createView(component) { break;
var view = component.createObject(mainView) }
}
return view; gui.removePlugin(this.path)
} activeView(mainSplit.views[0].view, mainSplit.views[0].menuItem);
} }
} }
} }
function createMenuItem(view, options) {
/****************** if(options === undefined) {
* Dialogs options = {};
*****************/ }
FileDialog {
id: generalFileDialog var section;
property var callback; switch(options.section) {
onAccepted: { case "begin":
var path = this.fileUrl.toString(); section = menuBegin
callback.call(this, path); break;
} case "ethereum":
section = menuDefault;
function show(selectExisting, callback) { break;
generalFileDialog.callback = callback; case "legacy":
generalFileDialog.selectExisting = selectExisting; section = menuLegacy;
break;
this.open(); default:
} section = menuApps;
} break;
}
/****************** var comp = menuItemTemplate.createObject(section)
* Wallet functions comp.view = view
*****************/ comp.title = view.title
function importApp(path) {
var ext = path.split('.').pop() if(view.hasOwnProperty("iconSource")) {
if(ext == "html" || ext == "htm") { comp.icon = view.iconSource;
eth.openHtml(path) }
}else if(ext == "qml"){ comp.closable = options.close;
addPlugin(path, {close: true, section: "apps"})
} if (options.section === "begin") {
} comp.setAsBigButton(true)
}
function setWalletValue(value) { return comp
walletValueLabel.text = value }
}
ColumnLayout {
function loadPlugin(name) { id: menuColumn
console.log("Loading plugin" + name) y: 10
var view = mainView.addPlugin(name) width: parent.width
} anchors.left: parent.left
anchors.right: parent.right
function setPeers(text) { spacing: 3
peerLabel.text = text
}
function addPeer(peer) { ColumnLayout {
// We could just append the whole peer object but it cries if you try to alter them id: menuBegin
peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version, caps: peer.caps}) spacing: 3
} anchors {
left: parent.left
function resetPeers(){ right: parent.right
peerModel.clear() }
} }
function timeAgo(unixTs){ Rectangle {
var lapsed = (Date.now() - new Date(unixTs*1000)) / 1000 height: 55
return (lapsed + " seconds ago") color: "transparent"
} Text {
text: "ETHEREUM"
function convertToPretty(unixTs){ font.family: sourceSansPro.name
var a = new Date(unixTs*1000); font.weight: Font.DemiBold
var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec']; anchors {
var year = a.getFullYear(); left: parent.left
var month = months[a.getMonth()]; top: parent.verticalCenter
var date = a.getDate(); leftMargin: 16
var hour = a.getHours(); }
var min = a.getMinutes(); color: "#AAA0A0"
var sec = a.getSeconds(); }
var time = date+' '+month+' '+year+' '+hour+':'+min+':'+sec ; }
return time;
}
ColumnLayout {
/********************** id: menuDefault
* Windows spacing: 3
*********************/ anchors {
Window { left: parent.left
id: peerWindow right: parent.right
//flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint }
height: 200 }
width: 700
Rectangle { Rectangle {
anchors.fill: parent height: 55
property var peerModel: ListModel { color: "transparent"
id: peerModel Text {
} text: "APPS"
TableView { font.family: sourceSansPro.name
anchors.fill: parent font.weight: Font.DemiBold
id: peerTable anchors {
model: peerModel left: parent.left
TableViewColumn{width: 200; role: "ip" ; title: "IP" } top: parent.verticalCenter
TableViewColumn{width: 260; role: "version" ; title: "Version" } leftMargin: 16
TableViewColumn{width: 180; role: "caps" ; title: "Capabilities" } }
} color: "#AAA0A0"
} }
} }
Window { ColumnLayout {
id: aboutWin id: menuApps
visible: false spacing: 3
title: "About" anchors {
minimumWidth: 350 left: parent.left
maximumWidth: 350 right: parent.right
maximumHeight: 280 }
minimumHeight: 280 }
Image { Rectangle {
id: aboutIcon height: 55
height: 150 color: "transparent"
width: 150 Text {
fillMode: Image.PreserveAspectFit text: "DEBUG"
smooth: true font.family: sourceSansPro.name
source: "../facet.png" font.weight: Font.DemiBold
x: 10 anchors {
y: 30 left: parent.left
} top: parent.verticalCenter
leftMargin: 16
Text { }
anchors.left: aboutIcon.right color: "#AAA0A0"
anchors.leftMargin: 10 }
anchors.top: parent.top }
anchors.topMargin: 30
font.pointSize: 12
text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>" ColumnLayout {
} id: menuLegacy
} spacing: 3
anchors {
Window { left: parent.left
id: txImportDialog right: parent.right
minimumWidth: 270 }
maximumWidth: 270 }
maximumHeight: 50 }
minimumHeight: 50 }
TextField {
id: txImportField /*********************
width: 170 * Main view
anchors.verticalCenter: parent.verticalCenter ********************/
anchors.left: parent.left Rectangle {
anchors.leftMargin: 10 id: rootView
onAccepted: { anchors.right: parent.right
} anchors.left: menu.right
} anchors.bottom: parent.bottom
Button { anchors.top: parent.top
anchors.left: txImportField.right color: "#00000000"
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 5 /*Rectangle {
text: "Import" id: urlPane
onClicked: { height: 40
eth.importTx(txImportField.text) color: "#00000000"
txImportField.visible = false anchors {
} left: parent.left
} right: parent.right
Component.onCompleted: { leftMargin: 5
addrField.focus = true rightMargin: 5
} top: parent.top
} topMargin: 5
}
Window { TextField {
id: addPeerWin id: url
visible: false objectName: "url"
minimumWidth: 300 placeholderText: "DApp URL"
maximumWidth: 300 anchors {
maximumHeight: 50 left: parent.left
minimumHeight: 50 right: parent.right
title: "Connect to peer" top: parent.top
topMargin: 5
ComboBox { rightMargin: 5
id: addrField leftMargin: 5
anchors.verticalCenter: parent.verticalCenter }
anchors.left: parent.left
anchors.right: addPeerButton.left Keys.onReturnPressed: {
anchors.leftMargin: 10 if(/^https?/.test(this.text)) {
anchors.rightMargin: 10 newBrowserTab(this.text);
onAccepted: { } else {
eth.connectToPeer(addrField.currentText) addPlugin(this.text, {close: true, section: "apps"})
addPeerWin.visible = false }
} }
}
editable: true
model: ListModel { id: pastPeers } }
Component.onCompleted: { // Border
pastPeers.insert(0, {text: "poc-8.ethdev.com:30303"}) Rectangle {
/* id: divider
var ips = eth.pastPeers() anchors {
for(var i = 0; i < ips.length; i++) { left: parent.left
pastPeers.append({text: ips.get(i)}) right: parent.right
} top: urlPane.bottom
}
pastPeers.insert(0, {text: "poc-7.ethdev.com:30303"}) z: -1
*/ height: 1
} color: "#CCCCCC"
} }*/
Button { Rectangle {
id: addPeerButton id: mainView
anchors.right: parent.right color: "#00000000"
anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right
anchors.rightMargin: 10 anchors.left: parent.left
text: "Add" anchors.bottom: parent.bottom
onClicked: { anchors.top: parent.top
eth.connectToPeer(addrField.currentText)
addPeerWin.visible = false function createView(component) {
} var view = component.createObject(mainView)
}
Component.onCompleted: { return view;
addrField.focus = true }
} }
} }
} }
/******************
* Dialogs
*****************/
FileDialog {
id: generalFileDialog
property var callback;
onAccepted: {
var path = this.fileUrl.toString();
callback.call(this, path);
}
function show(selectExisting, callback) {
generalFileDialog.callback = callback;
generalFileDialog.selectExisting = selectExisting;
this.open();
}
}
/******************
* Wallet functions
*****************/
function importApp(path) {
var ext = path.split('.').pop()
if(ext == "html" || ext == "htm") {
eth.openHtml(path)
}else if(ext == "qml"){
addPlugin(path, {close: true, section: "apps"})
}
}
function setWalletValue(value) {
walletValueLabel.text = value
}
function loadPlugin(name) {
console.log("Loading plugin" + name)
var view = mainView.addPlugin(name)
}
function setPeers(text) {
peerLabel.text = text
}
function addPeer(peer) {
// We could just append the whole peer object but it cries if you try to alter them
peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version, caps: peer.caps})
}
function resetPeers(){
peerModel.clear()
}
function timeAgo(unixTs){
var lapsed = (Date.now() - new Date(unixTs*1000)) / 1000
return (lapsed + " seconds ago")
}
function convertToPretty(unixTs){
var a = new Date(unixTs*1000);
var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
var year = a.getFullYear();
var month = months[a.getMonth()];
var date = a.getDate();
var hour = a.getHours();
var min = a.getMinutes();
var sec = a.getSeconds();
var time = date+' '+month+' '+year+' '+hour+':'+min+':'+sec ;
return time;
}
/**********************
* Windows
*********************/
Window {
id: peerWindow
//flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint
height: 200
width: 700
Rectangle {
anchors.fill: parent
property var peerModel: ListModel {
id: peerModel
}
TableView {
anchors.fill: parent
id: peerTable
model: peerModel
TableViewColumn{width: 200; role: "ip" ; title: "IP" }
TableViewColumn{width: 260; role: "version" ; title: "Version" }
TableViewColumn{width: 180; role: "caps" ; title: "Capabilities" }
}
}
}
Window {
id: aboutWin
visible: false
title: "About"
minimumWidth: 350
maximumWidth: 350
maximumHeight: 280
minimumHeight: 280
Image {
id: aboutIcon
height: 150
width: 150
fillMode: Image.PreserveAspectFit
smooth: true
source: "../facet.png"
x: 10
y: 30
}
Text {
anchors.left: aboutIcon.right
anchors.leftMargin: 10
anchors.top: parent.top
anchors.topMargin: 30
font.pointSize: 12
text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>"
}
}
Window {
id: txImportDialog
minimumWidth: 270
maximumWidth: 270
maximumHeight: 50
minimumHeight: 50
TextField {
id: txImportField
width: 170
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.leftMargin: 10
onAccepted: {
}
}
Button {
anchors.left: txImportField.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 5
text: "Import"
onClicked: {
eth.importTx(txImportField.text)
txImportField.visible = false
}
}
Component.onCompleted: {
addrField.focus = true
}
}
Window {
id: addPeerWin
visible: false
minimumWidth: 300
maximumWidth: 300
maximumHeight: 50
minimumHeight: 50
title: "Connect to peer"
ComboBox {
id: addrField
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.right: addPeerButton.left
anchors.leftMargin: 10
anchors.rightMargin: 10
onAccepted: {
eth.connectToPeer(addrField.currentText)
addPeerWin.visible = false
}
editable: true
model: ListModel { id: pastPeers }
Component.onCompleted: {
pastPeers.insert(0, {text: "poc-8.ethdev.com:30303"})
/*
var ips = eth.pastPeers()
for(var i = 0; i < ips.length; i++) {
pastPeers.append({text: ips.get(i)})
}
pastPeers.insert(0, {text: "poc-7.ethdev.com:30303"})
*/
}
}
Button {
id: addPeerButton
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: 10
text: "Add"
onClicked: {
eth.connectToPeer(addrField.currentText)
addPeerWin.visible = false
}
}
Component.onCompleted: {
addrField.focus = true
}
}
}
\ No newline at end of file
cmd/mist/assets/qml/views/browser.qml
View file @ b64ad7a2
...@@ -56,12 +56,34 @@ Rectangle { ...@@ -56,12 +56,34 @@ Rectangle {
//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>"); //uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
uriNav.text = uri; uriNav.text = uri;
} else { } else {
// Prevent inf loop. // Prevent inf loop.
window.cleanPath = false; window.cleanPath = false;
} }
} }
function showFullUrlBar(on){
if (on) {
//appTitle.visible = false
//appDomain.visible = false
//uriNav.visible = true
clickAnywhereOnApp.visible = true
navBar.state = "fullUrlVisible"
} else {
//appTitle.visible = true
//appDomain.visible = true
//uriNav.visible = false
clickAnywhereOnApp.visible = false
navBar.state = "titleVisible"
}
}
Component.onCompleted: { Component.onCompleted: {
} }
...@@ -71,75 +93,234 @@ Rectangle { ...@@ -71,75 +93,234 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
state: "inspectorShown" state: "inspectorShown"
MouseArea {
id: clickAnywhereOnApp
z:15
//hoverEnabled: true
anchors.fill: parent
/*hoverEnabled: true*/
onClicked: {
showFullUrlBar(false);
}
/*Rectangle {
anchors.fill: parent
color: "#88888888"
}*/
}
RowLayout { RowLayout {
id: navBar id: navBar
height: 40 height: 74
z: 20
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
leftMargin: 7
} }
Button { Button {
id: back id: back
onClicked: { onClicked: {
webview.goBack() webview.goBack()
} }
anchors{
left: parent.left
leftMargin: 6
}
style: ButtonStyle { style: ButtonStyle {
background: Image { background: Image {
source: "../../back.png" source: "../../backButton.png"
width: 30 width: 20
height: 30 height: 30
} }
} }
} }
TextField { Rectangle {
anchors { id: appInfoPane
height: 28
color: "#FFFFFF"
radius: 6
MouseArea {
anchors.fill: parent
z: 10
hoverEnabled: true
onEntered: {
showFullUrlBar(true);
}
}
anchors {
left: back.right left: back.right
right: toggleInspector.left right: parent.right
leftMargin: 10 leftMargin: 10
rightMargin: 10 rightMargin: 10
} }
text: webview.url;
id: uriNav
y: parent.height / 2 - this.height / 2
Keys.onReturnPressed: { Text {
webview.url = this.text; id: appTitle
} text: "LOADING"
font.bold: true
font.capitalization: Font.AllUppercase
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
anchors {
left: parent.left
right: parent.horizontalCenter
top: parent.top
bottom: parent.bottom
rightMargin: 10
}
color: "#928484"
}
Text {
id: appDomain
text: "loading domain"
font.bold: false
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
anchors {
left: parent.horizontalCenter
right: parent.right
top: parent.top
bottom: parent.bottom
leftMargin: 10
}
color: "#C0AFAF"
}
TextField {
id: uriNav
opacity: 0.0
anchors {
left: parent.left
right: parent.right
leftMargin: 16
}
horizontalAlignment: Text.AlignHCenter
style: TextFieldStyle {
textColor: "#928484"
background: Rectangle {
border.width: 0
color: "transparent"
}
}
text: webview.url;
y: parent.height / 2 - this.height / 2
z: 20
activeFocusOnPress: true
Keys.onReturnPressed: {
webview.url = this.text;
}
/* onFocusedChanged: {
if (focused) {
//uriNav.selectAll();
}
}*/
}
z:2
} }
Rectangle {
id: appInfoPaneShadow
width: 10
height: 30
color: "#BDB6B6"
radius: 6
Button { anchors {
id: toggleInspector left: back.right
anchors {
right: parent.right right: parent.right
leftMargin:10
rightMargin:10
top: parent.top
topMargin: 23
} }
iconSource: "../../bug.png"
onClicked: {
// XXX soon
return
if(inspector.visible == true){
inspector.visible = false
}else{
inspector.visible = true
inspector.url = webview.experimental.remoteInspectorUrl
}
}
}
}
// Border z:1
Rectangle {
id: divider
anchors {
left: parent.left
right: parent.right
top: navBar.bottom
} }
z: -1
height: 1 Rectangle {
color: "#CCCCCC" id: navBarBackground
anchors.fill: parent
gradient: Gradient {
GradientStop { position: 0.0; color: "#F6F1F2" }
GradientStop { position: 1.0; color: "#DED5D5" }
}
z:-1
}
states: [
State {
name: "fullUrlVisible"
PropertyChanges {
target: appTitle
anchors.rightMargin: -50
opacity: 0.0
}
PropertyChanges {
target: appDomain
anchors.leftMargin: -50
opacity: 0.0
}
PropertyChanges {
target: uriNav
anchors.leftMargin: 0
opacity: 1.0
}
},
State {
name: "titleVisible"
PropertyChanges {
target: appTitle
anchors.rightMargin: 10
opacity: 1.0
}
PropertyChanges {
target: appDomain
anchors.leftMargin: 10
opacity: 1.0
}
PropertyChanges {
target: uriNav
anchors.leftMargin: -50
opacity: 0.0
}
}
]
transitions: [
// This adds a transition that defaults to applying to all state changes
Transition {
// This applies a default NumberAnimation to any changes a state change makes to x or y properties
NumberAnimation {
properties: "anchors.leftMargin, anchors.rightMargin, opacity"
easing.type: Easing.InOutQuad //Easing.InOutBack
duration: 300
}
}
]
} }
WebEngineView { WebEngineView {
...@@ -149,16 +330,51 @@ Rectangle { ...@@ -149,16 +330,51 @@ Rectangle {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
top: divider.bottom top: navBar.bottom
} }
z: 10
onLoadingChanged: { onLoadingChanged: {
if (loadRequest.status == WebEngineView.LoadSucceededStatus) { if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
webview.runJavaScript("document.title", function(pageTitle) { webview.runJavaScript("document.title", function(pageTitle) {
menuItem.title = pageTitle; menuItem.title = pageTitle;
}); });
//var topBarStyle
webView.runJavaScript("document.querySelector(\"meta[name='ethereum-dapp-url-bar-style']\").getAttribute(\"content\")", function(topBarStyle){
if (topBarStyle=="transparent") {
// Adjust for a transparent sidebar Dapp
navBarBackground.visible = false;
back.visible = false;
appInfoPane.anchors.leftMargin = -16;
appInfoPaneShadow.anchors.leftMargin = -16;
webview.anchors.topMargin = -74;
webview.runJavaScript("document.querySelector('body').classList.add('ethereum-dapp-url-bar-style-transparent')")
} else {
navBarBackground.visible = true;
back.visible = true;
appInfoPane.anchors.leftMargin = 0;
appInfoPaneShadow.anchors.leftMargin = 0;
webview.anchors.topMargin = 0;
};
});
webview.runJavaScript(eth.readFile("bignumber.min.js")); webview.runJavaScript(eth.readFile("bignumber.min.js"));
webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js")); webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
var cleanTitle = webview.url.toString()
var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
var domain = matches && matches[1];
appDomain.text = domain //webview.url.replace("a", "z")
appTitle.text = webview.title
showFullUrlBar(false);
} }
} }
onJavaScriptConsoleMessage: { onJavaScriptConsoleMessage: {
...@@ -208,4 +424,3 @@ Rectangle { ...@@ -208,4 +424,3 @@ Rectangle {
] ]
} }
} }
cmd/mist/assets/qml/views/catalog.qml 0 → 100644
View file @ b64ad7a2
import QtQuick 2.0
import QtQuick.Controls 1.0;
import QtQuick.Controls.Styles 1.0
import QtQuick.Layouts 1.0;
import QtWebEngine 1.0
//import QtWebEngine.experimental 1.0
import QtQuick.Window 2.0;
Rectangle {
id: window
anchors.fill: parent
color: "#00000000"
property var title: "Catalog"
property var iconSource: ""
property var menuItem
property var hideUrl: true
property alias url: webview.url
property alias windowTitle: webview.title
property alias webView: webview
property var cleanPath: false
property var open: function(url) {
if(!window.cleanPath) {
var uri = url;
if(!/.*\:\/\/.*/.test(uri)) {
uri = "http://" + uri;
}
var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
if(reg.test(uri)) {
uri.replace(reg, function(match, pre, domain, path) {
uri = pre;
var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
var ip = [];
for(var i = 0, l = lookup.length; i < l; i++) {
ip.push(lookup.charCodeAt(i))
}
if(ip.length != 0) {
uri += lookup;
} else {
uri += domain;
}
uri += path;
});
}
window.cleanPath = true;
webview.url = uri;
//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
uriNav.text = uri;
} else {
// Prevent inf loop.
window.cleanPath = false;
}
}
Component.onCompleted: {
}
Item {
objectName: "root"
id: root
anchors.fill: parent
state: "inspectorShown"
WebEngineView {
objectName: "webView"
id: webview
anchors.fill: parent
property var protocol: "http://"
//property var domain: "localhost:3000"
property var domain: "ethereum-dapp-catalog.meteor.com"
url: protocol + domain
//navigationRequest: WebEngineView.IgnoreRequest
// onLoadingChanged: {
// if (loadRequest.status == WebEngineView.LoadSucceededStatus) {
// webview.runJavaScript(eth.readFile("bignumber.min.js"));
// webview.runJavaScript(eth.readFile("ethereum.js/dist/ethereum.js"));
// }
// }
//onNavigationRequested: {
// detect URL scheme prefix, most likely an external link
//var schemaRE = /^\w+:/;
//if (schemaRE.test(request.url)) {
// request.action = WebView.AcceptRequest;
//} else {
//request.action = WebView.IgnoreRequest;
// delegate request.url here
//}
//}
onJavaScriptConsoleMessage: {
console.log(sourceID + ":" + lineNumber + ":" + JSON.stringify(message));
}
onNavigationRequested: {
var cleanTitle = request.url.toString()
var matches = cleanTitle.match(/^[a-z]*\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
var requestedDomain = matches && matches[1];
console.debug ("NavigationRequested: " + request.url + " navigationType=" + request.navigationType)
if(request.navigationType==0){
if (requestedDomain === this.domain){
request.action = WebEngineView.AcceptRequest;
} else {
request.action = WebEngineView.IgnoreRequest;
newBrowserTab(request.url);
}
}
}
}
WebEngineView {
id: inspector
visible: false
z:10
anchors {
left: root.left
right: root.right
top: sizeGrip.bottom
bottom: root.bottom
}
}
states: [
State {
name: "inspectorShown"
PropertyChanges {
target: inspector
}
}
]
}
}
core/block_processor.go
View file @ b64ad7a2
...@@ -8,11 +8,9 @@ import ( ...@@ -8,11 +8,9 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/pow" "github.com/ethereum/go-ethereum/pow"
"github.com/ethereum/go-ethereum/pow/ezp" "github.com/ethereum/go-ethereum/pow/ezp"
"github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/state"
...@@ -25,20 +23,6 @@ type PendingBlockEvent struct { ...@@ -25,20 +23,6 @@ type PendingBlockEvent struct {
var statelogger = logger.NewLogger("BLOCK") var statelogger = logger.NewLogger("BLOCK")
type EthManager interface {
BlockProcessor() *BlockProcessor
ChainManager() *ChainManager
TxPool() *TxPool
PeerCount() int
IsMining() bool
IsListening() bool
Peers() []*p2p.Peer
KeyManager() *crypto.KeyManager
ClientIdentity() p2p.ClientIdentity
Db() ethutil.Database
EventMux() *event.TypeMux
}
type BlockProcessor struct { type BlockProcessor struct {
db ethutil.Database db ethutil.Database
// Mutex for locking the block processor. Blocks can only be handled one at a time // Mutex for locking the block processor. Blocks can only be handled one at a time
...@@ -160,6 +144,9 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state ...@@ -160,6 +144,9 @@ func (self *BlockProcessor) ApplyTransactions(coinbase *state.StateObject, state
return receipts, handled, unhandled, erroneous, err return receipts, handled, unhandled, erroneous, err
} }
// Process block will attempt to process the given block's transactions and applies them
// on top of the block's parent state (given it exists) and will return wether it was
// successful or not.
func (sm *BlockProcessor) Process(block *types.Block) (td *big.Int, err error) { func (sm *BlockProcessor) Process(block *types.Block) (td *big.Int, err error) {
// Processing a blocks may never happen simultaneously // Processing a blocks may never happen simultaneously
sm.mutex.Lock() sm.mutex.Lock()
...@@ -175,14 +162,14 @@ func (sm *BlockProcessor) Process(block *types.Block) (td *big.Int, err error) { ...@@ -175,14 +162,14 @@ func (sm *BlockProcessor) Process(block *types.Block) (td *big.Int, err error) {
} }
parent := sm.bc.GetBlock(header.ParentHash) parent := sm.bc.GetBlock(header.ParentHash)
return sm.ProcessWithParent(block, parent) return sm.processWithParent(block, parent)
} }
func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big.Int, err error) { func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (td *big.Int, err error) {
sm.lastAttemptedBlock = block sm.lastAttemptedBlock = block
// Create a new state based on the parent's root (e.g., create copy)
state := state.New(parent.Root(), sm.db) state := state.New(parent.Root(), sm.db)
//state := state.New(parent.Trie().Copy())
// Block validation // Block validation
if err = sm.ValidateBlock(block, parent); err != nil { if err = sm.ValidateBlock(block, parent); err != nil {
...@@ -196,18 +183,23 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big ...@@ -196,18 +183,23 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big
header := block.Header() header := block.Header()
// Validate the received block's bloom with the one derived from the generated receipts.
// For valid blocks this should always validate to true.
rbloom := types.CreateBloom(receipts) rbloom := types.CreateBloom(receipts)
if bytes.Compare(rbloom, header.Bloom) != 0 { if bytes.Compare(rbloom, header.Bloom) != 0 {
err = fmt.Errorf("unable to replicate block's bloom=%x", rbloom) err = fmt.Errorf("unable to replicate block's bloom=%x", rbloom)
return return
} }
// The transactions Trie's root (R = (Tr [[H1, T1], [H2, T2], ... [Hn, Tn]]))
// can be used by light clients to make sure they've received the correct Txs
txSha := types.DeriveSha(block.Transactions()) txSha := types.DeriveSha(block.Transactions())
if bytes.Compare(txSha, header.TxHash) != 0 { if bytes.Compare(txSha, header.TxHash) != 0 {
err = fmt.Errorf("validating transaction root. received=%x got=%x", header.TxHash, txSha) err = fmt.Errorf("validating transaction root. received=%x got=%x", header.TxHash, txSha)
return return
} }
// Tre receipt Trie's root (R = (Tr [[H1, R1], ... [Hn, R1]]))
receiptSha := types.DeriveSha(receipts) receiptSha := types.DeriveSha(receipts)
if bytes.Compare(receiptSha, header.ReceiptHash) != 0 { if bytes.Compare(receiptSha, header.ReceiptHash) != 0 {
fmt.Println("receipts", receipts) fmt.Println("receipts", receipts)
...@@ -215,12 +207,14 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big ...@@ -215,12 +207,14 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big
return return
} }
// Accumulate static rewards; block reward, uncle's and uncle inclusion.
if err = sm.AccumulateRewards(state, block, parent); err != nil { if err = sm.AccumulateRewards(state, block, parent); err != nil {
return return
} }
// Commit state objects/accounts to a temporary trie (does not save)
// used to calculate the state root.
state.Update(ethutil.Big0) state.Update(ethutil.Big0)
if !bytes.Equal(header.Root, state.Root()) { if !bytes.Equal(header.Root, state.Root()) {
err = fmt.Errorf("invalid merkle root. received=%x got=%x", header.Root, state.Root()) err = fmt.Errorf("invalid merkle root. received=%x got=%x", header.Root, state.Root())
return return
...@@ -230,10 +224,6 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big ...@@ -230,10 +224,6 @@ func (sm *BlockProcessor) ProcessWithParent(block, parent *types.Block) (td *big
td = CalculateTD(block, parent) td = CalculateTD(block, parent)
// Sync the current block's state to the database // Sync the current block's state to the database
state.Sync() state.Sync()
// Set the block hashes for the current messages
state.Manifest().SetHash(block.Hash())
// Reset the manifest XXX We need this?
state.Manifest().Reset()
// Remove transactions from the pool // Remove transactions from the pool
sm.txpool.RemoveSet(block.Transactions()) sm.txpool.RemoveSet(block.Transactions())
...@@ -313,27 +303,6 @@ func (sm *BlockProcessor) AccumulateRewards(statedb *state.StateDB, block, paren ...@@ -313,27 +303,6 @@ func (sm *BlockProcessor) AccumulateRewards(statedb *state.StateDB, block, paren
return nil return nil
} }
func (sm *BlockProcessor) GetMessages(block *types.Block) (messages []*state.Message, err error) {
if !sm.bc.HasBlock(block.Header().ParentHash) {
return nil, ParentError(block.Header().ParentHash)
}
sm.lastAttemptedBlock = block
var (
parent = sm.bc.GetBlock(block.Header().ParentHash)
//state = state.New(parent.Trie().Copy())
state = state.New(parent.Root(), sm.db)
)
defer state.Reset()
sm.TransitionState(state, parent, block)
sm.AccumulateRewards(state, block, parent)
return state.Manifest().Messages, nil
}
func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err error) { func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err error) {
if !sm.bc.HasBlock(block.Header().ParentHash) { if !sm.bc.HasBlock(block.Header().ParentHash) {
return nil, ParentError(block.Header().ParentHash) return nil, ParentError(block.Header().ParentHash)
......
core/manager.go 0 → 100644
View file @ b64ad7a2
package core
import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/p2p"
)
type EthManager interface {
BlockProcessor() *BlockProcessor
ChainManager() *ChainManager
TxPool() *TxPool
PeerCount() int
IsMining() bool
IsListening() bool
Peers() []*p2p.Peer
KeyManager() *crypto.KeyManager
ClientIdentity() p2p.ClientIdentity
Db() ethutil.Database
EventMux() *event.TypeMux
}
eth/block_pool_test.go
View file @ b64ad7a2
...@@ -613,6 +613,7 @@ func TestInvalidBlock(t *testing.T) { ...@@ -613,6 +613,7 @@ func TestInvalidBlock(t *testing.T) {
} }
func TestVerifyPoW(t *testing.T) { func TestVerifyPoW(t *testing.T) {
t.Skip("***FIX*** This test is broken")
logInit() logInit()
_, blockPool, blockPoolTester := newTestBlockPool(t) _, blockPool, blockPoolTester := newTestBlockPool(t)
blockPoolTester.blockChain[0] = nil blockPoolTester.blockChain[0] = nil
......
rlp/encode.go
View file @ b64ad7a2
...@@ -32,6 +32,48 @@ type Encoder interface { ...@@ -32,6 +32,48 @@ type Encoder interface {
EncodeRLP(io.Writer) error EncodeRLP(io.Writer) error
} }
// Flat wraps a value (which must encode as a list) so
// it encodes as the list's elements.
//
// Example: suppose you have defined a type
//
// type foo struct { A, B uint }
//
// Under normal encoding rules,
//
// rlp.Encode(foo{1, 2}) --> 0xC20102
//
// This function can help you achieve the following encoding:
//
// rlp.Encode(rlp.Flat(foo{1, 2})) --> 0x0102
func Flat(val interface{}) Encoder {
return flatenc{val}
}
type flatenc struct{ val interface{} }
func (e flatenc) EncodeRLP(out io.Writer) error {
// record current output position
var (
eb = out.(*encbuf)
prevstrsize = len(eb.str)
prevnheads = len(eb.lheads)
)
if err := eb.encode(e.val); err != nil {
return err
}
// check that a new list header has appeared
if len(eb.lheads) == prevnheads || eb.lheads[prevnheads].offset == prevstrsize-1 {
return fmt.Errorf("rlp.Flat: %T did not encode as list", e.val)
}
// remove the new list header
newhead := eb.lheads[prevnheads]
copy(eb.lheads[prevnheads:], eb.lheads[prevnheads+1:])
eb.lheads = eb.lheads[:len(eb.lheads)-1]
eb.lhsize -= newhead.tagsize()
return nil
}
// Encode writes the RLP encoding of val to w. Note that Encode may // Encode writes the RLP encoding of val to w. Note that Encode may
// perform many small writes in some cases. Consider making w // perform many small writes in some cases. Consider making w
// buffered. // buffered.
...@@ -123,6 +165,13 @@ func (head *listhead) encode(buf []byte) []byte { ...@@ -123,6 +165,13 @@ func (head *listhead) encode(buf []byte) []byte {
} }
} }
func (head *listhead) tagsize() int {
if head.size < 56 {
return 1
}
return 1 + intsize(uint64(head.size))
}
func newencbuf() *encbuf { func newencbuf() *encbuf {
return &encbuf{sizebuf: make([]byte, 9)} return &encbuf{sizebuf: make([]byte, 9)}
} }
......
rlp/encode_test.go
View file @ b64ad7a2
...@@ -177,6 +177,15 @@ var encTests = []encTest{ ...@@ -177,6 +177,15 @@ var encTests = []encTest{
{val: &recstruct{5, nil}, output: "C205C0"}, {val: &recstruct{5, nil}, output: "C205C0"},
{val: &recstruct{5, &recstruct{4, &recstruct{3, nil}}}, output: "C605C404C203C0"}, {val: &recstruct{5, &recstruct{4, &recstruct{3, nil}}}, output: "C605C404C203C0"},
// flat
{val: Flat(uint(1)), error: "rlp.Flat: uint did not encode as list"},
{val: Flat(simplestruct{A: 3, B: "foo"}), output: "0383666F6F"},
{
// value generates more list headers after the Flat
val: []interface{}{"foo", []uint{1, 2}, Flat([]uint{3, 4}), []uint{5, 6}, "bar"},
output: "D083666F6FC201020304C2050683626172",
},
// nil // nil
{val: (*uint)(nil), output: "80"}, {val: (*uint)(nil), output: "80"},
{val: (*string)(nil), output: "80"}, {val: (*string)(nil), output: "80"},
......
rpc/http/server.go
View file @ b64ad7a2
...@@ -102,7 +102,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler { ...@@ -102,7 +102,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler {
if reserr != nil { if reserr != nil {
rpchttplogger.Warnln(reserr) rpchttplogger.Warnln(reserr)
jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()} jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr}) JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
return return
} }
......
rpc/message.go
View file @ b64ad7a2
...@@ -34,20 +34,20 @@ const ( ...@@ -34,20 +34,20 @@ const (
) )
type RpcRequest struct { type RpcRequest struct {
ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"` JsonRpc string `json:"jsonrpc"`
ID int `json:"id"`
Method string `json:"method"` Method string `json:"method"`
Params []json.RawMessage `json:"params"` Params []json.RawMessage `json:"params"`
} }
type RpcSuccessResponse struct { type RpcSuccessResponse struct {
ID int `json:"id"` ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"` JsonRpc string `json:"jsonrpc"`
Result interface{} `json:"result"` Result interface{} `json:"result"`
} }
type RpcErrorResponse struct { type RpcErrorResponse struct {
ID *int `json:"id"` ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"` JsonRpc string `json:"jsonrpc"`
Error *RpcErrorObject `json:"error"` Error *RpcErrorObject `json:"error"`
} }
......
rpc/util.go
View file @ b64ad7a2
...@@ -47,7 +47,6 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) ...@@ -47,7 +47,6 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error)
// Convert JSON to native types // Convert JSON to native types
d := json.NewDecoder(req.Body) d := json.NewDecoder(req.Body)
// d.UseNumber()
defer req.Body.Close() defer req.Body.Close()
err := d.Decode(&reqParsed) err := d.Decode(&reqParsed)
...@@ -55,6 +54,7 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) ...@@ -55,6 +54,7 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error)
rpclogger.Errorln("Error decoding JSON: ", err) rpclogger.Errorln("Error decoding JSON: ", err)
return reqParsed, err return reqParsed, err
} }
rpclogger.DebugDetailf("Parsed request: %s", reqParsed) rpclogger.DebugDetailf("Parsed request: %s", reqParsed)
return reqParsed, nil return reqParsed, nil
......
rpc/ws/server.go
View file @ b64ad7a2
...@@ -94,9 +94,10 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler { ...@@ -94,9 +94,10 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler {
var jsonrpcver string = "2.0" var jsonrpcver string = "2.0"
fn := func(conn *websocket.Conn) { fn := func(conn *websocket.Conn) {
for { for {
wslogger.Debugln("Handling request") wslogger.Debugln("Handling connection")
var reqParsed rpc.RpcRequest var reqParsed rpc.RpcRequest
// reqParsed, reqerr := JSON.ParseRequestBody(conn.Request())
if err := websocket.JSON.Receive(conn, &reqParsed); err != nil { if err := websocket.JSON.Receive(conn, &reqParsed); err != nil {
jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest} jsonerr := &rpc.RpcErrorObject{-32700, rpc.ErrorParseRequest}
JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr}) JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
...@@ -108,7 +109,7 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler { ...@@ -108,7 +109,7 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler {
if reserr != nil { if reserr != nil {
wslogger.Warnln(reserr) wslogger.Warnln(reserr)
jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()} jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr}) JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
continue continue
} }
......
state/manifest.go deleted 100644 → 0
View file @ da2fae0e
package state
import (
"fmt"
"math/big"
)
// Object manifest
//
// The object manifest is used to keep changes to the state so we can keep track of the changes
// that occurred during a state transitioning phase.
type Manifest struct {
Messages Messages
}
func NewManifest() *Manifest {
m := &Manifest{}
m.Reset()
return m
}
func (m *Manifest) Reset() {
m.Messages = nil
}
func (self *Manifest) AddMessage(msg *Message) *Message {
self.Messages = append(self.Messages, msg)
return msg
}
func (self *Manifest) SetHash(hash []byte) {
for _, message := range self.Messages {
message.Block = hash
}
}
type Messages []*Message
type Message struct {
To, From []byte
Input []byte
Output []byte
Path int
Origin []byte
Timestamp int64
Coinbase []byte
Block []byte
Number *big.Int
Value *big.Int
ChangedAddresses [][]byte
}
func (self *Message) AddStorageChange(addr []byte) {
self.ChangedAddresses = append(self.ChangedAddresses, addr)
}
func (self *Message) String() string {
return fmt.Sprintf("Message{to: %x from: %x input: %x output: %x origin: %x coinbase: %x block: %x number: %v timestamp: %d path: %d value: %v", self.To, self.From, self.Input, self.Output, self.Origin, self.Coinbase, self.Block, self.Number, self.Timestamp, self.Path, self.Value)
}
state/statedb.go
View file @ b64ad7a2
...@@ -22,8 +22,6 @@ type StateDB struct { ...@@ -22,8 +22,6 @@ type StateDB struct {
stateObjects map[string]*StateObject stateObjects map[string]*StateObject
manifest *Manifest
refund map[string]*big.Int refund map[string]*big.Int
logs Logs logs Logs
...@@ -32,7 +30,7 @@ type StateDB struct { ...@@ -32,7 +30,7 @@ type StateDB struct {
// Create a new state from a given trie // Create a new state from a given trie
func New(root []byte, db ethutil.Database) *StateDB { func New(root []byte, db ethutil.Database) *StateDB {
trie := trie.New(ethutil.CopyBytes(root), db) trie := trie.New(ethutil.CopyBytes(root), db)
return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest(), refund: make(map[string]*big.Int)} return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: make(map[string]*big.Int)}
} }
func (self *StateDB) EmptyLogs() { func (self *StateDB) EmptyLogs() {
...@@ -47,6 +45,13 @@ func (self *StateDB) Logs() Logs { ...@@ -47,6 +45,13 @@ func (self *StateDB) Logs() Logs {
return self.logs return self.logs
} }
func (self *StateDB) Refund(addr []byte, gas *big.Int) {
if self.refund[string(addr)] == nil {
self.refund[string(addr)] = new(big.Int)
}
self.refund[string(addr)].Add(self.refund[string(addr)], gas)
}
// Retrieve the balance from the given address or 0 if object not found // Retrieve the balance from the given address or 0 if object not found
func (self *StateDB) GetBalance(addr []byte) *big.Int { func (self *StateDB) GetBalance(addr []byte) *big.Int {
stateObject := self.GetStateObject(addr) stateObject := self.GetStateObject(addr)
...@@ -57,13 +62,6 @@ func (self *StateDB) GetBalance(addr []byte) *big.Int { ...@@ -57,13 +62,6 @@ func (self *StateDB) GetBalance(addr []byte) *big.Int {
return ethutil.Big0 return ethutil.Big0
} }
func (self *StateDB) Refund(addr []byte, gas *big.Int) {
if self.refund[string(addr)] == nil {
self.refund[string(addr)] = new(big.Int)
}
self.refund[string(addr)].Add(self.refund[string(addr)], gas)
}
func (self *StateDB) AddBalance(addr []byte, amount *big.Int) { func (self *StateDB) AddBalance(addr []byte, amount *big.Int) {
stateObject := self.GetStateObject(addr) stateObject := self.GetStateObject(addr)
if stateObject != nil { if stateObject != nil {
...@@ -103,6 +101,7 @@ func (self *StateDB) SetCode(addr, code []byte) { ...@@ -103,6 +101,7 @@ func (self *StateDB) SetCode(addr, code []byte) {
} }
} }
// TODO vars
func (self *StateDB) GetState(a, b []byte) []byte { func (self *StateDB) GetState(a, b []byte) []byte {
stateObject := self.GetStateObject(a) stateObject := self.GetStateObject(a)
if stateObject != nil { if stateObject != nil {
...@@ -212,25 +211,21 @@ func (s *StateDB) Cmp(other *StateDB) bool { ...@@ -212,25 +211,21 @@ func (s *StateDB) Cmp(other *StateDB) bool {
} }
func (self *StateDB) Copy() *StateDB { func (self *StateDB) Copy() *StateDB {
if self.trie != nil { state := New(nil, self.db)
state := New(nil, self.db) state.trie = self.trie.Copy()
state.trie = self.trie.Copy() for k, stateObject := range self.stateObjects {
for k, stateObject := range self.stateObjects { state.stateObjects[k] = stateObject.Copy()
state.stateObjects[k] = stateObject.Copy() }
}
for addr, refund := range self.refund {
state.refund[addr] = new(big.Int).Set(refund)
}
logs := make(Logs, len(self.logs))
copy(logs, self.logs)
state.logs = logs
return state for addr, refund := range self.refund {
state.refund[addr] = new(big.Int).Set(refund)
} }
return nil logs := make(Logs, len(self.logs))
copy(logs, self.logs)
state.logs = logs
return state
} }
func (self *StateDB) Set(state *StateDB) { func (self *StateDB) Set(state *StateDB) {
...@@ -301,10 +296,6 @@ func (self *StateDB) Update(gasUsed *big.Int) { ...@@ -301,10 +296,6 @@ func (self *StateDB) Update(gasUsed *big.Int) {
} }
} }
func (self *StateDB) Manifest() *Manifest {
return self.manifest
}
// Debug stuff // Debug stuff
func (self *StateDB) CreateOutputForDiff() { func (self *StateDB) CreateOutputForDiff() {
for _, stateObject := range self.stateObjects { for _, stateObject := range self.stateObjects {
......
vm/vm.go
View file @ b64ad7a2
...@@ -38,13 +38,6 @@ func New(env Environment) *Vm { ...@@ -38,13 +38,6 @@ func New(env Environment) *Vm {
func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) { func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
self.env.SetDepth(self.env.Depth() + 1) self.env.SetDepth(self.env.Depth() + 1)
msg := self.env.State().Manifest().AddMessage(&state.Message{
To: me.Address(), From: caller.Address(),
Input: callData,
Origin: self.env.Origin(),
Timestamp: self.env.Time(), Coinbase: self.env.Coinbase(), Number: self.env.BlockNumber(),
Value: value,
})
context := NewContext(caller, me, code, gas, price) context := NewContext(caller, me, code, gas, price)
vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], context.Address(), len(code), context.Gas, callData) vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], context.Address(), len(code), context.Gas, callData)
...@@ -618,8 +611,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I ...@@ -618,8 +611,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
val, loc := stack.Popn() val, loc := stack.Popn()
statedb.SetState(context.Address(), loc.Bytes(), val) statedb.SetState(context.Address(), loc.Bytes(), val)
msg.AddStorageChange(loc.Bytes())
self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes()) self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
case JUMP: case JUMP:
jump(pc, stack.Pop()) jump(pc, stack.Pop())
...@@ -670,7 +661,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I ...@@ -670,7 +661,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
dataGas.Mul(dataGas, GasCreateByte) dataGas.Mul(dataGas, GasCreateByte)
if context.UseGas(dataGas) { if context.UseGas(dataGas) {
ref.SetCode(ret) ref.SetCode(ret)
msg.Output = ret
} }
addr = ref.Address() addr = ref.Address()
...@@ -713,7 +703,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I ...@@ -713,7 +703,6 @@ func (self *Vm) Run(me, caller ContextRef, code []byte, value, gas, price *big.I
vmlogger.Debugln(err) vmlogger.Debugln(err)
} else { } else {
stack.Push(ethutil.BigTrue) stack.Push(ethutil.BigTrue)
msg.Output = ret
mem.Set(retOffset.Uint64(), retSize.Uint64(), ret) mem.Set(retOffset.Uint64(), retSize.Uint64(), ret)
} }
......
whisper/message.go
View file @ b64ad7a2
...@@ -12,6 +12,8 @@ type Message struct { ...@@ -12,6 +12,8 @@ type Message struct {
Signature []byte Signature []byte
Payload []byte Payload []byte
Sent int64 Sent int64
To *ecdsa.PublicKey
} }
func NewMessage(payload []byte) *Message { func NewMessage(payload []byte) *Message {
......
whisper/whisper.go
View file @ b64ad7a2
...@@ -256,6 +256,8 @@ func (self *Whisper) postEvent(envelope *Envelope) { ...@@ -256,6 +256,8 @@ func (self *Whisper) postEvent(envelope *Envelope) {
func (self *Whisper) open(envelope *Envelope) (*Message, *ecdsa.PrivateKey) { func (self *Whisper) open(envelope *Envelope) (*Message, *ecdsa.PrivateKey) {
for _, key := range self.keys { for _, key := range self.keys {
if message, err := envelope.Open(key); err == nil || (err != nil && err == ecies.ErrInvalidPublicKey) { if message, err := envelope.Open(key); err == nil || (err != nil && err == ecies.ErrInvalidPublicKey) {
message.To = &key.PublicKey
return message, key return message, key
} }
} }
......
xeth/whisper.go
View file @ b64ad7a2
...@@ -99,8 +99,9 @@ type Options struct { ...@@ -99,8 +99,9 @@ type Options struct {
type WhisperMessage struct { type WhisperMessage struct {
ref *whisper.Message ref *whisper.Message
Payload string `json:"payload"` Payload string `json:"payload"`
To string `json:"to"`
From string `json:"from"` From string `json:"from"`
Sent int64 `json:"time"` Sent int64 `json:"sent"`
} }
func NewWhisperMessage(msg *whisper.Message) WhisperMessage { func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
...@@ -108,6 +109,7 @@ func NewWhisperMessage(msg *whisper.Message) WhisperMessage { ...@@ -108,6 +109,7 @@ func NewWhisperMessage(msg *whisper.Message) WhisperMessage {
ref: msg, ref: msg,
Payload: toHex(msg.Payload), Payload: toHex(msg.Payload),
From: toHex(crypto.FromECDSAPub(msg.Recover())), From: toHex(crypto.FromECDSAPub(msg.Recover())),
To: toHex(crypto.FromECDSAPub(msg.To)),
Sent: msg.Sent, Sent: msg.Sent,
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment