scale_rb 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ecdacacab52152c1db21cd934b452fca391320112c7a8a1c5a8479b4df9946
-  data.tar.gz: 637a12f9313b048bcd7e5c77dd34862225db553b0e42f620736aea5c78505a49
+  metadata.gz: b9af24645257f5dc7c2028047ba01ef9a3d1fe4282581717cb62334a6f96f153
+  data.tar.gz: 8d79a47702d593158680d4fe2f5a887962fd87bc19e51e2d57b4ea6ca2ec0a9b
 SHA512:
-  metadata.gz: 18c6f40b6f41b3fa59a08c93a44b348e94642fe510f695576b164d5b0ad70362bfa0ade33823c422b85b9db55f2f23995598c9990c2a4b7c6e6113cb17b73ba0
-  data.tar.gz: bbb523afb3209dfd58827094cc4f1fce4d841fff5bba5b94538a736edac05803fb0dd3624dcedc5d2c068944614f7d43e053528574df402713f56b9ecb03c2ce
+  metadata.gz: b573f530576618d07382f3b995cc5413a564e4bf95149882cc83b6cb0d885e2adee2f903b5db0c8a14fd5b6964683b6851f6105e0c53c6bcb98e625c2991a639
+  data.tar.gz: efa796fe20f73749749bfd06de0f08c1d836268ddb99963775003f282eff60e15accd4d62556eaa1d01b0821447bdcb4bd8956e5445401ca562da2df1fc547f8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale_rb (0.1.9)
+    scale_rb (0.1.11)
       base58
       blake2b_rs (~> 0.1.4)
       xxhash

data/lib/client/http_client.rb

@@ -4,24 +4,34 @@ require 'uri'
 require 'net/http'
 require 'json'
 
+# TODO: method_name = cmd.gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase
 module ScaleRb
   module HttpClient
     extend RpcRequestBuilder
 
     class << self
       def request(url, body)
+        ScaleRb.logger.debug "url: #{url}"
+        ScaleRb.logger.debug "body: #{body}"
         uri = URI(url)
         req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
         req.body = body
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true if uri.instance_of? URI::HTTPS
         res = http.request(req)
-        # puts res unless res.is_a?(Net::HTTPSuccess)
+
+        raise res.class.name unless res.is_a?(Net::HTTPSuccess)
 
         result = JSON.parse(res.body)
-        raise result['error'] if result['error']
+        ScaleRb.logger.debug result
+        raise result['error']['message'] if result['error']
 
         result['result']
+      rescue StandardError => e
+        ScaleRb.logger.error e.message
+        ScaleRb.logger.error 'retry...'
+        sleep 2
+        request(url, body)
       end
 
       def json_rpc_call(url, method, *params)
@@ -34,7 +44,20 @@ module ScaleRb
       end
 
       def method_missing(method, *args)
-        json_rpc_call(args[0], method, *args[1..])
+        ScaleRb.logger.debug "#{method}(#{args.join(', ')})"
+        # check if the first argument is a url
+        url_regex = %r{^https?://}
+        raise 'url format is not correct' unless args[0].match?(url_regex)
+
+        url = args[0]
+        raise NoMethodError, "undefined rpc method `#{method}'" unless rpc_methods(url).include?(method.to_s)
+
+        json_rpc_call(url, method, *args[1..])
+      end
+
+      def rpc_methods(url)
+        result = json_rpc_call(url, 'rpc_methods', [])
+        result['methods']
       end
 
       def get_metadata(url, at = nil)
@@ -157,4 +180,4 @@ module ScaleRb
       end
     end
   end
-end
+end

data/lib/portable_codec.rb

@@ -70,7 +70,23 @@ module PortableCodec
     def decode_array(array_type, bytes, registry)
       len = array_type._get(:len)
       inner_type_id = array_type._get(:type)
-      _decode_types([inner_type_id] * len, bytes, registry)
+
+      # check if the type of inner_type_id is a u8
+      if _u8?(inner_type_id, registry)
+        [
+          bytes[0...len].to_hex,
+          bytes[len..]
+        ]
+      else
+        _decode_types([inner_type_id] * len, bytes, registry)
+      end
+    end
+
+    def _u8?(type_id, registry)
+      type = registry[type_id]
+      raise TypeNotFound, "id: #{type_id}" if type.nil?
+
+      type._get(:def)._get(:primitive)&.downcase == 'u8'
     end
 
     def decode_sequence(sequence_type, bytes, registry)
@@ -242,7 +258,10 @@ module PortableCodec
 
       # if the variant item has more than one field, the value must be a hash with the same length.
       # if the variant item has only one field, that means the field is a type id point to a composite. TODO: check the type's fields length
-      raise VariantFieldsLengthNotMatch, "type: #{variant_type}, \nvalue: #{v}" if item._get(:fields).length > 1 && item._get(:fields).length != v.length
+      if item._get(:fields).length > 1 && item._get(:fields).length != v.length
+        raise VariantFieldsLengthNotMatch,
+              "type: #{variant_type}, \nvalue: #{v}"
+      end
 
       ScaleRb.encode_uint('u8', item._get(:index)) + encode_composite(item, v, registry)
     end

data/lib/scale_rb/version.rb

@@ -1,3 +1,3 @@
 module ScaleRb
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end

data/lib/scale_rb.rb

@@ -32,16 +32,14 @@ require 'address'
 
 module ScaleRb
   class << self
-    attr_writer :logger
-
-    def logger
-      @logger ||= Logger.new($stdout)
-      @logger.level = Logger::INFO
-      @logger
-    end
+    attr_accessor :logger
 
     def debug(key, value)
       logger.debug "#{key.rjust(15)}: #{value}"
     end
   end
 end
+
+logger = Logger.new($stdout)
+logger.level = Logger::INFO
+ScaleRb.logger = logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scale_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Aki Wu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blake2b_rs