nis-ruby 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681592f0869e7c2ff1956e2b04ad32ffcd07f002
-  data.tar.gz: d3f7c8660d39d09d9186c3df607e5b00682ca5d1
+  metadata.gz: aa8c49e0cd78c5bdde006099b1fcda37b2708a64
+  data.tar.gz: cb8a3175db3121d2f761265423b93407ae8013e7
 SHA512:
-  metadata.gz: f7c4b08efb1324125b792de4df01fa6dc7aaacc355358a65e10ce337dbad2dce308a830103aa23bebb954488b673cd00ab086036c41cef5dfbdc9522bd6aa5ee
-  data.tar.gz: 05e7ed7f141eb73a948b3690376dc5d5b4a43ebdd343d6a68942470d46f6d5dd089b396026567f6fcf579d996332e6c9ec28bc5d62593fb4893c68a247f66bdd
+  metadata.gz: 563b492199ffbce3d85d8914eff9d166e60c3f2a6751082980ae2a8a722006a78c07cfd66271433bfbe9b09a42a883e1f493ddcdba52d331d5b48c5bb9c85cb6
+  data.tar.gz: 254df0dfe30be08e4bd7ec23241c181001db04d9d5ca005b7b74f72e636617fff7438a5816fb948a99bd8c27e96e8bcde0722bcc3d0664fc3d8ca1b286200028

data/README.md

@@ -35,11 +35,13 @@ gem 'nis-ruby'
 
 ### Examples
 
-More specific example codes are in **examples/** directory.
+More specific example codes are in **[examples/](examples/)** directory.
 
 ### Methods
 
 ```ruby
+require 'rubygems'
+require 'nis'
 nis = Nis.new
 
 nis.heartbeat
@@ -53,7 +55,7 @@ nis.status
 kp = Nis::Keypair.new(SENDER_PRIV_KEY)
 tx = Nis::Transaction::Transfer.new(
   RECIPIENT_ADDRESS,
-  10_000_000,
+  1, # send 1xem
   'Message'
 )
 req = Nis::Request::PrepareAnnounce.new(tx, kp)
@@ -63,12 +65,15 @@ nis.transaction_prepare_announce(req)
 # => {innerTransactionHash: {}, code: 1, type: 1, message: "SUCCESS", transactionHash: {data: "9da41fd6c6886740ae6a15c869df0470015d78103e5b216971aa09fdbcce9cde"}}
 
 # Request to remote node.
+# nis = Nis.new(host: '104.128.226.60')
 # nis.transaction_announce(req)
 ```
 
 ### Requesting
 
 ```ruby
+require 'rubygems'
+require 'nis'
 nis = Nis.new
 
 nis.request(:get, '/account/get',
@@ -102,22 +107,22 @@ $ nis request get account/harvests --params=address:TALICELCD3XPH4FFI5STGGNSNSWP
 
 ## Connection
 
-You can find nodes here. [NEM Node Rewards](https://supernodes.nem.io/)
+You can choose nodes from [NEM Node Rewards](https://supernodes.nem.io/).
 
 ### Hash
 
 ```ruby
 # Passing hostname
-Nis.new(host: 'bigalice3.nem.ninja')
+Nis.new(host: '104.128.226.60')
 
 # Passing url
-Nis.new(url: 'http://bigalice3.nem.ninja:7890')
+Nis.new(url: 'http://104.128.226.60:7890')
 ```
 
 ### Environment Variable
 
 ```bash
-$ export NIS_URL=http://bigalice3.nem.ninja:7890
+$ export NIS_URL=http://104.128.226.60:7890
 $ nis heartbeat # => {"code":1,"type":2,"message":"ok"}
 ```
 
@@ -127,13 +132,6 @@ Environment variable used as default value.
 
 * [Documentation for nis-ruby - rubydoc.info](http://www.rubydoc.info/gems/nis-ruby)
 
-## TODO
-
-* Do more improvements
-  * Encryption message
-  * Failover connection
-  * Be more easy to use
-
 ## Contact
 
 Feel free to ask me if you have any questions.

data/examples/block.rb

@@ -1,11 +1,9 @@
 require 'nis'
-hr = '-' * 64
 
 nis = Nis.new
 
-block = nis.block_at_public(block_height: 890761)
+block = nis.block_at_public(block_height: 890_761)
+
 puts block.to_hash
-puts hr
 
 puts nis.block_get(block_hash: 'fb5e76bf137eb27451926d29fd2b308e672e5d9ec405d9cbcd47cc0f83492cd0')
-puts hr

data/examples/local.rb

@@ -15,5 +15,5 @@ puts outgoing.last.to_hash
 all = nis.local_account_transfers_all(page: page)
 puts all.last.to_hash
 
-blocks = nis.local_chain_blocks_after(block_height: 2649)
+blocks = nis.local_chain_blocks_after(block_height: 2_649)
 puts blocks.last

data/examples/transactions/mosaic_definition_creation.rb

@@ -1,6 +1,6 @@
 require 'nis'
 
-# owner
+# mosaic creator
 A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 A_ADDRESS = 'TDPP2C4XQLMESBMCYGWN4NRAJAKZEYRV75KGYSOB'
 

data/examples/transactions/mosaic_supply_change.rb

@@ -1,6 +1,6 @@
 require 'nis'
 
-# owner
+# mosaic owner
 A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
 kp = Nis::Keypair.new(A_PRIVATE_KEY)

data/examples/transactions/multisig.rb

@@ -1,16 +1,18 @@
 require 'nis'
 
 # multisig
-A_PUBLIC_KEY  = '4b26a75313b747985470977a085ae6f840a0b84ebd96ddf17f4a31a2b580d078'
+M_PUBLIC_KEY  = '00f077782658ae91b77f238ba5fcd7ef110564b5c189072e4d4590d9b17f9d76f3'
 
 # cosignatory
-B_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
-B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
-kp = Nis::Keypair.new(B_PRIVATE_KEY)
+# recipient
+B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
-ttx = Nis::Transaction::Transfer.new(B_ADDRESS, 1_000_000, 'Good luck!')
-tx = Nis::Transaction::Multisig.new(ttx, A_PUBLIC_KEY)
+kp = Nis::Keypair.new(A_PRIVATE_KEY)
+
+ttx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
+tx = Nis::Transaction::Multisig.new(ttx, M_PUBLIC_KEY)
 puts "Fee: #{tx.fee.to_i}"
 
 nis = Nis.new

data/examples/transactions/multisig_add_cosignatory.rb

@@ -1,24 +1,24 @@
 require 'nis'
 
-# Account A (multisig)
-A_PUBLIC_KEY  = '4b26a75313b747985470977a085ae6f840a0b84ebd96ddf17f4a31a2b580d078'
+# multisig
+M_PUBLIC_KEY  = '6d72b57d2bc199d328e7ea3e24775f7f614760bc18f3f8501cd3daa9870cc40c'
 
-# Account B (cosignatory1)
-B_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+# cosignatory1
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
-# Account C (cosignatory2)
-C_PUBLIC_KEY  = '9fd1e5e886c4006efc715a0e183f2a87f198b8d19c44e7c67925b01aa45a7114'
+# cosignatory2
+B_PUBLIC_KEY  = '9e7ab2924cd1a3482df784db190614cfc8a33671f5d80a5b15a9c9e8b4d13933'
 
-kp = Nis::Keypair.new(B_PRIVATE_KEY)
+kp = Nis::Keypair.new(A_PRIVATE_KEY)
 
 mcm = Nis::Struct::MultisigCosignatoryModification.new(
   modificationType: 1,
-  cosignatoryAccount: C_PUBLIC_KEY
+  cosignatoryAccount: B_PUBLIC_KEY
 )
-min_cosigs = 2
-mtx = Nis::Transaction::MultisigAggregateModification.new([mcm], min_cosigs)
+min_cosigs = 1
 
-tx = Nis::Transaction::Multisig.new(mtx, A_PUBLIC_KEY)
+mtx = Nis::Transaction::MultisigAggregateModification.new([mcm], min_cosigs)
+tx = Nis::Transaction::Multisig.new(mtx, M_PUBLIC_KEY)
 
 nis = Nis.new
 req = Nis::Request::PrepareAnnounce.new(tx, kp)

data/examples/transactions/multisig_aggregate_modification.rb

@@ -1,16 +1,17 @@
 require 'nis'
 
 # multisig
-A_PRIVATE_KEY = '9bf8e6fd1a178a3cce39840cda34f80f55fe075c15f48eefad8506f4a70c2b47'
+M_PRIVATE_KEY = '00f077782658ae91b77f238ba5fcd7ef110564b5c189072e4d4590d9b17f9d76f3'
 
 # cosignatory
-B_PUBLIC_KEY  = 'cc63b4dcdec745417043c3fa0992ec3a1695461a26d90264744648abbd5caa0d'
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
+A_PUBLIC_KEY  = 'cc63b4dcdec745417043c3fa0992ec3a1695461a26d90264744648abbd5caa0d'
 
-kp = Nis::Keypair.new(A_PRIVATE_KEY)
+kp = Nis::Keypair.new(M_PRIVATE_KEY)
 
 mcm = Nis::Struct::MultisigCosignatoryModification.new(
   modificationType: 1,
-  cosignatoryAccount: B_PUBLIC_KEY
+  cosignatoryAccount: A_PUBLIC_KEY
 )
 min_cosigs = 1
 

data/examples/transactions/multisig_signature.rb

@@ -1,22 +1,22 @@
 require 'nis'
 
 # multisig
-A_PUBLIC_KEY = '4b26a75313b747985470977a085ae6f840a0b84ebd96ddf17f4a31a2b580d078'
-A_ADDRESS = 'TBAOYZS4FGY5XPQ5OD2VL3SY7GQ5FLH66GRCX5DL'
+M_PUBLIC_KEY = '6d72b57d2bc199d328e7ea3e24775f7f614760bc18f3f8501cd3daa9870cc40c'
+M_ADDRESS = 'TDJNDAQ7F7AQRXKP2YVTH67QYCWWKE6QLSJFWN64'
 
 # cosignatory1
-# B_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
-# B_PUBLIC_KEY  = 'cc63b4dcdec745417043c3fa0992ec3a1695461a26d90264744648abbd5caa0d'
-# B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+# A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
+# A_PUBLIC_KEY  = 'be2ba9cb15a547110d511a4d43c0482fbb584d78781abac01fb053d18f4a0033'
+# A_ADDRESS = 'TDPP2C4XQLMESBMCYGWN4NRAJAKZEYRV75KGYSOB'
 
 # cosignatory2
-C_PRIVATE_KEY = '2f6bececfaa81e0ce878be6263df29d11412559132743eebde99f695fbc4e288'
-C_ADDRESS = 'TAFPFQOTRYEKMKWWKLLLMYA3I5SCFDGYFACCOFWS'
+B_PRIVATE_KEY = '1d13af2c31ee6fb0c3c7aaaea818d9b305dcadba130ba663fc42d9f25b24ded1'
+B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
-kp = Nis::Keypair.new(C_PRIVATE_KEY)
+kp = Nis::Keypair.new(B_PRIVATE_KEY)
 
 nis = Nis.new
-txes = nis.account_unconfirmed_transactions(address: C_ADDRESS)
+txes = nis.account_unconfirmed_transactions(address: B_ADDRESS)
 
 unless txes.size > 0
   puts 'There are no transactions to sign.'
@@ -26,7 +26,7 @@ end
 hash = txes.first.meta.data
 puts "Unconfirmed Transaction Hash: #{hash}"
 
-tx = Nis::Transaction::MultisigSignature.new(hash, A_ADDRESS, C_PUBLIC_KEY)
+tx = Nis::Transaction::MultisigSignature.new(hash, M_ADDRESS, B_PUBLIC_KEY)
 
 req = Nis::Request::PrepareAnnounce.new(tx, kp)
 res = nis.transaction_prepare_announce(req)

data/examples/transactions/provision_namespace.rb

@@ -1,7 +1,7 @@
 require 'nis'
 
-# owner
-A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+# namespace creator
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
 kp = Nis::Keypair.new(A_PRIVATE_KEY)
 

data/examples/transactions/transfer.rb

@@ -1,14 +1,14 @@
 require 'nis'
 
 # sender
-A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
-# receiver
-B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+# recipient
+B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
 kp = Nis::Keypair.new(A_PRIVATE_KEY)
 
-tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1_000_000, 'Good luck!')
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
 puts "Fee: #{tx.fee.to_i}"
 
 nis = Nis.new

data/examples/transactions/transfer_mosaic.rb

@@ -1,48 +1,52 @@
 require 'nis'
-require 'pp'
 
 # sender
-A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
-# receiver
-B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+# recipient
+B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
 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')
+# fetch mosaic definition
+nis = Nis.new
+mo_dmdps = nis.namespace_mosaic_definition_page(namespace: 'kon')
 mo_def = mo_dmdps.first.mosaic
 
-# require 'pry'; binding.pry
-
+# Or you can use built object if you already know mosaic definition.
 # mosaic_id = Nis::Struct::MosaicId.new(
-#   namespaceId: 'sushi',
-#   name: 'anago'
+#   namespaceId: 'kon',
+#   name: 'heart'
 # )
-
 # properties = Nis::Struct::MosaicProperties.new(
-#   divisibility: 0,
-#   initialSupply: 10_000,
-#   supplyMutable: true,
-#   transferable: true
+#   divisibility: 3,
+#   initialSupply: 100_000_000
 # )
-
 # 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)
+# sending 1xem as mosaic sample
+# mosaic_id = Nis::Struct::MosaicId.new(
+#   namespaceId: 'nem',
+#   name: 'xem'
+# )
+# properties = Nis::Struct::MosaicProperties.new(
+#   divisibility: 6,
+#   initialSupply: 8_999_999_999
+# )
+# mo_def = Nis::Struct::MosaicDefinition.new(
+#   id: mosaic_id,
+#   properties: properties,
+# )
+# mosaic_attachment = Nis::Struct::MosaicAttachment.new(mo_def, 1_000_000)
 
-# pp tx.to_hash
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
+tx.mosaics << Nis::Struct::MosaicAttachment.new(mo_def, 1)
 
-nis = Nis.new
 req = Nis::Request::PrepareAnnounce.new(tx, kp)
-pp req.to_hash
-# res = nis.transaction_prepare_announce(req)
+res = nis.transaction_prepare_announce(req)
 
-#
-# puts "Message: #{res.message}"
-# puts "TransactionHash: #{res.transaction_hash}"
+puts "Message: #{res.message}"
+puts "TransactionHash: #{res.transaction_hash}"

data/examples/transactions/transfer_remote.rb

@@ -1,14 +1,14 @@
 require 'nis'
 
 # sender
-A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b834214'
 
-# receiver
-B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+# recipient
+B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
 kp = Nis::Keypair.new(A_PRIVATE_KEY)
 
-tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1_000_000, 'Good luck!')
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
 puts "Fee: #{tx.fee.to_i}"
 
 nis = Nis.new(host: '104.128.226.60')

data/examples/util/deserialize.rb

@@ -0,0 +1,14 @@
+require 'nis'
+
+# sender
+A_PRIVATE_KEY = '260206d683962350532408e8774fd14870a173b7fba17f6b504da3dbc5f1cc9f'
+
+# receiver
+B_ADDRESS = 'TAWKJTUP4DWKLDKKS534TYP6G324CBNMXKBA4X7B'
+
+kp = Nis::Keypair.new(A_PRIVATE_KEY)
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
+req = Nis::Request::Announce.new(tx, kp)
+
+puts req.to_hash[:data]
+puts Nis::Util::Deserializer.deserialize_transaction(req.to_hash[:data])

data/lib/nis/fee/provision_namespace.rb

@@ -22,11 +22,11 @@ class Nis::Fee
     private
 
     def root_fee
-      100 * 1_000_000
+      0.15 * 1_000_000
     end
 
     def sub_fee
-      10 * 1_000_000
+      0.15 * 1_000_000
     end
   end
 end

data/lib/nis/request/announce.rb

@@ -16,18 +16,31 @@ class Nis::Request
 
     # @return [Hash] Attribute and value pairs
     def to_hash
-      if @transaction.respond_to?(:other_trans)
-        other_trans(@transaction)
+      entity = @transaction.clone
+
+      entity.amount *= 1_000_000 if entity.respond_to?(:amount)
+
+      if entity.respond_to?(:other_trans)
+        other_trans(entity)
       end
 
-      @transaction.tap do |tx|
+      entity.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
         tx.version = Nis::Util.parse_version(tx.network, version(tx))
         tx.signer = @keypair.public
       end
 
-      serialized = serialize(@transaction)
+      entity_hash = entity.to_hash
+      if entity.respond_to?(:has_mosaics?) && !entity.has_mosaics?
+        entity_hash.delete(:mosaics)
+      end
+
+      if entity.respond_to?(:other_trans) && !entity.other_trans.has_mosaics?
+        entity_hash[:otherTrans].delete(:mosaics)
+      end
+
+      serialized = serialize(entity_hash)
       hex_serialized = Nis::Util::Convert.ua2hex(serialized)
 
       { data: Nis::Util::Convert.ua2hex(serialized),
@@ -36,8 +49,8 @@ class Nis::Request
 
     private
 
-    def serialize(transaction)
-      Nis::Util::Serializer.serialize_transaction(transaction.to_hash)
+    def serialize(transaction_hash)
+      Nis::Util::Serializer.serialize_transaction(transaction_hash)
     end
 
     def signature(serialized)
@@ -46,6 +59,8 @@ class Nis::Request
 
     def other_trans(transaction)
       transaction.other_trans.tap do |tx|
+        tx.amount *= 1_000_000 if tx.respond_to?(:amount)
+
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
         tx.version = Nis::Util.parse_version(tx.network, version(tx))

data/lib/nis/request/prepare_announce.rb

@@ -16,18 +16,31 @@ class Nis::Request
 
     # @return [Hash] Attribute and value pairs
     def to_hash
-      if @transaction.respond_to?(:other_trans)
-        other_trans(@transaction)
+      entity = @transaction.clone
+
+      entity.amount *= 1_000_000 if entity.respond_to?(:amount)
+
+      if entity.respond_to?(:other_trans)
+        other_trans(entity)
       end
 
-      @transaction.tap do |tx|
+      entity.tap do |tx|
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
         tx.version = Nis::Util.parse_version(tx.network, version(tx))
         tx.signer = @keypair.public
       end
 
-      { transaction: @transaction.to_hash,
+      entity_hash = entity.to_hash
+      if entity.respond_to?(:has_mosaics?) && !entity.has_mosaics?
+        entity_hash.delete(:mosaics)
+      end
+
+      if entity.respond_to?(:other_trans) && !entity.other_trans.has_mosaics?
+        entity_hash[:otherTrans].delete(:mosaics)
+      end
+
+      { transaction: entity_hash,
         privateKey: @keypair.private }
     end
 
@@ -35,6 +48,8 @@ class Nis::Request
 
     def other_trans(transaction)
       transaction.other_trans.tap do |tx|
+        tx.amount *= 1_000_000 if tx.respond_to?(:amount)
+
         tx.timeStamp = Nis::Util.timestamp
         tx.deadline = Nis::Util.deadline(DEADLINE)
         tx.version = Nis::Util.parse_version(tx.network, version(tx))

data/lib/nis/util/deserializer.rb

@@ -5,18 +5,31 @@ module Nis::Util
     # @return [Hash]
     def self.deserialize_transaction(serialized)
       s = Nis::Util::Convert.hex2ua(serialized)
+      type = deserialize_int(s[0, 4])
+      method = case type
+               when 0x0101 then method(:deserialize_transfer)
+               when 0x0801 then method(:deserialize_importance_transfer)
+               when 0x1001 then method(:deserialize_multisig_aggregate_modification)
+               when 0x1002 then method(:deserialize_multisig_signature)
+               when 0x1004 then method(:deserialize_multisig)
+               when 0x2001 then method(:deserialize_provision_namespace)
+               when 0x4001 then method(:deserialize_mosaic_definition_creation)
+               when 0x4002 then method(:deserialize_mosaic_supply_change)
+        else raise "Not implemented entity type: #{type}"
+      end
+      method.call(serialized)
+    end
+
+    # Deserialize a transfer transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_transfer(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
       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
@@ -26,11 +39,123 @@ module Nis::Util
       else
         tx[:message] = { type: 1, payload: '' }
       end
-      tx
+      common.merge(tx)
+    end
+
+    # Deserialize a importance transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_importance_transfer(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      tx[:mode] = deserialize_int(s[60, 4])
+      # s[64, 4] # Length of remote account public key byte array
+      tx[:remoteAccount] = deserialize_hex(s[68, 32])
+      common.merge(tx)
+    end
+
+    # Deserialize a multisig aggregate modification transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_multisig_aggregate_modification(serialized)
+      raise 'Not yet implimented.'
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      # TODO: deserializing
+      common.merge(tx)
+    end
+
+    # Deserialize a multisig signature transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_multisig_signature(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      tx[:otherHash] = {data: deserialize_hex(s[68, 32])}
+      tx[:otherAccount] = deserialize_a(s[104, 40])
+      common.merge(tx)
+    end
+
+    # Deserialize a multisig transfer transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_multisig(serialized)
+      raise 'Not yet implimented.'
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      # TODO: deserializing
+      common.merge(tx)
+    end
+
+    # Deserialize a provision namespace transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_provision_namespace(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      # s[60, 4] # Length of rental fee sink's public key byte array (always 32): 4 bytes
+      tx[:rentalFeeSink] = deserialize_a(s[64, 40]) # Public key bytes of rental fee sink
+      tx[:rentalFee] = deserialize_int(s[104, 8]) # Fental fee: 8 bytes
+      newpart_len = deserialize_int(s[112, 4]) # Length of new part string: 4 bytes
+      tx[:newPart] = deserialize_a(s[116, newpart_len]) # New part string: UTF8 encoded string.
+      parent_len = deserialize_int(s[116 + newpart_len, 4]) # Length of parent string: 4 bytes
+      parent = s[116 + newpart_len, parent_len]
+      unless parent.all? { |val| val == 0xff }
+        tx[:parent] = deserialize_a(parent) # Parent string: UTF8 encoded string
+      end
+      common.merge(tx)
+    end
+
+    # Deserialize a mosaic definition creation transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_mosaic_definition_creation(serialized)
+      raise 'Not yet implimented.'
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      # TODO: deserializing
+      common.merge(tx)
+    end
+
+    # Deserialize a mosaic supply change transaction object
+    # @param [String] serialized
+    # @return [Hash]
+    def self.deserialize_mosaic_supply_change(serialized)
+      s = Nis::Util::Convert.hex2ua(serialized)
+      common = deserialize_common(s)
+      tx = {}
+      # s[60, 4] # Length of mosaic id structure
+      ns_len = deserialize_int(s[64, 4]) # Length of namespace id string
+      mo_len = deserialize_int(s[68 + ns_len, 4]) # Length of mosaic name string
+      tx[:mosaicId] = {
+        namespaceId: deserialize_a(s[68, ns_len]),
+        name: deserialize_a(s[68 + ns_len + mo_len, mo_len])
+      }
+      tx[:supplyType] = deserialize_int(s[68 + ns_len + 4 + mo_len, 4]) # Supply type
+      tx[:delta] = deserialize_int(s[68 + ns_len + 4 + mo_len + 4, 8]) # Delta (change in supply)
+      common.merge(tx)
     end
 
     private
 
+    def self.deserialize_common(s)
+      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])
+      tx
+    end
+
     def self.deserialize_int(ua)
       Nis::Util::Convert.ua2hex(ua.reverse).to_i(16)
     end

data/lib/nis/util/serializer.rb

@@ -5,67 +5,163 @@ 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 0x0101 then method(:serialize_transfer)
+               when 0x0801 then method(:serialize_importance_transfer)
+               when 0x1001 then method(:serialize_multisig_aggregate_modification)
+               when 0x1002 then method(:serialize_multisig_signature)
+               when 0x1004 then method(:serialize_multisig)
+               when 0x2001 then method(:serialize_provision_namespace)
+               when 0x4001 then method(:serialize_mosaic_definition_creation)
+               when 0x4002 then method(:serialize_mosaic_supply_change)
         else raise "Not implemented entity type: #{entity[:type]}"
       end
       method.call(entity)
     end
 
-    def self.serialize_common(entity)
+    def self.serialize_transfer(entity)
       a = []
-      a += serialize_int(entity[:type])
-      a += serialize_int(entity[:version])
-      a += serialize_int(entity[:timeStamp])
+      # Common transaction part
+      a += serialize_common(entity)
+      # Transfer transaction part
+      a += serialize_safe_string(entity[:recipient])
+      a += serialize_long(entity[:amount])
+      temp = hex2ua(entity[:message][:payload])
+      if temp.size == 0
+        a += [0, 0, 0, 0]
+      else
+        a += serialize_int(temp.size + 8)
+        a += serialize_int(entity[:message][:type])
+        a += serialize_int(temp.size)
+        a += temp
+      end
+      a
+    end
 
-      temp = hex2ua(entity[:signer])
+    def self.serialize_importance_transfer(entity)
+      a = []
+      a += serialize_common(entity)
+      a += serialize_int(entity[:mode])
+      temp = hex2ua(entity[:remoteAccount])
       a += serialize_int(temp.size)
       a += temp
-
-      a += serialize_long(entity[:fee].to_i)
-      a += serialize_int(entity[:deadline])
       a
     end
 
-    def self.serialize_multisig_transfer(entity)
+    def self.serialize_multisig_aggregate_modification(entity)
       a = []
+      a += serialize_common(entity)
+      a += serialize_int(entity[:modifications].size)
+      a += entity[:modifications].map do |mod|
+        b = []
+        b += serialize_int(40)
+        b += serialize_int(mod[:modificationType])
+        b += serialize_int(32)
+        b += hex2ua(mod[:cosignatoryAccount])
+        b
+      end.flatten
 
-      # Common transaction part
+      # The following part describes the minimum cosignatories modification.
+      # The part is optional. Version 1 aggregate modification transactions should omit this part.
+      # Version 2 aggregate modification transactions with no minimum cosignatories modification
+      # should only write the length field with value 0x00, 0x00, 0x00, 0x00.
+      if true # only version2
+        if entity[:minCosignatories][:relativeChange] > 0
+          a += serialize_int(4)
+          a += serialize_int(entity[:minCosignatories][:relativeChange])
+        else
+          a += [0, 0, 0, 0]
+        end
+      end
+      a
+    end
+
+    def self.serialize_multisig_signature(entity)
+      a = []
       a += serialize_common(entity)
+      temp = hex2ua(entity[:otherHash][:data])
+      a += serialize_int(4 + temp.size)
+      a += serialize_int(temp.size)
+      a += temp
+      a += serialize_safe_string(entity[:otherAccount])
+    end
 
-      # Transfer transaction part
-      tx = serialize_transfer(entity[:otherTrans])
+    def self.serialize_multisig(entity)
+      a = []
+      a += serialize_common(entity)
+      other_tx = entity[:otherTrans]
+      tx = case other_tx[:type]
+        when 0x0101 then serialize_transfer(other_tx)
+        when 0x0801 then serialize_importance_transfer(other_tx)
+        when 0x1001 then serialize_multisig_aggregate_modification(other_tx)
+        else raise "Unexpected type #{other_tx[:type]}"
+      end
       a += serialize_int(tx.size)
       a += tx
       a
     end
 
-    def self.serialize_transfer(entity)
+    def self.serialize_provision_namespace(entity)
       a = []
-
-      # Common transaction part
       a += serialize_common(entity)
-
-      # Transfer transaction part
-      temp = serialize_safe_string(entity[:recipient])
+      a += serialize_safe_string(entity[:rentalFeeSink])
+      a += serialize_long(entity[:rentalFee])
+      temp = hex2ua(utf8_to_hex(entity[:newPart]))
+      a += serialize_int(temp.size)
       a += temp
-
-      a += serialize_long(entity[:amount])
-
-      temp = hex2ua(entity[:message][:payload])
-      if temp.size == 0
-        a += [0, 0, 0, 0]
-      else
-        a += serialize_int(temp.size + 8)
-        a += serialize_int(entity[:message][:type])
+      if entity[:parent]
+        temp = hex2ua(utf8_to_hex(entity[:parent]))
         a += serialize_int(temp.size)
         a += temp
+      else
+        a += [255, 255, 255, 255]
       end
       a
     end
 
+    def self.serialize_mosaic_definition_creation(entity)
+      a = []
+      a += serialize_common(entity)
+      a += serialize_mosaic_definition(entity[:mosaicDefinition])
+      a += serialize_safe_string(entity[:creationFeeSink])
+      a += serialize_long(entity[:creationFee])
+      a
+    end
+
+    def self.serialize_mosaic_supply_change(entity)
+      a = []
+      a += serialize_common(entity)
+      mo_id = entity[:mosaicId]
+      a_ns = hex2ua(utf8_to_hex(mo_id[:namespaceId]))
+      a_ns_len = serialize_int(a_ns.size)
+      a_mo = hex2ua(utf8_to_hex(mo_id[:name]))
+      a_mo_len = serialize_int(a_mo.size)
+      a += serialize_int((a_ns_len + a_ns + a_mo_len + a_mo).size)
+      a += a_ns_len
+      a += a_ns
+      a += a_mo_len
+      a += a_mo
+      a += serialize_int(entity[:supplyType])
+      a += serialize_long(entity[:delta])
+      a
+    end
+
     private
 
+    def self.serialize_common(entity)
+      a = []
+      a += serialize_int(entity[:type])
+      a += serialize_int(entity[:version])
+      a += serialize_int(entity[:timeStamp])
+
+      temp = hex2ua(entity[:signer])
+      a += serialize_int(temp.size)
+      a += temp
+
+      a += serialize_long(entity[:fee].to_i)
+      a += serialize_int(entity[:deadline])
+      a
+    end
+
     # Safe String - Each char is 8 bit
     # @param [String] str
     # @return [Array]
@@ -106,16 +202,6 @@ module Nis::Util
       a
     end
 
-    # @param [Nis::Struct::MosaicId] mosaic_id
-    # @return [Array]
-    def self.serialize_mosaic_id(mosaic_id)
-      serialized_namespace_id = serialize_safe_string(mosaic_id.namespace_id)
-      serialized_name = serialize_safe_string(mosaic_id.name)
-      [serialized_namespace_id.size + serialized_name.size, 0, 0, 0] +
-        serialized_namespace_id +
-        serialized_name
-    end
-
     # @param [Nis::Struct::Mosaic] mosaic
     # @return [Array]
     def self.serialize_mosaic_and_quantity(mosaic)
@@ -145,74 +231,63 @@ module Nis::Util
       end.flatten
     end
 
+    # @param [Hash] entity
+    # @return [Array]
+    def self.serialize_mosaic_id(entity)
+      a = []
+      a += serialize_safe_string(entity[:namespaceId])
+      a += serialize_safe_string(entity[:name])
+      serialize_int(a.size) + a
+    end
+
     # @param [Hash] entity
     # @return [Array]
     def self.serialize_property(entity)
-      a = [].fill(0, 0, 4)
-      serialized_name  = serialize_safe_string(entity[:name]);
-      serialized_value = serialize_safe_string(entity[:value]);
-      a[0] = serialized_name.size + serialized_value.size
-      a + serialized_name + serialized_value
+      a = []
+      a += serialize_safe_string(entity[:name])
+      a += serialize_safe_string(entity[:value])
+      serialize_int(a.size) + a
     end
 
     # @param [Array] entities
     # @return [Array]
     def self.serialize_properties(entities)
-      a = [].fill(0, 0, 4)
-      a[0] = entities.size
-
-      helper = {
+      order = {
         'divisibility'  => 1,
         'initialSupply' => 2,
         'supplyMutable' => 3,
         'transferable'  => 4
       }
-      a + entities.sort_by { |ent| helper[ent[:name]] }
+      a = []
+      a = entities.sort_by { |ent| order[ent[:name]] }
         .map { |ent| serialize_property(ent) }.flatten
+      serialize_int(entities.size) + a
     end
 
     # @param [Hash] entity
     # @return [Array]
     def self.serialize_levy(entity)
-      return [].fill(0, 0, 4) if entity.nil?
-      a = [].fill(0, 0, 8)
-      a[0] = entity[:type]
-      temp = serialize_safe_string(entity[:recipient])
-      serialized_mosaic_id = serialize_mosaic_id(entity[:mosaic_id])
-      serialized_fee = serialize_long(entity[:fee])
-      a += temp + serialized_mosaic_id + serialized_fee
-      a[0] = 4 + temp.size + serialized_mosaic_id.size + 8;
-      a
+      return [0, 0, 0, 0] if entity.nil?
+      a = []
+      a += serialize_int(entity[:type])
+      a += serialize_safe_string(entity[:recipient])
+      a += serialize_mosaic_id(entity[:mosaicId])
+      a += serialize_long(entity[:fee])
+      serialize_int(a.size) + a
     end
 
     # @param [Hash] entity
     # @return [Array]
     def self.serialize_mosaic_definition(entity)
-      a = [].fill(0, 0, 4)
+      a = []
       temp = hex2ua(entity[:creator])
-      a[0] = temp.size
+      a += serialize_int(temp.size)
       a += temp
       a += serialize_mosaic_id(entity[:id])
-      utf8_to_bin = hex2ua(utf8_to_hex(entity[:description]));
-      a += serialize_bin_string(utf8_to_bin);
-      a += serialize_properties(entity[:properties]);
-      a += serialize_levy(entity[:levy]);
-      a
-    end
-
-    # @param [String] hex
-    # @return [Array]
-    # def self.hex2ua(hex)
-    #   hex.scan(/../).map(&:hex)
-    # end
-    #
-    def self.bin2words(bin, bin_size)
-        # temp = [];
-        # for (let i = 0; i < ua_size; i += 4) {
-        #     let x = ua[i] * 0x1000000 + (ua[i + 1] || 0) * 0x10000 + (ua[i + 2] || 0) * 0x100 + (ua[i + 3] || 0);
-        #     temp.push((x > 0x7fffffff) ? x - 0x100000000 : x);
-        # }
-        # CryptoJS.lib.WordArray.create(temp, ua_size);
+      a += serialize_bin_string(hex2ua(utf8_to_hex(entity[:description])))
+      a += serialize_properties(entity[:properties])
+      a += serialize_levy(entity[:levy])
+      serialize_int(a.size) + a
     end
 
     # @param [String] hex
@@ -253,21 +328,5 @@ module Nis::Util
         end
       end.flatten.map(&:chr).join
     end
-
-    def encode(sender_privkey, recipient_pubkey, message)
-      # sk = hex2ua(sender_privkey)
-      # pk = hex2ua(recipient_pubkey)
-      # let shared = new Uint8Array(32);
-      # let r = key_derive(shared, salt, sk, pk);
-      # let encKey = r;
-      # let encIv = {
-      #     iv: convert.bin2words(iv, 16)
-      # };
-      # let encrypted = CryptoJS.AES.encrypt(CryptoJS.enc.Hex.parse(convert.utf8ToHex(msg)), encKey, encIv);
-      #
-      salt = RbNaCl::Random.random_bytes(32)
-      iv   = RbNaCl::Random.random_bytes(16)
-      bin2hex(salt) + bin2hex(iv) # + CryptoJS.enc.Hex.stringify(encrypted.ciphertext)
-    end
   end
 end

data/lib/nis/version.rb

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

data/nis.gemspec

@@ -25,6 +25,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.post_install_message = %q{
+  <nis-ruby>
+  Please see https://gitter.im/44uk/nis-ruby for the latest information.
+  The gem is under development. Incompatible changes can be made.
+  Feel free to ask and give feedback to https://twitter.com/44uk_i3
+  Good luck! NEM application development!
+  }
+
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'yard', '~> 0.9'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -215,6 +215,7 @@ files:
 - examples/transactions/transfer.rb
 - examples/transactions/transfer_mosaic.rb
 - examples/transactions/transfer_remote.rb
+- examples/util/deserialize.rb
 - lib/nis.rb
 - lib/nis/client.rb
 - lib/nis/endpoint.rb
@@ -352,7 +353,10 @@ licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message: "\n  <nis-ruby>\n  Please see https://gitter.im/44uk/nis-ruby
+  for the latest information.\n  The gem is under development. Incompatible changes
+  can be made.\n  Feel free to ask and give feedback to https://twitter.com/44uk_i3\n
+  \ Good luck! NEM application development!\n  "
 rdoc_options: []
 require_paths:
 - lib