nem-ruby 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0280ea3ed19d1f11f874b5443e59eeba0a21eb4fec27e31d578250c74c377730'
-  data.tar.gz: 3d9621bfe402f975ef08c2265a28dd3132ca86631a0ee14268fb1f5c2e340fa3
+  metadata.gz: af0488dcad2793275e0bc42b4613730c63c6d11e6c8c9815605137b1c60788ad
+  data.tar.gz: 93ddce86c953c3b220b2d81b24d83d806c05fbbb3e06ece73dac7ef429fcd396
 SHA512:
-  metadata.gz: d2983c53b1edb903c83571e2403dee0611848a644b21b3a4f5bbacaabb227a8b08c707ec2d10cdeda2e91be84e346b828ec72c40ad0509e15e9ad71ae117dc09
-  data.tar.gz: f887982de7c646a1604ad2c790db4f618141190750bf73cdbc912a1bb7a5ab5a569d3e136fb29a380f6ff81d9ee9fbbb92816b6f3fb24d9c30f344d49756eb76
+  metadata.gz: 6706e148b2ded5c9443ba9e0d5a5bfeac9d472965d167d0611ed6ca6765a63b4319fe3161a1c52da060bce2bc982ded779af2287b3bfe2abeee6f09604975ddc
+  data.tar.gz: 03afec67c11f6a77a6575072fa39dcbc0d875d7feaf1477bcde766adb59f5e2bae8d62c09abd298991c9eb9a55116b4f94462cb1f66f4e2db85fd535c5f43aa2

data/docs/examples/transactions.md

@@ -181,7 +181,7 @@ tx = Nem::Transaction::MultisigAggregateModification.new(msig_cosignatories, rel
 pp "Fee: #{tx.fee.to_i}"
 
 req = Nem::Request::Announce.new(tx, kp)
-res = endpoint.prepare_announce(req)
+res = endpoint.announce(req)
 
 pp "Message: #{res.message}"
 pp "TransactionHash: #{res.transaction_hash}"

data/docs/examples/util.md

@@ -19,6 +19,6 @@ data = req.to_entity[:data]
 pp data
 
 # deserialize data into hash
-hash = Nem::Util::Deserializer.deserialize_transaction(data)
+hash = Nem::Util::Deserializer.deserialize(data)
 pp Nem::Model::Transaction.new_from_account_transaction(hash)
 ```

data/examples/endpoint/transaction.rb

@@ -25,6 +25,9 @@ pp tx_endpoint.find(hash)
 hash = '4185cad053f0bc7a2b3b9e5adc493e81a5af2f0a431f3d34ba2a25c937731629'
 pp tx_endpoint.find(hash)
 
+# if tx has a message, convert hex to string
+# Nem::Util::Convert.hex_to_utf8(res.message.value)
+
 # aggregate (multisig)
 hash = 'f7d385a4c8b78d8a6a91c7b778df4ae793394c9c8bfeeca1393bf43770328a06'
 pp tx_endpoint.find(hash)

data/examples/transaction/multisig_add_cosignatory.rb

@@ -20,9 +20,11 @@ msig_cosigratories = [
   Nem::Transaction::MultisigCosignatoryModification.new(:add, B_PUBLIC_KEY)
 ]
 relative_change = 1
-mtx = Nem::Transaction::MultisigAggregateModification.new(msig_cosigratories, relative_change)
+mtx = Nem::Transaction::MultisigAggregateModification.new(
+  msig_cosigratories,
+  relative_change
+)
 tx = Nem::Transaction::Multisig.new(mtx, M_PUBLIC_KEY)
-tx_endpoint = Nem::Endpoint::Transaction.new(node)
 
 req = Nem::Request::Announce.new(tx, kp)
 res = tx_endpoint.announce(req)

data/examples/transaction/multisig_aggregate_modification.rb

@@ -17,11 +17,14 @@ msig_cosignatories = [
   Nem::Transaction::MultisigCosignatoryModification.new(:add, A_PUBLIC_KEY)
 ]
 relative_change = 1
-tx = Nem::Transaction::MultisigAggregateModification.new(msig_cosignatories, relative_change)
+tx = Nem::Transaction::MultisigAggregateModification.new(
+  msig_cosignatories,
+  relative_change
+)
 pp "Fee: #{tx.fee.to_i}"
 
 req = Nem::Request::Announce.new(tx, kp)
-res = tx_endpoint.prepare_announce(req)
+res = tx_endpoint.announce(req)
 
 pp "Message: #{res.message}"
 pp "TransactionHash: #{res.transaction_hash}"

data/examples/transaction/multisig_transfer.rb

@@ -13,7 +13,7 @@ A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b83421
 B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
 
 kp = Nem::Keypair.new(A_PRIVATE_KEY)
-node = Nem::Node.new
+node = Nem::Node.new(host: 'bigalice2.nem.ninja')
 tx_endpoint = Nem::Endpoint::Transaction.new(node)
 
 ttx = Nem::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
@@ -21,7 +21,7 @@ tx = Nem::Transaction::Multisig.new(ttx, M_PUBLIC_KEY)
 pp "Fee: #{tx.fee.to_i}"
 
 req = Nem::Request::Announce.new(tx, kp)
-res = tx_endpoint.prepare_announce(req)
+res = tx_endpoint.announce(req)
 
 pp "Message: #{res.message}"
 pp "TransactionHash: #{res.transaction_hash}"

data/examples/util/deserialize.rb

@@ -22,5 +22,5 @@ data = req.to_entity[:data]
 pp data
 
 # deserialize data into hash
-hash = Nem::Util::Deserializer.deserialize_transaction(data)
+hash = Nem::Util::Deserializer.deserialize(data)
 pp Nem::Model::Transaction.new_from_account_transaction(hash)

data/lib/nem/model/message.rb

@@ -32,6 +32,7 @@ module Nem
         bin_pk = (public_key || @public_key).scan(/../).map(&:hex).pack('C*')
         @value = Nem::Util::Ed25519.encrypt(bin_sk, bin_pk, value)
         @type = TYPE_ENCRYPTED
+        self
       end
 
       def decrypt!
@@ -39,6 +40,7 @@ module Nem
         bin_pk = (public_key || @public_key).scan(/../).map(&:hex).pack('C*')
         @value = Nem::Util::Ed25519.decrypt(bin_sk, bin_pk, payload)
         @type = TYPE_PLAIN
+        self
       end
 
       # @return [Boolean]

data/lib/nem/transaction/multisig_aggregate_modification.rb

@@ -8,7 +8,7 @@ module Nem
 
       attr_reader :modifications, :relative_change, :min_cosignatories
 
-      def initialize(modifications, relative_change, timestamp: nil, deadline: nil, network: nil)
+      def initialize(modifications, relative_change = 0, timestamp: nil, deadline: nil, network: nil)
         @modifications = modifications
         @relative_change = relative_change
 
@@ -19,6 +19,14 @@ module Nem
         @deadline = deadline || Time.now + Nem.default_deadline
       end
 
+      def has_relative_change?
+        relative_change != 0
+      end
+
+      def version
+        network(hex: true) + (has_relative_change? ? 2 : 1)
+      end
+
       # attributes must be CAMEL CASE for NIS params
       # @return [Hash]
       def to_hash

data/lib/nem/util/deserializer.rb

@@ -4,27 +4,39 @@ module Nem
       # Deserialize a transaction object
       # @param [String] serialized
       # @return [Hash]
-      def self.deserialize_transaction(serialized)
+      def self.deserialize(serialized)
         s = Nem::Util::Convert.hex2ua(serialized)
+        deserialize_transaction(s)
+      end
+
+      private
+
+      def self.switch_method(type)
+        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
+      end
+
+      # Deserialize a transaction object
+      # @param [String] serialized
+      # @return [Hash]
+      def self.deserialize_transaction(s)
         common = s[0, 60]
         specific = s[60, s.size]
         type = deserialize_int(common[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 = switch_method(type)
+        # require 'pry'; binding.pry
         deserialize_common(common).merge(method.call(specific))
       end
 
-      private
-
       # Deserialize a transfer transaction object
       # @param [String] serialized
       # @return [Hash]
@@ -82,10 +94,30 @@ module Nem
       # @param [String] serialized
       # @return [Hash]
       def self.deserialize_multisig_aggregate_modification(s)
-        raise 'Not yet implimented.'
-        # TODO: deserializing
-        tx = {}
-        tx
+        mods = []
+        mod_count = deserialize_int(s[0, 4])
+        offset = 4
+        mod_count.times do |i|
+          mod_len = deserialize_int(s[offset, 4])
+          mods << {
+            modificationType: deserialize_int(s[offset + 4, 4]),
+            cosignatoryAccount: deserialize_hex(s[offset + 12, 32])
+          }
+          offset += 4 + mod_len
+        end
+        tx = {
+          modifications: mods,
+        }
+
+        if s[offset + 4, 4]
+          tx.merge(
+            minCosignatories: {
+              relativeChange: deserialize_int(s[offset + 4, 4])
+            }
+          )
+        else
+          tx
+        end
       end
 
       # Deserialize a multisig signature transaction object
@@ -102,10 +134,10 @@ module Nem
       # @param [String] serialized
       # @return [Hash]
       def self.deserialize_multisig(s)
-        raise 'Not yet implimented.'
-        # TODO: deserializing
-        tx = {}
-        tx
+        msig_len = deserialize_int(s[0, 4])
+        inner = s[4, msig_len]
+        inner_tx = deserialize_transaction(inner)
+        { otherTrans: inner_tx }
       end
 
       # Deserialize a provision namespace transaction object

data/lib/nem/util/serializer.rb

@@ -60,17 +60,9 @@ module Nem
         end
         a.concat mods
 
-        # 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.concat serialize_int(4)
-            a.concat serialize_int(entity[:minCosignatories][:relativeChange])
-          else
-            a.concat [0, 0, 0, 0]
-          end
+        if true # TODO: append only version2
+          a.concat serialize_int(4)
+          a.concat serialize_int(entity[:minCosignatories][:relativeChange])
         end
         a
       end

data/lib/nem/version.rb

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

metadata

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