Skip to content

Commit

Permalink
Updated for release v0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@nanonano
nanonano committed Nov 11, 2021
1 parent e656e4f commit f43d492
Show file tree
Hide file tree
Showing 7 changed files with 434 additions and 251 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
@@ -1,5 +1,7 @@
# Change Log
## [Unreleased]

## Version [0.5.0] Beta (2021-11-11)
Important:-

1. A new Note field has been added to the end of the transaction record format (column M), this is used to add a description to a transaction. It is recommended that you add the additional Note column to all your existing transaction records.
Expand Down Expand Up @@ -363,7 +365,8 @@ This is the initial beta release. Although it has been throughly tested, it's po
- Exchange data files supported: Bitstamp, Bittrex, ChangeTip, Circle, Coinbase, Coinbase Pro, Coinfloor, Cryptopia, Cryptsy, Gatehub, OKEx, Poloniex, TradeSatoshi, Uphold.
- Explorer data files supported: Etherscan.

[Unreleased]: https://github.com/BittyTax/BittyTax/compare/v0.4.3...HEAD
[Unreleased]: https://github.com/BittyTax/BittyTax/compare/v0.5.0...HEAD
[0.5.0]: https://github.com/BittyTax/BittyTax/compare/v0.4.3...v0.5.0
[0.4.3]: https://github.com/BittyTax/BittyTax/compare/v0.4.2...v0.4.3
[0.4.2]: https://github.com/BittyTax/BittyTax/compare/v0.4.1...v0.4.2
[0.4.1]: https://github.com/BittyTax/BittyTax/compare/v0.4.0...v0.4.1
Expand Down
556 changes: 368 additions & 188 deletions README.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bittytax/version.py
View file
@@ -1 +1 @@
__version__ = '0.4.3'
__version__ = '0.5.0'
Binary file modified data/BittyTax_Report.pdf
View file
Binary file not shown.
Binary file modified data/BittyTax_Report_Summary.pdf
View file
Binary file not shown.
122 changes: 61 additions & 61 deletions data/example.csv
View file
@@ -1,61 +1,61 @@
Type,Buy Quantity,Buy Asset,Buy Value,Sell Quantity,Sell Asset,Sell Value,Fee Quantity,Fee Asset,Fee Value,Wallet,Timestamp
Deposit,870,GBP,,,,,,,,LocalBitcoins,2013-05-24T20:16:46 UTC
Trade,10,BTC,,870,GBP,,,,,LocalBitcoins,2013-05-24T20:17:40 UTC
Withdrawal,,,,10,BTC,,,,,LocalBitcoins,2013-05-24T20:20:49 UTC
Deposit,10,BTC,,,,,,,,Desktop wallet,2013-05-24T21:20:49 BST
Deposit,2693.8,USD,,,,,,,,Bitstamp,2014-05-29T08:33:00 UTC
Spend,,,,0.002435,BTC,0.8,,,,Desktop wallet,2014-06-26T12:25:02 BST
Gift-Sent,,,,0.02757,BTC,,,,,Desktop wallet,2014-07-18T14:12:47 BST
Trade,0.41525742,BTC,,257.53,USD,,1.29,USD,,Bitstamp,2014-07-23T10:58:00 UTC
Trade,0.58474258,BTC,,362.63,USD,,1.82,USD,,Bitstamp,2014-07-23T10:58:00 UTC
Trade,0.86,BTC,,521.16,USD,,2.51,USD,,Bitstamp,2014-07-24T13:08:00 UTC
Trade,0.9,BTC,,545.7,USD,,2.51,USD,,Bitstamp,2014-07-24T13:08:00 UTC
Trade,1.64037953,BTC,,994.07,USD,,4.58,USD,,Bitstamp,2014-07-24T13:09:00 UTC
Withdrawal,,,,4.40037953,BTC,,,,,Bitstamp,2014-07-24T21:01:00 UTC
Deposit,4.40027953,BTC,,,,,,,,Desktop wallet,2014-07-24T21:53:37 UTC
Income,3,BTC,450,,,,,,,Desktop wallet,2015-05-22T11:34:18 BST
Deposit,6,BTC,,,,,,,,Poloniex,2016-01-27T21:01:03 UTC
Withdrawal,,,,6.0001259,BTC,,,,,Desktop wallet,2016-01-27T21:15:41 GMT
Trade,77.41195874,ETH,,0.48789661,BTC,,0.15482391,ETH,,Poloniex,2016-01-27T22:04:21 UTC
Trade,366.5243149,ETH,,2.30979957,BTC,,0.73304862,ETH,,Poloniex,2016-01-27T22:04:21 UTC
Trade,70,ETH,,0.44058,BTC,,0.14,ETH,,Poloniex,2016-01-27T22:04:21 UTC
Trade,329.9038463,ETH,,2.07925198,BTC,,0.65980769,ETH,,Poloniex,2016-01-27T22:05:12 UTC
Trade,0.85909824,ETH,,0.00541455,BTC,,0.00171819,ETH,,Poloniex,2016-01-27T22:09:19 UTC
Trade,0.01202613,BTC,,1.81296224,ETH,,0.00002405,BTC,,Poloniex,2016-01-29T13:51:01 UTC
Trade,0.07591833,BTC,,11.44480809,ETH,,0.00015183,BTC,,Poloniex,2016-01-29T13:51:01 UTC
Trade,0.00000016,BTC,,0.00002554,ETH,,0,BTC,,Poloniex,2016-01-29T13:51:19 UTC
Trade,0.331671,BTC,,50,ETH,,0.00066334,BTC,,Poloniex,2016-01-29T13:51:34 UTC
Trade,0.00000001,BTC,,0.00000292,ETH,,0,BTC,,Poloniex,2016-01-29T13:51:36 UTC
Trade,0.00601426,BTC,,0.90666181,ETH,,0.00001202,BTC,,Poloniex,2016-01-29T13:51:39 UTC
Trade,2.3987246,BTC,,361.6120503,ETH,,0.00479744,BTC,,Poloniex,2016-01-29T13:51:39 UTC
Trade,2.52372665,BTC,,385.8909256,ETH,,0.00504745,BTC,,Poloniex,2016-01-29T14:12:31 UTC
Trade,0.2049795,BTC,,31.34238327,ETH,,0.00040995,BTC,,Poloniex,2016-01-29T14:12:31 UTC
Withdrawal,,,,7.0002,BTC,,,,,Desktop wallet,2017-03-24T22:57:44 GMT
Deposit,7,BTC,,,,,,,,Poloniex,2017-03-24T22:57:44 UTC
Trade,1.00000013,ETH,,0.03729998,BTC,,0.0015,ETH,,Poloniex,2017-04-12T19:38:26 UTC
Trade,7.03854165,ETH,,0.26253746,BTC,,0.01759635,ETH,,Poloniex,2017-04-12T19:38:26 UTC
Trade,1.04194963,ETH,,0.03885951,BTC,,0.00260487,ETH,,Poloniex,2017-04-12T19:38:26 UTC
Trade,240.1501338,ETH,,8.95639684,BTC,,0.60037533,ETH,,Poloniex,2017-04-12T19:38:26 UTC
Income,1.0003,BTC,,,,,,,,Desktop wallet,2017-05-10T10:26:31 BST
Gift-Received,0.24,BTC,,,,,,,,Desktop wallet,2017-08-08T14:21:29 BST
Charity-Sent,,,,5,BTC,,,,,Desktop wallet,2017-08-08T19:37:20 BST
Trade,102.423163,XRP,,0.00508223,BTC,,0.15363474,XRP,,Poloniex,2017-09-09T21:34:15 UTC
Trade,315.6206719,XRP,,0.01566109,BTC,,0.473431,XRP,,Poloniex,2017-09-09T21:34:41 UTC
Trade,0.36900443,XRP,,0.0000183,BTC,,0.0005535,XRP,,Poloniex,2017-09-09T21:34:47 UTC
Trade,0.07537283,XRP,,0.00000373,BTC,,0.00011305,XRP,,Poloniex,2017-09-09T21:34:52 UTC
Trade,12928.31362,XRP,,0.64150292,BTC,,19.39247042,XRP,,Poloniex,2017-09-09T21:38:08 UTC
Trade,6043.711874,XRP,,0.29988898,BTC,,9.06556781,XRP,,Poloniex,2017-09-09T21:38:09 UTC
Trade,0.06932688,XRP,,0.00000343,BTC,,0.00010399,XRP,,Poloniex,2017-09-09T21:38:27 UTC
Trade,6.87404272,XRP,,0.00034108,BTC,,0.01031106,XRP,,Poloniex,2017-09-09T21:38:27 UTC
Trade,708.641246,XRP,,0.03516277,BTC,,1.06296186,XRP,,Poloniex,2017-09-09T21:39:34 UTC
Trade,47.06572815,XRP,,0.0023354,BTC,,0.07059859,XRP,,Poloniex,2017-09-09T21:39:42 UTC
Withdrawal,,,,2.,BTC,,0.0001,BTC,,Poloniex,2017-12-24 12:01:33 UTC
Deposit,2,BTC,,,,,,,,Coinfloor,2017-12-24T13:53:19 UTC
Trade,10063.92,GBP,,0.999,BTC,,30.19,GBP,,Coinfloor,2017-12-24T16:09:09 UTC
Trade,10062.93,GBP,,0.999,BTC,,30.19,GBP,,Coinfloor,2017-12-24T16:09:14 UTC
Trade,10.07,GBP,,0.001,BTC,,0.03,GBP,,Coinfloor,2017-12-24T16:09:26 UTC
Trade,10.08,GBP,,0.001,BTC,,0.03,GBP,,Coinfloor,2017-12-24T16:09:33 UTC
Withdrawal,,,,"20,086.56",GBP,,,,,Coinfloor,2017-12-29T23:00:05 UTC
Mining,12.5,BTC,,,,,,,,Desktop wallet,2018-01-02T14:26:12 UTC
Spend,,,,2000,XRP,,,,,Poloniex,2018-04-01T12:57:11 UTC
Trade,917.1344668,XRP,,0.03037549,BTC,,2.29283616,XRP,,Poloniex,2018-04-05T15:06:49 UTC
Type,Buy Quantity,Buy Asset,Buy Value in GBP,Sell Quantity,Sell Asset,Sell Value in GBP,Fee Quantity,Fee Asset,Fee Value in GBP,Wallet,Timestamp,Note
Deposit,870,GBP,,,,,,,,LocalBitcoins,2013-05-24 20:16:46,from Bank
Trade,10,BTC,,870,GBP,,,,,LocalBitcoins,2013-05-24 20:17:40,
Withdrawal,,,,10,BTC,,,,,LocalBitcoins,2013-05-24 20:20:49,to Desktop wallet
Deposit,10,BTC,,,,,,,,Desktop wallet,2013-05-24 20:20:49,from LocalBitcoins
Deposit,2693.8,USD,,,,,,,,Bitstamp,2014-05-29 08:33:00,from Bank
Spend,,,,0.002435,BTC,0.80,,,,Desktop wallet,2014-06-26 11:25:02,
Gift-Sent,,,,0.02757,BTC,,,,,Desktop wallet,2014-07-18 13:12:47,
Trade,0.41525742,BTC,,257.53,USD,,1.29,USD,,Bitstamp,2014-07-23 10:58:00,
Trade,0.58474258,BTC,,362.63,USD,,1.82,USD,,Bitstamp,2014-07-23 10:58:00,
Trade,0.86,BTC,,521.16,USD,,2.51,USD,,Bitstamp,2014-07-24 13:08:00,
Trade,0.9,BTC,,545.7,USD,,2.51,USD,,Bitstamp,2014-07-24 13:08:00,
Trade,1.64037953,BTC,,994.07,USD,,4.58,USD,,Bitstamp,2014-07-24 13:09:00,
Withdrawal,,,,4.40027953,BTC,,0.0001,BTC,,Bitstamp,2014-07-24 21:01:00,to Desktop wallet
Deposit,4.40027953,BTC,,,,,,,,Desktop wallet,2014-07-24 21:53:37,from Bitstamp
Income,3,BTC,450.00,,,,,,,Desktop wallet,2015-05-22 10:34:18,
Deposit,6,BTC,,,,,,,,Poloniex,2016-01-27 21:01:03,to Desktop wallet
Withdrawal,,,,6,BTC,,0.0001259,BTC,,Desktop wallet,2016-01-27 21:15:41,from Poloniex
Trade,77.41195874,ETH,,0.48789661,BTC,,0.15482391,ETH,,Poloniex,2016-01-27 22:04:21,
Trade,366.5243149,ETH,,2.30979957,BTC,,0.73304862,ETH,,Poloniex,2016-01-27 22:04:21,
Trade,70,ETH,,0.44058,BTC,,0.14,ETH,,Poloniex,2016-01-27 22:04:21,
Trade,329.9038463,ETH,,2.07925198,BTC,,0.65980769,ETH,,Poloniex,2016-01-27 22:05:12,
Trade,0.85909824,ETH,,0.00541455,BTC,,0.00171819,ETH,,Poloniex,2016-01-27 22:09:19,
Trade,0.01202613,BTC,,1.81296224,ETH,,0.00002405,BTC,,Poloniex,2016-01-29 13:51:01,
Trade,0.07591833,BTC,,11.44480809,ETH,,0.00015183,BTC,,Poloniex,2016-01-29 13:51:01,
Trade,0.00000016,BTC,,0.00002554,ETH,,0,BTC,,Poloniex,2016-01-29 13:51:19,
Trade,0.331671,BTC,,50.,ETH,,0.00066334,BTC,,Poloniex,2016-01-29 13:51:34,
Trade,0.00000001,BTC,,0.00000292,ETH,,0,BTC,,Poloniex,2016-01-29 13:51:36,
Trade,0.00601426,BTC,,0.90666181,ETH,,0.00001202,BTC,,Poloniex,2016-01-29 13:51:39,
Trade,2.3987246,BTC,,361.6120503,ETH,,0.00479744,BTC,,Poloniex,2016-01-29 13:51:39,
Trade,2.52372665,BTC,,385.8909256,ETH,,0.00504745,BTC,,Poloniex,2016-01-29 14:12:31,
Trade,0.2049795,BTC,,31.34238327,ETH,,0.00040995,BTC,,Poloniex,2016-01-29 14:12:31,
Withdrawal,,,,7,BTC,,0.0002,BTC,,Desktop wallet,2017-03-24 22:57:44,to Poloniex
Deposit,7,BTC,,,,,,,,Poloniex,2017-03-24 22:57:44,from Desktop wallet
Trade,1.00000013,ETH,,0.03729998,BTC,,0.0015,ETH,,Poloniex,2017-04-12 19:38:26,
Trade,7.03854165,ETH,,0.26253746,BTC,,0.01759635,ETH,,Poloniex,2017-04-12 19:38:26,
Trade,1.04194963,ETH,,0.03885951,BTC,,0.00260487,ETH,,Poloniex,2017-04-12 19:38:26,
Trade,240.1501338,ETH,,8.95639684,BTC,,0.60037533,ETH,,Poloniex,2017-04-12 19:38:26,
Income,1.0003,BTC,,,,,,,,Desktop wallet,2017-05-10 09:26:31,
Gift-Received,0.24,BTC,,,,,,,,Desktop wallet,2017-08-08 13:21:29,
Charity-Sent,,,,5,BTC,,,,,Desktop wallet,2017-08-08 18:37:20,
Trade,102.423163,XRP,,0.00508223,BTC,,0.15363474,XRP,,Poloniex,2017-09-09 21:34:15,
Trade,315.6206719,XRP,,0.01566109,BTC,,0.473431,XRP,,Poloniex,2017-09-09 21:34:41,
Trade,0.36900443,XRP,,0.0000183,BTC,,0.0005535,XRP,,Poloniex,2017-09-09 21:34:47,
Trade,0.07537283,XRP,,0.00000373,BTC,,0.00011305,XRP,,Poloniex,2017-09-09 21:34:52,
Trade,12928.31362,XRP,,0.64150292,BTC,,19.39247042,XRP,,Poloniex,2017-09-09 21:38:08,
Trade,6043.711874,XRP,,0.29988898,BTC,,9.06556781,XRP,,Poloniex,2017-09-09 21:38:09,
Trade,0.06932688,XRP,,0.00000343,BTC,,0.00010399,XRP,,Poloniex,2017-09-09 21:38:27,
Trade,6.87404272,XRP,,0.00034108,BTC,,0.01031106,XRP,,Poloniex,2017-09-09 21:38:27,
Trade,708.641246,XRP,,0.03516277,BTC,,1.06296186,XRP,,Poloniex,2017-09-09 21:39:34,
Trade,47.06572815,XRP,,0.0023354,BTC,,0.07059859,XRP,,Poloniex,2017-09-09 21:39:42,
Withdrawal,,,,2,BTC,,0.0001,BTC,,Poloniex,2017-12-24 12:01:33,to Coinfloor
Deposit,2,BTC,,,,,,,,Coinfloor,2017-12-24 13:53:19,from Poloniex
Trade,10063.92,GBP,,0.999,BTC,,30.19,GBP,,Coinfloor,2017-12-24 16:09:09,
Trade,10062.93,GBP,,0.999,BTC,,30.19,GBP,,Coinfloor,2017-12-24 16:09:14,
Trade,10.07,GBP,,0.001,BTC,,0.03,GBP,,Coinfloor,2017-12-24 16:09:26,
Trade,10.08,GBP,,0.001,BTC,,0.03,GBP,,Coinfloor,2017-12-24 16:09:33,
Withdrawal,,,,20086.56,GBP,,,,,Coinfloor,2017-12-29 23:00:05,to Bank
Mining,12.5,BTC,,,,,,,,Desktop wallet,2018-01-02 14:26:12,
Spend,,,,2000,XRP,,,,,Poloniex,2018-04-01 12:57:11,
Trade,917.1344668,XRP,,0.03037549,BTC,,2.29283616,XRP,,Poloniex,2018-04-05 15:06:49,
Binary file modified data/example.xlsx
View file
Binary file not shown.

0 comments on commit f43d492

Please sign in to comment.