mixin_bot 0.3.2 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11583daf7567ac673396219c79076e30a6694848e9d9887cc214c8db3a12c7cb
-  data.tar.gz: 668a5ffd78cfa55628e3fa49f44e0f1e028f74bf850265ec27b8ef7b95dfb49b
+  metadata.gz: ed2fac4118078dffd141f4147ffd7dfea3bc529180cea2a6136622ceafe1b70b
+  data.tar.gz: cd147227f703ecb292819e137cf6c625563bb339fc7da996a2adbc1db0cc466a
 SHA512:
-  metadata.gz: 01be5ec88fcc8f9b6b511d0f0ae6f679075aa965a3993133cdd31c5e7fd463d4c2864075a105c4034d35fad5b787940befa6fd602b486e8433139422475184f4
-  data.tar.gz: 5e86eff08885ea64958d2e79e51de906e2c727cb70b87437927c495933efa90756a0df38e712c40c1e4666fe8c8b6fe81345121fcd2eafa7e35dbb1da03fd4cd
+  metadata.gz: 982f3caa95756397116ea9c3a559f574dc1881be80325d02961c2f8f62943273726714d54f5bf019d4d599be31f8200637822b5f0229a0857253e62add6f69ce
+  data.tar.gz: 2f433ee6e767e1c8a3176f55c8806687dbae560cc4376ca9f2b110644fe444976a209e81f9dab475a1ed28068ac351ca17706e3581cea82784636767a50888d0

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/app.rb

@@ -6,7 +6,7 @@ module MixinBot
       def add_favorite_app(app_id, access_token: nil)
         path = format('/apps/%<id>s/favorite', id: app_id)
 
-        access_token ||= access_token('POST', path, {})
+        access_token ||= access_token('POST', path)
         authorization = format('Bearer %<access_token>s', access_token: access_token)
         client.post(path, headers: { 'Authorization': authorization })
       end
@@ -14,7 +14,7 @@ module MixinBot
       def remove_favorite_app(app_id, access_token: nil)
         path = format('/apps/%<id>s/unfavorite', id: app_id)
 
-        access_token ||= access_token('POST', path, '')
+        access_token ||= access_token('POST', path)
         authorization = format('Bearer %<access_token>s', access_token: access_token)
         client.post(path, headers: { 'Authorization': authorization })
       end

data/lib/mixin_bot/api/auth.rb

@@ -4,7 +4,7 @@ module MixinBot
   class API
     module Auth
       def access_token(method, uri, body = '', exp_in: 600, scp: 'FULL')
-        sig = Digest::SHA256.hexdigest(method + uri + body)
+        sig = Digest::SHA256.hexdigest(method + uri + body.to_s)
         iat = Time.now.utc.to_i
         exp = (Time.now.utc + exp_in).to_i
         jti = SecureRandom.uuid

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.2'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.7
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print