nem-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 748ca73f087e9f567496b5c698b6d1b81bbbd192601e8bbdb17efdb202eede92
-  data.tar.gz: 2e9f12cc146d126bcd67b37b68dacaac5c62fbc02e36923ce3e1fdbffd73831f
+  metadata.gz: 1a80d96a7c25cccb9215c5f05af2651ab5573a7f2f767a420a1a97cb156c4cbb
+  data.tar.gz: 6ef2b946c1088bdf76828b4252e83f15d57a7489de035fca2cedbaa920ac3db8
 SHA512:
-  metadata.gz: 9b7d3becf508d3eff05b8031b443bfc36673a703cc68cd867f0c18c891802e1a2e9d02677875122ddb595c822e75db63691c9f0a2b1938cc1f1ca62f15bd0240
-  data.tar.gz: a0e386cd6014fc1e6f24908bd6129cc8f44c1789e098a076153f26ba85cde49f8dc485fd1f5ffa3bfca4642c48194ab8e5d0516d6552268fbd484979484f3a85
+  metadata.gz: fc780b27ec580dbe40ecd22de3972b98794fefa751f194012c49f7a15682ee68feb998e26c932e80dc0698037fe256532210c82abba5a501856c232b7a7e1a9c
+  data.tar.gz: 6b01deeb6257603d93fd406ffe90ab54b97f33234cc2929e411ac8d6e3009c12112f709b1e52716f324c3ac2d44cfbc0d59726e368573f36c459ef781e38d639

data/examples/transaction/transfer_mosaic.rb

@@ -12,42 +12,30 @@ B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 kp = Nem::Keypair.new(A_PRIVATE_KEY)
 node = Nem::Node.new(host: 'bigalice2.nem.ninja')
 tx_endpoint = Nem::Endpoint::Transaction.new(node)
-# ns_endpoint = Nem::Endpoint::Namespace.new(node)
 
-# TODO:
+tx = Nem::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
 
-# fetch mosaic definition
-# mo_dmdps = ns_endpoint.mosaic_definition('kon')
-# mo_def = mo_dmdps.first.mosaic
+tx.mosaics << Nem::Mosaic::Xem.new(1)
 
-# define custom mosaic attachment
-# class MyMosaic < Nem::Model::MosaicAttachment
-#   def initialize(quantity)
-#     # set values what you defined
-#     mosaic_id = Nem::Model::MosaicId.new(
-#       namespace_id: 'my',
-#       name: 'mosaic'
-#     )
-#     # set values what you defined
-#     properties = Nem::Model::MosaicProperties.new(
-#       divisibility: 3,
-#       initial_supply: 123_456_789
-#     )
-#     super(
-#       mosaic_id: mosaic_id,
-#       properties: properties,
-#       quantity: quantity
-#     )
-#   end
-# end
+# fetch mosaic definition
+ns_endpoint = Nem::Endpoint::Namespace.new(node)
+mo_def = ns_endpoint.mosaic_definition('kon').first
+moa = Nem::Model::MosaicAttachment.new(
+  mosaic_id: mo_def.id,
+  properties: mo_def.properties,
+  quantity: 1
+)
+tx.mosaics << moa
 
 # define custom mosaic attachment
 class KonHeart < Nem::Model::MosaicAttachment
   def initialize(quantity)
+    # set values what you defined
     mosaic_id = Nem::Model::MosaicId.new(
       namespace_id: 'kon',
       name: 'heart'
     )
+    # set values what you defined
     properties = Nem::Model::MosaicProperties.new(
       divisibility: 3,
       initial_supply: 100_000_000
@@ -59,10 +47,8 @@ class KonHeart < Nem::Model::MosaicAttachment
     )
   end
 end
-
-tx = Nem::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
-tx.mosaics << Nem::Mosaic::Xem.new(1)
 tx.mosaics << KonHeart.new(1)
+
 pp "Fee: #{tx.fee.to_i}"
 
 req = Nem::Request::Announce.new(tx, kp)

data/lib/nem/model/mosaic.rb

@@ -10,7 +10,7 @@ module Nem
       attr_reader :mosaic_id, :quantity
 
       def self.new_from_mosaic(hash)
-        mosaic_id = Nem::Model::MosaicId.new_from_mosaic_id(hash[:mosaicId])
+        mosaic_id = MosaicId.new_from_mosaic_id(hash[:mosaicId])
         new(
           quantity: hash[:quantity],
           mosaic_id: mosaic_id

data/lib/nem/model/mosaic_definition.rb

@@ -19,9 +19,9 @@ module Nem
         :meta_id
 
       def self.new_from_mosaic_definition(hash)
-        id = Nem::Model::MosaicId.new_from_mosaic_id(hash[:id])
-        props = Nem::Model::MosaicProperties.new_from_mosaic_properties(hash[:properties])
-        levy = Nem::Model::MosaicLevy.new_from_mosaic_levy(hash[:levy])
+        id = MosaicId.new_from_mosaic_id(hash[:id])
+        props = MosaicProperties.new_from_mosaic_properties(hash[:properties])
+        levy = MosaicLevy.new_from_mosaic_levy(hash[:levy])
         new(
           creator: hash[:creator],
           description: hash[:description],
@@ -34,13 +34,13 @@ module Nem
       def self.new_from_mosaic_definition_meta_data_pair(hash)
         meta = hash[:meta]
         mosaic = hash[:mosaic]
-        id = Nem::Model::MosaicId.new_from_mosaic_id(mosaic[:id])
-        props = Nem::Model::MosaicProperties.new_from_mosaic_properties(mosaic[:properties])
-        levy = Nem::Model::MosaicLevy.new_from_mosaic_levy(mosaic[:levy])
+        id = MosaicId.new_from_mosaic_id(mosaic[:id])
+        props = MosaicProperties.new_from_mosaic_properties(mosaic[:properties])
+        levy = MosaicLevy.new_from_mosaic_levy(mosaic[:levy])
         new(
           meta_id: meta[:id],
-          creator: hash[:creator],
-          description: hash[:description],
+          creator: mosaic[:creator],
+          description: mosaic[:description],
           id: id,
           properties: props,
           levy: levy

data/lib/nem/model/mosaic_levy.rb

@@ -10,7 +10,7 @@ module Nem
 
       def self.new_from_mosaic_levy(hash)
         return nil if hash.empty?
-        mosaic_id = Nem::Model::MosaicId.new_from_mosaic_id(hash[:mosaicId])
+        mosaic_id = MosaicId.new_from_mosaic_id(hash[:mosaicId])
         new(
           fee: hash[:fee],
           recipient: hash[:recipient],

data/lib/nem/model/mosaic_owned.rb

@@ -7,7 +7,7 @@ module Nem
 
       def self.new_from_mosaic_owned(hash)
         mosaics = hash[:data].inject({}) do |memo, mos|
-          mosaic = Nem::Model::Mosaic.new_from_mosaic(mos)
+          mosaic = Mosaic.new_from_mosaic(mos)
           memo[mosaic.fqn] = mosaic
           memo
         end

data/lib/nem/model/mosaic_supply.rb

@@ -10,7 +10,7 @@ module Nem
       attr_reader :id, :supply
 
       def self.new_from_mosaic_supply(hash)
-        id = Nem::Model::MosaicId.new_from_mosaic_id(hash[:mosaicId])
+        id = MosaicId.new_from_mosaic_id(hash[:mosaicId])
         new(
           id: id,
           supply: hash[:supply]

data/lib/nem/model/transfer_transaction.rb

@@ -10,7 +10,7 @@ module Nem
           amount: transaction[:amount],
         )
         unless transaction[:message].empty?
-          attrs[:message] = Nem::Model::Message.new_from_message(transaction[:message])
+          attrs[:message] = Message.new_from_message(transaction[:message])
         end
         if transaction[:mosaics]
           attrs[:mosaics] = transaction[:mosaics].map do |mo|

data/lib/nem/transaction/base.rb

@@ -1,5 +1,11 @@
 module Nem
   module Transaction
+    # @attr [Integer] type
+    # @attr [Integer] fee
+    # @attr [Integer] timestamp
+    # @attr [Integer] deadline
+    # @attr [String] signer
+    # @attr [String] signature
     class Base
       attr_reader :type, :fee,
         :timestamp, :deadline, :signer, :signature
@@ -33,6 +39,7 @@ module Nem
       end
 
       # it can be override by child class
+      # @return [Integer]
       def version
         network(hex: true) + 1
       end

data/lib/nem/transaction/importance_transfer.rb

@@ -21,6 +21,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           mode: parse_mode,

data/lib/nem/transaction/mosaic_definition_creation.rb

@@ -20,6 +20,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           mosaicDefinition: mosaic_definition.to_hash,

data/lib/nem/transaction/mosaic_supply_change.rb

@@ -23,6 +23,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           mosaicId: mosaic_id.to_hash,

data/lib/nem/transaction/multisig.rb

@@ -18,6 +18,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           otherTrans: other_trans.to_hash,

data/lib/nem/transaction/multisig_aggregate_modification.rb

@@ -2,6 +2,7 @@ module Nem
   module Transaction
     # @attr [Array <Nem::Model::MultisigCosignatoryModification>] modifications
     # @attr [Interger] relative_change
+    # @attr [Interger] min_cosignatories
     class MultisigAggregateModification < Nem::Transaction::Base
       TYPE = 0x1001 # 4097 (multisig aggregate modification transfer transaction)
 
@@ -17,6 +18,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           modifications: modifications.map(&:to_hash),

data/lib/nem/transaction/multisig_cosignatory_modification.rb

@@ -1,5 +1,7 @@
 module Nem
   module Transaction
+    # @attr [Interger] modification_type
+    # @attr [Interger] cosignatory_account
     class MultisigCosignatoryModification
       attr_reader :modification_type, :cosignatory_account
 
@@ -12,6 +14,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           modificationType: parse_type,

data/lib/nem/transaction/multisig_signature.rb

@@ -19,6 +19,7 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           otherHash: { data: other_hash },

data/lib/nem/transaction/provision_namespace.rb

@@ -1,14 +1,14 @@
 module Nem
   module Transaction
+    # @attr [String] new_part
+    # @attr [String] parent
+    # @attr [String] rental_fee_sink
+    # @attr [Integer] rental_fee
     class ProvisionNamespace < Nem::Transaction::Base
       TYPE = 0x2001 # 8193 (provision namespace transaction)
 
       attr_reader :new_part, :parent, :rental_fee_sink, :rental_fee
 
-      # @attr [String] new_part
-      # @attr [String] parent
-      # @attr [String] rental_fee_sink
-      # @attr [Integer] rental_fee
       def initialize(new_part, parent = nil, network: nil)
         @new_part = new_part
         @parent = parent
@@ -20,15 +20,18 @@ module Nem
         @fee = Nem::Fee::ProvisionNamespace.new(self)
       end
 
+      # @return [Boolean]
       def root?
         !!(@parent == nil)
       end
 
+      # @return [Boolean]
       def sub?
         !!(@parent && @new_part)
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
       def to_hash
         {
           newPart: new_part,

data/lib/nem/transaction/transfer.rb

@@ -26,10 +26,12 @@ module Nem
         @fee = Nem::Fee::Transfer.new(self)
       end
 
+      # @return [Boolean]
       def has_message?
         @message.bytesize > 0
       end
 
+      # @return [Boolean]
       def has_mosaics?
         @mosaics.size > 0
       end
@@ -39,6 +41,8 @@ module Nem
       end
 
       # attributes must be CAMEL CASE for NIS params
+      # @return [Hash]
+      # Mosaics need to be sorted by fqn. if not it will occur FAILURE_SIGNATURE_NOT_VERIFIABLE
       def to_hash
         tmp = {
           amount: amount * 1_000_000,
@@ -46,7 +50,9 @@ module Nem
           message: message.to_hash
         }
         unless mosaics.empty?
-          tmp[:mosaics] = mosaics.map do |moa|
+          tmp[:mosaics] = mosaics
+            .sort_by { |mo| mo.fqn }
+            .map do |moa|
             {
               mosaicId: {
                 namespaceId: moa.mosaic_id.namespace_id,

data/lib/nem/util/deserializer.rb

@@ -33,16 +33,38 @@ module Nem
         tx[:recipient] = deserialize_a(s[4, 40])
         tx[:amount] = deserialize_int(s[44, 8])
         tx[:message] = {}
-        message_len = deserialize_int(s[52, 4])
-        if message_len > 0
-          # s[60, 4] # length of payload
+        msg_len = deserialize_int(s[52, 4])
+        if msg_len > 0
+          payload_len = deserialize_int(s[60, 4])
           tx[:message] = {
             type: deserialize_int(s[56, 4]),
-            payload: Nem::Util::Convert.hex_to_utf8(deserialize_hex(s[64, s.size]))
+            payload: Nem::Util::Convert.hex_to_utf8(deserialize_hex(s[64, payload_len]))
           }
         else
           tx[:message] = { type: 1, payload: '' }
         end
+
+        mosaic_cnt = deserialize_int(s[56 + msg_len, 4])
+        return tx unless mosaic_cnt
+
+        # mosaic section
+        tx[:mosaics] = []
+        offset = 0
+        mosaic_cnt.times do |i|
+          mo_len = deserialize_int(s[offset + 60 + msg_len, 4])
+          # ns_len = deserialize_int(s[offset+64+msg_len, 4])
+          ns_name_len = deserialize_int(s[offset + 68 + msg_len, 4])
+          mo_name_len = deserialize_int(s[offset + 72 + msg_len + ns_name_len, 4])
+          ns = Nem::Util::Convert.hex_to_utf8 deserialize_hex(s[offset + 72 + msg_len, ns_name_len])
+          name = Nem::Util::Convert.hex_to_utf8 deserialize_hex(s[offset + 76 + msg_len + ns_name_len, mo_name_len])
+          quantity = deserialize_int(s[offset + 76 + msg_len + ns_name_len + mo_name_len, 8])
+          attachment = {
+            mosaicId: { namespaceId: ns, name: name },
+            quantity: quantity
+          }
+          tx[:mosaics] << attachment
+          offset += mo_len + 4
+        end
         tx
       end
 

data/lib/nem/util/serializer.rb

@@ -180,10 +180,13 @@ module Nem
 
       # @param [Nem::Struct::Mosaic] mosaic
       # @return [Array]
-      def self.serialize_mosaic_and_quantity(mosaic_attachment)
+      def self.serialize_mosaic_attachment(mosaic_attachment)
         a = []
-        a.concat serialize_mosaic_id(mosaic_attachment[:mosaicId])
-        a.concat serialize_long(mosaic_attachment[:quantity])
+        mosaic_id = serialize_mosaic_id(mosaic_attachment[:mosaicId])
+        quantity = serialize_long(mosaic_attachment[:quantity])
+        a.concat serialize_int((mosaic_id + quantity).size)
+        a.concat mosaic_id
+        a.concat quantity
       end
 
       # @param [Array <Nem::Struct::Mosaic>] entities
@@ -192,9 +195,8 @@ module Nem
         a = []
         a.concat serialize_int(entities.size)
         mosaics = entities.inject([]) do |memo, ent|
-          memo.concat serialize_mosaic_and_quantity(ent)
+          memo.concat serialize_mosaic_attachment(ent)
         end
-        a.concat serialize_int(mosaics.size)
         a.concat mosaics
       end
 

data/lib/nem/version.rb

@@ -1,3 +1,3 @@
 module Nem
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nem-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler