mixin_bot 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 984fd110f61498e0cff51f5df350484ff8c31e87ea09c26ebcda93151609cd36
-  data.tar.gz: ed4c91a108b486d3213e88474c95564776210b6d628cefa0632bea41b10c863f
+  metadata.gz: 3ab14eb3fd1f2187aa59672bb2b1ec7706e0e9a4baa099f3002753d516d405f2
+  data.tar.gz: 1888a0bb071ffc1f0d0c691a5ae4405a9e4ffe9a0c7800c45553a523ced9170e
 SHA512:
-  metadata.gz: f0da3b8af07a5c58670d3dc47777ef4160d2c38e2addf02a6ed9338587fed71f5e04f8203cf83984e54811275d7077eb95c4379125c14dc935920a5b4f129688
-  data.tar.gz: 84661d4ed53646870c000edee35e85a0108c06414aab660dcf736fb2d18082a5cfe90885ed38f47b0970d9e99e75953bc8227cdd1ad8fcbc994a271edbbbfe98
+  metadata.gz: 9b08fc17724391cf02e75b8126dcfe1ef43800510df13be4f51d9c8dfe5ba7113b2a3ce696e258a1a13312fee274dc36ddf61d9d40271387f308fff31f9398e0
+  data.tar.gz: 024e157e76f9bd96d92d265562dc2d1add40b2c7c6539e180a735125eb021d8f89c1eaa8c90ac01b684af1f47810d9aa83fe0c67c79252ad7e1b1d366a1f5f05

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,8 +112,9 @@ module MixinBot
       build_raw_transaction(
         utxos: [collectible],
         senders: collectible['receivers'],
+        senders_threshold: collectible['receivers_threshold'],
         receivers: kwargs['receivers'],
-        threshold: kwargs['threshold'],
+        receivers_threshold: kwargs['receivers_threshold'],
         extra: kwargs["nfo"],
         amount: 1,
         asset_mixin_id: NFT_ASSET_MIXIN_ID

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,22 +146,22 @@ 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]
-        threshold           = kwargs[:threshold]
+        senders_threshold   = kwargs[:senders_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]
@@ -213,7 +213,7 @@ module MixinBot
               receivers: senders, 
               index: 1, 
               amount: (input_amount - amount),
-              threshold: threshold,
+              threshold: senders_threshold,
               hint: hint
             )
             outputs.push output1

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.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport