Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #16: Exchange of an altcoin to BTC is not tracked properly … #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue #16: Exchange of an altcoin to BTC is not tracked properly … #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 34 additions & 45 deletions CoinTaxes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,59 +47,48 @@ def fix_orders(exchange, buys, sells):
if product == 'BCC':
product = 'BCH'
if order['buysell'] == 'buy':
# buys_fixed.append([
# order['order_time'], product, 'buy', cost_usd, order['amount'], cost_per_coin_usd, 'USD'
# ])
# sells_fixed.append([
# order['order_time'], 'BTC', 'sell', cost_usd, order['cost'], price_usd, 'USD'
# ])
# buying some $COIN for BTC: selling BTC for USD, buying $COIN for USD
buys_fixed.append({
'order_time': order['order_time'],
'product': product,
'currency': 'USD',
'currency_pair': product + '-USD', # TODO: review
'buysell': 'buy',
'cost': cost_usd,
'amount': order['amount'],
'cost_per_coin': cost_per_coin_usd,
'order_time': order['order_time'],
'product': product,
'currency': 'USD',
'currency_pair': product + '-USD',
'buysell': 'buy',
'cost': cost_usd,
'amount': order['amount'],
'cost_per_coin': cost_per_coin_usd
})
sells_fixed.append({
'order_time': order['order_time'],
'product': 'BTC',
'currency': 'USD',
'currency_pair': 'BTC-USD', # TODO: review
'buysell': 'sell',
'cost': cost_usd,
'amount': order['cost'],
'cost_per_coin': price_usd,
'order_time': order['order_time'],
'product': 'BTC',
'currency': 'USD',
'currency_pair': 'BTC-USD',
'buysell': 'sell',
'cost': cost_usd,
'amount': order['cost'],
'cost_per_coin': price_usd
})
elif order['buysell'] == 'sell':
# sells_fixed.append([
# order['order_time'], product, 'sell', cost_usd, order['amount'], cost_per_coin_usd, 'USD'
# ])
# buys_fixed.append([
# order['order_time'], 'BTC', 'buy', cost_usd, order['cost'], price_usd, 'USD'
# ])
# selling some $COIN for BTC: selling $COIN for USD, buying BTC for USD
sells_fixed.append({
'order_time': order['order_time'],
'product': product,
'currency': 'USD',
'currency_pair': product + '-USD', # TODO: review
'buysell': 'sell',
'cost': cost_usd,
'amount': order['cost'],
'cost_per_coin': price_usd,
'order_time': order['order_time'],
'product': product,
'currency': 'USD',
'currency_pair': product + '-USD',
'buysell': 'sell',
'cost': cost_usd,
'amount': order['amount'],
'cost_per_coin': cost_per_coin_usd
})
# was order['order_time'], product, 'sell', cost_usd, order['amount'], cost_per_coin_usd, 'USD'
buys_fixed.append({
'order_time': order['order_time'],
'product': 'BTC',
'currency': 'USD',
'currency_pair': 'BTC-USD', # TODO: review
'buysell': 'buy',
'cost': cost_usd,
'amount': order['cost'],
'cost_per_coin': price_usd,
'order_time': order['order_time'],
'product': 'BTC',
'currency': 'USD',
'currency_pair': 'BTC-USD',
'buysell': 'buy',
'cost': cost_usd,
'amount': order['cost'],
'cost_per_coin': price_usd
})
else:
print("WEIRD! Unknown order buy sell type!")
Expand Down