mixin_bot 0.6.2 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9d0653ed53008afca7e4b5fb60b5121992f4ec1e33d874e7c03610083490e2
-  data.tar.gz: 6c129dc49aa616fbf6de2cb898bb798fcf025cfd5e46f612693fead1c85d0580
+  metadata.gz: c1c0fbeabe6a358600bd80d72f66d5c6b80e821cfe6f825d5ca1fea0a760b21f
+  data.tar.gz: f6145d9b52a375c483d2e9245de73af120ff8f799c3385e63ca8c4351576bf7f
 SHA512:
-  metadata.gz: 7738c8d91ce4c6f9b9a13946a8a04443d01f73b85cfa67a5e60e0b5a453111c6b403b08102c1854c2f40b848f0e8ec514de3e0553104fca507b812996027eaf7
-  data.tar.gz: d2d210103d602e87a3e980d5c72bf224194fc54e256047c171e7db0f3be0096926e826d62f80ae4657dce4254473df54335a4cd3aa9ba23ba6eaa39773b5c79e
+  metadata.gz: 3b5a1d53e447d0a69ab2d6e7eb4d0f326605ef69b08cbefa4f9e4161aac3b52f74db91fc3da009110c1314050c484d5d6abd89a611717a85720e1a347d760c1a
+  data.tar.gz: 9ccc513bea19199e6070d04fc95f0c29cdc4371dc167a3990b7645c31cc855eea93a3bac061fac4280c9b36b869b7cae8cc80e999472e36562cfd5a35b8ea8c4

data/lib/mixin_bot/api/collectible.rb

@@ -101,7 +101,7 @@ module MixinBot
     #   receivers_threshold: 1,
     #   state: 'unspent'
     # }
-    COLLECTIBLE_TRANSACTION_ARGUMENTS = %i[collectible nfo receivers threshold].freeze
+    COLLECTIBLE_TRANSACTION_ARGUMENTS = %i[collectible nfo receivers receivers_threshold].freeze
     def build_collectible_transaction(**kwargs)
       raise ArgumentError, "#{COLLECTIBLE_TRANSACTION_ARGUMENTS.join(', ')} are needed for build collectible transaction" unless COLLECTIBLE_TRANSACTION_ARGUMENTS.all? { |param| kwargs.keys.include? param }
 
@@ -112,11 +112,13 @@ module MixinBot
       build_raw_transaction(
         utxos: [collectible],
         senders: collectible['receivers'],
+        senders_threshold: collectible['receivers_threshold'],
         receivers: kwargs['receivers'],
-        threshold: kwargs['threshold'],
-        extra: kwargs["nfo"],
+        receivers_threshold: kwargs['receivers_threshold'],
+        extra: kwargs['nfo'],
         amount: 1,
-        asset_mixin_id: NFT_ASSET_MIXIN_ID
+        asset_mixin_id: NFT_ASSET_MIXIN_ID,
+        access_token: kwargs['access_token'],
       )
     end
 

data/lib/mixin_bot/api/conversation.rb

@@ -123,6 +123,7 @@ module MixinBot
       end
 
       def unique_uuid(user_id, opponent_id = nil)
+        opponent_id ||= client_id
         MixinBot::Utils.unique_uuid user_id, opponent_id
       end
       alias unique_conversation_id unique_uuid

data/lib/mixin_bot/api/multisig.rb

@@ -146,26 +146,30 @@ module MixinBot
       # kwargs:
       # {
       #   senders: [ uuid ],
+      #   senders_threshold: integer,
       #   receivers: [ uuid ],
-      #   threshold: integer,
+      #   receivers_threshold: integer,
       #   asset_id: uuid,
       #   amount: string / float,
       #   memo: string,
       # }
-      RAW_TRANSACTION_ARGUMENTS = %i[utxos senders receivers amount threshold].freeze
+      RAW_TRANSACTION_ARGUMENTS = %i[utxos senders senders_threshold receivers receivers_threshold amount].freeze
       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]
+        senders_threshold   = kwargs[:senders_threshold]
+        receivers           = kwargs[:receivers]
+        receivers_threshold = kwargs[:receivers_threshold]
+        amount              = kwargs[:amount]
+        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: senders_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/utils.rb

@@ -17,11 +17,10 @@ module MixinBot
       NFT_MASK = 0x00
       NULL_UUID = '00000000-0000-0000-0000-000000000000'
 
-      def unique_uuid(user_id, opponent_id = nil)
-        opponent_id ||= client_id
+      def unique_uuid(uuid_1, uuid_2)
         md5 = Digest::MD5.new
-        md5 << [user_id, opponent_id].min
-        md5 << [user_id, opponent_id].max
+        md5 << [uuid_1, uuid_2].min
+        md5 << [uuid_1, uuid_2].max
         digest = md5.digest
         digest6 = (digest[6].ord & 0x0f | 0x30).chr
         digest8 = (digest[8].ord & 0x3f | 0x80).chr

data/lib/mixin_bot/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.6
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement