diff --git a/public/fn.js b/public/fn.js index 1781b72..895a403 100644 --- a/public/fn.js +++ b/public/fn.js @@ -289,11 +289,9 @@ function depositFLO(quantity, userID, privKey, proxySecret) { return new Promise((resolve, reject) => { if (typeof quantity !== "number" || quantity <= floGlobals.fee) return reject(`Invalid quantity (${quantity})`); - floBlockchainAPI.sendTx(userID, floGlobals.adminID, quantity, privKey, 'Deposit FLO in market').then(result => { - if (!result.txid || !result.txid.result || result.txid.error) - return reject(result); + floBlockchainAPI.sendTx(userID, floGlobals.adminID, quantity, privKey, 'Deposit FLO in market').then(txid => { let request = { - txid: result.txid.result, + txid: txid, timestamp: Date.now() }; request.sign = signRequest({ @@ -345,13 +343,11 @@ function withdrawFLO(quantity, proxySecret) { function depositRupee(quantity, userID, privKey, proxySecret) { return new Promise((resolve, reject) => { - if (!floGlobals.verifyPrivKey(privKey, userID)) + if (!floCrypto.verifyPrivKey(privKey, userID)) return reject("Invalid Private Key"); - tokenAPI.sendToken(privKey, quantity, 'Deposit Rupee in market').then(result => { - if (!result.txid || !result.txid.result || result.txid.error) - return reject(result); + tokenAPI.sendToken(privKey, quantity, 'Deposit Rupee in market').then(txid => { let request = { - txid: result.txid.result, + txid: txid, timestamp: Date.now() }; request.sign = signRequest({ diff --git a/public/home.html b/public/home.html index 3eb7255..8571784 100644 --- a/public/home.html +++ b/public/home.html @@ -7,7 +7,30 @@ border: 1px solid black; } + + + @@ -18,7 +41,8 @@
- RememberMe + RememberMe
+
@@ -312,9 +336,22 @@ const UI_evt = {}; + UI_evt.signup = function() { + let sid = document.forms['login-form']['sid'].value; + let privKey = prompt("Enter Private Key of floID to register: "); + signUp(privKey, sid).then(result => { + console.info(result); + alert("Account registered!") + }).catch(error => { + console.error(error) + alert(error); + }); + }; + UI_evt.logout = function() { logout().then(result => { console.warn(result); + localStorage.removeItem("proxy_secret"); location.reload(); }).catch(error => console.error(error)); }; @@ -369,7 +406,7 @@ UI_evt.depositFLO = function() { let formInputs = document.forms['deposit-withdraw-form']; let privKey = prompt("Enter private key"); - depositFLO(formInputs["quantity"].value, user_id, privKey, proxy_secret) + depositFLO(parseFloat(formInputs["quantity"].value), user_id, privKey, proxy_secret) .then(result => console.log(result)) .catch(error => console.error(error)) .finally(_ => formInputs.reset()); @@ -378,7 +415,7 @@ UI_evt.depositRupee = function() { let formInputs = document.forms['deposit-withdraw-form']; let privKey = prompt("Enter private key"); - depositRupee(formInputs["quantity"].value, user_id, privKey, proxy_secret) + depositRupee(parseFloat(formInputs["quantity"].value), user_id, privKey, proxy_secret) .then(result => console.log(result)) .catch(error => console.error(error)) .finally(_ => formInputs.reset()); @@ -386,7 +423,7 @@ UI_evt.withdrawFLO = function() { let formInputs = document.forms['deposit-withdraw-form']; - withdrawFLO(formInputs["quantity"].value, proxy_secret) + withdrawFLO(parseFloat(formInputs["quantity"].value), proxy_secret) .then(result => console.log(result)) .catch(error => console.error(error)) .finally(_ => formInputs.reset()); @@ -394,7 +431,7 @@ UI_evt.withdrawRupee = function() { let formInputs = document.forms['deposit-withdraw-form']; - withdrawRupee(formInputs["quantity"].value, proxy_secret) + withdrawRupee(parseFloat(formInputs["quantity"].value), proxy_secret) .then(result => console.log(result)) .catch(error => console.error(error)) .finally(_ => formInputs.reset());