RanchiMall/localbitcoinplusplus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from avishkarabhishek786/master

Browse Source 
Fixed issues that came in remote testing
This commit is contained in:
Abhishek Sinha 2020-06-04 12:01:34 +05:30 committed by GitHub
commit 20393ab447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3303 additions and 1520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cash_payments_handler.html
View File

@ -11378,16 +11378,12 @@
Object.defineProperty(localbitcoinplusplus, "server", {
value: {
//btc_mainnet: "https://blockexplorer.com",
btc_mainnet: "https://insight.bitpay.com",
//btc_testnet: "https://testnet.blockexplorer.com",
btc_testnet: "https://test-insight.bitpay.com",
flo_mainnet: "https://flosight.duckdns.org",
flo_testnet: "https://testnet-flosight.duckdns.org",
//flo_testnet: "https://testnet.flocha.in",
flo_api_mainnet: "https://ranchimallflo.duckdns.org",
flo_api_testnet: "https://ranchimallflo-testnet.duckdns.org",
//flo_api_testnet: "ranchimall1.duckdns.org:5109"
},
writable: false,
configurable: false,
@ -12007,39 +12003,6 @@
localbitcoinplusplus.actions = {
parse_flo_comments: async function(callback) {
// text = `masterFLOPubKey=03EA5E2CAB18DA585400D6EC569438D415FAF200528E05D0E2B9BEAA2B5C3DCA90
// #!#tradableAsset1=BTC,FLO,BTC_TEST,FLO_TEST#!#tradableAsset2=INR,USD,
// #!#validTradingAmount=10,50,100,#!#btcTradeMargin=5000
// #!#MaxBackups=1
// #!#miners_fee={"btc":0.0003, "flo":0.0003}
// #!#supernodesPubKeys=0315C3A20FE7096CC2E0F81A80D5F1A687B8F9EFA65242A0B0881E1BA3EE7D7D53,
// 03F7493F11B8E44B9798CD434D20FBE7FA34B9779D144984889D11A17C56A18742,039B4AA00DBFC0A6631DE6DA83526611A0E6B857D3579DF840BBDEAE8B6898E3B6,
// 03C8E3836C9A77E2AF03D4265D034BA85732738919708EAF6A16382195AE796EDF,0349B08AA1ABDCFFB6D78CD7C949665AD2FF065EA02B3C6C47A5E9592C9A1C6BCB,
// 026FCC6CFF6EB3A39E54BEB6E13FC2F02C3A93F4767AA80E49E7E876443F95AE5F,
// #!#cashiers={"032871A74D2DDA9D0DE7135F58B5BD2D7F679D2CCA20EA7909466D1A6912DF4022":"johnDoe@upi",
// "03DB4A12EB543B293DDBB0CE314C46C36D6761294AFBB7264A6D78F710FFD97CF0":"janeDoe@upi"}
// #!#ShamirsMaxShares=8#!#supernodeSeeds={"ranchimall1":{"ip":"127.0.0.1:9111","kbucketId":"oZxHcbSf1JC8t5GjutopWYXs7C6Fe9p7ps"},
// "ranchimall2":{"ip":"127.0.0.1:9112","kbucketId":"oTWjPupy3Z7uMdPcu5uXd521HBkcsLuSuM"},
// "ranchimall3":{"ip":"127.0.0.1:9113","kbucketId":"odYA6KagmbokSh9GY7yAfeTUZRtZLwecY1"},
// "ranchimall4":{"ip":"127.0.0.1:9114","kbucketId":"oJosrve9dBv2Hj2bfncxv2oEpTysg3Wejv"},
// "ranchimall5":{"ip":"127.0.0.1:9115","kbucketId":"oMhv5sAzqg77sYHxmUGZWKRrVo4P4JQduS"},
// "ranchimall6":{"ip":"127.0.0.1:9116","kbucketId":"oV1wCeWca3VawbBTfUGKA7Vd368PATnKAx"}}`;
text = `masterFLOPubKey=03EA5E2CAB18DA585400D6EC569438D415FAF200528E05D0E2B9BEAA2B5C3DCA90
#!#tradableAsset1=BTC,FLO,BTC_TEST,FLO_TEST#!#tradableAsset2=INR,USD,
#!#validTradingAmount=10,50,100,#!#btcTradeMargin=5000
#!#MaxBackups=1
#!#ordersLife={"trade":300000, "cryptoDeposit":900000, "cryptoWithdraw":300000, "cashDeposit":900000, "cashWithdraw":900000}
#!#miners_fee={"btc":0.0005, "flo":0.001}
#!#supernodesPubKeys=0315C3A20FE7096CC2E0F81A80D5F1A687B8F9EFA65242A0B0881E1BA3EE7D7D53,
026FCC6CFF6EB3A39E54BEB6E13FC2F02C3A93F4767AA80E49E7E876443F95AE5F,
#!#cashiers={"032871A74D2DDA9D0DE7135F58B5BD2D7F679D2CCA20EA7909466D1A6912DF4022":{"upi":"johnDoe@upi", "currencies":["INR"], "is_live":false},
"03DB4A12EB543B293DDBB0CE314C46C36D6761294AFBB7264A6D78F710FFD97CF0":{"upi":"janeDoe@upi", "currencies":["INR", "USD"], "is_live":false}}
#!#ShamirsMaxShares=8#!#supernodeSeeds={"ranchimall1":{"ip":"127.0.0.1:9111","kbucketId":"oZxHcbSf1JC8t5GjutopWYXs7C6Fe9p7ps"},
"ranchimall6":{"ip":"127.0.0.1:9116","kbucketId":"oV1wCeWca3VawbBTfUGKA7Vd368PATnKAx"}}`;
return callback(text);
if(ENVR==='LIVE') {
master_data = await helper_functions
.ajaxGet(`${localbitcoinplusplus.server.flo_mainnet}/api/txs/?address=${localbitcoinplusplus.RM_FLO_SENDING_ADDR}`);
@ -13391,6 +13354,11 @@
responseData: response_from_server
});
} else {
let deposits_list = document.getElementById("deposits_list");
if(deposits_list.innerHTML.length>0
&& deposits_list.children["length"]>1) return;
document.getElementById("deposits_list").innerHTML=
`<table id="deposits_list" class="myTable">
<tbody><tr class="header">
@ -13416,6 +13384,11 @@
responseData: response_from_server
});
} else {
let withdraws_list = document.getElementById("withdraws_list");
if(withdraws_list.innerHTML.length>0
&& withdraws_list.children["length"]>1) return;
document.getElementById("withdraws_list").innerHTML =
`<table id="withdraws_list" class="myTable">
<tbody><tr class="header">
@ -13479,7 +13452,7 @@
case "list_of_cashier_latest_pending_cash_withdrawals":
(async function() {
let v = ``;
const withdraws_table = document.getElementById("withdraws_list");
let withdraws_table = document.getElementById("withdraws_list");
//withdraws_table.innerHTML = '';
for (const m of responseData.responseData.data) {
const user_upi = localbitcoinplusplus.encrypt.decryptMessage(

4774
index.html
View File

File diff suppressed because it is too large Load Diff