zilliqa 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '018bc423c0476dc0362faa4d0df9b4a7f37c4aad76f383bd863fa4100b016b61'
-  data.tar.gz: d1dfcff519bbd42412f4b14796d70151e09583a63ff4485c16007c0387d6422e
+  metadata.gz: adc16f87724dfe4358cacb61ee512a23099959133a93120d9a5e58036789d243
+  data.tar.gz: c4e0874ef2aee44823575c1a28f83a860e53a33a1e23e24d7a6ecc91673a738c
 SHA512:
-  metadata.gz: 11617320444c963cdf226d50c0abe47ed6a6e67e8f99a9300618999975ad1d58656b75d4d2d3544cd02e459290bf486968ae67d8b92cab5a81cba238614cdbed
-  data.tar.gz: 499f210816b57de86c731100cab5c0ed8b2d89e64339938066527e09818e4789267a4a1a3c32a71817c86d49850c4b87eafaf4b599d6b2d9f4158df7f18a6ca5
+  metadata.gz: 6d80397b1910a9597244ec9ecade7b34529093cc4fa7aabbde67b5c4b55146a69987f49ba95a121ad4ed8aae9c4e9d28cb1bd181df8868925baa7d4a97cccc3f
+  data.tar.gz: b6c523aa0692bc9a36548dabb370028d80f66ef6e114444590bd1b67e841e307e3cb1fe28299947d546345fbbf4fc82fa394295956df3f224af30384a6a03ece

data/Gemfile.lock

@@ -1,40 +1,42 @@
 PATH
   remote: .
   specs:
-    zilliqa (0.1.0)
+    zilliqa (0.1.4)
       bitcoin-ruby
-      bitcoin-secp256k1
       google-protobuf
       jsonrpc-client
       pbkdf2-ruby
+      ruby-bitcoin-secp256k1
       scrypt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    bitcoin-ruby (0.0.19)
+    bitcoin-ruby (0.0.20)
       eventmachine
       ffi
       scrypt
-    bitcoin-secp256k1 (0.5.1)
-      ffi (>= 1.9.25)
     eventmachine (1.2.7)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    google-protobuf (3.7.1)
+    google-protobuf (3.21.2)
     jsonrpc-client (0.1.3)
       faraday
       multi_json (>= 1.1.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.1.1)
+    minitest (5.16.1)
+    multi_json (1.15.0)
     pbkdf2-ruby (0.2.1)
-    rake (13.0.1)
-    scrypt (3.0.6)
+    rake (13.0.6)
+    ruby-bitcoin-secp256k1 (0.5.2)
+      ffi (>= 1.9.25)
+    ruby2_keywords (0.0.5)
+    scrypt (3.0.7)
       ffi-compiler (>= 1.0, < 2.0)
 
 PLATFORMS

data/lib/zilliqa/account/transaction.rb

@@ -57,7 +57,7 @@ module Zilliqa
         protocol = Zilliqa::Proto::ProtoTransactionCoreInfo.new
         protocol.version = version.to_i
         protocol.nonce = nonce.to_i
-        protocol.toaddr = Util.decode_hex(Wallet.to_checksum_address(to_addr).downcase.sub('0x', ''))
+        protocol.toaddr = Util.decode_hex(Util::Bech32.to_checksum_address(to_addr).downcase.sub('0x', ''))
         protocol.senderpubkey = Zilliqa::Proto::ByteArray.new(data: Util.decode_hex(sender_pub_key))
 
         raise StandardLengthError if amount.to_i > MAX_BIGINT_BYTES
@@ -75,7 +75,7 @@ module Zilliqa
         {
           version: version.to_i,
           nonce: nonce.to_i,
-          toAddr: Wallet.to_checksum_address(to_addr),
+          toAddr: Util::Bech32.to_checksum_address(to_addr),
           amount: amount.to_s,
           pubKey: sender_pub_key,
           gasPrice: gas_price.to_s,

data/lib/zilliqa/account/wallet.rb

@@ -3,7 +3,6 @@ require 'digest'
 module Zilliqa
   module Account
     class Wallet
-      MAINNET = 65_537
 
       # Takes an array of Account objects and instantiates a Wallet instance.
       def initialize(provider = nil, accounts = {})
@@ -70,30 +69,6 @@ module Zilliqa
         @default_account = @accounts[address]
       end
 
-      # to_checksum_address
-      #
-      # takes hex-encoded string and returns the corresponding address
-      #
-      # @param {string} address
-      # @returns {string}
-      def self.to_checksum_address(address)
-        return Zilliqa::Util::Bech32.from_bech32(address) if Zilliqa::Util::Validator.bech32?(address)
-        address = address.downcase.gsub('0x', '')
-
-        s1 = Digest::SHA256.hexdigest(Util.decode_hex(address))
-        v = s1.to_i(base=16)
-
-        ret = ['0x']
-        address.each_char.each_with_index do |c, idx|
-          if '1234567890'.include?(c)
-            ret << c
-          else
-            ret << ((v & (2 ** (255 - 6 * idx))) < 1 ? c.downcase : c.upcase)
-          end
-        end
-
-        ret.join
-      end
 
       def transfer(to_addr, amount)
         gas_price = Integer(@provider.GetMinimumGasPrice)
@@ -127,7 +102,7 @@ module Zilliqa
 
       def sign_with(tx, address)
         account = @accounts[address]
-        address = @provider.testnet? ? Zilliqa::Util::Bech32.from_bech32(account.address) : account.address
+        address = account.address
 
         raise 'The selected account does not exist on this Wallet instance.' unless account
 

data/lib/zilliqa/crypto/key_tool.rb

@@ -1,10 +1,10 @@
-require 'secp256k1'
+require 'bitcoin_secp256k1'
 require 'digest'
 
 module Zilliqa
   module Crypto
     class KeyTool
-      include Secp256k1
+      include BitcoinSecp256k1
       def initialize(private_key)
         is_raw = private_key.length == 32
 

data/lib/zilliqa/crypto/schnorr.rb

@@ -1,11 +1,11 @@
-require 'secp256k1'
+require 'bitcoin_secp256k1'
 require 'digest'
 require 'openssl'
 
 module Zilliqa
   module Crypto
     class Schnorr
-      include Secp256k1
+      include BitcoinSecp256k1
 
       N = OpenSSL::BN.new('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16)
       G = OpenSSL::BN.new('79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798', 16)

data/lib/zilliqa/jsonrpc/provider.rb

@@ -28,10 +28,6 @@ module Zilliqa
       def method_missing(sym, *args)
         @client.invoke(sym.to_s, args)
       end
-
-      def testnet?
-        @endpoint && !@endpoint.match('dev').nil?
-      end
     end
   end
 end

data/lib/zilliqa/util/bech32.rb

@@ -21,7 +21,7 @@ module Zilliqa
 
         ret = Bitcoin::Bech32.convert_bits(data[1], from_bits: 5, to_bits: 8, pad: false)
 
-        Zilliqa::Account::Wallet.to_checksum_address(Util.encode_hex(ret.pack('c*'))).sub('0x', '')
+        to_checksum_address(Util.encode_hex(ret.pack('c*'))).sub('0x', '')
       end
 
       # to_checksum_address

data/lib/zilliqa/version.rb

@@ -1,3 +1,3 @@
 module Zilliqa
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

data/zilliqa.gemspec

@@ -34,10 +34,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_dependency "bundler", ">= 2.2.33"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_dependency "bitcoin-secp256k1"
+  spec.add_dependency "ruby-bitcoin-secp256k1"
   spec.add_dependency "scrypt"
   spec.add_dependency "pbkdf2-ruby"
   spec.add_dependency "jsonrpc-client"

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: zilliqa
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - snuff
 - cenyongh
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: 2.2.33
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bitcoin-secp256k1
+  name: ruby-bitcoin-secp256k1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -181,7 +181,7 @@ metadata:
   homepage_uri: https://github.com/mechanizm/zilliqa
   source_code_uri: https://github.com/mechanizm/zilliqa
   changelog_uri: https://github.com/mechanizm/zilliqa
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -196,9 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Zilliqa — Zilliqa Ruby Blockchain Library
 test_files: []