scale.rb 0.2.13 → 0.2.18

data/lib/scale/block.rb

@@ -10,7 +10,7 @@ module Scale
       end
 
       def self.decode(scale_bytes)
-        metadata = Scale::TypeRegistry.instance.metadata
+        metadata = Scale::TypeRegistry.instance.metadata.value
         result = {}
 
         extrinsic_length = Compact.decode(scale_bytes).value
@@ -24,9 +24,6 @@ module Scale
           if contains_transaction
             address = Scale::Types.get("Address").decode(scale_bytes)
             result[:address] = address.value
-            result[:account_length] = address.account_length
-            result[:account_id] = address.account_id
-            result[:account_index] = address.account_index
             result[:signature] = Scale::Types.get("Signature").decode(scale_bytes).value
             result[:nonce] = Scale::Types.get("Compact").decode(scale_bytes).value
             result[:era] = Scale::Types.get("Era").decode(scale_bytes).value
@@ -39,9 +36,6 @@ module Scale
           if contains_transaction
             address = Scale::Types.get("Address").decode(scale_bytes)
             result[:address] = address.value
-            result[:account_length] = address.account_length
-            result[:account_id] = address.account_id
-            result[:account_index] = address.account_index
             result[:signature] = Scale::Types.get("Signature").decode(scale_bytes).value
             result[:era] = Scale::Types.get("Era").decode(scale_bytes).value
             result[:nonce] = Scale::Types.get("Compact").decode(scale_bytes).value
@@ -55,9 +49,6 @@ module Scale
           if contains_transaction
             address = Scale::Types.get("Address").decode(scale_bytes)
             result[:address] = address.value
-            result[:account_length] = address.account_length
-            result[:account_id] = address.account_id
-            result[:account_index] = address.account_index
             result[:signature] = Scale::Types.get("Signature").decode(scale_bytes).value
             result[:era] = Scale::Types.get("Era").decode(scale_bytes).value
             result[:nonce] = Scale::Types.get("Compact").decode(scale_bytes).value
@@ -69,16 +60,11 @@ module Scale
         elsif version_info == "0x04" || version_info == "0x84"
 
           if contains_transaction
-            address = Scale::Types.get("Address").decode(scale_bytes)
-            result[:address] = address.value
-            result[:account_length] = address.account_length
-            result[:account_id] = address.account_id
-            result[:account_index] = address.account_index
-            result[:signature_version] = Scale::Types.get("U8").decode(scale_bytes).value
-            result[:signature] = Scale::Types.get("Signature").decode(scale_bytes).value
-            result[:era] = Scale::Types.get("Era").decode(scale_bytes).value
-            result[:nonce] = Scale::Types.get("Compact").decode(scale_bytes).value
-            result[:tip] = Scale::Types.get("Compact").decode(scale_bytes).value
+            result[:address] = Scale::Types.get("Address").decode(scale_bytes).value
+            result[:signature] = scale::types.get("MultiSignature").decode(scale_bytes).value
+            result[:era] = scale::types.get("era").decode(scale_bytes).value
+            result[:nonce] = scale::types.get("compact").decode(scale_bytes).value
+            result[:tip] = scale::types.get("compact").decode(scale_bytes).value
             result[:extrinsic_hash] = generate_hash(scale_bytes.bytes)
           end
           result[:call_index] = scale_bytes.get_next_bytes(2).bytes_to_hex[2..]
@@ -146,7 +132,7 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
-        metadata = Scale::TypeRegistry.instance.metadata
+        metadata = Scale::TypeRegistry.instance.metadata.value
 
         result = {}
         phase = scale_bytes.get_next_bytes(1).first
@@ -155,9 +141,13 @@ module Scale
           result[:extrinsic_idx] = U32.decode(scale_bytes).value
         end
 
-        type = scale_bytes.get_next_bytes(2).bytes_to_hex[2..]
-        event = metadata.event_index[type][1]
-        # mod = metadata.event_index[type][0]
+        index = scale_bytes.get_next_bytes(2).bytes_to_hex[2..]
+        event = metadata.event_index[index][1]
+        the_module = metadata.event_index[index][0]
+
+        result[:event_index] = index
+        result[:event_metadata] = event
+        result[:module_metadata] = the_module
 
         result[:params] = []
         event[:args].each do |arg_type|
@@ -175,18 +165,18 @@ module Scale
       end
     end
 
-    # log
-    class Other < Bytes; end
-
     class AuthoritiesChange 
       include Vec
       inner_type "AccountId"
     end
 
-    class ConsensusEngineId < VecU8Length4; end
+    class GenericConsensusEngineId < VecU8Length4; end
 
     class ChangesTrieRoot < Bytes; end
 
+    # log
+    class Other < Bytes; end
+
     class SealV0
       include Struct
       items(

data/lib/scale/trie.rb

@@ -10,6 +10,7 @@ module Scale
       NIBBLE_SIZE_BOUND = 65535
 
       def self.decode(scale_bytes)
+        hash = "0x#{Crypto::blake2_256(scale_bytes.bytes)}"
         first = scale_bytes.get_next_bytes(1).first
         if first == EMPTY
           TrieNode.new({})
@@ -44,6 +45,7 @@ module Scale
             value_bytes = scale_bytes.get_next_bytes(count)
 
             return TrieNode.new({
+              hash: hash,
               node_type: "leaf",
               partial: {
                 hex: partial_bytes.bytes_to_hex, 
@@ -80,8 +82,8 @@ module Scale
               if has_child
                 count = Compact.decode(scale_bytes).value
                 if count == 32
-                  hash = H256.decode(scale_bytes).value
-                  children[i] = hash
+                  h = H256.decode(scale_bytes).value
+                  children[i] = h
                 else
                   inline = scale_bytes.get_next_bytes count
                   children[i] = inline.bytes_to_hex
@@ -98,6 +100,7 @@ module Scale
             # end
 
             result = TrieNode.new({
+              hash: hash,
               node_type: "branch",
               partial: {
                 hex: partial_bytes.bytes_to_hex, 
@@ -115,7 +118,54 @@ module Scale
 
         end
       end
+
+      def self.check(root, proof, key)
+        key = Key.new(key)
+
+        nodes = proof.map {|node_data| 
+          node = TrieNode::decode(Scale::Bytes.new(node_data)).value
+          [node[:hash], node]
+        }.to_h
+
+        self.do_check(root, nodes, key)
+      end
+
+      private
+      def self.do_check(hash, nodes, key)
+        if node = nodes[hash]
+          if node[:children]
+            position = key.next_nibble(node[:partial][:hex], node[:partial][:padding]).to_i(16)
+            child = node[:children][position]
+            return self.do_check(child, nodes, key)
+          else
+            return node[:value]
+          end
+        else
+          raise "Fail"
+        end
+      end
     end
 
   end
 end
+
+class Key
+  def initialize(value)
+    @value = value[2..] if value.start_with?("0x")
+    @offset = 0
+  end
+
+  def next_nibble(partial, padding)
+    partial = partial[2..] if partial.start_with?("0x")
+    partial = partial[1..] if padding
+
+    new_offset = @offset + partial.length
+    if partial == @value[@offset...new_offset]
+      nibble = @value[new_offset]
+      @offset = new_offset + 1
+      return nibble
+    else
+      raise "Fail"
+    end
+  end
+end

data/lib/scale/types.rb

@@ -6,10 +6,13 @@ module Scale
       BYTES_LENGTH = 1
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(self::BYTES_LENGTH)
         if bytes == [0]
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Bool.new(false)
         elsif bytes == [1]
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Bool.new(true)
         else
           raise "Bad data"
@@ -80,6 +83,7 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         first_byte = scale_bytes.get_next_bytes(1)[0]
         first_byte_in_bin = first_byte.to_s(2).rjust(8, "0")
 
@@ -113,6 +117,7 @@ module Scale
               .to_i(16)
           end
 
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         Compact.new(value)
       end
 
@@ -141,6 +146,7 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         length = Scale::Types::Compact.decode(scale_bytes).value
         bytes = scale_bytes.get_next_bytes(length)
 
@@ -148,8 +154,10 @@ module Scale
         # => "Café"
         str = bytes.pack("C*").force_encoding("utf-8")
         if str.valid_encoding?
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Bytes.new str
         else
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Bytes.new bytes.bytes_to_hex
         end
       end
@@ -171,8 +179,10 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         length = Scale::Types::Compact.decode(scale_bytes).value
         hex_string = scale_bytes.get_next_bytes(length).bytes_to_hex
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         Hex.new(hex_string)
       end
     end
@@ -180,8 +190,10 @@ module Scale
     class String
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         length = Scale::Types::Compact.decode(scale_bytes).value
         bytes = scale_bytes.get_next_bytes(length)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         String.new bytes.pack("C*").force_encoding("utf-8")
       end
     end
@@ -189,7 +201,9 @@ module Scale
     class H160
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(20)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         H160.new(bytes.bytes_to_hex)
       end
 
@@ -202,7 +216,9 @@ module Scale
     class H256
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(32)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         H256.new(bytes.bytes_to_hex)
       end
 
@@ -215,7 +231,9 @@ module Scale
     class H512
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(64)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         H512.new(bytes.bytes_to_hex)
       end
 
@@ -234,12 +252,14 @@ module Scale
       # the <address> is 32 byte account id or 1, 2, 4, 8 byte account index
       # scale_bytes: account length byte  + <address>'s bytes
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         account_length = scale_bytes.get_next_bytes(1).first
 
         if account_length == 0xff # 32 bytes address(Public key)
           account_id = scale_bytes.get_next_bytes(32).bytes_to_hex
           account_length = [account_length].bytes_to_hex
 
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Address.new({
             account_id: account_id,
             account_length: account_length
@@ -258,6 +278,7 @@ module Scale
           # TODO: add account_idx 
           account_length = [account_length].bytes_to_hex
 
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
           Address.new({
             account_index: account_index,
             account_length: account_length
@@ -280,10 +301,14 @@ module Scale
 
     class AccountIdAddress < GenericAddress
       def self.decode(scale_bytes)
-        AccountIdAddress.new({
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        result = AccountIdAddress.new({
           account_id: AccountId.decode(scale_bytes).value,
           account_length: "0xff"
         })
+
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        result
       end
 
       def encode
@@ -304,12 +329,15 @@ module Scale
     class Era
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         byte = scale_bytes.get_next_bytes(1).bytes_to_hex
-        if byte == "0x00"
+        result = if byte == "0x00"
           Era.new byte
         else
           Era.new byte + scale_bytes.get_next_bytes(1).bytes_to_hex()[2..]
         end
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        result
       end
     end
 
@@ -320,12 +348,14 @@ module Scale
     class CompactMoment
       include SingleValue
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         value = Compact.decode(scale_bytes).value
         if value > 10000000000
           value /= 1000
         end
 
-        CompactMoment.new Time.at(value).to_datetime.strftime("%F %T")
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        CompactMoment.new Time.at(value).strftime("%F %T")
       end
     end
 
@@ -570,34 +600,52 @@ module Scale
 
     class VecU8Length2
       include VecU8FixedLength
+      BYTE_LENGTH = 2
     end
 
     class VecU8Length3
       include VecU8FixedLength
+      BYTE_LENGTH = 3
     end
 
     class VecU8Length4
       include VecU8FixedLength
+      BYTE_LENGTH = 4
     end
 
     class VecU8Length8
       include VecU8FixedLength
+      BYTE_LENGTH = 8
     end
 
     class VecU8Length16
       include VecU8FixedLength
+      BYTE_LENGTH = 16
     end
 
     class VecU8Length20
       include VecU8FixedLength
+      BYTE_LENGTH = 20
     end
 
     class VecU8Length32
       include VecU8FixedLength
+      BYTE_LENGTH = 32
     end
 
     class VecU8Length64
       include VecU8FixedLength
+      BYTE_LENGTH = 64
+    end
+
+    class VecU8Length128
+      include VecU8FixedLength
+      BYTE_LENGTH = 128
+    end
+
+    class VecU8Length256
+      include VecU8FixedLength
+      BYTE_LENGTH = 256
     end
 
     class BalanceLock
@@ -614,7 +662,9 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(20)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         EthereumAddress.new(bytes.bytes_to_hex)
       end
 
@@ -631,8 +681,10 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(65)
         EcdsaSignature.new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
       end
 
       def encode
@@ -740,7 +792,11 @@ module Scale
     class VoteOutcome
       include SingleValue
       def self.decode(scale_bytes)
-        new(scale_bytes.get_next_bytes(32))
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        result = new(scale_bytes.get_next_bytes(32))
+        
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        result
       end
     end
 
@@ -781,6 +837,7 @@ module Scale
       include SingleValue
 
       def self.decode(scale_bytes, metadata, chain_spec)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         call_index = scale_bytes.get_next_bytes(2).bytes_to_hex[2..]
         call_module, call = metadata.value.call_index[call_index]
 
@@ -789,6 +846,7 @@ module Scale
           {name: arg[:name], type: arg[:type], value: arg_obj.encode, value_raw: arg_obj.value}
         end
 
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         self.new({
           call_index: call_index, 
           call_function: call[:name],
@@ -826,6 +884,15 @@ module Scale
       end
     end
 
+    class GenericBlock
+      include SingleValue
+
+      def self.decode(scale_bytes)
+      end
+
+      def encode
+      end
+    end
 
   end
 end