Merge pull request #1 from raggi/master

Update from Bitcoin-ruby repo

Author: jgmontoya

.github/workflows/ruby.yml

@@ -0,0 +1,42 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+
+      matrix:
+        os: [ubuntu-latest, macos-latest, ubuntu-18.04, macos-10.15]
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Brew automake
+      run: brew install automake
+      if: startsWith(matrix.os, 'macOS')
+    - name: Build secp256k1
+      run: bundle exec rake build_libsecp256k1
+    - name: Run tests
+      run: bundle exec rake

.gitignore

@@ -1,3 +1,4 @@
+secp256k1.so
 *.gem
 .bundle
 pkg/*

Gemfile

@@ -3,15 +3,16 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem 'rake', '~> 12.3.1'
-  gem 'bacon', '~> 1.2.0'
-  gem 'rspec', '~> 3.7.0'
-  gem 'rubocop', '~> 0.58.2'
-  gem 'simplecov', '~> 0.16.1'
-  gem 'minitest', '~> 5.11.3'
+  gem 'rake'
+  gem 'bacon'
+  gem 'rspec'
+  gem 'rubocop'
+  gem 'simplecov'
+  gem 'minitest'
+  gem 'scanf'
 end
 
 group :development do
-  gem 'pry', '~> 0.11.3'
-  gem 'pry-byebug', '~> 3.6.0'
+  gem 'pry'
+  gem 'pry-byebug'
 end

Gemfile.lock

@@ -9,77 +9,82 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     bacon (1.2.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.15.1)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
     rainbow (3.0.0)
-    rake (12.3.1)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    rubocop (0.58.2)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.15.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    scrypt (3.0.5)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    scanf (1.0.0)
+    scrypt (3.0.7)
       ffi-compiler (>= 1.0, < 2.0)
-    simplecov (0.16.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    unicode-display_width (1.4.0)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bacon (~> 1.2.0)
+  bacon
   bitcoin-ruby!
-  minitest (~> 5.11.3)
-  pry (~> 0.11.3)
-  pry-byebug (~> 3.6.0)
-  rake (~> 12.3.1)
-  rspec (~> 3.7.0)
-  rubocop (~> 0.58.2)
-  simplecov (~> 0.16.1)
+  minitest
+  pry
+  pry-byebug
+  rake
+  rspec
+  rubocop
+  scanf
+  simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.2.19

Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 # libsecp256k1 repository URL
-LIBSECP256K1_REPO = 'https://github.com/bitcoin-core/secp256k1/'.freeze
+LIBSECP256K1_REPO = 'https://github.com/bitcoin-core/secp256k1.git'.freeze
 # Folder into which libsecp256k1 repository is cloned
 LIBSECP256K1_PATH = 'secp256k1'.freeze
 
@@ -34,8 +34,8 @@ end
 
 desc 'Compiles the libsecp256k1 library'
 task :build_libsecp256k1, [:force] do |_, args|
-  # Commit hash for libsecp256k1 from May 31, 2018.
-  COMMIT_HASH = '1e6f1f5ad5e7f1e3ef79313ec02023902bf8175c'.freeze
+  # Commit hash for libsecp256k1 from March 31, 2021.
+  COMMIT_HASH = '50f33677122fed79dedb05e8046b2fea93496201'.freeze
 
   force = args[:force]
 

lib/bitcoin.rb

@@ -325,7 +325,7 @@ def litecoin_hash(hex)
       bytes = [hex].pack("H*").reverse
       begin
         require "scrypt" unless defined?(::SCrypt)
-        hash = SCrypt::Engine.__sc_crypt(bytes, bytes, 1024, 1, 1, 32)
+        hash = SCrypt::Engine.scrypt(bytes, bytes, 1024, 1, 1, 32)
       rescue LoadError
         hash = Litecoin::Scrypt.scrypt_1024_1_1_256_sp(bytes)
       end

lib/bitcoin/ffi/openssl.rb

@@ -1,30 +1,21 @@
 # encoding: ascii-8bit
 
+require 'openssl'
 require 'ffi'
 
 module Bitcoin
   # autoload when you need to re-generate a public_key from only its private_key.
   # ported from: https://github.com/sipa/bitcoin/blob/2d40fe4da9ea82af4b652b691a4185431d6e47a8/key.h
   module OpenSSL_EC # rubocop:disable Naming/ClassAndModuleCamelCase
     extend FFI::Library
-    if FFI::Platform.windows?
-      ffi_lib 'libeay32', 'ssleay32'
-    else
-      ffi_lib [
-        'libssl.so.1.1.0', 'libssl.so.1.1',
-        'libssl.so.1.0.0', 'libssl.so.10',
-        'ssl'
-      ]
-    end
+
+    # Use the library loaded by the extension require above.
+    ffi_lib FFI::CURRENT_PROCESS
 
     NID_secp256k1 = 714 # rubocop:disable Naming/ConstantName
     POINT_CONVERSION_COMPRESSED = 2
     POINT_CONVERSION_UNCOMPRESSED = 4
 
-    # OpenSSL 1.1.0 version as a numerical version value as defined in:
-    # https://www.openssl.org/docs/man1.1.0/man3/OpenSSL_version.html
-    VERSION_1_1_0_NUM = 0x10100000
-
     # OpenSSL 1.1.0 engine constants, taken from:
     # https://github.com/openssl/openssl/blob/2be8c56a39b0ec2ec5af6ceaf729df154d784a43/include/openssl/crypto.h
     OPENSSL_INIT_ENGINE_RDRAND = 0x00000200
@@ -52,21 +43,10 @@ module OpenSSL_EC # rubocop:disable Naming/ClassAndModuleCamelCase
       attach_function :SSLeay, [], :long
     end
 
-    # Returns the version of SSL present.
-    #
-    # @return [Integer] version number as an integer.
-    def self.version
-      if self.respond_to?(:OpenSSL_version_num)
-        OpenSSL_version_num()
-      else
-        SSLeay()
-      end
-    end
-
-    if version >= VERSION_1_1_0_NUM
+    begin
       # Initialization procedure for the library was changed in OpenSSL 1.1.0
       attach_function :OPENSSL_init_ssl, [:uint64, :pointer], :int
-    else
+    rescue FFI::NotFoundError
       attach_function :SSL_library_init, [], :int
       attach_function :ERR_load_crypto_strings, [], :void
       attach_function :SSL_load_error_strings, [], :void
@@ -391,7 +371,7 @@ def self.init_ffi_ssl
       @ssl_loaded ||= false
       return if @ssl_loaded
 
-      if version >= VERSION_1_1_0_NUM
+      if self.method_defined?(:OPENSSL_init_ssl)
         OPENSSL_init_ssl(
           OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_ENGINE_ALL_BUILTIN,
           nil

lib/bitcoin/key.rb

@@ -183,7 +183,7 @@ def to_bip38(passphrase)
       addresshash = Digest::SHA256.digest( Digest::SHA256.digest( self.addr ) )[0...4]
 
       require 'scrypt' unless defined?(::SCrypt::Engine)
-      buf = SCrypt::Engine.__sc_crypt(passphrase, addresshash, 16384, 8, 8, 64)
+      buf = SCrypt::Engine.scrypt(passphrase, addresshash, 16384, 8, 8, 64)
       derivedhalf1, derivedhalf2 = buf[0...32], buf[32..-1]
 
       aes = proc{|k,a,b|
@@ -212,7 +212,7 @@ def self.from_bip38(encrypted_privkey, passphrase)
       raise "Invalid checksum"  unless Digest::SHA256.digest(Digest::SHA256.digest(version + flagbyte + addresshash + encryptedhalf1 + encryptedhalf2))[0...4] == checksum
 
       require 'scrypt' unless defined?(::SCrypt::Engine)
-      buf = SCrypt::Engine.__sc_crypt(passphrase, addresshash, 16384, 8, 8, 64)
+      buf = SCrypt::Engine.scrypt(passphrase, addresshash, 16384, 8, 8, 64)
       derivedhalf1, derivedhalf2 = buf[0...32], buf[32..-1]
 
       aes = proc{|k,a|

lib/bitcoin/litecoin.rb

@@ -68,7 +68,7 @@ def xor_salsa8(a, b, a_offset, b_offset)
 
   begin
     require "scrypt"
-    hash = SCrypt::Engine.__sc_crypt(secret_bytes, secret_bytes, 1024, 1, 1, 32)
+    hash = SCrypt::Engine.scrypt(secret_bytes, secret_bytes, 1024, 1, 1, 32)
     p hash.reverse.unpack("H*")[0] == "00000000002bef4107f882f6115e0b01f348d21195dacd3582aa2dabd7985806"
   rescue LoadError
     puts "scrypt gem not found, using native scrypt"
@@ -77,7 +77,7 @@ def xor_salsa8(a, b, a_offset, b_offset)
 
   require 'benchmark'
   Benchmark.bmbm{|x|
-    x.report("v1"){ SCrypt::Engine.__sc_crypt(secret_bytes, secret_bytes, 1024, 1, 1, 32).reverse.unpack("H*") rescue nil }
+    x.report("v1"){ SCrypt::Engine.scrypt(secret_bytes, secret_bytes, 1024, 1, 1, 32).reverse.unpack("H*") rescue nil }
     x.report("v2"){ Litecoin::Scrypt.scrypt_1024_1_1_256_sp(secret_bytes).reverse.unpack("H*")[0] }
   }
 end