lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated according to the new Generic JSON RPC API

cl-refactor
obscuren 10 years ago
parent
c95dfec5e4
commit
590c393680
2 changed files with 227 additions and 265 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 490
      main.js

2
index.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="ethereum.js"></script> <script type="text/javascript" src="main.js"></script>
<script type="text/javascript"> <script type="text/javascript">
function registerName() { function registerName() {
var name = document.querySelector("#name").value; var name = document.querySelector("#name").value;

490
main.js
View File

@ -3,11 +3,10 @@
return o instanceof Promise return o instanceof Promise
} }
var eth = { var web3 = {
_callbacks: {}, _callbacks: {},
_events: {}, _events: {},
prototype: Object(), providers: {},
toHex: function(str) { toHex: function(str) {
var hex = ""; var hex = "";
for(var i = 0; i < str.length; i++) { for(var i = 0; i < str.length; i++) {
@ -47,249 +46,253 @@
return hex return hex
}, },
block: function(numberOrHash) { eth: {
return new Promise(function(resolve, reject) { prototype: Object(),
var func;
if(typeof numberOrHash == "string") {
func = "getBlockByHash";
} else {
func = "getBlockByNumber";
}
eth.provider.send({call: func, args: [numberOrHash]}, function(block) {
if(block)
resolve(block);
else
reject("not found");
block: function(numberOrHash) {
return new Promise(function(resolve, reject) {
/*
var func;
if(typeof numberOrHash == "string") {
func = "getBlockByHash";
} else {
func = "getBlockByNumber";
}
*/
web3.provider.send({call: /*func*/"block", args: [numberOrHash]}, function(block) {
if(block)
resolve(block);
else
reject("not found");
});
}); });
}); },
},
transact: function(params) { transaction: function(numberOrHash, nth) {
if(params === undefined) { return new Promise(function(resolve, reject) {
params = {}; reject("`transaction` not yet implemented")
} });
},
if(params.endowment !== undefined) uncle: function(numberOrHash, nth) {
params.value = params.endowment; return new Promise(function(resolve, reject) {
if(params.code !== undefined) reject("`uncle` not yet implemented")
params.data = params.code; });
},
transact: function(params) {
if(params === undefined) {
params = {};
}
var promises = [] if(params.endowment !== undefined)
if(isPromise(params.to)) { params.value = params.endowment;
promises.push(params.to.then(function(_to) { params.to = _to; })); if(params.code !== undefined)
} params.data = params.code;
if(isPromise(params.from)) {
promises.push(params.from.then(function(_from) { params.from = _from; }));
}
if(typeof params.data !== "object" || isPromise(params.data)) {
params.data = [params.data]
}
var data = params.data; var promises = []
for(var i = 0; i < params.data.length; i++) { if(isPromise(params.to)) {
if(isPromise(params.data[i])) { promises.push(params.to.then(function(_to) { params.to = _to; }));
var promise = params.data[i]; }
var _i = i; if(isPromise(params.from)) {
promises.push(promise.then(function(_arg) { params.data[_i] = _arg; })); promises.push(params.from.then(function(_from) { params.from = _from; }));
} }
}
// Make sure everything is string if(typeof params.data !== "object" || isPromise(params.data)) {
var fields = ["value", "gas", "gasPrice"]; params.data = [params.data]
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". var data = params.data;
return Promise.all(promises).then(function() { for(var i = 0; i < params.data.length; i++) {
if(isPromise(params.data[i])) {
var promise = params.data[i];
var _i = i;
promises.push(promise.then(function(_arg) { params.data[_i] = _arg; }));
}
}
// 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 Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) {
params.data = params.data.join("");
web3.provider.send({call: "transact", args: ["0x"+params]}, function(data) {
if(data[1])
reject(data[0]);
else
resolve(data[0]);
});
});
})
},
compile: function(code) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
params.data = params.data.join(""); web3.provider.send({call: "compile", args: [code]}, function(data) {
eth.provider.send({call: "transact", args: ["0x"+params]}, function(data) {
if(data[1]) if(data[1])
reject(data[0]); reject(data[0]);
else else
resolve(data[0]); resolve(data[0]);
}); });
}); });
}) },
},
compile: function(code) { balanceAt: function(address) {
return new Promise(function(resolve, reject) { var promises = [];
eth.provider.send({call: "compile", args: [code]}, function(data) {
if(data[1])
reject(data[0]);
else
resolve(data[0]);
});
});
},
balanceAt: function(address) { if(isPromise(address)) {
var promises = []; promises.push(address.then(function(_address) { address = _address; }));
}
if(isPromise(address)) {
promises.push(address.then(function(_address) { address = _address; }));
}
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getBalanceAt", args: [address]}, function(balance) { web3.provider.send({call: "balanceAt", args: [address]}, function(balance) {
resolve(balance); resolve(balance);
});
}); });
}); });
}); },
},
countAt: function(address) { countAt: function(address) {
var promises = []; var promises = [];
if(isPromise(address)) { if(isPromise(address)) {
promises.push(address.then(function(_address) { address = _address; })); promises.push(address.then(function(_address) { address = _address; }));
} }
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getCountAt", args: [address]}, function(count) { web3.provider.send({call: "countAt", args: [address]}, function(count) {
resolve(count); resolve(count);
});
}); });
}); });
}); },
},
codeAt: function(address) { codeAt: function(address) {
var promises = []; var promises = [];
if(isPromise(address)) { if(isPromise(address)) {
promises.push(address.then(function(_address) { address = _address; })); promises.push(address.then(function(_address) { address = _address; }));
} }
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getCodeAt", args: [address]}, function(code) { web3.provider.send({call: "codeAt", args: [address]}, function(code) {
resolve(code); resolve(code);
});
}); });
}); });
}); },
},
storageAt: function(address, storageAddress) { storageAt: function(address, storageAddress) {
var promises = []; var promises = [];
if(isPromise(address)) { if(isPromise(address)) {
promises.push(address.then(function(_address) { address = _address; })); promises.push(address.then(function(_address) { address = _address; }));
} }
if(isPromise(storageAddress)) { if(isPromise(storageAddress)) {
promises.push(storageAddress.then(function(_sa) { storageAddress = _sa; })); promises.push(storageAddress.then(function(_sa) { storageAddress = _sa; }));
} }
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getStorageAt", args: [address, storageAddress]}, function(entry) { web3.provider.send({call: "stateAt", args: [address, storageAddress]}, function(entry) {
resolve(entry); resolve(entry);
});
}); });
}); });
}); },
},
stateAt: function(address, storageAddress) { stateAt: function(address, storageAddress) {
return this.storageAt(address, storageAddress); return this.storageAt(address, storageAddress);
}, },
call: function(params) { call: function(params) {
if(params === undefined) { if(params === undefined) {
params = {}; params = {};
} }
if(params.endowment !== undefined) if(params.endowment !== undefined)
params.value = params.endowment; params.value = params.endowment;
if(params.code !== undefined) if(params.code !== undefined)
params.data = params.code; params.data = params.code;
var promises = [] var promises = []
if(isPromise(params.to)) { if(isPromise(params.to)) {
promises.push(params.to.then(function(_to) { params.to = _to; })); promises.push(params.to.then(function(_to) { params.to = _to; }));
} }
if(isPromise(params.from)) { if(isPromise(params.from)) {
promises.push(params.from.then(function(_from) { params.from = _from; })); promises.push(params.from.then(function(_from) { params.from = _from; }));
} }
if(isPromise(params.data)) { if(isPromise(params.data)) {
promises.push(params.data.then(function(_code) { params.data = _code; })); 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 { } else {
data = params.data; 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 // Make sure everything is string
var fields = ["value", "gas", "gasPrice"]; var fields = ["value", "gas", "gasPrice"];
for(var i = 0; i < fields.length; i++) { for(var i = 0; i < fields.length; i++) {
if(params[fields[i]] === undefined) { if(params[fields[i]] === undefined) {
params[fields[i]] = ""; params[fields[i]] = "";
}
params[fields[i]] = params[fields[i]].toString();
} }
params[fields[i]] = params[fields[i]].toString();
}
// Load promises then call the last "transact". // Load promises then call the last "transact".
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "call", args: params}, function(data) { web3.provider.send({call: "call", args: params}, function(data) {
if(data[1]) if(data[1])
reject(data[0]); reject(data[0]);
else else
resolve(data[0]); resolve(data[0]);
});
}); });
}); })
}) },
},
watch: function(params) { watch: function(params) {
return new Filter(params); return new Filter(params);
}, },
secretToAddress: function(key) {
var promises = [];
if(isPromise(key)) {
promises.push(key.then(function(_key) { key = _key; }));
}
return Promise.all(promises).then(function() {
return new Promise(function(resolve, reject) {
eth.provider.send({call: "getSecretToAddress", args: [key]}, function(address) {
resolve(address);
});
});
});
}, },
on: function(event, cb) { on: function(event, cb) {
if(eth._events[event] === undefined) { if(web3._events[event] === undefined) {
eth._events[event] = []; web3._events[event] = [];
} }
eth._events[event].push(cb); web3._events[event].push(cb);
return this return this
}, },
off: function(event, cb) { off: function(event, cb) {
if(eth._events[event] !== undefined) { if(web3._events[event] !== undefined) {
var callbacks = eth._events[event]; var callbacks = web3._events[event];
for(var i = 0; i < callbacks.length; i++) { for(var i = 0; i < callbacks.length; i++) {
if(callbacks[i] === cb) { if(callbacks[i] === cb) {
delete callbacks[i]; delete callbacks[i];
@ -301,7 +304,7 @@
}, },
trigger: function(event, data) { trigger: function(event, data) {
var callbacks = eth._events[event]; var callbacks = web3._events[event];
if(callbacks !== undefined) { if(callbacks !== undefined) {
for(var i = 0; i < callbacks.length; i++) { for(var i = 0; i < callbacks.length; i++) {
// Figure out whether the returned data was an array // Figure out whether the returned data was an array
@ -316,6 +319,7 @@
}, },
}; };
var eth = web3.eth;
// Eth object properties // Eth object properties
Object.defineProperty(eth, "key", { Object.defineProperty(eth, "key", {
get: function() { get: function() {
@ -336,7 +340,7 @@
Object.defineProperty(eth, "coinbase", { Object.defineProperty(eth, "coinbase", {
get: function() { get: function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getCoinBase"}, function(coinbase) { web3.provider.send({call: "getCoinBase"}, function(coinbase) {
resolve(coinbase); resolve(coinbase);
}); });
}); });
@ -346,7 +350,7 @@
Object.defineProperty(eth, "listening", { Object.defineProperty(eth, "listening", {
get: function() { get: function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getIsListening"}, function(listening) { web3.provider.send({call: "getIsListening"}, function(listening) {
resolve(listening); resolve(listening);
}); });
}); });
@ -357,7 +361,7 @@
Object.defineProperty(eth, "mining", { Object.defineProperty(eth, "mining", {
get: function() { get: function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getIsMining"}, function(mining) { web3.provider.send({call: "getIsMining"}, function(mining) {
resolve(mining); resolve(mining);
}); });
}); });
@ -367,7 +371,7 @@
Object.defineProperty(eth, "peerCount", { Object.defineProperty(eth, "peerCount", {
get: function() { get: function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getPeerCount"}, function(peerCount) { web3.provider.send({call: "getPeerCount"}, function(peerCount) {
resolve(peerCount); resolve(peerCount);
}); });
}); });
@ -378,19 +382,19 @@
this.queued = []; this.queued = [];
this.ready = false; this.ready = false;
this.provider = undefined; this.provider = undefined;
this.seed = 1; this.id = 1;
}; };
ProviderManager.prototype.send = function(data, cb) { ProviderManager.prototype.send = function(data, cb) {
data.seed = this.seed; data._id = this.id;
if(cb) { if(cb) {
eth._callbacks[data.seed] = cb; web3._callbacks[data._id] = cb;
} }
if(data.args === undefined) { if(data.args === undefined) {
data.args = []; data.args = [];
} }
this.seed++; this.id++;
if(this.provider !== undefined) { if(this.provider !== undefined) {
this.provider.send(data); this.provider.send(data);
@ -418,60 +422,16 @@
ProviderManager.prototype.installed = function() { ProviderManager.prototype.installed = function() {
return this.provider !== undefined; return this.provider !== undefined;
}; };
web3.provider = new ProviderManager();
eth.provider = new ProviderManager(); web3.setProvider = function(provider) {
provider.onmessage = messageHandler;
eth.setProvider = function(provider) { web3.provider.set(provider);
eth.provider.set(provider);
eth.provider.sendQueued(); web3.provider.sendQueued();
}; };
var EthWebSocket = function(host) {
// onmessage handlers
this.handlers = [];
// queue will be filled with messages if send is invoked before the ws is ready
this.queued = [];
this.ready = false;
this.ws = new WebSocket(host);
var self = this;
this.ws.onmessage = function(event) {
for(var i = 0; i < self.handlers.length; i++) {
self.handlers[i].call(self, event.data, event)
}
};
this.ws.onopen = function() {
self.ready = true;
for(var i = 0; i < self.queued.length; i++) {
// Resend
self.send(self.queued[i]);
}
};
};
EthWebSocket.prototype.send = function(jsonData) {
if(this.ready) {
var data = JSON.stringify(jsonData);
this.ws.send(data);
} else {
this.queued.push(jsonData);
}
};
EthWebSocket.prototype.onMessage = function(handler) {
this.handlers.push(handler);
};
EthWebSocket.prototype.unload = function() {
this.ws.close();
};
eth.WebSocket = EthWebSocket;
var filters = []; var filters = [];
var Filter = function(options) { var Filter = function(options) {
filters.push(this); filters.push(this);
@ -488,7 +448,7 @@
var self = this; // Cheaper than binding var self = this; // Cheaper than binding
this.promise = new Promise(function(resolve, reject) { this.promise = new Promise(function(resolve, reject) {
eth.provider.send({call: call, args: [options]}, function(id) { web3.provider.send({call: call, args: [options]}, function(id) {
self.id = id; self.id = id;
resolve(id); resolve(id);
@ -513,7 +473,7 @@
Filter.prototype.uninstall = function() { Filter.prototype.uninstall = function() {
this.promise.then(function(id) { this.promise.then(function(id) {
eth.provider.send({call: "uninstallFilter", args:[id]}); web3.provider.send({call: "uninstallFilter", args:[id]});
}); });
}; };
@ -522,7 +482,7 @@
return Promise.all([this.promise]).then(function() { return Promise.all([this.promise]).then(function() {
var id = self.id var id = self.id
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
eth.provider.send({call: "getMessages", args: [id]}, function(messages) { web3.provider.send({call: "getMessages", args: [id]}, function(messages) {
resolve(messages); resolve(messages);
}); });
}); });
@ -531,36 +491,38 @@
// Register to the messages callback. "messages" will be emitted when new messages // Register to the messages callback. "messages" will be emitted when new messages
// from the client have been created. // from the client have been created.
eth.on("messages", function(messages, id) { web3.on("messages", function(messages, id) {
for(var i = 0; i < filters.length; i++) { for(var i = 0; i < filters.length; i++) {
filters[i].trigger(messages, id); filters[i].trigger(messages, id);
} }
}); });
function messageHandler(ev) {
var data = JSON.parse(ev)
// Install default provider if(data._event !== undefined) {
if(!eth.provider.installed()) { web3.trigger(data._event, data.data);
var sock = new eth.WebSocket("ws://localhost:40404/eth"); } else {
sock.onMessage(function(ev) { if(data._id) {
var data = JSON.parse(ev) var cb = web3._callbacks[data._id];
if(cb) {
if(data._event !== undefined) { cb.call(this, data.data)
eth.trigger(data._event, data.data);
} else { // Remove the "trigger" callback
if(data.seed) { delete web3._callbacks[ev._id];
var cb = eth._callbacks[data.seed];
if(cb) {
cb.call(this, data.data)
// Remove the "trigger" callback
delete eth._callbacks[ev.seed];
}
} }
} }
}); }
}
/*
// Install default provider
if(!web3.provider.installed()) {
var sock = new web3.WebSocket("ws://localhost:40404/eth");
eth.setProvider(sock); web3.setProvider(sock);
} }
*/
window.eth = eth; window.web3 = web3;
})(this); })(this);

Write Preview
Loading…
Cancel
Save