nis-ruby 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8c49e0cd78c5bdde006099b1fcda37b2708a64
-  data.tar.gz: cb8a3175db3121d2f761265423b93407ae8013e7
+  metadata.gz: 93f3eeb5532cbd0ab950c6813e000a5400f5014c
+  data.tar.gz: bf31058b27c37de8a80a53e152a0e3cc38fbdc84
 SHA512:
-  metadata.gz: 563b492199ffbce3d85d8914eff9d166e60c3f2a6751082980ae2a8a722006a78c07cfd66271433bfbe9b09a42a883e1f493ddcdba52d331d5b48c5bb9c85cb6
-  data.tar.gz: 254df0dfe30be08e4bd7ec23241c181001db04d9d5ca005b7b74f72e636617fff7438a5816fb948a99bd8c27e96e8bcde0722bcc3d0664fc3d8ca1b286200028
+  metadata.gz: 7c03543c6cfc51d0b46a4077a19cd44a97d87eee619f3ab95b42017a8f7e32911f5cc76a5047fba0e3d24ea11035916529491bd21f9b105a0866ed1c948ab9a9
+  data.tar.gz: 66b59428d40eab12063847cded5fac1ab1bcf27b2cb00f3da1417b9e5e334534267ec32ad8010d606605101fe538a8ff9214dc175a57a764c8be767e96bf26cc

data/examples/transactions/transfer.rb

@@ -5,9 +5,9 @@ A_PRIVATE_KEY = '4ce5c8f9fce571db0d9ac1adf00b8d3ba0f078ed40835fd3d730a2f24b83421
 
 # recipient
 B_ADDRESS = 'TA4TX6U5HG2MROAESH2JE5524T4ZOY2EQKQ6ELHF'
+B_PUBLIC_KEY = '9e7ab2924cd1a3482df784db190614cfc8a33671f5d80a5b15a9c9e8b4d13933'
 
 kp = Nis::Keypair.new(A_PRIVATE_KEY)
-
 tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, 'Good luck!')
 puts "Fee: #{tx.fee.to_i}"
 
@@ -17,3 +17,18 @@ res = nis.transaction_prepare_announce(req)
 
 puts "Message: #{res.message}"
 puts "TransactionHash: #{res.transaction_hash}"
+
+# with encrypted message
+
+message = Nis::Struct::Message.new('Good luck!', type: :encrypted,
+  private_key: kp.private,
+  public_key: B_PUBLIC_KEY
+)
+message.encrypt!
+tx = Nis::Transaction::Transfer.new(B_ADDRESS, 1, message, {})
+puts "Fee: #{tx.fee.to_i}"
+
+req = Nis::Request::PrepareAnnounce.new(tx, kp)
+res = nis.transaction_prepare_announce(req)
+puts "Message: #{res.message}"
+puts "TransactionHash: #{res.transaction_hash}"

data/lib/nis/struct/message.rb

@@ -2,15 +2,32 @@ class Nis::Struct
   # @attr [String] value
   # @attr [Integer] type
   # @attr [String] payload
+  # @attr [String] public_key
   class Message
-    attr_accessor :value, :type, :payload
+    attr_reader :value, :type, :public_key, :private_key
 
     TYPE_PLAIN     = 1
     TYPE_ENCRYPTED = 2
 
-    def initialize(value = '')
+    def initialize(value = '', type: :plain, private_key: nil, public_key: nil)
       @value = value
-      @type  = TYPE_PLAIN
+      @type = (type == :encrypted) ? TYPE_ENCRYPTED : TYPE_PLAIN
+      @private_key = private_key
+      @public_key = public_key
+    end
+
+    def encrypt!
+      bin_sk = fix_private_key(@private_key).scan(/../).map(&:hex).reverse.pack('C*')
+      bin_pk = (public_key || @public_key).scan(/../).map(&:hex).pack('C*')
+      @value = Nis::Util::Ed25519.encrypt(bin_sk, bin_pk, value)
+      @type = TYPE_ENCRYPTED
+    end
+
+    def decrypt!
+      bin_sk = fix_private_key(@private_key).scan(/../).map(&:hex).reverse.pack('C*')
+      bin_pk = (public_key || @public_key).scan(/../).map(&:hex).pack('C*')
+      @value = Nis::Util::Ed25519.decrypt(bin_sk, bin_pk, payload)
+      @type = TYPE_PLAIN
     end
 
     # @return [Boolean]
@@ -40,7 +57,7 @@ class Nis::Struct
 
     # @return [String]
     def to_s
-      @value
+      @value.to_s
     end
 
     # @return [Boolean]
@@ -49,7 +66,13 @@ class Nis::Struct
     end
 
     def payload
-      @payload ||= value.unpack('H*').join
+      encrypted? ? value : value.unpack('H*').join
+    end
+
+    private
+
+    def fix_private_key(key)
+      "#{'0' * 64}#{key.sub(/^00/i, '')}"[-64, 64]
     end
   end
 end

data/lib/nis/transaction/transfer.rb

@@ -33,7 +33,9 @@ class Nis::Transaction
 
       @recipient = recipient
       @amount = amount
-      @message = Nis::Struct::Message.new(message)
+      @message = message.is_a?(Nis::Struct::Message) ?
+        message :
+        Nis::Struct::Message.new(message.to_s)
       @fee = Nis::Fee::Transfer.new(self)
       @mosaics = mosaics
     end

data/lib/nis/util/convert.rb

@@ -2,14 +2,6 @@ module Nis::Util
   module Convert
     HEX_ENCODE_ARRAY = %w[0 1 2 3 4 5 6 7 8 9 a b c d e f]
 
-    def hexlify(obj)
-      obj.unpack('H*').first
-    end
-
-    def unhexlify(obj)
-      obj.scan(/../).map(&:hex).pack('C*')
-    end
-
     # Reversed convertion of hex to Uint8Array
     # @param [String] hex
     # @return [Array]
@@ -77,8 +69,8 @@ module Nis::Util
         v += 0x100000000 if v < 0
         temp[0] = (v >> 24)
         temp[1] = (v >> 16) & 0xff
-        temp[2] = (v >>  8) & 0xff
-        temp[3] = (v)       & 0xff
+        temp[2] = (v >> 8) & 0xff
+        temp[3] = (v) & 0xff
         temp
       end.flatten
     end

data/lib/nis/util/deserializer.rb

@@ -74,7 +74,7 @@ module Nis::Util
       s = Nis::Util::Convert.hex2ua(serialized)
       common = deserialize_common(s)
       tx = {}
-      tx[:otherHash] = {data: deserialize_hex(s[68, 32])}
+      tx[:otherHash] = { data: deserialize_hex(s[68, 32]) }
       tx[:otherAccount] = deserialize_a(s[104, 40])
       common.merge(tx)
     end

data/lib/nis/util/ed25519.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'digest/sha3'
 require 'base32'
+require 'securerandom'
 
 module Nis::Util
   module Ed25519
@@ -52,7 +53,7 @@ module Nis::Util
 
       def xrecover(y)
         xx = (y * y - 1) * inv(@@d * y * y + 1)
-        x = xx.to_bn.mod_exp((@@q + 3) / 8, @@q)
+        x = xx.to_bn.mod_exp((@@q + 3) / 8, @@q).to_i
         x = (x * @@I) % @@q if (x * x - xx) % @@q != 0
         x = @@q - x if x % 2 != 0
         x
@@ -102,10 +103,10 @@ module Nis::Util
       end
 
       def scalarmult(_P, e)
-        @@ident if e == 0
+        return @@ident if e == 0
         _Q = scalarmult(_P, e / 2)
         _Q = edwards_double(_Q)
-        _Q = edwards_add(_Q, _P) if e & 1
+        _Q = edwards_add(_Q, _P) if (e & 1) == 1
         _Q
       end
 
@@ -161,6 +162,64 @@ module Nis::Util
         encodepoint(_A)
       end
 
+      def encrypt(sk, pk, data)
+        h = HH(sk)
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
+        _A = decodepoint(pk)
+        bin_g = encodepoint(scalarmult(_A, a))
+
+        bin_iv = SecureRandom.random_bytes(16)
+        # bin_iv = [133, 235, 90, 141, 29, 234, 234, 20, 115, 237, 164, 88, 224, 87, 29, 82].pack('C*')
+        hex_iv = bin_iv.unpack('H*').join
+
+        bin_salt = SecureRandom.random_bytes(32)
+        # bin_salt = [35, 150, 208, 176, 6, 179, 135, 220, 197, 253, 164, 147, 164, 177, 228, 43, 143, 146, 245, 255, 226, 71, 44, 94, 218, 169, 117, 88, 98, 241, 115, 79].pack('C*')
+        hex_salt = bin_salt.unpack('H*').join
+
+        ua_salt = Nis::Util::Convert.hex2ua(hex_salt)
+        ua_g = Nis::Util::Convert.hex2ua(bin_g.unpack('H*').join)
+
+        c = []
+        ua_salt.each_with_index { |el, idx| c << (el ^ ua_g[idx]) }
+        bin_key = Digest::SHA3.digest(c.pack('C*'), 256)
+
+        cipher = OpenSSL::Cipher.new('AES-256-CBC')
+        cipher.encrypt
+        cipher.key = bin_key
+        cipher.iv = bin_iv
+        encrypted_data = cipher.update(data.bytes.pack('C*')) + cipher.final
+        hex_salt + hex_iv + encrypted_data.unpack('H*').join
+      end
+
+      def decrypt(sk, pk, data)
+        h = HH(sk)
+        a = 2**(@@b - 2) + (3...@@b - 2).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
+        _A = decodepoint(pk)
+        bin_g = encodepoint(scalarmult(_A, a))
+
+        hex_salt = data[0, 64]
+        hex_iv = data[64, 32]
+        hex_encrypted = data[96, data.size]
+
+        ua_iv = Nis::Util::Convert.hex2ua(hex_iv)
+        bin_iv = ua_iv.pack('C*')
+
+        ua_salt = Nis::Util::Convert.hex2ua(hex_salt)
+        ua_g = Nis::Util::Convert.hex2ua(bin_g.unpack('H*').first)
+
+        c = []
+        ua_salt.each_with_index { |el, idx| c << (el ^ ua_g[idx]) }
+        bin_key = Digest::SHA3.digest(c.pack('C*'), 256)
+
+        bin_encrypted = Nis::Util::Convert.hex2ua(hex_encrypted).pack('C*')
+
+        cipher = OpenSSL::Cipher.new('AES-256-CBC')
+        cipher.decrypt
+        cipher.key = bin_key
+        cipher.iv = bin_iv
+        cipher.update(bin_encrypted) + cipher.final
+      end
+
       def Hint(m)
         h = H(m)
         (0...2 * @@b).inject(0) { |sum, i| sum + 2**i * bit(h, i) }
@@ -207,7 +266,7 @@ module Nis::Util
       end
 
       def decodepoint(s)
-        y = (0...@@b - 1).inject(0) { |sum, i| 2**i * bit(s, i) }
+        y = (0...@@b - 1).inject(0) { |sum, i| sum + 2**i * bit(s, i) }
         x = xrecover(y)
         x = @@q - x if x & 1 != bit(s, @@b - 1)
         _P = [x, y, 1, (x * y) % @@q]

data/lib/nis/util/serializer.rb

@@ -90,9 +90,9 @@ module Nis::Util
       a += serialize_common(entity)
       other_tx = entity[:otherTrans]
       tx = case other_tx[:type]
-        when 0x0101 then serialize_transfer(other_tx)
-        when 0x0801 then serialize_importance_transfer(other_tx)
-        when 0x1001 then serialize_multisig_aggregate_modification(other_tx)
+           when 0x0101 then serialize_transfer(other_tx)
+           when 0x0801 then serialize_importance_transfer(other_tx)
+           when 0x1001 then serialize_multisig_aggregate_modification(other_tx)
         else raise "Unexpected type #{other_tx[:type]}"
       end
       a += serialize_int(tx.size)

data/lib/nis/version.rb

@@ -1,3 +1,3 @@
 class Nis
-  VERSION = '0.0.15'.freeze
+  VERSION = '0.0.16'.freeze
 end

data/nis.gemspec

@@ -25,13 +25,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.post_install_message = %q{
+  spec.post_install_message = '
   <nis-ruby>
   Please see https://gitter.im/44uk/nis-ruby for the latest information.
   The gem is under development. Incompatible changes can be made.
   Feel free to ask and give feedback to https://twitter.com/44uk_i3
   Good luck! NEM application development!
-  }
+  '
 
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Yoshiyuki Ieyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby client library for the NEM Infrastructure Server API