nem-ruby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c889bc0039c2bdcd4fbbb850eb858cc31e25832e8a9b97209694c920be4e765
-  data.tar.gz: 717eba0d9db81aacf501b6c6039d21e5ab7ef376c39fbcfd5af761cac6307451
+  metadata.gz: '0280ea3ed19d1f11f874b5443e59eeba0a21eb4fec27e31d578250c74c377730'
+  data.tar.gz: 3d9621bfe402f975ef08c2265a28dd3132ca86631a0ee14268fb1f5c2e340fa3
 SHA512:
-  metadata.gz: 713c72f13c16b5d126b43134edab7dffc2f2c1619c1123e5e7f17219cb44d26ea610f7acaed190df0f3615906ff723605fdd31deda41a9a253e990715c44f05e
-  data.tar.gz: 49b82f440b5701bd09e4f2c9652c08c3a8a9e09fc35e3760103da20c97eb5a7ccd118fcd132424f4ebd0decabfc5fdb706f06a9832bf75683e7103001fb09692
+  metadata.gz: d2983c53b1edb903c83571e2403dee0611848a644b21b3a4f5bbacaabb227a8b08c707ec2d10cdeda2e91be84e346b828ec72c40ad0509e15e9ad71ae117dc09
+  data.tar.gz: f887982de7c646a1604ad2c790db4f618141190750bf73cdbc912a1bb7a5ab5a569d3e136fb29a380f6ff81d9ee9fbbb92816b6f3fb24d9c30f344d49756eb76

data/lib/nem/fee/transfer.rb

@@ -12,7 +12,7 @@ module Nem
         tmp = if @transaction.has_mosaics?
           mosaics_fee
         else
-          FEE_FACTOR * minimum_fee(@transaction.amount / 1_000_000)
+          FEE_FACTOR * minimum_fee(@transaction.amount).to_i
         end
         tmp += message_fee if @transaction.has_message?
         tmp * 1_000_000
@@ -39,7 +39,13 @@ module Nem
         FEE_FACTOR * [1, (@transaction.message.bytesize / 2 / 32) + 1].max
       end
 
+      def xem_equivalent(multiplier, quantity, supply, divisibility)
+        return 0 if supply == 0
+        multiplier * 8_999_999_999 * quantity / supply / 10**(divisibility + 6)
+      end
+
       def mosaics_fee
+        multiplier = @transaction.amount * 1_000_000
         FEE_FACTOR * @transaction.mosaics.inject(0) do |sum, moa|
           tmp_fee = 0
           if moa.divisibility == 0 && moa.initial_supply <= 10_000
@@ -50,13 +56,14 @@ module Nem
             # custom mosaic fee, Max is 1.25.
             max_mosaic_quantity = 9_000_000_000_000_000
             total_mosaic_quantity = moa.initial_supply * (10**moa.divisibility)
-            supply_related_adjustment = (0.8 * (Math.log(max_mosaic_quantity / total_mosaic_quantity))).floor
-            num_nem = if moa.initial_supply == 0
-              0
-            else
-              8_999_999_999.to_f * moa.quantity * 1_000_000 / moa.initial_supply / (10**(moa.divisibility + 6))
-            end
-            tmp_fee = minimum_fee(num_nem.ceil)
+            supply_related_adjustment = (0.8 * (Math.log(max_mosaic_quantity / total_mosaic_quantity))).to_i
+            num_nem = xem_equivalent(
+              multiplier,
+              moa.amount,
+              moa.initial_supply,
+              moa.divisibility
+            )
+            tmp_fee = minimum_fee(num_nem.to_i)
           end
           sum + [1, tmp_fee - supply_related_adjustment].max
         end

data/lib/nem/keypair.rb

@@ -19,12 +19,15 @@ module Nem
     end
 
     def verify_signature(signer, hash, apostille_hash)
-      # TDOD: support private apostille
+      # TODO: support private apostille
       raise NotImplementedError, 'Not implemented private apostille'
     end
 
     # @return [Nem::Keypair] new key pair
-    def self.generate(seed = SecureRandom.hex(64))
+    def self.generate(seed = SecureRandom.hex(32))
+      unless seed =~ /\A\h{64}\z/ || seed =~ /\A\h{66}\z/
+        raise ArgumentError, 'PrivateKey is not valid!'
+      end
       new(seed)
     end
 

data/lib/nem/version.rb

@@ -1,3 +1,3 @@
 module Nem
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nem-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler