Fix cumulative distribution calculation bug in SingleNocap

python/erc20_demurrage_token/token.py

@@ -38,6 +38,15 @@ class DemurrageTokenSettings:
         self.sink_address = None
 
 
+    def __str__(self):
+        return 'name {} demurrage level {} period minutes {} sink address {}'.format(
+                self.name,
+                self.demurrage_level,
+                self.period_minutes,
+                self.sink_address,
+                )
+
+
 class DemurrageToken(ERC20):
 
     __abi = {}
@@ -445,14 +454,16 @@ class DemurrageToken(ERC20):
         return o
 
 
-    def get_distribution_from_redistribution(self, contract_address, redistribution, sender_address=ZERO_ADDRESS, id_generator=None):
+    def get_distribution_from_redistribution(self, contract_address, redistribution, redistribution_previous, sender_address=ZERO_ADDRESS, id_generator=None):
         j = JSONRPCRequest(id_generator)
         o = j.template()
         o['method'] = 'eth_call'
         enc = ABIContractEncoder()
         enc.method('getDistributionFromRedistribution')
         enc.typ(ABIContractType.BYTES32)
+        enc.typ(ABIContractType.BYTES32)
         enc.bytes32(redistribution)
+        enc.bytes32(redistribution_previous)
         data = add_0x(enc.get())
         tx = self.template(sender_address, contract_address)
         tx = self.set_code(tx, data)

python/erc20_demurrage_token/unittest/base.py

@@ -33,7 +33,7 @@ PERIOD = 10
 class TestTokenDeploy:
 
     def __init__(self, rpc, token_symbol='FOO', token_name='Foo Token', sink_address=ZERO_ADDRESS, supply=10**12):
-        self.tax_level = TAX_LEVEL
+        self.tax_level= TAX_LEVEL
         self.period_seconds = PERIOD * 60
 
         self.settings = DemurrageTokenSettings()
@@ -44,6 +44,7 @@ class TestTokenDeploy:
         self.settings.period_minutes = PERIOD
         self.settings.sink_address = sink_address
         self.sink_address = self.settings.sink_address
+        logg.debug('using demurrage token settings: {}'.format(self.settings))
 
         o = block_latest()
         self.start_block = rpc.do(o)
@@ -203,7 +204,7 @@ class TestDemurrageCap(TestDemurrage):
 class TestDemurrageUnit(TestDemurrage):
 
     def setUp(self):
-        super(TestDemurrage, self).setUp()
+        super(TestDemurrageUnit, self).setUp()
 
         self.tax_level = 50
         self.period_seconds = 60