scale_rb 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83289d7a27bca72fe9e21e43f2b06ff29e191e47b9e1397cb96ea1adf6ee6c0
-  data.tar.gz: a1e77aaffcbc32aa795cb9cd57303f71a3fc1477c42e2540034d9060dc88a415
+  metadata.gz: 7d53289f0b86d457c262f850a693fd75c8c007fe6fe6fb716241d30897c7f57c
+  data.tar.gz: 3784af581e51a87e7bdc10d6da633d719189e328f0d373ddfb93f1d120e6a44e
 SHA512:
-  metadata.gz: 26a88e5148bd175700d992542ea490dfd97b298b24dd8a6955fa24e276c12a8018b914c9c2f321b59cce4d8be24ceda7674814a83495a6079bebef43f8407d7a
-  data.tar.gz: 74e818ab1e4d56caac4b78de0e15545b53e86361a5557fa72eae7e8310dec0b09a101590551e5b6d5b218d41c690e6eaea6221a84a93a14c904620724390aaf0
+  metadata.gz: a6fa663c9058b64cb9b5f77450cfddf2eac1ddd582ce1c56445d0d255bddd479339b644f95cb436cb53e5e1e46698593dc862e7a6d6e77515ea17798427ec029
+  data.tar.gz: baf73201617384641f980d6aa8d83650edc483a60969c240c78ef935f22fce267b5084e9de30487a5b4a79bc4333f1b240f00003991ded04e3b32c94bca3df9d

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    scale_rb (0.1.5)
+    scale_rb (0.1.7)
+      base58
       blake2b_rs (~> 0.1.4)
       xxhash
 
 GEM
   remote: https://rubygems.org/
   specs:
+    base58 (0.2.3)
     blake2b_rs (0.1.4)
       ffi (~> 1.0)
       thermite (~> 0)

data/README.md

@@ -2,9 +2,6 @@
 
 *WARNING: UNDER DEVELOPMENT*
 
-* Only support metadata v14.
-* Http & WebSocket client helper. No Client in this repo.
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/exe/metadata

@@ -6,7 +6,7 @@ require 'json'
 require 'optparse'
 
 def print_metadata(url, at = nil)
-  puts JSON.pretty_generate(HttpClient.get_metadata(url, at))
+  puts JSON.pretty_generate(ScaleRb::HttpClient.get_metadata(url, at))
 end
 
 # ./bin/metadata http://g2.dev.darwinia.network:2234 -b 0x23ebddd6519aaf1b7fc916c3709af13d7a4010943fb53038406581171000a58e
@@ -31,10 +31,10 @@ else
       block_hash = @options[:block]
     else
       block_number = @options[:block].to_i
-      block_hash = HttpClient.chain_getBlockHash url, block_number
+      block_hash = ScaleRb::HttpClient.chain_getBlockHash url, block_number
     end
   else
-    block_hash = HttpClient.chain_getBlockHash url
+    block_hash = ScaleRb::HttpClient.chain_getBlockHash url
   end
 
   print_metadata url, block_hash

data/lib/address.rb

@@ -0,0 +1,95 @@
+require 'base58'
+
+# Warning: Just for test
+class Address
+  SS58_PREFIX = 'SS58PRE'
+
+  TYPES = [
+    # Polkadot Live (SS58, AccountId)
+    0, 1,
+    # Polkadot Canary (SS58, AccountId)
+    2, 3,
+    # Kulupu (SS58, Reserved)
+    16, 17,
+    # Darwinia Live
+    18,
+    # Dothereum (SS58, AccountId)
+    20, 21, 
+    # Generic Substrate wildcard (SS58, AccountId)
+    42, 43,
+
+    # Schnorr/Ristretto 25519 ("S/R 25519") key
+    48,
+    # Edwards Ed25519 key
+    49,
+    # ECDSA SECP256k1 key
+    50,
+
+    # Reserved for future address format extensions.
+    *64..255
+  ]
+
+  class << self
+
+    def array_to_hex_string(arr)
+      body = arr.map { |i| i.to_s(16).rjust(2, '0') }.join
+      "0x#{body}"
+    end
+
+    def decode(address, addr_type = 42, ignore_checksum = true)
+      decoded = Base58.base58_to_binary(address, :bitcoin)
+      is_pubkey = decoded.size == 35
+
+      size = decoded.size - ( is_pubkey ? 2 : 1 )
+
+      prefix = decoded[0, 1].unpack("C*").first
+
+      raise "Invalid address type" unless TYPES.include?(addr_type)
+      
+      hash_bytes = make_hash(decoded[0, size])
+      if is_pubkey
+        is_valid_checksum = decoded[-2].unpack("C*").first == hash_bytes[0] && decoded[-1].unpack("C*").first == hash_bytes[1]
+      else
+        is_valid_checksum = decoded[-1].unpack("C*").first == hash_bytes[0]
+      end
+
+      # raise "Invalid decoded address checksum" unless is_valid_checksum && ignore_checksum
+
+      decoded[1...size].unpack("H*").first
+    end
+
+
+    def encode(pubkey, addr_type = 42)
+      pubkey = pubkey[2..-1] if pubkey =~ /^0x/i
+      key = [pubkey].pack("H*")
+
+      u8_array = key.bytes
+
+      u8_array.unshift(addr_type)
+
+      bytes = make_hash(u8_array.pack("C*"))
+      
+      checksum = bytes[0, key.size == 32 ? 2 : 1]
+
+      u8_array.push(*checksum)
+
+      input = u8_array.pack("C*")
+
+      Base58.binary_to_base58(input, :bitcoin)
+    end
+
+    def make_hash(body)
+      Blake2b.hex("#{SS58_PREFIX}#{body}".bytes, 64)
+    end
+
+    def is_ss58_address?(address)
+      begin
+        decode(address)
+      rescue
+        return false
+      end
+      return true
+    end
+
+  end
+end

data/lib/client/http_client.rb

@@ -104,9 +104,10 @@ module ScaleRb
       #   },
       #   ..
       #
+      # TODO: part of the key is provided, but not all
       def get_storage(url, pallet_name, item_name, key, value, registry, at = nil)
         # map, but no key's value provided. get all storages under the partial storage key
-        if !key.nil? && key[:value].nil?
+        if key && (key[:value].nil? || key[:value].empty?)
           partial_storage_key = StorageHelper.encode_storage_key(pallet_name, item_name).to_hex
           get_storages_by_partial_key(
             url,
@@ -124,10 +125,11 @@ module ScaleRb
       end
 
       def get_storage2(url, pallet_name, item_name, value_of_key, metadata, at = nil)
-        raise 'metadata should not be nil' if metadata.nil?
+        raise 'Metadata should not be nil' if metadata.nil?
 
         registry = Metadata.build_registry(metadata)
         item = Metadata.get_storage_item(pallet_name, item_name, metadata)
+        raise "No such storage item: `#{pallet_name}`.`#{item_name}`" if item.nil?
 
         modifier = item._get(:modifier) # Default | Optional
         fallback = item._get(:fallback)
@@ -135,6 +137,7 @@ module ScaleRb
 
         plain = type._get(:plain)
         map = type._get(:map)
+        # debug
 
         key, value =
           if plain

data/lib/metadata/metadata_v10.rb

@@ -11,6 +11,7 @@ module Metadata
 
       def get_storage_item(module_name, item_name, metadata)
         modula = get_module(module_name, metadata)
+        raise "Module `#{module_name}` not found" if modula.nil?
         modula._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/metadata/metadata_v11.rb

@@ -11,6 +11,7 @@ module Metadata
 
       def get_storage_item(module_name, item_name, metadata)
         modula = get_module(module_name, metadata)
+        raise "Module `#{module_name}` not found" if modula.nil?
         modula._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/metadata/metadata_v12.rb

@@ -11,6 +11,7 @@ module Metadata
 
       def get_storage_item(module_name, item_name, metadata)
         modula = get_module(module_name, metadata)
+        raise "Module `#{module_name}` not found" if modula.nil?
         modula._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/metadata/metadata_v13.rb

@@ -11,6 +11,7 @@ module Metadata
 
       def get_storage_item(module_name, item_name, metadata)
         modula = get_module(module_name, metadata)
+        raise "Module `#{module_name}` not found" if modula.nil?
         modula._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/metadata/metadata_v14.rb

@@ -16,6 +16,7 @@ module Metadata
 
       def get_storage_item(pallet_name, item_name, metadata)
         pallet = get_module(pallet_name, metadata)
+        raise "Pallet `#{pallet_name}` not found" if pallet.nil?
         pallet._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/metadata/metadata_v9.rb

@@ -11,6 +11,7 @@ module Metadata
 
       def get_storage_item(module_name, item_name, metadata)
         modula = get_module(module_name, metadata)
+        raise "Module `#{module_name}` not found" if modula.nil?
         modula._get(:storage)._get(:items).find do |item|
           item._get(:name) == item_name
         end

data/lib/portable_codec.rb

@@ -134,6 +134,9 @@ module PortableCodec
       raise TypeNotFound, "id: #{id}" if type.nil?
 
       type_def = type._get(:def)
+      # debug
+      # p type_def
+      # p value
 
       return encode_primitive(type_def, value) if type_def._key?(:primitive)
       return encode_compact(value) if type_def._key?(:compact)
@@ -188,6 +191,9 @@ module PortableCodec
       fields = composite_type._get(:fields)
       # reduce composite level when composite only has one field without name
       if fields.length == 1 && fields.first._get(:name).nil?
+        # debug
+        # p fields.first._get(:type)
+        # p value
         encode(fields.first._get(:type), value, registry)
       else
         values =

data/lib/scale_rb/version.rb

@@ -1,3 +1,3 @@
 module ScaleRb
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

data/lib/scale_rb.rb

@@ -28,6 +28,8 @@ require 'client/abstract_ws_client'
 # get registry from config
 require 'registry'
 
+require 'address'
+
 module ScaleRb
   class << self
     attr_writer :logger

data/lib/storage_helper.rb

@@ -12,11 +12,11 @@ module StorageHelper
 
       if key && registry
 
-        types, values =
+        key_types, key_values =
           if key[:hashers].length == 1
             [
               [key[:type]],
-              [key[:value]]
+              key[:value]
             ]
           else
             [
@@ -25,7 +25,13 @@ module StorageHelper
             ]
           end
 
-        storage_key + PortableCodec._encode_types_with_hashers(types, values, registry, key[:hashers])
+        # debug
+        # p "encode_storage_key -----------------------"
+        # p key_types
+        # p key_values
+        # p "encode_storage_key -----------------------"
+        raise "Key's value doesn't match key's type, key's value: #{key_values.inspect}, but key's type: #{key_types.inspect}. Please check your key's value." if key_types.class != key_values.class || key_types.length != key_values.length
+        storage_key + PortableCodec._encode_types_with_hashers(key_types, key_values, registry, key[:hashers])
       else
         storage_key
       end
@@ -35,9 +41,10 @@ module StorageHelper
     # type: portable type id
     # optional: boolean
     # fallback: hex string
+    # returns nil or data
     def decode_storage(data, type, optional, fallback, registry)
       data ||= (optional ? nil : fallback)
-      PortableCodec.decode(type, data.to_bytes, registry)[0]
+      PortableCodec.decode(type, data.to_bytes, registry)[0] if data
     end
 
     # storage_item: the storage item from metadata

data/scale_rb.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   # for hashers
   spec.add_dependency 'blake2b_rs', '~> 0.1.4'
   spec.add_dependency 'xxhash'
+  spec.add_dependency "base58"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scale_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Aki Wu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blake2b_rs
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base58
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby implementation of the parity SCALE data format
 email:
 - wuminzhe@gmail.com
@@ -59,6 +73,7 @@ files:
 - bin/console
 - bin/setup
 - exe/metadata
+- lib/address.rb
 - lib/client/abstract_ws_client.rb
 - lib/client/http_client.rb
 - lib/client/rpc_request_builder.rb