pochette 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddd8603e5bf4c3adc3f2372f140da6656ee4ca3
-  data.tar.gz: 43c1f00598313990af9a6f0b8467f7761b15aa3a
+  metadata.gz: 232aedff3f83a84ce22d5c17d27cfb9663b8d2a5
+  data.tar.gz: f53d4c8ddef9552dc4be39640dbb6d2ae0c429f7
 SHA512:
-  metadata.gz: 4ca387a7203f8f227276a828776c21fdffc972b253d736c4eb3e1eee099946575fecb9d40a972f20c9b60058d9239cc0e38e4ee7ea7357c8bf03c2f71924bf08
-  data.tar.gz: f355e1d37c0c90d22ebd8a981cea1de955765a8dcb208ce4db5de156c2c4480524a28f0115433f02bf2f4125ebec18a30fd326bd44cac8d5e0d7860e6ad767f9
+  metadata.gz: bc2996d2eece872696c85d2bb2ef1a72f7b703ead2c945ae114e6c201eeb8b40a5f16c51ed8d960e793227d673afee28ca1ccfa9a04ea7c1b718fc6dc0600ffb
+  data.tar.gz: 88c8709b576c2e68d7a1b2689fc193c7c94679100df7d0913d342173853952eb4b3c99187027277381b254590ddb0c83df2e71dcccec555c2bb7b5e24433d6e6

data/README.md

@@ -20,7 +20,8 @@ and broadcasted.
 
 The Pochette::TrezorTransactionBuilder class extends Pochette::TransactionBuilder
 including transactions, inputs and outputs that are formatted in a way they can
-be passed directly to a Trezor device for signing.
+be passed directly to a Trezor device for signing. You can even build transactions
+for multisig addresses to be signed by several trezors.
 
 ## Table of contents
 - [Installation and Setup](#installation-and-setup)
@@ -187,15 +188,34 @@ If you're using [Trezor Connect](https://github.com/trezor/connect) for signing
 then you won't need to pass in the transactions.
 
 #### Receives
-The TransactionBuilder's initializer receives a single options hash with:
+The TrezorTransactionBuilder's initializer receives a single options hash with:
 
 <dl>
-<dt>addresses:</dt>
+<dt>bip32_addresses:</dt>
 <dd>
   List of addresses in wallet. We will be spending their unspent outputs.
   Each address is represented as a pair, with the public address string
   and the BIP32 path as a list of integers, for example:
+
+  <pre>
   ['public-address-as-string', [44, 1, 3, 11]]
+  </pre>
+
+  If you're spending from a multisig address then you should provide
+  all the root xpubs ( session.getPublicKey([]) ) from your different trezor devices, the path as a list of
+  integers and the M number (as in M out of N).
+  The actual bitcoin address will be derived from these. 
+  The following example is for a multi-sig address where 2 out of 3 trezors can sign.
+  The address is generated from the public key at path [42, 1, 1] in each trezor.
+
+  <pre>
+  [['xpub661MyMwAqRbcGCmcnz4JtnieVyuvgQFGqZqw3KS1g9khndpF3segkAYbYCKKaQ9Di2ZuWLaZU4Axt7TrKq41aVYx8XTbDbQFzhhDMntKLU5',
+    'xpub661MyMwAqRbcFwc3Nmz8WmMU9okGmeVSmuprwNHCVsfhy6vMyg6g79octqwNftK4g62TMWmb7UtVpnAWnANzqwtKrCDFe2UaDCv1HoErssE'
+    'xpub661MyMwAqRbcGkqPSKVkwTMtFZzEpbWXjM4t1Dv1XQbfMxtyLRGupWkp3fcSCDtp6nd1AUrRtq8tnFGTYgkY1pB9muwzaBDnJSMo2rVENhz'],
+   [42,1,1],
+   2]
+  <pre>
+
 </dd>
 <dt>outputs:</dt>
 <dd>
@@ -250,6 +270,53 @@ A hash with
   { address_n: [42,1,1],
     prev_hash: "956b30c3c4335f019dbee60c60d76994319473acac356f774c7858cd5c968e40",
     prev_index: 1}
+
+  When spending from a multisig address, the inputs will also include the multisig structure,
+  with nodes and everything your trezor needs to sign.
+  Notice there's a 'signatures' key inside 'multisig', you should sign the transaction as is,
+  then populate the corresponding value in 'signatures' and keep signing until you have
+  all the required signatures.
+
+  { address_n: [42,1,1],
+    prev_hash: "eeeb30c3c4335f019dbee60c60d76994319473acac356f774c7858cd5c968eee",
+    prev_index: 0,
+    script_type: 'SPENDMULTISIG',
+    multisig: {
+      signatures: ['','',''],
+      m: 2,
+      pubkeys: [
+        { address_n: [42,1,1],
+          node: {
+            chain_code: 'a6d47170817f78094180f1a7a3a9df7634df75fa9604d71b87e92a5a6bf9d30a',
+            depth: 0, 
+            child_num: 0, 
+            fingerprint: 0,
+            path: [],
+            public_key: '03142b0a6fa6943e7276ddc42582c6b169243d289ff17e7c8101797047eed90c9b',
+          }
+        },
+        { address_n: [42,1,1],
+          node: {
+            chain_code: '8c9151740446b9e0063ca934df66c5e14121a0b4d8a360748f1b19bfef675460',
+            depth: 0, 
+            child_num: 0, 
+            fingerprint: 0,
+            path: [],
+            public_key: '027565ceb190647ec5c566805ebc5cb6166ae2ee1d4995495f61b9eff371ec0e61',
+          }
+        },
+        { address_n: [42,1,1],
+          node: {
+            chain_code: 'de5bc5918414df3777ff52ae733bdbc87431485cfd39aea65da6133e183ef68a',
+            depth: 0, 
+            child_num: 0, 
+            fingerprint: 0,
+            path: [],
+            public_key: '028776ff18f0f3808d6d42749a6e2baee5c75c3f7ae07445403a3a5690d580a0af',
+          }
+        }
+      ]
+    }
 </dd>
 <dt>trezor_outputs:</dt>
 <dd>

data/lib/pochette.rb

@@ -3,6 +3,7 @@ require "bitcoin_rpc"
 require "active_support"
 require "active_support/core_ext"
 require "bitcoin"
+require "money-tree"
 require "contracts"
 C = Contracts
 
@@ -13,7 +14,7 @@ module Pochette
   
   Contract C::Bool => C::Bool
   def self.testnet=(v)
-    Bitcoin.network = v ? :testnet : :bitcoin
+    Bitcoin.network = v ? :testnet3 : :bitcoin
     @testnet = v
   end
 

data/lib/pochette/transaction_builder.rb

@@ -3,7 +3,6 @@
 # Instantiating will perform all the given queries, you'll be left with a
 # TransactionBuilder object that is either valid? or not, and if valid
 # you can query the results via to_hash.
-
 class Pochette::TransactionBuilder
   include Contracts::Core
 

data/lib/pochette/trezor_transaction_builder.rb

@@ -1,10 +1,12 @@
 # Same as TransactionBuilder but outputs a transaction hash with all the
 # required data to create and sign a transaction using a BitcoinTrezor.
-
 class Pochette::TrezorTransactionBuilder < Pochette::TransactionBuilder
 
   Contract ({
-    :bip32_addresses => C::ArrayOf[[String, C::ArrayOf[Integer]]],
+    :bip32_addresses => C::ArrayOf[C::Or[
+      [C::Or[String, C::ArrayOf[String]], C::ArrayOf[Integer]],
+      [C::Or[String, C::ArrayOf[String]], C::ArrayOf[Integer], C::Maybe[Integer]]
+    ]],
     :outputs => C::Maybe[C::ArrayOf[[String, C::Num]]],
     :utxo_blacklist => C::Maybe[C::ArrayOf[[String, Integer]]],
     :change_address => C::Maybe[String],
@@ -32,7 +34,9 @@ class Pochette::TrezorTransactionBuilder < Pochette::TransactionBuilder
     :trezor_inputs => C::ArrayOf[{
       address_n: C::ArrayOf[Integer],
       prev_hash: String,
-      prev_index: Integer
+      prev_index: Integer,
+      script_type: C::Maybe[C::Any],
+      multisig: C::Maybe[C::Any],
     }],
     :trezor_outputs => C::ArrayOf[{
       script_type: String,
@@ -59,17 +63,55 @@ protected
       self.errors = [:no_bip32_addresses_given]
       return
     end
-    options[:addresses] = options[:bip32_addresses].collect(&:first)
+    options[:addresses] = options[:bip32_addresses].collect{|a| address_from_bip32(a) }
     self.bip32_address_lookup = options[:bip32_addresses].reduce({}) do |accum, addr|
-      accum[addr.first] = addr.last
+      accum[address_from_bip32(addr)] = addr
       accum
     end
   end
 
+  # Bip32 addresses may look like an address with a bip32 path, or
+  # an array of xpubs, bip32 path and M (as in M of N) for multisig p2sh addresses.
+  def address_from_bip32(array)
+    if array.first.is_a?(String)
+      array.first
+    else
+      public_keys = array.first.collect do |x|
+        MoneyTree::Node.from_bip32(x).node_for_path(array[1].join('/')).public_key.key
+      end
+      address, _ = Bitcoin.pubkeys_to_p2sh_multisig_address(array.last, *public_keys)
+      address
+    end
+  end
+
   def build_trezor_inputs
     self.trezor_inputs = inputs.collect do |input|
-      { address_n: bip32_address_lookup[input[0]],
+      address = bip32_address_lookup[input[0]]
+      hash = { address_n: address[1],
         prev_hash: input[1], prev_index: input[2] }
+      if address.size == 3
+        xpubs = address.first
+        m = address.last
+        hash[:script_type] = 'SPENDMULTISIG'
+        hash[:multisig] = {
+          signatures: [''] * xpubs.size,
+          m: m,
+          pubkeys: xpubs.collect do |xpub|
+            node = MoneyTree::Node.from_bip32(xpub)
+            { address_n: address[1],
+              node: {
+                chain_code: node.chain_code.to_s(16),
+                depth: 0, 
+                child_num: 0, 
+                fingerprint: 0,
+                path: [],
+                public_key: node.public_key.key,
+              }
+            }
+          end
+        }
+      end
+      hash
     end
   end
 

data/lib/pochette/version.rb

@@ -1,3 +1,3 @@
 module Pochette
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/pochette.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", "~> 4.2"
   spec.add_dependency "bitcoin_rpc", "~> 0.1.1"
   spec.add_dependency "bitcoin-ruby", "~> 0.0.7"
+  spec.add_dependency "money-tree", "~> 0.9.0"
   spec.add_dependency "contracts", "~> 0.12.0"
 
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pochette
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: money-tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: contracts
   requirement: !ruby/object:Gem::Requirement