keoken 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910f95d9e5c38b7bd38a3931b31172285811a45d0dcfdbd280d0c9f86c177a8c
-  data.tar.gz: f6d5dbc887a6bb374da47157dcede765a4f236f2d241058b9e9bd3e08b60e196
+  metadata.gz: 15695594d36a454d57720a31ba196856d28df82d10d2e9209ba436487458da64
+  data.tar.gz: e9f4b18afbad07bac82b0c2b5c001f186a2c5e2c13088c51f7a7369ff7d8f478
 SHA512:
-  metadata.gz: a3b15901f51755d600d766fab2c96c4a0e42b2722368d763d27a4930761882060f5ab2d7f9f053e1639c3cc841bf862b6556c9cb0fd8214c0a0211a13bb8667c
-  data.tar.gz: a0c828852eb3b6929c39b78e9454add080bb142b708bff5c60488eec17b5ffeb6f015f74a994e8aaf0e5ab2ae046bb43571e2343a2ea9fe31b5d75c4ed32c5b8
+  metadata.gz: 209f756479dce58ecbcc2754fdea37a0cff43018ffbcab3273e5660a466c8d058d03b7a364cba53c8b56a19dd944cb10adc01972a3953e7690acb057c8266fdf
+  data.tar.gz: e886697b6477af041787fa9152a998efaa08e3bd1c95087f2b5ea5665df37c68849599c259376f6938e58ae583082f94a541cbefd05e4d4cd60cc6e1f84496cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    keoken (0.1.1)
+    keoken (0.2.0)
       bitcoin-ruby (~> 0.0.18)
 
 GEM

data/lib/keoken/parser.rb

@@ -6,26 +6,28 @@ module Keoken
       @data  = binary.bytes
     end
 
+    protected
+
+    # rubocop:disable Metrics/AbcSize
     def prefix
-      result = @data.slice!(0)
-      raise Keoken::DataNotParsed, 'OP_RETURN missing' unless result == Bitcoin::Script::OP_RETURN.to_i
-      result = @data.slice!(0)
-      raise Keoken::DataNotParsed, 'Prefix size missing' unless result == Keoken::PREFIX_SIZE.to_i
+      raise Keoken::DataNotParsed, 'OP_RETURN missing' unless @data.slice!(0) == Bitcoin::Script::OP_RETURN.to_i
+      raise Keoken::DataNotParsed, 'Prefix size missing' unless @data.slice!(0) == Keoken::PREFIX_SIZE.to_i
       result = @data.slice!(0..Keoken::PREFIX.htb.bytes.length - 1)
       raise Keoken::DataNotParsed, 'Prefix not provided' unless result == Keoken::PREFIX.htb.bytes
-      bytesize = @data.slice!(0)
-      raise Keoken::DataNotParsed, 'Bytesize not provided' unless bytesize == @data.length
+      raise Keoken::DataNotParsed, 'Bytesize not provided' unless @data.slice!(0) == @data.length
     end
+    # rubocop:enable Metrics/AbcSize
 
     def set_transaction_type
       result = @data.slice!(0..3).join
-      @transaction_type = if result == Keoken::TYPE_CREATE_ASSET
-        :create
-      elsif result == Keoken::TYPE_SEND_TOKEN
-        :send
-      else
-        raise Keoken::DataNotParsed, 'Transaction type not valid'
-      end
+      @transaction_type =
+        if result == Keoken::TYPE_CREATE_ASSET
+          :create
+        elsif result == Keoken::TYPE_SEND_TOKEN
+          :send
+        else
+          raise Keoken::DataNotParsed, 'Transaction type not valid'
+        end
       @transaction_type
     end
 
@@ -39,15 +41,21 @@ module Keoken
         break if tmp.zero? && end_of_name
         name.push tmp
       end
+      name_or_id_to_hex(name)
+    end
+
+    def set_amount
+      @data.map { |datum| datum.to_s(16) }.join.to_i(16)
+    end
+
+    private
+
+    def name_or_id_to_hex(name)
       if @transaction_type == :create
         name.map { |n| n.to_s(16).htb }.join
       elsif @transaction_type == :send
         name.map { |n| n.to_s(16) }.join
       end
     end
-
-    def amount
-      @data.map { |byte| byte.zero? ? "#{byte}0" : byte.to_s }.join.to_i
-    end
   end
 end

data/lib/keoken/token.rb

@@ -1,16 +1,20 @@
 module Keoken
-  class Token
-    attr_accessor :data_script, :name, :id, :amount, :transaction_type
+  class Token < Parser
+    attr_accessor :data_script, :id
 
     # Creates a new token object.
     #
     # @param options [Hash] options parameters to create the token.
     # @option options [String] :name The name of token to create.
     # @option options [Number] :id The id of token to obtain an amount to send to another address.
+    # @option options [String] :script An hexadecimal script intended to be parsed.
     #
     def initialize(options = {})
       @name   = options[:name]
       @id     = options[:id]
+      return unless options[:script]
+      super(options[:script])
+      parse_script
     end
 
     # Generate the script to create a token.
@@ -26,7 +30,7 @@ module Keoken
           Keoken::VERSION_NODE,
           Keoken::TYPE_CREATE_ASSET,
           name_to_hex(@name),
-          Keoken::PREFIX_BYTE_AMOUNT[0..prefix_length(amount)] + amount.to_s
+          Keoken::PREFIX_BYTE_AMOUNT[0..prefix_length(amount)] + amount.to_s(16)
         ].flatten.join
       self
     end
@@ -45,7 +49,7 @@ module Keoken
           Keoken::VERSION_NODE,
           Keoken::TYPE_SEND_TOKEN,
           Keoken::PREFIX_BYTE_ASSET_ID[0..asset_length] + @id.to_s,
-          Keoken::PREFIX_BYTE_AMOUNT[0..prefix_length(amount)] + amount.to_s
+          Keoken::PREFIX_BYTE_AMOUNT[0..prefix_length(amount)] + amount.to_s(16)
         ].flatten.join
       self
     end
@@ -86,18 +90,6 @@ module Keoken
       }
     end
 
-    def parse_script(script)
-      parser = Keoken::Parser.new(script)
-      parser.prefix
-      @transaction_type = parser.set_transaction_type
-      if @transaction_type == :create
-        @name = parser.name_or_id
-      else
-        @id = parser.name_or_id
-      end
-      @amount = parser.amount
-    end
-
     private
 
     def data_length
@@ -112,5 +104,17 @@ module Keoken
       asset_bytes = name.bytes.map { |n| n.to_s(16) }
       asset_bytes + ['00']
     end
+
+    def parse_script
+      prefix
+      @transaction_type = set_transaction_type
+      if @transaction_type == :create
+        @name = name_or_id
+      else
+        @id = name_or_id
+      end
+      @amount = set_amount
+      self
+    end
   end
 end

data/lib/keoken/version.rb

@@ -1,3 +1,3 @@
 module Keoken
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/keoken.rb

@@ -1,8 +1,8 @@
 require 'bitcoin'
 
 require 'keoken/extensions/bitcoin/script'
-require 'keoken/token'
 require 'keoken/parser'
+require 'keoken/token'
 require 'keoken/backend/base'
 require 'keoken/backend/bitcoin_ruby/transaction'
 require 'keoken/bitprim/transaction'

data/spec/keoken_spec.rb

@@ -21,21 +21,19 @@ describe Keoken do
     token = Keoken::Token.new(name: 'test-keoken')
     token.create(1_000_000)
     expect(token.hex).to(
-      eq('6a0400004b501800000000746573742d6b656f6b656e000000000001000000')
+      eq('6a0400004b501700000000746573742d6b656f6b656e00000000000f4240')
     )
   end
 
   it 'serialize the test-keoken token' do
-    token = Keoken::Token.new
-    token.parse_script('6a0400004b501800000000746573742d6b656f6b656e000000000001000000')
+    token = Keoken::Token.new(script: '6a0400004b501800000000746573742d6b656f6b656e0000000000000f4240')
     expect(token.to_json).to(
       eq('{"id":null,"name":"test-keoken","amount":1000000,"transaction_type":"create"}')
     )
   end
 
   it 'deserialize the test-keoken token' do
-    token = Keoken::Token.new
-    token.parse_script('6a0400004b501800000000746573742d6b656f6b656e000000000001000000')
+    token = Keoken::Token.new(script: '6a0400004b501800000000746573742d6b656f6b656e0000000000000f4240')
     expect(token.to_hash).to(
       eq(
         amount: 1_000_000,
@@ -47,8 +45,7 @@ describe Keoken do
   end
 
   it 'deserialize the token with id' do
-    token = Keoken::Token.new
-    token.parse_script('6a0400004b501000000001000000340000000001000000')
+    token = Keoken::Token.new(script: '6a0400004b5010000000010000003400000000000f4240')
     expect(token.to_hash).to(
       eq(
         amount: 1_000_000,
@@ -59,6 +56,18 @@ describe Keoken do
     )
   end
 
+  it 'deserialize the Bitprim token' do
+    token = Keoken::Token.new(script: '6a0400004b5014000000004269747072696d0000000000000f4240')
+    expect(token.to_hash).to(
+      eq(
+        amount: 1_000_000,
+        name: 'Bitprim',
+        id: nil,
+        transaction_type: :create
+      )
+    )
+  end
+
   it 'raise an error when name is not provided' do
     token = Keoken::Token.new
     expect { token.create(1_000_000) }.to raise_error(Keoken::NameNotFound)
@@ -73,7 +82,7 @@ describe Keoken do
     token = Keoken::Token.new(id: 34)
     token.send_amount(1_000_000)
     expect(token.hex).to(
-      eq('6a0400004b501000000001000000340000000001000000')
+      eq('6a0400004b50f0000000100000034000000000f4240')
     )
   end
 
@@ -100,7 +109,7 @@ describe Keoken do
             },
             {
               "value" => "0.00000000",
-              "scriptPubKey" => "OP_RETURN 00004b50 00000000746573742d6b656f6b656e000000000001000000",
+              "scriptPubKey" => "OP_RETURN 00004b50 00000000746573742d6b656f6b656e00000000000f4240",
             },
           ]
         )
@@ -110,7 +119,7 @@ describe Keoken do
     it 'raw transaction' do
       raw = @transaction_token.raw
       expect(raw).to start_with('0100000001dae8143d5422d5e1018c43732baa74ac3114d4399a1f58a9ea7e31f656938a44010000006')
-      expect(raw).to end_with('6a0400004b501800000000746573742d6b656f6b656e00000000000100000000000000')
+      expect(raw).to end_with('6a0400004b501700000000746573742d6b656f6b656e00000000000f424000000000')
     end
 
     it 'broadcast transaction' do
@@ -162,17 +171,17 @@ describe Keoken do
             },
             {
               "value" => "0.00000000",
-              "scriptPubKey" => "OP_RETURN 00004b50 00000001000001230000000000500000",
+              "scriptPubKey" => "OP_RETURN 00004b50 000000010000012300000000007a1200",
             },
           ]
         )
       )
     end
 
-    it "raw transaction" do
+    it 'raw transaction' do
       raw = @transaction_token.raw
-      expect(raw).to start_with("0100000001dae8143d5422d5e1018c43732baa74ac3114d4399a1f58a9ea7e31f656938a4401000000")
-      expect(raw).to end_with("6a0400004b50100000000100000123000000000050000000000000")
+      expect(raw).to start_with('0100000001dae8143d5422d5e1018c43732baa74ac3114d4399a1f58a9ea7e31f656938a4401000000')
+      expect(raw).to end_with('6a0400004b5010000000010000012300000000007a120000000000')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keoken
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bitex