Added state "external" to field digital_currency_tx_state on economicevent. Now when a tx in bc, take "external" state

Author: XaviP

valuenetwork/valueaccounting/migrations/0009_auto_20170422_0732.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2017-04-22 07:32
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('valueaccounting', '0008_auto_20170319_1333'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='economicevent',
+            name='digital_currency_tx_state',
+            field=models.CharField(blank=True, choices=[(b'new', 'New'), (b'pending', 'Pending'), (b'broadcast', 'Broadcast'), (b'confirmed', 'Confirmed'), (b'external', 'External')], max_length=12, null=True, verbose_name='digital currency transaction state'),
+        ),
+    ]

valuenetwork/valueaccounting/models.py

@@ -884,7 +884,7 @@ def total_financial_income(self):
             Q(event_type__name='Expense Contribution')
             )
         return sum(event.quantity for event in events)
-        
+
     def all_events(self):
         return EconomicEvent.objects.filter(
             Q(from_agent=self)|Q(to_agent=self))
@@ -10535,6 +10535,7 @@ def contributions(self):
     ('pending', _('Pending')),
     ('broadcast', _('Broadcast')),
     ('confirmed', _('Confirmed')),
+    ('external', _('External')),
 )
 
 class EconomicEvent(models.Model):
@@ -10768,8 +10769,8 @@ def due_date(self):
             return self.commitment.due_date
         else:
             return self.event_date
-        
-        
+
+
     def previous_events(self):
         """ Experimental method:
         Trying to use properties of events to determine event sequence.
@@ -10815,7 +10816,7 @@ def transaction_state(self):
         #import pdb; pdb.set_trace()
         state = self.digital_currency_tx_state
         new_state = None
-        if state == "new" or state == "pending" or state == "broadcast":
+        if state == "external" or state == "pending" or state == "broadcast":
             tx = self.digital_currency_tx_hash
             if tx:
                 from valuenetwork.valueaccounting.faircoin_utils import get_confirmations

valuenetwork/valueaccounting/service.py

@@ -91,7 +91,7 @@ def faircoin_incoming_exchange_type(cls):
         xt = ExchangeType.objects.filter(
             use_case=use_case,
             name="Receive FairCoins")
-        if xt: 
+        if xt:
             xt = xt[0]
         else:
             xt = ExchangeType(
@@ -106,7 +106,7 @@ def faircoin_incoming_transfer_type(cls):
         tt = TransferType.objects.filter(
             exchange_type=xt,
             name="Receive FairCoins")
-        if tt: 
+        if tt:
             tt = tt[0]
         else:
             tt = TransferType(
@@ -232,8 +232,8 @@ def include_blockchain_tx_as_event(self, agent, resource):
                 )
                 transfer.save()
 
-                et_receive = EventType.objects.get(name="Receive") 
-                state = "new"
+                et_receive = EventType.objects.get(name="Receive")
+                state = "external"
                 confirmations, timestamp = faircoin_utils.get_confirmations(str(tx[0]))
                 if confirmations > 0:
                     state = "broadcast"
@@ -253,7 +253,7 @@ def include_blockchain_tx_as_event(self, agent, resource):
                     event_reference=faircoin_address
                 )
                 event.save()
-                
+
                 tx_included.append(str(tx[0]))
         #import pdb; pdb.set_trace()
         return tx_included