bitcoinrb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79b3878cc9efefd8c38b5cd870144bc23a80bbf7bf1c741378dd66c9e5ebdbf8
-  data.tar.gz: a5d9956a5a6b7bed15b73e552b84110d9636f1b069c1d97978be4e94c1e0a0f0
+  metadata.gz: 524753cfa61041f101f72d76e914f70b20b504fb0eecad9d378a436afe7db718
+  data.tar.gz: f3181a60120da9f892ceaaaaf22aba5923b26f495fb9fb9dd314c5cce8127129
 SHA512:
-  metadata.gz: b779fd9decef5b224144dae60e06b99f3ac0fbb17b34202af0ce31eb2bd7e0a6076b3a940dcfe2e460923017c14feb40c2d0bf891f3ebe9553b65be124559a32
-  data.tar.gz: 7f011d31ab1ec5364cc8f04a63b6baf74d37db05d49666588dd1329d5005f3ba01a8e8b83752989121b73c3956eda8a5808365b729f6d21dc136f6abf0c817cd
+  metadata.gz: da27669ddabc4d64bf3c96d4e83eb8c5d90ef837ed91b6f2e1d0e7d50c74153c62ff39eecb1867463f5a8435f7643d62ba6108e7a10d1fa46e4b10178fe8e2f1
+  data.tar.gz: 2f85e04fecddba5bb1d1ce4fc61bf79fd972280f4834e56a4b56974958903e74bd1d19789c93d6bdebe8bead9b5fca8ad26d4c35967760cf0517da42ebfeb35d

data/lib/bitcoin/block.rb

@@ -17,6 +17,10 @@ module Bitcoin
       header.hash
     end
 
+    def block_hash
+      header.block_hash
+    end
+
     # calculate block weight
     def weight
       stripped_size * (WITNESS_SCALE_FACTOR - 1) + size
@@ -41,7 +45,7 @@ module Bitcoin
 
     # calculate merkle root from tx list.
     def calculate_merkle_root
-      Bitcoin::MerkleTree.build_from_leaf(transactions.map(&:hash)).merkle_root
+      Bitcoin::MerkleTree.build_from_leaf(transactions.map(&:tx_hash)).merkle_root
     end
 
     # check the witness commitment in coinbase tx matches witness commitment calculated from tx list.

data/lib/bitcoin/block_header.rb

@@ -36,14 +36,17 @@ module Bitcoin
       (mantissa * 2 ** (8 * (exponent - 3)))
     end
 
-    # block hash(little endian)
     def hash
+      calc_hash.to_i(16)
+    end
+
+    def block_hash
       calc_hash
     end
 
     # block hash(big endian)
     def block_id
-      hash.rhex
+      block_hash.rhex
     end
 
     # evaluate block header

data/lib/bitcoin/merkle_tree.rb

@@ -10,7 +10,7 @@ module Bitcoin
     end
 
     def merkle_root
-      root.hash
+      root.value
     end
 
     def self.build_from_leaf(txids)
@@ -31,11 +31,16 @@ module Bitcoin
       flags.each do |f|
         current_node.flag = f
         if f.zero? || current_node.leaf?
-          current_node.hash = hashes[hash_index]
+          current_node.value = hashes[hash_index]
           hash_index += 1
         end
         current_node = current_node.next_partial
-        break if hash_index == hashes.size
+        if hash_index == hashes.size
+          if current_node&.leaf?
+            current_node.value = hashes.last
+          end
+          break
+        end
       end
       new(root)
     end
@@ -52,17 +57,21 @@ module Bitcoin
       nodes.first
     end
 
+    def find_node(value)
+      root.find_node(value)
+    end
+
     # node of merkle tree
     class Node
 
       attr_accessor :flag
-      attr_accessor :hash
+      attr_accessor :value
       attr_accessor :parent
       attr_accessor :left
       attr_accessor :right
 
-      def initialize(hash = nil)
-        @hash = hash
+      def initialize(value = nil)
+        @value = value
       end
 
       def left=(node)
@@ -75,10 +84,10 @@ module Bitcoin
         @right = node
       end
 
-      def hash
-        return @hash if @hash
+      def value
+        return @value if @value
         self.right = left.dup unless right
-        Bitcoin.double_sha256([left.hash + right.hash].pack('H*')).bth
+        Bitcoin.double_sha256([left.value + right.value].pack('H*')).bth
       end
 
       def root?
@@ -112,7 +121,25 @@ module Bitcoin
         d
       end
 
+      # @param target value to be found
+      # @return node which has same value as target. nil if this node and any children don't have same value.
+      def find_node(target)
+        return self if value == target
+        return nil if flag && flag.zero?
+        return left&.find_node(target) || right&.find_node(target)
+      end
+
+      def index
+        i = 0
+        d = 1
+        current_node = self
+        until current_node.root? do
+          i += d if current_node.parent.right == current_node
+          current_node = current_node.parent
+          d *= 2
+        end
+        i
+      end
     end
   end
-
 end

data/lib/bitcoin/network/message_handler.rb

@@ -226,6 +226,7 @@ module Bitcoin
 
       def on_merkle_block(merkle_block)
         logger.info("receive merkle block message. #{merkle_block.build_json}")
+        peer.handle_merkle_block(merkle_block)
       end
 
       def on_cmpct_block(cmpct_block)

data/lib/bitcoin/network/peer.rb

@@ -92,7 +92,7 @@ module Bitcoin
       def start_block_header_download
         logger.info("[#{addr}] start block header download.")
         get_headers = Bitcoin::Message::GetHeaders.new(
-            Bitcoin.chain_params.protocol_version, [chain.latest_block.hash])
+            Bitcoin.chain_params.protocol_version, [chain.latest_block.block_hash])
         conn.send_message(get_headers)
       end
 
@@ -138,7 +138,7 @@ module Bitcoin
           break unless header.valid?
           entry = chain.append_header(header)
           next unless entry
-          @best_hash = entry.hash
+          @best_hash = entry.block_hash
           @best_height = entry.height
         end
         pool.changed
@@ -190,6 +190,11 @@ module Bitcoin
         pool.notify_observers(:tx, tx)
       end
 
+      def handle_merkle_block(merkle_block)
+        pool.changed
+        pool.notify_observers(:merkleblock, merkle_block)
+      end
+
       # send ping message.
       def send_ping
         ping = Bitcoin::Message::Ping.new

data/lib/bitcoin/psbt/hd_key_path.rb

@@ -20,9 +20,9 @@ module Bitcoin
       # @param [String] payload hd key path value with binary format.
       # @return [Bitcoin::PSBT::HDKeyPath]
       def self.parse_from_payload(pubkey, payload)
-        raise 'Size of key was not the expected size for the type BIP32 keypath' unless [Bitcoin::Key::PUBLIC_KEY_SIZE, Bitcoin::Key::COMPRESSED_PUBLIC_KEY_SIZE].include?(pubkey.bytesize)
+        raise ArgumentError, 'Size of key was not the expected size for the type BIP32 keypath.' unless [Bitcoin::Key::PUBLIC_KEY_SIZE, Bitcoin::Key::COMPRESSED_PUBLIC_KEY_SIZE].include?(pubkey.bytesize)
         pubkey = Bitcoin::Key.new(pubkey: pubkey.bth)
-        raise 'Invalid pubkey' unless pubkey.fully_valid_pubkey?
+        raise ArgumentError, 'Invalid pubkey' unless pubkey.fully_valid_pubkey?
         self.new(pubkey.pubkey, fingerprint: payload[0...4].bth, path: payload[4..-1].unpack('I*'))
       end
 

data/lib/bitcoin/psbt/input.rb

@@ -38,9 +38,11 @@ module Bitcoin
 
           case key_type
           when PSBT_IN_TYPES[:non_witness_utxo]
+            raise ArgumentError, 'Invalid non-witness utxo typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input non-witness utxo already provided.' if input.non_witness_utxo
             input.non_witness_utxo = Bitcoin::Tx.parse_from_payload(value)
           when PSBT_IN_TYPES[:witness_utxo]
+            raise ArgumentError, 'Invalid input witness utxo typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input witness utxo already provided.' if input.witness_utxo
             input.witness_utxo = Bitcoin::TxOut.parse_from_payload(value)
           when PSBT_IN_TYPES[:partial_sig]
@@ -52,21 +54,27 @@ module Bitcoin
             raise ArgumentError, 'Duplicate Key, input partial signature for pubkey already provided.' if input.partial_sigs[pubkey.pubkey]
             input.partial_sigs[pubkey.pubkey] = value
           when PSBT_IN_TYPES[:sighash]
+            raise ArgumentError, 'Invalid input sighash type typed key.' unless key_len == 1
             raise ArgumentError 'Duplicate Key, input sighash type already provided.' if input.sighash_type
             input.sighash_type = value.unpack('I').first
           when PSBT_IN_TYPES[:redeem_script]
+            raise ArgumentError, 'Invalid redeemscript typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input redeemScript already provided.' if input.redeem_script
             input.redeem_script = Bitcoin::Script.parse_from_payload(value)
           when PSBT_IN_TYPES[:witness_script]
+            raise ArgumentError, 'Invalid witnessscript typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input witnessScript already provided.' if input.witness_script
             input.witness_script = Bitcoin::Script.parse_from_payload(value)
           when PSBT_IN_TYPES[:bip32_derivation]
+            raise ArgumentError, 'Invalid bip32 typed key.' unless key_len
             raise ArgumentError, 'Duplicate Key, pubkey derivation path already provided.' if input.hd_key_paths[key.bth]
             input.hd_key_paths[key.bth] = Bitcoin::PSBT::HDKeyPath.parse_from_payload(key, value)
           when PSBT_IN_TYPES[:script_sig]
+            raise ArgumentError, 'Invalid final scriptsig typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input final scriptSig already provided.' if input.final_script_sig
             input.final_script_sig = Bitcoin::Script.parse_from_payload(value)
           when PSBT_IN_TYPES[:script_witness]
+            raise ArgumentError, 'Invalid final script witness typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, input final scriptWitness already provided.' if input.final_script_witness
             input.final_script_witness = Bitcoin::ScriptWitness.parse_from_payload(value)
           else

data/lib/bitcoin/psbt/output.rb

@@ -27,9 +27,11 @@ module Bitcoin
           value = buf.read(Bitcoin.unpack_var_int_from_io(buf))
           case key_type
           when PSBT_OUT_TYPES[:redeem_script]
+            raise ArgumentError, 'Invalid output redeemScript typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, output redeemScript already provided' if output.redeem_script
             output.redeem_script = value
           when PSBT_OUT_TYPES[:witness_script]
+            raise ArgumentError, 'Invalid output witnessScript typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, output witnessScript already provided' if output.witness_script
             output.witness_script = value
           when PSBT_OUT_TYPES[:bip32_derivation]

data/lib/bitcoin/psbt/tx.rb

@@ -40,26 +40,27 @@ module Bitcoin
 
           case key_type
           when PSBT_GLOBAL_TYPES[:unsigned_tx]
-            raise ArgumentError, 'Duplicate Key, unsigned tx already provided' if partial_tx.tx
+            raise ArgumentError, 'Invalid global transaction typed key.' unless key_len == 1
+            raise ArgumentError, 'Duplicate Key, unsigned tx already provided.' if partial_tx.tx
             partial_tx.tx = Bitcoin::Tx.parse_from_payload(value)
             partial_tx.tx.in.each do |tx_in|
               raise ArgumentError, 'Unsigned tx does not have empty scriptSigs and scriptWitnesses.' if !tx_in.script_sig.empty? || !tx_in.script_witness.empty?
             end
           else
-            raise ArgumentError, 'Duplicate Key, key for unknown value already provided' if partial_tx.unknowns[key]
+            raise ArgumentError, 'Duplicate Key, key for unknown value already provided.' if partial_tx.unknowns[key]
             partial_tx.unknowns[([key_type].pack('C') + key).bth] = value
           end
         end
 
-        raise ArgumentError, 'No unsigned transcation was provided.' unless partial_tx.tx
+        raise ArgumentError, 'No unsigned transaction was provided.' unless partial_tx.tx
 
         # read input data.
         partial_tx.tx.in.each do |tx_in|
           break if buf.eof?
           input = Input.parse_from_buf(buf)
           partial_tx.inputs << input
-          if input.non_witness_utxo && input.non_witness_utxo.hash != tx_in.prev_hash
-            raise ArgumentError, 'Non-witness UTXO does not match outpoint hash'
+          if input.non_witness_utxo && input.non_witness_utxo.tx_hash != tx_in.prev_hash
+            raise ArgumentError, 'Non-witness UTXO does not match outpoint hash.'
           end
         end
 
@@ -110,7 +111,7 @@ module Bitcoin
       # @param [Bitcoin::Script] witness_script witness script to set input.
       # @param [Hash] hd_key_paths bip 32 hd key paths to set input.
       def update!(prev_tx, redeem_script: nil, witness_script: nil, hd_key_paths: [])
-        prev_hash = prev_tx.hash
+        prev_hash = prev_tx.tx_hash
         tx.in.each_with_index do|tx_in, i|
           if tx_in.prev_hash == prev_hash
             utxo = prev_tx.out[tx_in.out_point.index]

data/lib/bitcoin/rpc/request_handler.rb

@@ -12,7 +12,7 @@ module Bitcoin
         h[:headers] = best_block.height
         h[:bestblockhash] = best_block.header.block_id
         h[:chainwork] = best_block.header.work
-        h[:mediantime] = node.chain.mtp(best_block.hash)
+        h[:mediantime] = node.chain.mtp(best_block.block_hash)
         h
       end
 

data/lib/bitcoin/script/script.rb

@@ -352,6 +352,11 @@ module Bitcoin
       to_payload.bytesize
     end
 
+    # execute script interpreter using this script for development.
+    def run
+      Bitcoin::ScriptInterpreter.eval(Bitcoin::Script.new, self.dup)
+    end
+
     # encode int value to script number hex.
     # The stacks hold byte vectors.
     # When used as numbers, byte vectors are interpreted as little-endian variable-length integers

data/lib/bitcoin/store/chain_entry.rb

@@ -16,14 +16,18 @@ module Bitcoin
 
       # get database key
       def key
-        Bitcoin::Store::KEY_PREFIX[:entry] + header.hash
+        Bitcoin::Store::KEY_PREFIX[:entry] + header.block_hash
       end
 
-      # block hash
       def hash
         header.hash
       end
 
+      # block hash
+      def block_hash
+        header.block_hash
+      end
+
       # previous block hash
       def prev_hash
         header.prev_hash

data/lib/bitcoin/store/db/level_db.rb

@@ -61,7 +61,7 @@ module Bitcoin
         def save_entry(entry)
           db.batch do
             db.put(entry.key ,entry.to_payload)
-            db.put(height_key(entry.height), entry.hash)
+            db.put(height_key(entry.height), entry.block_hash)
             connect_entry(entry)
           end
         end
@@ -81,17 +81,15 @@ module Bitcoin
         def connect_entry(entry)
           unless entry.genesis?
             tip_block = Bitcoin::Store::ChainEntry.parse_from_payload(get_entry_payload_from_hash(best_hash))
-            unless tip_block.hash == entry.prev_hash
-              raise "entry(#{entry.hash}) does not reference current best block hash(#{tip_block.hash})"
+            unless tip_block.block_hash == entry.prev_hash
+              raise "entry(#{entry.block_hash}) does not reference current best block hash(#{tip_block.block_hash})"
             end
             unless tip_block.height + 1 == entry.height
               raise "block height is small than current best block."
             end
           end
-
-
-          db.put(KEY_PREFIX[:best], entry.hash)
-          db.put(KEY_PREFIX[:next] + entry.prev_hash, entry.hash)
+          db.put(KEY_PREFIX[:best], entry.block_hash)
+          db.put(KEY_PREFIX[:next] + entry.prev_hash, entry.block_hash)
         end
       end
 

data/lib/bitcoin/store/spv_chain.rb

@@ -44,17 +44,17 @@ module Bitcoin
       # @return [Bitcoin::Store::ChainEntry] appended block header entry.
       def append_header(header)
         logger.info("append header #{header.block_id}")
-        raise "this header is invalid. #{header.hash}" unless header.valid?
+        raise "this header is invalid. #{header.block_hash}" unless header.valid?
         best_block = latest_block
         current_height = best_block.height
-        if best_block.hash == header.prev_hash
+        if best_block.block_hash == header.prev_hash
           entry = Bitcoin::Store::ChainEntry.new(header, current_height + 1)
           db.save_entry(entry)
           entry
         else
-          unless find_entry_by_hash(header.hash)
+          unless find_entry_by_hash(header.block_hash)
             # TODO implements recovery process
-            raise "header's previous hash(#{header.prev_hash}) does not match current best block's(#{best_block.hash})."
+            raise "header's previous hash(#{header.prev_hash}) does not match current best block's(#{best_block.block_hash})."
           end
         end
       end

data/lib/bitcoin/tx.rb

@@ -70,11 +70,15 @@ module Bitcoin
     end
 
     def hash
+      to_payload.bth.to_i(16)
+    end
+
+    def tx_hash
       Bitcoin.double_sha256(serialize_old_format).bth
     end
 
     def txid
-      hash.rhex
+      tx_hash.rhex
     end
 
     def witness_hash
@@ -109,7 +113,7 @@ module Bitcoin
     end
 
     def ==(other)
-      hash == other.hash
+      to_payload == other.to_payload
     end
 
     # serialize tx with old tx format

data/lib/bitcoin/validation.rb

@@ -49,7 +49,7 @@ module Bitcoin
 
     # check proof of work
     def check_block_header(header, state)
-      header.hash
+      header.block_hash
       header.bits
 
     end

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/openassets/marker_output.rb

@@ -5,8 +5,14 @@ module OpenAssets
     # whether this output is marker output for open assets.
     def open_assets_marker?
       return false unless script_pubkey.op_return?
-      payload = Payload.parse_from_payload(script_pubkey.op_return_data)
-      !payload.nil?
+      !oa_payload.nil?
+    end
+
+    # get open asset payload.
+    # @return [OpenAssets::Payload] open asset payload.
+    def oa_payload
+      return nil unless script_pubkey.op_return?
+      Payload.parse_from_payload(script_pubkey.op_return_data)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa