mixin_bot 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490beec97c1c3ba36f339f4a947f7717ee7eafa0aad01ba7d36c0ad8962af0e2
-  data.tar.gz: e00974b0b39f0002d60ced9f3ad416ce4b0addc63ba2d6e14584fc5b3f64a4c3
+  metadata.gz: 8282148099d4fa3128ae77f40fbefbd5712edeacebbd10fc286055b463427f40
+  data.tar.gz: d8e8b3511fb866dd76004534d2629f6edb362d82177d8a717a5f7a797c532b8e
 SHA512:
-  metadata.gz: ccf975f89a77c9421151ec6235939a9b1e78359253597daa81e70e7e4badd1362e9c617425e547681ac25be72bdad25c0d56334dc9cc9a56b97abe0b08913dd7
-  data.tar.gz: c6d2dabfd14fa960f32549e2ba082d275a618f058b25ab54217e900197d42d10659c48a36e484aff55ed58c92e3355c35a121e599e6b110286bbd9ac3fc06b22
+  metadata.gz: ac472ad54cc28559dec43283aa12691984fb5dd4f1d4dc5c2356b72716cfedd754d209b4b37f7ca4986408e7155523a2a41caeeec140c9ab6dcd00704e7b0d2e
+  data.tar.gz: 414a6e52690819775032c7abd45d2cc4e885bc0d12a195ba87e4d5bd945ebac1eb8ffad7b458d3f3faf7cbfba5cccc157b5c5f6cab1517685dc28e15041389fe

data/lib/mixin_bot.rb

@@ -6,10 +6,10 @@ require 'digest'
 require 'faye/websocket'
 require 'http'
 require 'jose'
-require 'jwt'
 require 'msgpack'
 require 'open3'
 require 'openssl'
+require 'rbnacl'
 require_relative './mixin_bot/api'
 require_relative './mixin_bot/cli'
 require_relative './mixin_bot/version'

data/lib/mixin_bot/api.rb

@@ -25,9 +25,14 @@ module MixinBot
       @client_id = options[:client_id] || MixinBot.client_id
       @client_secret = options[:client_secret] || MixinBot.client_secret
       @session_id = options[:session_id] || MixinBot.session_id
-      @pin_token = Base64.urlsafe_decode64 options[:pin_token] || MixinBot.pin_token
       @client = Client.new(MixinBot.api_host || 'api.mixin.one')
       @blaze_host = MixinBot.blaze_host || 'blaze.mixin.one'
+      @pin_token =
+        begin
+          Base64.urlsafe_decode64 options[:pin_token] || MixinBot.pin_token
+        rescue StandardError
+          ''
+        end
       _private_key = options[:private_key] || MixinBot.private_key
       @private_key =
         if /^-----BEGIN RSA PRIVATE KEY-----/.match? _private_key

data/lib/mixin_bot/api/blaze.rb

@@ -54,7 +54,7 @@ module MixinBot
           end
 
           ws = nil
-          start_blaze_connect(&block) if reconnect
+          start_blaze_connect(&_block) if reconnect
         end
       end
     end

data/lib/mixin_bot/api/multisig.rb

@@ -261,15 +261,21 @@ module MixinBot
 
         outputs = []
         output0 = create_output(receivers: receivers, index: 0)['data']
-        output0['amount'] = format('%<amount>.8f', amount: amount)
-        output0['script'] = build_threshold_script(receivers.length)
-        outputs << output0
+        outputs << {
+          'amount': format('%<amount>.8f', amount: amount),
+          'script': build_threshold_script(receivers.length),
+          'mask': output0['mask'],
+          'keys': output0['keys']
+        }
 
         if input_amount > amount
           output1 = create_output(receivers: senders, index: 1)['data']
-          output1['amount'] = format('%<amount>.8f', amount: input_amount - amount)
-          output1['script'] = build_threshold_script(utxos[0]['threshold'].to_i)
-          outputs << output1
+          outputs << {
+            'amount': format('%<amount>.8f', amount: input_amount - amount),
+            'script': build_threshold_script(threshold.to_i),
+            'mask': output1['mask'],
+            'keys': output1['keys']
+          }
         end
 
         extra = Digest.hexencode memo.to_s.slice(0, 140)

data/lib/mixin_bot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MixinBot
-  VERSION = '0.3.0'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement