mixin_bot 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2493d906df4d0e0619c860f2b8260cb7b461e0c0aff489706e38d2126cf52a
-  data.tar.gz: a8106a0086282b5f8eb09feab36f1885715ba51c09285413dabc66d8fcd6f00d
+  metadata.gz: bec70596fc9cd40814bcdfd8693573173472db142523131f44c28057f7eae2dd
+  data.tar.gz: 52ddbfa9ab68e4340b39c8299383dadf82e14b4ce8dee3c1fd785b5843ac6672
 SHA512:
-  metadata.gz: 30442db3e5c4ac450500fb6c0b09023ac36c249c4b12fa2226bbd438076d7e6f9708ac4a93665524cdc28890d0ff22886ef317f1cac1ff38a393e69ca8e127be
-  data.tar.gz: 827e08df53317fbfb3441ecb476b4d665013eaaff843e6a7ef6f2776da24979ddb72544976efbf28fad4035a34f8ad1d5968df15ecbf4b0f03ba934853db5174
+  metadata.gz: bdf202a7fad3fd4e6101288a0fd821b45f9945047ef03e01177dd72942f7c94af225be54e12ff6a7f1fc092d9939e0defcd8e5d6eba2c7b8b683d510ef486ab5
+  data.tar.gz: 2058403228454b3b1f4764a7a4ea4756e463648650ee9bfabd12073fe88465eb3d7b478a3583cd4e73f829ef60605e8952aff56a706922b19beb00554d2cfbd6

data/lib/mixin_bot.rb

@@ -9,6 +9,7 @@ require 'jose'
 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

@@ -119,19 +119,19 @@ module MixinBot
 
       # pay to the multisig address
       # used for create multisig payment code_id
-      def create_multisig_payment(params)
+      def create_multisig_payment(**kwargs)
         path = '/payments'
         payload = {
-          asset_id: params[:asset_id],
-          amount: params[:amount].to_s,
-          trace_id: params[:trace_id] || SecureRandom.uuid,
-          memo: params[:memo],
+          asset_id: kwargs[:asset_id],
+          amount: kwargs[:amount].to_s,
+          trace_id: kwargs[:trace_id] || SecureRandom.uuid,
+          memo: kwargs[:memo],
           opponent_multisig: {
-            receivers: params[:receivers],
-            threshold: params[:threshold]
+            receivers: kwargs[:receivers],
+            threshold: kwargs[:threshold]
           }
         }
-        access_token = params[:access_token]
+        access_token = kwargs[:access_token]
         access_token ||= access_token('POST', path, payload.to_json)
         authorization = format('Bearer %<access_token>s', access_token: access_token)
         client.post(path, headers: { 'Authorization': authorization }, json: payload)
@@ -166,37 +166,37 @@ module MixinBot
       end
 
       # filter utxo by members, asset_id and threshold
-      def filter_utxos(params)
-        utxos = all_multisigs(access_token: params[:access_token])
+      def filter_utxos(**kwargs)
+        utxos = all_multisigs(access_token: kwargs[:access_token])
 
-        unless params[:members].nil?
+        unless kwargs[:members].nil?
           utxos = utxos.filter(
             &lambda { |utxo|
-              utxo['members'].sort == params[:members].sort
+              utxo['members'].sort == kwargs[:members].sort
             }
           )
         end
 
-        unless params[:asset_id].nil?
+        unless kwargs[:asset_id].nil?
           utxos = utxos.filter(
             &lambda { |utxo|
-              utxo['asset_id'] == params[:asset_id]
+              utxo['asset_id'] == kwargs[:asset_id]
             }
           )
         end
 
-        unless params[:threshold].nil?
+        unless kwargs[:threshold].nil?
           utxos = utxos.filter(
             &lambda { |utxo|
-              utxo['threshold'] == params[:threshold]
+              utxo['threshold'] == kwargs[:threshold]
             }
           )
         end
 
-        unless params[:state].nil?
+        unless kwargs[:state].nil?
           utxos = utxos.filter(
             &lambda { |utxo|
-              utxo['state'] == params[:state]
+              utxo['state'] == kwargs[:state]
             }
           )
         end
@@ -204,7 +204,7 @@ module MixinBot
         utxos
       end
 
-      # params:
+      # kwargs:
       # {
       #   senders: [ uuid ],
       #   receivers: [ uuid ],
@@ -214,16 +214,16 @@ module MixinBot
       #   amount: string / float,
       #   memo: string,
       # }
-      def build_raw_transaction(params)
-        senders        = params[:senders]
-        receivers      = params[:receivers]
-        asset_id       = params[:asset_id]
-        asset_mixin_id = params[:asset_mixin_id]
-        amount         = params[:amount]
-        memo           = params[:memo]
-        threshold      = params[:threshold]
-        access_token   = params[:access_token]
-        utxos          = params[:utxos]
+      def build_raw_transaction(kwargs)
+        senders        = kwargs[:senders]
+        receivers      = kwargs[:receivers]
+        asset_id       = kwargs[:asset_id]
+        asset_mixin_id = kwargs[:asset_mixin_id]
+        amount         = kwargs[:amount]
+        memo           = kwargs[:memo]
+        threshold      = kwargs[:threshold]
+        access_token   = kwargs[:access_token]
+        utxos          = kwargs[:utxos]
 
         raise 'access_token required!' if access_token.nil? && !senders.include?(client_id)
 
@@ -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.1'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-20 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