scale.rb 0.2.18 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c509663910bc3e5dd790fd40e4e0d04ac4f589c44a0253b8b1b353b17687d82
-  data.tar.gz: 30249e26671d18d7568c58df2926a5aa071a4ca7b25af443315c8a92a65d292f
+  metadata.gz: 45e42a3b0f9d6934412cf21cf4eff6576846b914e1f93f136ba5cf9188cca349
+  data.tar.gz: 905d9f7d1fdeed1ef44050e5d187e775fed65e322acd9e0d3ed6c638b8676f40
 SHA512:
-  metadata.gz: 4ce9f292eeca2be4bc9f2967f9806730bedfd2fc14b4837a6d3cbea2808f62fbadffd31a40e218968ad2bac886338359bb01c164ed9a781186d78f54dbfb7293
-  data.tar.gz: 590a67087cdd8fe40717a0ec255bf0c824e807eec1f5f476c856b5002280f7680f0534559648e3ec3470a66194fd9fa141a1b1a277bbebc8dea15cc838027c5c
+  metadata.gz: 15a61c8fe8bc16594feff4c4fe6898bb9a826a3a1bb22eec7f6f483cb5f2a053d6ac69a6431a2bcf8ce41cfbf41a04860799c2d625b232953be0386a948464e7
+  data.tar.gz: e74c876481194337664d0e0df5ed1862452262cb7beb2e575912a043e24268c404b55ada4ee3b908f07511b029ad3399d63894e0503ce6b9fa04f0a35ebac735

data/.gitignore

@@ -10,3 +10,4 @@
 /.idea
 /target
 .DS_Store
+/scripts/tmp.rb

data/Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -15,6 +17,8 @@ name = "SCALE-testing-interface"
 version = "0.1.0"
 dependencies = [
  "frame-support",
+ "hex",
+ "libc",
  "parity-scale-codec",
  "sp-core",
 ]
@@ -642,9 +646,9 @@ dependencies = [
 
 [[package]]
 name = "hex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hmac"
@@ -744,9 +748,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.82"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
 
 [[package]]
 name = "libsecp256k1"

data/Cargo.toml

@@ -8,11 +8,10 @@ edition = "2018"
 parity-scale-codec = { version = "1.3.6" }
 sp-core = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git", features = ["full_crypto"]}
 frame-support = { version = "2.0.0", git = "https://github.com/paritytech/substrate.git" }
+libc = { version = "0.2.94" }
+hex = { version = "0.4.3" }
 
 [lib]
 name = "scale_ffi"
 crate-type = ["dylib"]
 
-[[bin]]
-name = "storage_key"
-path = "src/storage_key.rs"

data/Dockerfile

@@ -15,7 +15,10 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
     export RUSTFLAGS='-C target-feature=-crt-static' && \
     make
 
-RUN gem install bundler:1.17.3 && \
+ENV RUSTFLAGS='-C target-feature=-crt-static'
+ENV PATH=/root/.cargo/bin:$PATH
+
+RUN gem install bundler:2.2.13 && \
     bundle install && \
     rake install:local
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale.rb (0.2.18)
+    scale.rb (0.3.2)
       base58
       blake2b_rs (~> 0.1.2)
       faye-websocket
@@ -19,7 +19,7 @@ GEM
     coderay (1.1.3)
     diff-lcs (1.4.4)
     eventmachine (1.2.7)
-    faye-websocket (0.11.0)
+    faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.15.0)
@@ -49,7 +49,7 @@ GEM
       tomlrb (~> 1.2)
     thor (1.1.0)
     tomlrb (1.3.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xxhash (0.4.0)

data/README.md

@@ -1,5 +1,7 @@
 ![grants_badge](./grants_badge.png)
 
+**Warning: After v0.2.19, the develop branch will do a structure refactor and big optimization.**
+
 # scale.rb
 
 **Ruby SCALE Codec Library**
@@ -19,7 +21,7 @@ Because the feature of ruby 2.6 is used, the ruby version is required to be >= 2
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'scale.rb', '0.2.18'
+gem 'scale.rb', '0.2.19'
 ```
 
 And then execute:
@@ -73,9 +75,23 @@ p o.encode # "080001"
 3. client
 ```ruby
 require "scale"
-
-client = SubstrateClient.new "wss://pangolin-rpc.darwinia.network"
-client.get_storage("EthereumRelay", "ConfirmedHeaderParcels", [0])
+client = SubstrateClient.new "wss://rpc.darwinia.network"
+
+v = Scale::Types.get("EthereumTransactionIndex")
+  .new(
+    [
+      Scale::Types::H256.new("0x803054c2beacabc36e15c3147bb87d8320a02e9b601be28820a622dedd1c7717"),
+      Scale::Types::U64.new(266)
+    ]
+  )
+
+storage = client.get_storage("EthereumBacking", "VerifiedProof", [v])
+puts storage.to_human
+
+# get the raw data
+key = client.generate_storage_key("EthereumBacking", "VerifiedProof", [v])[0]
+storage_raw = client.state_getStorageAt(key)
+puts storage_raw
 
 ```
 Please go to `spec` dir for more examples.

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler/gem_tasks'
+require "scale"
 task default: :spec
+
+desc 'Check types of a spec'
+task :check_types do
+  TypeRegistry.instance.load spec_name: 'darwinia'
+end

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)

data/lib/metadata/metadata.rb

@@ -1,12 +1,16 @@
 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
+          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
@@ -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