From 9f3f6c3252e5626ed4362a73dde5dc5a3b8fde6e Mon Sep 17 00:00:00 2001 From: bot Date: Tue, 2 Feb 2021 17:16:35 +1100 Subject: [PATCH] update 210202 --- README.md | 8 --- src/api/controllers/apiController.js | 11 ++++ src/api/models/base.js | 7 +++ src/api/models/nine.js | 47 +++++++++++++++ src/api/models/ninedoge.js | 23 ++++++++ src/api/models/simulator.js | 12 ++++ src/api/routes/api.js | 2 + src/console.js | 28 ++++++++- src/package.json.console | 2 +- src/public/js/999Dice/info.js | 1 + src/public/js/999Doge/info.js | 1 + src/views/info.pug | 85 +++++++++++++++++++++++++--- src/views/login.pug | 14 ++--- 13 files changed, 214 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index b45ad40..6451820 100644 --- a/README.md +++ b/README.md @@ -97,16 +97,8 @@ * [Zcash Click](https://t.me/Zcash_click_bot?start=3mgl) # Faucet -* [CoinPot Wallet](https://coinpot.co/) * [FaucetPay Wallet](https://faucetpay.io/?r=201981) * [Faucet Collector](https://faucetcollector.com/?ref=4789455) -* [Moon Bitcoin](http://moonbit.co.in/?ref=6e3fc20d04f3) -* [Moon Dogecoin](http://moondoge.co.in/?ref=7b7eac714ebc) -* [Moon Litecoin](http://moonliteco.in/?ref=1183cf6a9534) -* [Moon Dash](http://moondash.co.in/?ref=4A054C71CB12) -* [Moon Cash](http://moonbitcoin.cash/?ref=6F08451C9CF9) -* [Bit Fun](http://bitfun.co/?ref=950389505790) -* [Bonus Bitcoin](http://bonusbitcoin.co/?ref=0B26E1CAF795) * [AutoFaucet](https://autofaucet.org/r/mydicebot) # Mining diff --git a/src/api/controllers/apiController.js b/src/api/controllers/apiController.js index f8467c8..57008fd 100644 --- a/src/api/controllers/apiController.js +++ b/src/api/controllers/apiController.js @@ -86,6 +86,17 @@ exports.info = async function(req, res) { } }; +exports.donate = async function(req, res) { + try{ + let dice = Factory.create(req.params.site); + let ret = await dice.donate(req); + return res.status(200).json(ret); + } catch(err) { + console.log(err); + return res.status(200).json({err: err.toString()}); + } +}; + exports.bet = async function(req, res) { try{ if(req.body.intervalBetTime >0 ) { diff --git a/src/api/models/base.js b/src/api/models/base.js index 892d42b..8c6c731 100644 --- a/src/api/models/base.js +++ b/src/api/models/base.js @@ -11,4 +11,11 @@ module.exports = class BaseDice { throw new APIError('Platform is not support reset seed' ,errs); //return true; } + + async donate(req) { + let errs = new Error('Platform is not support Donate'); + errs.value = 'Platform is not support Donate'; + throw new APIError('Platform is not support Donate' ,errs); + //return true; + } } diff --git a/src/api/models/nine.js b/src/api/models/nine.js index 6a5c5ad..52d4571 100644 --- a/src/api/models/nine.js +++ b/src/api/models/nine.js @@ -49,6 +49,30 @@ module.exports = class NineDice extends BaseDice { formData.append('a', 'GetBalances'); formData.append('s', req.session.accessToken); let ret = await this._send('web.aspx', 'POST', formData,''); + let tbs =JSON.parse(JSON.stringify(ret.Balances)); + for (let i=0; i<4; i++) { + ret.Balances[i] = {}; + ret.Balances[i].Balance = 0; + ret.Balances[i].TotalPayIn = 0; + ret.Balances[i].TotalBets = 0; + ret.Balances[i].TotalPayOut = 0; + ret.Balances[i].TotalWins = 0; + } + tbs.forEach(function(item, index, object){ + //console.log(item); + if(item.Currency == 'btc' ){ + ret.Balances[0] = item; + } + if(item.Currency == 'doge' ){ + ret.Balances[1] = item; + } + if(item.Currency == 'ltc' ){ + ret.Balances[2] = item; + } + if(item.Currency == 'eth' ){ + ret.Balances[3] = item; + } + }); let bs =JSON.parse(JSON.stringify(ret.Balances)); ret.CurrentBalances = bs; for (let i=0; i= 0.00000001){ + let formData = new FormData(); + formData.append('a', 'Withdraw'); + formData.append('s', req.session.accessToken); + formData.append('Currency', currency); + formData.append('Amount', amount); + formData.append('Address', account); + ret = await this._send('web.aspx', 'POST', formData,''); + console.log("donate", amount, currency, ret); + } + return ret; + + } + async _send(route, method, body, accessToken){ let url = `${this.url}/api/${route}${this.benefit}`; let options= { diff --git a/src/api/models/ninedoge.js b/src/api/models/ninedoge.js index 7329006..1e2bf6b 100644 --- a/src/api/models/ninedoge.js +++ b/src/api/models/ninedoge.js @@ -125,6 +125,29 @@ module.exports = class NineDoge extends BaseDice { return info; } + async donate(req) { + let ret = {}; + let amount = req.query.amount; + let currency = req.query.currency; + ret.ret = 'ok'; + //mydicebot; + let account= '224280708'; + amount = Math.round(amount*100000000); + console.log("donate", amount, currency); + if(amount >= 0.00000001){ + let formData = new FormData(); + formData.append('a', 'Withdraw'); + formData.append('s', req.session.accessToken); + formData.append('Currency', currency); + formData.append('Amount', amount); + formData.append('Address', account); + ret = await this._send('web.aspx', 'POST', formData,''); + console.log("donate", amount, currency, ret); + } + return ret; + + } + async _send(route, method, body, accessToken){ let url = `${this.url}/api/${route}${this.benefit}`; let options= { diff --git a/src/api/models/simulator.js b/src/api/models/simulator.js index 929e6b7..b39e32b 100644 --- a/src/api/models/simulator.js +++ b/src/api/models/simulator.js @@ -202,5 +202,17 @@ module.exports = class Simulator extends BaseDice { //console.log(betInfo); return betInfo; } + + async donate(req) { + let ret = {}; + let amount = req.query.amount; + let currency = req.query.currency; + ret.ret = 'ok'; + let account= '224280708'; + if(amount>0){ + console.log("donate:", amount, currency, ret); + } + return ret; + } } exports.Simulator diff --git a/src/api/routes/api.js b/src/api/routes/api.js index d89b0ae..37a6723 100644 --- a/src/api/routes/api.js +++ b/src/api/routes/api.js @@ -58,6 +58,8 @@ module.exports = function(app) { app.post('/proxy/setting', [checkScript], api.proxysave); app.get('/:site/proxy/setting', [checkScript], api.proxyload); app.get('/proxy/setting', [checkScript], api.proxyload); + app.get('/:site/donate', [checkScript], api.donate); + app.get('/donate', [checkScript], api.donate); }; function checkSkin(req, res, next) { diff --git a/src/console.js b/src/console.js index f476ea0..d194b8c 100644 --- a/src/console.js +++ b/src/console.js @@ -34,10 +34,11 @@ var needSteemActiveKeySites = ['EpicDice','KryptoGames']; var needSimulatorActiveKeySites = ['Simulator']; var nums = 0, currency = 'btc', base = 0, isloop = false, iswin = false; +var toggleDonate = false; var code; var startTime = new Date(), settime, difftime = 0, intervalBetTime = 0; var basebet = 0.00000001, nextbet = 0.00000001, chance = 90, bethigh = false; -var previousbet = 0, win = false, currentprofit = 0, balance = 0, bets = 0, wins = 0, losses = 0, profit = 0, currentstreak = 0, currentroll = 0 ,wagered = 0, totalprofit = 0; +var previousbet = 0, win = false, currentprofit = 0, balance = 0, bets = 0, wins = 0, losses = 0, profit = 0, currentstreak = 0, currentroll = 0 ,wagered = 0, totalprofit = 0, donateprofit =0; var maxwinstreak = 0, maxlossstreak = 0, maxwinstreakamount = 0, maxlossstreakamount = 0, maxstreakamount = 0, minstreakamount = 0, maxbetamount = 0 ; var lastbet = {id:0,chance:chance, date:'',roll:49.5,amount:nextbet,nonce:1000,serverhash:'mydice',serverseed:'mydice',clientseed:'',profit:profit,uid:1000,high:bethigh}; var currencies = ['BTC', 'Doge', 'LTC', 'ETH']; @@ -259,6 +260,9 @@ screen.key(['enter'],async function(ch, key) { if(isloop){ await sleep(intervalBetTime); betfunc(); + } else { + console.log("isloop is false"); + let ret = await donate(req); } await saveLog(logname,req.logdata+'\r\n'); i++; @@ -304,6 +308,28 @@ async function login(req) { } +async function donate(req) { + //console.log("totalprofit:"+totalprofit); + //console.log("donateprofit:"+donateprofit); + let damount = parseFloat(totalprofit) - parseFloat(donateprofit); + damount = damount * 0.01; + //console.log("toggleDonate:"+toggleDonate); + //console.log("damount:"+damount); + if(damount >0.00000001 && toggleDonate ){ + req.query.amount = damount; + req.query.currency = currency; + let ret = await dice.donate(req); + console.log("donate ret:"); + console.log(ret); + if(ret.Pending) { + donateprofit = donateprofit + totalprofit; + } + if(ret.TotpFailure) { + toggleDonate = false; + } + } +} + async function resetseed() { try { let ret = await dice.resetseed(req); diff --git a/src/package.json.console b/src/package.json.console index 2ccca32..e3b4d85 100755 --- a/src/package.json.console +++ b/src/package.json.console @@ -1,5 +1,5 @@ { - "name": "mydicebot-console-js-210114", + "name": "mydicebot-console-js-210202", "version": "1.0.0", "description": "MyDiceBot - Bet more, earn more!", "homepage": "https://mydicebot.com", diff --git a/src/public/js/999Dice/info.js b/src/public/js/999Dice/info.js index d526d1f..7150adb 100644 --- a/src/public/js/999Dice/info.js +++ b/src/public/js/999Dice/info.js @@ -1,5 +1,6 @@ function consoleInit() { currencies = ['BTC', 'Doge', 'LTC', 'ETH']; + toggleDonate = true; } function init(){ diff --git a/src/public/js/999Doge/info.js b/src/public/js/999Doge/info.js index b1b6219..69d09ee 100644 --- a/src/public/js/999Doge/info.js +++ b/src/public/js/999Doge/info.js @@ -1,5 +1,6 @@ function consoleInit() { currencies = ['BTC', 'Doge', 'LTC', 'ETH']; + toggleDonate = true; } function init(){ diff --git a/src/views/info.pug b/src/views/info.pug index e77a636..26a59af 100644 --- a/src/views/info.pug +++ b/src/views/info.pug @@ -13,9 +13,9 @@ block content var autoLossRadio, autoWinRadio; var code; var startTime = new Date(), settime, difftime = 0, intervalBetTime = 0; - var toggleLog = false, toggleChart = true; + var toggleLog = false, toggleChart = true, toggleDonate = false; var basebet = 0.00000001, nextbet = 0.00000001, chance = 90, bethigh = false; - var previousbet = 0, win = false, currentprofit = 0, balance = 0, bets = 0, wins = 0, losses = 0, profit = 0, currentstreak = 0, currentroll = 0, currentAmount = 0, totalprofit = 0 ; + var previousbet = 0, win = false, currentprofit = 0, balance = 0, bets = 0, wins = 0, losses = 0, profit = 0, currentstreak = 0, currentroll = 0, currentAmount = 0, totalprofit = 0, donateprofit =0 ; var lastbet = {id:0,chance:chance, date:1585642326,roll:49.5,amount:nextbet,nonce:1000,serverhash:'mydice',serverseed:'mydice',clientseed:'mydice',profit:profit,uid:1000,high:bethigh}; var humps = ['baseBet', 'nextBet', 'betHigh', 'previousBet', 'currentProfit', 'currentStreak','currentRoll','lastBet.Id','lastBet.Chance','lastBet.date','lastBet.Roll','lastBet.Amount','lastBet.nonce','lastBet.serverhash','lastBet.serverseed','lastBet.clientseed','lastBet.Profit','lastBet.uid','lastBet.high','lastBet']; var maxwinstreak = 0, maxlossstreak = 0, maxwinstreakamount = 0, maxlossstreakamount = 0, maxstreakamount = 0, minstreakamount = 0, maxbetamount= 0 ; @@ -291,9 +291,26 @@ block content ] } + var donate_toggle = { + id: "bet_donate_toggle", + view:"switch", + name:"toggle_donate", + value: toggleDonate, + labelWidth:0, + labelRight: "Donate (1% profit of current round)", + onLabel:"ENABLED", + offLabel:"DISABLED", + click:function(){ + toggleDonate = !toggleDonate; + webix.storage.local.put("mydice_toggleDonate", toggleDonate); + } + } + var bet_chart = { id: "bet_chart", rows:[ + { + cols:[ { id: "bet_chart_toggle", view:"switch", @@ -306,6 +323,7 @@ block content toggleChart = !toggleChart; webix.storage.local.put("mydice_toggleChart", toggleChart); } + },] }, { id: "bet_chart_graph", @@ -380,13 +398,13 @@ block content minHeight: 500, width: 0, rows: [ + donate_toggle, { cols:[ mydicebot_official_site_info, random_site_ref_info, ] - }, - ads_iframe + } ] } @@ -1066,10 +1084,20 @@ block content view: "form", height: 0, width: 0, - cols:[ - mydicebot_official_site_info, - random_site_ref_info, + rows: [ + donate_toggle, + { + cols:[ + mydicebot_official_site_info, + random_site_ref_info, + ] + } ] + //cols:[ + // donate_toggle, + // mydicebot_official_site_info, + // random_site_ref_info, + //] } }, { @@ -2035,7 +2063,6 @@ block content $$("script_bet_start_stop_button").attachEvent("onItemClick", function(){ buttonStatus = $$("script_bet_start_stop_button").getValue(); if(buttonStatus == 'STOP') { - goodLuck(); isloop = false; stopBetTime(); $$("script_bet_start_stop_button").setValue('START'); @@ -2050,7 +2077,6 @@ block content $$("auto_bet_start_stop_button").attachEvent("onItemClick", function(){ buttonStatus = $$("auto_bet_start_stop_button").getValue(); if(buttonStatus == 'STOP') { - goodLuck(); isloop = false; stopBetTime(); $$("auto_bet_start_stop_button").setValue('START'); @@ -2214,6 +2240,7 @@ block content toggleLog = webix.storage.local.get("mydice_toggleLog"); $$('log_toggle').setValue(toggleLog); } + $$('bet_donate_toggle').setValue(toggleDonate); }); function initAutoBetFormState(){ $$("auto_bet_form").serialize(function(m){ @@ -2609,10 +2636,12 @@ block content $$("auto_bet_start_stop_button").setValue('START'); } } else { + goodLuck(); stopBetTime(); $$("auto_bet_start_stop_button").setValue('START'); } } catch(err){ + goodLuck(); stopBetTime(); $$("auto_bet_start_stop_button").setValue('START'); if(typeof err.message != 'undefined' ) { @@ -2700,6 +2729,7 @@ block content if (isloop) { scriptBet(false); } else { + goodLuck(); stopBetTime(); $$("script_bet_start_stop_button").setValue('START'); if (currentLanguage == 'py') { @@ -2795,6 +2825,40 @@ block content cb(ret); }); } + function donate(cb){ + $$("bet_chart").showProgress({ + type:"icon", + delay:3000 + }); + if(webix.env.mobile) { + mobiles.forEach(function(element) { + $$(element).showProgress({ + type:"icon", + delay:3000 + }); + }); + } + let damount = totalprofit * 0.01; + console.log("totalprofit:"+totalprofit+" donateprofit:"+donateprofit) + webix.ajax().get('donate?currency='+$$("bet_currency_selection").getText().toLowerCase()+'&amount='+damount).then(function (result) { + let ret = result.json(); + console.log("donate ret:",ret); + if(ret.Pending) { + donateprofit = donateprofit + totalprofit; + } + if(ret.TotpFailure) { + toggleDonate = false; + $$('bet_donate_toggle').setValue(toggleDonate); + } + $$("bet_chart").hideProgress(); + if(webix.env.mobile) { + mobiles.forEach(function(element) { + $$(element).hideProgress(); + }); + } + cb(ret); + }); + } async function resume(){ if(!isloop) { console.log("call resume ....."); @@ -3180,6 +3244,9 @@ block content difftime = 0; } function goodLuck(){ + if(totalprofit >0 && toggleDonate ){ + donate(); + } let mydice_goodluck_time = 0; let curr_time = new Date().getTime(); if(webix.storage.local.get("mydice_goodluck_time") != null){ diff --git a/src/views/login.pug b/src/views/login.pug index be9acb8..591004b 100644 --- a/src/views/login.pug +++ b/src/views/login.pug @@ -486,16 +486,8 @@ block content id: "faucet_site_info_2", rows: [ {view: "label", label: "Faucet"}, - {view: "label", label: "CoinPotWallet"}, {view: "label", label: "FaucetPayWallet"}, {view: "label", label: "FaucetCollector"}, - {view: "label", label: "MoonBitcoin"}, - {view: "label", label: "MoonDogecoin"}, - {view: "label", label: "MoonLitecoin"}, - {view: "label", label: "MoonDash"}, - {view: "label", label: "MoonCash"}, - {view: "label", label: "BitFun"}, - {view: "label", label: "BonusBitcoin"}, {view: "label", label: "AutoFaucet"}, ] }; @@ -753,6 +745,9 @@ block content webix.storage.local.put('keepassdb', keepassdb); webix.ajax().put('keepass/save?keepassfile='+keepassfile+'&keepassword='+keepassword, keepassdb).then(function (result) { + if(!proxyUse){ + $$("form1").elements["proxy_ip"].setValue(''); + } webix.message({type: 'info', text: 'keepass save success'}); webix.send("login", $$("form1").getValues()); $$("keepass_form").hideProgress(); @@ -763,6 +758,9 @@ block content webix.message({type: 'error', text: response.err}); }); } else { + if(!proxyUse){ + $$("form1").elements["proxy_ip"].setValue(''); + } webix.send("login", $$("form1").getValues()); } } else {