nis-ruby 0.0.16 → 0.0.17

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

@@ -44,5 +44,29 @@ module Nis::Endpoint
         res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
       end
     end
+
+    # @param [Symbol] dir direction(:in, :out, :all)
+    # @param [String] address
+    # @param [String] hash
+    # @param [String] id
+    # @return [Array <Nis::Struct::TransactionMetaDataPair>]
+    # @see https://nemproject.github.io/#requesting-transaction-data-for-an-account
+    def account_transfers(dir = :all, address:, hash: nil, id: nil)
+      request!(:get, "/account/transfers/#{account_transfers_direction(dir)}",
+        address: address,
+        hash: hash,
+        id: id
+      ) do |res|
+        res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
+      end
+    end
+
+    def account_transfers_direction(dir)
+      case dir.to_s
+        when /\Ai/ then :incoming
+        when /\Ao/ then :outgoing
+        else :all
+      end
+    end
   end
 end

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

@@ -29,5 +29,22 @@ module Nis::Endpoint
         res[:data].map { |natv| Nis::Struct::NemAsyncTimerVisitor.build(natv) }
       end
     end
+
+    def debug_connections(dir)
+      request!(:get, "/debug/connections/#{debug_connections_direction(dir)}") do |res|
+        Nis::Struct::AuditCollection.build(
+          outstanding: res[:outstanding],
+          most_recent: res[:'most-recent']
+        )
+      end
+    end
+
+    def debug_connections_direction(dir)
+      case dir.to_s
+        when /\Ai/ then :incoming
+        when /\Ao/ then :outgoing
+        else raise "Undefined direction: #{dir}"
+      end
+    end
   end
 end

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

@@ -28,6 +28,20 @@ module Nis::Endpoint
             res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
           end
         end
+
+        def local_account_transfers(dir = :all, page:)
+          request!(:post, "/local/account/transfers/#{local_account_transfers_direction(dir)}", page) do |res|
+            res[:data].map { |tmdp| Nis::Struct::TransactionMetaDataPair.build(tmdp) }
+          end
+        end
+
+        def local_account_transfers_direction(dir)
+          case dir.to_s
+            when /\Ai/ then :incoming
+            when /\Ao/ then :outgoing
+            else :all
+          end
+        end
       end
     end
   end

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

@@ -21,5 +21,25 @@ module Nis::Endpoint
         res[:data].map { |n| Nis::Struct::Node.build(n) }
       end
     end
+
+    # @return [Array <Nis::Struct::Node>]
+    # @see https://nemproject.github.io/#active-neighborhood
+    def node_peerlist(state = :all)
+      if node_peerlist_state(state) == :all
+        node_peerlist_all
+      else
+        request!(:get, "/node/peer-list/#{node_peerlist_state(state)}") do |res|
+          res[:data].map { |n| Nis::Struct::Node.build(n) }
+        end
+      end
+    end
+
+    def node_peerlist_state(state)
+      case state.to_s
+        when 'active' then :active
+        when 'reachable' then :reachable
+        else :all
+      end
+    end
   end
 end

data/lib/nis/endpoint/time_sync.rb

@@ -0,0 +1,4 @@
+module Nis::Endpoint
+  module TimeSync
+  end
+end

data/lib/nis/endpoint/time_sync/network_time.rb

@@ -0,0 +1,10 @@
+module Nis::Endpoint
+  module TimeSync::NetworkTime
+    # @return [Nis::Struct::NetworkTime]
+    def time_sync_network_time
+      request!(:get, '/time-sync/network-time') do |res|
+        Nis::Struct::NetworkTime.build res
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Nis::Endpoint
+  module Transaction::Get
+    # @param [String] hash
+    # @return [Nis::Struct::TransactionMetaDataPair]
+    def transaction_get(hash:)
+      Nis::Struct::TransactionMetaDataPair.build request!(:get,
+        '/transaction/get',
+        hash: hash
+      )
+    end
+  end
+end

data/lib/nis/keypair.rb

@@ -2,8 +2,8 @@ class Nis
   class Keypair
     attr_reader :private, :public
 
-    # @param [String] Private Key
-    # @option options [Strung] :public_key Public Key
+    # @param [String] Hex Private Key
+    # @option options [Strung] :public_key Hex Public Key
     def initialize(private_key, public_key: nil)
       @private = private_key
       @public  = public_key || calc_public_key
@@ -12,8 +12,8 @@ class Nis
     # @param [String] Hex string
     # @return  [String] Signed hex string
     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_data = Nis::Util::Convert.hex2bin(data)
+      bin_signed = Nis::Util::Ed25519.signature_hash_unsafe(bin_data, bin_secret, bin_public)
       bin_signed.unpack('H*').first
     end
 
@@ -24,9 +24,15 @@ class Nis
     end
 
     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
+      bin_public.unpack('H*').first
+    end
+
+    def bin_secret
+      @bin_secret ||= Nis::Util::Convert.hex2bin_rev(fix_private_key(@private))
+    end
+
+    def bin_public
+      @bin_public ||= Nis::Util::Ed25519.publickey_hash_unsafe(bin_secret)
     end
   end
 end

data/lib/nis/struct.rb

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

data/lib/nis/struct/importance_transfer_transaction.rb

@@ -0,0 +1,10 @@
+class Nis::Struct
+  # @attr [Integer] mode
+  # @attr [String]  remote_account
+  class ImportanceTransferTransaction < Transaction
+    attr_accessor :mode, :remoteAccount
+
+    alias :remote_account :remoteAccount
+    alias :remote_account= :remoteAccount=
+  end
+end

data/lib/nis/struct/message.rb

@@ -4,11 +4,18 @@ class Nis::Struct
   # @attr [String] payload
   # @attr [String] public_key
   class Message
-    attr_reader :value, :type, :public_key, :private_key
+    attr_reader :value, :type
+    attr_accessor :public_key, :private_key
 
     TYPE_PLAIN     = 1
     TYPE_ENCRYPTED = 2
 
+    def self.build(attrs)
+      if attrs[:type] == TYPE_ENCRYPTED
+        new(attrs[:payload], type: :encrypted)
+      end
+    end
+
     def initialize(value = '', type: :plain, private_key: nil, public_key: nil)
       @value = value
       @type = (type == :encrypted) ? TYPE_ENCRYPTED : TYPE_PLAIN
@@ -66,7 +73,7 @@ class Nis::Struct
     end
 
     def payload
-      encrypted? ? value : value.unpack('H*').join
+      encrypted? ? value : value.unpack('H*').first
     end
 
     private

data/lib/nis/struct/mosaic_definition_creation_transaction.rb

@@ -0,0 +1,15 @@
+class Nis::Struct
+  # @attr [Hash] mosaicDefinition
+  # @attr [String] creationFeeSink
+  # @attr [Integer] creationFee
+  class MosaicDefinitionCreationTransaction < Transaction
+    attr_accessor :mosaicDefinition, :creationFeeSink, :creationFee
+
+    alias :mosaic_definition :mosaicDefinition
+    alias :mosaic_definition= :mosaicDefinition=
+    alias :creation_fee_sink :creationFeeSink
+    alias :creation_fee_sink= :creationFeeSink=
+    alias :creation_fee :creationFee
+    alias :creation_fee= :creationFee=
+  end
+end

data/lib/nis/struct/mosaic_supply_change_transaction.rb

@@ -0,0 +1,12 @@
+class Nis::Struct
+  # @attr [String] mosaicId
+  # @attr [Integer] supplyType
+  # @attr [Integer] delta
+  class MosaicSupplyChangeTransaction < Transaction
+    attr_accessor :mosaicId, :supplyType, :delta
+
+    # def self.build
+    # TODO: mosaicId
+    # end
+  end
+end

data/lib/nis/struct/multisig_aggregate_modification_transaction.rb

@@ -0,0 +1,10 @@
+class Nis::Struct
+  # @attr [Array] modifications
+  # @attr [Hash] minCosignatories
+  class MultisigAggregationModificationTransaction < Transaction
+    attr_accessor :modifications, :minCosignatories
+
+    alias :min_cosignatories :minCosignatories
+    alias :min_cosignatories= :minCosignatories=
+  end
+end

data/lib/nis/struct/multisig_signature_transaction.rb

@@ -0,0 +1,12 @@
+class Nis::Struct
+  # @attr [String] other_hash
+  # @attr [String] other_account
+  class MultisigSignatureTransaction < Transaction
+    attr_accessor :otherHash, :otherAccount
+
+    alias :other_hash :otherHash
+    alias :other_hash= :otherHash=
+    alias :other_account :otherAccount
+    alias :other_account= :otherAccount=
+  end
+end

data/lib/nis/struct/multisig_transaction.rb

@@ -0,0 +1,15 @@
+class Nis::Struct
+  # @attr [String] other_hash
+  # @attr [String] other_account
+  class MultisigTransaction < Transaction
+    attr_accessor :otherTrans
+
+    alias :other_trans :otherTrans
+    alias :other_trans= :otherTrans=
+
+    def self.build(attrs)
+      attrs[:otherTrans] = Nis::Struct::TransactionMetaDataPair.build_transaction_struct(attrs[:otherTrans])
+      new(attrs)
+    end
+  end
+end

data/lib/nis/struct/network_time.rb

@@ -0,0 +1,17 @@
+class Nis::Struct
+  # @attr [Integer] sendTimeStamp
+  # @attr [Integer] receiveTimeStamp
+  class NetworkTime
+    include Nis::Util::Assignable
+    attr_accessor :sendTimeStamp, :receiveTimeStamp
+
+    alias :send_timestamp :sendTimeStamp
+    alias :send_timestamp= :sendTimeStamp=
+    alias :receive_timestamp :receiveTimeStamp
+    alias :receive_timestamp= :receiveTimeStamp=
+
+    def self.build(attrs)
+      new(attrs)
+    end
+  end
+end

data/lib/nis/struct/provision_namespace_transaction.rb

@@ -0,0 +1,16 @@
+class Nis::Struct
+  # @attr [String] rentalFeeSink
+  # @attr [Integer] rentalFee
+  # @attr [String] newPart
+  # @attr [String] parent
+  class ProvisionNamespaceTransaction < Transaction
+    attr_accessor :rentalFeeSink, :rentalFee, :newPart, :parent
+
+    alias :rental_fee_sink :rentalFeeSink
+    alias :rental_fee_sink= :rentalFeeSink=
+    alias :rental_fee :rentalFee
+    alias :rental_fee= :rentalFee=
+    alias :new_part :newPart
+    alias :new_part= :newPart=
+  end
+end

data/lib/nis/struct/transaction.rb

@@ -1,97 +1,20 @@
 class Nis::Struct
-  # @attr [Integer] timestamp
-  # @attr [Integer] amount
-  # @attr [Integer] fee
-  # @attr [String]  recipient
   # @attr [Integer] type
-  # @attr [Integer] deadline
-  # @attr [Nis::Struct::Message] message
   # @attr [Integer] version
+  # @attr [Integer] timestamp
   # @attr [String]  signer
-  # @attr [Array <Nis::Struct::MosaicId>] mosaics
+  # @attr [Integer] fee
+  # @attr [Integer] deadline
   # @see https://nemproject.github.io/#transaction
-  # @see https://nemproject.github.io/#initiating-a-transfer-transaction
-  # @see https://nemproject.github.io/#version-1-transfer-transactions
-  # @see https://nemproject.github.io/#version-2-transfer-transactions
   class Transaction
     include Nis::Util::Assignable
-    attr_accessor :timeStamp, :amount, :fee, :recipient, :type, :deadline, :message, :version, :signer,
-                  :mosaics
+    attr_accessor :type, :version, :timeStamp, :signer, :fee, :deadline
 
     alias :timestamp :timeStamp
     alias :timestamp= :timeStamp=
 
-    TRANSFER = 0x0101                                 #   257 (transfer transaction)
-    IMPORTANCE_TRANSFER = 0x0801                      #  2049 (importance transfer transaction)
-    MULTISIG_AGGREGATE_MODIFICATION_TRANSFER = 0x1001 #  4097 (multisig aggregate modification transfer transaction)
-    MULTISIG_SIGNATURE = 0x1002                       #  4098 (multisig signature transaction)
-    MULTISIG = 0x1004                                 #  4099 (multisig transaction)
-    PROVISION_NAMESPACE = 0x2001                      #  8193 (provision namespace transaction)
-    MOSAIC_DEFINITION_CREATION = 0x4001               # 16385 (mosaic definition creation transaction)
-    MOSAIC_SUPPLY_CHANGE = 0x4002                     # 16386 (mosaic supply change transaction)
-
-    TESTNET = 0x98000000 # -1744830464
-    MAINNET = 0x68000000 #  1744830464
-
-    VERSION_1 = 0x00000001 # 1
-    VERSION_2 = 0x00000002 # 2
-
-    TESTNET_VERSION_1 = TESTNET | VERSION_1 # 0x98000001 = -1744830463
-    TESTNET_VERSION_2 = TESTNET | VERSION_2 # 0x98000002 = -1744830462
-    MAINNET_VERSION_1 = MAINNET | VERSION_1 # 0x68000001 =  1744830465
-    MAINNET_VERSION_2 = MAINNET | VERSION_2 # 0x68000002 =  1744830466
-
     def self.build(attrs)
       new(attrs)
     end
-
-    # @return [Integer]
-    def _version
-      (0xFFFFFFF0 & @version)
-    end
-
-    # @return [Boolean]
-    def testnet?
-      (0x0000000F & @version) == TESTNET
-    end
-
-    # @return [Boolean]
-    def mainnet?
-      (0x0000000F & @version) == MAINNET
-    end
-
-    # @return [Integer]
-    def fee
-      @fee ||= calculate_fee
-    end
-
-    def mosaics
-      @mosaics ||= []
-    end
-
-    alias to_hash_old to_hash
-
-    def to_hash
-      fee
-      to_hash_old
-    end
-
-    # @return [Integer]
-    def calculate_fee
-      if mosaics.empty?
-        tmp_fee = [1, amount / 1_000_000 / 10000].max
-        fee = (tmp_fee > 25 ? 25 : tmp_fee)
-      else
-        # TODO: calc mosaics fee
-        raise NotImplementedError, 'not implemented calculation mosaic fee.'
-        fee = 25
-      end
-
-      if message.bytesize > 0
-        fee += [1, (message.bytesize / 2 / 32) + 1].max
-      end
-
-      fee * 1_000_000
-    end
   end
 end

data/lib/nis/struct/transaction_meta_data_pair.rb

@@ -9,8 +9,24 @@ class Nis::Struct
     def self.build(meta:, transaction:)
       new(
         meta: TransactionMetaData.build(meta),
-        transaction: Transaction.build(transaction)
+        transaction: build_transaction_struct(transaction)
       )
     end
+
+    def self.build_transaction_struct(data)
+      type = data[:type]
+      klass = case type
+        when 0x0101 then Nis::Struct::TransferTransaction
+        when 0x0801 then Nis::Struct::ImportanceTransferTransaction
+        when 0x1001 then Nis::Struct::MultisigAggregationModificationTransaction
+        when 0x1002 then Nis::Struct::MultisigSignatureTransaction
+        when 0x1004 then Nis::Struct::MultisigTransaction
+        when 0x2001 then Nis::Struct::ProvisionNamespaceTransaction
+        when 0x4001 then Nis::Struct::MosaicDefinitionCreationTransaction
+        when 0x4002 then Nis::Struct::MosaicSupplyChangeTransaction
+        else raise "Not implemented entity type: #{type}"
+      end
+      klass.build(data)
+    end
   end
 end