block_io 3.0.0 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a878068a7ce224442ab3544657e2fb5de30dc68c43b00fd443c7c8ea35a61a
-  data.tar.gz: '09ad2302125ca6d86427637023439ffac4f8c1e7d6f477d098aeb6955d0f3be2'
+  metadata.gz: eed2e36f43cdd4162187d87cc37d1a7262cf3bb49c74dd0ee5fa419287700805
+  data.tar.gz: c8841cd420bd57b9c29b8617aaf39f26d2e8a7050d432c2a0cc9b35bf3b0d602
 SHA512:
-  metadata.gz: bb922e78d5c23c2e64b8259a688189eab1c20e654fa63389cc919d28a68030a0650101df2a32aecafbabb6ff639552e2698def07cd405638f0aea6bed32e7995
-  data.tar.gz: 940ff69d78033e939b150af65fc89944a8fd99a4296bab9c8314b5988508e2d093ec1e6c1295df37ebcbac4d31110fc70e3749d02a58da25585039594b872de6
+  metadata.gz: 54d0ba740aa4cfbe535ae9a3c57f42d72f70422840609634c2810e9d2f491d53281fbb8afd6739da7e13d9329bfd0234e8b82e50b649f419dc963ae1dd465660
+  data.tar.gz: 60275bf0b7acffcdc354c095e557b34f1815aa5819e000384ef182f9439287188d9fd660951aa195b329a1cb0959a58b9ef8a397ba6f533625733a094124c240

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 os:
 - linux
+dist:
+- bionic
 rvm:
-- 2.4
-- 2.5
 - 2.6
 - 2.7
 - 3.0

data/README.md

@@ -14,9 +14,13 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install block_io -v=3.0.0
+    $ gem install block_io
 
 ## Changelog
+*12/26/21*: Version 3.0.4 drops support for EOL Ruby 2.4, 2.5. Supports Ruby 3.1.  
+*09/28/21*: Version 3.0.3 supports witness_v1 outputs (Bech32m).  
+*07/21/21*: Version 3.0.2 fixes Litecoin P2SH address version.  
+*06/09/21*: Version 3.0.1 implements use of dynamic decryption algorithms.  
 *04/14/21*: BREAKING CHANGES. Version 3.0.0. Remove support for Ruby < 2.4.0, and Windows. Behavior and interfaces have changed. By upgrading you'll need to revise your code and tests.
 
 ## Important Notes

data/block_io.gemspec

@@ -15,15 +15,15 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.6.0'
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.16", "< 3.0"
   spec.add_development_dependency "rake", "~> 13.0", ">= 13.0"
   spec.add_development_dependency "rspec", "~> 3.6", ">= 3.6"
   spec.add_development_dependency "webmock", "~> 3.12", "< 4.0"
-  spec.add_runtime_dependency "bitcoinrb", "~> 0.7.0", "= 0.7.0"
-  spec.add_runtime_dependency "http", "~> 4.4.1", ">= 4.4.1"
-  spec.add_runtime_dependency "oj", "~> 3.11", ">= 3.11"
-  spec.add_runtime_dependency "connection_pool", "~> 2.2.5", ">= 2.2"
+  spec.add_runtime_dependency "bitcoinrb", "~> 1.0", "= 1.0.0"
+  spec.add_runtime_dependency "http", ">= 4.4.1", "< 6.0"
+  spec.add_runtime_dependency "oj", "~> 3.0", "< 4.0"
+  spec.add_runtime_dependency "connection_pool", ">= 2.2", "< 3.0"
 end

data/lib/block_io/chainparams/BTC.yml

@@ -2,7 +2,7 @@
 network: "BTC"
 address_version: "00"
 p2sh_version: "05"
-bech32_hrp: 'bc'
+bech32_hrp: "bc"
 privkey_version: "80"
 extended_privkey_version: "0488ade4"
 extended_pubkey_version: "0488b21e"

data/lib/block_io/chainparams/BTCTEST.yml

@@ -2,7 +2,7 @@
 network: "BTCTEST"
 address_version: "6f"
 p2sh_version: "c4"
-bech32_hrp: 'tb'
+bech32_hrp: "tb"
 privkey_version: "ef"
 extended_privkey_version: "04358394"
 extended_pubkey_version: "043587cf"

data/lib/block_io/chainparams/LTC.yml

@@ -1,8 +1,8 @@
 --- !ruby/object:Bitcoin::ChainParams
 network: "LTC"
 address_version: "30"
-p2sh_version: "05"
-bech32_hrp: 'ltc'
+p2sh_version: "50"
+bech32_hrp: "ltc"
 privkey_version: "b0"
 extended_privkey_version: "019d9cfe"
 extended_pubkey_version: "019da462"

data/lib/block_io/chainparams/LTCTEST.yml

@@ -2,7 +2,7 @@
 network: "LTCTEST"
 address_version: "6f"
 p2sh_version: "3a"
-bech32_hrp: 'tltc'
+bech32_hrp: "tltc"
 privkey_version: "ef"
 extended_privkey_version: "0436f6e1"
 extended_pubkey_version: "0436ef7d"

data/lib/block_io/client.rb

@@ -16,7 +16,7 @@ module BlockIo
       raise "Must provide an API Key." unless args.key?(:api_key) and args[:api_key].to_s.size > 0
       
       @api_key = args[:api_key]
-      @encryption_key = Helper.pinToAesKey(args[:pin] || "") if args.key?(:pin)
+      @pin = args[:pin]
       @version = args[:version] || 2
       @hostname = args[:hostname] || "block.io"
       @proxy = args[:proxy] || {}
@@ -131,9 +131,10 @@ module BlockIo
       if !encrypted_key.nil? and !@keys.key?(encrypted_key['public_key']) then
         # decrypt the key with PIN
 
-        raise Exception.new("PIN not set and no keys provided. Cannot sign transaction.") unless @encryption_key or @keys.size > 0
-        
-        key = Helper.extractKey(encrypted_key['encrypted_passphrase'], @encryption_key)
+        raise Exception.new("PIN not set and no keys provided. Cannot sign transaction.") unless !@pin.nil? or @keys.size > 0
+
+        key = Helper.dynamicExtractKey(encrypted_key, @pin)
+
         raise Exception.new("Public key mismatch for requested signer and ourselves. Invalid Secret PIN detected.") unless key.public_key_hex.eql?(encrypted_key["public_key"])
 
         # store this key for later use

data/lib/block_io/extended_bitcoinrb.rb

@@ -21,7 +21,7 @@ module Bitcoin
     end
 
     def self.init(name)
-      i = YAML.load(File.open("#{__dir__}/chainparams/#{name}.yml"))
+      i = YAML.safe_load(File.open("#{__dir__}/chainparams/#{name}.yml"), :permitted_classes => [Bitcoin::ChainParams])
       i.dust_relay_fee ||= Bitcoin::DUST_RELAY_TX_FEE
       i
     end
@@ -46,12 +46,17 @@ module Bitcoin
         r = point_field.mod(r_point.x)
         return nil if r.zero?
 
+        rec = r_point.y & 1
+        
         e = ECDSA.normalize_digest(data, GROUP.bit_length)
         s = point_field.mod(point_field.inverse(nonce) * (e + r * private_key))
 
         # covert to low-s
-        s = GROUP.order - s if s > (GROUP.order / 2)
-
+        if s > (GROUP.order / 2)
+          s = GROUP.order - s
+          rec = r_point.y & 1
+        end
+        
         return nil if s.zero?
 
         signature = ECDSA::Signature.new(r, s).to_der
@@ -60,7 +65,7 @@ module Bitcoin
         #        public_key = Bitcoin::Key.new(priv_key: privkey.bth, :key_type => Bitcoin::Key::TYPES[:compressed]).pubkey # get rid of the key_type warning
         #        raise 'Creation of signature failed.' unless Bitcoin::Secp256k1::Ruby.verify_sig(data, signature, public_key)
         
-        signature
+        [signature, rec]
       end
       
     end

data/lib/block_io/helper.rb

@@ -2,6 +2,18 @@ module BlockIo
 
   class Helper
 
+    LEGACY_DECRYPTION_ALGORITHM = {
+      :pbkdf2_salt => "",
+      :pbkdf2_iterations => 2048,
+      :pbkdf2_hash_function => "SHA256",
+      :pbkdf2_phase1_key_length => 16,
+      :pbkdf2_phase2_key_length => 32,
+      :aes_iv => nil,
+      :aes_cipher => "AES-256-ECB",
+      :aes_auth_tag => nil,
+      :aes_auth_data => nil
+    }
+    
     def self.allSignaturesPresent?(tx, inputs, signatures, input_address_data)
       # returns true if transaction has all signatures present
       
@@ -152,6 +164,44 @@ module BlockIo
       sighash
       
     end
+
+    def self.getDecryptionAlgorithm(user_key_algorithm = nil)
+      # mainly used so existing unit tests do not break
+      
+      algorithm = ({}).merge(LEGACY_DECRYPTION_ALGORITHM)
+
+      if !user_key_algorithm.nil? then
+        algorithm[:pbkdf2_salt] = user_key_algorithm['pbkdf2_salt']
+        algorithm[:pbkdf2_iterations] = user_key_algorithm['pbkdf2_iterations']
+        algorithm[:pbkdf2_hash_function] = user_key_algorithm['pbkdf2_hash_function']
+        algorithm[:pbkdf2_phase1_key_length] = user_key_algorithm['pbkdf2_phase1_key_length']
+        algorithm[:pbkdf2_phase2_key_length] = user_key_algorithm['pbkdf2_phase2_key_length']
+        algorithm[:aes_iv] = user_key_algorithm['aes_iv']
+        algorithm[:aes_cipher] = user_key_algorithm['aes_cipher']
+        algorithm[:aes_auth_tag] = user_key_algorithm['aes_auth_tag']
+        algorithm[:aes_auth_data] = user_key_algorithm['aes_auth_data']
+      end
+
+      algorithm
+      
+    end
+    
+    def self.dynamicExtractKey(user_key, pin)
+      # user_key object contains the encrypted user key and decryption algorithm
+
+      algorithm = self.getDecryptionAlgorithm(user_key['algorithm'])
+
+      aes_key = self.pinToAesKey(pin, algorithm[:pbkdf2_iterations],
+                                 algorithm[:pbkdf2_salt],
+                                 algorithm[:pbkdf2_hash_function],
+                                 algorithm[:pbkdf2_phase1_key_length],
+                                 algorithm[:pbkdf2_phase2_key_length])
+
+      decrypted = self.decrypt(user_key['encrypted_passphrase'], aes_key, algorithm[:aes_iv], algorithm[:aes_cipher], algorithm[:aes_auth_tag], algorithm[:aes_auth_data])
+      
+      Key.from_passphrase(decrypted)
+      
+    end
     
     def self.extractKey(encrypted_data, b64_enc_key)
       # passphrase is in plain text
@@ -169,24 +219,25 @@ module BlockIo
       OpenSSL::Digest::SHA256.digest(value).unpack("H*")[0]
     end
     
-    def self.pinToAesKey(secret_pin, iterations = 2048)
+    def self.pinToAesKey(secret_pin, iterations = 2048, salt = "", hash_function = "SHA256", pbkdf2_phase1_key_length = 16, pbkdf2_phase2_key_length = 32)
       # converts the pincode string to PBKDF2
       # returns a base64 version of PBKDF2 pincode
-      salt = ""
 
+      raise Exception.new("Unknown hash function specified. Are you using current version of this library?") unless hash_function == "SHA256"
+      
       part1 = OpenSSL::PKCS5.pbkdf2_hmac(
         secret_pin,
-        "",
-        1024,
-        128/8,
+        salt,
+        iterations/2,
+        pbkdf2_phase1_key_length,
         OpenSSL::Digest::SHA256.new
       ).unpack("H*")[0]
       
       part2 = OpenSSL::PKCS5.pbkdf2_hmac(
         part1,
-        "",
-        1024,
-        256/8,
+        salt,
+        iterations/2,
+        pbkdf2_phase2_key_length,
         OpenSSL::Digest::SHA256.new
       ) # binary
 
@@ -195,15 +246,19 @@ module BlockIo
     end
 
     # Decrypts a block of data (encrypted_data) given an encryption key
-    def self.decrypt(encrypted_data, b64_enc_key, iv = nil, cipher_type = "AES-256-ECB")
+    def self.decrypt(encrypted_data, b64_enc_key, iv = nil, cipher_type = "AES-256-ECB", auth_tag = nil, auth_data = nil)
+
+      raise Exception.new("Auth tag must be 16 bytes exactly.") unless auth_tag.nil? or auth_tag.size == 32
       
       response = nil
 
       begin
-        aes = OpenSSL::Cipher.new(cipher_type)
+        aes = OpenSSL::Cipher.new(cipher_type.downcase)
         aes.decrypt
         aes.key = b64_enc_key.unpack("m0")[0]
-        aes.iv = iv unless iv.nil?
+        aes.iv = [iv].pack("H*") unless iv.nil?
+        aes.auth_tag = [auth_tag].pack("H*") unless auth_tag.nil?
+        aes.auth_data = [auth_data].pack("H*") unless auth_data.nil?
         response = aes.update(encrypted_data.unpack("m0")[0]) << aes.final
       rescue Exception => e
         # decryption failed, must be an invalid Secret PIN
@@ -214,12 +269,17 @@ module BlockIo
     end
     
     # Encrypts a block of data given an encryption key
-    def self.encrypt(data, b64_enc_key, iv = nil, cipher_type = "AES-256-ECB")
-      aes = OpenSSL::Cipher.new(cipher_type)
+    def self.encrypt(data, b64_enc_key, iv = nil, cipher_type = "AES-256-ECB", auth_data = nil)
+      aes = OpenSSL::Cipher.new(cipher_type.downcase)
       aes.encrypt
       aes.key = b64_enc_key.unpack("m0")[0]
-      aes.iv = iv unless iv.nil?
-      [aes.update(data) << aes.final].pack("m0")
+      aes.iv = [iv].pack("H*") unless iv.nil?
+      aes.auth_data = [auth_data].pack("H*") unless auth_data.nil?
+      result = [aes.update(data) << aes.final].pack("m0")
+      auth_tag = (cipher_type.end_with?("-GCM") ? aes.auth_tag.unpack("H*")[0] : nil)
+
+      {:aes_auth_tag => auth_tag, :aes_cipher_text => result, :aes_iv => iv, :aes_cipher => cipher_type, :aes_auth_data => auth_data}
+      
     end
 
     # courtesy bitcoin-ruby

data/lib/block_io/version.rb

@@ -1,3 +1,3 @@
 module BlockIo
-  VERSION = "3.0.0"
+  VERSION = "3.0.4"
 end

data/spec/helper_spec.rb

@@ -6,24 +6,31 @@ describe "Helper.sha256" do
 end
 
 describe "Helper.pinToAesKey" do
-  it "deadbeef" do
-    expect(BlockIo::Helper.pinToAesKey("deadbeef", false)).to eq([["b87ddac3d84865782a0edbc21b5786d56795dd52bab0fe49270b3726372a83fe"].pack("H*")].pack("m0"))
+  describe "no_salt" do
+    it "deadbeef" do
+      expect(BlockIo::Helper.pinToAesKey("deadbeef")).to eq([["b87ddac3d84865782a0edbc21b5786d56795dd52bab0fe49270b3726372a83fe"].pack("H*")].pack("m0"))
+    end
+  end
+  describe "salt" do
+    it "922445847c173e90667a19d90729e1fb" do
+      expect(BlockIo::Helper.pinToAesKey("deadbeef", 500000, "922445847c173e90667a19d90729e1fb")).to eq([["f206403c6bad20e1c8cb1f3318e17cec5b2da0560ed6c7b26826867452534172"].pack("H*")].pack("m0"))
+    end
   end
 end
 
-describe "Helper.encrypt" do
+describe "Helper.encrypt_aes256ecb" do
   before(:each) do
     @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef")
     @encrypted_data = BlockIo::Helper.encrypt("beadbeef", @encryption_key)
   end
 
   it "beadbeef" do
-    expect(@encrypted_data).to eq("3wIJtPoC8KO6S7x6LtrN0g==")
+    expect(@encrypted_data[:aes_cipher_text]).to eq("3wIJtPoC8KO6S7x6LtrN0g==")
   end
 
 end
 
-describe "Helper.decrypt" do
+describe "Helper.decrypt_aes256ecb" do
   before(:each) do
     @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef")
     @bad_encryption_key = BlockIo::Helper.pinToAesKey(SecureRandom.hex(8))
@@ -31,7 +38,7 @@ describe "Helper.decrypt" do
   end
 
   it "encryption_key" do
-    @decrypted_data = BlockIo::Helper.decrypt(@encrypted_data, @encryption_key)
+    @decrypted_data = BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text], @encryption_key)
     expect(@decrypted_data).to eq("beadbeef")
   end
 
@@ -42,3 +49,106 @@ describe "Helper.decrypt" do
   end
   
 end
+
+describe "Helper.encrypt_aes256cbc" do
+  before(:each) do
+    @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef", 500000, "922445847c173e90667a19d90729e1fb")
+    @encrypted_data = BlockIo::Helper.encrypt("beadbeef", @encryption_key, "11bc22166c8cf8560e5fa7e5c622bb0f", "AES-256-CBC")
+  end
+
+  it "beadbeef" do
+    expect(@encrypted_data[:aes_cipher_text]).to eq("LExu1rUAtIBOekslc328Lw==")
+  end
+
+end
+
+describe "Helper.decrypt_aes256cbc" do
+  before(:each) do
+    @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef", 500000, "922445847c173e90667a19d90729e1fb")
+    @bad_encryption_key = BlockIo::Helper.pinToAesKey(SecureRandom.hex(8))
+    @encrypted_data = BlockIo::Helper.encrypt("beadbeef", @encryption_key, "11bc22166c8cf8560e5fa7e5c622bb0f", "AES-256-CBC")
+  end
+
+  it "encryption_key" do
+    @decrypted_data = BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text], @encryption_key, @encrypted_data[:aes_iv], @encrypted_data[:aes_cipher])
+    expect(@decrypted_data).to eq("beadbeef")
+  end
+
+  it "bad_encryption_key" do
+    expect{
+      BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text], @bad_encryption_key, @encrypted_data[:aes_iv], @encrypted_data[:aes_cipher])
+    }.to raise_error(Exception, "Invalid Secret PIN provided.")
+  end
+  
+end
+
+describe "Helper.decrypt_aes256gcm" do
+  before(:each) do
+    @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef", 500000, "922445847c173e90667a19d90729e1fb")
+    @bad_encryption_key = BlockIo::Helper.pinToAesKey(SecureRandom.hex(8))
+    @encrypted_data = BlockIo::Helper.encrypt("beadbeef", @encryption_key, "a57414b88b67f977829cbdca", "AES-256-GCM", "")
+  end
+
+  it "encryption_key" do
+    @decrypted_data = BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text],
+                                              @encryption_key, @encrypted_data[:aes_iv],
+                                              @encrypted_data[:aes_cipher],
+                                              @encrypted_data[:aes_auth_tag],
+                                              @encrypted_data[:aes_auth_data])
+    expect(@decrypted_data).to eq("beadbeef")
+  end
+
+  it "encryption_key_bad_auth_tag" do
+    expect{
+      BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text],
+                              @encryption_key, @encrypted_data[:aes_iv],
+                              @encrypted_data[:aes_cipher],
+                              @encrypted_data[:aes_auth_tag][0..30],
+                              @encrypted_data[:aes_auth_data])
+    }.to raise_error(Exception, "Auth tag must be 16 bytes exactly.")
+  end
+
+  it "bad_encryption_key" do
+    expect{
+      BlockIo::Helper.decrypt(@encrypted_data[:aes_cipher_text], @bad_encryption_key, @encrypted_data[:aes_iv], @encrypted_data[:aes_cipher], @encrypted_data[:aes_auth_tag],
+                              @encrypted_data[:aes_auth_data])
+    }.to raise_error(Exception, "Invalid Secret PIN provided.")
+  end
+  
+end
+
+describe "Helper.encrypt_aes256gcm" do
+  before(:each) do
+    @encryption_key = BlockIo::Helper.pinToAesKey("deadbeef", 500000, "922445847c173e90667a19d90729e1fb")
+    @encrypted_data = BlockIo::Helper.encrypt("beadbeef", @encryption_key, "a57414b88b67f977829cbdca", "AES-256-GCM", "")
+  end
+
+  it "beadbeef" do
+    expect(@encrypted_data[:aes_cipher_text]).to eq("ELV56Z57KoA=")
+    expect(@encrypted_data[:aes_auth_tag]).to eq("adeb7dfe53027bdda5824dc524d5e55a")
+  end
+
+end
+
+describe "Helper.dynamicExtractKey" do
+
+  before(:each) do
+    @aes256cbc_user_key = Oj.safe_load('{"encrypted_passphrase":"LExu1rUAtIBOekslc328Lw==","public_key":"02f87f787bffb30396984cb6b3a9d6830f32d5b656b3e39b0abe4f3b3c35d99323","algorithm":{"pbkdf2_salt":"922445847c173e90667a19d90729e1fb","pbkdf2_iterations":500000,"pbkdf2_hash_function":"SHA256","pbkdf2_phase1_key_length":16,"pbkdf2_phase2_key_length":32,"aes_iv":"11bc22166c8cf8560e5fa7e5c622bb0f","aes_cipher":"AES-256-CBC","aes_auth_tag":null,"aes_auth_data":null}}')
+    @aes256gcm_user_key = Oj.safe_load('{"encrypted_passphrase":"ELV56Z57KoA=","public_key":"02f87f787bffb30396984cb6b3a9d6830f32d5b656b3e39b0abe4f3b3c35d99323","algorithm":{"pbkdf2_salt":"922445847c173e90667a19d90729e1fb","pbkdf2_iterations":500000,"pbkdf2_hash_function":"SHA256","pbkdf2_phase1_key_length":16,"pbkdf2_phase2_key_length":32,"aes_iv":"a57414b88b67f977829cbdca","aes_cipher":"AES-256-GCM","aes_auth_tag":"adeb7dfe53027bdda5824dc524d5e55a","aes_auth_data":""}}')
+    @aes256ecb_user_key = Oj.safe_load('{"encrypted_passphrase":"3wIJtPoC8KO6S7x6LtrN0g==","public_key":"02f87f787bffb30396984cb6b3a9d6830f32d5b656b3e39b0abe4f3b3c35d99323","algorithm":{"pbkdf2_salt":"","pbkdf2_iterations":2048,"pbkdf2_hash_function":"SHA256","pbkdf2_phase1_key_length":16,"pbkdf2_phase2_key_length":32,"aes_iv":null,"aes_cipher":"AES-256-ECB","aes_auth_tag":null,"aes_auth_data":null}}')
+    @pin = "deadbeef"
+  end
+
+  it "aes256ecb_success" do
+    expect(BlockIo::Helper.dynamicExtractKey(@aes256ecb_user_key, @pin).public_key_hex).to eq(BlockIo::Key.from_passphrase("beadbeef").public_key_hex)
+  end
+  
+  it "aes256cbc_success" do
+    expect(BlockIo::Helper.dynamicExtractKey(@aes256cbc_user_key, @pin).public_key_hex).to eq(BlockIo::Key.from_passphrase("beadbeef").public_key_hex)
+  end
+  
+  it "aes256gcm_success" do
+    expect(BlockIo::Helper.dynamicExtractKey(@aes256gcm_user_key, @pin).public_key_hex).to eq(BlockIo::Key.from_passphrase("beadbeef").public_key_hex)
+  end
+  
+end

data/spec/larger_transaction_spec.rb

@@ -347,5 +347,25 @@ describe "Client.create_and_sign_transaction" do
     
   end
   
-end
+  context "witness_v1_output" do
+
+    before(:each) do
+
+      @blockio = BlockIo::Client.new(:api_key => @api_key, :pin => @insecure_pin_valid)
+      
+    end
+
+    it "succeeds_on_witness_v1_output" do
+    
+      request = Oj.safe_load(File.open("spec/test-cases/json/prepare_transaction_response_witness_v1_output.json").read)
+      expected_response = Oj.safe_load(File.open("spec/test-cases/json/create_and_sign_transaction_response_witness_v1_output.json").read)
+      
+      actual_response = @blockio.create_and_sign_transaction(request)
+      
+      expect(actual_response).to eq(expected_response)
+      
+    end
+
+  end
   
+end

data/spec/test-cases/json/create_and_sign_transaction_response_witness_v1_output.json

@@ -0,0 +1,11 @@
+{
+  "tx_type": "basic",
+  "tx_hex": "0100000001784ecc9b864ff9b8a97eaacd138fdf193a5d889735702a4f726d2f87631de45f0100000000ffffffff03204e000000000000225120000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433204e000000000000220020000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e864339f4c00000000000017a914026b9608a26f40f74644cc60622d1067c3696ac98700000000",
+  "signatures": [
+    {
+      "input_index": 0,
+      "public_key": "02d2cbf77287c1443759abdd35f239e7da2f52c992258653bc8dd577ae63c78628",
+      "signature": "304402206d093e2a14e80e01f3c8eefc76d651d01c3dedbd1f0dabf78ace5b352ca660b602202aac312b5b7f0b8c79ad22e75d2523ee39d9c62a35be4db102b5c8f3f296f662"
+    }
+  ]
+}

data/spec/test-cases/json/prepare_transaction_response_witness_v1_output.json

@@ -0,0 +1,64 @@
+{
+  "status": "success",
+  "data": {
+    "network": "BTCTEST",
+    "tx_type": "basic",
+    "inputs": [
+      {
+        "input_index": 0,
+        "previous_txid": "5fe41d63872f6d724f2a703597885d3a19df8f13cdaa7ea9b8f94f869bcc4e78",
+        "previous_output_index": 1,
+        "input_value": "0.00060915",
+        "spending_address": "2MsU2DsvP7okZ2sZGZUvH3rZZuQt4pf75Am"
+      }
+    ],
+    "outputs": [
+      {
+        "output_index": 0,
+        "output_category": "user-specified",
+        "output_value": "0.00020000",
+        "receiving_address": "tb1pqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesf3hn0c"
+      },
+      {
+        "output_index": 1,
+        "output_category": "user-specified",
+        "output_value": "0.00020000",
+        "receiving_address": "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy"
+      },
+      {
+        "output_index": 2,
+        "output_category": "change",
+        "output_value": "0.00019615",
+        "receiving_address": "2MsU2DsvP7okZ2sZGZUvH3rZZuQt4pf75Am"
+      }
+    ],
+    "input_address_data": [
+      {
+        "required_signatures": 2,
+        "public_keys": [
+          "021916c1ea9215990263e2862bcecc85397d199a4411c863983176ee3d44e27f7f",
+          "02d2cbf77287c1443759abdd35f239e7da2f52c992258653bc8dd577ae63c78628"
+        ],
+        "address": "2MsU2DsvP7okZ2sZGZUvH3rZZuQt4pf75Am",
+        "address_type": "P2WSH-over-P2SH"
+      }
+    ],
+    "user_key": {
+      "public_key": "02d2cbf77287c1443759abdd35f239e7da2f52c992258653bc8dd577ae63c78628",
+      "encrypted_passphrase": "jlPuw8CJGTWTb+O4I/IKGWGDdF9G8/MX5meX+IfuLfbb7rRABoSUGYSU2BXxxRqR95K64u8gH46h3zr/NKsj8OFv5gj4JwClM7RN03fvb+3CyXgwy4eYSSpFE6vVsdyoxJ8rshUbpf8tvCerUKC0LhE9d61q7mWYoVAik61WRwc=",
+      "algorithm": {
+        "pbkdf2_salt": "7ccf40ce398f0fb475fe91043f7dce57",
+        "pbkdf2_iterations": 102400,
+        "pbkdf2_hash_function": "SHA256",
+        "pbkdf2_phase1_key_length": 16,
+        "pbkdf2_phase2_key_length": 32,
+        "aes_iv": "7c69a5e81e53ba05213b35bb",
+        "aes_cipher": "AES-256-GCM",
+        "aes_auth_tag": "d19b5e48e068f3b1179a4724b3862650",
+        "aes_auth_data": ""
+      }
+    },
+    "estimated_tx_size": 260,
+    "expected_unsigned_txid": "e1925681c6986df2617d41c90b2bbc32cd01f7df0323ca52417b4a8677b2a160"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: block_io
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.4
 platform: ruby
 authors:
 - Atif Nazir
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,80 +96,80 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.4.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.4.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
-    - - ">="
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.5
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.5
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: This Ruby Gem is the official reference client for the Block.io payments
   API. To use this, you will need the Dogecoin, Bitcoin, or Litecoin API key(s) from
   Block.io. Go ahead, sign up :)
@@ -251,6 +251,7 @@ files:
 - spec/test-cases/json/create_and_sign_transaction_response_sweep_p2wpkh.json
 - spec/test-cases/json/create_and_sign_transaction_response_sweep_p2wpkh_over_p2sh.json
 - spec/test-cases/json/create_and_sign_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json
+- spec/test-cases/json/create_and_sign_transaction_response_witness_v1_output.json
 - spec/test-cases/json/get_balance_response.json
 - spec/test-cases/json/prepare_dtrust_transaction_response_P2SH_3of5_195inputs.json
 - spec/test-cases/json/prepare_dtrust_transaction_response_P2SH_4of5_195inputs.json
@@ -284,6 +285,7 @@ files:
 - spec/test-cases/json/prepare_transaction_response_P2WSH-over-P2SH_1of2_253inputs.json
 - spec/test-cases/json/prepare_transaction_response_P2WSH-over-P2SH_1of2_762inputs.json
 - spec/test-cases/json/prepare_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json
+- spec/test-cases/json/prepare_transaction_response_witness_v1_output.json
 - spec/test-cases/json/summarize_prepared_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json
 homepage: https://block.io/api/simple/ruby
 licenses:
@@ -297,14 +299,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: An easy to use Dogecoin, Bitcoin, Litecoin wallet API by Block.io. Sign up
@@ -356,6 +358,7 @@ test_files:
 - spec/test-cases/json/create_and_sign_transaction_response_sweep_p2wpkh.json
 - spec/test-cases/json/create_and_sign_transaction_response_sweep_p2wpkh_over_p2sh.json
 - spec/test-cases/json/create_and_sign_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json
+- spec/test-cases/json/create_and_sign_transaction_response_witness_v1_output.json
 - spec/test-cases/json/get_balance_response.json
 - spec/test-cases/json/prepare_dtrust_transaction_response_P2SH_3of5_195inputs.json
 - spec/test-cases/json/prepare_dtrust_transaction_response_P2SH_4of5_195inputs.json
@@ -389,4 +392,5 @@ test_files:
 - spec/test-cases/json/prepare_transaction_response_P2WSH-over-P2SH_1of2_253inputs.json
 - spec/test-cases/json/prepare_transaction_response_P2WSH-over-P2SH_1of2_762inputs.json
 - spec/test-cases/json/prepare_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json
+- spec/test-cases/json/prepare_transaction_response_witness_v1_output.json
 - spec/test-cases/json/summarize_prepared_transaction_response_with_blockio_fee_and_expected_unsigned_txid.json