btcruby 1.5 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b28e8aae378a1e3a925ccb7acdb05b68e2e1987c
-  data.tar.gz: a134759a151e238011207ea52d7ff0a2bbbbf92e
+  metadata.gz: 9bbec90a3ce39cd29196eafbbbfc18e884e8c514
+  data.tar.gz: 05eb71dfff15d7b3f4949945623be1dfdebd8855
 SHA512:
-  metadata.gz: 3a0b2f8cbfc3cb5fba98cc1844beae30410db5da37fcc2decbe91190c41c571ef9be5c16c86d1e496d6ffa46afbb5d5c92c1c9d4fdb494714bc3c531505dd4c3
-  data.tar.gz: 5e2edf87ad3704f45acd614a67763325e73aaf85ab61fdc52c3ac6827e09bc7273a5c48a66764fd1b38836b88888f21e3680d8330750ec8c76c7a653a8b3dbfa
+  metadata.gz: 9d658653097c2a101c5e42f03b287f2769070a379c6a6e2f1ec244f1782421f9cfcc10bad946e3d9e4a6721bb13f8ef4148a21dd6cc2baac6635115cc96b001d
+  data.tar.gz: fc9c6d2bb51365065b558590f0f5a45b8bac0d1ac6df795fd3ce195ee5e4f8af241772d4e34a8634f66826747e08389cb34d497f4a8ccc7ed80194205f2e593f

data/RELEASE_NOTES.md

@@ -2,11 +2,18 @@
 BTCRuby Release Notes
 =====================
 
+1.5.1 (December 30, 2015)
+-----------------------
+
+* `BTC::TransactionSignatureChecker` accepts `version` and `amount` to support different hashing schemes (e.g. segwit) and passes them to `BTC::Transaction#signature_hash` function.
+
+
 1.5 (November 29, 2015)
 -----------------------
 
 * `BTC::SecretSharing` changes API to support 96-, 104- and 128-bit secrets.
 
+
 1.4 (November 26, 2015)
 -----------------------
 

data/lib/btcruby/outpoint.rb

@@ -33,6 +33,13 @@ module BTC
       @index == INVALID_INDEX && @transaction_hash == ZERO_HASH256
     end
 
+    def data
+      data = "".b
+      data << BTC::Data.ensure_binary_encoding(transaction_hash)
+      data << BTC::WireFormat.encode_uint32le(index)
+      data
+    end
+
     def ==(other)
       index == other.index &&
       transaction_hash == other.transaction_hash

data/lib/btcruby/script/test_signature_checker.rb

@@ -25,7 +25,7 @@ module BTC
       ecdsa_sig = script_signature[0..-2]
 
       key = BTC::Key.new(public_key: public_key)
-      result = key.verify_ecdsa_signature(ecdsa_sig, hash)
+      result = key.verify_ecdsa_signature(ecdsa_sig, signature_hash)
       return result
     end
 

data/lib/btcruby/script/transaction_signature_checker.rb

@@ -2,11 +2,16 @@ module BTC
   class TransactionSignatureChecker
     include SignatureChecker
     
+    attr_accessor :version
     attr_accessor :transaction
     attr_accessor :input_index
-    def initialize(transaction: nil, input_index: nil)
+    attr_accessor :amount
+    
+    def initialize(version: 0, transaction: nil, input_index: nil, amount: 0)
+      @version     = version
       @transaction = transaction
       @input_index = input_index
+      @amount      = amount
     end
     
     def check_signature(script_signature:nil, public_key:nil, script:nil)
@@ -19,7 +24,13 @@ module BTC
       ecdsa_sig = script_signature[0..-2]
       
       key = BTC::Key.new(public_key: public_key)
-      hash = @transaction.signature_hash(input_index: @input_index, output_script: script, hash_type: hashtype)
+      hash = @transaction.signature_hash(
+        input_index:   @input_index, 
+        output_script: script, 
+        hash_type:     hashtype, 
+        version:       version, 
+        amount:        amount
+      )
       result = key.verify_ecdsa_signature(ecdsa_sig, hash)
       return result
     rescue BTC::FormatError => e # public key is invalid

data/lib/btcruby/ssss.rb

@@ -313,7 +313,8 @@ if $0 == __FILE__
   
   begin
     require_relative 'base58'
-    payload_length = 13
+    payload_length = 14 # 13 + checksum
+    #payload_length = 15 # 14 + checksum
     lengths = {}
     (0..255).each do |ver|
       prefixes = []

data/lib/btcruby/transaction.rb

@@ -332,7 +332,7 @@ module BTC
     # Hash for signing a transaction.
     # You should specify an input index, output script of the previous transaction for that input,
     # and an optional hash type (default is SIGHASH_ALL).
-    def signature_hash(input_index: nil, output_script: nil, hash_type: BTC::SIGHASH_ALL)
+    def signature_hash(input_index: nil, output_script: nil, hash_type: BTC::SIGHASH_ALL, version: 0, amount: 0)
 
       raise ArgumentError, "Should specify input_index in Transaction#signature_hash." if !input_index
       raise ArgumentError, "Should specify output_script in Transaction#signature_hash." if !output_script

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.5".freeze
+  VERSION = "1.5.1".freeze
 end

data/spec/ssss_spec.rb

@@ -127,9 +127,12 @@ describe BTC::SecretSharing do
         shares = ssss.split(secret, m, n)
         hexshares = shares.map{|s| BTC.to_hex(s)}
         hexshares.must_equal defined_shares
-        subshares = shares[0...m] # TODO: iterate over various combinations
-        restored_secret = ssss.restore(subshares)
-        BTC.to_hex(restored_secret).must_equal hexsecret
+        [shares, shares.reverse].each do |list|
+          [list[0...m], list[0...m].reverse].each do |subshares|
+            restored_secret = ssss.restore(subshares)
+            BTC.to_hex(restored_secret).must_equal hexsecret
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.5.1
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi