nis-ruby 0.0.11.1 → 0.0.12

data/lib/nis/transaction/multisig_aggregate_modification.rb

@@ -1,50 +1,48 @@
 class Nis::Transaction
-  # @attr [Integer] timeStamp
-  # @attr [String]  signature
-  # @attr [Integer] fee
+  # @attr [Array <Nis::Struct::MultisigCosignatoryModification>] modifications
+  # @attr [Interger] min_cosigs
   # @attr [Integer] type
+  # @attr [Integer] fee
   # @attr [Integer] deadline
+  # @attr [Integer] timeStamp
   # @attr [Integer] version
   # @attr [String] signer
-  # @attr [Array <Nis::Struct::MultisigCosignatoryModification>] modifications
-  # @attr [Hash] minCosignatories
+  # @attr [String] signature
   # @see http://bob.nem.ninja/docs/#multisigAggregateModificationTransaction
   class MultisigAggregateModification
-    include Nis::Mixin::Network
-    attr_writer :version, :fee
+    include Nis::Mixin::Struct
 
-    include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
-                  :modifications, :minCosignatories
+    attr_reader :type, :fee
+    attr_accessor :modifications, :minCosignatories,
+      :deadline, :timeStamp, :version, :signer, :signature,
+      :network
 
-    alias timestamp timeStamp
-    alias timestamp= timeStamp=
     alias min_cosignatories minCosignatories
     alias min_cosignatories= minCosignatories=
+    alias timestamp timeStamp
 
     TYPE = 0x1001 # 4097 (multisig aggregate modification transfer transaction)
-    FEE  = 16_000_000
-
-    def self.build(attrs)
-      new(attrs)
-    end
 
-    # @return [Integer]
-    def type
-      @type ||= TYPE
-    end
+    def initialize(modifications, min_cosigs, network: :testnet)
+      @type = TYPE
+      @network = network
 
-    # @return [Integer]
-    def fee
-      @fee ||= FEE
+      @modifications = modifications
+      @minCosignatories = min_cosigs
+      # @minCosignatories = { relativeChange: 1 }
+      @fee = Nis::Fee::MultisigAggregateModification.new(self)
     end
 
-    alias to_hash_old to_hash
-
-    def to_hash
-      type
-      fee
-      to_hash_old
-    end
+    private
+
+    # def relative_change
+    #   modifications.inject do |sum, mod|
+    #     case mod.modificationType
+    #     when :add    then  1
+    #     when :remove then -1
+    #       else raise "Unsupported modificationType: #{mod.modificationType}"
+    #     end
+    #   end
+    # end
   end
 end

data/lib/nis/transaction/multisig_signature.rb

@@ -1,45 +1,46 @@
 class Nis::Transaction
-  # @attr [Integer] timeStamp
-  # @attr [String]  signature
-  # @attr [Integer] fee
+  # @attr [String]  otherHash
+  # @attr [String]  otherAccount
   # @attr [Integer] type
+  # @attr [Integer] fee
   # @attr [Integer] deadline
+  # @attr [Integer] timeStamp
   # @attr [Integer] version
-  # @attr [String]  signer
-  # @attr [String]  otherHash
-  # @attr [String]  otherAccount
+  # @attr [String] signer
+  # @attr [String] signature
   # @see http://bob.nem.ninja/docs/#multisigSignatureTransaction
   class MultisigSignature
-    include Nis::Mixin::Network
-    attr_writer :version, :fee
+    include Nis::Mixin::Struct
 
-    include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
-                  :otherHash, :otherAccount
+    attr_reader :type, :fee
+    attr_accessor :otherHash, :otherAccount, :signer,
+      :deadline, :timeStamp, :version, :signature,
+      :network
 
-    alias timestamp timeStamp
-    alias timestamp= timeStamp=
     alias other_hash otherHash
     alias other_hash= otherHash=
     alias other_account otherAccount
     alias other_account= otherAccount=
+    alias timestamp timeStamp
 
     TYPE = 0x1002 # 4098 (multisig signature transaction)
 
-    def self.build(attrs)
-      new(attrs)
-    end
+    def initialize(other_hash, other_account, signer, network: :testnet)
+      @type = TYPE
+      @network = network
 
-    # @return [Integer]
-    def type
-      @type ||= TYPE
+      @otherHash = { data: other_hash }
+      @otherAccount = other_account
+      @signer = signer
+      @fee = Nis::Fee::Multisig.new(self)
     end
 
-    alias to_hash_old to_hash
+    def otherHash=(hash)
+      @otherHash = { data: hash }
+    end
 
-    def to_hash
-      type
-      to_hash_old
+    def otherHash
+      @otherHash[:data]
     end
   end
 end

data/lib/nis/transaction/provision_namespace.rb

@@ -1,56 +1,76 @@
 class Nis::Transaction
-  # @attr [Integer] timeStamp
-  # @attr [String]  signature
-  # @attr [Integer] fee
+  # @attr [String] newPart
+  # @attr [String] parent
+  # @attr [Integer] rentalFee
+  # @attr [String] rentalFeeSink
   # @attr [Integer] type
+  # @attr [Integer] fee
   # @attr [Integer] deadline
+  # @attr [Integer] timeStamp
   # @attr [Integer] version
-  # @attr [String]  signer
-  # @attr [String]  rentalFeeSink
-  # @attr [Integer] rentalFee
-  # @attr [String]  newPart
-  # @attr [String]  parent
+  # @attr [String] signer
+  # @attr [String] signature
+  # @attr [Symbol] network
   # @see http://bob.nem.ninja/docs/#provisionNamespaceTransaction
   class ProvisionNamespace
-    include Nis::Mixin::Network
-    attr_writer :version, :fee
+    include Nis::Mixin::Struct
 
-    include Nis::Util::Assignable
-    attr_accessor :timeStamp, :signature, :type, :deadline, :signer,
-                  :rentalFeeSink, :rentalFee, :newPart, :parent
+    attr_reader :type, :fee
+    attr_accessor :newPart, :parent, :rentalFeeSink, :rentalFee,
+      :deadline, :timeStamp, :version, :signer, :signature,
+      :network
 
-    alias timestamp timeStamp
-    alias timestamp= timeStamp=
-    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=
+    alias rental_fee rentalFee
+    alias rental_fee= rentalFee=
+    alias rental_fee_sink rentalFeeSink
+    alias rental_fee_sink= rentalFeeSink=
+    alias timestamp timeStamp
 
     TYPE = 0x2001 # 8193 (provision namespace transaction)
-    FEE  = 20_000_000
 
-    def self.build(attrs)
-      new(attrs)
+    def initialize(new_part, parent = nil, network: :testnet)
+      @type = TYPE
+      @network = network
+
+      @newPart = new_part
+      @parent = parent
+      @rentalFee = rental[:fee]
+      @rentalFeeSink = rental[:sink]
+
+      @fee = Nis::Fee::ProvisionNamespace.new(self)
     end
 
-    # @return [Integer]
-    def type
-      @type ||= TYPE
+    def root?
+      !!(@parent == nil)
     end
 
-    # @return [Integer]
-    def fee
-      @fee ||= FEE
+    def sub?
+      !!(@parent && @newPart)
     end
 
-    alias to_hash_old to_hash
+    private
 
-    def to_hash
-      type
-      fee
-      to_hash_old
+    # @see http://www.nem.ninja/docs/#namespaces
+    def rental
+      if @network == :testnet
+        if root?
+          { fee: 100 * 1_000_000,
+            sink: 'TAMESPACEWH4MKFMBCVFERDPOOP4FK7MTDJEYP35' }
+        else
+          { fee: 10 * 1_000_000,
+            sink: 'TAMESPACEWH4MKFMBCVFERDPOOP4FK7MTDJEYP35' }
+        end
+      else
+        if root?
+          { fee: 5_000 * 1_000_000 ,
+            sink: 'NAMESPACEWH4MKFMBCVFERDPOOP4FK7MTBXDPZZA' }
+        else
+          { fee: 200 * 1_000_000 ,
+            sink: 'NAMESPACEWH4MKFMBCVFERDPOOP4FK7MTBXDPZZA' }
+        end
+      end
     end
   end
 end

data/lib/nis/transaction/transfer.rb

@@ -1,74 +1,44 @@
 class Nis::Transaction
-  # @attr [Integer] timestamp
-  # @attr [Integer] amount
-  # @attr [Integer] fee
   # @attr [String]  recipient
+  # @attr [Integer] amount
+  # @attr [Nis::Struct::Message] message
+  # @attr [Array <Nis::Struct::MosaicId>] mosaics
   # @attr [Integer] type
+  # @attr [Nis::Fee::Transfer] fee
   # @attr [Integer] deadline
-  # @attr [Nis::Struct::Message] message
+  # @attr [Integer] timestamp
   # @attr [Integer] version
-  # @attr [String]  signer
-  # @attr [Array <Nis::Struct::MosaicId>] mosaics
+  # @attr [String] signer
+  # @attr [Symbol] network
   # @see http://bob.nem.ninja/docs/#transferTransaction
   # @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 Transfer
-    include Nis::Mixin::Network
-    attr_writer :version, :fee
+    include Nis::Mixin::Struct
 
-    include Nis::Util::Assignable
-    attr_accessor :timeStamp, :amount, :recipient, :type, :deadline, :message, :signer,
-                  :mosaics
+    attr_reader :type, :fee
+    attr_accessor :recipient, :amount, :message,
+      :deadline, :timeStamp, :version, :signer,
+      :network
 
-    alias :timestamp :timeStamp
-    alias :timestamp= :timeStamp=
+    alias timestamp timeStamp
 
     TYPE = 0x0101 # 257 (transfer transaction)
-    FEE  = 25
-
-    def self.build(attrs)
-      new(attrs)
-    end
 
-    # @return [Integer]
-    def type
-      @type ||= TYPE
-    end
+    def initialize(recipient, amount, message = '', network: :testnet)
+      @type = TYPE
+      @network = network
 
-    # @return [Integer]
-    def fee
-      @fee ||= calculate_fee
+      @recipient = recipient
+      @amount = amount
+      @message = Nis::Struct::Message.new(message)
+      @fee = Nis::Fee::Transfer.new(self)
     end
 
     def mosaics
-      @mosaics ||= []
-    end
-
-    alias to_hash_old to_hash
-
-    def to_hash
-      type
-      fee
-      to_hash_old
-    end
-
-    # @return [Integer]
-    def calculate_fee
-      if mosaics.empty?
-        tmp_fee = [1, amount / 1_000_000 / 10_000].max
-        fee = (tmp_fee > FEE ? FEE : tmp_fee)
-      else
-        # TODO: calc mosaics fee
-        raise NotImplementedError, 'not implemented calculation mosaic fee.'
-        fee = FEE
-      end
-
-      if message.bytesize > 0
-        fee += [1, (message.bytesize / 2 / 32) + 1].max
-      end
-
-      fee * 1_000_000
+      # TODO: to be implemented...
+      []
     end
   end
 end

data/lib/nis/util.rb

@@ -12,24 +12,27 @@ module Nis::Util
 
   NEM_EPOCH = Time.utc(2015, 3, 29, 0, 6, 25, 0)
 
-  #
-  # @see http://www.nem.ninja/docs/#namespaces
-  NAMESPACE_SINK = {
-    testnet: 'TAMESPACEWH4MKFMBCVFERDPOOP4FK7MTDJEYP35',
-    mainnet: 'NAMESPACEWH4MKFMBCVFERDPOOP4FK7MTBXDPZZA'
-  }
-
-  # @see http://www.nem.ninja/docs/#mosaics
-  MOSAIC_SINK = {
-    testnet: 'TBMOSAICOD4F54EE5CDMR23CCBGOAM2XSJBR5OLC',
-    mainnet: 'NBMOSAICOD4F54EE5CDMR23CCBGOAM2XSIUX6TRS'
-  }
-
   APOSTILLE_SINK = {
     testnet: 'TC7MCY5AGJQXZQ4BN3BOPNXUVIGDJCOHBPGUM2GE',
     mainnet: 'NCZSJHLTIMESERVBVKOW6US64YDZG2PFGQCSV23J'
   }
 
+  def self.parse_version(network, version)
+    parse_network(network) | version
+  end
+
+  def self.parse_network(network)
+    case network
+    when :mainnet then MAINNET
+    when :testnet then TESTNET
+      else TESTNET
+    end
+  end
+
+  def self.deadline(seconds = 3600)
+    timestamp + seconds
+  end
+
   def self.timestamp
     (Time.now - NEM_EPOCH).to_i
   end

data/lib/nis/version.rb

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

data/nis.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 2.3'
   spec.add_development_dependency 'pry', '~> 0.10'
 
+  spec.add_dependency 'digest-sha3', '~> 1.1'
+  spec.add_dependency 'rbnacl', '~> 5.0'
   spec.add_dependency 'faraday', '~> 0.11'
   spec.add_dependency 'faraday_middleware', '~> 0.11'
   spec.add_dependency 'thor', '~> 0.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.11.1
+  version: 0.0.12
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: digest-sha3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -164,9 +192,27 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/nis
+- examples/account.rb
+- examples/block.rb
+- examples/debug.rb
+- examples/local.rb
+- examples/namespace.rb
+- examples/nis.rb
+- examples/node.rb
+- examples/shutdown.rb
+- examples/transactions/importance_transfer.rb
+- examples/transactions/mosaic_definition_creation.rb
+- examples/transactions/mosaic_supply_change.rb
+- examples/transactions/multisig.rb
+- examples/transactions/multisig_add_cosignatory.rb
+- examples/transactions/multisig_aggregate_modification.rb
+- examples/transactions/multisig_signature.rb
+- examples/transactions/provision_namespace.rb
+- examples/transactions/transfer.rb
 - lib/nis.rb
 - lib/nis/client.rb
 - lib/nis/endpoint.rb
@@ -206,13 +252,26 @@ files:
 - lib/nis/endpoint/node/extended_info.rb
 - lib/nis/endpoint/node/info.rb
 - lib/nis/endpoint/node/peer_list.rb
+- lib/nis/endpoint/shutdown.rb
 - lib/nis/endpoint/status.rb
 - lib/nis/endpoint/transaction.rb
 - lib/nis/endpoint/transaction/announce.rb
 - lib/nis/endpoint/transaction/prepareAnnounce.rb
 - lib/nis/error.rb
+- lib/nis/fee.rb
+- lib/nis/fee/importance_transfer.rb
+- lib/nis/fee/mosaic_definition_creation.rb
+- lib/nis/fee/mosaic_supply_change_transfer.rb
+- lib/nis/fee/multisig.rb
+- lib/nis/fee/multisig_aggregation_modification.rb
+- lib/nis/fee/provision_namespace.rb
+- lib/nis/fee/transfer.rb
+- lib/nis/keypair.rb
 - lib/nis/mixin.rb
-- lib/nis/mixin/network.rb
+- lib/nis/mixin/struct.rb
+- lib/nis/request.rb
+- lib/nis/request/announce.rb
+- lib/nis/request/prepare_announce.rb
 - lib/nis/struct.rb
 - lib/nis/struct/account_importance_view_model.rb
 - lib/nis/struct/account_info.rb
@@ -281,22 +340,6 @@ files:
 - lib/nis/util/assignable.rb
 - lib/nis/version.rb
 - nis.gemspec
-- samples/request_account.rb
-- samples/request_block.rb
-- samples/request_debug.rb
-- samples/request_importance_transfer_transaction.rb
-- samples/request_local.rb
-- samples/request_mosaic_definition_creation_transaction.rb
-- samples/request_mosaic_supply_change_transaction.rb
-- samples/request_multisig_add_cosignatory_transaction.rb
-- samples/request_multisig_aggregate_modification_transaction.rb
-- samples/request_multisig_signature_transaction.rb
-- samples/request_multisig_transaction.rb
-- samples/request_namespace.rb
-- samples/request_nis.rb
-- samples/request_node.rb
-- samples/request_provision_namespace_transaction.rb
-- samples/request_transfer_transaction.rb
 homepage: https://github.com/44uk/nis-ruby
 licenses:
 - MIT