btcruby 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 217d2c55943bb88f2a02a77774574a82f345845f
-  data.tar.gz: 9e74dfbf5e332e4fbda8cca3c3d6f1dd8962ac1a
+  metadata.gz: ffee95a66b5f287235a52944ff6f92e3335b22df
+  data.tar.gz: 550a1d62ecea9b95a15294f3b65477566c9baa90
 SHA512:
-  metadata.gz: 509d5068a72d3e04ea612a92348bc7edd9929aed0acc87e55dc10866c24294e6d2f84fb26d0d54f2c18ab19ff09cd6cc0bc267735cb6694be6fbd5e3d757dda0
-  data.tar.gz: 39b60fbdd30baf9ffaa08005d07ac2d767c3f85a8e0c5761380e369ebeae96092bcf9d7d7f1406f4c5a30f63ef3694e1598980efacada1e23e9484aff6c2a40a
+  metadata.gz: 517e12449e58e4866826c6f28230f854bc26b04e788f9d7d3bd864dd15aeb60ccc948da70a4c2d69bfdeef84bd1475f5ac5d78aee599ea67ba52674a30703cb0
+  data.tar.gz: e175176b5a85c1eb40e17134179bf29acc04b2077228c26089b308321d17f94e29960a4f66f0c216e124c108173e40f353125b2e596cef0117687f82098b31bb

data/RELEASE_NOTES.md

@@ -2,6 +2,12 @@
 BTCRuby Release Notes
 =====================
 
+1.7 (September 28, 2017)
+-------------------------
+
+* Various bugfixes
+* WIP on API for the versioned scripts
+
 1.6 (January 15, 2015)
 -------------------------
 

data/lib/btcruby/address.rb

@@ -21,7 +21,7 @@
 #
 #      address = BTC::PublicKeyAddress.new(hash: hash)
 #
-# 3. To convert address to its Base68Check format call to_s:
+# 3. To convert address to its Base58Check format call to_s:
 #
 #      string = address.to_s
 #

data/lib/btcruby/keychain.rb

@@ -24,7 +24,7 @@ module BTC
 
     PUBLIC_MAINNET_VERSION  = 0x0488B21E # xpub
     PRIVATE_MAINNET_VERSION = 0x0488ADE4 # xprv
-    PUBLIC_TESNET_VERSION   = 0x043587CF # tpub
+    PUBLIC_TESTNET_VERSION  = 0x043587CF # tpub
     PRIVATE_TESTNET_VERSION = 0x04358394 # tprv
 
     # Instance of BTC::Key that is a "head" of this keychain.
@@ -107,9 +107,9 @@ module BTC
 
     def key
       @key ||= if @private_key
-        BTC::Key.new(private_key: @private_key, public_key_compressed: true)
+        BTC::Key.new(private_key: @private_key, public_key_compressed: true, network: @network)
       else
-        BTC::Key.new(public_key: @public_key)
+        BTC::Key.new(public_key: @public_key, network: @network)
       end
     end
 
@@ -127,7 +127,7 @@ module BTC
 
     def extended_public_key
       @extended_public_key ||= begin
-        prefix = _extended_key_prefix(mainnet? ? PUBLIC_MAINNET_VERSION : PUBLIC_TESNET_VERSION)
+        prefix = _extended_key_prefix(mainnet? ? PUBLIC_MAINNET_VERSION : PUBLIC_TESTNET_VERSION)
         BTC::Base58.base58check_from_data(prefix + @public_key)
       end
     end
@@ -205,7 +205,7 @@ module BTC
       elsif _components
         init_with_components(*_components)
       else
-        raise ArgumentError, "Either seed or an extended " if !private_key && !public_key
+        raise ArgumentError, "Either seed or an extended key must be provided"
       end
     end
 
@@ -251,13 +251,13 @@ module BTC
           @network = Network.testnet
         end
 
-      elsif version == PUBLIC_MAINNET_VERSION || version == PUBLIC_TESNET_VERSION
+      elsif version == PUBLIC_MAINNET_VERSION || version == PUBLIC_TESTNET_VERSION
         # Should have a 33-byte public key with non-zero first byte.
         if keyprefix == 0x00
           raise BTCError, "Extended public key must have non-zero first byte (received #{keyprefix})"
         end
         @public_key = xkeydata[45, 33]
-        if version == PUBLIC_TESNET_VERSION
+        if version == PUBLIC_TESTNET_VERSION
           @network = Network.testnet
         end
       else
@@ -452,25 +452,25 @@ module BTC
         end
       end
     end
-    
+
     # BIP44 Support
-    
+
     def bip44_keychain(network: Network.mainnet)
       network_index = network.mainnet? ? 0 : 1
       derived_keychain(44, hardened: true).derived_keychain(network_index, hardened: true)
     end
-    
+
     def bip44_account_keychain(account_index)
       derived_keychain(account_index, hardened: true)
     end
-    
+
     def bip44_external_keychain
       derived_keychain(0, hardened: false)
     end
-    
+
     def bip44_internal_keychain
       derived_keychain(1, hardened: false)
     end
-    
+
   end # Keychain
 end # BTC

data/lib/btcruby/mnemonic.rb

@@ -1,4 +1,4 @@
-# BTC::Mnemonic implements BIP44: mnemonic-based hierarchical deterministic wallets.
+# BTC::Mnemonic implements BIP39: mnemonic-based hierarchical deterministic wallets.
 # Currently only supports restoring keychain from words. Generating sentence.
 require 'openssl'
 require 'openssl/digest'

data/lib/btcruby/script/script.rb

@@ -89,6 +89,14 @@ module BTC
       public_key_script? ||
       standard_op_return_script?
     end
+    
+    # Returns true if this is an output script wrapped in a versioned pushdata for segwit softfork.
+    def versioned_script?
+      return chunks.size == 1 &&
+             chunks[0].pushdata? &&
+             chunks[0].canonical? &&
+             chunks[0].pushdata.bytesize > 2
+    end
 
     # Returns true if the script is a pay-to-pubkey script:
     # "<pubkey> OP_CHECKSIG"
@@ -248,7 +256,7 @@ module BTC
     # and a new script instance is returned.
     def without_dropped_prefix_data
       if dropped_prefix_data
-        return self.class.new << @chunks[2..-1]
+        return Script.new << @chunks[2..-1]
       end
       self
     end
@@ -288,7 +296,7 @@ module BTC
 
     # Complete copy of a script.
     def dup
-      self.class.new(data: self.data)
+      Script.new(data: self.data)
     end
 
     def ==(other)
@@ -324,7 +332,7 @@ module BTC
     # Wraps the recipient into an output P2SH script
     # (OP_HASH160 <20-byte hash of the recipient> OP_EQUAL).
     def p2sh_script
-      self.class.new << OP_HASH160 << BTC.hash160(self.data) << OP_EQUAL
+      Script.new << OP_HASH160 << BTC.hash160(self.data) << OP_EQUAL
     end
 
 
@@ -336,18 +344,18 @@ module BTC
     def simulated_signature_script(strict: true)
       if public_key_hash_script?
          # assuming non-compressed pubkeys to be conservative
-        return self.class.new << Script.simulated_signature(hashtype: SIGHASH_ALL) << Script.simulated_uncompressed_pubkey
+        return Script.new << Script.simulated_signature(hashtype: SIGHASH_ALL) << Script.simulated_uncompressed_pubkey
 
       elsif public_key_script?
-        return self.class.new << Script.simulated_signature(hashtype: SIGHASH_ALL)
+        return Script.new << Script.simulated_signature(hashtype: SIGHASH_ALL)
 
       elsif script_hash_script? && !strict
         # This is a wild approximation, but works well if most p2sh scripts are 2-of-3 multisig scripts.
         # If you have a very particular smart contract scheme you should not use TransactionBuilder which estimates fees this way.
-        return self.class.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*2 << Script.simulated_multisig_script(2,3).data
+        return Script.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*2 << Script.simulated_multisig_script(2,3).data
 
       elsif multisig_script?
-        return self.class.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*self.multisig_signatures_required
+        return Script.new << OP_0 << [Script.simulated_signature(hashtype: SIGHASH_ALL)]*self.multisig_signatures_required
       else
         return nil
       end
@@ -463,7 +471,7 @@ module BTC
 
     # Same arguments as with Array#[].
     def subscript(*args)
-      self.class.new << chunks[*args]
+      Script.new << chunks[*args]
     end
     alias_method :[], :subscript
 
@@ -478,7 +486,7 @@ module BTC
       subscriptsize = subscript.chunks.size
       buf = []
       i = 0
-      result = self.class.new
+      result = Script.new
       chunks.each do |chunk|
         if chunk == subscript.chunks[i]
           buf << chunk

data/lib/btcruby/script/script_interpreter.rb

@@ -36,7 +36,7 @@ module BTC
     # (required if the scripts use signature-checking opcodes).
     # Checker can be transaction checker or block checker
     def initialize(flags:             SCRIPT_VERIFY_NONE,
-                   extensions:           nil,
+                   extensions:        nil,
                    signature_checker: nil,
                    raise_on_failure:  false,
                    max_pushdata_size: MAX_SCRIPT_ELEMENT_SIZE,
@@ -144,8 +144,8 @@ module BTC
       @altstack = []
       @run_script_chunks = script.chunks.to_a.dup # can be modified by `insert_script`
       
-      number_zero  = ScriptNumber.new(integer: 0)
-      number_one   = ScriptNumber.new(integer: 1)
+      number_zero  = BTC::ScriptNumber.new(integer: 0)
+      number_one   = BTC::ScriptNumber.new(integer: 1)
       zero_value = "".b
       false_value = "".b
       true_value = "\x01".b
@@ -216,7 +216,7 @@ module BTC
           case opcode
           when OP_1NEGATE, OP_1..OP_16
             # ( -- value)
-            num = ScriptNumber.new(integer: opcode - (OP_1 - 1))
+            num = BTC::ScriptNumber.new(integer: opcode - (OP_1 - 1))
             stack_push(num.data)
             # The result of these opcodes should always be the minimal way to push the data
             # they push, so no need for a CheckMinimalPush here.
@@ -408,7 +408,7 @@ module BTC
 
           when OP_DEPTH
             # -- stacksize
-            sn = ScriptNumber.new(integer: @stack.size)
+            sn = BTC::ScriptNumber.new(integer: @stack.size)
             stack_push(sn.data)
 
           when OP_DROP
@@ -489,7 +489,7 @@ module BTC
             if @stack.size < 1
               return set_error(SCRIPT_ERR_INVALID_STACK_OPERATION)
             end
-            sn = ScriptNumber.new(integer: @stack.last.size)
+            sn = BTC::ScriptNumber.new(integer: @stack.last.size)
             stack_push(sn.data)
 
 
@@ -548,9 +548,9 @@ module BTC
             when OP_ABS
               bn = -bn if bn < 0
             when OP_NOT
-              bn = ScriptNumber.new(boolean: (bn == 0))
+              bn = BTC::ScriptNumber.new(boolean: (bn == 0))
             when OP_0NOTEQUAL
-              bn = ScriptNumber.new(boolean: (bn != 0))
+              bn = BTC::ScriptNumber.new(boolean: (bn != 0))
             else
               raise "invalid opcode"
             end
@@ -566,7 +566,7 @@ module BTC
 
             bn1 = cast_to_number(@stack[-2])
             bn2 = cast_to_number(@stack[-1])
-            bn = ScriptNumber.new(integer: 0)
+            bn = BTC::ScriptNumber.new(integer: 0)
 
             case opcode
             when OP_ADD
@@ -574,21 +574,21 @@ module BTC
             when OP_SUB
               bn = bn1 - bn2
             when OP_BOOLAND
-              bn = ScriptNumber.new(boolean: ((bn1 != 0) && (bn2 != 0)))
+              bn = BTC::ScriptNumber.new(boolean: ((bn1 != 0) && (bn2 != 0)))
             when OP_BOOLOR
-              bn = ScriptNumber.new(boolean: ((bn1 != 0) || (bn2 != 0)))
+              bn = BTC::ScriptNumber.new(boolean: ((bn1 != 0) || (bn2 != 0)))
             when OP_NUMEQUAL, OP_NUMEQUALVERIFY
-              bn = ScriptNumber.new(boolean: (bn1 == bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 == bn2))
             when OP_NUMNOTEQUAL
-              bn = ScriptNumber.new(boolean: (bn1 != bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 != bn2))
             when OP_LESSTHAN
-              bn = ScriptNumber.new(boolean: (bn1 < bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 < bn2))
             when OP_GREATERTHAN
-              bn = ScriptNumber.new(boolean: (bn1 > bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 > bn2))
             when OP_LESSTHANOREQUAL
-              bn = ScriptNumber.new(boolean: (bn1 <= bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 <= bn2))
             when OP_GREATERTHANOREQUAL
-              bn = ScriptNumber.new(boolean: (bn1 >= bn2))
+              bn = BTC::ScriptNumber.new(boolean: (bn1 >= bn2))
             when OP_MIN
               bn = (bn1 < bn2 ? bn1 : bn2)
             when OP_MAX
@@ -815,7 +815,7 @@ module BTC
       end
 
       return true
-    rescue ScriptNumberError => e
+    rescue BTC::ScriptNumberError => e
       return set_error(SCRIPT_ERR_UNKNOWN_ERROR, e.message)
     end # run_script
     
@@ -914,7 +914,7 @@ module BTC
     def cast_to_number(data,
                        require_minimal: flag?(SCRIPT_VERIFY_MINIMALDATA),
                        max_size: @integer_max_size)
-      ScriptNumber.new(data: data, require_minimal: require_minimal, max_size: max_size)
+      BTC::ScriptNumber.new(data: data, require_minimal: require_minimal, max_size: max_size)
     end
 
     def cast_to_bool(data)

data/lib/btcruby/script/script_version.rb

@@ -0,0 +1,54 @@
+module BTC
+  class ScriptVersion
+    VERSION_DEFAULT = 0
+    VERSION_P2SH = 1
+
+    attr_reader :version         # binary string containing the version
+    attr_reader :sighash_version
+
+    def initialize(version)
+      @version = version
+    end
+    
+    # Returns a matching signature hash version for the given script version.
+    # All currently known script versions use sighash version 1.
+    def sighash_version
+      return 1
+    end
+
+    # Returns true if version is known.
+    # Unknown versions are supported too, but scripts are not even parsed and interpreted as "anyone can spend".
+    def known?
+      default? ||
+      p2sh?
+    end
+
+    def default?
+      @version == VERSION_DEFAULT
+    end
+
+    def p2sh?
+      @version == VERSION_P2SH
+    end
+
+    def name
+      case version
+      when VERSION_DEFAULT
+        "Default script"
+      when VERSION_P2SH
+        "P2SH v1"
+      else
+        "Unknown script version"
+      end
+    end
+    
+    def to_i
+      @version
+    end
+    
+    def to_s
+      "v#{@version} (#{name})"
+    end
+
+  end
+end

data/lib/btcruby/script/versioned_script.rb

@@ -0,0 +1,64 @@
+module BTC
+  # Versioned script is a wrapper around a regular script with a version prefix.
+  # Note that we support version of any length, but do not parse and interpret unknown versions.
+  class VersionedScript
+    
+    attr_reader :version        # Integer
+    attr_reader :data           # Raw data representing script wrapped in VersionedScript. For 256-bit P2SH it's just a hash, not a script.
+    attr_reader :wrapper_script # BTC::Script that wraps version + data
+    attr_reader :script_version # BTC::ScriptVersion
+    attr_reader :inner_script   # BTC::Script derived from data, if it makes sense for the given version. 
+    
+    # Initializers:
+    # - `VersionedScript.new(wrapper_script:)` that wraps the version and inner script data.
+    # - `VersionedScript.new(version:, data:)` where version is one of ScriptVersion::VERSION_* and data is a raw inner script data (hash for p2sh256).
+    # - `VersionedScript.new(p2sh_redeem_script:)` creates a versioned script with p2sh hash of the redeem script.
+    def initialize(wrapper_script: nil,
+                   version: nil, data: nil,
+                   script: nil,
+                   p2sh_redeem_script: nil,
+                   )
+      if wrapper_script
+        if !wrapper_script.versioned_script?
+          raise ArgumentError, "Script is not a canonical versioned script with minimal pushdata encoding"
+        end
+        @wrapper_script = wrapper_script
+        fulldata = BTC::Data.ensure_binary_encoding(wrapper_script.chunks.first.pushdata)
+        @version = fulldata.bytes[0]
+        @data = fulldata[1..-1]
+      elsif script
+        @version = ScriptVersion::VERSION_DEFAULT
+        @data = script.data
+      elsif p2sh_redeem_script
+        @version = ScriptVersion::VERSION_P2SH256
+        @data = BTC.hash256(p2sh_redeem_script.data)
+      else
+        @version = version or raise ArgumentError, "Version is missing"
+        @data = data
+      end
+    end
+    
+    def wrapper_script
+      @wrapper_script ||= BTC::Script.new << (@version.chr.b + @data)
+    end
+    
+    # Returns inner BTC::Script if it's a default script
+    def inner_script
+      if script_version.default?
+        BTC::Script.new(data: data)
+      else
+        nil
+      end
+    end
+    
+    def script_version
+      @script_version ||= ScriptVersion.new(@version)
+    end
+
+    def known_version?
+      script_version.known?
+    end
+    
+  end
+end
+

data/lib/btcruby/secp256k1.rb

@@ -10,8 +10,10 @@ module BTC
 
     ffi_lib 'secp256k1'
 
-    SECP256K1_CONTEXT_VERIFY = (1 << 0)
-    SECP256K1_CONTEXT_SIGN   = (1 << 1)
+    SECP256K1_FLAGS_TYPE_CONTEXT = (1 << 0)
+    SECP256K1_FLAGS_BIT_CONTEXT_VERIFY = (1 << 8)
+    SECP256K1_FLAGS_BIT_CONTEXT_SIGN   = (1 << 9)
+    SECP256K1_CONTEXT_SIGN   = (SECP256K1_FLAGS_TYPE_CONTEXT | SECP256K1_FLAGS_BIT_CONTEXT_SIGN)
 
     # Note: this struct is opaque, but public. Its size will eventually be guaranteed.
     # See https://github.com/bitcoin/secp256k1/issues/288
@@ -42,7 +44,7 @@ module BTC
         privkey_buf = FFI::MemoryPointer.new(:uchar, privkey.bytesize)
         privkey_buf.put_bytes(0, privkey)
         
-        if secp256k1_ecdsa_sign(ctx, hash_buf, sig.pointer, privkey_buf, nil, nil) == 1
+        if secp256k1_ecdsa_sign(ctx, sig.pointer, hash_buf, privkey_buf, nil, nil) == 1
           # Serialize an ECDSA signature in DER format.
           bufsize = 72
           output_pointer = FFI::MemoryPointer.new(:uint8, bufsize)

data/lib/btcruby/transaction_builder.rb

@@ -60,6 +60,10 @@ module BTC
     # Default is Transaction::DEFAULT_FEE_RATE
     attr_accessor :fee_rate
 
+    # Miner's fee for this transaction.
+    # If `fee` is not nil, fee_rate is ignored and transaction uses the specified fee.
+    attr_accessor :fee
+    
     # Minimum amount of change below which transaction is not composed.
     # If change amount is non-zero and below this value, more unspent outputs are used.
     # If change amount is zero, change output is not even created and this attribute is not used.
@@ -92,10 +96,10 @@ module BTC
     # A total size of all outputs in bytes (including change output).
     attr_reader :outputs_size
 
-
     # Implementation of the attributes declared above
     # ===============================================
 
+    
     def network
       @network ||= Network.default
     end
@@ -223,7 +227,7 @@ module BTC
 
         # Check if inputs cover the fees
         if result.outputs_amount < 0
-          raise InsufficientFundsError
+          raise InsufficientFundsError.new(result)
         end
 
         # Warn if the output amount is relatively small.
@@ -282,7 +286,7 @@ module BTC
 
       while true
         if (sorted_utxos.size + mandatory_utxos.size) == 0
-          raise InsufficientFundsError
+          raise InsufficientFundsError.new(result)
         end
 
         utxo = nil
@@ -361,7 +365,7 @@ module BTC
             else
               # Change is negative, we need more funds for this transaction.
               # Try adding more utxos on the next cycle.
-
+              result.fee = fee
             end
 
           end # if inputs_amount >= outputs_amount
@@ -374,6 +378,8 @@ module BTC
     # Helper to compute total fee for a given transaction.
     # Simulates signatures to estimate final size.
     def compute_fee_for_transaction(tx, fee_rate)
+      # Return mining fee if set manually
+      return fee if fee
       # Compute fees for this tx by composing a tx with properly sized dummy signatures.
       simulated_tx = tx.dup
       simulated_tx.inputs.each do |txin|
@@ -518,4 +524,3 @@ if $0 == __FILE__
 
 
 end
-

data/lib/btcruby/transaction_builder/errors.rb

@@ -10,6 +10,11 @@ module BTC
     class MissingUnspentOutputsError < Error; end
 
     # Unspent outputs are not sufficient to build the transaction.
-    class InsufficientFundsError < Error; end
+    class InsufficientFundsError < Error
+      attr_accessor :result
+      def initialize(result = nil)
+        @result = result
+      end
+    end
   end
 end

data/lib/btcruby/version.rb

@@ -1,3 +1,3 @@
 module BTC
-  VERSION = "1.6".freeze
+  VERSION = "1.7".freeze
 end

data/spec/currency_formatter_spec.rb

@@ -14,7 +14,6 @@ describe BTC::CurrencyFormatter do
     fm.string_from_number(42000*BTC::COIN + BTC::COIN/2).must_equal("42000.5")
 
     fm.number_from_string("1").must_equal 1*BTC::COIN
-    fm.number_from_string("1.").must_equal 1*BTC::COIN
     fm.number_from_string("1.0").must_equal 1*BTC::COIN
     fm.number_from_string("42").must_equal 42*BTC::COIN
     fm.number_from_string("42.123").must_equal 42*BTC::COIN + 12300000
@@ -35,7 +34,6 @@ describe BTC::CurrencyFormatter do
     fm.string_from_number(42000*BTC::COIN + BTC::COIN/2).must_equal("42000.50000000")
 
     fm.number_from_string("1").must_equal 1*BTC::COIN
-    fm.number_from_string("1.").must_equal 1*BTC::COIN
     fm.number_from_string("1.0").must_equal 1*BTC::COIN
     fm.number_from_string("42").must_equal 42*BTC::COIN
     fm.number_from_string("42.123").must_equal 42*BTC::COIN + 12300000

data/spec/keychain_spec.rb

@@ -258,4 +258,9 @@ describe BTC::Keychain do
     m0pub.extended_public_key.must_equal "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH"
     m0pub.extended_private_key.must_equal nil
   end
+  it "should raise the ArgumentError when arguments are not passed" do
+    assert_raises ArgumentError do
+      BTC::Keychain.new
+    end
+  end
 end

data/spec/script_number_spec.rb

@@ -22,6 +22,10 @@ describe BTC::ScriptNumber do
     BTC::ScriptNumber.new(data: "\x01").to_i.must_equal 1
   end
 
+  it "should parse 0x27 as 39" do
+    BTC::ScriptNumber.new(data: "\x27").to_i.must_equal 39
+  end
+
   it "should parse 0xff as -127" do
     BTC::ScriptNumber.new(data: "\xff").to_i.must_equal -127
   end

data/spec/secp256k1_spec.rb

@@ -9,22 +9,34 @@ describe BTC::Secp256k1 do
     sig.to_hex.must_equal sighex
   end
 
-  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979" do
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 01" do
     verify_rfc6979_signature("cca9fbcc1b41e5a95d369eaa6ddcff73b61a4efaa279cfc6567e8daa39cbaf50",
                              "sample",
                              "3045022100af340daf02cc15c8d5d08d7735dfe6b98a474ed373bdb5fbecf7571be52b384202205009fb27f37034a9b24b707b7c6b79ca23ddef9e25f7282e8a797efe53a8f124")
+  end
+
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 02" do
     verify_rfc6979_signature("0000000000000000000000000000000000000000000000000000000000000001",
                              "Satoshi Nakamoto",
                              "3045022100934b1ea10a4b3c1757e2b0c017d0b6143ce3c9a7e6a4a49860d7a6ab210ee3d802202442ce9d2b916064108014783e923ec36b49743e2ffa1c4496f01a512aafd9e5")
+  end
+
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 03" do
     verify_rfc6979_signature("fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",
                              "Satoshi Nakamoto",
                              "3045022100fd567d121db66e382991534ada77a6bd3106f0a1098c231e47993447cd6af2d002206b39cd0eb1bc8603e159ef5c20a5c8ad685a45b06ce9bebed3f153d10d93bed5")
+  end
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 04" do
     verify_rfc6979_signature("f8b8af8ce3c7cca5e300d33939540c10d45ce001b8f252bfbc57ba0342904181",
                              "Alan Turing",
                              "304402207063ae83e7f62bbb171798131b4a0564b956930092b33b07b395615d9ec7e15c022058dfcc1e00a35e1572f366ffe34ba0fc47db1e7189759b9fb233c5b05ab388ea")
+  end
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 05" do
     verify_rfc6979_signature("0000000000000000000000000000000000000000000000000000000000000001",
                              "All those moments will be lost in time, like tears in rain. Time to die...",
                              "30450221008600dbd41e348fe5c9465ab92d23e3db8b98b873beecd930736488696438cb6b0220547fe64427496db33bf66019dacbf0039c04199abb0122918601db38a72cfc21")
+  end
+  it "should produce deterministic ECDSA signatures Bitcoin-canonical using nonce from RFC6979 06" do
     verify_rfc6979_signature("e91671c46231f833a6406ccbea0e3e392c76c167bac1cb013f6f1013980455c2",
                              "There is a computer disease that anybody who works with computers knows about. It's a very serious disease and it interferes completely with the work. The trouble with computers is that you 'play' with them!",
                              "3045022100b552edd27580141f3b2a5463048cb7cd3e047b97c9f98076c32dbdf85a68718b0220279fa72dd19bfae05577e06c7c0c1900c371fcd5893f7e1d56a37d30174671f6")

data/spec/transaction_builder_spec.rb

@@ -68,6 +68,12 @@ describe BTC::TransactionBuilder do
       result.fee.must_be :<, 0.01 * BTC::COIN
     end
 
+    it "should be able to set mining fee" do
+      @builder.fee =50690
+      result = @builder.build()
+      result.fee.must_equal 50690
+    end
+    
     it "should have valid amounts" do
       result = @builder.build
       result.inputs_amount.must_equal mock_utxos.inject(0){|sum, out| sum + out.value}
@@ -190,6 +196,12 @@ describe BTC::TransactionBuilder do
       result.fee.must_be :<, 0.01 * BTC::COIN
     end
 
+    it "should be able to set mining fee" do
+      @builder.fee =50690
+      result = @builder.build()
+      result.fee.must_equal 50690
+    end
+
     it "should have valid amounts" do
       result = @builder.build
       result.inputs_amount.must_equal 11*1000_00

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: btcruby
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Oleg Andreev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -115,10 +115,12 @@ files:
 - lib/btcruby/script/script_interpreter.rb
 - lib/btcruby/script/script_interpreter_extension.rb
 - lib/btcruby/script/script_number.rb
+- lib/btcruby/script/script_version.rb
 - lib/btcruby/script/signature_checker.rb
 - lib/btcruby/script/signature_hashtype.rb
 - lib/btcruby/script/test_signature_checker.rb
 - lib/btcruby/script/transaction_signature_checker.rb
+- lib/btcruby/script/versioned_script.rb
 - lib/btcruby/secp256k1.rb
 - lib/btcruby/ssss.rb
 - lib/btcruby/transaction.rb