zilliqa 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f43029e1217410a942e08d277f3bd3fdea3caa3c31e554f7680fa070b4508d
-  data.tar.gz: aec1227bede462077054e4ac53cb06db7228c4e838c2e10f73989fe025f77c84
+  metadata.gz: b5b31a541e002ddbb8e7d6f6565737886e4f7b4cf9c72aef65398a73a4fd6256
+  data.tar.gz: b582db1c358c34dc3cf99c2d224cf1d21fd32c096a0a31af2984de742a9f992b
 SHA512:
-  metadata.gz: ecc5e70f76b9be1d1d7aebd610459e6d9652978e5dc43372fdd2df48beddadc1188c9ffb115f1859c272ba87a061ccd6610cccc0f4d2c8b615a7f9ab2ce3ed09
-  data.tar.gz: 36eb9db2fa4d64d9e1ec5e2d6914e8eed6e02bc8e9623356fe207e1748c36c3d580e14969bc587df72bc9881e2cd8a5f31024e5357afd59547cce55927644542
+  metadata.gz: 56b59fb6910ef59f005f49baf2d1d14f523f8615408c874b87bb5d5a35dac9b6adf14279e45b7de58c3cfde8a14d96624f82e91cfa40f45e0460c66e133574dc
+  data.tar.gz: d58305528951a8435575ec6a6ebbb180eb849d2b6acfa87132fb6aec26082c1f7be35f8b655932c0387539fdfc537fbeb4c0987d548b354110c114ee27c1ffa4

data/.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  pull_request:
+    types: [opened, labeled, reopened, synchronize]
+  push:
+    branches: [master]
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: test
+    steps:
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.3
+          rubygems: latest
+          bundler-cache: true
+      - uses: actions/checkout@v3
+      - run: sudo apt-get update -y && sudo apt-get install -y libsecp256k1-dev
+      - run: bundle install
+      - run: bundle exec rake test

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    zilliqa (0.1.4)
+    zilliqa (0.1.6)
       bitcoin-ruby
+      bundler (>= 2.2.33)
       google-protobuf
       jsonrpc-client
       pbkdf2-ruby
@@ -16,22 +17,31 @@ GEM
       eventmachine
       ffi
       scrypt
+    byebug (11.1.3)
+    coderay (1.1.3)
     eventmachine (1.2.7)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    google-protobuf (3.21.2)
-    jsonrpc-client (0.1.3)
+    google-protobuf (3.24.0)
+    jsonrpc-client (0.1.4)
       faraday
       multi_json (>= 1.1.0)
-    minitest (5.16.1)
+    method_source (1.0.0)
+    minitest (5.15.0)
     multi_json (1.15.0)
     pbkdf2-ruby (0.2.1)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
     rake (13.0.6)
     ruby-bitcoin-secp256k1 (0.5.2)
       ffi (>= 1.9.25)
@@ -43,10 +53,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
-  minitest (~> 5.0)
+  minitest (= 5.15)
+  pry-byebug (~> 3.10)
   rake (~> 13.0)
   zilliqa!
 
 BUNDLED WITH
-   1.17.2
+   2.2.33

data/lib/zilliqa/util/difficulty.rb

@@ -0,0 +1,46 @@
+module Zilliqa
+  module Util
+    class Difficulty
+      ZERO_MASK = [0xFF, 0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01]
+      DIVIDEND = 'ffff000000000000000000000000000000000000000000000000000000000000'
+
+      def self.to_boundary_divided(difficulty)
+        n_divided = 8
+        n_divided_start = 32
+
+        return to_boundary(difficulty) if difficulty < n_divided_start
+
+        n_level = (difficulty - n_divided_start) / n_divided
+        m_sub_level = (difficulty - n_divided_start) % n_divided
+        difficulty_level = n_divided_start + n_level
+
+        int_boundary = to_boundary(difficulty_level)
+
+        boundary_change_step = (int_boundary >> 1).div(n_divided)
+
+        int_boundary - (boundary_change_step * m_sub_level)
+      end
+
+      def self.to_boundary(difficulty)
+        boundary = ['ff'*32].pack('H*').bytes
+
+        n_bytes_to_zero = difficulty / 8
+        n_bits_to_zero = difficulty % 8
+
+        (0..n_bytes_to_zero).each { |i| boundary[i] = 0 }
+
+        boundary[n_bytes_to_zero] = ZERO_MASK[n_bits_to_zero]
+
+        boundary.pack('C*').unpack('H*').first.to_i(16)
+      end
+
+
+      def self.to_hashpower_divided(difficulty)
+        boundary = to_boundary_divided(difficulty)
+
+        int_dividend = DIVIDEND.to_i(16)
+        int_dividend / boundary
+      end
+    end
+  end
+end

data/lib/zilliqa/util/validator.rb

@@ -22,16 +22,6 @@ module Zilliqa
         m != nil
       end
 
-      # checksum_address?
-      #
-      # takes hex-encoded string and returns boolean if address is checksumed
-      #
-      # @param {string} address
-      # @returns {boolean}
-      def self.checksum_address?(address)
-        self.address?(address) && Zilliqa::Account::Wallet::to_checksum_address(address) == address
-      end
-
       def self.bech32?(address)
         m = /^zil1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]{38}/ =~ address
         m != nil

data/lib/zilliqa/version.rb

@@ -1,3 +1,3 @@
 module Zilliqa
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/zilliqa.rb

@@ -14,6 +14,7 @@ require 'zilliqa/util/validator'
 require 'zilliqa/util/util'
 require 'zilliqa/util/unit'
 require 'zilliqa/util/bech32'
+require 'zilliqa/util/difficulty'
 
 
 module Zilliqa

data/zilliqa.gemspec

@@ -36,7 +36,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", ">= 2.2.33"
   spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  # FIXME starting with 5.16 minitest supports kwargs in mocks,
+  # and that breaks our tests, e.g in contract/contract_factory_test.rb:186,
+  # where we expect hash as mock argument, but minitest treat this hash as kwargs
+  spec.add_development_dependency "minitest", "5.15"
+  spec.add_development_dependency "pry-byebug", "~> 3.10"
   spec.add_dependency "ruby-bitcoin-secp256k1"
   spec.add_dependency "scrypt"
   spec.add_dependency "pbkdf2-ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zilliqa
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - snuff
@@ -41,18 +41,32 @@ dependencies:
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '5.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '5.15'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: ruby-bitcoin-secp256k1
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +159,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -169,6 +183,7 @@ files:
 - lib/zilliqa/proto/message.proto
 - lib/zilliqa/proto/message_pb.rb
 - lib/zilliqa/util/bech32.rb
+- lib/zilliqa/util/difficulty.rb
 - lib/zilliqa/util/unit.rb
 - lib/zilliqa/util/util.rb
 - lib/zilliqa/util/validator.rb

data/.circleci/config.yml

@@ -1,30 +0,0 @@
-version: 2.1
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.6.1
-        environment:
-          RAILS_ENV: test
-    steps:
-      - checkout
-      - run:
-          name: Which bundler?
-          command: bundle -v
-
-      - restore_cache:
-          keys:
-            - zilliqa{{ checksum "Gemfile.lock" }}
-            - zilliqa
-
-      - run:
-          name: Install libsecp256k1-dev dependency
-          command: sudo apt-get update -y && sudo apt-get install -y libsecp256k1-dev
-
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - save_cache:
-          key: zilliqa{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
-      - run: bundle exec rake test