scale_rb 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83289d7a27bca72fe9e21e43f2b06ff29e191e47b9e1397cb96ea1adf6ee6c0
-  data.tar.gz: a1e77aaffcbc32aa795cb9cd57303f71a3fc1477c42e2540034d9060dc88a415
+  metadata.gz: 3c6c07616c5b65f7aee2b0504956231534d94cd3df9eba9320e4a22d2a38aed2
+  data.tar.gz: f2f3572c5d7ed389d5772c6245fb2e02eb75d57cf5ff28b78a8db82642d47402
 SHA512:
-  metadata.gz: 26a88e5148bd175700d992542ea490dfd97b298b24dd8a6955fa24e276c12a8018b914c9c2f321b59cce4d8be24ceda7674814a83495a6079bebef43f8407d7a
-  data.tar.gz: 74e818ab1e4d56caac4b78de0e15545b53e86361a5557fa72eae7e8310dec0b09a101590551e5b6d5b218d41c690e6eaea6221a84a93a14c904620724390aaf0
+  metadata.gz: 1709366a718feafae82a60b5a5aeb05e5e78fbc3160c151de66b2be25e62ad3f6031c50db0097cc1880c00ec263962f45b4cf3fcb6f4ccd0d13ab48ce9b84976
+  data.tar.gz: 231963a7fc17cc7d25ec5aded79120f11733e97d81edf58f4f2fc31edbb11865b435bd286b9817db744d98bad8751433eb68e809d567f9590d5ee70c5687b97d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale_rb (0.1.5)
+    scale_rb (0.1.6)
       blake2b_rs (~> 0.1.4)
       xxhash
 

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.6'
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scale_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Aki Wu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blake2b_rs