bigchaindb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d9cf27e3a5fb294f3c6e37d7b84faddb571f3c
-  data.tar.gz: 3d95ff6eb3c196556dc7f314c2e1ad4b8d3098df
+  metadata.gz: 2618f49e57cb2ca1f60a063f1158f67aa8fdcb1a
+  data.tar.gz: 7baed025c2623ac93d98ef0f69c0a1468fa1566d
 SHA512:
-  metadata.gz: a1ab9d92ca2f8e04552625929a36117fa09f1515683beeb9ec3ec6e382529ebcfc8bc80fc036def0fc7ee20a98965d3da878f5e18fafa19c2cc80faa7deb7466
-  data.tar.gz: a7e7737e4dd84c11e13b45f7dd416eecfc7e578b20f0e9564e5920cd6412244651b11ebda8c80df7e71c5fb3c00c4b59da32d022ab608b8d71f9f75cfec2d396
+  metadata.gz: 2cee9717b4f5c95b51d94412e69f14625ff1b820a0dba70cb3e42d780dddfc16dc3173cc79cacbf9a6d623a62a262203e1ed137de36f3b744f3226aa8306d6b3
+  data.tar.gz: 6fdd7c0f337fa04bb93ac3cace765729ac2617394c25763f79444fdb60cf519a8f6d93c68f4c782e3ac8d596a6166478f679c242c03971eaa0284f68e6a8e378

data/lib/bigchaindb.rb

@@ -47,9 +47,9 @@ module Bdb
   def self.spend(txn, output_ids = [])
     # Convert outputs in txn to signable/spendable inputs.
     if output_ids.any?
-      args = [txn.to_json]
-    else
       args = [txn.to_json, output_ids.to_json]
+    else
+      args = [txn.to_json]
     end
     JSON.parse(`bdb spend #{args.shelljoin}`)
   end
@@ -61,9 +61,28 @@ module Bdb
 
   def self.transfer_asset(ipdb, receiver_pubkey, sender_pubkey, sender_privkey, inputs, amount, asset_id, metadata = {"ts"=> Time.now.to_s})
     asset = { "id" => asset_id}
-    input_amount = inputs["outputs"].inject(0) { |sum,out| sum + out["amount"].to_i }
+    new_inputs = []
+    input_amount = 0
+
+    if inputs.blank?
+      # ask IPDB for unspent outputs
+      unspent = Bdb.unspent_outputs(ipdb, sender_pubkey)
+      unspent.each do |u|
+        txn = JSON.parse(Bdb.get_transaction_by_id(ipdb, u["transaction_id"]))
+        next unless t["asset"]["id"] == asset_id
+        input_amount += txn["outputs"][u["output_index"]]["amount"].to_i
+        new_inputs.push(Bdb.spend(txn, u["output_index"]))
+      end
+    else
+      # assume that every output for sender_pubkey in given inputs is unspent and can be used as input
+      inputs.each do |inp|
+        input_amount += inp["outputs"].select { |o| o["condition"]["details"]["public_key"] == sender_pubkey }.inject(0) { |sum,out| sum + out["amount"].to_i }
+        new_inputs.push(Bdb.spend(inp, inputs["outputs"].each_with_index.select { |o,i| o["condition"]["details"]["public_key"] == sender_pubkey }.map(&:last)))
+      end
+    end
+
     if amount > input_amount
-      puts "input_amount < amount"
+      puts "input_amount #{input_amount} < amount #{amount}"
       return nil
     end
     outputs = [Bdb.generate_output(receiver_pubkey,amount)]
@@ -71,14 +90,14 @@ module Bdb
       # left-over amount should be transferred back to sender
       outputs.push(Bdb.generate_output(sender_pubkey,input_amount - amount))
     end
-    input = Bdb.spend(inputs)
-    transfer = Bdb.transfer_txn(input, outputs, asset, metadata)
+    
+    transfer = Bdb.transfer_txn(new_inputs, outputs, asset, metadata)
     signed_transfer = Bdb.sign(transfer, sender_privkey)
     resp = post_transaction(ipdb, signed_transfer)
     if resp.code == 202
-      puts "Transaction posted. Now checking status..."
-      sleep(5)
       txn = JSON.parse(resp.body)
+      puts "Transaction #{txn["id"]} posted. Now checking status..."
+      sleep(5)
       status_resp = get_transaction_status(ipdb, txn["id"])
       if (status_resp.code == 200) && JSON.parse(status_resp.body)["status"] == "valid"
         return {"transfer" => transfer, "txn" => txn}
@@ -105,9 +124,9 @@ module Bdb
     signed_create = Bdb.sign(create, private_key)
     resp = post_transaction(ipdb, signed_create)
     if resp.code == 202
-      puts "Transaction posted. Now checking status..."
-      sleep(5)
       txn = JSON.parse(resp.body)
+      puts "Transaction #{txn["id"]} posted. Now checking status..."
+      sleep(5)
       status_resp = get_transaction_status(ipdb, txn["id"])
       if (status_resp.code == 200) && JSON.parse(status_resp.body)["status"] == "valid"
         return {"create" => create, "txn" => txn}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigchaindb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nilesh Trivedi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty