Browse Source

create wallet screen fix, basilisk mode send tx debug code enabled

master
Satinder Grewal 8 years ago
parent
commit
fefdf13dd3
  1. 2
      assets/scripts/iguana_api.js
  2. 33
      assets/scripts/iguana_api/IguanaEDEX.js
  3. 8
      assets/scripts/login.js

2
assets/scripts/iguana_api.js

@ -199,7 +199,7 @@ function Iguana_utxorawtx(data) {
dataType: 'json' dataType: 'json'
}) })
.then(result => { .then(result => {
//console.log(result); console.log(result);
resolve(result); resolve(result);
}); });
}); });

33
assets/scripts/iguana_api/IguanaEDEX.js

@ -200,8 +200,7 @@ function EDEXgetBalance(coin) {
} }
function EDEXSendutxoRawTx(data) { function EDEXSendutxoRawTx(data) {
Shepherd_GetBasiliskCache() Shepherd_GetBasiliskCache().then(function(result) {
.then(function(result) {
var _data = JSON.parse(result), var _data = JSON.parse(result),
query = _data.result.basilisk, query = _data.result.basilisk,
utxos_set = query[data.coin][data.sendfrom].refresh.data, utxos_set = query[data.coin][data.sendfrom].refresh.data,
@ -215,9 +214,8 @@ function EDEXSendutxoRawTx(data) {
'utxos': utxos_set 'utxos': utxos_set
}; };
// console.log(send_data) console.log(send_data)
Iguana_utxorawtx(send_data) Iguana_utxorawtx(send_data).then(function(result) {
.then(function(result) {
var edexcoin_sendto_result_tbl = ''; var edexcoin_sendto_result_tbl = '';
console.log(result); console.log(result);
@ -233,8 +231,7 @@ function EDEXSendutxoRawTx(data) {
'signedtx': result.signedtx, 'signedtx': result.signedtx,
'coin': send_data.coin 'coin': send_data.coin
}; };
Iguana_DEXsendrawtx(ajax_data_dexrawtx) Iguana_DEXsendrawtx(ajax_data_dexrawtx).then(function(dexrwatx_result) {
.then(function(dexrwatx_result) {
console.log(dexrwatx_result); console.log(dexrwatx_result);
if (dexrwatx_result.error == undefined) { if (dexrwatx_result.error == undefined) {
var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin'); var active_edexcoin = $('[data-edexcoin]').attr('data-edexcoin');
@ -278,9 +275,8 @@ function EDEXSendutxoRawTx(data) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
toastr.info(_lang[defaultLang].TOASTR.GETTING_TXID_INFO + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION); toastr.info(_lang[defaultLang].TOASTR.GETTING_TXID_INFO + '.', _lang[defaultLang].TOASTR.WALLET_NOTIFICATION);
EDEXgettransaction(ajax_data_dexrawtx.coin,dexrwatx_result) EDEXgettransaction(ajax_data_dexrawtx.coin,dexrwatx_result).then(function(result) {
.then(function(result) { console.log(result);
//console.log(result);
resolve(result); resolve(result);
}); });
}); });
@ -288,10 +284,9 @@ function EDEXSendutxoRawTx(data) {
var process_refresh_utxos = function(gettxdata) { var process_refresh_utxos = function(gettxdata) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
//console.log(gettxdata) console.log(gettxdata)
//console.log(utxos_set) console.log(utxos_set)
EDEX_GetTxIDList(gettxdata) EDEX_GetTxIDList(gettxdata).then(function(get_txid_list) {
.then(function(get_txid_list) {
console.log(get_txid_list) console.log(get_txid_list)
resolve(get_txid_list); resolve(get_txid_list);
}); });
@ -305,10 +300,9 @@ function EDEXSendutxoRawTx(data) {
var get_data_cache_contents = function(get_txid_list) { var get_data_cache_contents = function(get_txid_list) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
console.log(get_txid_list); console.log(get_txid_list);
//console.log(send_data) console.log(send_data)
//console.log(send_data.sendfrom) console.log(send_data.sendfrom)
Shepherd_GroomData_Get() Shepherd_GroomData_Get().then(function(result) {
.then(function(result) {
console.log(result); console.log(result);
/*console.log(result.basilisk.KMD[send_data.sendfrom].refresh); /*console.log(result.basilisk.KMD[send_data.sendfrom].refresh);
delete result.basilisk.KMD[send_data.sendfrom].refresh.data; delete result.basilisk.KMD[send_data.sendfrom].refresh.data;
@ -328,8 +322,7 @@ function EDEXSendutxoRawTx(data) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
console.log(save_this_data); console.log(save_this_data);
Shepherd_GroomData_Post(save_this_data) Shepherd_GroomData_Post(save_this_data).then(function(result) {
.then(function(result) {
console.log(result); console.log(result);
resolve(result); resolve(result);
}); });

8
assets/scripts/login.js

@ -43,8 +43,8 @@ var Login = function() {
success: function(label) { success: function(label) {
label label
.closest('.form-group') .closest('.form-group')
.removeClass('has-error') .removeClass('has-error');
.remove(); label.remove();
}, },
errorPlacement: function(error, element) { errorPlacement: function(error, element) {
@ -226,8 +226,8 @@ var Login = function() {
success: function(label) { success: function(label) {
label label
.closest('.form-group') .closest('.form-group')
.removeClass('has-error') .removeClass('has-error');
.remove(); label.remove();
}, },
errorPlacement: function(error, element) { errorPlacement: function(error, element) {

Loading…
Cancel
Save