pochette 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8dd02b0770bece5d5eaa3448a0b93c3a845b2ec
-  data.tar.gz: c5c98babd5e812837602407b1e9e4b8efb73e9d9
+  metadata.gz: 1ac3995ef5885c6804c5122045e8d8ed6a738e6d
+  data.tar.gz: 20cf6325242fbcb5336a6e9c60cf72a6d17f9d59
 SHA512:
-  metadata.gz: f32b462888cefaafc710fb3b6855f52b4768d4f0f8ededfcded88914363262b687831d0f572645c5625d79546b4b99b078d897b658c687eea21cd773544b7deb
-  data.tar.gz: 20eeea9cb1b468b94c8a90edb093bfb82392857f12f82ea4e7cb7d89af7f4b62987b0d99e6858e8c5a06d10ab0e7d526dfb3bcbd7d8ba4870d7332754f5eb48f
+  metadata.gz: 2d3cd3d8adc25a27d02f8745292e7a22a4573914956ab3c3d701a729d8a97861ca36ff30d3afa869b45abb3ac65ce5d9e4c8f71a5b7c01b7260d3f8c0663a464
+  data.tar.gz: dfbabba768e84d4900d71bb30d39942b166a059cf28b3131781d70893ee6bf04d83f0c78180aab3b8bd65763e7d5dc0b37440f1ac32ddfc56662309923e60c00

data/README.md

@@ -128,7 +128,7 @@ A hash with
 <dt>outputs:</dt>
 <dd>Array of [destination address, amount in satoshis]</dd>
 <dt>inputs:</dt>
-<dd>Array of [input address, utxo transaction hash, utxo position, amount]</dd>
+<dd>Array of [input address, utxo transaction hash, utxo position, amount, scriptPubKey]</dd>
 <dt>utxos_to_blacklist:</dt>
 <dd>
   Transaction inputs formatted to be used as utxo_blacklist on another
@@ -168,7 +168,8 @@ A hash with
       [ "2NAHscN6XVqUPzBSJHC3fhkeF5SQVxiR9p9",
         "956b30c3c4335f019dbee60c60d76994319473acac356f774c7858cd5c968e40",
         1,
-        200000000
+        200000000,
+        'public_key_in_hex_format'
       ],
     ],
     utxos_to_blacklist: [
@@ -299,7 +300,8 @@ A hash with
       [ "2NAHscN6XVqUPzBSJHC3fhkeF5SQVxiR9p9",
         "956b30c3c4335f019dbee60c60d76994319473acac356f774c7858cd5c968e40",
         1,
-        200000000
+        200000000,
+        "script_pubkey"
       ],
     ],
     trezor_inputs: [
@@ -472,19 +474,19 @@ Pochette::TransactionBuilder which is smart about selecting utxos.
     ]
 >>> backend.list_unspent(addresses).should == [
   ["mjfa56Keq7PXRKgdPSDB6eWLp4aaAVcj6L",
-  "fb401691795a73e0160252c00af18327a15006fcdf877ccca0c116809669032e", 0, 500000],
+  "fb401691795a73e0160252c00af18327a15006fcdf877ccca0c116809669032e", 0, 500000, "script_pub_key"],
   ["mxYzRdJfPk8PcaKSsSzNkX85mMfNcr2CGr",
-  "250978b77fe1310d6c72239d9e9589d7ac3dc6edf1b2412806ace5104553da34", 1, 100000],
+  "250978b77fe1310d6c72239d9e9589d7ac3dc6edf1b2412806ace5104553da34", 1, 100000, "script_pub_key"],
   ["mvrDG7Ts6Mq9ejhZxdsQLjbScycVaktqsg",
-  "d9afd460b0a5e065fdd87bf97cb1843a29ea588c59daabd1609794e8166bb75f", 0, 500000],
+  "d9afd460b0a5e065fdd87bf97cb1843a29ea588c59daabd1609794e8166bb75f", 0, 500000, "script_pub_key"],
   ["mxYzRdJfPk8PcaKSsSzNkX85mMfNcr2CGr",
-  "5bd72a4aa7818f47ac8943e3e17519be00c46530760860e608d898d728b9d46e", 1, 100000],
+  "5bd72a4aa7818f47ac8943e3e17519be00c46530760860e608d898d728b9d46e", 1, 100000, "script_pub_key"],
   ["mwZE4QfzzriE7nsgHSWbgmtT7s6SDysYvP",
-  "b252037526ecb616ab5901552abb903f00bf73400a1fc49b5b5bd699b84bce77", 0, 500000],
+  "b252037526ecb616ab5901552abb903f00bf73400a1fc49b5b5bd699b84bce77", 0, 500000, "script_pub_key"],
   ["mjfa56Keq7PXRKgdPSDB6eWLp4aaAVcj6L",
-  "9142d7a8e96124a36db9708dd21afa4ac81f15a77bd85c06f16e808a4d700da2", 1, 100000],
+  "9142d7a8e96124a36db9708dd21afa4ac81f15a77bd85c06f16e808a4d700da2", 1, 100000, "script_pub_key"],
   ["mzbXim4u1Nq4J2kVggu471pZL3ahxNkmE9",
-  "ff768084764a05d1de72628432c0a4419538b2786089ec8ad009f6096bc69fe1", 0, 500000]
+  "ff768084764a05d1de72628432c0a4419538b2786089ec8ad009f6096bc69fe1", 0, 500000, "script_pub_key"]
 ]
 ```
 

data/lib/pochette/backends/bitcoin_core.rb

@@ -74,7 +74,7 @@ class Pochette::Backends::BitcoinCore
   def list_unspent(addresses)
     return nil if addresses.empty?
     client.listunspent(1, 99999999, addresses).collect do |u| 
-      [u[:address], u[:txid], u[:vout], (u[:amount] * 1_0000_0000).to_i]
+      [u[:address], u[:txid], u[:vout], (u[:amount] * 1_0000_0000).to_i, u[:scriptPubKey]]
     end
   end
 

data/lib/pochette/backends/blockchain_info.rb

@@ -15,7 +15,7 @@ class Pochette::Backends::BlockchainInfo
     json = get_json("unspent", {active: addresses.join('|'), format: 'json'})
     json['unspent_outputs'].collect do |utxo|
       address = Bitcoin::Script.new(utxo['script'].htb).get_address
-      [address, utxo['tx_hash_big_endian'], utxo['tx_output_n'].to_i, utxo['value']]
+      [address, utxo['tx_hash_big_endian'], utxo['tx_output_n'].to_i, utxo['value'], utxo['script']]
     end
   end
   

data/lib/pochette/transaction_builder.rb

@@ -43,7 +43,7 @@ class Pochette::TransactionBuilder
     :output_total => C::Num,
     :fee => C::Num,
     :outputs => C::ArrayOf[[String, C::Num]],
-    :inputs => C::ArrayOf[[String, String, Integer, C::Num]],
+    :inputs => C::ArrayOf[[String, String, Integer, C::Num, String]],
     :utxos_to_blacklist => C::ArrayOf[[String, Integer]]
   })]
   def as_hash

data/lib/pochette/trezor_transaction_builder.rb

@@ -26,7 +26,7 @@ class Pochette::TrezorTransactionBuilder < Pochette::TransactionBuilder
     :output_total => C::Num,
     :fee => C::Num,
     :outputs => C::ArrayOf[[String, C::Num]],
-    :inputs => C::ArrayOf[[String, String, Integer, C::Num]],
+    :inputs => C::ArrayOf[[String, String, Integer, C::Num, String]],
     :utxos_to_blacklist => C::ArrayOf[[String, Integer]],
     :transactions => C::ArrayOf[Hash],
     :trezor_inputs => C::ArrayOf[{

data/lib/pochette/version.rb

@@ -1,3 +1,3 @@
 module Pochette
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pochette
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport