iota-ruby 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32740331750eaf99d815b46b70e295edeac4ab4
-  data.tar.gz: 229099a8efc82398f840dd6a997a4262aefeaf2b
+  metadata.gz: 56550726895238e50668114981fc85deed729c9d
+  data.tar.gz: 74bce50a977d7116ce1e39f1fd27bda535bbae8e
 SHA512:
-  metadata.gz: bd529fd2768766e1e41b99a96bc270273c4a49b0c374fe3ea1c404193dcfa4e9ea8e1a60e510c68705f4e69bab70d812dec7c84cd1e8ff2ac3b6d850c65b7ea3
-  data.tar.gz: 1bee6775b242bf06712cd45dbf7c3834169d2529d6f4615674525250e06595d659bd902ea2b22d8b7ffc0ffc46fcff9a1025f16a70ac64ad3dd34dfb43058daf
+  metadata.gz: 9d5f10d81ccfd9c24dd42875ba4a66444d0abeba8bc4db683ba9be5bd4a3d451d858cd6cb916e6a77b9f8a3639dbc803fa26eb0fd6537d9c292532181366dd3a
+  data.tar.gz: b8044e97b83756fe5e0a627c816b1013b854bd30597808d41b4c62986b56cfa73e553eb901a4c7b5e9aa9a4d4f2f888b278e68213de5cc94fd7a085b8cfdf1b1

data/README.md

@@ -1,25 +1,25 @@
 # IOTA Ruby Gem
 
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/vivekmarakana/iota.lib.rb/master/LICENSE)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/vivekmarakana/iota.lib.rb/master/LICENSE) [![Gem Version](https://badge.fury.io/rb/iota-ruby.svg)](https://badge.fury.io/rb/iota-ruby)
 
-This is the **unofficial** Ruby gem for the IOTA Core. It implements both the [official API](https://iota.readme.io/), as well as newly proposed functionality (such as signing, bundles, utilities and conversion).
-
-This gem is a **beta release**. If you find any bug or face issue, please [post it here](https://github.com/vivekmarakana/iota.lib.rb/issues).
-
-**Note: This release does not have multi signature support. It will be added after successful testing of this version**
+This is the **unofficial** Ruby gem for the IOTA Core. It implements both the [official API](https://iota.readme.io/), as well as newly proposed functionality (such as signing, bundles, utilities, conversion, multi signature support and reattch/promote).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'iota-ruby', '~> 1.1.1', require: 'iota'
+gem 'iota-ruby', '~> 1.1.2'
 ```
 
 And then execute:
 
     $ bundle
 
+Or install it yourself as:
+
+    $ gem install iota-ruby
+
 
 # Documentation
 
@@ -41,6 +41,8 @@ The optional settings object can have the following values:
 You can either supply the remote node directly via the `provider` option, or individually with `host` and `port`, as can be seen in the example below:
 
 ```ruby
+require 'iota'
+
 # Create client with host and port as provider
 client = IOTA::Client.new(host: 'http://localhost', port: 14265)
 

data/lib/iota/api/api.rb

@@ -130,13 +130,13 @@ module IOTA
         sendCommand(@commands.getTips, &callback)
       end
 
-      def getTransactionsToApprove(depth, &callback)
+      def getTransactionsToApprove(depth, reference = nil, &callback)
         # Check if correct depth
         if !@validator.isValue(depth)
           return sendData(false, "Invalid inputs provided", &callback)
         end
 
-        sendCommand(@commands.getTransactionsToApprove(depth), &callback)
+        sendCommand(@commands.getTransactionsToApprove(depth, reference), &callback)
       end
 
       def attachToTangle(trunkTransaction, branchTransaction, minWeightMagnitude, trytes, &callback)
@@ -185,6 +185,14 @@ module IOTA
         sendCommand(@commands.storeTransactions(trytes), &callback)
       end
 
+      def checkConsistency(tails, &callback)
+        if !@validator.isArrayOfHashes(tails)
+          return sendData(false, "Invalid tails provided", &callback)
+        end
+
+        sendCommand(@commands.checkConsistency(tails), &callback)
+      end
+
       private
       def sendData(status, data, &callback)
         callback ? callback.call(status, data) : [status, data]

data/lib/iota/api/commands.rb

@@ -60,11 +60,11 @@ module IOTA
         { command: 'getTips' }
       end
 
-      def getTransactionsToApprove(depth)
+      def getTransactionsToApprove(depth, reference = nil)
         {
           command: 'getTransactionsToApprove',
           depth: depth
-        }
+        }.merge(reference.nil? ? {} : { reference: reference })
       end
 
       def attachToTangle(trunkTransaction, branchTransaction, minWeightMagnitude, trytes)
@@ -94,6 +94,13 @@ module IOTA
           trytes: trytes
         }
       end
+
+      def checkConsistency(tails)
+        {
+          command: 'checkConsistency',
+          tails: tails
+        }
+      end
     end
   end
 end

data/lib/iota/api/wrappers.rb

@@ -67,13 +67,15 @@ module IOTA
         end
       end
 
-      def sendTrytes(trytes, depth, minWeightMagnitude, &callback)
+      def sendTrytes(trytes, depth, minWeightMagnitude, options = {}, &callback)
         # Check if correct depth and minWeightMagnitude
         if !@validator.isValue(depth) || !@validator.isValue(minWeightMagnitude)
           return sendData(false, "Invalid inputs provided", &callback)
         end
 
-        getTransactionsToApprove(depth) do |status, approval_data|
+        reference = options[:reference] || options['reference']
+
+        getTransactionsToApprove(depth, reference) do |status, approval_data|
           if !status
             return sendData(false, approval_data, &callback)
           end
@@ -213,7 +215,8 @@ module IOTA
         end
       end
 
-      def replayBundle(tail, depth, minWeightMagnitude, &callback)
+      # Replays or promote transactions based on tail consistency
+      def replayBundle(tail, depth, minWeightMagnitude, forcedReplay = false, &callback)
         # Check if correct tail hash
         if !@validator.isHash(tail)
           return sendData(false, "Invalid trytes provided", &callback)
@@ -224,17 +227,42 @@ module IOTA
           return sendData(false, "Invalid inputs provided", &callback)
         end
 
+        isPromotable = false
+        if !forcedReplay
+          checkConsistency([tail]) do |status, isConsistent|
+            isPromotable = status && isConsistent
+          end
+        end
+
         getBundle(tail) do |status, transactions|
           if !status
             return sendData(false, transactions, &callback)
           end
 
-          bundleTrytes = []
-          transactions.each do |trx|
-            bundleTrytes << @utils.transactionTrytes(trx);
-          end
+          if !isPromotable
+            bundleTrytes = []
+            transactions.each do |trx|
+              bundleTrytes << @utils.transactionTrytes(trx);
+            end
 
-          return sendTrytes(bundleTrytes.reverse, depth, minWeightMagnitude, &callback)
+            return sendTrytes(bundleTrytes.reverse, depth, minWeightMagnitude, &callback)
+          else
+            account = IOTA::Models::Account.new(nil, transactions.first.address, self, @validator, @utils)
+
+            transfers = [{
+              address: '9' * 81,
+              value: 0,
+              message: '',
+              tag: ''
+            }]
+
+            begin
+              account.sendTransfer(depth, minWeightMagnitude, transfers, { reference: tail })
+              return sendData(status, transactions, &callback)
+            rescue => e
+              return sendData(false, e.message, &callback)
+            end
+          end
         end
       end
 
@@ -405,7 +433,7 @@ module IOTA
 
         data = []
 
-        hashes.in_groups_of(batchSize, false) do |group|
+        hashes.each_slice(batchSize) do |group|
           getTrytes(group) do |status, trytes|
             if !status
               return sendData(false, trytes, &callback)

data/lib/iota/models/account.rb

@@ -3,10 +3,10 @@ module IOTA
     class Account < Base
       attr_reader :client, :seed, :latestAddress, :addresses, :transfers, :inputs, :balance
 
-      def initialize(client, seed)
-        @api = client.api
-        @validator = client.validator
-        @utils = client.utils
+      def initialize(client, seed, api = nil, validator = nil, utils = nil)
+        @api = client ? client.api : api
+        @validator = client ? client.validator : validator
+        @utils = client ? client.utils : utils
         @seed = seed.class == String ? Seed.new(seed) : seed
 
         reset
@@ -188,7 +188,7 @@ module IOTA
         end
 
         # Get inputs if we are sending tokens
-        if totalValue
+        if totalValue > 0
           #  Case 1: user provided inputs
           #
           #  Validate the inputs by calling getBalances
@@ -263,7 +263,8 @@ module IOTA
         end
 
         trytes = prepareTransfers(transfers, options)
-        @api.sendTrytes(trytes, depth, minWeightMagnitude) do |status, data|
+
+        @api.sendTrytes(trytes, depth, minWeightMagnitude, options) do |status, data|
           if !status
             raise StandardError, data
           else
@@ -358,8 +359,14 @@ module IOTA
               # Final function for signing inputs
               return signInputs(inputs, bundle, signatureFragments, hmacKey)
             elsif remainder > 0
+              index = 0
+              (0...inputs.length).step(1) do |k|
+                index = [inputs[k].keyIndex, index].max
+              end
+              index += 1
+
               # Generate a new Address by calling getNewAddress
-              address = getNewAddress({security: security})
+              address = getNewAddress({index: index, security: security})
               timestamp = Time.now.utc.to_i
 
               # Remainder bundle entry

data/lib/iota/utils/broker.rb

@@ -97,7 +97,8 @@ module IOTA
           'findTransactions'      =>   'hashes',
           'getTrytes'             =>   'trytes',
           'getInclusionStates'    =>   'states',
-          'attachToTangle'        =>   'trytes'
+          'attachToTangle'        =>   'trytes',
+          'checkConsistency'      =>   'state'
         }
 
         # If correct result and we want to prepare the result

data/lib/iota/version.rb

@@ -1,3 +1,3 @@
 module IOTA
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iota-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Vivek Marakana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler