pochette 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c505a9f75cdfc003b454e87cd97c48f8fc11aeb7
-  data.tar.gz: 9e6c94633014b5d0f1ab9328dd1d9f0edea20ca1
+  metadata.gz: a017e533b5f1d3f65ac7b806d1d91efae1a1ee6b
+  data.tar.gz: a561a5c25acb769f73308b2aa2d8086da9f2e7c3
 SHA512:
-  metadata.gz: ba821bb23b235bb6ca4b9a2249c6ca6a3844665bcfe1a967e16066da4976e37d1cf01ce7e7004cc83c522fc84359d0a419e14a352264c1a4a5aa570a8b3b55cf
-  data.tar.gz: 2b312820cb91d983c0638473d957a13b4f45fe99044aa4361eede24d61d1ec638b2da51fcc4243e1f8c9d13a2d96107e0f687e0a9a9a8ea6869e76ab348f3f3e
+  metadata.gz: eda52dde1acbf52a00edb364840506beacaf4f36176852dd4ba35035382802f7461bcd573a60d89e34cfee950163720ef7706c0a18fb15231ede2cbaaa28b1ba
+  data.tar.gz: aaf7184e79879a6b6b6303f05d108a3678a66a64170d0a8803370f468b4a2a3d688413d4eae4891cc26cac36110fe44d6f66755aadb2708a0d4cff051ffc8fcc

data/README.md

@@ -93,7 +93,7 @@ The TransactionBuilder's initializer receives a single options hash with:
 <dd>
   List of pairs [recipient_address, amount]
   This will not be all the final outputs in the transaction,
-  as a 'change' output may be adted if needed.
+  as a 'change' output may be added if needed.
 </dd>
 <dt>utxo_blacklist:</dt>
 <dd>
@@ -426,19 +426,20 @@ amount seen on the network for a given address, and the final confirmed amount a
       'mhLAgRz5f1YogfYBZCDFSRt3ceeKBPVEKg',
     ]
 >>> backend.balances_for(addresses, 6) 
->>> [
-"mhLAgRz5f1YogfYBZCDFSRt3ceeKBPVEKg" =>
-  [0.00544426, 0.00544426, 0.0, 0.00544426, 0.00544426, 0.0],
-"mjfa56Keq7PXRKgdPSDB6eWLp4aaAVcj6L" =>
-  [0.005, 0.0, 0.005, 0.006, 0.0, 0.006],
-"mvrDG7Ts6Mq9ejhZxdsQLjbScycVaktqsg" =>
-  [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
-"mwZE4QfzzriE7nsgHSWbgmtT7s6SDysYvP" =>
-  [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
-"mxYzRdJfPk8PcaKSsSzNkX85mMfNcr2CGr" =>
-  [0.002, 0.0, 0.002, 0.002, 0.0, 0.002],
-"mzbXim4u1Nq4J2kVggu471pZL3ahxNkmE9" =>
-  [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
+=> {
+    "mhLAgRz5f1YogfYBZCDFSRt3ceeKBPVEKg" =>
+      [0.00544426, 0.00544426, 0.0, 0.00544426, 0.00544426, 0.0],
+    "mjfa56Keq7PXRKgdPSDB6eWLp4aaAVcj6L" =>
+      [0.005, 0.0, 0.005, 0.006, 0.0, 0.006],
+    "mvrDG7Ts6Mq9ejhZxdsQLjbScycVaktqsg" =>
+      [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
+    "mwZE4QfzzriE7nsgHSWbgmtT7s6SDysYvP" =>
+      [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
+    "mxYzRdJfPk8PcaKSsSzNkX85mMfNcr2CGr" =>
+      [0.002, 0.0, 0.002, 0.002, 0.0, 0.002],
+    "mzbXim4u1Nq4J2kVggu471pZL3ahxNkmE9" =>
+      [0.005, 0.0, 0.005, 0.005, 0.0, 0.005],
+   }
 ```
 
 ## list_unspent(addresses)

data/lib/pochette/backends/blockchain_info.rb

@@ -89,7 +89,8 @@ class Pochette::Backends::BlockchainInfo
     uri = URI.parse("https://blockchain.info/pushtx")
     params = { "tx" => hex }
     params['api_code'] = api_key if api_key
-    Net::HTTP.post_form(uri, params)
+    response = Net::HTTP.post_form(uri, params)
+    raise StandardError.new(response) if response.code.to_i != 200
     Bitcoin::Protocol::Tx.new(hex.htb).hash
   end
 

data/lib/pochette/transaction_builder.rb

@@ -5,6 +5,8 @@
 # you can query the results via to_hash.
 
 class Pochette::TransactionBuilder
+  include Contracts::Core
+
   # Backend can be set globally, or independently for each class and instance.
   class_attribute :backend
   def self.backend
@@ -17,10 +19,17 @@ class Pochette::TransactionBuilder
   cattr_accessor(:network_minimum_fee){ 10000 }
   cattr_accessor(:default_fee_per_kb){ 10000 }
 
+  Contract ({
+    :addresses => C::ArrayOf[String],
+    :outputs => C::Maybe[C::ArrayOf[[String, C::Num]]],
+    :utxo_blacklist => C::Maybe[C::ArrayOf[[String, Integer]]],
+    :change_address => C::Maybe[String],
+    :fee_per_kb => C::Maybe[C::Num],
+    :spend_all => C::Maybe[C::Bool],
+  }) => C::Any
   def initialize(options)
     self.backend = options[:backend] if options[:backend]
     initialize_options(options)
-    return unless valid?
     initialize_fee
     initialize_outputs
     return unless valid?
@@ -29,6 +38,14 @@ class Pochette::TransactionBuilder
     validate_final_amounts
   end
 
+  Contract C::None => C::Maybe[({
+    :input_total => C::Num,
+    :output_total => C::Num,
+    :fee => C::Num,
+    :outputs => C::ArrayOf[[String, C::Num]],
+    :inputs => C::ArrayOf[[String, String, Integer, C::Num]],
+    :utxos_to_blacklist => C::ArrayOf[[String, Integer]]
+  })]
   def as_hash
     return nil unless valid?
     { input_total: inputs_amount,
@@ -58,9 +75,6 @@ protected
     self.options = options
     self.errors ||= []
     self.addresses = options[:addresses]
-    if addresses.nil? || addresses.empty?
-      return errors << :no_addresses_given
-    end
   end
 
   def initialize_fee

data/lib/pochette/trezor_transaction_builder.rb

@@ -1,37 +1,16 @@
 # Same as TransactionBuilder but outputs a transaction hash with all the
 # required data to create and sign a transaction using a BitcoinTrezor.
-# * Uses BIP32 addresses instead of regular strings.
-#   Each address is represented as a pair, with the public address string
-#   and the BIP32 path as a list of integers, for example:
-#   ['public-address-as-string', [44, 1, 3, 11]]
-#
-# * Includes associated transaction data for each input being spent,
-#   ready to be consumed by your Trezor device.
-#
-# * Outputs are represented as JSON with script_type as expected by Trezor.
-#   { script_type: 'PAYTOADDRESS',
-#     address: '1address-as-string',
-#     amount: amount_in_satoshis }
-#
-# Options:
-#   bip32_addresses:
-#     List of [address, path] pairs in wallet.
-#     We will be spending their unspent outputs.
-#   outputs:
-#     List of pairs [recipient_address, amount]
-#     This will not be all the final outputs in the transaction,
-#     as a 'change' output may be added if needed.
-#   utxo_blacklist:
-#     List of utxos to ignore, a list of pairs [transaction hash, position]
-#   change_address:
-#     Change address to use. Will default to the first source address.
-#   fee_per_kb:
-#     Defaults to 10000 satoshis.
-#   spend_all:
-#     Wether to spend all available utxos or just select enough to
-#     cover the given outputs.
 
 class Pochette::TrezorTransactionBuilder < Pochette::TransactionBuilder
+
+  Contract ({
+    :bip32_addresses => C::ArrayOf[[String, C::ArrayOf[Integer]]],
+    :outputs => C::Maybe[C::ArrayOf[[String, C::Num]]],
+    :utxo_blacklist => C::Maybe[C::ArrayOf[[String, Integer]]],
+    :change_address => C::Maybe[String],
+    :fee_per_kb => C::Maybe[C::Num],
+    :spend_all => C::Maybe[C::Bool],
+  }) => C::Any
   def initialize(options)
     options = options.dup
     initialize_bip32_addresses(options)
@@ -42,6 +21,25 @@ class Pochette::TrezorTransactionBuilder < Pochette::TransactionBuilder
     build_transactions
   end
 
+  Contract C::None => C::Maybe[({
+    :input_total => C::Num,
+    :output_total => C::Num,
+    :fee => C::Num,
+    :outputs => C::ArrayOf[[String, C::Num]],
+    :inputs => C::ArrayOf[[String, String, Integer, C::Num]],
+    :utxos_to_blacklist => C::ArrayOf[[String, Integer]],
+    :transactions => C::ArrayOf[Hash],
+    :trezor_inputs => C::ArrayOf[{
+      address_n: C::ArrayOf[Integer],
+      prev_hash: String,
+      prev_index: Integer
+    }],
+    :trezor_outputs => C::ArrayOf[{
+      script_type: String,
+      address: String,
+      amount: C::Num
+    }]
+  })]
   def as_hash
     return nil unless valid?
     super.merge(

data/lib/pochette/version.rb

@@ -1,3 +1,3 @@
 module Pochette
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/pochette.rb

@@ -3,17 +3,26 @@ require "bitcoin_rpc"
 require "active_support"
 require "active_support/core_ext"
 require "bitcoin"
+require "contracts"
+C = Contracts
 
 module Pochette
+  include Contracts::Core
+
   mattr_accessor :backend
   
+  Contract C::Bool => C::Bool
   def self.testnet=(v)
-    @testnet = v
     Bitcoin.network = v ? :testnet : :bitcoin
+    @testnet = v
   end
+
+  Contract C::None => C::Bool
   def self.testnet
-    @testnet
+    @testnet || false
   end
+
+  Contract C::None => C::Bool
   def self.testnet?
     self.testnet
   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 "contracts"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pochette
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nubis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 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: contracts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement