mixin_bot 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9d0653ed53008afca7e4b5fb60b5121992f4ec1e33d874e7c03610083490e2
-  data.tar.gz: 6c129dc49aa616fbf6de2cb898bb798fcf025cfd5e46f612693fead1c85d0580
+  metadata.gz: '0482fa8ed14e5435679aba1bd40e8f9d13a4db3c4f96f2b7fe97f2639d7d55d1'
+  data.tar.gz: 506032e530c347644b878d1f1ba7a520208ca9c5ee1450351657291af46c9153
 SHA512:
-  metadata.gz: 7738c8d91ce4c6f9b9a13946a8a04443d01f73b85cfa67a5e60e0b5a453111c6b403b08102c1854c2f40b848f0e8ec514de3e0553104fca507b812996027eaf7
-  data.tar.gz: d2d210103d602e87a3e980d5c72bf224194fc54e256047c171e7db0f3be0096926e826d62f80ae4657dce4254473df54335a4cd3aa9ba23ba6eaa39773b5c79e
+  metadata.gz: b855af1cda16ae26a7b224593adabadc5f9636f364ad36bccbcba4117ad631a38ff70abc35c3cac05df81a6bf14235d923029699df8256c8f05b59a0c697d46a
+  data.tar.gz: 7cd57b5eabe7726b5fe4d751e85ad1a4a36754b8b547a0a27baad26ccffff16a7731dc0dd3151be011e872b79a34444a6bd74b22ec550d4e567231a0b85a8552

data/lib/mixin_bot/api/multisig.rb

@@ -156,16 +156,20 @@ module MixinBot
       def build_raw_transaction(**kwargs)
         raise ArgumentError, "#{RAW_TRANSACTION_ARGUMENTS.join(', ')} are needed for build raw transaction" unless RAW_TRANSACTION_ARGUMENTS.all? { |param| kwargs.keys.include? param }
 
-        senders        = kwargs[:senders]
-        receivers      = kwargs[:receivers]
-        amount         = kwargs[:amount]
-        threshold      = kwargs[:threshold]
-        asset_id       = kwargs[:asset_id]
-        asset_mixin_id = kwargs[:asset_mixin_id]
-        utxos          = kwargs[:utxos]
-        memo           = kwargs[:memo]
-        extra          = kwargs[:extra]
-        access_token   = kwargs[:access_token]
+        senders             = kwargs[:senders]
+        threshold           = kwargs[:threshold]
+        receivers           = kwargs[:receivers]
+        receivers_threshold = kwargs[:receivers_threshold]
+        amount              = kwargs[:amount]
+        threshold           = kwargs[:threshold]
+        asset_id            = kwargs[:asset_id]
+        asset_mixin_id      = kwargs[:asset_mixin_id]
+        utxos               = kwargs[:utxos]
+        memo                = kwargs[:memo]
+        extra               = kwargs[:extra]
+        access_token        = kwargs[:access_token]
+        outputs             = kwargs[:outputs] || []
+        hint                = kwargs[:hint]
 
         raise 'access_token required!' if access_token.nil? && !senders.include?(client_id)
 
@@ -193,23 +197,27 @@ module MixinBot
           }
         )
 
-        outputs = []
-        output0 = create_output(receivers: receivers, index: 0)['data']
-        outputs << {
-          'amount': format('%<amount>.8f', amount: amount),
-          'script': build_threshold_script(receivers.length),
-          'mask': output0['mask'],
-          'keys': output0['keys']
-        }
+        if outputs.empty?
+          receivers_threshold = 1 if receivers.size == 1
+          output0 = build_output(
+            receivers: receivers, 
+            index: 0, 
+            amount: amount, 
+            threshold: receivers_threshold,
+            hint: hint
+          )
+          outputs.push output0
 
-        if input_amount > amount
-          output1 = create_output(receivers: senders, index: 1)['data']
-          outputs << {
-            'amount': format('%<amount>.8f', amount: input_amount - amount),
-            'script': build_threshold_script(threshold.to_i),
-            'mask': output1['mask'],
-            'keys': output1['keys']
-          }
+          if input_amount > amount
+            output1 = build_output(
+              receivers: senders, 
+              index: 1, 
+              amount: (input_amount - amount),
+              threshold: threshold,
+              hint: hint
+            )
+            outputs.push output1
+          end
         end
 
         extra = extra || Digest.hexencode(memo.to_s.slice(0, 140))
@@ -225,31 +233,22 @@ module MixinBot
         tx.to_json
       end
 
+      def build_output(receivers:, index:, amount:, threshold:, hint: nil)
+        _output = create_output receivers: receivers, index: index, hint: hint
+        {
+          amount: format('%.8f', amount.to_f),
+          script: build_threshold_script(threshold),
+          mask: _output['mask'],
+          keys: _output['keys']
+        }
+      end
+
       def str_to_bin(str)
         return if str.nil?
 
         str.scan(/../).map(&:hex).pack('c*')
       end
 
-      def build_inputs(inputs)
-        res = []
-        prototype = {
-          'Hash' => nil,
-          'Index' => nil,
-          'Genesis' => nil,
-          'Deposit' => nil,
-          'Mint' => nil
-        }
-        inputs.each do |input|
-          struc = prototype.dup
-          struc['Hash'] = str_to_bin input['hash']
-          struc['Index'] = input['index']
-          res << struc
-        end
-
-        res
-      end
-
       def generate_trace_from_hash(hash, output_index = 0)
         MixinBot::Utils.generate_trace_from_hash hash, output_index
       end

data/lib/mixin_bot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - an-lee