scale.rb 0.2.17 → 0.3.1

data/lib/scale/block.rb

@@ -2,11 +2,11 @@ module Scale
   module Types
 
     class Extrinsic
-      include SingleValue
+      include Base
       # attr_accessor :address, :signature, :nonce, :era, :extrinsic_hash, :call_index, :params_raw, :params
 
-      def self.generate_hash(data)
-        Blake2b.hex data, Blake2b::Key.none, 32
+      def self.generate_hash(bytes)
+        Crypto.blake2_256 bytes
       end
 
       def self.decode(scale_bytes)
@@ -61,10 +61,10 @@ module Scale
 
           if contains_transaction
             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[: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..]
@@ -116,7 +116,7 @@ module Scale
     end
 
     class EventRecords
-      include SingleValue
+      include Base
       
       def self.decode(scale_bytes)
 
@@ -129,7 +129,7 @@ module Scale
     end
 
     class EventRecord
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
         metadata = Scale::TypeRegistry.instance.metadata.value
@@ -211,7 +211,7 @@ module Scale
 
     class LogDigest
       include Enum
-      items %w[Other AuthoritiesChange ChangesTrieRoot SealV0 Consensus Seal PreRuntime]
+      inner_types *%w[Other AuthoritiesChange ChangesTrieRoot SealV0 Consensus Seal PreRuntime]
     end
 
   end

data/lib/scale/trie.rb

@@ -2,7 +2,7 @@ module Scale
   module Types
     
     class TrieNode
-      include SingleValue
+      include Base
       EMPTY = 0
       NIBBLE_PER_BYTE = 2
       BITMAP_LENGTH = 2

data/lib/scale/types.rb

@@ -2,15 +2,18 @@ module Scale
   module Types
 
     class Bool
-      include SingleValue
+      include Base
       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]
-          Bool.new(false)
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new(false)
         elsif bytes == [1]
-          Bool.new(true)
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new(true)
         else
           raise "Bad data"
         end
@@ -21,6 +24,35 @@ module Scale
       end
     end
 
+    class OptionBool
+      include Base
+      def self.decode(scale_bytes)
+        byte = scale_bytes.get_next_bytes(1)[0]
+        value = if byte == 0x00
+                  nil
+                elsif byte == 0x01
+                  true
+                elsif byte == 0x02
+                  false
+                else
+                  raise BadDataError.new("Bad scale data for OptionBool #{byte.to_s(16)}")
+                end
+        new(value)
+      end
+
+      def encode
+        if value.nil?
+          "00"
+        elsif value === true
+          "01"
+        elsif value === false
+          "02"
+        else
+          raise WrongValueError.new("OptionBool can not have value other than `nil`, `true`, `false`")
+        end
+      end
+    end
+
     class U8
       include FixedWidthUInt
       BYTE_LENGTH = 1
@@ -51,6 +83,11 @@ module Scale
       BYTE_LENGTH = 32
     end
 
+    class U512
+      include FixedWidthUInt
+      BYTE_LENGTH = 64
+    end
+
     class I8
       include FixedWidthInt
       BYTE_LENGTH = 1
@@ -77,9 +114,10 @@ module Scale
     end
 
     class Compact
-      include SingleValue
+      include Base
 
       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,7 +151,8 @@ module Scale
               .to_i(16)
           end
 
-        Compact.new(value)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(value)
       end
 
       def encode
@@ -138,9 +177,10 @@ module Scale
     end
 
     class Bytes
-      include SingleValue
+      include Base
 
       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,9 +188,11 @@ module Scale
         # => "Café"
         str = bytes.pack("C*").force_encoding("utf-8")
         if str.valid_encoding?
-          Bytes.new str
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new str
         else
-          Bytes.new bytes.bytes_to_hex
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new bytes.bytes_to_hex
         end
       end
 
@@ -168,29 +210,40 @@ module Scale
     end
 
     class Hex
-      include SingleValue
+      include Base
 
       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
-        Hex.new(hex_string)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(hex_string)
+      end
+
+      def encode
+        length = Compact.new((value.length - 2)/2).encode
+        "#{length}#{value[2..]}"
       end
     end
 
     class String
-      include SingleValue
+      include Base
       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)
-        String.new bytes.pack("C*").force_encoding("utf-8")
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new bytes.pack("C*").force_encoding("utf-8")
       end
     end
 
     class H160
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(20)
-        H160.new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(bytes.bytes_to_hex)
       end
 
       def encode
@@ -200,10 +253,12 @@ module Scale
     end
 
     class H256
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(32)
-        H256.new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(bytes.bytes_to_hex)
       end
 
       def encode
@@ -213,10 +268,12 @@ module Scale
     end
 
     class H512
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(64)
-        H512.new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(bytes.bytes_to_hex)
       end
 
       def encode
@@ -226,7 +283,7 @@ module Scale
     end
 
     class GenericAddress
-      include SingleValue
+      include Base
 
       # https://github.com/paritytech/substrate/wiki/External-Address-Format-(SS58)
       # base58encode ( concat ( <address-type>, <address>, <checksum> ) )
@@ -234,13 +291,15 @@ 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
 
-          Address.new({
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new({
             account_id: account_id,
             account_length: account_length
           })
@@ -258,7 +317,8 @@ module Scale
           # TODO: add account_idx 
           account_length = [account_length].bytes_to_hex
 
-          Address.new({
+          puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+          new({
             account_index: account_index,
             account_length: account_length
           })
@@ -280,10 +340,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 = 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
@@ -291,6 +355,17 @@ module Scale
       end
     end
 
+    class GenericMultiAddress
+      include Enum
+      items(
+        Id: "AccountId",
+        Index: "Compact",
+        Raw: "Hex",
+        Address32: "H256",
+        Address20: "H160"
+      )
+    end
+
     class AccountId < H256; end
 
     class Balance < U128; end
@@ -302,14 +377,17 @@ module Scale
     class AccountIndex < U32; end
 
     class Era
-      include SingleValue
+      include Base
       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"
-          Era.new byte
+        result = if byte == "0x00"
+          new byte
         else
-          Era.new byte + scale_bytes.get_next_bytes(1).bytes_to_hex()[2..]
+          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
 
@@ -318,14 +396,16 @@ module Scale
     class Moment < U64; end
 
     class CompactMoment
-      include SingleValue
+      include Base
       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
+        new Time.at(value).strftime("%F %T")
       end
     end
 
@@ -429,9 +509,9 @@ module Scale
     end
 
     class Null
-      include SingleValue
+      include Base
       def self.decode(scale_bytes)
-        Null.new nil
+        new nil
       end
 
       def encode
@@ -622,18 +702,20 @@ module Scale
       include Struct
       items(
         id: "VecU8Length8",
-        amount: "Balance",
+        amount: "Scale::Types::Balance",
         until: "U32",
-        reasons: "WithdrawReasons"
+        reasons: "Scale::Types::WithdrawReasons"
       )
     end
 
     class EthereumAddress
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
+        puts "BEGIN " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
         bytes = scale_bytes.get_next_bytes(20)
-        EthereumAddress.new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
+        new(bytes.bytes_to_hex)
       end
 
       def encode
@@ -646,11 +728,13 @@ module Scale
     end
 
     class EcdsaSignature
-      include SingleValue
+      include Base
 
       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)
+        new(bytes.bytes_to_hex)
+        puts "  END " + self::TYPE_NAME + ": #{scale_bytes}" if Scale::Types.debug == true
       end
 
       def encode
@@ -756,9 +840,13 @@ module Scale
     end
 
     class VoteOutcome
-      include SingleValue
+      include Base
       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
 
@@ -796,9 +884,10 @@ module Scale
     end
 
     class BoxProposal
-      include SingleValue
+      include Base
 
       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]
 
@@ -807,6 +896,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],
@@ -832,7 +922,7 @@ module Scale
     end
 
     class VecH512Length2
-      include SingleValue
+      include Base
 
       def self.decode(scale_bytes)
       end
@@ -844,6 +934,15 @@ module Scale
       end
     end
 
+    class GenericBlock
+      include Base
+
+      def self.decode(scale_bytes)
+      end
+
+      def encode
+      end
+    end
 
   end
 end