updated multiple owner docs and cryptoconditions example

tests/doc/run_doc_python_server_api_examples.py

@@ -31,11 +31,18 @@ sleep(10)
 
 tx_retrieved = b.get_transaction(tx_signed['id'])
 
+print(json.dumps(tx_retrieved, sort_keys=True, indent=4, separators=(',', ':')))
+
+print(testuser1_pub)
+print(b.me)
+
+print(tx_retrieved['id'])
 # create a second testuser
 testuser2_priv, testuser2_pub = crypto.generate_key_pair()
 
 # retrieve the transaction with condition id
 tx_retrieved_id = b.get_owned_ids(testuser1_pub).pop()
+print(json.dumps(tx_retrieved_id, sort_keys=True, indent=4, separators=(',', ':')))
 
 # create a transfer transaction
 tx_transfer = b.create_transaction(testuser1_pub, testuser2_pub, tx_retrieved_id, 'TRANSFER')
@@ -50,6 +57,8 @@ sleep(10)
 
 # check if the transaction is already in the bigchain
 tx_transfer_retrieved = b.get_transaction(tx_transfer_signed['id'])
+print(json.dumps(tx_transfer_retrieved, sort_keys=True, indent=4, separators=(',', ':')))
+
 
 # create another transfer transaction with the same input
 tx_transfer2 = b.create_transaction(testuser1_pub, testuser2_pub, tx_retrieved_id, 'TRANSFER')
@@ -63,20 +72,54 @@ try:
 except exceptions.DoubleSpend as e:
     print(e)
 
+# Create a new asset and assign it to multiple owners
+tx_multisig = b.create_transaction(b.me, [testuser1_pub, testuser2_pub], None, 'CREATE')
+
+# Have the federation sign the transaction
+tx_multisig_signed = b.sign_transaction(tx_multisig, b.me_private)
+b.write_transaction(tx_multisig_signed)
+
+# wait a few seconds for the asset to appear on the blockchain
+sleep(10)
+
+# retrieve the transaction
+tx_multisig_retrieved = b.get_transaction(tx_multisig_signed['id'])
+
+print(json.dumps(tx_multisig_retrieved, sort_keys=True, indent=4, separators=(',', ':')))
+
+testuser3_priv, testuser3_pub = crypto.generate_key_pair()
+
+tx_multisig_retrieved_id = b.get_owned_ids(testuser2_pub).pop()
+tx_multisig_transfer = b.create_transaction([testuser1_pub, testuser2_pub], testuser3_pub, tx_multisig_retrieved_id, 'TRANSFER')
+tx_multisig_transfer_signed = b.sign_transaction(tx_multisig_transfer, [testuser1_priv, testuser2_priv])
+
+b.write_transaction(tx_multisig_transfer_signed)
+
+# wait a few seconds for the asset to appear on the blockchain
+sleep(10)
+
+# retrieve the transaction
+tx_multisig_retrieved = b.get_transaction(tx_multisig_transfer_signed['id'])
+
+print(json.dumps(tx_multisig_transfer_signed, sort_keys=True, indent=4, separators=(',', ':')))
+
 # create some new testusers
 thresholduser1_priv, thresholduser1_pub = crypto.generate_key_pair()
 thresholduser2_priv, thresholduser2_pub = crypto.generate_key_pair()
+thresholduser3_priv, thresholduser3_pub = crypto.generate_key_pair()
 
 # retrieve the last transaction of testuser2
 tx_retrieved_id = b.get_owned_ids(testuser2_pub).pop()
 
-# create a base template for a 1-input/2-output transaction
-threshold_tx = b.create_transaction(testuser2_pub, [thresholduser1_pub, thresholduser2_pub], tx_retrieved_id, 'TRANSFER')
+# create a base template for a 1-input/3-output transaction
+threshold_tx = b.create_transaction(testuser2_pub, [thresholduser1_pub, thresholduser2_pub, thresholduser3_pub],
+                                    tx_retrieved_id, 'TRANSFER')
 
-# create a Threshold Cryptocondition
+# create a 2-out-of-3 Threshold Cryptocondition
 threshold_condition = ThresholdSha256Fulfillment(threshold=2)
 threshold_condition.add_subfulfillment(Ed25519Fulfillment(public_key=thresholduser1_pub))
 threshold_condition.add_subfulfillment(Ed25519Fulfillment(public_key=thresholduser2_pub))
+threshold_condition.add_subfulfillment(Ed25519Fulfillment(public_key=thresholduser3_pub))
 
 # update the condition in the newly created transaction
 threshold_tx['transaction']['conditions'][0]['condition'] = {
@@ -97,28 +140,41 @@ sleep(10)
 
 # check if the transaction is already in the bigchain
 tx_threshold_retrieved = b.get_transaction(threshold_tx_signed['id'])
+print(json.dumps(tx_threshold_retrieved, sort_keys=True, indent=4, separators=(',', ':')))
 
-thresholduser3_priv, thresholduser3_pub = crypto.generate_key_pair()
+thresholduser4_priv, thresholduser4_pub = crypto.generate_key_pair()
 
 # retrieve the last transaction of thresholduser1_pub
 tx_retrieved_id = b.get_owned_ids(thresholduser1_pub).pop()
 
 # create a base template for a 2-input/1-output transaction
-threshold_tx_transfer = b.create_transaction([thresholduser1_pub, thresholduser2_pub], thresholduser3_pub, tx_retrieved_id, 'TRANSFER')
+threshold_tx_transfer = b.create_transaction([thresholduser1_pub, thresholduser2_pub, thresholduser3_pub],
+                                             thresholduser4_pub, tx_retrieved_id, 'TRANSFER')
 
 # parse the threshold cryptocondition
 threshold_fulfillment = Fulfillment.from_json(threshold_tx['transaction']['conditions'][0]['condition']['details'])
-subfulfillment1 = threshold_fulfillment.subconditions[0]['body']
-subfulfillment2 = threshold_fulfillment.subconditions[1]['body']
+
+subfulfillment1 = threshold_fulfillment.get_subcondition_from_vk(thresholduser1_pub)[0]
+subfulfillment2 = threshold_fulfillment.get_subcondition_from_vk(thresholduser2_pub)[0]
+subfulfillment3 = threshold_fulfillment.get_subcondition_from_vk(thresholduser3_pub)[0]
+
 
 # get the fulfillment message to sign
 threshold_tx_fulfillment_message = util.get_fulfillment_message(threshold_tx_transfer,
                                                                 threshold_tx_transfer['transaction']['fulfillments'][0],
                                                                 serialized=True)
 
-# sign the subconditions
+# clear the subconditions of the threshold fulfillment, they will be added again after signing
+threshold_fulfillment.subconditions = []
+
+# sign and add the subconditions until threshold of 2 is reached
 subfulfillment1.sign(threshold_tx_fulfillment_message, crypto.SigningKey(thresholduser1_priv))
+threshold_fulfillment.add_subfulfillment(subfulfillment1)
 subfulfillment2.sign(threshold_tx_fulfillment_message, crypto.SigningKey(thresholduser2_priv))
+threshold_fulfillment.add_subfulfillment(subfulfillment2)
+
+# Add remaining (unfulfilled) fulfillment as a condition
+threshold_fulfillment.add_subcondition(subfulfillment3.condition)
 
 assert threshold_fulfillment.validate(threshold_tx_fulfillment_message) == True
 
@@ -126,7 +182,10 @@ threshold_tx_transfer['transaction']['fulfillments'][0]['fulfillment'] = thresho
 
 assert b.verify_signature(threshold_tx_transfer) == True
 
-assert b.validate_transaction(threshold_tx_transfer) == True
+assert b.validate_transaction(threshold_tx_transfer) == threshold_tx_transfer
 
 b.write_transaction(threshold_tx_transfer)
 
+print(json.dumps(threshold_tx_transfer, sort_keys=True, indent=4, separators=(',', ':')))
+
+