nis-ruby 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a209933bc58268e827373213bbd8246aeb5147
-  data.tar.gz: 2842c5967a6dfab98aea4fdf1e659b967528071e
+  metadata.gz: 681592f0869e7c2ff1956e2b04ad32ffcd07f002
+  data.tar.gz: d3f7c8660d39d09d9186c3df607e5b00682ca5d1
 SHA512:
-  metadata.gz: 4d7bbc7b84d6495f60484c7cd3927ca47643f0659dd9948ebaa5be823b741ab1caa052772a8156d78328faf210a57cfa90f348b3b64ae9a6ca5577443b142a8f
-  data.tar.gz: 7a275ef7fda5a0cfb0e34c01db7ba7c92c18feb7036285dd6fe2d50944c74ff9f2307174b7acb93f42b1dfa79be155c4c69ec4bd2b682c3ac39ea4baa5c8b546
+  metadata.gz: f7c4b08efb1324125b792de4df01fa6dc7aaacc355358a65e10ce337dbad2dce308a830103aa23bebb954488b673cd00ab086036c41cef5dfbdc9522bd6aa5ee
+  data.tar.gz: 05e7ed7f141eb73a948b3690376dc5d5b4a43ebdd343d6a68942470d46f6d5dd089b396026567f6fcf579d996332e6c9ec28bc5d62593fb4893c68a247f66bdd

data/README.md

@@ -5,9 +5,9 @@
 [![Code Climate](https://codeclimate.com/github/44uk/nis-ruby/badges/gpa.svg)](https://codeclimate.com/github/44uk/nis-ruby)
 [![Join the chat at https://gitter.im/44uk/nis-ruby](https://badges.gitter.im/44uk/nis-ruby.svg)](https://gitter.im/44uk/nis-ruby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-<img src="https://cloud.githubusercontent.com/assets/370508/24320282/a332d238-1175-11e7-96dc-75bc30e562d2.png" width="320" height="320" alt="NEM" align="right" />
+<img src="https://cloud.githubusercontent.com/assets/370508/24320282/a332d238-1175-11e7-96dc-75bc30e562d2.png" width="280" height="280" alt="nem" align="right" />
 
-Ruby client library for the NEM Infrastructure Server API
+Ruby client library for the NEM Infrastructure Server(NIS) API.
 
 - [NEM \- Distributed Ledger Technology \(Blockchain\)](https://www.nem.io/)
 - [NEM NIS API Documentation](https://nemproject.github.io/)
@@ -15,6 +15,9 @@ Ruby client library for the NEM Infrastructure Server API
 
 *The gem is under development. Incompatible changes can be made.*
 
+*Do a thorough test on testnet before you use this gem on production.*
+
+- [NEM Testnet Faucet \- You can get Testnet XEM for development / testing.](http://test-nem-faucet.44uk.net/)
 
 ## Installation
 
@@ -30,6 +33,8 @@ gem 'nis-ruby'
 
 ## Usage
 
+### Examples
+
 More specific example codes are in **examples/** directory.
 
 ### Methods
@@ -79,7 +84,6 @@ nis.request(:post, '/account/unlock',
 # See https://nemproject.github.io/#locking-and-unlocking-accounts
 ```
 
-
 ## Commandline
 
 ```bash
@@ -96,11 +100,9 @@ $ nis request get account/harvests --params=address:TALICELCD3XPH4FFI5STGGNSNSWP
 # => [Array <HervestInfo structure>]
 ```
 
-
 ## Connection
 
-You can find nodes here.
-- [NEM Node Rewards](https://supernodes.nem.io/)
+You can find nodes here. [NEM Node Rewards](https://supernodes.nem.io/)
 
 ### Hash
 
@@ -121,26 +123,29 @@ $ nis heartbeat # => {"code":1,"type":2,"message":"ok"}
 
 Environment variable used as default value.
 
+## For More Information
+
+* [Documentation for nis-ruby - rubydoc.info](http://www.rubydoc.info/gems/nis-ruby)
 
 ## TODO
 
 * Do more improvements
-  * Mosaic transferring
   * Encryption message
+  * Failover connection
   * Be more easy to use
 
+## Contact
 
-## Documentation
-
-Available at [rubydoc.info](http://www.rubydoc.info/gems/nis-ruby).
+Feel free to ask me if you have any questions.
 
+* [@44uk_i3 - Twitter](https://twitter.com/44uk_i3)
+* [44uk/nis-ruby - gitter](https://gitter.im/44uk/nis-ruby)
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/nis-ruby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](LICENSE).
 

data/Rakefile

@@ -1,6 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'yard'
 
 RSpec::Core::RakeTask.new(:spec)
 
+YARD::Rake::YardocTask.new
+
 task default: :spec

data/examples/transactions/transfer_mosaic.rb

@@ -0,0 +1,48 @@
+require 'nis'
+require 'pp'
+
+# sender
+A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+
+# receiver
+B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+
+kp = Nis::Keypair.new(A_PRIVATE_KEY)
+
+# fetch mosaic information
+nis = Nis.new(host: '104.128.226.60')
+mo_dmdps = nis.namespace_mosaic_definition_page(namespace: 'sushi')
+mo_def = mo_dmdps.first.mosaic
+
+# require 'pry'; binding.pry
+
+# mosaic_id = Nis::Struct::MosaicId.new(
+#   namespaceId: 'sushi',
+#   name: 'anago'
+# )
+
+# properties = Nis::Struct::MosaicProperties.new(
+#   divisibility: 0,
+#   initialSupply: 10_000,
+#   supplyMutable: true,
+#   transferable: true
+# )
+
+# mo_def = Nis::Struct::MosaicDefinition.new(
+#   id: mosaic_id,
+#   properties: properties,
+# )
+
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1_000_000, 'Good luck!')
+tx.mosaics << Nis::Struct::MosaicAttachment.new(mo_def, 1_000_000)
+
+# pp tx.to_hash
+
+nis = Nis.new
+req = Nis::Request::PrepareAnnounce.new(tx, kp)
+pp req.to_hash
+# res = nis.transaction_prepare_announce(req)
+
+#
+# puts "Message: #{res.message}"
+# puts "TransactionHash: #{res.transaction_hash}"

data/lib/nis/fee/importance_transfer.rb

@@ -6,7 +6,7 @@ class Nis::Fee
 
     # @return [Integer] fee in micro XEM
     def value
-      testnet? ? 0.15 * 1_000_000 : 6_000_000
+      0.15 * 1_000_000
     end
 
     # @return [Integer] fee in micro XEM

data/lib/nis/fee/mosaic_definition_creation.rb

@@ -6,7 +6,7 @@ class Nis::Fee
 
     # @return [Integer] fee in micro XEM
     def value
-      (testnet? ? 10 : 500) * 1_000_000
+      10 * 1_000_000
     end
 
     # @return [Integer] fee in micro XEM

data/lib/nis/fee/mosaic_supply_change_transfer.rb

@@ -6,7 +6,7 @@ class Nis::Fee
 
     # @return [Integer] fee in micro XEM
     def value
-      testnet? ? 0.15 * 1_000_000 : 20 * 1_000_000
+      0.15 * 1_000_000
     end
 
     # @return [Integer] fee in micro XEM

data/lib/nis/fee/multisig.rb

@@ -6,7 +6,7 @@ class Nis::Fee
 
     # @return [Integer] fee in micro XEM
     def value
-      testnet? ? 0.15 * 1_000_000 : 6_000_000
+      0.15 * 1_000_000
     end
 
     # @return [Integer] fee in micro XEM

data/lib/nis/fee/multisig_aggregation_modification.rb

@@ -7,13 +7,9 @@ class Nis::Fee
     # @return [Integer] fee in micro XEM
     def value
       if @transaction.minCosignatories == 0
-        testnet? ?
-          0.5 * 1_000_000 :
-          (10 + 6 * @transaction.modifications.length) * 1_000_000
+        0.5 * 1_000_000
       else
-        testnet? ?
-          0.5 * 1_000_000 :
-          (10 + 6 * @transaction.modifications.length + 6) * 1_000_000
+        0.5 * 1_000_000
       end
     end
 

data/lib/nis/fee/provision_namespace.rb

@@ -22,11 +22,11 @@ class Nis::Fee
     private
 
     def root_fee
-      (testnet? ? 100 : 5_000) * 1_000_000
+      100 * 1_000_000
     end
 
     def sub_fee
-      (testnet? ? 10 : 200) * 1_000_000
+      10 * 1_000_000
     end
   end
 end

data/lib/nis/fee/transfer.rb

@@ -1,23 +1,19 @@
 class Nis::Fee
   class Transfer
+    FEE_FACTOR = 0.05
+
     def initialize(transaction)
       @transaction = transaction
     end
 
     # @return [Integer] fee in micro XEM
     def value
-      tmp = 0
-
-      if @transaction.mosaics.empty?
-        tmp += min_fee
+      tmp = if @transaction.has_mosaics?
+        mosaics_fee
       else
-        tmp += mosaics_fee
-      end
-
-      if @transaction.message.bytesize > 0
-        tmp += message_fee
+        FEE_FACTOR * minimum_fee(@transaction.amount / 1_000_000)
       end
-
+      tmp += message_fee if @transaction.has_message?
       tmp * 1_000_000
     end
 
@@ -33,19 +29,40 @@ class Nis::Fee
 
     private
 
-    def min_fee
-      tmp = [1, @transaction.amount / 1_000_000 / 10_000].max
-      tmp = (tmp > 25 ? 25 : tmp)
-      testnet? ? 0.05 * tmp : tmp
+    def minimum_fee(base)
+      tmp = [1, base / 10_000].max
+      tmp > 25 ? 25 : tmp
     end
 
     def message_fee
-      tmp = [1, (@transaction.message.bytesize / 2 / 32) + 1].max
-      testnet? ? 0.05 * tmp : tmp
+      FEE_FACTOR * [1, (@transaction.message.bytesize / 2 / 32) + 1].max
     end
 
     def mosaics_fee
-      raise NotImplementedError, 'not implemented calculation mosaics fee.'
+      FEE_FACTOR * @transaction.mosaics.inject(0) do |sum, mo_attachment|
+        mo = mo_attachment.mosaic_definition
+        quantity = mo_attachment.quantity
+        tmp_fee = 0
+        if mo.divisibility == 0 && mo.initial_supply <= 10_000
+          # It is called *Small Business Mosaic Fee*
+          supply_related_adjustment = 0
+          tmp_fee = 1
+        else
+          # custom mosaic fee, Max is 1.25.
+          max_mosaic_quantity = 9_000_000_000_000_000
+          total_mosaic_quantity = mo.initial_supply * (10**mo.divisibility)
+          supply_related_adjustment = (0.8 * (Math.log(max_mosaic_quantity / total_mosaic_quantity))).floor
+
+          num_nem = if mo.initial_supply == 0
+            0
+          else
+            8_999_999_999.to_f * quantity * 1_000_000 / mo.initial_supply / (10**(mo.divisibility + 6))
+          end
+          tmp_fee = minimum_fee(num_nem.ceil)
+        end
+
+        sum + [1, tmp_fee - supply_related_adjustment].max
+      end
     end
   end
 end

data/lib/nis/keypair.rb

@@ -2,11 +2,15 @@ class Nis
   class Keypair
     attr_reader :private, :public
 
+    # @param [String] Private Key
+    # @option options [Strung] :public_key Public Key
     def initialize(private_key, public_key: nil)
       @private = private_key
       @public  = public_key || calc_public_key
     end
 
+    # @param [String] Hex string
+    # @return  [String] Signed hex string
     def sign(data)
       bin_data = data.scan(/../).map(&:hex).pack('C*')
       bin_signed = Nis::Util::Ed25519.signature_hash_unsafe(bin_data, @bin_secret, @bin_public)

data/lib/nis/request/announce.rb

@@ -14,6 +14,7 @@ class Nis::Request
       @transaction = transaction
     end
 
+    # @return [Hash] Attribute and value pairs
     def to_hash
       if @transaction.respond_to?(:other_trans)
         other_trans(@transaction)
@@ -22,7 +23,7 @@ class Nis::Request
       @transaction.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
-        tx.version = Nis::Util.parse_version(tx.network, 1)
+        tx.version = Nis::Util.parse_version(tx.network, version(tx))
         tx.signer = @keypair.public
       end
 
@@ -47,9 +48,13 @@ class Nis::Request
       transaction.other_trans.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
-        tx.version = Nis::Util.parse_version(tx.network, 1)
+        tx.version = Nis::Util.parse_version(tx.network, version(tx))
         tx.signer = transaction.signer
       end
     end
+
+    def version(transaction)
+      transaction.respond_to?(:has_mosaics?) && transaction.has_mosaics? ? 2 : 1
+    end
   end
 end

data/lib/nis/request/prepare_announce.rb

@@ -14,6 +14,7 @@ class Nis::Request
       @transaction = transaction
     end
 
+    # @return [Hash] Attribute and value pairs
     def to_hash
       if @transaction.respond_to?(:other_trans)
         other_trans(@transaction)
@@ -22,7 +23,7 @@ class Nis::Request
       @transaction.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
-        tx.version = Nis::Util.parse_version(tx.network, 1)
+        tx.version = Nis::Util.parse_version(tx.network, version(tx))
         tx.signer = @keypair.public
       end
 
@@ -36,13 +37,15 @@ class Nis::Request
       transaction.other_trans.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
-        tx.version = Nis::Util.parse_version(tx.network, 1)
-
-        # tx.signer = @keypair.public
+        tx.version = Nis::Util.parse_version(tx.network, version(tx))
 
         # multisig transfer
         tx.signer = transaction.signer
       end
     end
+
+    def version(transaction)
+      transaction.respond_to?(:has_mosaics?) && transaction.has_mosaics? ? 2 : 1
+    end
   end
 end

data/lib/nis/struct/mosaic_attachment.rb

@@ -0,0 +1,21 @@
+class Nis::Struct
+  # @attr [String] fqn ex) nem.xem
+  # @attr [Integer] quantity
+  # @see https://nemproject.github.io/#version-2-transfer-transactions
+  class MosaicAttachment
+    extend Forwardable
+    def_delegators :@mosaic_definition, :initial_supply, :divisibility
+
+    attr_reader :mosaic_definition, :quantity
+
+    def initialize(mo_def, quantity)
+      @mosaic_definition = mo_def
+      @quantity = quantity
+    end
+
+    def to_hash
+      { mosaicId: @mosaic_definition.id.to_hash,
+        quantity: @quantity }
+    end
+  end
+end

data/lib/nis/struct/mosaic_definition.rb

@@ -9,9 +9,13 @@ class Nis::Struct
     include Nis::Util::Assignable
     attr_accessor :creator, :id, :description, :properties, :levy
 
+    extend Forwardable
+    def_delegators :@properties, :divisibility, :initialSupply, :supplyMutable, :transferable,
+      :initial_supply, :supply_mutable
+
     def self.build(attrs)
       attrs[:id] = MosaicId.build(attrs[:id])
-      attrs[:properties] = attrs[:properties].map { |p| MosaicProperties.build(p) }
+      attrs[:properties] = MosaicProperties.build(attrs[:properties])
       attrs[:levy] = MosaicLevy.build(attrs[:levy]) if attrs[:levy]
       new(attrs)
     end

data/lib/nis/struct/mosaic_properties.rb

@@ -13,7 +13,17 @@ class Nis::Struct
     alias supply_mutable supplyMutable
     alias supply_mutable= supplyMutable=
 
-    def self.build(attrs)
+    def self.build(props)
+      attrs = props.inject({}) do |hash, prop|
+        hash[prop[:name]] = case prop[:name]
+                            when 'divisibility'  then prop[:value].to_i
+                            when 'initialSupply' then prop[:value].to_i
+                            when 'supplyMutable' then prop[:value] == 'true' ? true : false
+                            when 'transferable'  then prop[:value] == 'true' ? true : false
+          else prop[:value]
+        end
+        hash
+      end
       new(attrs)
     end
 

data/lib/nis/transaction/mosaic_definition_creation.rb

@@ -47,7 +47,7 @@ class Nis::Transaction
           fee: 20 * 1_000_000 }
       else
         { sink: 'NBMOSAICOD4F54EE5CDMR23CCBGOAM2XSIUX6TRS',
-          fee: 500 * 1_000_000 }
+          fee: 20 * 1_000_000 }
       end
     end
   end

data/lib/nis/transaction/provision_namespace.rb

@@ -64,10 +64,10 @@ class Nis::Transaction
         end
       else
         if root?
-          { fee: 5_000 * 1_000_000 ,
+          { fee: 100 * 1_000_000 ,
             sink: 'NAMESPACEWH4MKFMBCVFERDPOOP4FK7MTBXDPZZA' }
         else
-          { fee: 200 * 1_000_000 ,
+          { fee: 10 * 1_000_000 ,
             sink: 'NAMESPACEWH4MKFMBCVFERDPOOP4FK7MTBXDPZZA' }
         end
       end

data/lib/nis/transaction/transfer.rb

@@ -20,13 +20,14 @@ class Nis::Transaction
     attr_reader :type, :fee
     attr_accessor :recipient, :amount, :message,
       :deadline, :timeStamp, :version, :signer,
-      :network
+      :network,
+      :mosaics
 
     alias timestamp timeStamp
 
     TYPE = 0x0101 # 257 (transfer transaction)
 
-    def initialize(recipient, amount, message = '', network: :testnet)
+    def initialize(recipient, amount, message = '', mosaics: [], network: :testnet)
       @type = TYPE
       @network = network
 
@@ -34,11 +35,15 @@ class Nis::Transaction
       @amount = amount
       @message = Nis::Struct::Message.new(message)
       @fee = Nis::Fee::Transfer.new(self)
+      @mosaics = mosaics
     end
 
-    def mosaics
-      # TODO: to be implemented...
-      []
+    def has_message?
+      @message.bytesize > 0
+    end
+
+    def has_mosaics?
+      @mosaics.size > 0
     end
   end
 end

data/lib/nis/unit/address.rb

@@ -48,7 +48,7 @@ module Nis::Unit
       ripe = OpenSSL::Digest::RIPEMD160.digest(public_key_hash)
 
       if network == :testnet
-        version = "\x98".force_encoding("ASCII-8BIT") + ripe
+        version = "\x98".force_encoding('ASCII-8BIT') + ripe
       else
         version = "\x68" + ripe
       end

data/lib/nis/util.rb

@@ -29,6 +29,10 @@ module Nis::Util
     end
   end
 
+  def self.parse_nemtime(nemtime)
+    NEM_EPOCH + nemtime
+  end
+
   def self.deadline(seconds = 3600)
     timestamp + seconds
   end

data/lib/nis/util/deserializer.rb

@@ -0,0 +1,46 @@
+module Nis::Util
+  module Deserializer
+    # Deserialize a transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_transaction(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      tx = {}
+      tx[:type] = deserialize_int(s[0, 4])
+      tx[:version] = deserialize_int(s[4, 4])
+      tx[:timeStamp] = deserialize_int(s[8, 4])
+      # s[12,4] # length of public key
+      tx[:signer] = deserialize_hex(s[16, 32])
+      tx[:fee] = deserialize_int(s[48, 8])
+      tx[:deadline] = deserialize_int(s[56, 4])
+      # s[60,4] # length of  address
+      tx[:recipient] = deserialize_a(s[64, 40])
+      tx[:amount] = deserialize_int(s[104, 8])
+
+      tx[:message] = {}
+      message_len = deserialize_int(s[112, 4])
+      if message_len > 0
+        tx[:message][:type] = deserialize_int(s[116, 4])
+        # s[120, 4] # length of payload
+        tx[:message][:payload] = deserialize_hex(s[124, s.size])
+      else
+        tx[:message] = { type: 1, payload: '' }
+      end
+      tx
+    end
+
+    private
+
+    def self.deserialize_int(ua)
+      Nis::Util::Convert.ua2hex(ua.reverse).to_i(16)
+    end
+
+    def self.deserialize_hex(ua)
+      Nis::Util::Convert.ua2hex(ua)
+    end
+
+    def self.deserialize_a(ua)
+      Nis::Util::Convert.hex2a(deserialize_hex(ua))
+    end
+  end
+end

data/lib/nis/util/ed25519.rb

@@ -14,7 +14,7 @@ module Nis::Util
       end
 
       def intlist2bytes(l)
-        l.map {|c| c.chr }.join
+        l.map { |c| c.chr }.join
       end
 
       # standard implement
@@ -27,36 +27,34 @@ module Nis::Util
       end
 
       def pow2(x, p)
-        # """== pow(x, 2**p, q)"""
         while p > 0 do
-          x = x * x % $q
+          x = x * x % @@q
           p -= 1
         end
         x
       end
 
       def inv(z)
-        # """$= z^{-1} \mod q$, for z != 0"""
         # Adapted from curve25519_athlon.c in djb's Curve25519.
-        z2 = z * z % $q  # 2
-        z9 = pow2(z2, 2) * z % $q  # 9
-        z11 = z9 * z2 % $q  # 11
-        z2_5_0 = (z11 * z11) % $q * z9 % $q  # 31 == 2^5 - 2^0
-        z2_10_0 = pow2(z2_5_0, 5) * z2_5_0 % $q  # 2^10 - 2^0
-        z2_20_0 = pow2(z2_10_0, 10) * z2_10_0 % $q  # ...
-        z2_40_0 = pow2(z2_20_0, 20) * z2_20_0 % $q
-        z2_50_0 = pow2(z2_40_0, 10) * z2_10_0 % $q
-        z2_100_0 = pow2(z2_50_0, 50) * z2_50_0 % $q
-        z2_200_0 = pow2(z2_100_0, 100) * z2_100_0 % $q
-        z2_250_0 = pow2(z2_200_0, 50) * z2_50_0 % $q  # 2^250 - 2^0
-        pow2(z2_250_0, 5) * z11 % $q  # 2^255 - 2^5 + 11 = q - 2
+        z2 = z * z % @@q  # 2
+        z9 = pow2(z2, 2) * z % @@q  # 9
+        z11 = z9 * z2 % @@q  # 11
+        z2_5_0 = (z11 * z11) % @@q * z9 % @@q  # 31 == 2^5 - 2^0
+        z2_10_0 = pow2(z2_5_0, 5) * z2_5_0 % @@q  # 2^10 - 2^0
+        z2_20_0 = pow2(z2_10_0, 10) * z2_10_0 % @@q  # ...
+        z2_40_0 = pow2(z2_20_0, 20) * z2_20_0 % @@q
+        z2_50_0 = pow2(z2_40_0, 10) * z2_10_0 % @@q
+        z2_100_0 = pow2(z2_50_0, 50) * z2_50_0 % @@q
+        z2_200_0 = pow2(z2_100_0, 100) * z2_100_0 % @@q
+        z2_250_0 = pow2(z2_200_0, 50) * z2_50_0 % @@q  # 2^250 - 2^0
+        pow2(z2_250_0, 5) * z11 % @@q  # 2^255 - 2^5 + 11 = q - 2
       end
 
       def xrecover(y)
-        xx = (y * y - 1) * inv($d * y * y + 1)
-        x = xx.to_bn.mod_exp(($q + 3) / 8, $q)
-        x = (x * $I) % $q if (x * x - xx) % $q != 0
-        x = $q - x if x % 2 != 0
+        xx = (y * y - 1) * inv(@@d * y * y + 1)
+        x = xx.to_bn.mod_exp((@@q + 3) / 8, @@q)
+        x = (x * @@I) % @@q if (x * x - xx) % @@q != 0
+        x = @@q - x if x % 2 != 0
         x
       end
 
@@ -66,10 +64,10 @@ module Nis::Util
         x1, y1, z1, t1 = _P
         x2, y2, z2, t2 = _Q
 
-        a = (y1 - x1) * (y2 - x2) % $q
-        b = (y1 + x1) * (y2 + x2) % $q
-        c = t1 * 2 * $d * t2 % $q
-        dd = z1 * 2 * z2 % $q
+        a = (y1 - x1) * (y2 - x2) % @@q
+        b = (y1 + x1) * (y2 + x2) % @@q
+        c = t1 * 2 * @@d * t2 % @@q
+        dd = z1 * 2 * z2 % @@q
         e = b - a
         f = dd - c
         g = dd + c
@@ -79,7 +77,7 @@ module Nis::Util
         t3 = e * h
         z3 = f * g
 
-        [x3 % $q, y3 % $q, z3 % $q, t3 % $q]
+        [x3 % @@q, y3 % @@q, z3 % @@q, t3 % @@q]
       end
 
       def edwards_double(_P)
@@ -87,11 +85,11 @@ module Nis::Util
         # http://www.hyperelliptic.org/EFD/g1p/auto-twisted-extended-1.html
         x1, y1, z1, _t1 = _P
 
-        a = x1 * x1 % $q
-        b = y1 * y1 % $q
-        c = 2 * z1 * z1 % $q
+        a = x1 * x1 % @@q
+        b = y1 * y1 % @@q
+        c = 2 * z1 * z1 % @@q
         # dd = -a
-        e = ((x1 + y1) * (x1 + y1) - a - b) % $q
+        e = ((x1 + y1) * (x1 + y1) - a - b) % @@q
         g = -a + b  # dd + b
         f = g - c
         h = -a - b  # dd - b
@@ -100,11 +98,11 @@ module Nis::Util
         t3 = e * h
         z3 = f * g
 
-        return x3 % $q, y3 % $q, z3 % $q, t3 % $q
+        [x3 % @@q, y3 % @@q, z3 % @@q, t3 % @@q]
       end
 
       def scalarmult(_P, e)
-        return $ident if e == 0
+        @@ident if e == 0
         _Q = scalarmult(_P, e / 2)
         _Q = edwards_double(_Q)
         _Q = edwards_add(_Q, _P) if e & 1
@@ -112,9 +110,9 @@ module Nis::Util
       end
 
       def make_Bpow
-        _P = $B
+        _P = @@B
         (0...253).each do |_|
-          $Bpow << _P
+          @@Bpow << _P
           _P = edwards_double(_P)
         end
       end
@@ -122,27 +120,27 @@ module Nis::Util
       # Implements scalarmult(B, e) more efficiently.
       def scalarmult_B(e)
         # scalarmult(B, l) is the identity
-        e = e % $l
-        _P = $ident
+        e = e % @@l
+        _P = @@ident
         (0...253).each do |i|
-          _P = edwards_add(_P, $Bpow[i]) if e & 1 == 1
+          _P = edwards_add(_P, @@Bpow[i]) if e & 1 == 1
           e = e / 2
         end
         _P
       end
 
       def encodeint(y)
-        bits = (0...$b).map {|i| (y >> i) & 1}
-        (0...$b/8).map {|i| int2byte((0...8).inject(0) {|sum, j| sum + (bits[i * 8 + j] << j) }) }.join
+        bits = (0...@@b).map { |i| (y >> i) & 1 }
+        (0...@@b / 8).map { |i| int2byte((0...8).inject(0) { |sum, j| sum + (bits[i * 8 + j] << j) }) }.join
       end
 
       def encodepoint(_P)
         x, y, z, _t = _P
         zi = inv(z)
-        x = (x * zi) % $q
-        y = (y * zi) % $q
-        bits = (0...$b-1).map {|i| (y >> i) & 1} + [x & 1]
-        (0...$b/8).map {|i| int2byte((0...8).inject(0) {|sum, j| sum + (bits[i * 8 + j] << j) }) }.join
+        x = (x * zi) % @@q
+        y = (y * zi) % @@q
+        bits = (0...@@b - 1).map { |i| (y >> i) & 1 } + [x & 1]
+        (0...@@b / 8).map { |i| int2byte((0...8).inject(0) { |sum, j| sum + (bits[i * 8 + j] << j) }) }.join
       end
 
       def bit(h, i)
@@ -151,70 +149,69 @@ module Nis::Util
 
       def publickey_unsafe(sk)
         h = H(sk)
-        a = 2 ** ($b-2) + (3...$b-2).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
         _A = scalarmult_B(a)
-        return encodepoint(_A)
+        codepoint(_A)
       end
 
       def publickey_hash_unsafe(sk)
         h = HH(sk)
-        a = 2 ** ($b-2) + (3...$b-2).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
         _A = scalarmult_B(a)
-        return encodepoint(_A)
+        encodepoint(_A)
       end
 
       def Hint(m)
         h = H(m)
-        (0...2*$b).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        (0...2 * @@b).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
       end
 
       def Hint_hash(m)
         h = HH(m)
-        (0...2*$b).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        (0...2 * @@b).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
       end
 
       def signature_unsafe(m, sk, pk)
         h = H(sk)
-        a = 2 ** ($b-2) + (3...$b-2).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
         r = Hint(
-          intlist2bytes(($b/8...$b/4).map {|j| indexbytes(h, j) }) + m
+          intlist2bytes((@@b / 8...@@b / 4).map { |j| indexbytes(h, j) }) + m
         )
         _R = scalarmult_B(r)
-        _S = (r + Hint(encodepoint(_R) + pk + m) * a) % $l
+        _S = (r + Hint(encodepoint(_R) + pk + m) * a) % @@l
         encodepoint(_R) + encodeint(_S)
       end
 
       # Not safe to use with secret keys or secret data.
-      #
-      # See module docstring.  This function should be used for testing only.
+      # This function should be used for testing only.
       def signature_hash_unsafe(m, sk, pk)
         h = HH(sk)
-        a = 2 ** ($b-2) + (3...$b-2).inject(0) {|sum, i| sum + 2 ** i * bit(h, i) }
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
         r = Hint_hash(
-          intlist2bytes(($b/8...$b/4).map {|j| indexbytes(h, j) }) + m
+          intlist2bytes((@@b / 8...@@b / 4).map { |j| indexbytes(h, j) }) + m
         )
         _R = scalarmult_B(r)
-        _S = (r + Hint_hash(encodepoint(_R) + pk + m) * a) % $l
+        _S = (r + Hint_hash(encodepoint(_R) + pk + m) * a) % @@l
         encodepoint(_R) + encodeint(_S)
       end
 
       def isoncurve(_P)
         x, y, z, t = _P
-        (z % $q != 0 and
-          x * y % $q == z * t % $q and
-          (y * y - x * x - z * z - $d * t * t) % $q == 0)
+        (z % @@q != (0) &&
+          x * y % @@q == (z * t % @@q) &&
+          (y * y - x * x - z * z - @@d * t * t) % @@q == (0))
       end
 
       def decodeint(s)
-        (0...$b).inject(0) {|sum, i| sum + 2 ** i * bit(s, i) }
+        (0...@@b).inject(0) { |sum, i| sum + 2**i * bit(s, i) }
       end
 
       def decodepoint(s)
-        y = (0...$b-1).inject(0) {|sum, i| 2 ** i * bit(s, i) }
+        y = (0...@@b - 1).inject(0) { |sum, i| 2**i * bit(s, i) }
         x = xrecover(y)
-        x = $q - x if x & 1 != bit(s, $b - 1)
-        _P = [x, y, 1, (x * y) % $q]
-        raise "decoding point that is not on curve" unless isoncurve(_P)
+        x = @@q - x if x & 1 != bit(s, @@b - 1)
+        _P = [x, y, 1, (x * y) % @@q]
+        raise 'decoding point that is not on curve' unless isoncurve(_P)
         _P
       end
 
@@ -222,42 +219,39 @@ module Nis::Util
       end
 
       # Not safe to use when any argument is secret.
-      #
-      # See module docstring.  This function should be used only for
+      # This function should be used only for
       # verifying public signatures of public messages.
       def checkvalid(s, m, pk)
-        raise "signature length is wrong" if s.size != $b / 4
-        raise "public-key length is wrong" if pk.size != $b / 8
+        raise 'signature length is wrong' if s.size != @@b / 4
+        raise 'public-key length is wrong' if pk.size != @@b / 8
 
-        # _R = decodepoint(s[:b // 8])
-        _R = decodepoint(s[0...$b/8])
+        _R = decodepoint(s[0...@@b / 8])
         _A = decodepoint(pk)
-        _S = decodeint(s[$b/8...$b/4])
+        _S = decodeint(s[@@b / 8...@@b / 4])
         h = Hint(encodepoint(_R) + pk + m)
 
         x1, y1, z1, _t1 = _P = scalarmult_B(_S)
         x2, y2, z2, _t2 = _Q = edwards_add(_R, scalarmult(_A, h))
 
         if (!isoncurve(_P) || !isoncurve(_Q) || (x1 * z2 - x2 * z1) % q != 0 || (y1 * z2 - y2 * z1) % q != 0)
-          raise SignatureMismatch("signature does not pass verification")
+          raise SignatureMismatch('signature does not pass verification')
         end
       end
     end
 
-    $b = 256
-    $q = 2 ** 255 - 19
-    $l = 2 ** 252 + 27742317777372353535851937790883648493
+    @@b = 256
+    @@q = 2**255 - 19
+    @@l = 2**252 + 27742317777372353535851937790883648493
 
-    $d = -121665 * self.inv(121666) % $q
-    $I = 2.to_bn.mod_exp(($q - 1) / 4, $q)
+    @@d = -121665 * self.inv(121666) % @@q
+    @@I = 2.to_bn.mod_exp((@@q - 1) / 4, @@q)
 
-    $By = 4 * self.inv(5)
-    $Bx = self.xrecover($By)
-    $B = [$Bx % $q, $By % $q, 1, ($Bx * $By) % $q]
-    $ident = [0, 1, 1, 0]
+    @@By = 4 * self.inv(5)
+    @@Bx = self.xrecover(@@By)
+    @@B = [@@Bx % @@q, @@By % @@q, 1, (@@Bx * @@By) % @@q]
+    @@ident = [0, 1, 1, 0]
 
-    # Bpow[i] == scalarmult(B, 2**i)
-    $Bpow = []
+    @@Bpow = []
     self.make_Bpow
   end
 end

data/lib/nis/util/serializer.rb

@@ -5,8 +5,8 @@ module Nis::Util
     # @return [Array]
     def self.serialize_transaction(entity)
       method = case entity[:type]
-        when  257 then method(:serialize_transfer)
-        when 4100 then method(:serialize_multisig_transfer)
+               when  257 then method(:serialize_transfer)
+               when 4100 then method(:serialize_multisig_transfer)
         else raise "Not implemented entity type: #{entity[:type]}"
       end
       method.call(entity)
@@ -54,7 +54,7 @@ module Nis::Util
 
       temp = hex2ua(entity[:message][:payload])
       if temp.size == 0
-        a += [0,0,0,0]
+        a += [0, 0, 0, 0]
       else
         a += serialize_int(temp.size + 8)
         a += serialize_int(entity[:message][:type])

data/lib/nis/version.rb

@@ -1,3 +1,3 @@
 class Nis
-  VERSION = '0.0.13'.freeze
+  VERSION = '0.0.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -213,6 +213,7 @@ files:
 - examples/transactions/multisig_signature.rb
 - examples/transactions/provision_namespace.rb
 - examples/transactions/transfer.rb
+- examples/transactions/transfer_mosaic.rb
 - examples/transactions/transfer_remote.rb
 - lib/nis.rb
 - lib/nis/client.rb
@@ -295,6 +296,7 @@ files:
 - lib/nis/struct/key_pair_view_model.rb
 - lib/nis/struct/message.rb
 - lib/nis/struct/mosaic.rb
+- lib/nis/struct/mosaic_attachment.rb
 - lib/nis/struct/mosaic_definition.rb
 - lib/nis/struct/mosaic_definition_meta_data.rb
 - lib/nis/struct/mosaic_definition_meta_data_pair.rb
@@ -340,6 +342,7 @@ files:
 - lib/nis/util.rb
 - lib/nis/util/assignable.rb
 - lib/nis/util/convert.rb
+- lib/nis/util/deserializer.rb
 - lib/nis/util/ed25519.rb
 - lib/nis/util/serializer.rb
 - lib/nis/version.rb