From c5481b7654b8ab35b2242befc3a5b235e6d70685 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 30 Apr 2014 14:54:59 +0200
Subject: getBalanceAt getStorageAt, fixed get balance api call

---
 ethereal/assets/ethereum.js     | 4 ++--
 ethereal/assets/qml/webapp.qml  | 2 +-
 ethereal/assets/samplecoin.html | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'ethereal')

diff --git a/ethereal/assets/ethereum.js b/ethereal/assets/ethereum.js
index 916655d5e..fd5091bd1 100644
--- a/ethereal/assets/ethereum.js
+++ b/ethereal/assets/ethereum.js
@@ -29,7 +29,7 @@ window.eth = {
 		postData({call: "create", args: [sec, value, gas, gasPrice, init, body]}, cb);
 	},
 
-	getStorage: function(address, storageAddress, cb) {
+	getStorageAt: function(address, storageAddress, cb) {
 		postData({call: "getStorage", args: [address, storageAddress]}, cb);
 	},
 
@@ -37,7 +37,7 @@ window.eth = {
 		postData({call: "getKey"}, cb);
 	},
 
-	getBalance: function(address, cb) {
+	getBalanceAt: function(address, cb) {
 		postData({call: "getBalance", args: [address]}, cb);
 	},
 
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index 2f3fef4d2..c0df0b66e 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -76,7 +76,7 @@ ApplicationWindow {
 					case "getBalance":
 						require(1);
 
-						postData(data._seed, eth.getStateObject(data.args[0]).Value());					
+						postData(data._seed, eth.getStateObject(data.args[0]).value());
 
 						break
 					case "getKey":
diff --git a/ethereal/assets/samplecoin.html b/ethereal/assets/samplecoin.html
index 02efa8e01..3b039fb04 100644
--- a/ethereal/assets/samplecoin.html
+++ b/ethereal/assets/samplecoin.html
@@ -23,15 +23,19 @@ function tests() {
 
 function init() {
 	eth.getKey(function(key) {
-		eth.getStorage(jefcoinAddr, key, function(storage) {
+		eth.getStorageAt(jefcoinAddr, key, function(storage) {
 			document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
 		});
 
 		eth.watch(jefcoinAddr, function(stateObject) {
-			eth.getStorage(jefcoinAddr, key, function(storage) {
+			eth.getStorageAt(jefcoinAddr, key, function(storage) {
 				document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
 			});
 		});
+
+		eth.getBalanceAt(key, function(balance) {
+			debug("balance", balance);
+		})
 	});
 }
 
-- 
cgit v1.2.3