scale.rb 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c01e31f2e50407197c68df2d81da349d5471d52ddcb1b17c1a30fcd5706eae
-  data.tar.gz: 5618f3aa22bcf94dc40a12bb15508cbe6dff74441879ffccdd8f2d6f626de992
+  metadata.gz: 201e89b117a429345fb44cc4e9da4c77b99284e8cbf42622c96548f76777ebde
+  data.tar.gz: 5f534ca2a026903a3bc74bad4bcf58c1d683bd2e7d24988a4710709733636dba
 SHA512:
-  metadata.gz: c00a8b437a13ea3a795ac1dbdc4bbeda4442400cb0a8153ab0bc07e980f5c921091b54afffe28392646aa3fede9c7b8b96d1d74d1e4fb3a9e3cf5de0419c1bca
-  data.tar.gz: c449932d536db154cd4b6e3bbb9163bb6083494d69066e52b3e3fb856bdcc44944e9d102835f1c702c024667a32ae8c1baa0719fc1d6e0815fc90dbbbf92b956
+  metadata.gz: '0039c3cff40a7d34da5099e1b27fd6091d30213fdcc4578ee4a091496ab5bbb6048bab1e881ea0657fd8a9f3e1db6a8be7d986dc0998caa2772273ee52028568'
+  data.tar.gz: ba948fe866b16470b02c03d726a445d8fc55a19b59d15f2a6f0d9cd48822fcf17f682dc18905047f9ba83c1627dc31d1d3169f026176b61ad19aeed75c5c05e7

data/.dockerignore

@@ -0,0 +1,11 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/.rakeTasks
+/.idea
+/target

data/Dockerfile

@@ -2,17 +2,20 @@ FROM ruby:2.6-alpine3.11
 
 ENV BUILD_PACKAGES curl-dev build-base
 
-RUN echo "http://mirrors.ustc.edu.cn/alpine/v3.11/main/" > /etc/apk/repositories && \
-    apk update && \
+RUN apk update && \
     apk upgrade && \
-    apk add git $BUILD_PACKAGES
+    apk add git curl $BUILD_PACKAGES
 
 WORKDIR /usr/src/app
 
 COPY . .
-RUN gem sources --add https://gems.ruby-china.com/ --remove https://rubygems.org/ && \
-    gem install bundler:1.17.3 && \
-    bundle config mirror.https://rubygems.org https://gems.ruby-china.com && \
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+    source $HOME/.cargo/env && \
+    export RUSTFLAGS='-C target-feature=-crt-static' && \
+    make
+
+RUN gem install bundler:1.17.3 && \
     bundle install && \
     rake install:local
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale.rb (0.2.5)
+    scale.rb (0.2.6)
       activesupport (>= 4.0.0)
       json (~> 2.3.0)
       substrate_common.rb (~> 0.1.8)
@@ -10,23 +10,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     base58 (0.2.3)
     blake2b (0.10.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     ffi (1.12.2)
-    i18n (1.8.2)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.3.1)
     method_source (0.9.2)
-    minitest (5.14.0)
+    minitest (5.14.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -93,11 +93,11 @@ rspec spec/types_ffi_spec.rb
 
 1. update to latest image
 
-   `docker pull itering/scale`
+   `docker pull itering/scale:latest`
 
 2. Run image:
 
-   `docker run -it itering/scale`
+   `docker run -it itering/scale:latest`
 
    This  will enter the container with a linux shell opened. 
 

data/lib/metadata/metadata.rb

@@ -82,14 +82,14 @@ module Scale
         result[:type] = if is_key_value
                           {
                             Map: {
-                              key: rename(String.decode(scale_bytes).value),
-                              value: rename(String.decode(scale_bytes).value),
+                              key: String.decode(scale_bytes).value,
+                              value: String.decode(scale_bytes).value,
                               linked: Bool.decode(scale_bytes).value
                             }
                           }
                         else
                           {
-                            Plain: rename(String.decode(scale_bytes).value)
+                            Plain: String.decode(scale_bytes).value
                           }
                         end
 
@@ -116,7 +116,7 @@ module Scale
       def self.decode(scale_bytes)
         result = {}
         result[:name] = String.decode(scale_bytes).value
-        result[:type] = rename(String.decode(scale_bytes).value)
+        result[:type] = String.decode(scale_bytes).value
 
         MetadataModuleCallArgument.new(result)
       end

data/lib/metadata/metadata_v0.rb

@@ -129,7 +129,7 @@ module Scale
       def self.decode(scale_bytes)
         id = U16.decode(scale_bytes).value
         name = Bytes.decode(scale_bytes).value
-        args = Scale::Types.type_of("Vec<MetadataModuleCallArgument>").decode(scale_bytes).value.map(&: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)
         MetadataV0ModuleFunction.new({
           id: id,
@@ -140,14 +140,14 @@ module Scale
       end
     end
 
-    class MetadataModuleCallArgument
+    class MetadataV0ModuleCallArgument
       include SingleValue
 
       def self.decode(scale_bytes)
         name = Bytes.decode(scale_bytes).value
         type = Bytes.decode(scale_bytes).value
 
-        MetadataModuleCallArgument.new({name: name, type: type})
+        MetadataV0ModuleCallArgument.new({name: name, type: type})
       end
     end
 

data/lib/metadata/metadata_v1.rb

@@ -92,26 +92,26 @@ module Scale
 
         if is_key_value
           type = {
-            MapType: {
-              key: rename(Bytes.decode(scale_bytes).value),
-              value: rename(Bytes.decode(scale_bytes).value)
+            Map: {
+              key: Bytes.decode(scale_bytes).value,
+              value: Bytes.decode(scale_bytes).value
             }
           }
         else
           type = {
-            PlainType: rename(Bytes.decode(scale_bytes).value)
+            Plain: Bytes.decode(scale_bytes).value
           }
         end
 
         fallback = Hex.decode(scale_bytes).value
-        docs = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value
+        docs = Scale::Types.type_of("Vec<Bytes>").decode(scale_bytes).value.map(&:value)
 
         MetadataV1ModuleStorage.new({
           name: name,
           modifier: modifier,
           type: type,
-          default: fallback,
-          docs: docs
+          fallback: fallback,
+          documentation: docs
         })
       end
     end

data/lib/metadata/metadata_v4.rb

@@ -92,14 +92,14 @@ module Scale
         storage_function_type = Scale::Types.type_of("Enum", %w[Plain Map DoubleMap]).decode(scale_bytes).value
         if storage_function_type == "Plain"
           result[:type] = {
-            Plain: rename(String.decode(scale_bytes).value)
+            Plain: String.decode(scale_bytes).value
           }
         elsif storage_function_type == "Map"
           result[:type] = {
             Map: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               linked: Bool.decode(scale_bytes).value
             }
           }
@@ -107,9 +107,9 @@ module Scale
           result[:type] = {
             DoubleMap: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key1: rename(String.decode(scale_bytes).value),
-              key2: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key1: String.decode(scale_bytes).value,
+              key2: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               key2Hasher: StorageHasher.decode(scale_bytes).value
             }
           }

data/lib/metadata/metadata_v5.rb

@@ -92,14 +92,14 @@ module Scale
         storage_function_type = Scale::Types.type_of("Enum", %w[Plain Map DoubleMap]).decode(scale_bytes).value
         if storage_function_type == "Plain"
           result[:type] = {
-            Plain: rename(String.decode(scale_bytes).value)
+            Plain: String.decode(scale_bytes).value
           }
         elsif storage_function_type == "Map"
           result[:type] = {
             Map: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               linked: Bool.decode(scale_bytes).value
             }
           }
@@ -107,9 +107,9 @@ module Scale
           result[:type] = {
             DoubleMap: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key1: rename(String.decode(scale_bytes).value),
-              key2: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key1: String.decode(scale_bytes).value,
+              key2: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               key2Hasher: StorageHasher.decode(scale_bytes).value
             }
           }

data/lib/metadata/metadata_v6.rb

@@ -92,7 +92,7 @@ module Scale
           name: String.decode(scale_bytes).value,
           type: String.decode(scale_bytes).value, # convert
           value: Hex.decode(scale_bytes).value,
-          docs: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+          documentation: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
         }
         MetadataV6ModuleConstants.new result
       end

data/lib/metadata/metadata_v7.rb

@@ -106,14 +106,14 @@ module Scale
         storage_function_type = Scale::Types.type_of("Enum", %w[Plain Map DoubleMap]).decode(scale_bytes).value
         if storage_function_type == "Plain"
           result[:type] = {
-            Plain: rename(String.decode(scale_bytes).value)
+            Plain: String.decode(scale_bytes).value
           }
         elsif storage_function_type == "Map"
           result[:type] = {
             Map: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               linked: Bool.decode(scale_bytes).value
             }
           }
@@ -121,16 +121,16 @@ module Scale
           result[:type] = {
             DoubleMap: {
               hasher: StorageHasher.decode(scale_bytes).value,
-              key1: rename(String.decode(scale_bytes).value),
-              key2: rename(String.decode(scale_bytes).value),
-              value: rename(String.decode(scale_bytes).value),
+              key1: String.decode(scale_bytes).value,
+              key2: String.decode(scale_bytes).value,
+              value: String.decode(scale_bytes).value,
               key2Hasher: StorageHasher.decode(scale_bytes).value
             }
           }
         end
 
         result[:fallback] = Hex.decode(scale_bytes).value
-        result[:docs] = 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)
 
         MetadataV7ModuleStorageEntry.new(result)
       end
@@ -143,7 +143,7 @@ module Scale
           name: String.decode(scale_bytes).value,
           type: String.decode(scale_bytes).value, # convert
           value: Hex.decode(scale_bytes).value,
-          docs: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+          documentation: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
         }
         MetadataV7ModuleConstants.new result
       end

data/lib/metadata/metadata_v8.rb

@@ -88,7 +88,7 @@ module Scale
       def self.decode(scale_bytes)
         result = {
           name: String.decode(scale_bytes).value,
-          docs: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
+          documentation: Scale::Types.type_of("Vec<String>").decode(scale_bytes).value.map(&:value)
         }
 
         MetadataModuleError.new(result)

data/lib/scale.rb

@@ -29,21 +29,28 @@ module Scale
 
   class TypeRegistry
     include Singleton
-    attr_accessor :types, :versioning
-    attr_accessor :spec_version, :metadata
-    attr_accessor :custom_types
+    attr_reader :spec_name, :types, :versioning, :custom_types
+    attr_accessor :spec_version
+    attr_accessor :metadata
 
-    def load(spec_name = nil, custom_types = nil)
-      default_types, _ = load_chain_spec_types("default")
+    def load(spec_name: nil, custom_types: nil)
+      @spec_name = nil
+      @types = nil
+      @versioning = nil
+      @custom_types = nil
+
+      default_types, _, _ = load_chain_spec_types("default")
 
       if spec_name.nil? || spec_name == "default"
+        @spec_name = "default"
         @types = default_types
       else
-        spec_types, @versioning = load_chain_spec_types(spec_name)
+        @spec_name = spec_name
+        spec_types, @versioning, @spec_version = load_chain_spec_types(spec_name)
         @types = default_types.merge(spec_types)
       end
 
-      @custom_types = custom_types.stringify_keys if custom_types.nil? && custom_types.class.name == "Hash"
+      self.custom_types = custom_types
       true
     end
 
@@ -67,27 +74,33 @@ module Scale
       Scale::Types.constantize(type)
     end
 
-    def load_chain_spec_types(spec_name)
-      file = File.join File.expand_path("../..", __FILE__), "lib", "type_registry", "#{spec_name}.json"
-      json_string = File.open(file).read
-      json = JSON.parse(json_string)
+    def custom_types=(custom_types)
+      @custom_types = custom_types.stringify_keys if (not custom_types.nil?) && custom_types.class.name == "Hash"
+    end
 
-      runtime_id = json["runtime_id"]
+    private
 
-      [json["types"], json["versioning"]]
-    end
+      def load_chain_spec_types(spec_name)
+        file = File.join File.expand_path("../..", __FILE__), "lib", "type_registry", "#{spec_name}.json"
+        json_string = File.open(file).read
+        json = JSON.parse(json_string)
 
-    def type_traverse(type, types)
-      if types.has_key?(type)
-        type_traverse(types[type], types)
-      else
-        if type.class == ::String
-          rename(type)
+        runtime_id = json["runtime_id"]
+
+        [json["types"], json["versioning"], runtime_id]
+      end
+
+      def type_traverse(type, types)
+        if types.has_key?(type)
+          type_traverse(types[type], types)
         else
-          type
+          if type.class == ::String
+            rename(type)
+          else
+            type
+          end
         end
       end
-    end
   end
 
   # TODO: == implement
@@ -323,6 +336,7 @@ def rename(type)
   return "Compact" if type == "<Balance as HasCompact>::Type"
   return "Compact" if type == "<BlockNumber as HasCompact>::Type"
   return "Compact" if type == "Compact<Balance>"
+  return "Compact" if type == "Compact<BlockNumber>"
   return "CompactMoment" if type == "<Moment as HasCompact>::Type"
   return "CompactMoment" if type == "Compact<Moment>"
   return "InherentOfflineReport" if type == "<InherentOfflineReport as InherentOfflineReport>::Inherent"

data/lib/scale/block.rb

@@ -96,9 +96,10 @@ module Scale
           # decode params
           result[:params_raw] = scale_bytes.get_remaining_bytes.bytes_to_hex
           result[:params] = call[:args].map do |arg|
-            type = Scale::Types.get(arg[:type])
-            arg_obj = type.decode(scale_bytes)
-            {name: arg[:name], type: arg[:type], scale_type: type, value: arg_obj.value }
+            type = arg[:type]
+            scale_type = Scale::Types.get(type)
+            obj = scale_type.decode(scale_bytes)
+            {name: arg[:name], type: type, scale_type: scale_type, value: obj.value }
           end
         end
 
@@ -123,6 +124,24 @@ module Scale
       end
     end
 
+    class Phase
+      include Enum
+      items isApplyExtrinsic: "Bool", asApplyExtrinsic: "U32", isFinalization: "Bool", isInitialization: "Bool"
+    end
+
+    class EventRecords
+      include SingleValue
+      
+      def self.decode(scale_bytes)
+
+        length = Compact.decode(scale_bytes).value
+
+        length.times do |i|
+          ev = EventRecord.decode(scale_bytes)
+        end
+      end
+    end
+
     class EventRecord
       include SingleValue