iota-ruby 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1e5423f9645a1fceef2e926f77101b6d28a2e837
-  data.tar.gz: 55d897d2dec4177927a57e90f7e5570c79d95604
+SHA256:
+  metadata.gz: 0eddb950ffbc3bf0e3da4e220391718183273cb590bd721edc759fb76b0fd7bf
+  data.tar.gz: 53e845e6eacd344ae3237b2547320565cd8323b6fee7d0aa872668f1cb47c507
 SHA512:
-  metadata.gz: 16ccbc15b79c844294c81ab21146e6fb848dd1db5d2e3e6b8b56b8096f3aed43d117a607f046b3b7ddd4fcb2e7770284662df7246ea5649c94498f03ceb5e3d9
-  data.tar.gz: 077a3b55befc66196a5bfa9e2ceab5074d5d42afd856a245a90c4c15d701b7b4f6446973e604c53c748acc1263d549dca8f48df232c826a0b1c42b681c6ba2f1
+  metadata.gz: b6873ed591a86864e6ff9ed57179d34bf2f0046dd059eb6849478ffd5ed1209dbc61920c466fae17e0b896a2507b47073ae28ee4b98557d7cd4575db279fdcf4
+  data.tar.gz: d13783668a13b9bbf76df9afee95a7a0ef04a081bfaffaaacb4f03b76f3a805f8798727cc0e454dd8b724ebeac64e05171d4d9f92dfaffbedde88005322dac16

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
+dist: trusty
+osx_image: xcode9.3
 os:
   - linux
   - osx
@@ -7,4 +9,16 @@ rvm:
   - ruby-head
   - 2.5.1
   - 2.4.1
+  - jruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-3
+matrix:
+  exclude:
+    - os: osx
+      rvm: rbx-3
+    - os: osx
+      rvm: ruby-head
+    - os: osx
+      rvm: jruby-head
 before_install: gem install bundler -v 1.15.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [1.1.8] - 2019-07-15
+- minor fixes in IOTA::Crypto::Converter.trytes
+- Fixing some stuff in c extenstion to make it compatible with MRI ruby and Rubinius
+- adding support for Rubinius
+- adding support for JRuby platforms with native curl function in Java
+
 ## [1.1.7] - 2018-12-02
 - adding `user` & `password` options to client
 - [Local PoW Support](https://github.com/vivekmarakana/iota.lib.rb#local-pow-support)
@@ -8,5 +14,5 @@
 - Inbuilt batching for following apis: `getTrytes`, `getBalances`, `wereAddressesSpentFrom`, `getInclusionStates` & `findTransactions`
 - adding changelog file to keep track of future changes
 
-### Changed
-- Only returning balance array as reponse for `getBalances` api call (Major)
+### Old major changes
+- Only returning balance array as reponse for `getBalances` api call

data/README.md

@@ -107,3 +107,15 @@ client = IOTA::Client.new(provider: 'https://node.iota-tangle.io:14265')
 client = IOTA::Client.new(provider: 'https://node.iota-tangle.io:14265', local_pow: true)
 # Now you can use `client.api.attachToTangle` api, which will do the proof-of-work on transaction and return the trytes that needs to be broadcasted
 ```
+
+## Compatibility
+
+Tested on [Travis CI](https://travis-ci.org/vivekmarakana/iota.lib.rb) on following environment [configurations](https://github.com/vivekmarakana/iota.lib.rb/blob/master/.travis.yml):
+
+- ruby-head (Linux)
+- 2.5.1 (Linux & Mac)
+- 2.4.1 (Linux & Mac)
+- jruby-head (OpenJDK8/Linux)
+- jruby-19mode (OpenJDK8/Linux & OpenJDK8/OSX)
+- jruby-18mode (OpenJDK8/Linux & OpenJDK8/OSX)
+- rbx-3 (Linux)

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "rake/extensiontask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
@@ -8,17 +7,30 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-Rake::ExtensionTask.new "ccurl" do |ext|
-  ext.lib_dir = "lib"
-end
+tasks = []
 
-def can_compile_extensions
-  return false if RUBY_DESCRIPTION =~ /jruby/
-  return true
-end
+if RUBY_PLATFORM =~ /java/
+  if ENV['TRAVIS'].to_s.empty?
+    puts "Will build JAVA extension"
+
+    require 'rake/javaextensiontask'
+    Rake::JavaExtensionTask.new "jcurl" do |ext|
+      ext.lib_dir = "lib"
+    end
 
-if can_compile_extensions
-  task :default => [:compile, :test]
+    tasks << :compile
+  else
+    puts "Not building jar for travis"
+  end
 else
-  task :default => [:test]
+  puts "Will build C extension"
+
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new "ccurl" do |ext|
+    ext.lib_dir = "lib"
+  end
+
+  tasks << :compile
 end
+
+task :default => tasks + [:test]

data/ext/ccurl/ccurl.c

@@ -5,6 +5,10 @@
 #define NUMBER_OF_ROUNDS 81
 #define STATE_LENGTH 3 * HASH_LENGTH
 
+#ifndef RARRAY_LEN
+#  define RARRAY_LEN(x) return (long)NUM2INT(rb_funcall(x, rb_intern("length"), 0));
+#endif
+
 typedef int64_t trit_t;
 
 #define __TRUTH_TABLE 1,  0, -1, 1, -1,  0, -1,  1,  0
@@ -43,7 +47,7 @@ static VALUE ccurl_absorb(VALUE self, VALUE data) {
   trit_t *trits;
   int offset = 0;
   int i;
-  int length = NUM2INT(rb_funcall(data, rb_intern("length"), 0, 0));
+  int length = (int)RARRAY_LEN(data);
 
   Curl *ctx;
   Data_Get_Struct(self, Curl, ctx);
@@ -66,21 +70,25 @@ static VALUE ccurl_absorb(VALUE self, VALUE data) {
 }
 
 static VALUE ccurl_squeeze(VALUE self, VALUE data) {
-  int length = NUM2INT(rb_funcall(data, rb_intern("length"), 0, 0));
+  int offset = 0;
   int i;
+  int length = (int)RARRAY_LEN(data);
 
   Curl *ctx;
   Data_Get_Struct(self, Curl, ctx);
 
-  for(; length < HASH_LENGTH; length++) {
-    rb_ary_push(data, LONG2NUM(0));
-  }
+  do {
+    for(; length < HASH_LENGTH; length++) {
+      rb_ary_push(data, LONG2NUM(0));
+    }
 
-  for (i = 0; i < HASH_LENGTH; i++) {
-    rb_ary_store(data, i, LONG2NUM(ctx->state[i]));
-  }
+    for (i = 0; i < HASH_LENGTH; i++) {
+      rb_ary_store(data, i, LONG2NUM(ctx->state[i]));
+    }
 
-  ccurl_transform(self);
+    ccurl_transform(self);
+    offset += HASH_LENGTH;
+  } while ((length -= HASH_LENGTH) > 0);
 
   return Qnil;
 }

data/ext/jcurl/JCurl.java

@@ -0,0 +1,126 @@
+package com.vmarakana;
+
+import java.util.Arrays;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyInteger;
+import org.jruby.RubyNil;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+public class JCurl extends RubyObject {
+  /**
+   * The hash length.
+   */
+  public static final int HASH_LENGTH = 243;
+  private static final int STATE_LENGTH = 3 * HASH_LENGTH;
+
+  public static final int NUMBER_OF_ROUNDS = 81;
+  private int numberOfRounds;
+
+  private static final int[] TRUTH_TABLE = {1, 0, -1, 2, 1, -1, 0, 2, -1, 1, 0};
+  private final int[] scratchpad = new int[STATE_LENGTH];
+  private int[] state;
+
+  /**
+   * Java constructor
+   * @param ruby Ruby
+   * @param metaclass RubyClass
+   */
+  public JCurl(Ruby ruby, RubyClass rubyClass) {
+    super(ruby, rubyClass);
+  }
+
+  /**
+   *
+   * @param context ThreadContext
+   * @param klass IRubyObject
+   * @param args optional (no args rounds = NUMBER_OF_ROUNDS)
+   * @return new Vec3 object (ruby)
+   */
+  @JRubyMethod(name = "new", meta = true, rest = true)
+  public static IRubyObject rbNew(ThreadContext context, IRubyObject klass, IRubyObject... args) {
+    JCurl jcurl = (JCurl) ((RubyClass) klass).allocate();
+    jcurl.init(context, args);
+    return jcurl;
+  }
+
+  // This method is internal and not exposed
+  private IRubyObject init(ThreadContext context, IRubyObject... args) {
+    state = new int[STATE_LENGTH];
+
+    // Set rounds
+    if (args.length > 0 && args[0] instanceof RubyInteger) {
+      numberOfRounds = ((RubyInteger) args[0]).getIntValue();
+    } else {
+      numberOfRounds = NUMBER_OF_ROUNDS;
+    }
+
+    return new RubyNil(context.runtime);
+  }
+
+  @JRubyMethod
+  public IRubyObject transform(ThreadContext context) {
+    int scratchpadIndex = 0;
+    int prev_scratchpadIndex = 0;
+    for (int round = 0; round < numberOfRounds; round++) {
+      System.arraycopy(state, 0, scratchpad, 0, STATE_LENGTH);
+      for (int stateIndex = 0; stateIndex < STATE_LENGTH; stateIndex++) {
+        prev_scratchpadIndex = scratchpadIndex;
+        if (scratchpadIndex < 365) {
+          scratchpadIndex += 364;
+        } else {
+          scratchpadIndex += -365;
+        }
+        state[stateIndex] = TRUTH_TABLE[scratchpad[prev_scratchpadIndex] + (scratchpad[scratchpadIndex] << 2) + 5];
+      }
+    }
+
+    return new RubyNil(context.runtime);
+  }
+
+  @JRubyMethod
+  public IRubyObject absorb(ThreadContext context, final IRubyObject trits) {
+    int offset = 0;
+    int length = ((RubyArray) trits).getLength();
+
+    do {
+      System.arraycopy(trits.toJava(int[].class), offset, state, 0, length < HASH_LENGTH ? length : HASH_LENGTH);
+      transform(context);
+      offset += HASH_LENGTH;
+    } while ((length -= HASH_LENGTH) > 0);
+
+    return new RubyNil(context.runtime);
+  }
+
+  @JRubyMethod
+  public RubyNil squeeze(ThreadContext context, final IRubyObject trits) {
+    int offset = 0;
+    int length = ((RubyArray) trits).getLength();
+
+    do {
+      for(; length < HASH_LENGTH; length++) {
+        ((RubyArray) trits).append(context.runtime.newFixnum(0));
+      }
+
+      for (int i = 0; i < HASH_LENGTH; i++) {
+        ((RubyArray) trits).store(i, context.runtime.newFixnum(state[i]));
+      }
+
+      transform(context);
+      offset += HASH_LENGTH;
+    } while ((length -= HASH_LENGTH) > 0);
+
+    return new RubyNil(context.runtime);
+  }
+
+  @JRubyMethod
+  public IRubyObject reset(ThreadContext context) {
+    Arrays.fill(state, 0);
+    return new RubyNil(context.runtime);
+  }
+}

data/ext/jcurl/JCurlService.java

@@ -0,0 +1,36 @@
+package com.vmarakana;
+
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.BasicLibraryService;
+
+public class JCurlService implements BasicLibraryService {
+  private Ruby runtime;
+
+  /**
+   * Basic load method of the BasicLibraryService, this method is
+   * invoked when the ruby code does the related require call.
+   * @param ruby An instance of the JRuby runtime.
+   * @return boolean True if everything was successful, false otherwise.
+   * @throws IOException is required to match the BasicLibraryService signature
+   */
+
+  @Override
+  public boolean basicLoad(final Ruby ruby) throws IOException {
+    RubyModule iota = ruby.defineModule("IOTA");
+    RubyModule crypto = iota.defineModuleUnder("Crypto");
+    RubyClass jcurl = crypto.defineClassUnder("JCurl", ruby.getObject(), new ObjectAllocator() {
+      public IRubyObject allocate(Ruby ruby1, RubyClass rubyClass) {
+        return new JCurl(ruby1, rubyClass);
+      }
+    });
+
+    jcurl.defineAnnotatedMethods(JCurl.class);
+    return true;
+  }
+}

data/iota-ruby.gemspec

@@ -13,17 +13,25 @@ Gem::Specification.new do |spec|
   spec.description   = "Ruby gem for the IOTA core"
   spec.homepage      = "https://github.com/vivekmarakana/iota.lib.rb"
 
-  spec.files         = `git ls-files`.split("\n")
+  spec.files         = `git ls-files`.split("\n") - [ "lib/jcurl.jar"]
   spec.test_files    = `git ls-files -- test/*`.split("\n")
-  spec.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.extensions    = ["ext/ccurl/extconf.rb"]
 
-  spec.required_ruby_version = '>= 2.4.0'
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.0.4"
-  spec.add_dependency "digest-sha3", "~> 1.1"
-  spec.add_dependency "ffi", "~> 1.9.25"
+  if RUBY_PLATFORM =~ /java/
+    spec.platform      = "java"
+    spec.files         << "lib/jcurl.jar"
+  else
+    spec.extensions    = ["ext/ccurl/extconf.rb"]
+  end
+
+  spec.add_development_dependency "bundler", ">= 1.15"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "minitest", ">= 5.0"
+  spec.add_development_dependency "rake-compiler", ">= 1.0.4"
+
+  unless RUBY_PLATFORM =~ /java/
+    spec.add_runtime_dependency "digest-sha3", "~> 1.1"
+  end
+
+  spec.add_runtime_dependency "ffi", "~> 1.9.25"
 end

data/lib/iota.rb

@@ -1,3 +1,4 @@
+require "patch"
 require "iota/version"
 
 require "iota/utils/input_validator"
@@ -40,8 +41,6 @@ module IOTA
       @utils = IOTA::Utils::Utils.new
       @validator = @utils.validator
       @multisig = IOTA::Multisig::Multisig.new(self)
-      # TODO: Implement MAM
-      # TODO: Implement Flash Channel
     end
 
     def changeNode(settings = {})

data/lib/iota/crypto/converter.rb

@@ -81,7 +81,10 @@ module IOTA
 
           (0...trits.length).step(3) do |i|
             chunk = trits[i...i+3]
-            trytes += TRYTES_ALPHABET[TRYTE_TRITS.index(chunk)]
+            index = TRYTE_TRITS.index(chunk)
+            if !index.nil?
+              trytes += TRYTES_ALPHABET[index]
+            end
           end
 
           trytes

data/lib/iota/crypto/curl.rb

@@ -1,9 +1,9 @@
-if !Dir.glob(File.join(File.dirname(__FILE__), '../../ccurl.*')).empty?
+if RUBY_PLATFORM =~ /java/
+  require "iota/crypto/curl_java"
+  BaseCurl = IOTA::Crypto::JCurl
+else
   require "iota/crypto/curl_c"
   BaseCurl = IOTA::Crypto::CCurl
-else
-  require "iota/crypto/curl_ruby"
-  BaseCurl = IOTA::Crypto::RubyCurl
 end
 
 module IOTA

data/lib/iota/crypto/curl_c.rb

@@ -5,11 +5,13 @@ module IOTA
       HASH_LENGTH = 243
       STATE_LENGTH = 3 * HASH_LENGTH
 
+      unless RUBY_PLATFORM =~ /java/
+        require "ccurl"
+      end
+
       def version
         "C"
       end
     end
   end
 end
-
-require "ccurl"

data/lib/iota/crypto/curl_java.rb

@@ -0,0 +1,18 @@
+module IOTA
+  module Crypto
+    class JCurl
+      NUMBER_OF_ROUNDS = 81
+      HASH_LENGTH = 243
+      STATE_LENGTH = 3 * HASH_LENGTH
+
+      if RUBY_PLATFORM =~ /java/
+        require 'jcurl'
+        com.vmarakana.JCurlService.new.basicLoad(JRuby.runtime)
+      end
+
+      def version
+        "Java"
+      end
+    end
+  end
+end

data/lib/iota/crypto/kerl.rb

@@ -1,5 +1,3 @@
-require 'digest/sha3'
-
 module IOTA
   module Crypto
     class Kerl
@@ -11,7 +9,13 @@ module IOTA
       end
 
       def reset
-        @hasher = Digest::SHA3.new(BIT_HASH_LENGTH)
+        unless RUBY_PLATFORM =~ /java/
+          require 'digest/sha3'
+          @hasher = Digest::SHA3.new(BIT_HASH_LENGTH)
+        else
+          require "iota/crypto/sha3_ruby"
+          @hasher = Digest::RubySHA3.new(BIT_HASH_LENGTH)
+        end
       end
 
       def absorb(trits, offset = 0, length = nil)

data/lib/iota/crypto/sha3_ruby.rb

@@ -0,0 +1,122 @@
+require 'digest'
+
+module Digest
+  class RubySHA3 < Digest::Class
+    PILN = [10,  7, 11, 17, 18,  3,  5, 16,
+             8, 21, 24,  4, 15, 23, 19, 13,
+            12,  2, 20, 14, 22,  9,  6,  1]
+
+    ROTC = [ 1,  3,  6, 10, 15, 21, 28, 36,
+            45, 55,  2, 14, 27, 41, 56,  8,
+            25, 43, 62, 18, 39, 61, 20, 44]
+
+    RNDC = [0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
+            0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
+            0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
+            0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
+            0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
+            0x8000000000008003, 0x8000000000008002, 0x8000000000000080,
+            0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
+            0x8000000000008080, 0x0000000080000001, 0x8000000080008008]
+
+    def initialize hash_size = 512
+      @size = hash_size / 8
+      @buffer = ''
+    end
+
+    def << s
+      @buffer << s.unpack('C*').pack('C*')
+      self
+    end
+    alias update <<
+
+    def reset
+      # @buffer.clear # CHANGE: DO NOT CLEAR BUFFER AS WE NEED
+      self
+    end
+
+    def digest(data = nil)
+      if data
+        update(data)
+        value = finish
+      else
+        cloned = dup
+        value = cloned.finish
+      end
+      value
+    end
+
+    def hexdigest(data = nil)
+      value = digest(data)
+      value.unpack("H*").first
+    end
+
+    def inspect
+      "#<#{self.class}: #{hexdigest}>"
+    end
+
+    def finish
+      s = Array.new 25, 0
+      width = 200 - @size * 2
+
+      buffer_dup = @buffer.dup
+      buffer_dup << "\x01" << "\0" * (width - buffer_dup.size % width)
+      buffer_dup[-1] = (buffer_dup[-1].ord | 0x80).chr.unpack('C*').pack('C*')
+
+      0.step buffer_dup.size - 1, width do |j|
+        quads = buffer_dup[j, width].unpack 'Q*'
+        (width / 8).times do |i|
+          s[i] ^= quads[i]
+        end
+
+        keccak s
+      end
+
+      s.pack('Q*')[0, @size]
+    end
+
+    private
+    def keccak s
+      24.times.each_with_object [] do |round, a|
+        # Theta
+        5.times do |i|
+          a[i] = s[i] ^ s[i + 5] ^ s[i + 10] ^ s[i + 15] ^ s[i + 20]
+        end
+
+        5.times do |i|
+          t = a[(i + 4) % 5] ^ rotate(a[(i + 1) % 5], 1)
+          0.step 24, 5 do |j|
+            s[j + i] ^= t
+          end
+        end
+
+        # Rho Pi
+        t = s[1]
+        24.times do |i|
+          j = PILN[i]
+          a[0] = s[j]
+          s[j] = rotate t, ROTC[i]
+          t = a[0]
+        end
+
+        # Chi
+        0.step 24, 5 do |j|
+          5.times do |i|
+            a[i] = s[j + i]
+          end
+
+          5.times do |i|
+            s[j + i] ^= ~a[(i + 1) % 5] & a[(i + 2) % 5]
+          end
+        end
+
+        # Iota
+        s[0] ^= RNDC[round]
+      end
+    end
+
+    def rotate x, y
+      (x << y | x >> 64 - y) & (1 << 64) - 1
+    end
+  end
+end

data/lib/iota/multisig/multisig.rb

@@ -57,7 +57,7 @@ module IOTA
         # validate remainder address
         raise StandardError, "Invalid remainder address provided" if remainderAddress && !@validator.isAddress(remainderAddress)
 
-        remainderAddress = @utils.noChecksum(remainderAddress) if remainderAddress.length == 90
+        remainderAddress = @utils.noChecksum(remainderAddress) if remainderAddress && remainderAddress.length == 90
 
         # Create a new bundle
         bundle = IOTA::Crypto::Bundle.new

data/lib/iota/version.rb

@@ -1,3 +1,3 @@
 module IOTA
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/lib/patch.rb

@@ -0,0 +1,17 @@
+# Patching Array#sum method for older rubies, jruby and rubinbius
+if !Array.instance_methods.include?(:sum)
+  class Array
+    def sum
+      inject(0) {|sum, val| sum + val}
+    end
+  end
+end
+
+# Patching Regexp#match? method for older rubies, jruby and rubinbius
+if !Regexp.instance_methods.include?(:match?)
+  class Regexp
+    def match?(a)
+      !match(a).nil?
+    end
+  end
+end

data/test/curl_c_test.rb

@@ -1,8 +1,8 @@
 require "test_helper"
-if !Dir.glob(File.join(File.dirname(__FILE__), '../lib/ccurl.*')).empty?
+unless RUBY_PLATFORM =~ /java/
   require "iota/crypto/curl_c"
 
-  class CcurlTest < Minitest::Test
+  class CCurlTest < Minitest::Test
     def setup
       @converter = IOTA::Crypto::Converter
       @curl = IOTA::Crypto::CCurl.new(81)

data/test/curl_java_test.rb

@@ -0,0 +1,31 @@
+require "test_helper"
+if RUBY_PLATFORM =~ /java/
+  require "iota/crypto/curl_java"
+
+  class JavaCurlTest < Minitest::Test
+    def setup
+      @converter = IOTA::Crypto::Converter
+      @curl = IOTA::Crypto::JCurl.new(81)
+    end
+
+    def test_that_hash_works
+      trytes = "999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999G9AIBZPUUIXPRDTUJNGAUSWPJMLJOCSJSPVGP9KDCABPQIWXYOAXJVMDYSCPAAIJNWOHUIUNKKOVJJASCHJYTXA999999999999999999999FOINFALCON99999999999999999RJFYLXD99999999999D99999999WCKBQGFJRFIYVJAZDYLNQZIUQGG9EKZKNUOBEEASPPJXUGCTAGHGWLQSWJKC9DRVEKKHDOUJLNEQCGYK9HKFPGUUIXFOZBXZIJAFPWBYUTIAZMYHGAC9QMRDJCGOW9VXVLVQKTKRLQFITNLDHPDXHDWIVRZQGZ9999OEMEOVATRLZWXXDXIX9AVNDCHRLC9WHB9IAUUYKHUGIFBKCCYN9LRGTTQISBQYPDHTXRTOYVZTLU99999COINFALCON99999999999999999Z9PSAGQJE999999999L99999999IQXMVTRNAQVADDX9ET9IAMVJDZV"
+      expected_hash = "QLMNETEZDOYSBQLRPRJIZNRRDZ9EKY9LCOLNIDQEZNUFWOVYR9SJLBCVIJWIOKGNPMPGWYTNFMOW99999"
+
+      transactionTrits = @converter.trits(trytes)
+      hash = []
+
+      start = Time.now
+      # generate the correct transaction hash
+      @curl.reset
+      @curl.absorb(transactionTrits)
+      @curl.squeeze(hash)
+      hash = @converter.trytes(hash)
+      puts "Java Curl time: #{(Time.now - start) * 1000.0}ms"
+
+      assert expected_hash == hash
+    end
+  end
+else
+  puts "Java extension is not available. Skipping tests for it."
+end

data/test/kerl_test.rb

@@ -6,18 +6,6 @@ class KerlTest < Minitest::Test
     @kerl = IOTA::Crypto::Kerl.new
   end
 
-  def test_that_sha3_works
-    digest = "\xe0\xef\x02\xd2FD\xa7\xb2\x8b<\x1b\x01\xc4\xfe\x13zI\x86M[\xdefV\xfa\xf49\xe1\xeb\xa6X\x06M\x9e\xcf\x842U\xba\x90=\x1c\xeb\xdcf\xff/\x16\xce".unpack('C*')
-    hexdigest = "e0ef02d24644a7b28b3c1b01c4fe137a49864d5bde6656faf439e1eba658064d9ecf843255ba903d1cebdc66ff2f16ce"
-
-    a = Digest::SHA3.new(384)
-    a.update("GYOMKVTSNHVJNCNFBBAH9AAMXLPLLLROQY99QN9DLSJUHDPBLCFFAIQXZA9BKMBJCYSFHFPXAHDWZFEIZ")
-
-    assert a.digest_length == 48
-    assert a.digest.bytes == digest
-    assert a.hexdigest == hexdigest
-  end
-
   def test_that_absorb_squeeze_works
     input = "GYOMKVTSNHVJNCNFBBAH9AAMXLPLLLROQY99QN9DLSJUHDPBLCFFAIQXZA9BKMBJCYSFHFPXAHDWZFEIZ"
     expected = "OXJCNFHUNAHWDLKKPELTBFUCVW9KLXKOGWERKTJXQMXTKFKNWNNXYD9DMJJABSEIONOSJTTEVKVDQEWTW"

data/test/sha3_test.rb

@@ -0,0 +1,71 @@
+require "test_helper"
+
+require "iota/crypto/sha3_ruby"
+
+class Sha3Test < Minitest::Test
+  def setup
+    @ruby_sha3_class = Digest::RubySHA3
+    unless RUBY_PLATFORM =~ /java/
+      require 'digest/sha3'
+      @c_sha3_class = Digest::SHA3
+    else
+      @c_sha3_class = nil
+    end
+
+    @str = "GYOMKVTSNHVJNCNFBBAH9AAMXLPLLLROQY99QN9DLSJUHDPBLCFFAIQXZA9BKMBJCYSFHFPXAHDWZFEIZ"
+    @result = "e0ef02d24644a7b28b3c1b01c4fe137a49864d5bde6656faf439e1eba658064d9ecf843255ba903d1cebdc66ff2f16ce"
+  end
+
+  def test_that_c_sha3_update_works
+    if @c_sha3_class
+      start = Time.now
+      a = @c_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      a.update(@str)
+      puts "C SHA3 Update time: #{(Time.now - start) * 1000.0}ms"
+
+      assert a.digest_length == 48
+      assert a.hexdigest == @result
+    end
+  end
+
+  def test_that_c_sha3_digest_works
+    if @c_sha3_class
+      start = Time.now
+      a = @c_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      assert a.hexdigest(@str) == @result
+      puts "C SHA3 Digest time: #{(Time.now - start) * 1000.0}ms"
+    end
+  end
+
+  def test_that_ruby_sha3_update_works
+    if @ruby_sha3_class
+      start = Time.now
+      a = @ruby_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      a.update(@str)
+      puts "Ruby SHA3 Update time: #{(Time.now - start) * 1000.0}ms"
+      assert a.digest_length == 48
+      assert a.hexdigest == @result
+    end
+  end
+
+  def test_that_ruby_sha3_digest_works
+    if @ruby_sha3_class
+      start = Time.now
+      a = @ruby_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      assert a.hexdigest(@str) == @result
+      puts "Ruby SHA3 Digest time: #{(Time.now - start) * 1000.0}ms"
+    end
+  end
+
+  def test_that_c_sha3_and_ruby_sha3_give_same_results
+    if @ruby_sha3_class && @c_sha3_class
+      a = @ruby_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      b = @c_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      assert a.hexdigest(@str) == b.hexdigest(@str)
+
+      a = @ruby_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      b = @c_sha3_class.new(IOTA::Crypto::Kerl::BIT_HASH_LENGTH)
+      assert a.update(@str).hexdigest == b.update(@str).hexdigest
+    end
+  end
+end

data/test/utils_test.rb

@@ -5,6 +5,12 @@ class UtilsTest < Minitest::Test
     @utils = IOTA::Utils::Utils.new
   end
 
+  def test_add_checksum
+    addressWithoutChecksum = "UYEEERFQYTPFAHIPXDQAQYWYMSMCLMGBTYAXLWFRFFWPYFOICOVLK9A9VYNCKK9TQUNBTARCEQXJHD9VY"
+    addressWithChecksum = "UYEEERFQYTPFAHIPXDQAQYWYMSMCLMGBTYAXLWFRFFWPYFOICOVLK9A9VYNCKK9TQUNBTARCEQXJHD9VYXOEDEOMRC"
+    assert_equal @utils.addChecksum(addressWithoutChecksum), addressWithChecksum
+  end
+
   def test_checksum_validation
     addressWithChecksum = "UYEEERFQYTPFAHIPXDQAQYWYMSMCLMGBTYAXLWFRFFWPYFOICOVLK9A9VYNCKK9TQUNBTARCEQXJHD9VYXOEDEOMRC"
     assert_equal @utils.isValidChecksum(addressWithChecksum), true

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: iota-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Vivek Marakana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
@@ -97,8 +97,7 @@ dependencies:
 description: Ruby gem for the IOTA core
 email:
 - vivek.marakana@gmail.com
-executables:
-- iota-console
+executables: []
 extensions:
 - ext/ccurl/extconf.rb
 extra_rdoc_files: []
@@ -116,6 +115,8 @@ files:
 - examples/multisig.rb
 - ext/ccurl/ccurl.c
 - ext/ccurl/extconf.rb
+- ext/jcurl/JCurl.java
+- ext/jcurl/JCurlService.java
 - ext/pow/ccurl-0.3.0.dll
 - ext/pow/libccurl-0.3.0.dylib
 - ext/pow/libccurl-0.3.0.so
@@ -129,11 +130,13 @@ files:
 - lib/iota/crypto/converter.rb
 - lib/iota/crypto/curl.rb
 - lib/iota/crypto/curl_c.rb
+- lib/iota/crypto/curl_java.rb
 - lib/iota/crypto/curl_ruby.rb
 - lib/iota/crypto/hmac.rb
 - lib/iota/crypto/kerl.rb
 - lib/iota/crypto/pow_provider.rb
 - lib/iota/crypto/private_key.rb
+- lib/iota/crypto/sha3_ruby.rb
 - lib/iota/crypto/signing.rb
 - lib/iota/models/account.rb
 - lib/iota/models/base.rb
@@ -150,11 +153,14 @@ files:
 - lib/iota/utils/object_validator.rb
 - lib/iota/utils/utils.rb
 - lib/iota/version.rb
+- lib/patch.rb
 - test/ascii_test.rb
 - test/curl_c_test.rb
+- test/curl_java_test.rb
 - test/curl_ruby_test.rb
 - test/kerl_test.rb
 - test/pow_provider_test.rb
+- test/sha3_test.rb
 - test/test_helper.rb
 - test/utils_test.rb
 homepage: https://github.com/vivekmarakana/iota.lib.rb
@@ -168,23 +174,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: IOTA API wrapper for Ruby
 test_files:
 - test/ascii_test.rb
 - test/curl_c_test.rb
+- test/curl_java_test.rb
 - test/curl_ruby_test.rb
 - test/kerl_test.rb
 - test/pow_provider_test.rb
+- test/sha3_test.rb
 - test/test_helper.rb
 - test/utils_test.rb