nis-ruby 0.0.10 → 0.0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4287fd9c5da8d0d63e15449b9aaf58ff283040b8
-  data.tar.gz: c0aeef4e827e1161a8868227dd48cde26ab131fb
+  metadata.gz: b71820d8d2ab72e1c4ddc2777939b2099a2ff716
+  data.tar.gz: 7bf8eef6eeed3ead69f68e40d3ffa1c63d8f3077
 SHA512:
-  metadata.gz: 928f54fe0c8d1013df7efcecd068b386a189a973a5715b54d85057d406c3a04097bb642af3ab718985630587efac8bcde0d6d213b04eb539d2ad6ee4351a1b84
-  data.tar.gz: d231b8271bfbb964fe205ade11e8fb9388224255ad1316ff63a3e56a309631d8c75a1facd2cd8e0551ce23a97cae47a364c960347894f0e47777154f5c81d5e7
+  metadata.gz: 891cdec923af05c61c85c9af8aa644cd2fb5ed5508bea4505ce5ebd5a93896706c91f502518079fd7da8494c02d8c4fb4819446c52e4d8b9115eafab84a3787f
+  data.tar.gz: af8eb1fa70b6d3e5b098b31e5969904598ff72956748d3f70e3e1dc496f8e49164a8bc3201839cbe38639a74b54a33f3d785f036e44ff6d405cdc1124219c21a

data/README.md

@@ -29,7 +29,7 @@ gem 'nis-ruby'
 
 ## Usage
 
-More specific demonstrations are in samples/ directory.
+More specific sample codes are in **samples/** directory.
 
 ### Methods
 
@@ -43,6 +43,23 @@ nis.heartbeat
 nis.status
 # => {code: 6, type: 4, message: "status"}
 # See http://bob.nem.ninja/docs/#status-request
+
+tx = Nis::Transaction::Transfer.new(
+  amount: 10_000_000,
+  recipient: RECIPIENT_ADDRESS,
+  signer: SENDER_PUBLIC_KEY,
+  message: Nis::Struct::Message.new('Hello'),
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
+)
+
+rpa = Nis::Struct::RequestPrepareAnnounce.new(
+  transaction: tx,
+  privateKey: SENDER_PRIVATE_KEY
+)
+
+nis.transaction_prepare_announce(request_prepare_announce: rpa)
 ```
 
 ### Requesting
@@ -64,7 +81,7 @@ nis.request(:post, '/account/unlock',
 
 tx = {
   amount: 10_000_000,
-  fee:     3_000_000,
+  fee:     1_000_000,
   recipient: 'TALICELCD3XPH4FFI5STGGNSNSWPOTG5E4DS2TOS',
   signer: 'a1aaca6c17a24252e674d155713cdf55996ad00175be4af02a20c67b59f9fe8a',
   message: {
@@ -72,9 +89,9 @@ tx = {
     type: 1
   },
   type: 0x0101, # 257
-  timeStamp: (Time.now.to_i - 1_427_587_585),
-  deadline: (Time.now.to_i - 1_427_587_585) + 43_200,
-  version: -1_744_830_463 # testnet version 1
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
 }
 puts nis.request! :post, 'transaction/prepare-announce', {
   transaction: tx,
@@ -124,10 +141,11 @@ Nis.new(url: 'http://bigalice3.nem.ninja:7890')
 
 ## TODO
 
-* Do more improvements.
-  * Implementation Apostille
-  * Implementation Mosaic
-  * Implementation Encryption
+* Do more improvements
+  * Mosaic transferring
+  * Encryption message
+  * Remote transaction
+
 
 ## Documentation
 

data/lib/nis.rb

@@ -1,8 +1,10 @@
 require 'nis/version'
+require 'nis/mixin'
 require 'nis/util'
 require 'nis/client'
 require 'nis/endpoint'
 require 'nis/struct'
+require 'nis/transaction'
 require 'nis/unit'
 require 'nis/error'
 

data/lib/nis/endpoint/node/experiences.rb

@@ -3,7 +3,9 @@ module Nis::Endpoint
     # @return [Nis::Struct::ExtendedNodeExperiencePair]
     # @see http://bob.nem.ninja/docs/#requesting-node-experiences
     def node_experiences
-      Nis::Struct::ExtendedNodeExperiencePair.build request!(:get, '/node/experiences')
+      request!(:get, '/node/experiences') do |res|
+        res[:data].map { |enep| Nis::Struct::ExtendedNodeExperiencePair.build(enep) }
+      end
     end
   end
 end

data/lib/nis/mixin.rb

@@ -0,0 +1 @@
+Dir[File.expand_path('../mixin/*.rb', __FILE__)].each { |f| require f }

data/lib/nis/mixin/network.rb

@@ -0,0 +1,20 @@
+class Nis
+  module Mixin
+    module Network
+      # @return [Integer]
+      def version
+        (0x0000000F & @version)
+      end
+
+      # @return [Boolean]
+      def testnet?
+        (0xFFFFFFF0 & @version) == Nis::Util::TESTNET
+      end
+
+      # @return [Boolean]
+      def mainnet?
+        (0xFFFFFFF0 & @version) == Nis::Util::MAINNET
+      end
+    end
+  end
+end

data/lib/nis/struct/block.rb

@@ -18,6 +18,7 @@ class Nis::Struct
     alias :prev_block_hash= :prevBlockHash=
 
     def self.build(attrs)
+      attrs[:transactions] = attrs[:transactions].map {|tx| Transaction.build(tx) }
       new(attrs)
     end
   end

data/lib/nis/struct/extended_node_experience_pair.rb

@@ -8,6 +8,7 @@ class Nis::Struct
     attr_accessor :node, :syncs, :experiences
 
     def self.build(attrs)
+      attrs[:node] = Node.build(attrs[:node])
       new(attrs)
     end
   end

data/lib/nis/struct/mosaic_properties.rb

@@ -31,13 +31,13 @@ class Nis::Struct
       [{
         name: 'divisibility',
         value: divisibility.to_s
-      },{
+      }, {
         name: 'initialSupply',
         value: initial_supply.to_s
-      },{
+      }, {
         name: 'supplyMutable',
         value: supply_mutable ? 'true' : 'false'
-      },{
+      }, {
         name: 'transferable',
         value: transferable ? 'true' : 'false'
       }]

data/lib/nis/transaction.rb

@@ -0,0 +1 @@
+Dir[File.expand_path('../transaction/*.rb', __FILE__)].each { |f| require f }

data/lib/nis/{struct/importance_transfer_transaction.rb → transaction/importance_transfer.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [String]  signature
   # @attr [Integer] fee
@@ -9,9 +9,12 @@ class Nis::Struct
   # @attr [Integer] version
   # @attr [String]  signer
   # @see http://bob.nem.ninja/docs/#importanceTransferTransaction
-  class ImportanceTransferTransaction
+  class ImportanceTransfer
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :mode, :remoteAccount, :type, :deadline, :version, :signer
+    attr_accessor :timeStamp, :signature, :mode, :remoteAccount, :type, :deadline, :signer
 
     alias timestamp timeStamp
     alias timestamp= timeStamp=
@@ -19,6 +22,7 @@ class Nis::Struct
     alias remote_account= remoteAccount=
 
     TYPE = 0x0801 # 2049 (importance transfer transaction)
+    FEE  = 6_000_000
 
     ACTIVATE   = 0x0001
     DEACTIVATE = 0x0002
@@ -28,18 +32,21 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
+    def type
+      @type ||= TYPE
     end
 
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == Nis::Util::TESTNET
+    # @return [Integer]
+    def fee
+      @fee ||= FEE
     end
 
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == Nis::Util::MAINNET
+    alias to_hash_old to_hash
+
+    def to_hash
+      type
+      fee
+      to_hash_old
     end
   end
 end

data/lib/nis/{struct/mosaic_definition_creation_transaction.rb → transaction/mosaic_definition_creation.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [Integer] signature
   # @attr [Integer] fee
@@ -10,9 +10,12 @@ class Nis::Struct
   # @attr [Integer] creationFeeSink
   # @attr [Nis::Struct::MosaicDefinition] mosaicDefinition
   # @see http://bob.nem.ninja/docs/#mosaicDefinitionCreationTransaction
-  class MosaicDefinitionCreationTransaction
+  class MosaicDefinitionCreation
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
       :creationFee, :creationFeeSink, :mosaicDefinition
 
     alias timestamp timeStamp
@@ -32,35 +35,21 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == MAINNET
+    def type
+      @type ||= TYPE
     end
 
     # @return [Integer]
     def fee
-      @fee ||= calculate_fee
+      @fee ||= FEE
     end
 
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
-
-    # @return [Integer]
-    def calculate_fee
-      FEE
-    end
   end
 end

data/lib/nis/{struct/mosaic_supply_change_transaction.rb → transaction/mosaic_supply_change.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [Integer] signature
   # @attr [Integer] fee
@@ -7,9 +7,12 @@ class Nis::Struct
   # @attr [Integer] version
   # @attr [String] signer
   # @see http://bob.nem.ninja/docs/#mosaicSupplyChangeTransaction
-  class MosaicSupplyChangeTransaction
+  class MosaicSupplyChange
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
                   :supplyType, :delta, :mosaicId
 
     alias timestamp timeStamp
@@ -21,6 +24,7 @@ class Nis::Struct
 
     TYPE = 0x4002 # 16386 (mosaic supply change transaction)
     FEE  = 20_000_000
+
     INCREASE = 1
     DECREASE = 2
 
@@ -29,35 +33,21 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == MAINNET
+    def type
+      @type ||= TYPE
     end
 
     # @return [Integer]
     def fee
-      @fee ||= calculate_fee
+      @fee ||= FEE
     end
 
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
-
-    # @return [Integer]
-    def calculate_fee
-      FEE
-    end
   end
 end

data/lib/nis/{struct/multisig_transaction.rb → transaction/multisig.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [Integer] fee
   # @attr [Integer] type
@@ -7,9 +7,12 @@ class Nis::Struct
   # @attr [String] signer
   # @attr [Nis::Struct::TransferTransaction] otherTrans
   # @see http://bob.nem.ninja/docs/#multisigTransaction
-  class MultisigTransaction
+  class Multisig
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :type, :deadline, :signer,
                   :otherTrans
 
     alias timestamp timeStamp
@@ -25,23 +28,13 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == MAINNET
+    def type
+      @type ||= TYPE
     end
 
     # @return [Integer]
     def fee
-      @fee ||= calculate_fee
+      @fee ||= FEE
     end
 
     def mosaics
@@ -51,13 +44,9 @@ class Nis::Struct
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
-
-    # @return [Integer]
-    def calculate_fee
-      FEE
-    end
   end
 end

data/lib/nis/{struct/multisig_aggregate_modification_transaction.rb → transaction/multisig_aggregate_modification.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [String]  signature
   # @attr [Integer] fee
@@ -9,9 +9,12 @@ class Nis::Struct
   # @attr [Array <Nis::Struct::MultisigCosignatoryModification>] modifications
   # @attr [Hash] minCosignatories
   # @see http://bob.nem.ninja/docs/#multisigAggregateModificationTransaction
-  class MultisigAggregateModificationTransaction
+  class MultisigAggregateModification
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
                   :modifications, :minCosignatories
 
     alias timestamp timeStamp
@@ -27,34 +30,21 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == Nis::Util::TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == Nis::Util::MAINNET
+    def type
+      @type ||= TYPE
     end
 
+    # @return [Integer]
     def fee
-      @fee ||= calculate_fee
+      @fee ||= FEE
     end
 
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
-
-    # @return [Integer]
-    def calculate_fee
-      FEE
-    end
   end
 end

data/lib/nis/{struct/multisig_signature_transaction.rb → transaction/multisig_signature.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [String]  signature
   # @attr [Integer] fee
@@ -9,9 +9,12 @@ class Nis::Struct
   # @attr [String]  otherHash
   # @attr [String]  otherAccount
   # @see http://bob.nem.ninja/docs/#multisigSignatureTransaction
-  class MultisigSignatureTransaction
+  class MultisigSignature
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
                   :otherHash, :otherAccount
 
     alias timestamp timeStamp
@@ -28,18 +31,15 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
+    def type
+      @type ||= TYPE
     end
 
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == Nis::Util::TESTNET
-    end
+    alias to_hash_old to_hash
 
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == Nis::Util::MAINNET
+    def to_hash
+      type
+      to_hash_old
     end
   end
 end

data/lib/nis/{struct/provision_namespace_transaction.rb → transaction/provision_namespace.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timeStamp
   # @attr [String]  signature
   # @attr [Integer] fee
@@ -11,9 +11,12 @@ class Nis::Struct
   # @attr [String]  newPart
   # @attr [String]  parent
   # @see http://bob.nem.ninja/docs/#provisionNamespaceTransaction
-  class ProvisionNamespaceTransaction
+  class ProvisionNamespace
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :fee, :type, :deadline, :version, :signer,
+    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
                   :rentalFeeSink, :rentalFee, :newPart, :parent
 
     alias timestamp timeStamp
@@ -33,35 +36,21 @@ class Nis::Struct
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == Nis::Util::TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == Nis::Util::MAINNET
+    def type
+      @type ||= TYPE
     end
 
     # @return [Integer]
     def fee
-      @fee ||= calculate_fee
+      @fee ||= FEE
     end
 
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
-
-    # @return [Integer]
-    def calculate_fee
-      FEE
-    end
   end
 end

data/lib/nis/{struct/transfer_transaction.rb → transaction/transfer.rb}

@@ -1,4 +1,4 @@
-class Nis::Struct
+class Nis::Transaction
   # @attr [Integer] timestamp
   # @attr [Integer] amount
   # @attr [Integer] fee
@@ -13,33 +13,27 @@ class Nis::Struct
   # @see http://bob.nem.ninja/docs/#initiating-a-transfer-transaction
   # @see http://bob.nem.ninja/docs/#version-1-transfer-transactions
   # @see http://bob.nem.ninja/docs/#version-2-transfer-transactions
-  class TransferTransaction
+  class Transfer
+    include Nis::Mixin::Network
+    attr_writer :version, :fee
+
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :amount, :fee, :recipient, :type, :deadline, :message, :version, :signer,
+    attr_accessor :timeStamp, :amount, :recipient, :type, :deadline, :message, :signer,
                   :mosaics
 
     alias :timestamp :timeStamp
     alias :timestamp= :timeStamp=
 
     TYPE = 0x0101 # 257 (transfer transaction)
+    FEE  = 25
 
     def self.build(attrs)
       new(attrs)
     end
 
     # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == Nis::Util::TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == Nis::Util::MAINNET
+    def type
+      @type ||= TYPE
     end
 
     # @return [Integer]
@@ -54,6 +48,7 @@ class Nis::Struct
     alias to_hash_old to_hash
 
     def to_hash
+      type
       fee
       to_hash_old
     end
@@ -62,11 +57,11 @@ class Nis::Struct
     def calculate_fee
       if mosaics.empty?
         tmp_fee = [1, amount / 1_000_000 / 10_000].max
-        fee = (tmp_fee > 25 ? 25 : tmp_fee)
+        fee = (tmp_fee > FEE ? FEE : tmp_fee)
       else
         # TODO: calc mosaics fee
         raise NotImplementedError, 'not implemented calculation mosaic fee.'
-        fee = 25
+        fee = FEE
       end
 
       if message.bytesize > 0

data/lib/nis/version.rb

@@ -1,3 +1,3 @@
 class Nis
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11.1'.freeze
 end

data/samples/request_block.rb

@@ -1,11 +1,11 @@
 require 'nis'
 hr = '-' * 64
 
-# create NIS instance
 nis = Nis.new
 
-puts nis.block_at_public(block_height: 895492)
+block = nis.block_at_public(block_height: 890761)
+puts block.to_hash
 puts hr
 
-puts nis.block_get(block_hash: '74998229fa8a6eebfce9bcc313c552528bf82caac6166ae05e65578b4fb1f2da')
+puts nis.block_get(block_hash: 'fb5e76bf137eb27451926d29fd2b308e672e5d9ec405d9cbcd47cc0f83492cd0')
 puts hr

data/samples/request_debug.rb

@@ -2,7 +2,6 @@ require 'pp'
 require 'nis'
 hr = '-' * 64
 
-# create NIS instance
 nis = Nis.new
 
 incoming = nis.debug_connections_incoming

data/samples/request_importance_transfer_transaction.rb

@@ -10,15 +10,13 @@ A_PUBLIC_KEY  = '5aff2e991f85d44eed8f449ede365a920abbefc22f1a2f731d4a00225867351
 B_PUBLIC_KEY = 'cc6c9485d15b992501e57fe3799487e99de272f79c5442de94eeb998b45e0144'.freeze
 
 # build Transaction Object
-tx = Nis::Struct::ImportanceTransferTransaction.new(
-  timeStamp: Nis::Util.timestamp,
-  fee:  6_000_000,
-  mode: Nis::Struct::ImportanceTransferTransaction::ACTIVATE,
+tx = Nis::Transaction::ImportanceTransfer.new(
+  mode: Nis::Transaction::ImportanceTransfer::ACTIVATE,
   remoteAccount: B_PUBLIC_KEY,
-  type: Nis::Struct::ImportanceTransferTransaction::TYPE,
+  signer: A_PUBLIC_KEY,
+  timeStamp: Nis::Util.timestamp,
   deadline: Nis::Util.timestamp + 43_200,
-  version:  Nis::Util::TESTNET_VERSION_1,
-  signer: A_PUBLIC_KEY
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object

data/samples/request_local.rb

@@ -7,14 +7,18 @@ page = Nis::Struct::AccountPrivateKeyTransactionsPage.new(
   value: '00b4a68d16dc505302e9631b860664ba43a8183f0903bc5782a2403b2f9eb3c8a1'
 )
 
-puts nis.local_account_transfers_incoming(page: page)
+incoming = nis.local_account_transfers_incoming(page: page)
+puts incoming.last.to_hash
 puts hr
 
-puts nis.local_account_transfers_outgoing(page: page)
+outgoing = nis.local_account_transfers_outgoing(page: page)
+puts outgoing.last.to_hash
 puts hr
 
-puts nis.local_account_transfers_all(page: page)
+all = nis.local_account_transfers_all(page: page)
+puts all.last.to_hash
 puts hr
 
-puts nis.local_chain_blocks_after(block_height: 2649)
+blocks = nis.local_chain_blocks_after(block_height: 2649)
+puts blocks.last
 puts hr

data/samples/request_mosaic_definition_creation_transaction.rb

@@ -8,7 +8,7 @@ A_PUBLIC_KEY  = 'be2ba9cb15a547110d511a4d43c0482fbb584d78781abac01fb053d18f4a003
 
 mosaic_id = Nis::Struct::MosaicId.new(
   namespaceId: 'kon',
-  name: "teas"
+  name: 'teas'
 )
 
 properties = Nis::Struct::MosaicProperties.new(
@@ -37,15 +37,14 @@ definition = Nis::Struct::MosaicDefinition.new(
 )
 
 # build Transaction Object
-tx = Nis::Struct::MosaicDefinitionCreationTransaction.new(
-  timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::MosaicDefinitionCreationTransaction::TYPE,
-  deadline: Nis::Util.timestamp + 43_200,
-  version: Nis::Util::TESTNET_VERSION_1,
-  signer: A_PUBLIC_KEY,
+tx = Nis::Transaction::MosaicDefinitionCreation.new(
+  mosaicDefinition: definition,
   creationFee: 500_000_000,
   creationFeeSink: Nis::Util::MOSAIC_SINK[:testnet],
-  mosaicDefinition: definition
+  signer: A_PUBLIC_KEY,
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object

data/samples/request_mosaic_supply_change_transaction.rb

@@ -8,19 +8,18 @@ A_PUBLIC_KEY  = 'be2ba9cb15a547110d511a4d43c0482fbb584d78781abac01fb053d18f4a003
 
 mosaic_id = Nis::Struct::MosaicId.new(
   namespaceId: 'kon',
-  name: "teas"
+  name: 'teas'
 )
 
 # build Transaction Object
-tx = Nis::Struct::MosaicSupplyChangeTransaction.new(
+tx = Nis::Transaction::MosaicSupplyChange.new(
+  mosaicId: mosaic_id,
+  supplyType: Nis::Transaction::MosaicSupplyChange::INCREASE,
+  delta: 1_000,
+  signer: A_PUBLIC_KEY,
   timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::MosaicSupplyChangeTransaction::TYPE,
   deadline: Nis::Util.timestamp + 43_200,
-  version:  Nis::Util::TESTNET_VERSION_1,
-  signer:   A_PUBLIC_KEY,
-  supplyType: Nis::Struct::MosaicSupplyChangeTransaction::INCREASE,
-  delta: 1_000,
-  mosaicId: mosaic_id
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object
@@ -29,10 +28,8 @@ rpa = Nis::Struct::RequestPrepareAnnounce.new(
   privateKey: A_PRIVATE_KEY
 )
 
-# Create NIS instance
 nis = Nis.new
 
-# Send XEM request.
 res = nis.transaction_prepare_announce(request_prepare_announce: rpa)
-puts res.inspect
+puts res.to_hash
 puts hr

data/samples/request_multisig_add_cosignatory_transaction.rb

@@ -22,27 +22,25 @@ mcm = Nis::Struct::MultisigCosignatoryModification.new(
 )
 
 # build Transaction Object
-tx = Nis::Struct::MultisigAggregateModificationTransaction.new(
-  timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::MultisigAggregateModificationTransaction::TYPE,
-  deadline: Nis::Util.timestamp + 43_200,
-  version:  Nis::Util::TESTNET_VERSION_1,
-  signer: A_PUBLIC_KEY,
+tx = Nis::Transaction::MultisigAggregateModification.new(
   modifications: [
     mcm
   ],
   minCosignatories: {
     relativeChange: 2
-  }
+  },
+  signer: A_PUBLIC_KEY,
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
-mtx = Nis::Struct::MultisigTransaction.new(
-  timeStamp: Nis::Util.timestamp,
+mtx = Nis::Transaction::Multisig.new(
+  otherTrans: tx,
   signer: B_PUBLIC_KEY,
-  type: Nis::Struct::MultisigTransaction::TYPE,
+  timeStamp: Nis::Util.timestamp,
   deadline: Nis::Util.timestamp + 43_200,
-  version: Nis::Struct::Transaction::TESTNET_VERSION_1,
-  otherTrans: tx
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object

data/samples/request_multisig_aggregate_modification_transaction.rb

@@ -17,18 +17,17 @@ mcm = Nis::Struct::MultisigCosignatoryModification.new(
 )
 
 # build Transaction Object
-tx = Nis::Struct::MultisigAggregateModificationTransaction.new(
-  timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::MultisigAggregateModificationTransaction::TYPE,
-  deadline: Nis::Util.timestamp + 43_200,
-  version:  Nis::Util::TESTNET_VERSION_1,
-  signer: A_PUBLIC_KEY,
+tx = Nis::Transaction::MultisigAggregateModification.new(
   modifications: [
     mcm
   ],
   minCosignatories: {
     relativeChange: 1
-  }
+  },
+  signer: A_PUBLIC_KEY,
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object

data/samples/request_multisig_signature_transaction.rb

@@ -16,8 +16,6 @@ C_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'.freeze
 C_PRIVATE_KEY = '1d13af2c31ee6fb0c3c7aaaea818d9b305dcadba130ba663fc42d9f25b24ded1'.freeze
 C_PUBLIC_KEY  = '9e7ab2924cd1a3482df784db190614cfc8a33671f5d80a5b15a9c9e8b4d13933'.freeze
 
-require 'pry'
-
 nis = Nis.new
 txes = nis.account_unconfirmed_transactions(address: C_ADDRESS)
 
@@ -32,17 +30,13 @@ puts "Unconfirmed Transaction Hash: #{hash}"
 puts hr
 
 # build Transaction Object
-tx = Nis::Struct::MultisigSignatureTransaction.new(
+tx = Nis::Transaction::MultisigSignature.new(
+  otherHash: { data: hash },
+  otherAccount: A_ADDRESS,
+  signer: C_PUBLIC_KEY,
   timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::MultisigSignatureTransaction::TYPE,
   deadline: Nis::Util.timestamp + 43_200,
-  version:  Nis::Util::TESTNET_VERSION_1,
-  signer: C_PUBLIC_KEY,
-  fee:  6_000_000,
-  otherHash: {
-    data: hash
-  },
-  otherAccount: A_ADDRESS
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object

data/samples/request_multisig_transaction.rb

@@ -12,24 +12,22 @@ B_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b83421
 B_PUBLIC_KEY  = 'be2ba9cb15a547110d511a4d43c0482fbb584d78781abac01fb053d18f4a0033'.freeze
 
 # build Transaction Object
-tx = Nis::Struct::Transaction.new(
-  amount: 10_000_000,
+tx = Nis::Transaction::Transfer.new(
+  amount: 1_000_000,
   recipient: B_ADDRESS,
-  signer: A_PUBLIC_KEY,
   message: Nis::Struct::Message.new('Hello'),
-  type: Nis::Struct::Transaction::TRANSFER,
+  signer: A_PUBLIC_KEY,
   timeStamp: Nis::Util.timestamp,
   deadline: Nis::Util.timestamp + 43_200,
-  version: Nis::Struct::Transaction::TESTNET_VERSION_1
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
-mtx = Nis::Struct::MultisigTransaction.new(
-  timeStamp: Nis::Util.timestamp,
+mtx = Nis::Transaction::Multisig.new(
+  otherTrans: tx,
   signer: B_PUBLIC_KEY,
-  type: Nis::Struct::MultisigTransaction::TYPE,
+  timeStamp: Nis::Util.timestamp,
   deadline: Nis::Util.timestamp + 43_200,
-  version: Nis::Struct::Transaction::TESTNET_VERSION_1,
-  otherTrans: tx
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # automatically calculate minimum fee if fee is not set.

data/samples/request_namespace.rb

@@ -1,11 +1,12 @@
 require 'nis'
 hr = '-' * 64
 
-# create NIS instance
 nis = Nis.new
 
-puts nis.namespace_mosaic_definition_page(namespace: 'alice.misc')
+ns_mosaics = nis.namespace_mosaic_definition_page(namespace: 'alice.misc')
+puts ns_mosaics.first.to_hash
 puts hr
 
-puts nis.namespace_root_page
+ns_root = nis.namespace_root_page
+puts ns_root.first.to_hash
 puts hr

data/samples/request_node.rb

@@ -1,25 +1,30 @@
 require 'nis'
 hr = '-' * 64
 
-# create NIS instance
 nis = Nis.new
 
-puts nis.node_info
+node_info = nis.node_info
+puts node_info.to_hash
 puts hr
 
-puts nis.node_extended_info
+ext_node_info = nis.node_extended_info
+puts ext_node_info.to_hash
 puts hr
 
-puts nis.node_experiences
+node_exp = nis.node_experiences
+puts node_exp.first.to_hash
 puts hr
 
-puts nis.node_peerlist_all
+peer_all = nis.node_peerlist_all
+puts peer_all.to_hash
 puts hr
 
-puts nis.node_peerlist_reachable
+reachables = nis.node_peerlist_reachable
+puts reachables.first.to_hash
 puts hr
 
-puts nis.node_peerlist_active
+actives = nis.node_peerlist_active
+puts actives.first.to_hash
 puts hr
 
 puts nis.node_active_peers_max_chain_height
@@ -39,5 +44,10 @@ bnr = Nis::Struct::BootNodeRequest.new(
     name: 'Alice'
   }
 )
-puts nis.node_boot(boot_node_request: bnr)
+
+begin
+  puts nis.node_boot(boot_node_request: bnr)
+rescue => ex
+  puts ex
+end
 puts hr

data/samples/request_provision_namespace_transaction.rb

@@ -7,16 +7,15 @@ A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b83421
 A_PUBLIC_KEY  = 'be2ba9cb15a547110d511a4d43c0482fbb584d78781abac01fb053d18f4a0033'.freeze
 
 # build Transaction Object
-tx = Nis::Struct::ProvisionNamespaceTransaction.new(
-  timeStamp: Nis::Util.timestamp,
-  type: Nis::Struct::ProvisionNamespaceTransaction::TYPE,
-  deadline: Nis::Util.timestamp + 43_200,
-  version: Nis::Util::TESTNET_VERSION_1,
-  signer: A_PUBLIC_KEY,
+tx = Nis::Transaction::ProvisionNamespace.new(
+  newPart: 'kon',
+  parent: nil,
   rentalFeeSink: Nis::Util::NAMESPACE_SINK[:testnet],
   rentalFee: 5_000_000_000,
-  newPart: 'kon',
-  parent:  nil
+  signer: A_PUBLIC_KEY,
+  timeStamp: Nis::Util.timestamp,
+  deadline: Nis::Util.timestamp + 43_200,
+  version: Nis::Util::TESTNET_VERSION_1
 )
 
 # build RequestPrepareAnnounce Object
@@ -25,10 +24,8 @@ rpa = Nis::Struct::RequestPrepareAnnounce.new(
   privateKey: A_PRIVATE_KEY
 )
 
-# Create NIS instance
 nis = Nis.new
 
-# Send XEM request.
 res = nis.transaction_prepare_announce(request_prepare_announce: rpa)
 puts res.message
 puts hr

data/samples/request_transfer_transaction.rb

@@ -10,11 +10,10 @@ A_PUBLIC_KEY  = '5aff2e991f85d44eed8f449ede365a920abbefc22f1a2f731d4a00225867351
 B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'.freeze
 
 # build Transaction Object
-tx = Nis::Struct::TransferTransaction.new(
+tx = Nis::Transaction::Transfer.new(
   amount:  1_000_000,
   # fee:     3_000_000, # see below.
   recipient: B_ADDRESS,
-  type: Nis::Struct::TransferTransaction::TYPE,
   signer: A_PUBLIC_KEY,
   message: Nis::Struct::Message.new('Hello'),
   timeStamp: Nis::Util.timestamp,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11.1
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -211,6 +211,8 @@ files:
 - lib/nis/endpoint/transaction/announce.rb
 - lib/nis/endpoint/transaction/prepareAnnounce.rb
 - lib/nis/error.rb
+- lib/nis/mixin.rb
+- lib/nis/mixin/network.rb
 - lib/nis/struct.rb
 - lib/nis/struct/account_importance_view_model.rb
 - lib/nis/struct/account_info.rb
@@ -230,22 +232,16 @@ files:
 - lib/nis/struct/explorer_view_model_transaction.rb
 - lib/nis/struct/extended_node_experience_pair.rb
 - lib/nis/struct/harvest_info.rb
-- lib/nis/struct/importance_transfer_transaction.rb
 - lib/nis/struct/key_pair_view_model.rb
 - lib/nis/struct/message.rb
 - lib/nis/struct/mosaic.rb
 - lib/nis/struct/mosaic_definition.rb
-- lib/nis/struct/mosaic_definition_creation_transaction.rb
 - lib/nis/struct/mosaic_definition_meta_data.rb
 - lib/nis/struct/mosaic_definition_meta_data_pair.rb
 - lib/nis/struct/mosaic_id.rb
 - lib/nis/struct/mosaic_levy.rb
 - lib/nis/struct/mosaic_properties.rb
-- lib/nis/struct/mosaic_supply_change_transaction.rb
-- lib/nis/struct/multisig_aggregate_modification_transaction.rb
 - lib/nis/struct/multisig_cosignatory_modification.rb
-- lib/nis/struct/multisig_signature_transaction.rb
-- lib/nis/struct/multisig_transaction.rb
 - lib/nis/struct/namespace.rb
 - lib/nis/struct/namespace_meta_data.rb
 - lib/nis/struct/namespace_meta_data_pair.rb
@@ -256,16 +252,23 @@ files:
 - lib/nis/struct/node.rb
 - lib/nis/struct/node_collection.rb
 - lib/nis/struct/node_experience.rb
-- lib/nis/struct/provision_namespace_transaction.rb
 - lib/nis/struct/request_announce.rb
 - lib/nis/struct/request_prepare_announce.rb
 - lib/nis/struct/time_synchronization_result.rb
 - lib/nis/struct/transaction.rb
 - lib/nis/struct/transaction_meta_data.rb
 - lib/nis/struct/transaction_meta_data_pair.rb
-- lib/nis/struct/transfer_transaction.rb
 - lib/nis/struct/unconfirmed_transaction_meta_data.rb
 - lib/nis/struct/unconfirmed_transaction_meta_data_pair.rb
+- lib/nis/transaction.rb
+- lib/nis/transaction/importance_transfer.rb
+- lib/nis/transaction/mosaic_definition_creation.rb
+- lib/nis/transaction/mosaic_supply_change.rb
+- lib/nis/transaction/multisig.rb
+- lib/nis/transaction/multisig_aggregate_modification.rb
+- lib/nis/transaction/multisig_signature.rb
+- lib/nis/transaction/provision_namespace.rb
+- lib/nis/transaction/transfer.rb
 - lib/nis/unit.rb
 - lib/nis/unit/address.rb
 - lib/nis/unit/balance.rb
@@ -293,7 +296,6 @@ files:
 - samples/request_nis.rb
 - samples/request_node.rb
 - samples/request_provision_namespace_transaction.rb
-- samples/request_transaction.rb
 - samples/request_transfer_transaction.rb
 homepage: https://github.com/44uk/nis-ruby
 licenses:

data/samples/request_transaction.rb

@@ -1,48 +0,0 @@
-require 'nis'
-hr = '-' * 64
-
-# Account A (Source)
-A_ADDRESS = 'TAH4MBR6MNLZKJAVW5ZJCMFAL7RS5U2YODUQKLCT'.freeze
-A_PRIVATE_KEY = '00b4a68d16dc505302e9631b860664ba43a8183f0903bc5782a2403b2f9eb3c8a1'.freeze
-A_PUBLIC_KEY  = '5aff2e991f85d44eed8f449ede365a920abbefc22f1a2f731d4a002258673519'.freeze
-
-# Account B (Dist)
-B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'.freeze
-
-# build Transaction Object
-tx = Nis::Struct::Transaction.new(
-  amount:  1_000_000,
-  # fee:     3_000_000, # see below.
-  recipient: B_ADDRESS,
-  signer: A_PUBLIC_KEY,
-  message: Nis::Struct::Message.new('Hello'),
-  type: Nis::Struct::Transaction::TRANSFER,
-  timeStamp: Nis::Util.timestamp,
-  deadline:  Nis::Util.timestamp + 43_200,
-  version:   Nis::Struct::Transaction::TESTNET_VERSION_1
-)
-
-# automatically calculate minimum fee if fee is not set.
-puts 'Fee: %d' % tx.fee
-
-# build RequestPrepareAnnounce Object
-rpa = Nis::Struct::RequestPrepareAnnounce.new(
-  transaction: tx,
-  privateKey: A_PRIVATE_KEY
-)
-
-# Create NIS instance
-nis = Nis.new
-
-# check banalces before sending XEM.
-puts 'Account A => balance: %d' %
-  (nis.account_get address: A_ADDRESS)[:account][:balance]
-puts 'Account B => balance: %d' %
-  (nis.account_get address: B_ADDRESS)[:account][:balance]
-puts hr
-
-# Send XEM request.
-res = nis.transaction_prepare_announce(request_prepare_announce: rpa)
-puts res.message
-
-# After several minutes, check Account A and B Balance.