Upload 5 files

task_assignment.py

@@ -6,7 +6,7 @@ from task_projection import scoped_pending
 from sqlalchemy.orm import Session
 from models_sql import Transaction, TaskAssignment
 from tip_transaction import lock_wallet_accounts
-from task_terms import funded_amount, latest_terms
+from task_terms import funded_amount, latest_terms, repeated_zero_deposits
 
 
 def assign_open_task(session, task_id, publisher, assignee, load_task):
@@ -30,7 +30,7 @@ def assign_open_task(session, task_id, publisher, assignee, load_task):
         deposits = [row for row in rows if row.tx_type == 'TASK_DEPOSIT']
         assignment = session.get(TaskAssignment,task_id)
         if deposits:
-            if (len(deposits)!=1 or deposits[0].account!=publisher or deposits[0].related_account!=assignee
+            if ((len(deposits)!=1 and not repeated_zero_deposits(deposits,publisher,assignee,deposit)) or deposits[0].account!=publisher or deposits[0].related_account!=assignee
                     or type(deposits[0].amount) is not int or deposits[0].amount!=-deposit):
                 raise ValueError('task already assigned differently')
             if assignment is None:
@@ -80,7 +80,7 @@ def project_assignments(bind,store,limit=50, *, task_id=None):
                 deposits=session.query(Transaction).filter(Transaction.item_id==task_id,
                     Transaction.tx_type=='TASK_DEPOSIT').all()
                 if (row.publisher!=publisher or type(row.deposit) is not int or row.deposit<0
-                        or len(deposits)!=1 or deposits[0].account!=publisher
+                        or (len(deposits)!=1 and not repeated_zero_deposits(deposits,publisher,row.assignee,row.deposit)) or deposits[0].account!=publisher
                         or deposits[0].related_account!=row.assignee or type(deposits[0].amount) is not int
                         or deposits[0].amount!=-row.deposit):
                     raise ValueError('assignment ledger mismatch')

task_dispute_read.py

@@ -5,7 +5,7 @@ from models_sql import TaskDisputeRecord, TaskDisputeResponseRecord, TaskResolut
 from task_dispute import dispute_payload
 from task_dispute_response import response_payload, ORIGINAL_FIELDS, RESPONSE_FIELDS
 from task_resolution import validate_resolution_ledgers, validate_participants
-from task_terms import funded_amount
+from task_terms import funded_amount, repeated_zero_deposits
 
 
 class DisputeReadDenied(PermissionError):
@@ -83,7 +83,7 @@ def merged_dispute(session, source, identifier, actor, admin=False, *, records=N
             Transaction.tx_type.like('TASK_%')).populate_existing().all()
         amount = funded_amount(rows, publisher)
         deposits = [r for r in rows if r.tx_type == 'TASK_DEPOSIT']
-        if (amount != resolution.amount or len(deposits) != 1 or deposits[0].account != publisher
+        if (amount != resolution.amount or (len(deposits) != 1 and not repeated_zero_deposits(deposits, publisher, assignee, resolution.deposit)) or deposits[0].account != publisher
                 or deposits[0].related_account != assignee or type(deposits[0].amount) is not int
                 or deposits[0].amount != -resolution.deposit):
             raise ValueError('resolution differs from actual funding')

task_read.py

@@ -6,7 +6,7 @@ from sqlalchemy import func
 from models_sql import (TaskPublication, TaskRevision, TaskAssignment, TaskDelivery,
                         TaskDisputeRecord, TaskDisputeResponseRecord, TaskSettlement,
                         TaskResolution, Transaction)
-from task_terms import validate_patch, funded_amount
+from task_terms import validate_patch, funded_amount, repeated_zero_deposits
 from task_delivery import delivery_patch
 from task_dispute import dispute_payload
 from task_resolution import distribution
@@ -79,7 +79,7 @@ def merged_task(current, records, funds):
         deposit = result.get('deposit_amount')
         if type(deposit) is float and deposit.is_integer() and 0 <= deposit <= 2147483647:
             deposit = int(deposit)
-        if len(deposits) != 1:
+        if len(deposits) != 1 and not repeated_zero_deposits(deposits, publisher, assignee, deposit):
             _reject_deposit('ledger_count')
         if type(deposit) is not int:
             _reject_deposit('deposit_type')

task_settlement.py

@@ -5,7 +5,7 @@ import uuid
 from task_projection import scoped_pending
 from sqlalchemy.orm import Session
 from models_sql import Transaction,TaskSettlement,TaskDisputeRecord,TaskDisputeResponseRecord
-from task_terms import funded_amount,latest_terms
+from task_terms import funded_amount,latest_terms,repeated_zero_deposits
 from tip_transaction import lock_wallet_accounts
 
 
@@ -21,7 +21,7 @@ def settlement_terms(session,task,publisher,assignee):
         Transaction.tx_type.like('TASK_%')).populate_existing().with_for_update().all()
     amount=funded_amount(rows,publisher)
     deposits=[row for row in rows if row.tx_type=='TASK_DEPOSIT']
-    if (len(deposits)!=1 or deposits[0].account!=publisher or deposits[0].related_account!=assignee
+    if ((len(deposits)!=1 and not repeated_zero_deposits(deposits,publisher,assignee,task.get('deposit_amount'))) or deposits[0].account!=publisher or deposits[0].related_account!=assignee
             or type(deposits[0].amount) is not int or deposits[0].amount>0):
         raise ValueError('invalid task deposit')
     deposit=-deposits[0].amount
@@ -124,7 +124,7 @@ def project_settlements(bind,store,limit=50, *, task_id=None):
                 funds=session.query(Transaction).filter(Transaction.item_id==task_id,
                     Transaction.tx_type.like('TASK_%')).all()
                 deposits=[tx for tx in funds if tx.tx_type=='TASK_DEPOSIT']
-                if (funded_amount(funds,publisher)!=row.amount or len(deposits)!=1
+                if (funded_amount(funds,publisher)!=row.amount or (len(deposits)!=1 and not repeated_zero_deposits(deposits,publisher,assignee,row.deposit))
                         or deposits[0].account!=publisher or deposits[0].related_account!=assignee
                         or type(deposits[0].amount) is not int or deposits[0].amount!=-row.deposit):
                     raise ValueError('settlement projection funding mismatch')

task_terms.py

@@ -38,6 +38,20 @@ def funded_amount(rows, publisher):
     return amount
 
 
+
+def repeated_zero_deposits(rows, publisher, assignee, deposit):
+    if (len(rows) < 2 or type(deposit) is not int or deposit != 0
+            or not isinstance(publisher, str) or not publisher.strip()
+            or not isinstance(assignee, str) or not assignee.strip() or publisher == assignee):
+        return False
+    identifiers = [getattr(row, 'tx_id', None) for row in rows]
+    return (all(isinstance(identifier, str) and identifier.strip() for identifier in identifiers)
+            and len(set(identifiers)) == len(identifiers)
+            and all(row.tx_type == 'TASK_DEPOSIT' and row.account == publisher
+                    and row.related_account == assignee and type(row.amount) is int
+                    and row.amount == 0 for row in rows))
+
+
 def latest_terms(session, task):
     rows = session.query(TaskRevision).filter(TaskRevision.task_id == task['id']).order_by(
         TaskRevision.revision.desc()).populate_existing().with_for_update().all()