bitcoinrb 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5d412165565c3dde3e626417f6a08e08d8698f66712c080b967f5d1e4e1688
-  data.tar.gz: 305d2ffba9338edfb26364da1d76ed166c1d2bbb253a2f3337db346a565247ea
+  metadata.gz: 34ec1d9b1b20094213a29e9df2a47b901bdef1d537323446230b6ff2f3420a50
+  data.tar.gz: 5591f08d5909d1b18b60b091a41e4f6638d424ea0512dbd270001d8e9555e633
 SHA512:
-  metadata.gz: 171bd45d707d1d49398d1f272ee7559bc88b5df66a8a4c15afbc107eb9c631eb243c3fad3ec3073d455c8e6c49048ddcd0bedbe96cb4c06b6af7daaad9d31c20
-  data.tar.gz: ef995e0e5db4d6b7352de9f7efa7d97bd2a6c0de39c811e352595c89a6b79966ab50304b7e0059bc7c2afff1826a37c99748233f79956d1dca80a745d6aec888
+  metadata.gz: 8e1a4df59cb46fa6d35dab5dc3d83dac58aaf6b8f39ae2ccc782c10ce06821000a1e31732887b0019b2ac62f0f4d7e831d71a0a9ad8964868b24c168862b963a
+  data.tar.gz: 9f374d157b4c8814c771697365ffded665a17b36579130604fd8c85375e05fbaa41f8212006ef037f5d2442af67a6130a1d5400d5019b9685404b433de1dff77

data/README.md

@@ -9,9 +9,9 @@ NOTE: Bitcoinrb work in progress, and there is a possibility of incompatible cha
 
 Bitcoinrb supports following feature:
 
-* Bitcoin script interpreter(including [BIP-65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki), [BIP-68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki), [BIP-112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki))
-* De/serialization of Bitcoin protocol network messages
-* De/serialization of blocks and transactions
+* [Bitcoin script interpreter](https://github.com/chaintope/bitcoinrb/wiki/Script)(including [BIP-65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki), [BIP-68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki), [BIP-112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki))
+* [De/serialization of Bitcoin protocol network messages](https://github.com/chaintope/bitcoinrb/wiki/P2P-Message)
+* De/serialization of blocks and [transactions](https://github.com/chaintope/bitcoinrb/wiki/Transaction)
 * Key generation and verification for ECDSA, including [BIP-32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) and [BIP-39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki) supports.
 * ECDSA signature(RFC6979 -Deterministic ECDSA, LOW-S, LOW-R support)
 * Segwit support (parsing segwit payload, Bech32 address, sign for segwit tx, [BIP-141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki), [BIP-143](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki), [BIP-144](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki))

data/bitcoinrb.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'siphash'
   spec.add_runtime_dependency 'protobuf', '3.8.5'
   spec.add_runtime_dependency 'scrypt'
-  spec.add_runtime_dependency 'activesupport', '~> 5.2.3'
 
   # for options
   spec.add_development_dependency 'leveldb-native'
@@ -43,5 +42,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'webmock', '~> 3.0'
 
 end

data/lib/bitcoin.rb

@@ -54,6 +54,7 @@ module Bitcoin
   autoload :KeyPath, 'bitcoin/key_path'
   autoload :Descriptor, 'bitcoin/descriptor'
   autoload :SLIP39, 'bitcoin/slip39'
+  autoload :Aezeed, 'bitcoin/aezeed'
 
   require_relative 'bitcoin/constants'
 

data/lib/bitcoin/chain_params.rb

@@ -36,9 +36,6 @@ module Bitcoin
 
     attr_accessor :dust_relay_fee
 
-    # fork coin id.
-    attr_accessor :fork_id
-
     # mainnet genesis
     def self.mainnet
       init('mainnet')
@@ -73,11 +70,6 @@ module Bitcoin
       Bitcoin::Block.new(header)
     end
 
-    # whether fork coin.
-    def fork_chain?
-      !fork_id.nil?
-    end
-
     def self.init(name)
       i = YAML.load(File.open("#{__dir__}/chainparams/#{name}.yml"))
       i.dust_relay_fee ||= Bitcoin::DUST_RELAY_TX_FEE

data/lib/bitcoin/chainparams/regtest.yml

@@ -9,7 +9,7 @@ privkey_version: "ef"
 extended_privkey_version: "04358394"
 extended_pubkey_version: "043587cf"
 bip49_pubkey_p2wpkh_p2sh_version: "044a5262"
-bip49_pubkey_p2wsh_p2sh_version: "024285ef"
+bip49_pubkey_p2wsh_p2sh_version: "024289ef"
 bip49_privkey_p2wpkh_p2sh_version: "044a4e28"
 bip49_privkey_p2wsh_p2sh_version: "024285b5"
 bip84_pubkey_p2wpkh_version: "045f1cf6"

data/lib/bitcoin/chainparams/testnet.yml

@@ -9,7 +9,7 @@ privkey_version: "ef"
 extended_privkey_version: "04358394"
 extended_pubkey_version: "043587cf"
 bip49_pubkey_p2wpkh_p2sh_version: "044a5262"
-bip49_pubkey_p2wsh_p2sh_version: "024285ef"
+bip49_pubkey_p2wsh_p2sh_version: "024289ef"
 bip49_privkey_p2wpkh_p2sh_version: "044a4e28"
 bip49_privkey_p2wsh_p2sh_version: "024285b5"
 bip84_pubkey_p2wpkh_version: "045f1cf6"

data/lib/bitcoin/constants.rb

@@ -91,13 +91,6 @@ module Bitcoin
   # Signature hash types/flags
   SIGHASH_TYPE = { all: 1, none: 2, single: 3, anyonecanpay: 128 }
 
-  # SIGHASH_FORK_ID for replay protection of the fork coin
-  SIGHASH_FORK_ID = 0x40
-
-  # fork coin id.
-  FORK_ID_CASH = 0
-  FORK_ID_GOLD = 79
-
   # Maximum number length in bytes
   DEFAULT_MAX_NUM_SIZE = 4
 

data/lib/bitcoin/ext_key.rb

@@ -6,6 +6,9 @@ module Bitcoin
   # BIP32 Extended private key
   class ExtKey
 
+    MAX_DEPTH = 255
+    MASTER_FINGERPRINT = '00000000'
+
     attr_accessor :ver
     attr_accessor :depth
     attr_accessor :number
@@ -18,7 +21,7 @@ module Bitcoin
     def self.generate_master(seed)
       ext_key = ExtKey.new
       ext_key.depth = ext_key.number = 0
-      ext_key.parent_fingerprint = '00000000'
+      ext_key.parent_fingerprint = MASTER_FINGERPRINT
       l = Bitcoin.hmac_sha512('Bitcoin seed', seed.htb)
       left = l[0..31].bth.to_i(16)
       raise 'invalid key' if left >= CURVE_ORDER || left == 0
@@ -94,6 +97,7 @@ module Bitcoin
       number += Bitcoin::HARDENED_THRESHOLD if harden
       new_key = ExtKey.new
       new_key.depth = depth + 1
+      raise IndexError, 'Depth over 255.' if new_key.depth > MAX_DEPTH
       new_key.number = number
       new_key.parent_fingerprint = fingerprint
       if number > (Bitcoin::HARDENED_THRESHOLD - 1)
@@ -143,6 +147,9 @@ module Bitcoin
       raise 'An unsupported version byte was specified.' unless ExtKey.support_version?(ext_key.ver)
       ext_key.depth = buf.read(1).unpack('C').first
       ext_key.parent_fingerprint = buf.read(4).bth
+      if ext_key.depth == 0
+        raise ArgumentError, 'Invalid parent fingerprint.' unless ext_key.parent_fingerprint == MASTER_FINGERPRINT
+      end
       ext_key.number = buf.read(4).unpack('N').first
       ext_key.chain_code = buf.read(32)
       buf.read(1) # 0x00
@@ -256,6 +263,7 @@ module Bitcoin
     def derive(number)
       new_key = ExtPubkey.new
       new_key.depth = depth + 1
+      raise IndexError, 'Depth over 255.' if new_key.depth > Bitcoin::ExtKey::MAX_DEPTH
       new_key.number = number
       new_key.parent_fingerprint = fingerprint
       raise 'hardened key is not support' if number > (Bitcoin::HARDENED_THRESHOLD - 1)
@@ -301,6 +309,9 @@ module Bitcoin
       raise 'An unsupported version byte was specified.' unless ExtPubkey.support_version?(ext_pubkey.ver)
       ext_pubkey.depth = buf.read(1).unpack('C').first
       ext_pubkey.parent_fingerprint = buf.read(4).bth
+      if ext_pubkey.depth == 0
+        raise ArgumentError, 'Invalid parent fingerprint.' unless ext_pubkey.parent_fingerprint == ExtKey::MASTER_FINGERPRINT
+      end
       ext_pubkey.number = buf.read(4).unpack('N').first
       ext_pubkey.chain_code = buf.read(32)
       ext_pubkey.pubkey = buf.read(33).bth

data/lib/bitcoin/key.rb

@@ -125,19 +125,19 @@ module Bitcoin
     # get pay to pubkey hash address
     # @deprecated
     def to_p2pkh
-      Bitcoin::Script.to_p2pkh(hash160).addresses.first
+      Bitcoin::Script.to_p2pkh(hash160).to_addr
     end
 
     # get pay to witness pubkey hash address
     # @deprecated
     def to_p2wpkh
-      Bitcoin::Script.to_p2wpkh(hash160).addresses.first
+      Bitcoin::Script.to_p2wpkh(hash160).to_addr
     end
 
     # get p2wpkh address nested in p2sh.
     # @deprecated
     def to_nested_p2wpkh
-      Bitcoin::Script.to_p2wpkh(hash160).to_p2sh.addresses.first
+      Bitcoin::Script.to_p2wpkh(hash160).to_p2sh.to_addr
     end
 
     def compressed?

data/lib/bitcoin/rpc/bitcoin_core_client.rb

@@ -56,7 +56,7 @@ module Bitcoin
         post(server_url, @config[:timeout], @config[:open_timeout], data.to_json, content_type: :json) do |respdata, request, result|
           raise result.message if !result.kind_of?(Net::HTTPSuccess) && respdata.empty?
           response = JSON.parse(respdata.gsub(/\\u([\da-fA-F]{4})/) { [$1].pack('H*').unpack('n*').pack('U*').encode('ISO-8859-1').force_encoding('UTF-8') })
-          raise response['error'] if response['error']
+          raise response['error'].to_s if response['error']
           response['result']
         end
       end

data/lib/bitcoin/rpc/request_handler.rb

@@ -96,7 +96,7 @@ module Bitcoin
           script = Bitcoin::Script.parse_from_payload(hex_script.htb)
           h = script.to_h
           h.delete(:hex)
-          h[:p2sh] = script.to_p2sh.addresses.first unless script.p2sh?
+          h[:p2sh] = script.to_p2sh.to_addr unless script.p2sh?
           h
         rescue Exception
           raise ArgumentError.new('Script decode failed')

data/lib/bitcoin/script/script.rb

@@ -148,7 +148,9 @@ module Bitcoin
       chunks.size == 0
     end
 
+    # @deprecated
     def addresses
+      puts "WARNING: Bitcoin::Script#addresses is deprecated. Use Bitcoin::Script#to_addr instead."
       return [p2pkh_addr] if p2pkh?
       return [p2sh_addr] if p2sh?
       return [bech32_addr] if witness_program?
@@ -156,6 +158,15 @@ module Bitcoin
       []
     end
 
+    # convert to address
+    # @return [String] if script type is p2pkh or p2sh or witness program, return address, otherwise nil.
+    def to_addr
+      return p2pkh_addr if p2pkh?
+      return p2sh_addr if p2sh?
+      return bech32_addr if witness_program?
+      nil
+    end
+
     # check whether standard script.
     def standard?
       p2pkh? | p2sh? | p2wpkh? | p2wsh? | multisig? | standard_op_return?

data/lib/bitcoin/script/script_interpreter.rb

@@ -609,7 +609,6 @@ module Bitcoin
       return false if sig.empty?
       s = sig.unpack('C*')
       hash_type = s[-1] & (~(SIGHASH_TYPE[:anyonecanpay]))
-      hash_type &= (~(Bitcoin::SIGHASH_FORK_ID)) if Bitcoin.chain_params.fork_chain? # for fork coin.
       return false if hash_type < SIGHASH_TYPE[:all] || hash_type > SIGHASH_TYPE[:single]
       true
     end

data/lib/bitcoin/tx.rb

@@ -202,7 +202,7 @@ module Bitcoin
       raise ArgumentError, 'script_pubkey must be specified.' unless output_script
       raise ArgumentError, 'unsupported sig version specified.' unless SIG_VERSION.include?(sig_version)
 
-      if sig_version == :witness_v0 || Bitcoin.chain_params.fork_chain?
+      if sig_version == :witness_v0
         raise ArgumentError, 'amount must be specified.' unless amount
         sighash_for_witness(input_index, output_script, hash_type, amount, skip_separator_index)
       else
@@ -225,7 +225,7 @@ module Bitcoin
         script_pubkey = redeem_script if redeem_script.p2wpkh?
       end
 
-      if has_witness || Bitcoin.chain_params.fork_chain?
+      if has_witness
         verify_input_sig_for_witness(input_index, script_pubkey, amount, flags)
       else
         verify_input_sig_for_legacy(input_index, script_pubkey, flags)
@@ -310,7 +310,7 @@ module Bitcoin
       if (hash_type & SIGHASH_TYPE[:anyonecanpay]) != 0
         hash_prevouts = hash_sequence ="\x00".ljust(32, "\x00")
       end
-      hash_type |= (Bitcoin.chain_params.fork_id << 8) if Bitcoin.chain_params.fork_chain?
+
       buf = [ [version].pack('V'), hash_prevouts, hash_sequence, outpoint,
               script_code ,amount, nsequence, hash_outputs, [@lock_time, hash_type].pack('VV')].join
       Bitcoin.double_sha256(buf)

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -206,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: leveldb-native
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: "[WIP]The implementation of Bitcoin Protocol for Ruby."
 email:
 - azuchi@chaintope.com