scale_rb 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946dbb730e56172125e2524d66c41650fb08a3b799576000b5254467080ec771
-  data.tar.gz: cae0b7ce708380ceeefa2bdd412abc30adbc5de5153b68bec12625497cf89e03
+  metadata.gz: 51cde569bc10814d0163c4b972c1d926a5ef69a044d02e88085db5bfdd9119a0
+  data.tar.gz: 694a2356b2626d1491c2dbb5cca8207179e614a88579c99bbd43a312c2435f9d
 SHA512:
-  metadata.gz: 3d9b11df5acc3538b9fd7af4aabd1db74f9fb0f08ab7bc2620299d2145beee2805eeee12b1948e33a9198b0141b4b6c57187bb99f984743dbfb1c7e62e9b0ca7
-  data.tar.gz: df6d923402362b259384fe585a83ee490dc3e5bc5154d41b886a74ee1ab19d3e1fa0e92c0a3f8c2b5ffb976f12138418728b0c046ac23470bb1954b12a65a048
+  metadata.gz: cbe20c371a268df323e64fcd9b142a8d04b87dc00e7079e1fd5e0979cbd4311de10b20687928200c427c407d839ce6ba0c804d5e08c72001a05d16b25b6faee8
+  data.tar.gz: 7e36ec4ef1d6e0b5584464498836fa5f19f4f7d194856c15bd25165bc6dd7f9f01e97cf0c736bc734806be83a26cc70b1fcb3b5986f95ba8fde0361dc76227b5

data/examples/http_client_2.rb

@@ -1,15 +1,20 @@
 require 'scale_rb'
 
+def fetch_some_storages(client, block_number)
+  start_time = Time.now
+
+  block_hash = client.chain_getBlockHash(block_number)
+  metadata = client.get_metadata(block_hash)
+  puts "event count: #{client.get_storage('System', 'EventCount', block_hash:, metadata:)}"
+  puts "treasury proposal #854: #{client.get_storage('Treasury', 'Proposals', [854], block_hash:, metadata:)}"
+  puts "all treasury proposals: #{client.get_storage('Treasury', 'Proposals', block_hash:, metadata:)}"
+  puts "child bounties: #{client.get_storage('ChildBounties', 'ChildBounties', [11, 1646], block_hash:, metadata:)}"
+
+  end_time = Time.now
+  puts "Time taken: #{end_time - start_time} seconds"
+end
+
 ScaleRb.logger.level = Logger::DEBUG
 
 client = ScaleRb::HttpClient.new('https://polkadot-rpc.dwellir.com')
-block_number = 21711742
-block_hash = client.chain_getBlockHash(block_number)
-metadata = client.get_metadata(block_hash)
-
-storage_query = ScaleRb::WsClient::StorageQuery.new(
-  pallet_name: 'System',
-  storage_name: 'Events',
-)
-storage = client.get_storage(block_hash, storage_query, metadata)
-puts "block #{block_number}(#{block_hash}) has #{storage.length} events"
+fetch_some_storages(client, 21711742)

data/examples/ws_client_4.rb

@@ -1,43 +1,21 @@
 require 'scale_rb'
 
-# ScaleRb.logger.level = Logger::DEBUG
+def fetch_some_storages(client, block_number)
+  start_time = Time.now
 
-ScaleRb::WsClient.start('wss://polkadot-rpc.dwellir.com') do |client|
-  block_number = 21711742
   block_hash = client.chain_getBlockHash(block_number)
   metadata = client.get_metadata(block_hash)
+  puts "event count: #{client.get_storage('System', 'EventCount', block_hash:, metadata:)}"
+  puts "treasury proposal #854: #{client.get_storage('Treasury', 'Proposals', [854], block_hash:, metadata:)}"
+  puts "all treasury proposals: #{client.get_storage('Treasury', 'Proposals', block_hash:, metadata:)}"
+  puts "child bounties: #{client.get_storage('ChildBounties', 'ChildBounties', [11, 1646], block_hash:, metadata:)}"
 
-  storage_query = ScaleRb::WsClient::StorageQuery.new(
-    pallet_name: 'System',
-    storage_name: 'EventCount',
-  )
-  puts "event count: #{client.get_storage(block_hash, storage_query, metadata)}"
-  # event count: 48
-
-
-  storage_query = ScaleRb::WsClient::StorageQuery.new(
-    pallet_name: 'Treasury',
-    storage_name: 'Proposals',
-    key_part1: 854,
-  )
-  puts "treasury proposal #854: #{client.get_storage(block_hash, storage_query, metadata)}"
-  # treasury proposal #854: {:proposer=>"0xb6f0f10eec993f3e6806eb6cc4d2f13d5f5a90a17b855a7bf9847a87e07ee322", :value=>82650000000000, :beneficiary=>"0xb6f0f10eec993f3e6806eb6cc4d2f13d5f5a90a17b855a7bf9847a87e07ee322", :bond=>0}
-
-
-  storage_query = ScaleRb::WsClient::StorageQuery.new(
-    pallet_name: 'Treasury',
-    storage_name: 'Proposals',
-  )
-  puts "all treasury proposals: #{client.get_storage(block_hash, storage_query, metadata)}"
-  # all treasury proposals: [{:storage_key=>"0x89d139e01a5eb2256f222e5fc5dbe6b388c2f7188c6fdd1dffae2fa0d171f4400c1910093df9204856030000", :storage=>{:proposer=>"0xb6f0f10eec993f3e6806eb6cc4d2f13d5f5a90a17b855a7bf9847a87e07ee322", :value=>82650000000000, :beneficiary=>"0xb6f0f10eec993f3e6806eb6cc4d2f13d5f5a90a17b855a7bf9847a87e07ee322", :bond=>0}}, ...]
+  end_time = Time.now
+  puts "Time taken: #{end_time - start_time} seconds"
+end
 
+ScaleRb.logger.level = Logger::DEBUG
 
-  storage_query = ScaleRb::WsClient::StorageQuery.new(
-    pallet_name: 'ChildBounties',
-    storage_name: 'ChildBounties',
-    key_part1: 11,
-    key_part2: 1646
-  )
-  puts "child bounties: #{client.get_storage(block_hash, storage_query, metadata)}"
-  # child bounties: {:parent_bounty=>11, :value=>3791150000000, :fee=>0, :curator_deposit=>0, :status=>{:PendingPayout=>{:curator=>"0xb1725c0de514e0df808b19dbfca26672019ea5f9e2eb69c0055c7f1d01b4f18a", :beneficiary=>"0xb089dedc24a15308874dc862b035d74f2f7b45cad475d6121a2d944921bbe237", :unlock_at=>21703671}}}
+ScaleRb::WsClient.start('wss://polkadot-rpc.dwellir.com') do |client|
+  fetch_some_storages(client, 21711742)
 end

data/lib/client/client_ext.rb

@@ -2,37 +2,31 @@ module ScaleRb
 
   # This module is used to add extra methods to both the ScaleRb::WsClient ScaleRb::HttpClient
   module ClientExt
-    StorageQuery = Struct.new(:pallet_name, :storage_name, :key_part1, :key_part2, keyword_init: true) do
-      def initialize(pallet_name:, storage_name:, key_part1: nil, key_part2: nil)
-        super
-      end
-    end
-
     # get decoded metadata at block_hash
-    def get_metadata(block_hash)
+    def get_metadata(block_hash = nil)
+      block_hash ||= chain_getHead
       metadata_hex = state_getMetadata(block_hash)
       ScaleRb::Metadata.decode_metadata(metadata_hex.strip._to_bytes)
     end
 
     # Get decoded storage at block_hash
-    def get_storage(block_hash, storage_query, metadata = nil)
+    def get_storage(pallet_name, storage_name, params = [], block_hash: nil, metadata: nil)
+      block_hash ||= chain_getHead
       metadata ||= get_metadata(block_hash)
 
       # storeage item
-      pallet_name = convert_to_camel_case storage_query.pallet_name
-      storage_name = convert_to_camel_case storage_query.storage_name
+      pallet_name = convert_to_camel_case pallet_name
+      storage_name = convert_to_camel_case storage_name
 
       # storage param
-      key = [storage_query.key_part1, storage_query.key_part2].compact
-      ScaleRb.logger.debug "#{pallet_name}.#{storage_name}(#{key.join(', ')})"
-      key = key.map { |part_of_key| c(part_of_key) }
-      ScaleRb.logger.debug "converted key: #{key}"
+      ScaleRb.logger.debug "#{pallet_name}.#{storage_name}(#{params.inspect})"
+      params = params.map { |param| c(param) }
 
       get_storage2(
         block_hash, # at
         pallet_name,
         storage_name,
-        key,
+        params,
         metadata
       )
     end
@@ -102,7 +96,7 @@ module ScaleRb
     #
     # key is for the param, value is for the return
     def get_storage1(block_hash, pallet_name, item_name, key, value, registry)
-      ScaleRb::logger.debug "get_storage1: #{pallet_name}.#{item_name} key: #{key} value: #{value}"
+      ScaleRb.logger.debug "#{pallet_name}.#{item_name}, key: #{key.inspect}, value: #{value}"
 
       if key
         if key[:value].nil? || key[:value].empty?
@@ -138,7 +132,6 @@ module ScaleRb
     end
 
     def get_storage2(block_hash, pallet_name, item_name, params, metadata)
-      ScaleRb.logger.debug "get_storage2: #{pallet_name}.#{item_name} params: #{params}"
       raise 'Metadata should not be nil' if metadata.nil?
 
       registry = Metadata.build_registry(metadata)

data/lib/client/http_client.rb

@@ -50,7 +50,7 @@ module ScaleRb
     end
 
     def method_missing(method, *args)
-      ScaleRb.logger.debug "#{method}(#{args.join(', ')})"
+      # ScaleRb.logger.debug "#{method}(#{args.join(', ')})"
 
       request(method.to_s, args)
     end

data/lib/client/ws_client.rb

@@ -22,7 +22,7 @@ module ScaleRb
                 data = parse_message(message)
                 next if data.nil?
 
-                ScaleRb.logger.debug "Received response: #{data}"
+                ScaleRb.logger.debug "Response: #{data}"
                 Async do
                   client.handle_response(data)
                 end
@@ -71,7 +71,7 @@ module ScaleRb
 
     def method_missing(method, *args)
       method = method.to_s
-      ScaleRb.logger.debug "#{method}(#{args.join(', ')})"
+      # ScaleRb.logger.debug "#{method}(#{args.join(', ')})"
 
       # why not check 'rpc_methods', because there is no @supported_methods when initializing
       if method != 'rpc_methods' && !@supported_methods.include?(method)
@@ -142,7 +142,7 @@ module ScaleRb
       })
 
       request = { jsonrpc: '2.0', id: @request_id, method: method, params: params }
-      ScaleRb.logger.debug "Sending request: #{request}"
+      ScaleRb.logger.debug "Request: #{request}"
       @connection.write(request.to_json)
 
       @request_id += 1

data/lib/codec.rb

@@ -404,6 +404,8 @@ module ScaleRb
     end
 
     def encode_uint(type, value)
+      raise InvalidValueError, "type: #{type}, value: #{value.inspect}" unless value.instance_of?(Integer)
+
       bit_length = type[1..].to_i
       value._to_bytes(bit_length)._flip
     end

data/lib/scale_rb/version.rb

@@ -1,3 +1,3 @@
 module ScaleRb
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

data/lib/storage_helper.rb

@@ -20,12 +20,14 @@ module ScaleRb
               ]
             else
               [
-                registry[key[:type]]._get(:def)._get(:tuple),
+                registry[key[:type]]._get(:def)._get(:tuple).first(key[:value].length),
                 key[:value],
-                key[:hashers]
+                key[:hashers].first(key[:value].length)
               ]
             end
 
+          ScaleRb.logger.debug "encode_storage_key: key_values: #{key_values.inspect}, key_types: #{key_types.inspect}, key_hashers: #{key_hashers.inspect}"
+
           if key_types.class != key_values.class || key_types.length != key_values.length
             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."
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scale_rb
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Aki Wu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58