Reenable LIFO and FIFO (see discussion at #79)

Makefile

@@ -33,10 +33,6 @@ run: $(VENV)/bin/activate
 	$(VENV)/bin/rp2_us -o output/ -p test_data_ config/test_data.ini input/test_data.ods
 	$(VENV)/bin/rp2_us -o output/ -p test_many_year_data_ config/test_data.ini input/test_data.ods
 	$(VENV)/bin/rp2_us -o output/ -p crypto_example_ config/crypto_example.ini input/crypto_example.ods
-# Temporarily removed lifo and hifo due to https://github.com/eprbell/rp2/issues/79
-#	$(VENV)/bin/rp2_us -m lifo -o output/ -p test_data_ config/test_data.ini input/test_data.ods
-#	$(VENV)/bin/rp2_us -m lifo -o output/ -p test_many_year_data_ config/test_data.ini input/test_data.ods
-#	$(VENV)/bin/rp2_us -m lifo -o output/ -p crypto_example_ config/crypto_example.ini input/crypto_example.ods
 
 check: $(VENV)/bin/activate
 	$(VENV)/bin/pytest --tb=native --verbose

README.md

@@ -57,7 +57,10 @@ Another unique advantage of RP2 is [transparent computation](https://github.com/
 * verify step-by-step how RP2 reaches the final result;
 * track down every lot fraction and its accounting details, in case of an audit.
 
-RP2 currently supports the [FIFO](https://www.investopedia.com/terms/f/fifo.asp) accounting method for US and Spanish taxes and the Total Average Method for Japanese taxes.
+RP2 currently supports the following accounting methods:
+* US: [FIFO](https://www.investopedia.com/terms/f/fifo.asp), [LIFO](https://www.investopedia.com/terms/f/lifo.asp) and [HIFO](https://www.investopedia.com/terms/f/hifo.asp). Note that these methods use universal application (not per-wallet application), as explained here: https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/;
+* Spain: FIFO;
+* Japan: Total Average Method.
 
 RP2 reads a configuration file and an input spreadsheet containing crypto transactions. These [input files](https://github.com/eprbell/rp2/blob/main/docs/input_files.md) can be generated either manually or automatically using [DaLI](https://github.com/eprbell/dali-rp2), a RP2 data loader and input generator (which is also privacy-focused, free, non-commercial, open-source and community-driven). After parsing the input, RP2 uses high-precision math to calculate long/short term capital gains, cost bases, balances, average price, in/out lot relationships/fractions, and finally it generates [output files](https://github.com/eprbell/rp2/blob/main/docs/output_files.md).
 
@@ -76,9 +79,9 @@ RP2 has extensive [unit test](https://github.com/eprbell/rp2/tree/main/tests/) c
 ### How RP2 Operates
 RP2 has been designed to have expressive primitives that can be used as building blocks for most tax scenarios: complex tax events can be described with patterns, built on top of these primitives (see the [FAQ list](https://github.com/eprbell/rp2/blob/main/docs/user_faq.md#tax-scenarios) for examples).
 
-RP2 treats virtual currency as property for tax purposes, as per [IRS Virtual Currency Guidance](https://www.irs.gov/newsroom/irs-reminds-taxpayers-to-report-virtual-currency-transactions).
+For the US case, RP2 treats virtual currency as property for tax purposes, as per [IRS Virtual Currency Guidance](https://www.irs.gov/newsroom/irs-reminds-taxpayers-to-report-virtual-currency-transactions).
 
-RP2 supports the FIFO accounting method: however, in and out lots typically don't have matching amounts, so RP2 fractions them, maps in/out lot fractions and computes the resulting cost basis and capital gains for each lot fraction.
+RP2 supports various accounting methods (e.g. FIFO, LIFO, HIFO): however, in and out lots typically don't have matching amounts, so RP2 fractions them, maps in/out lot fractions and computes the resulting cost basis and capital gains for each lot fraction.
 
 RP2 groups lot fractions into the following taxable event categories, each of which has a [specific tax treatment](https://github.com/eprbell/rp2/blob/main/docs/user_faq.md#which-crypto-tax-forms-to-file):
 * [AIRDROP](https://github.com/eprbell/rp2/blob/main/docs/user_faq.md#how-to-handle-airdrops): gains from airdrops;
@@ -170,11 +173,11 @@ The RP2 executable is country-dependent: `rp2_<country_code>`, where country cod
 To generate US tax output for the example files open a terminal window (or PowerShell if on Windows) and enter the following commands:
   ```
   cd <download_directory>
-  rp2_us -o output -p crypto_example_ crypto_example.ini crypto_example.ods
+  rp2_us -m fifo -o output -p crypto_example_ crypto_example.ini crypto_example.ods
   ```
 Results are generated in the `output` directory and logs are stored in the `log` directory.
 
-<!--- The `-m` option is particularly important, because is selects the accounting method: `rp2_us` supports FIFO, LIFO and HIFO (if `-m` is not specified it defaults to FIFO). --->
+The `-m` option is particularly important, because is selects the accounting method: `rp2_us` supports FIFO, LIFO and HIFO (if `-m` is not specified it defaults to FIFO).
 
 To print full command usage information for the `rp2_us` command:
   ```

docs/user_faq.md

@@ -85,13 +85,21 @@ In some cases exchange reports miss spot price information. In such situations y
 The user adds the tokens to the `assets` field of the [config file](input_files.md#the-config-file): RP2 accepts as valid all the tokens present in this field. See also the question on [writing a config file from scratch](#can-i-avoid-writing-a-config-file-from-scratch).
 
 ### What Accounting Methods Are Supported?
-Currently only the [FIFO](https://www.investopedia.com/terms/f/fifo.asp) accounting method is supported for US and Spanish taxes. Only the Total Average Method is supported for Japanese taxes.
+RP2 currently supports the following accounting methods:
+* US: [FIFO](https://www.investopedia.com/terms/f/fifo.asp), [LIFO](https://www.investopedia.com/terms/f/lifo.asp) and [HIFO](https://www.investopedia.com/terms/f/hifo.asp). Note that these methods use universal application (not per-wallet application), as explained here: https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/;
+* Spain: FIFO;
+* Japan: Total Average Method.
 
 ### Can I Change Accounting Method?
-No, currently RP2 only supports FIFO for US and Spanish taxes and the Total Average Method for Japanese taxes.
+Yes, for countries that support more than one accounting method, you can select which one to use via the `-m` command line option.
 
 ### What Countries Are Supported?
-Currently the US, Japan and Spain are supported, but more countries are being added. As new countries are added this FAQ will be updated.
+Currently the following countries are supported:
+* US;
+* Japan;
+* Spain.
+
+However more countries are being added. As new countries are added this FAQ will be updated.
 
 ### How to Switch from Another Tax Software to RP2?
 In other words, how does RP2 handle transactions that were managed by other software in previous years? In this case the user can just leave out from the RP2 input spreadsheet the transactions/lots that were already sold in previous years.

setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = rp2
 version = 1.5.0
-description = Privacy-focused, free, non-commercial, open-source, community-driven cryptocurrency tax calculator: it handles multiple coins/exchanges and computes long/short-term capital gains, cost bases, in/out lot relationships/fractioning, and account balances. It supports the FIFO accounting method, it features transparent computation for easy result verification, and it generates reports that tax accountants can understand, even if they are not cryptocurrency experts (e.g. form 8949).
+description = Privacy-focused, free, non-commercial, open-source, community-driven cryptocurrency tax calculator: it handles multiple coins/exchanges and computes long/short-term capital gains, cost bases, in/out lot relationships/fractioning, and account balances. It supports the FIFO, LIFO and HIFO accounting methods, it features transparent computation for easy result verification, and it generates reports that tax accountants can understand, even if they are not cryptocurrency experts (e.g. form 8949).
 
 long_description_content_type = text/markdown
 long_description = file: README.md, CHANGELOG.md

src/rp2/plugin/accounting_method/fifo.py

@@ -25,7 +25,9 @@
 from rp2.rp2_decimal import ZERO, RP2Decimal
 
 
-# FIFO plugin. See https://www.investopedia.com/terms/l/fifo.asp.
+# FIFO plugin. See https://www.investopedia.com/terms/l/fifo.asp. This plugin uses universal application, not per-wallet application:
+# this means there is one queue for each coin across every wallet and exchange and the accounting method is applied to each such queue.
+# More on this at https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/
 class AccountingMethod(AbstractAccountingMethod):
     def seek_non_exhausted_acquired_lot(
         self,

src/rp2/plugin/accounting_method/hifo.py

@@ -25,7 +25,9 @@
 from rp2.rp2_decimal import ZERO, RP2Decimal
 
 
-# HIFO plugin. See https://www.investopedia.com/terms/h/hifo.asp
+# HIFO plugin. See https://www.investopedia.com/terms/h/hifo.asp. This plugin uses universal application, not per-wallet application:
+# this means there is one queue for each coin across every wallet and exchange and the accounting method is applied to each such queue.
+# More on this at https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/
 class AccountingMethod(AbstractAccountingMethod):
     def seek_non_exhausted_acquired_lot(
         self,

src/rp2/plugin/accounting_method/lifo.py

@@ -25,8 +25,10 @@
 from rp2.rp2_decimal import ZERO, RP2Decimal
 
 
-# LIFO plugin. See https://www.investopedia.com/terms/l/lifo.asp. Note that under LIFO the date acquired must still be before or on the date sold:
-# see this discussion for details,
+# LIFO plugin. See https://www.investopedia.com/terms/l/lifo.asp. This plugin uses universal application, not per-wallet application:
+# this means there is one queue for each coin across every wallet and exchange and the accounting method is applied to each such queue.
+# More on this at https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/
+# Note that under LIFO the date acquired must still be before or on the date sold: for details see
 # https://ttlc.intuit.com/community/investments-and-rental-properties/discussion/using-lifo-method-for-cryptocurrency-or-even-stock-cost-basis/00/1433542
 class AccountingMethod(AbstractAccountingMethod):
     def seek_non_exhausted_acquired_lot(

src/rp2/plugin/country/us.py

@@ -34,8 +34,7 @@ def get_default_accounting_method(self) -> str:
 
     # Set of accounting methods accepted in the country
     def get_accounting_methods(self) -> Set[str]:
-        # Temporarily removed lifo and hifo due to https://github.com/eprbell/rp2/issues/79
-        return {"fifo"}
+        return {"fifo", "lifo", "hifo"}
 
     # Default set of generators to use if the user doesn't specify them on the command line
     def get_report_generators(self) -> Set[str]:

tests/abstract_test_ods_output_diff.py

@@ -40,7 +40,7 @@ class OutputPlugins(Enum):
 
 class AbstractTestODSOutputDiff(unittest.TestCase):
     # Temporarily removed lifo and hifo due to https://github.com/eprbell/rp2/issues/79
-    METHODS: List[str] = ["fifo"]
+    METHODS: List[str] = ["fifo", "lifo", "hifo"]
 
     def setUp(self) -> None:
         self.maxDiff = None  # pylint: disable=invalid-name