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

fixed deposit asset function

Browse Source
This commit is contained in:
Abhishek Sinha 2018-12-08 18:11:38 +05:30
parent b7ec853eec
commit ab94b80f83
1 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
supernode/index.html
View File

@ -7689,7 +7689,8 @@
// btcTradeMargin is tolerable difference between BTC trader should deposit and BTC he actually deposited // btcTradeMargin is tolerable difference between BTC trader should deposit and BTC he actually deposited
RMAssets = RMAssets =
`validAssets=BTC,INR#!#supernodes=127.0.0.1,212.88.88.2#!#MASTER_NODE=023B9F60692A17FAC805D012C5C8ADA3DD19A980A3C5F0D8A5B3500CC54D6E8B75 `validAssets=BTC,INR#!#supernodes=127.0.0.1,212.88.88.2#!#MASTER_NODE=023B9F60692A17FAC805D012C5C8ADA3DD19A980A3C5F0D8A5B3500CC54D6E8B75
#!#MASTER_RECEIVING_ADDRESS=oVRq2nka1GtALQT8pbuLHAGjqAQ7PAo6uy#!#validTradingAmount=10000,50000,100000#!#btcTradeMargin=5000`; #!#MASTER_RECEIVING_ADDRESS=oVRq2nka1GtALQT8pbuLHAGjqAQ7PAo6uy#!#validTradingAmount=10000,50000,100000#!#btcTradeMargin=5000
#!#supernodesPubKeys=037F59A09903234B570752D096745040C2653A1BE11A21191E149C00C4F5C1A3C8,`;
let floAssetsArray = RMAssets.split('#!#'); let floAssetsArray = RMAssets.split('#!#');
if (floAssetsArray.length > 0 && typeof floAssetsArray[0] !== undefined && if (floAssetsArray.length > 0 && typeof floAssetsArray[0] !== undefined &&
@ -7699,10 +7700,9 @@
floAssetsArray.map(function (assets_string) { floAssetsArray.map(function (assets_string) {
let k = assets_string.split('='); let k = assets_string.split('=');
if (k[1].indexOf(',') > 0) { if (k[1].indexOf(',') > 0) {
k[1] = k[1].split(',').map(function (val) { k[1] = k[1].split(',')
return val = !isNaN(val) ? parseFloat(val) : .map(val => !isNaN(val) ? parseFloat(val) : val)
val; .filter(v=>![null, "", undefined, NaN].includes(v));
});
} else if(!isNaN(k[1])) { } else if(!isNaN(k[1])) {
k[1] = parseFloat(k[1]); k[1] = parseFloat(k[1]);
} }
@ -7916,6 +7916,7 @@
let deposit_request_response = localbitcoinplusplus.rpc.prototype.send_rpc.call(this, let deposit_request_response = localbitcoinplusplus.rpc.prototype.send_rpc.call(this,
"deposit_asset_request_response", deposit_response_object); "deposit_asset_request_response", deposit_response_object);
doSend(deposit_request_response); doSend(deposit_request_response);
return true;
} else if (params.product == "INR") { } else if (params.product == "INR") {
params.id = + new Date(); params.id = + new Date();
@ -7931,35 +7932,54 @@
// YOU NEED TO DETERMINE A BANK ACCOUNT HERE IF NOONE IS WITHDRAWING // YOU NEED TO DETERMINE A BANK ACCOUNT HERE IF NOONE IS WITHDRAWING
try { try {
readDBbyIndex("withdraw_cash", "status", 1, function(withdrawers_list) { readDBbyIndex("withdraw_cash", "status", 1, function(withdrawers_list) {
withdrawers_list.map(function(withdrawer) { if (typeof withdrawers_list == "object") {
if(withdrawer.withdraw_amount==params.depositing_amount) { if (withdrawers_list.length>0) {
let withdrawer_bank_account = withdrawer.receivinAddress; withdrawers_list.map(function(withdrawer) {
if(withdrawer.withdraw_amount==params.depositing_amount) {
let withdrawer_bank_account = withdrawer.receivinAddress;
let deposit_response_object = {
error: false,
method: "deposit_asset_request_response",
msg: `Plese send the money to following bank address: "${withdrawer_bank_account}"`,
data: receivedTradeInfo
};
let deposit_request_response = localbitcoinplusplus.rpc.prototype.send_rpc.call(this,
"deposit_asset_request_response", deposit_response_object);
doSend(deposit_request_response);
return true;
} else {
// Return error to the requester
// return {
// error: true,
// method: "deposit_asset_request_response",
// data: "Deposit request failed: We could not find a withdrawer."
// };
}
});
} else {
//No one is withdrawing so provide your bank details
let deposit_response_object = { let deposit_response_object = {
error: false, error: false,
method: "deposit_asset_request_response", method: "deposit_asset_request_response",
msg: `Plese send the money to following bank address: "${withdrawer_bank_account}"`, msg: `Plese send the money to following bank address: "System determined bank".`,
data: receivedTradeInfo data: receivedTradeInfo
}; };
let deposit_request_response = localbitcoinplusplus.rpc.prototype.send_rpc.call(this, let deposit_request_response = localbitcoinplusplus.rpc.prototype.send_rpc.call(this,
"deposit_asset_request_response", deposit_response_object); "deposit_asset_request_response", deposit_response_object);
doSend(deposit_request_response); doSend(deposit_request_response);
} else { return true;
// Return error to the requester
return {
error: true,
method: "deposit_asset_request_response",
data: "Deposit request failed: We could not find a withdrawer."
};
} }
}); }
}); });
} catch (error) { } catch (error) {
return { console.log(error);
error: true,
method: "deposit_asset_request_response", // return {
data: "Deposit request failed: We could not find a withdrawer. Come again later." // error: true,
}; // method: "deposit_asset_request_response",
// data: "Deposit request failed: We could not find a withdrawer. Come again later."
// };
} }
} }
} else { } else {
@ -8376,7 +8396,7 @@
} }
return false; return false;
}, },
depositAsset(assetType, amount, userFLOaddress, callback) { depositAsset(assetType, amount, userFLOaddress) {
if (typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' && ! if (typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' && !
localbitcoinplusplus.master_configurations.validAssets.includes(assetType)) { localbitcoinplusplus.master_configurations.validAssets.includes(assetType)) {
throw new Error("Invalid asset error"); throw new Error("Invalid asset error");
@ -8398,10 +8418,7 @@
let deposit_request = localbitcoinplusplus.rpc.prototype.send_rpc.call(this, let deposit_request = localbitcoinplusplus.rpc.prototype.send_rpc.call(this,
"deposit_asset_request", deposit_request_object); "deposit_asset_request", deposit_request_object);
console.log(deposit_request);
doSend(deposit_request); doSend(deposit_request);
callback(deposit_request);
}, },
withdrawAsset(assetType, amount, receivinAddress, userFLOaddress, callback) { withdrawAsset(assetType, amount, receivinAddress, userFLOaddress, callback) {
if (typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' && ! if (typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' && !
@ -8688,8 +8705,8 @@
/* Websocket Code Starts here */ /* Websocket Code Starts here */
//var wsUri = "ws://localhost:9000/"; var wsUri = "ws://localhost:9000/";
var wsUri = "ws://ranchimall.duckdns.org:9000/"; //var wsUri = "ws://ranchimall.duckdns.org:9000/";
var output; var output;
function init() { function init() {
@ -8729,12 +8746,7 @@
var res_pos = response.indexOf('{'); var res_pos = response.indexOf('{');
if (res_pos >= 0) { if (res_pos >= 0) {
var res = response.substr(res_pos); var res = response.substr(res_pos);
try { try {var res_obj = JSON.parse(res);
console.log(res);
var res_obj = JSON.parse(res);
console.log(res_obj);
if (typeof res_obj.method !== undefined) { if (typeof res_obj.method !== undefined) {
let response_from_sever; let response_from_sever;
switch (res_obj.method) { switch (res_obj.method) {
@ -8760,18 +8772,18 @@
case "deposit_asset_request": case "deposit_asset_request":
response_from_sever = localbitcoinplusplus.rpc.prototype.receive_rpc_response.call(this, response_from_sever = localbitcoinplusplus.rpc.prototype.receive_rpc_response.call(this,
JSON.stringify(res_obj)); JSON.stringify(res_obj));
doSend(JSON.stringify(response_from_sever)); // send response to client console.log(response_from_sever);
//doSend(JSON.stringify(response_from_sever)); // send response to client
case "deposit_asset_request_response": case "deposit_asset_request_response":
console.log(res_obj); console.log(res_obj);
// let deposit_response_object = { if (typeof res_obj.params == "object" && typeof res_obj.params[0] == "object" && typeof res_obj.params[0].data == "object") {
// error: false, addDB('deposit', res_obj.params[0].data);
// method: "deposit_asset_request_response", let counterTraderAccountAddress =
// msg: `Please send the Bitcoin to ${generate_btc_keys_for_requester.address}.`, `<p><strong>Please pay the amount to following address:</strong></p>
// data: receivedTradeInfo <p>${res_obj.params[0].msg}</p>`;
// }; let asset_boxx = document.getElementById("asset_box");
if (typeof res_obj.error !== "undefined" && !res_obj.error && typeof res_obj.data == "object" && typeof res_obj.msg !== "undefined" && res_obj.msg.length asset_boxx.insertAdjacentHTML('beforeend', counterTraderAccountAddress);
&& typeof res_obj.data.trader_flo_address !== 'undefined' && res_obj.data.trader_flo_address.length>0 ) {
addDB('deposit', res_obj.data.deposit_db_object);
} }
break; break;
case "withdraw_request_method": case "withdraw_request_method":
@ -9350,17 +9362,7 @@
localbitcoinplusplus.master_configurations.validTradingAmount.includes(tradeAmount) && localbitcoinplusplus.master_configurations.validTradingAmount.includes(tradeAmount) &&
typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' && typeof localbitcoinplusplus.master_configurations.validAssets !== 'undefined' &&
localbitcoinplusplus.master_configurations.validAssets.includes(asset_type)) { localbitcoinplusplus.master_configurations.validAssets.includes(asset_type)) {
RM_TRADE.depositAsset(asset_type, tradeAmount, userFLOaddress, function (server_response) { RM_TRADE.depositAsset(asset_type, tradeAmount, userFLOaddress);
console.log(server_response);
if (server_response.length > 0) {
updateinDB('deposit', deposit_request_object, userFLOaddress);
let counterTraderAccountAddress =
`<p><strong>Please pay the amount to following address:</strong></p>
<p>${server_response}</p>`;
asset_box.insertAdjacentHTML('beforeend', counterTraderAccountAddress);
}
});
} else { } else {
throw new Error("Error while depositing your address."); throw new Error("Error while depositing your address.");
} }
@ -9482,7 +9484,7 @@
} }
}); });
}); });
}, 3600000); }, 600000);
</script> </script>
</body> </body>