scale.rb 0.2.16 → 0.3.0

data/lib/helper.rb

@@ -18,16 +18,30 @@ class SubstrateClient::Helper
         return_type = map[:value]
         # TODO: decode to account id if param is address
         # params[0] = decode(params[0]) if map[:key] == "AccountId"
+
         type = Scale::Types.get(map[:key])
-        params[0] = type.new(params[0]).encode
+        if params[0].class != type
+          raise Scale::StorageInputTypeError.new("The type of first param is not equal to the type from metadata: #{map[:key]} => #{type}")
+        end
+        params[0] = params[0].encode
       elsif map = storage_item[:type][:DoubleMap]
         raise "Storage call of type \"DoubleMapType\" requires 2 parameters" if params.nil? || params.length != 2
 
         hasher = map[:hasher]
         hasher2 = map[:key2Hasher]
         return_type = map[:value]
-        params[0] = Scale::Types.get(map[:key1]).new(params[0]).encode
-        params[1] = Scale::Types.get(map[:key2]).new(params[1]).encode
+
+        type1 = Scale::Types.get(map[:key1])
+        if params[0].class != type1
+          raise Scale::StorageInputTypeError.new("The type of 1st param is not equal to the type from metadata: #{map[:key1]} => #{type1.class.name}")
+        end
+        params[0] = params[0].encode
+
+        type2 = Scale::Types.get(map[:key2])
+        if params[1].class != type2
+          raise Scale::StorageInputTypeError.new("The type of 2nd param is not equal to the type from metadata: #{map[:key2]} => #{type2.class.name}")
+        end
+        params[1] = params[1].encode
       else
         raise NotImplementedError
       end
@@ -41,7 +55,8 @@ class SubstrateClient::Helper
         hasher2,
         metadata.value.value[:metadata][:version]
       )
-      [storage_key, return_type]
+      storage_modifier = storage_item[:modifier]
+      [storage_key, return_type, storage_item]
     end
 
     def generate_storage_key(module_name, storage_name, params = nil, hasher = nil, hasher2 = nil, metadata_version = nil)
@@ -64,7 +79,7 @@ class SubstrateClient::Helper
             param.encode().hex_to_bytes
           end
           param_hasher = "Twox128" if param_hasher.nil?
-          storage_key += Crypto.send(param_hasher.underscore, param_key)
+          storage_key += Crypto.send(param_hasher.underscore2, param_key)
         end
 
         "0x#{storage_key}"
@@ -79,7 +94,7 @@ class SubstrateClient::Helper
           storage_key += params_key.hex_to_bytes.bytes_to_utf8 
         end
 
-        "0x#{Crypto.send( hasher.underscore, storage_key )}"
+        "0x#{Crypto.send( hasher.underscore2, storage_key )}"
       end
     end
 
@@ -108,15 +123,17 @@ class SubstrateClient::Helper
     def decode_block(block)
       block["block"]["header"]["number"] = block["block"]["header"]["number"].to_i(16)
 
+      block["block"]["extrinsics_decoded"] = []
       block["block"]["extrinsics"].each_with_index do |hex, i|
         scale_bytes = Scale::Bytes.new(hex)
-        block["block"]["extrinsics"][i] = Scale::Types::Extrinsic.decode(scale_bytes).to_human
+        block["block"]["extrinsics_decoded"][i] = Scale::Types::Extrinsic.decode(scale_bytes).to_human
       end
 
+      block['block']['header']["digest"]["logs_decoded"] = []
       block['block']['header']["digest"]["logs"].each_with_index do |hex, i|
         scale_bytes = Scale::Bytes.new(hex)
         log = Scale::Types::LogDigest.decode(scale_bytes).to_human
-        block['block']['header']["digest"]["logs"][i] = log
+        block['block']['header']["digest"]["logs_decoded"][i] = log
       end
 
       block

data/lib/metadata/metadata.rb

@@ -1,13 +1,17 @@
 module Scale
   module Types
     class Metadata
-      include SingleValue
+      include Base
       attr_accessor :version
       def self.decode(scale_bytes)
         bytes = scale_bytes.get_next_bytes(4)
         if bytes.bytes_to_utf8 == "meta"
-          metadata_version = Scale::Types.type_of("Enum", %w[MetadataV0 MetadataV1 MetadataV2 MetadataV3 MetadataV4 MetadataV5 MetadataV6 MetadataV7 MetadataV8 MetadataV9 MetadataV10 MetadataV11 MetadataV12]).decode(scale_bytes).value
-          metadata = Metadata.new "Scale::Types::#{metadata_version}".constantize.decode(scale_bytes)
+          version_enum = {
+            "type" => "enum",
+            "value_list" => %w[MetadataV0 MetadataV1 MetadataV2 MetadataV3 MetadataV4 MetadataV5 MetadataV6 MetadataV7 MetadataV8 MetadataV9 MetadataV10 MetadataV11 MetadataV12 MetadataV13]
+          }
+          metadata_version = Scale::Types.get(version_enum).decode(scale_bytes).value
+          metadata = Metadata.new "Scale::Types::#{metadata_version}".constantize2.decode(scale_bytes)
           metadata.version = metadata_version[9..].to_i
         else
           scale_bytes.reset_offset
@@ -48,7 +52,7 @@ module Scale
     end
 
     class MetadataModule
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         name = String.decode(scale_bytes).value
         prefix = String.decode(scale_bytes).value
@@ -60,19 +64,19 @@ module Scale
 
         has_storage = Bool.decode(scale_bytes).value
         if has_storage
-          storages = Scale::Types.type_of("Vec<MetadataModuleStorage>").decode(scale_bytes).value
+          storages = Scale::Types.get("Vec<MetadataModuleStorage>").decode(scale_bytes).value
           result[:storage] = storages.map(&:value)
         end
 
         has_calls = Bool.decode(scale_bytes).value
         if has_calls
-          calls = Scale::Types.type_of("Vec<MetadataModuleCall>").decode(scale_bytes).value
+          calls = Scale::Types.get("Vec<MetadataModuleCall>").decode(scale_bytes).value
           result[:calls] = calls.map(&:value)
         end
 
         has_events = Bool.decode(scale_bytes).value
         if has_events
-          events = Scale::Types.type_of("Vec<MetadataModuleEvent>").decode(scale_bytes).value
+          events = Scale::Types.get("Vec<MetadataModuleEvent>").decode(scale_bytes).value
           result[:events] = events.map(&:value)
         end
 
@@ -85,11 +89,17 @@ module Scale
     end
 
     class MetadataModuleStorage
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
+        name = String.decode(scale_bytes).value
+        enum = {
+          "type" => "enum",
+          "value_list" => ["Optional", "Default"]
+        }
+        modifier = Scale::Types.get(enum).decode(scale_bytes).value
         result = {
-          name: String.decode(scale_bytes).value,
-          modifier: Scale::Types.type_of("Enum", %w[Optional Default]).decode(scale_bytes).value
+          name: name,
+          modifier: modifier
         }
 
         is_key_value = Bool.decode(scale_bytes).value
@@ -108,25 +118,25 @@ module Scale
                         end
 
         result[:fallback] = Hex.decode(scale_bytes).value
-        result[:documentation] = Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+        result[:documentation] = Scale::Types.get("Vec<String>").decode(scale_bytes).value.map(&:value)
 
         MetadataModuleStorage.new(result)
       end
     end
 
     class MetadataModuleCall
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         result = {}
         result[:name] = String.decode(scale_bytes).value
-        result[:args] = Scale::Types.type_of("Vec<MetadataModuleCallArgument>").decode(scale_bytes).value.map(&:value)
-        result[:documentation] = Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+        result[:args] = Scale::Types.get("Vec<MetadataModuleCallArgument>").decode(scale_bytes).value.map(&:value)
+        result[:documentation] = Scale::Types.get("Vec<String>").decode(scale_bytes).value.map(&:value)
         MetadataModuleCall.new(result)
       end
     end
 
     class MetadataModuleCallArgument
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         result = {}
         result[:name] = String.decode(scale_bytes).value
@@ -137,12 +147,12 @@ module Scale
     end
 
     class MetadataModuleEvent
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         result = {}
         result[:name] = String.decode(scale_bytes).value
-        result[:args] = Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
-        result[:documentation] = Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+        result[:args] = Scale::Types.get("Vec<String>").decode(scale_bytes).value.map(&:value)
+        result[:documentation] = Scale::Types.get("Vec<String>").decode(scale_bytes).value.map(&:value)
 
         MetadataModuleEvent.new(result)
       end

data/lib/metadata/metadata_v0.rb

@@ -1,7 +1,7 @@
 module Scale
   module Types
     class MetadataV0
-      include SingleValue
+      include Base
       attr_accessor :call_index, :event_index
 
       def initialize(value)
@@ -26,12 +26,12 @@ module Scale
           }
         }
 
-        events_modules = Scale::Types.type_of("Vec<MetadataV0EventModule>").decode(scale_bytes).value.map(&:value)
-        modules = Scale::Types.type_of("Vec<MetadataV0Module>").decode(scale_bytes).value.map(&:value)
+        events_modules = Scale::Types.get("Vec<MetadataV0EventModule>").decode(scale_bytes).value.map(&:value)
+        modules = Scale::Types.get("Vec<MetadataV0Module>").decode(scale_bytes).value.map(&:value)
 
         Bytes.decode(scale_bytes).value
 
-        sections = Scale::Types.type_of("Vec<MetadataV0Section>").decode(scale_bytes).value.map(&:value)
+        sections = Scale::Types.get("Vec<MetadataV0Section>").decode(scale_bytes).value.map(&:value)
 
         value[:metadata][:outerEvent][:events] = events_modules
         value[:metadata][:modules] = modules
@@ -65,11 +65,11 @@ module Scale
     end
 
     class MetadataV0EventModule
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
-        events = Scale::Types.type_of('Vec<MetadataV0Event>').decode(scale_bytes).value.map(&:value)
+        events = Scale::Types.get('Vec<MetadataV0Event>').decode(scale_bytes).value.map(&:value)
         MetadataV0EventModule.new([
           name, 
           events
@@ -78,25 +78,25 @@ module Scale
     end
 
     class MetadataV0Event
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
-        args = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
-        documentation = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
+        args = Scale::Types.get("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
+        documentation = Scale::Types.get("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
         MetadataV0Event.new({name: name, args: args.map {|arg| arg }, documentation: documentation})
       end
     end
 
     class MetadataV0Module
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         prefix = Bytes.decode(scale_bytes).value
         name = Bytes.decode(scale_bytes).value
         call_name = Bytes.decode(scale_bytes).value
 
-        functions = Scale::Types.type_of("Vec<MetadataV0ModuleFunction>").decode(scale_bytes).value.map(&:value)
+        functions = Scale::Types.get("Vec<MetadataV0ModuleFunction>").decode(scale_bytes).value.map(&:value)
 
         result = {
             prefix: prefix,
@@ -112,7 +112,7 @@ module Scale
         has_storage = Bool.decode(scale_bytes).value
         if has_storage
           storage_prefix = Bytes.decode(scale_bytes).value
-          storage = Scale::Types.type_of("Vec<MetadataV0ModuleStorage>").decode(scale_bytes).value.map(&:value)
+          storage = Scale::Types.get("Vec<MetadataV0ModuleStorage>").decode(scale_bytes).value.map(&:value)
           result[:storage] = {
             prefix: storage_prefix,
             functions: storage
@@ -124,13 +124,13 @@ module Scale
     end
 
     class MetadataV0ModuleFunction
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         id = U16.decode(scale_bytes).value
         name = Bytes.decode(scale_bytes).value
-        args = Scale::Types.type_of("Vec<MetadataV0ModuleCallArgument>").decode(scale_bytes).value.map(&:value)
-        documentation = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
+        args = Scale::Types.get("Vec<MetadataV0ModuleCallArgument>").decode(scale_bytes).value.map(&:value)
+        documentation = Scale::Types.get("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
         MetadataV0ModuleFunction.new({
           id: id,
           name: name,
@@ -141,7 +141,7 @@ module Scale
     end
 
     class MetadataV0ModuleCallArgument
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
@@ -152,11 +152,15 @@ module Scale
     end
 
     class MetadataV0ModuleStorage
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
-        modifier = Scale::Types.type_of("Enum", ["Optional", "Default"]).decode(scale_bytes).value
+        enum = {
+          "type" => "enum",
+          "value_list" => ["Optional", "Default"]
+        }
+        modifier = Scale::Types.get(enum).decode(scale_bytes).value
 
         is_key_value = Bool.decode(scale_bytes).value
 
@@ -174,7 +178,7 @@ module Scale
         end
 
         fallback = Hex.decode(scale_bytes).value
-        documentation = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
+        documentation = Scale::Types.get("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
 
         MetadataV0ModuleStorage.new({
           name: name,
@@ -187,7 +191,7 @@ module Scale
     end
 
     class MetadataV0Section
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value

data/lib/metadata/metadata_v1.rb

@@ -1,7 +1,7 @@
 module Scale
   module Types
     class MetadataV1
-      include SingleValue
+      include Base
       attr_accessor :call_index, :event_index
 
       def initialize(value)
@@ -11,7 +11,7 @@ module Scale
       end
 
       def self.decode(scale_bytes)
-        modules = Scale::Types.type_of("Vec<MetadataV1Module>").decode(scale_bytes).value
+        modules = Scale::Types.get("Vec<MetadataV1Module>").decode(scale_bytes).value
 
         value = {
           magicNumber: 1_635_018_093,
@@ -49,7 +49,7 @@ module Scale
     end
 
     class MetadataV1Module
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         name = String.decode(scale_bytes).value
         prefix = String.decode(scale_bytes).value
@@ -61,19 +61,19 @@ module Scale
 
         has_storage = Bool.decode(scale_bytes).value
         if has_storage
-          storages = Scale::Types.type_of("Vec<MetadataV1ModuleStorage>").decode(scale_bytes).value
+          storages = Scale::Types.get("Vec<MetadataV1ModuleStorage>").decode(scale_bytes).value
           result[:storage] = storages.map(&:value)
         end
 
         has_calls = Bool.decode(scale_bytes).value
         if has_calls
-          calls = Scale::Types.type_of("Vec<MetadataModuleCall>").decode(scale_bytes).value
+          calls = Scale::Types.get("Vec<MetadataModuleCall>").decode(scale_bytes).value
           result[:calls] = calls.map(&:value)
         end
 
         has_events = Bool.decode(scale_bytes).value
         if has_events
-          events = Scale::Types.type_of("Vec<MetadataModuleEvent>").decode(scale_bytes).value
+          events = Scale::Types.get("Vec<MetadataModuleEvent>").decode(scale_bytes).value
           result[:events] = events.map(&:value)
         end
 
@@ -82,11 +82,15 @@ module Scale
     end
 
     class MetadataV1ModuleStorage
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
-        modifier = Scale::Types.type_of("Enum", ["Optional", "Default"]).decode(scale_bytes).value
+        enum = {
+          "type" => "enum",
+          "value_list" => ["Optional", "Default"]
+        }
+        modifier = Scale::Types.get(enum).decode(scale_bytes).value
 
         is_key_value = Bool.decode(scale_bytes).value
 
@@ -104,7 +108,7 @@ module Scale
         end
 
         fallback = Hex.decode(scale_bytes).value
-        docs = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
+        docs = Scale::Types.get("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
 
         MetadataV1ModuleStorage.new({
           name: name,

data/lib/metadata/metadata_v10.rb

@@ -1,7 +1,7 @@
 module Scale
   module Types
     class MetadataV10
-      include SingleValue
+      include Base
       attr_accessor :call_index, :event_index
 
       def initialize(value)
@@ -11,7 +11,7 @@ module Scale
       end
 
       def self.decode(scale_bytes)
-        modules = Scale::Types.type_of("Vec<MetadataV8Module>").decode(scale_bytes).value
+        modules = Scale::Types.get("Vec<MetadataV8Module>").decode(scale_bytes).value
 
         value = {
           magicNumber: 1_635_018_093,

data/lib/metadata/metadata_v11.rb

@@ -1,7 +1,7 @@
 module Scale
   module Types
     class MetadataV11
-      include SingleValue
+      include Base
       attr_accessor :call_index, :event_index
 
       def initialize(value)
@@ -11,7 +11,7 @@ module Scale
       end
 
       def self.decode(scale_bytes)
-        modules = Scale::Types.type_of("Vec<MetadataV8Module>").decode(scale_bytes).value
+        modules = Scale::Types.get("Vec<MetadataV8Module>").decode(scale_bytes).value
 
         value = {
           magicNumber: 1_635_018_093,

data/lib/metadata/metadata_v12.rb

@@ -1,7 +1,7 @@
 module Scale
   module Types
     class MetadataV12
-      include SingleValue
+      include Base
       attr_accessor :call_index, :event_index
 
       def initialize(value)
@@ -11,7 +11,7 @@ module Scale
       end
 
       def self.decode(scale_bytes)
-        modules = Scale::Types.type_of("Vec<MetadataV12Module>").decode(scale_bytes).value
+        modules = Scale::Types.get("Vec<MetadataV12Module>").decode(scale_bytes).value
 
         value = {
           magicNumber: 1_635_018_093,
@@ -26,7 +26,8 @@ module Scale
         call_module_index = 0
         event_module_index = 0
 
-        modules.map(&:value).each_with_index do |m, module_index|
+        modules.map(&:value).each do |m|
+          module_index = m[:index]
           if m[:calls]
             m[:calls].each_with_index do |call, index|
               call[:lookup] = "%02x%02x" % [module_index, index]
@@ -47,7 +48,7 @@ module Scale
     end
 
     class MetadataV12Module
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
         name = String.decode(scale_bytes).value
 
@@ -64,18 +65,18 @@ module Scale
 
         has_calls = Bool.decode(scale_bytes).value
         if has_calls
-          calls = Scale::Types.type_of("Vec<MetadataModuleCall>").decode(scale_bytes).value
+          calls = Scale::Types.get("Vec<MetadataModuleCall>").decode(scale_bytes).value
           result[:calls] = calls.map(&:value)
         end
 
         has_events = Bool.decode(scale_bytes).value
         if has_events
-          events = Scale::Types.type_of("Vec<MetadataModuleEvent>").decode(scale_bytes).value
+          events = Scale::Types.get("Vec<MetadataModuleEvent>").decode(scale_bytes).value
           result[:events] = events.map(&:value)
         end
 
-        result[:constants] = Scale::Types.type_of("Vec<MetadataV7ModuleConstants>").decode(scale_bytes).value.map(&:value)
-        result[:errors] = Scale::Types.type_of("Vec<MetadataModuleError>").decode(scale_bytes).value.map(&:value)
+        result[:constants] = Scale::Types.get("Vec<MetadataV7ModuleConstants>").decode(scale_bytes).value.map(&:value)
+        result[:errors] = Scale::Types.get("Vec<MetadataModuleError>").decode(scale_bytes).value.map(&:value)
 
         result[:index] = U8.decode(scale_bytes).value
         MetadataV12Module.new(result)