From 9230666d49a74b1f540f6406e81e98f11193118b Mon Sep 17 00:00:00 2001 From: acidvegas Date: Tue, 22 Nov 2022 20:25:40 -0500 Subject: [PATCH] updated --- LICENSE | 2 +- README.md | 4 ++-- irccex/core/config.py | 4 +--- irccex/core/irc.py | 14 +++++++++++--- todo | 3 +++ 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 todo diff --git a/LICENSE b/LICENSE index d521bd0..4c8b212 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ ISC License -Copyright (c) 2020, acidvegas +Copyright (c) 2021, acidvegas Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/README.md b/README.md index 8cb83ea..81a9702 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ This game can introduce lots of trolling & botting. Get creative & figure out wa * Double fees mode will be activated randomly every 7 to 10 days, which will double the fees for cashout, trade, and send usage, and can last for 1 to 3 days. ###### Trading Pair Rules -- USD can only be used for buying or selling BTC, ETH, & LTC. +- USD can only be used for buying or selling BTC & ETH. - BTC & ETH are the only major trading pairs between all other cryptocurrencies. @@ -85,7 +85,7 @@ Support the project development if you like it: [Patreon.com/irccex](https://pat The IRCCEX project is completely open source & non-profit, though any support/pledges will help in motivation towards more development and adding new features! ###### Future Concepts & Ideas -* Use multiple API keys to prevent rate limiting. +* Include a seperate bot for just trading stocks (include options trading, dividends, etc) * IRCCEX BlockChain - Keep an on-going ledger of every single transaction ever made in the channel. *(No idea what use it would have. Maybe a `!trades` command for recent history. The idea makes me laugh)* * Buying options - Spend a large sum of money on features like locking someone from trading for X amount of time (Charge Y per hour and max it to 24 hours), wallet spying, wallet bombing (sending a bunch of shitcoins), hindsight where you get private message alerts on a coins price changing (can be used whenever only once). * Post reward pool bangs will make you lose money to fuck with people spamming hard with bots to rack up the pool diff --git a/irccex/core/config.py b/irccex/core/config.py index f1c56e3..81157be 100644 --- a/irccex/core/config.py +++ b/irccex/core/config.py @@ -43,6 +43,4 @@ class limits: class fees: cashout = 0.02 # 2% send = 0.01 # 1% - trade = 0.001 # 0.1% - -CMC_API_KEY = 'CHANGEME' # https://pro.coinmarketcap.com/signup \ No newline at end of file + trade = 0.001 # 0.1% \ No newline at end of file diff --git a/irccex/core/irc.py b/irccex/core/irc.py index c5b3491..884bb87 100644 --- a/irccex/core/irc.py +++ b/irccex/core/irc.py @@ -326,9 +326,17 @@ class Events: total = 0 for symbol in Bot.db['wallet'][nick]: amount = Bot.db['wallet'][nick][symbol] - value = amount if symbol == 'USD' else CMC._ticker()[symbol]['price']*amount - Commands.sendmsg(chan, f' {symbol.ljust(8)} | {str(functions.clean_float(amount)).rjust(20)} | {str(functions.clean_value(value)).rjust(20)}') - total += float(value) + if symbol == 'USD': + value = amount + elif symbol in CMC._ticker(): + value = CMC._ticker()[symbol]['price']*amount + else: # CLEAN THIS UP - TEMP FIX FOR ERRORS ON !wallet reported by sht, ji, and others... + value = 'JACKED' + if value == 'JACKED': + Commands.sendmsg(chan, symbol + ' was JACKED sucka!') + else: + Commands.sendmsg(chan, f' {symbol.ljust(8)} | {str(functions.clean_float(amount)).rjust(20)} | {str(functions.clean_value(value)).rjust(20)}') + total += float(value) Commands.sendmsg(chan, color(f' Total: {str(functions.clean_value(total)).rjust(27)}', constants.black, constants.light_grey)) elif len(args) == 2: if args[0] in ('!bottom','!top'): diff --git a/todo b/todo new file mode 100644 index 0000000..bbfcb5b --- /dev/null +++ b/todo @@ -0,0 +1,3 @@ +fix bang decimal amounts and maybe check reward pool +table aign to smallest irccex +show change suince initial investment on !wallet \ No newline at end of file