good morning!!!!

Skip to content
Snippets Groups Projects
Commit a3c8f835 authored by Jeffrey Wilcke's avatar Jeffrey Wilcke
Browse files

Updated test coin

parent aec3e26e
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
ethereal/assets/ethereum.js
+ 23
− 5
View file @ a3c8f835
...@@ -12,10 +12,28 @@ function postData(data, cb) { ...@@ -12,10 +12,28 @@ function postData(data, cb) {
window.eth = { window.eth = {
prototype: Object(), prototype: Object(),
send: function(cb) { // Retrieve block
document.getElementById("out").innerHTML = "clicked"; //
postData({message: "Hello world"}, cb); // Either supply a number or a string. Type is determent for the lookup method
// string - Retrieves the block by looking up the hash
// number - Retrieves the block by looking up the block number
getBlock: function(numberOrHash, cb) {
var func;
if(typeof numberOrHash == "string") {
func = "getBlockByHash"
} else {
func = "getBlockByNumber"
} }
postData({call: func, args: [numberOrHash]}, cb)
},
// Create transaction
//
// Creates a transaction with the current account
// If no recipient is set, the Ethereum API will see it as a contract creation
createTx: function(recipient, value, gas, gasPrice, data, cb) {
postData({call: "createTx", args: [recipient, value, gas, gasPrice, data]}, cb)
},
} }
window.eth._callbacks = {} window.eth._callbacks = {}
......
ethereal/assets/qml/webapp.qml
+ 91
− 67
View file @ a3c8f835
...@@ -8,18 +8,22 @@ import Ethereum 1.0 ...@@ -8,18 +8,22 @@ import Ethereum 1.0
ApplicationWindow { ApplicationWindow {
id: window id: window
title: "Webapp" title: "Ethereum"
width: 900 width: 900
height: 600 height: 600
minimumHeight: 300 minimumHeight: 300
property alias url: webview.url property alias url: webview.url
property alias webView: webview
Item { Item {
objectName: "root"
id: root id: root
anchors.fill: parent anchors.fill: parent
state: "inspectorShown" state: "inspectorShown"
WebView { WebView {
objectName: "webView"
id: webview id: webview
anchors { anchors {
left: parent.left left: parent.left
...@@ -27,6 +31,7 @@ ApplicationWindow { ...@@ -27,6 +31,7 @@ ApplicationWindow {
bottom: sizeGrip.top bottom: sizeGrip.top
top: parent.top top: parent.top
} }
onTitleChanged: { window.title = title } onTitleChanged: { window.title = title }
experimental.preferences.javascriptEnabled: true experimental.preferences.javascriptEnabled: true
experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.navigatorQtObjectEnabled: true
...@@ -36,7 +41,26 @@ ApplicationWindow { ...@@ -36,7 +41,26 @@ ApplicationWindow {
console.log("[onMessageReceived]: ", message.data) console.log("[onMessageReceived]: ", message.data)
var data = JSON.parse(message.data) var data = JSON.parse(message.data)
webview.experimental.postMessage(JSON.stringify({data: {message: data.message}, _seed: data._seed})) switch(data.call) {
case "getBlockByNumber":
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
postData(data._seed, block)
break
case "getBlockByHash":
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
postData(data._seed, block)
break
case "createTx":
if(data.args.length < 5) {
postData(data._seed, null)
} else {
var tx = eth.createTx(data.args[0], data.args[1],data.args[2],data.args[3],data.args[4])
postData(data._seed, tx)
}
}
}
function postData(seed, data) {
webview.experimental.postMessage(JSON.stringify({data: data, _seed: seed}))
} }
} }
......
ethereal/assets/test.html
+ 25
− 12
View file @ a3c8f835
<html> <html>
<head> <head>
<title>Epic Works (TM)</title> <title>jeffcoin</title>
<body> <body>
<h1>It just works!</h1> <h1>Jeff Coin</h1>
<p>Play with me...</p> <img src="file:///Users/jeffrey/Desktop/iconnew.png">
<button onclick="test();">test</button> <div id="transactions">
<div id="out"></div> <input id="addr" type="text" placeholder="Receiver address"></input><br>
<div id="in"></div> <input id="amount" type="text" placeholder="Amount"></input><br>
<div id="debug"></div> <button onclick="createTransaction();">Send Tx</button>
</div>
<div><button onclick="test();">Tests</button></div>
<script type="text/javascript"> <script type="text/javascript">
function test() { function createTransaction() {
eth.send(function(data) { debug("test")
debug(data) var addr = document.querySelector("#addr").value;
document.getElementById("in").innerHTML ="and the other way around " + data.message; var amount = document.querySelector("#amount").value;
eth.createTx(addr, amount, "100", "250", "", function(tx) {
debug("received tx hash:", tx)
}) })
} }
// Any test related actions here please
function tests() {
eth.getBlock(1, function(block) {
debug("queried block:", block)
})
}
</script> </script>
<div id="debug" style="border: 1px solid block"></div>
</body> </body>
</html> </html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment