scale.rb 0.2.12 → 0.2.17

data/scale.gemspec

@@ -33,14 +33,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "substrate_common.rb", "~> 0.1.9"
+  spec.add_dependency "blake2b_rs", "~> 0.1.2"
+  spec.add_dependency "xxhash"
+  spec.add_dependency "base58"
   spec.add_dependency "json", "~> 2.3.0"
-  spec.add_dependency "activesupport", ">= 4.0.0"
-  spec.add_dependency "thor", "~> 0.19.0"
+  spec.add_dependency "faye-websocket"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "ffi", "~> 1.12"
+  spec.add_development_dependency "ffi", "~> 1.15.0"
 end

data/scripts/block_events.rb

@@ -2,7 +2,6 @@ require "scale"
 
 
 client = SubstrateClient.new("ws://127.0.0.1:9944/")
-client.init
 metadata = client.get_metadata nil
 
 the_module = metadata.get_module("CertificateModule")
@@ -23,7 +22,7 @@ puts "CertificateModule storages:"
 puts "---------------------------------------"
 puts the_module[:storage][:items]
 
-# Scale::TypeRegistry.instance.metadata = metadata.value
+# Scale::TypeRegistry.instance.metadata = metadata
 # puts metadata.value.event_index["0400"][1]
 # puts metadata.value.event_index["0401"][1]
 # puts metadata.value.event_index["0402"][1]
@@ -31,4 +30,4 @@ puts the_module[:storage][:items]
 # scale_bytes = Scale::Bytes.new(hex_events)
 # Scale::Types.get("Vec<EventRecord>").decode(scale_bytes).value.each do |er|
 #   puts er.value
-# end
+# end

data/src/lib.rs

@@ -1,6 +1,17 @@
 extern crate parity_scale_codec;
 use std::slice;
-use parity_scale_codec::{Decode};
+use parity_scale_codec::{Encode, Decode};
+use frame_support::Twox128;
+use frame_support::Blake2_128Concat;
+use frame_support::StorageHasher;
+
+fn to_u8_vec(v_pointer: *const u8, len: usize) -> Vec<u8> {
+	let data_slice = unsafe {
+		assert!(!v_pointer.is_null());
+		slice::from_raw_parts(v_pointer, len)
+	};
+	data_slice.to_vec()
+}
 
 fn decode_from_raw_parts<T: Decode + PartialEq + std::fmt::Debug>(v_pointer: *const u8, len: usize) -> T {
     let data_slice = unsafe {
@@ -49,6 +60,36 @@ pub extern fn parse_opt_bool(v_pointer: *const u8, len: usize, inner_value: bool
     assert_eq!(decode_from_raw_parts::<Option<bool>>(v_pointer, len), expectation);
 }
 
+#[no_mangle]
+pub extern fn assert_storage_key_for_value(
+	mv_pointer: *const u8, mv_len: usize, 
+	sv_pointer: *const u8, sv_len: usize, 
+	ev_pointer: *const u8, ev_len: usize
+) {
+	let m = to_u8_vec(mv_pointer, mv_len);
+	let s = to_u8_vec(sv_pointer, sv_len);
+	let e = to_u8_vec(ev_pointer, ev_len);
+
+	let k = [Twox128::hash(&m), Twox128::hash(&s)].concat();
+	assert_eq!(k, e);
+}
+
+#[no_mangle]
+pub extern fn assert_storage_key_for_map_black2128concat(
+	mv_pointer: *const u8, mv_len: usize, 
+	sv_pointer: *const u8, sv_len: usize, 
+	pv_pointer: *const u8, pv_len: usize, 
+	ev_pointer: *const u8, ev_len: usize,
+) {
+	let m = to_u8_vec(mv_pointer, mv_len);
+	let s = to_u8_vec(sv_pointer, sv_len);
+	let p = to_u8_vec(pv_pointer, pv_len);
+	let e = to_u8_vec(ev_pointer, ev_len);
+	let mut k = [Twox128::hash(&m), Twox128::hash(&s)].concat();
+	k.extend(p.using_encoded(Blake2_128Concat::hash));
+	assert_eq!(k, e);
+}
+
 #[test]
 fn opt_bool_is_broken()
 {

data/src/storage_key.rs

@@ -0,0 +1,41 @@
+use frame_support::Twox128;
+use parity_scale_codec::Encode;
+use frame_support::{Identity, Blake2_128Concat, Twox64Concat};
+use frame_support::StorageHasher;
+
+pub fn to_hex_string(bytes: Vec<u8>) -> String {
+	let strs: Vec<String> = bytes.iter()
+		.map(|b| format!("{:02x}", b))
+		.collect();
+	strs.join("")
+}
+
+fn main() {
+	// value
+	let k = [Twox128::hash(b"Sudo"), Twox128::hash(b"Key")].concat();
+	println!("{}", to_hex_string(k));
+
+	// map
+	let mut k = [Twox128::hash(b"ModuleAbc"), Twox128::hash(b"Map1")].concat();
+	k.extend(vec![1u8, 0, 0, 0].using_encoded(Blake2_128Concat::hash));
+	println!("{}", to_hex_string(k));
+
+	let mut k = [Twox128::hash(b"ModuleAbc"), Twox128::hash(b"Map2")].concat();
+	k.extend(1u32.using_encoded(Twox64Concat::hash));
+	println!("{}", to_hex_string(k));
+
+	let mut k = [Twox128::hash(b"ModuleAbc"), Twox128::hash(b"Map3")].concat();
+	k.extend(1u32.using_encoded(Identity::hash));
+	println!("{}", to_hex_string(k));
+
+	// double map
+	let mut k = [Twox128::hash(b"ModuleAbc"), Twox128::hash(b"DoubleMap1")].concat();
+	k.extend(1u32.using_encoded(Blake2_128Concat::hash));
+	k.extend(2u32.using_encoded(Blake2_128Concat::hash));
+	println!("{}", to_hex_string(k));
+
+	let mut k = [Twox128::hash(b"ModuleAbc"), Twox128::hash(b"DoubleMap2")].concat();
+	k.extend(1u32.using_encoded(Blake2_128Concat::hash));
+	k.extend(2u32.using_encoded(Twox64Concat::hash));
+	println!("{}", to_hex_string(k));
+}

metadata

@@ -1,85 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: scale.rb
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.17
 platform: ruby
 authors:
 - Wu Minzhe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: substrate_common.rb
+  name: blake2b_rs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: json
+  name: xxhash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: base58
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -128,23 +142,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.15.0
 description: Ruby implementation of the parity SCALE data format
 email:
 - wuminzhe@gmail.com
-executables:
-- scale
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".dockerignore"
 - ".gitignore"
 - Cargo.lock
@@ -158,8 +170,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/scale
 - grants_badge.png
+- lib/address.rb
+- lib/common.rb
+- lib/helper.rb
 - lib/metadata/metadata.rb
 - lib/metadata/metadata_v0.rb
 - lib/metadata/metadata_v1.rb
@@ -177,8 +191,11 @@ files:
 - lib/scale.rb
 - lib/scale/base.rb
 - lib/scale/block.rb
+- lib/scale/trie.rb
 - lib/scale/types.rb
 - lib/scale/version.rb
+- lib/substrate_client.rb
+- lib/type_registry/crab.json
 - lib/type_registry/darwinia.json
 - lib/type_registry/default.json
 - lib/type_registry/edgeware.json
@@ -194,13 +211,14 @@ files:
 - scripts/block_events.rb
 - scripts/example.rb
 - src/lib.rs
+- src/storage_key.rs
 homepage: https://github.com/itering/scale.rb
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/itering/scale.rb
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby SCALE Codec Library
 test_files: []

data/exe/scale

@@ -1,80 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'scale'
-require 'thor'
-
-class ScaleCli < Thor
-  desc "specs", "list all chain specs"
-  def specs
-    path = File.join File.expand_path('../..', __FILE__), "lib", "type_registry", "*.json"
-    specs = Dir[path].map do |file|
-      File.basename file, ".json"
-    end
-    puts specs.join(", ")
-  end
-
-  # exmaples:
-  #   
-  #   scale types darwinia
-  #   =>
-  #   ProposalCategory => Scale::Types::ProposalCategory
-  #   VoteStage => Scale::Types::VoteStage
-  #   TallyType => Scale::Types::TallyType
-  #   ...
-  #
-  #   Count: 279
-  desc "types SPEC_NAME SPEC_VERSION", "list all types implemented for chain"
-  def types(spec_name = "default", spec_version = nil)
-    Scale::TypeRegistry.instance.load(spec_name, spec_version)
-    Scale::Types.list.each_pair do |type_name, type|
-      puts "#{green(type_name)} => #{yellow(type.to_s)}"
-    end
-
-    puts "\nCount: #{Scale::Types.list.length}"
-  end
-
-  # exmaples:
-  #
-  #   scale type Compact
-  #   => Scale::Types::Compact
-  #
-  #   scale type SessionKeysPolkadot kusama
-  #   => nil
-  #
-  #   scale type SessionKeysPolkadot kusama 1054
-  #   => Scale::Types::Struct_Of_AccountId_AccountId_AccountId_AccountId_AccountId_70247479160460
-  #
-  #   scale type "UnappliedSlash<AccountId, BalanceOf>"
-  #   => Scale::Types::Struct_Of_AccountId_AccountId_Vec˂UnappliedSlashOther˃_Vec˂AccountId˃_Balance_70145184872260
-  #
-  desc "type TYPE_NAME SPEC_NAME SPEC_VERSION", "show type's ruby class"
-  def type(type_name, spec_name = "default", spec_version = nil)
-    Scale::TypeRegistry.instance.load(spec_name, spec_version)
-    p Scale::Types.get(type_name)
-  end
-
-  # exmaples:
-  #
-  #   scale decode Compact 0x0300000040
-  #   => #<Scale::Types::Compact:0x00007fc86b9d1198 @value=1073741824>
-  desc "decode TYPE_NAME HEX SPEC_NAME SPEC_VERSION", "decode HEX string using TYPE_NAME"
-  def decode(type_name, hex, spec_name = "default", spec_version = nil)
-    Scale::TypeRegistry.instance.load(spec_name, spec_version)
-    type = Scale::Types.get(type_name)
-    scale_bytes = Scale::Bytes.new(hex)
-    p type.decode(scale_bytes)
-  end
-
-  # exmaples:
-  #
-  #   scale encode SessionIndex 2818
-  #   => #<Scale::Types::Compact:0x00007fc86b9d1198 @value=1073741824>
-  desc "encode TYPE_NAME VALUE SPEC_NAME SPEC_VERSION", "encode value"
-  def encode(type_name, value, spec_name = "default", spec_version = nil)
-    Scale::TypeRegistry.instance.load(spec_name, spec_version)
-    type = Scale::Types.get(type_name)
-    p "0x" + type.new(value.to_i).encode
-  end
-end
-
-ScaleCli.start(ARGV)