Apply redistribution correction from singlecap to singlenocap contract

python/CHANGELOG

@@ -1,4 +1,7 @@
-- 0.0.2-pending
+- 0.0.9
+	* Fix wrong redistribution calculation in single nocap
+[...]
+- 0.0.2
 	* Move to chainlib-eth
 - 0.0.1-unreleased
 	* Interface for redistributed and non-redistributed, with or without cap

python/requirements.txt

@@ -1,3 +1,3 @@
-chainlib-eth~=0.0.15
-eth-erc20~=0.1.5
-funga-eth~=0.5.1
+chainlib-eth~=0.0.27
+eth-erc20~=0.1.10
+funga-eth~=0.5.6

python/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = erc20-demurrage-token
-version = 0.0.8
+version = 0.0.9
 description = ERC20 token with redistributed continual demurrage
 author = Louis Holbrook
 author_email = dev@holbrook.no

python/tests/test_basic.py

@@ -107,10 +107,11 @@ class TestBasic(TestDemurrageDefault):
         r = self.rpc.do(o)
         demurrage_amount = c.parse_demurrage_amount(r)
         modifier_base = ((1000000 - self.tax_level) / 1000000) ** 10
+        logg.warning('mod base {}'.format(modifier_base))
         modifier = int(modifier_base * (10 ** 12))
 
         rounding_tolerance_nano = 4000000 # 0.000004% precision
-        demurrage_amount_truncate = int(demurrage_amount / (10 ** 26)) # equals 12 decimal places
+        demurrage_amount_truncate = int(demurrage_amount / (10 ** 16)) # equals 38 decimal places - 14 for the modifier magniture - 2 for percent int calc + 6 for token decimals (originally equalled 12 decimal places)
         self.assertGreaterEqual(modifier, demurrage_amount_truncate - rounding_tolerance_nano)
         self.assertLessEqual(modifier, demurrage_amount_truncate)