Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small adjustments to transfer-tx interface

Browse Source
This commit is contained in:
tim 2016-08-29 14:45:55 +02:00 committed by Sylvain Bellemare
parent 46f0b2c62e
commit 71b7eaed3e
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
transaction.py
View File

@ -266,7 +266,7 @@ class Transaction(object):
self.data = data self.data = data
@classmethod @classmethod
def create(cls, owners_before, owners_after, payload, secret=None, def create(cls, owners_before, owners_after, payload=None, secret=None,
time_expire=None): time_expire=None):
if not isinstance(owners_before, list): if not isinstance(owners_before, list):
raise TypeError('`owners_before` must be a list instance') raise TypeError('`owners_before` must be a list instance')
@ -324,7 +324,7 @@ class Transaction(object):
raise ValueError("This is not the case you're looking for ;)") raise ValueError("This is not the case you're looking for ;)")
@classmethod @classmethod
def transfer(cls, inputs, owners_after, payload, secret=None, time_expiry=None): def transfer(cls, inputs, owners_after, payload=None, secret=None, time_expiry=None):
if not isinstance(inputs, list): if not isinstance(inputs, list):
raise TypeError('`inputs` must be a list instance') raise TypeError('`inputs` must be a list instance')
if not isinstance(owners_after, list): if not isinstance(owners_after, list):
@ -332,23 +332,43 @@ class Transaction(object):
data = Data(payload) data = Data(payload)
if len(inputs) == len(owners_after) and len(owners_after) == 1: if len(inputs) == len(owners_after) and len(owners_after) == 1:
# NOTE: Standard case, one input and one output
ffill_for_cond = Ed25519Fulfillment(public_key=owners_after[0]) ffill_for_cond = Ed25519Fulfillment(public_key=owners_after[0])
cond_tx = Condition(ffill_for_cond, owners_after) cond_tx = Condition(ffill_for_cond, owners_after)
return cls(cls.TRANSFER, inputs, [cond_tx], data) return cls(cls.TRANSFER, inputs, [cond_tx], data)
elif len(inputs) == 1 and len(owners_after) > 1:
# NOTE: Threshold condition case
threshold = ThresholdSha256Fulfillment(threshold=len(owners_after))
for owner_after in owners_after:
threshold.add_subfulfillment(Ed25519Fulfillment(public_key=owner_after))
cond_tx = Condition(threshold, owners_after)
return cls(cls.TRANSFER, inputs, [cond_tx], data)
elif len(inputs) == len(owners_after) and len(owners_after) > 1:
# NOTE: Multiple inputs and outputs and threshold
# even though asset could also live on as multiple inputs
# and outputs
pass
def __eq__(self, other): def __eq__(self, other):
return self.to_dict() == other.to_dict() return self.to_dict() == other.to_dict()
# TODO: There might be a better name def to_inputs(self, condition_indices=None):
def to_spendable_fulfillments(self, condition_indices): inputs = []
spendables = [] # NOTE: If no condition indices are passed, we just assume to
# take all conditions as inputs.
if condition_indices is None or len(condition_indices) == 0:
condition_indices = [index for index, _
in enumerate(self.conditions)]
for cid in condition_indices: for cid in condition_indices:
input_cond = self.conditions[cid] input_cond = self.conditions[cid]
ffill = Fulfillment(input_cond.fulfillment, ffill = Fulfillment(input_cond.fulfillment,
input_cond.owners_after, input_cond.owners_after,
TransactionLink(self.id, cid)) TransactionLink(self.id, cid))
spendables.append(ffill) inputs.append(ffill)
return spendables return inputs
def add_fulfillment(self, fulfillment): def add_fulfillment(self, fulfillment):
if fulfillment is not None and not isinstance(fulfillment, Fulfillment): if fulfillment is not None and not isinstance(fulfillment, Fulfillment):