nis-ruby 0.0.12 → 0.0.13

data/lib/nis/endpoint/account/unlocked.rb

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Account::Unlocked
     # @return [Hash <Symbol: num-unlocked>, <Symbol: max-unlocked>]
-    # @see http://bob.nem.ninja/docs/#retrieving-the-unlock-info
+    # @see https://nemproject.github.io/#retrieving-the-unlock-info
     def account_unlocked_info
       request!(:post, '/account/unlocked/info')
     end

data/lib/nis/endpoint/block/at.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Block::At
     # @param [Integer] block_height
     # @return [Nis::Struct::Block]
-    # @see http://bob.nem.ninja/docs/#getting-a-block-with-a-given-height
+    # @see https://nemproject.github.io/#getting-a-block-with-a-given-height
     def block_at_public(block_height:)
       Nis::Struct::Block.build request!(:post, '/block/at/public', height: block_height)
     end

data/lib/nis/endpoint/block/get.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Block::Get
     # @param [String] block_hash
     # @return [Nis::Struct::Block]
-    # @see http://bob.nem.ninja/docs/#requesting-parts-of-the-block-chain
+    # @see https://nemproject.github.io/#requesting-parts-of-the-block-chain
     def block_get(block_hash:)
       Nis::Struct::Block.build request!(:get, '/block/get', blockHash: block_hash)
     end

data/lib/nis/endpoint/chain/height.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Chain
     module Height
       # @return [Nis::Struct::BlockHeight]
-      # @see http://bob.nem.ninja/docs/#block-chain-height
+      # @see https://nemproject.github.io/#block-chain-height
       def chain_height
         Nis::Struct::BlockHeight.build request!(:get, '/chain/height')
       end

data/lib/nis/endpoint/chain/last_block.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Chain
     module LastBlock
       # @return [Nis::Struct::Block]
-      # @see http://bob.nem.ninja/docs/#last-block-of-the-block-chain-score
+      # @see https://nemproject.github.io/#last-block-of-the-block-chain-score
       def chain_last_block
         request!(:get, '/chain/last-block') do |res|
           res[:transactions] = res[:transactions].map { |t| Nis::Struct::Transaction.new(t) }

data/lib/nis/endpoint/chain/score.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Chain
     module Score
       # @return [Nis::Struct::BlockScore]
-      # @see http://bob.nem.ninja/docs/#block-chain-score
+      # @see https://nemproject.github.io/#block-chain-score
       def chain_score
         Nis::Struct::BlockScore.build request!(:get, '/chain/score')
       end

data/lib/nis/endpoint/debug/connections.rb

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Debug::Connections
     # @return [Nis::Struct::AuditCollection]
-    # @see http://bob.nem.ninja/docs/#monitoring-incoming-and-outgoing-calls
+    # @see https://nemproject.github.io/#monitoring-incoming-and-outgoing-calls
     def debug_connections_incoming
       request!(:get, '/debug/connections/incoming') do |res|
         Nis::Struct::AuditCollection.build(
@@ -12,7 +12,7 @@ module Nis::Endpoint
     end
 
     # @return [Nis::Struct::AuditCollection]
-    # @see http://bob.nem.ninja/docs/#monitoring-incoming-and-outgoing-calls
+    # @see https://nemproject.github.io/#monitoring-incoming-and-outgoing-calls
     def debug_connections_outgoing
       request!(:get, '/debug/connections/outgoing') do |res|
         Nis::Struct::AuditCollection.build(
@@ -23,7 +23,7 @@ module Nis::Endpoint
     end
 
     # @return [Array <Nis::Struct::NemAsyncTimerVisitor>]
-    # @see http://bob.nem.ninja/docs/#monitoring-timers
+    # @see https://nemproject.github.io/#monitoring-timers
     def debug_connections_timers
       request!(:get, '/debug/timers') do |res|
         res[:data].map { |natv| Nis::Struct::NemAsyncTimerVisitor.build(natv) }

data/lib/nis/endpoint/debug/time_synchronization.rb

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Debug::TimeSynchronization
     # @return [TimeSynchronizationResult]
-    # @see http://bob.nem.ninja/docs/#monitoring-the-network-time
+    # @see https://nemproject.github.io/#monitoring-the-network-time
     def debug_time_synchronization
       request!(:get, '/debug/time-synchronization') do |res|
         res[:data].map { |tsr| Nis::Struct::TimeSynchronizationResult.build(tsr) }

data/lib/nis/endpoint/heartbeat.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Heartbeat
     # Determines if NIS is up and responsive.
     # @return [Nis::Struct::NemRequestResult] NIS Heartbeat
-    # @see http://bob.nem.ninja/docs/#heart-beat-request
+    # @see https://nemproject.github.io/#heart-beat-request
     def heartbeat
       Nis::Struct::NemRequestResult.build request(:get, '/heartbeat')
     end

data/lib/nis/endpoint/local/account/transfers.rb

@@ -4,7 +4,7 @@ module Nis::Endpoint
       module Transfers
         # @param [Nis::Struct::AccountPrivateKeyTransactionsPage] page
         # @return [Array <Nis::Struct::TransactionMetaDataPair>]
-        # @see http://bob.nem.ninja/docs/#transaction-data-with-decoded-messages
+        # @see https://nemproject.github.io/#transaction-data-with-decoded-messages
         def local_account_transfers_incoming(page:)
           request!(:post, '/local/account/transfers/incoming', page) do |res|
             res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
@@ -13,7 +13,7 @@ module Nis::Endpoint
 
         # @param [Nis::Struct::AccountPrivateKeyTransactionsPage] page
         # @return [Array <Nis::Struct::TransactionMetaDataPair>]
-        # @see http://bob.nem.ninja/docs/#transaction-data-with-decoded-messages
+        # @see https://nemproject.github.io/#transaction-data-with-decoded-messages
         def local_account_transfers_outgoing(page:)
           request!(:post, '/local/account/transfers/outgoing', page) do |res|
             res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
@@ -22,7 +22,7 @@ module Nis::Endpoint
 
         # @param [Nis::Struct::AccountPrivateKeyTransactionsPage] page
         # @return [Array <Nis::Struct::TransactionMetaDataPair>]
-        # @see http://bob.nem.ninja/docs/#transaction-data-with-decoded-messages
+        # @see https://nemproject.github.io/#transaction-data-with-decoded-messages
         def local_account_transfers_all(page:)
           request!(:post, '/local/account/transfers/all', page) do |res|
             res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }

data/lib/nis/endpoint/local/chain.rb

@@ -3,7 +3,7 @@ module Nis::Endpoint
     module Chain
       # @param [String] block_height
       # @return [Array <Nis::Struct::Block>]
-      # @see http://bob.nem.ninja/docs/#getting-part-of-a-chain
+      # @see https://nemproject.github.io/#getting-part-of-a-chain
       def local_chain_blocks_after(block_height:)
         request!(:post, '/local/chain/blocks-after',
           height: block_height

data/lib/nis/endpoint/namespace.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Namespace
     # @param [String] namespace
     # @return [Nis::Struct::Namespace]
-    # @see http://bob.nem.ninja/docs/#retrieving-a-specific-namespace
+    # @see https://nemproject.github.io/#retrieving-a-specific-namespace
     def namespace(namespace:)
       Nis::Struct::Namespace.build request!(:get, '/namespace', namespace: namespace)
     end

data/lib/nis/endpoint/namespace/mosaic.rb

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Namespace::Mosaic
     # @return [Array <Nis::Struct::MosaicDefinitionMetaDataPair>]
-    # @see http://bob.nem.ninja/docs/#retrieving-mosaic-definitions
+    # @see https://nemproject.github.io/#retrieving-mosaic-definitions
     def namespace_mosaic_definition_page(namespace:, id: nil, page_size: nil)
       request!(:get, '/namespace/mosaic/definition/page',
         namespace: namespace,

data/lib/nis/endpoint/namespace/root.rb

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Namespace::Root
     # @return [Array <Nis::Struct::NamespaceMetaDataPair>]
-    # @see http://bob.nem.ninja/docs/#retrieving-root-namespaces
+    # @see https://nemproject.github.io/#retrieving-root-namespaces
     def namespace_root_page(id: nil, page_size: nil)
       request!(:get, '/namespace/root/page',
         id: id,

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

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Node::ActivePeers
     # @return [Nis::Struct::Node]
-    # @see http://bob.nem.ninja/docs/#maximum-chain-height-in-the-active-neighborhood
+    # @see https://nemproject.github.io/#maximum-chain-height-in-the-active-neighborhood
     def node_active_peers_max_chain_height
       request!(:get, '/node/active-peers/max-chain-height') do |res|
         Nis::Struct::BlockHeight.build res

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

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Node::Boot
     # @param boot_node_request [Nis::Struct::BootNodeRequest]
     # @return [nil]
-    # @see http://bob.nem.ninja/docs/#booting-the-local-node
+    # @see https://nemproject.github.io/#booting-the-local-node
     def node_boot(boot_node_request:)
       request!(:post, '/node/boot', boot_node_request)
     end

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

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

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

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Node::ExtendedInfo
     # @return [Nis::Struct::Node]
-    # @see http://bob.nem.ninja/docs/#extended-node-information
+    # @see https://nemproject.github.io/#extended-node-information
     def node_extended_info
       Nis::Struct::NisNodeInfo.build request!(:get, '/node/extended-info')
     end

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

@@ -1,7 +1,7 @@
 module Nis::Endpoint
   module Node::Info
     # @return [Nis::Struct::Node]
-    # @see http://bob.nem.ninja/docs/#basic-node-information
+    # @see https://nemproject.github.io/#basic-node-information
     def node_info
       Nis::Struct::Node.build request!(:get, '/node/info')
     end

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

@@ -1,13 +1,13 @@
 module Nis::Endpoint
   module Node::PeerList
     # @return [Nis::Struct::NodeCollection]
-    # @see http://bob.nem.ninja/docs/#complete-neighborhood
+    # @see https://nemproject.github.io/#complete-neighborhood
     def node_peerlist_all
       Nis::Struct::NodeCollection.build request!(:get, '/node/peer-list/all')
     end
 
     # @return [Array <Nis::Struct::Node>]
-    # @see http://bob.nem.ninja/docs/#reachable-neighborhood
+    # @see https://nemproject.github.io/#reachable-neighborhood
     def node_peerlist_reachable
       request!(:get, '/node/peer-list/reachable') do |res|
         res[:data].map { |n| Nis::Struct::Node.build(n) }
@@ -15,7 +15,7 @@ module Nis::Endpoint
     end
 
     # @return [Array <Nis::Struct::Node>]
-    # @see http://bob.nem.ninja/docs/#active-neighborhood
+    # @see https://nemproject.github.io/#active-neighborhood
     def node_peerlist_active
       request!(:get, '/node/peer-list/active') do |res|
         res[:data].map { |n| Nis::Struct::Node.build(n) }

data/lib/nis/endpoint/status.rb

@@ -2,7 +2,7 @@ module Nis::Endpoint
   module Status
     # Determines the status of NIS.
     # @return [Nis::Struct::NemRequestResult] NIS status
-    # @see http://bob.nem.ninja/docs/#status-request
+    # @see https://nemproject.github.io/#status-request
     def status
       Nis::Struct::NemRequestResult.build request(:get, '/status')
     end

data/lib/nis/endpoint/transaction/announce.rb

@@ -1,12 +1,12 @@
 module Nis::Endpoint
   module Transaction::Announce
-    # @param [Nis::Struct::RequestAnnounce] request_announce
+    # @param [Nis::Struct::RequestAnnounce] request
     # @return [Nis::Struct::Node]
-    # @see http://bob.nem.ninja/docs/#sending-the-data-to-NIS
-    def transaction_announce(request_announce)
+    # @see https://nemproject.github.io/#sending-the-data-to-NIS
+    def transaction_announce(request)
       Nis::Struct::NemAnnounceResult.build request!(:post,
         '/transaction/announce',
-        request_announce
+        request
       )
     end
   end

data/lib/nis/endpoint/transaction/prepareAnnounce.rb

@@ -1,12 +1,12 @@
 module Nis::Endpoint
   module Transaction::PrepareAnnounce
-    # @param [Nis::Struct::RequestPrepareAnnounce] request_prepare_announce
+    # @param [Nis::Struct::RequestPrepareAnnounce] request
     # @return [Nis::Struct::Node]
-    # @see http://bob.nem.ninja/docs/#initiating-a-transaction
-    def transaction_prepare_announce(request_prepare_announce)
+    # @see https://nemproject.github.io/#initiating-a-transaction
+    def transaction_prepare_announce(request)
       Nis::Struct::NemAnnounceResult.build request!(:post,
         '/transaction/prepare-announce',
-        request_prepare_announce
+        request
       )
     end
   end

data/lib/nis/keypair.rb

@@ -4,15 +4,25 @@ class Nis
 
     def initialize(private_key, public_key: nil)
       @private = private_key
-      @public  = public_key
+      @public  = public_key || calc_public_key
     end
 
+    def sign(data)
+      bin_data = data.scan(/../).map(&:hex).pack('C*')
+      bin_signed = Nis::Util::Ed25519.signature_hash_unsafe(bin_data, @bin_secret, @bin_public)
+      bin_signed.unpack('H*').first
+    end
+
+    private
+
     def fix_private_key(key)
       "#{'0' * 64}#{key.sub(/^00/i, '')}"[-64, 64]
     end
 
-    def calc_pubkey
-      # TODO: calculate pubkey from privkey
+    def calc_public_key
+      @bin_secret = fix_private_key(@private).scan(/../).map(&:hex).reverse.pack('C*')
+      @bin_public = Nis::Util::Ed25519.publickey_hash_unsafe(@bin_secret)
+      @bin_public.unpack('H*').first
     end
   end
 end

data/lib/nis/request/announce.rb

@@ -1,10 +1,55 @@
 class Nis::Request
   # @attr [String] data
   # @attr [String] signature
-  # @see http://bob.nem.ninja/docs/#requestAnnounce
+  # @see https://nemproject.github.io/#requestAnnounce
   class Announce
     include Nis::Mixin::Struct
 
-    attr_accessor :data, :signature
+    attr_accessor :transaction, :keypair, :data, :signature
+
+    DEADLINE = 3600
+
+    def initialize(transaction, keypair)
+      @keypair = keypair
+      @transaction = transaction
+    end
+
+    def to_hash
+      if @transaction.respond_to?(:other_trans)
+        other_trans(@transaction)
+      end
+
+      @transaction.tap do |tx|
+        tx.timeStamp = Nis::Util.timestamp
+        tx.deadline = Nis::Util.deadline(DEADLINE)
+        tx.version = Nis::Util.parse_version(tx.network, 1)
+        tx.signer = @keypair.public
+      end
+
+      serialized = serialize(@transaction)
+      hex_serialized = Nis::Util::Convert.ua2hex(serialized)
+
+      { data: Nis::Util::Convert.ua2hex(serialized),
+        signature: signature(hex_serialized) }
+    end
+
+    private
+
+    def serialize(transaction)
+      Nis::Util::Serializer.serialize_transaction(transaction.to_hash)
+    end
+
+    def signature(serialized)
+      @keypair.sign(serialized)
+    end
+
+    def other_trans(transaction)
+      transaction.other_trans.tap do |tx|
+        tx.timeStamp = Nis::Util.timestamp
+        tx.deadline = Nis::Util.deadline(DEADLINE)
+        tx.version = Nis::Util.parse_version(tx.network, 1)
+        tx.signer = transaction.signer
+      end
+    end
   end
 end

data/lib/nis/request/prepare_announce.rb

@@ -1,7 +1,7 @@
 class Nis::Request
   # @attr [Nis::Struct::Transaction] transaction
   # @attr [Nis::Keypair] keypair
-  # @see http://bob.nem.ninja/docs/#requestPrepareAnnounce
+  # @see https://nemproject.github.io/#requestPrepareAnnounce
   class PrepareAnnounce
     include Nis::Mixin::Struct
 

data/lib/nis/struct/account_importance_view_model.rb

@@ -5,7 +5,7 @@ class Nis::Struct
   # @attr [Integer] score
   # @attr [Integer] ev
   # @attr [Integer] height
-  # @see http://bob.nem.ninja/docs/#accountImportanceViewModel
+  # @see https://nemproject.github.io/#accountImportanceViewModel
   class AccountImportanceViewModel
     include Nis::Util::Assignable
     attr_accessor :address, :importance, :isSet, :score, :ev, :height

data/lib/nis/struct/account_info.rb

@@ -6,7 +6,7 @@ class Nis::Struct
   # @attr [String] publicKey
   # @attr [String] label
   # @attr [Array] harvestedBlocks
-  # @see http://bob.nem.ninja/docs/#accountInfo
+  # @see https://nemproject.github.io/#accountInfo
   class AccountInfo
     include Nis::Util::Assignable
     attr_accessor :address, :balance, :vestedBalance, :importance, :publicKey, :label, :harvestedBlocks

data/lib/nis/struct/account_meta_data.rb

@@ -3,7 +3,7 @@ class Nis::Struct
   # @attr [String] remoteStatus
   # @attr [Array <Nis::Struct::AccountInfo>] cosignatoryOf
   # @attr [Array <Nis::Struct::AccountInfo>] cosignatories
-  # @see http://bob.nem.ninja/docs/#accountMetaData
+  # @see https://nemproject.github.io/#accountMetaData
   class AccountMetaData
     include Nis::Util::Assignable
     attr_accessor :status, :remoteStatus, :cosignatoryOf, :cosignatories

data/lib/nis/struct/account_meta_data_pair.rb

@@ -1,7 +1,7 @@
 class Nis::Struct
   # @attr [AccountInfo] account
   # @attr [AccountMetaData] meta
-  # @see http://bob.nem.ninja/docs/#accountMetaDataPair
+  # @see https://nemproject.github.io/#accountMetaDataPair
   class AccountMetaDataPair
     include Nis::Util::Assignable
     attr_accessor :account, :meta

data/lib/nis/struct/account_private_key_transactions_page.rb

@@ -2,7 +2,7 @@ class Nis::Struct
   # @attr [String] value
   # @attr [String] hash
   # @attr [Integer] id
-  # @see http://bob.nem.ninja/docs/#accountPrivateKeyTransactionsPage
+  # @see https://nemproject.github.io/#accountPrivateKeyTransactionsPage
   class AccountPrivateKeyTransactionsPage
     include Nis::Util::Assignable
     attr_accessor :value, :hash, :id