mixin_bot 0.7.3 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1380a5f8ac4dfc43535c076c71d5cf56bb33c6397678b2fec9f8ee57363856
-  data.tar.gz: 57f9a232369a358340bd2f631590436290aa53d86ca48a23083e1257a0a20792
+  metadata.gz: a6b6a8ef2f385b184baa4c0228bfb9a97867cff65aa625618ce08a7ff0570237
+  data.tar.gz: 4d4f11a16d0bf135c56768f5658ac20e80db652474a9a5b55cb3700f41092196
 SHA512:
-  metadata.gz: 7611839592fcc990af4de58b12760863d647b4d12dd411901313e5bf58f4b459e14ef4d39e4f020e663c1c2d243c7a97b62cb32c20892f299fe49d70f4985675
-  data.tar.gz: a7fb7e2b860623e48d13b380ad7aa94346840ca04d809b36cdeb35d967462986a638e3e110eb31229eef39aacce7f263d6ec1e26cbfb67b516cf0ed69ee5b040
+  metadata.gz: e1af0e4eb4050880c4ad2593045cc911a3cd078649f4a1cd90d7a820fec799cb9d758a70160af6b94b40ae9c04592c2a2ffa00159535d9b8954095a161ad1329
+  data.tar.gz: 571922c76b219488eb406836cb2d293365d16abe71f4a2fb7039d69ee53b52b71578b2f604264dd0f604d13dcebb53a40db06addef52dfff34cd21941088ae94

data/lib/mixin_bot/api/multisig.rb

@@ -100,7 +100,7 @@ module MixinBot
         path = '/payments'
         payload = {
           asset_id: kwargs[:asset_id],
-          amount: kwargs[:amount].to_s,
+          amount: format('%.8f', kwargs[:amount].to_d.to_r),
           trace_id: kwargs[:trace_id] || SecureRandom.uuid,
           memo: kwargs[:memo],
           opponent_multisig: {
@@ -160,12 +160,12 @@ module MixinBot
 
         raise 'access_token required!' if access_token.nil? && !senders.include?(client_id)
 
-        amount = amount.to_f.floor(8)
+        amount = amount.to_d.round(8)
         input_amount = utxos.map(
           &lambda { |utxo|
-            utxo['amount'].to_f
+            utxo['amount'].to_d
           }
-        ).sum.floor(8)
+        ).sum
 
         if input_amount < amount
           raise format(
@@ -199,7 +199,7 @@ module MixinBot
             output1 = build_output(
               receivers: senders, 
               index: 1, 
-              amount: (input_amount - amount).floor(8),
+              amount: input_amount - amount,
               threshold: senders_threshold,
               hint: hint
             )
@@ -223,7 +223,7 @@ module MixinBot
       def build_output(receivers:, index:, amount:, threshold:, hint: nil)
         _output = create_output receivers: receivers, index: index, hint: hint
         {
-          amount: amount.to_f.floor(8).to_s,
+          amount: format('%.8f', amount.to_d.to_r),
           script: build_threshold_script(threshold),
           mask: _output['mask'],
           keys: _output['keys']

data/lib/mixin_bot/api/transaction.rb

@@ -10,7 +10,7 @@ module MixinBot
         asset_id = options[:asset_id]
         receivers = options[:receivers]
         threshold = options[:threshold]
-        amount = options[:amount].to_f
+        amount = options[:amount].to_d
         memo = options[:memo]
         trace_id = options[:trace_id] || SecureRandom.uuid
         encrypted_pin = options[:encrypted_pin] || encrypt_pin(pin)
@@ -23,7 +23,7 @@ module MixinBot
             threshold: threshold
           },
           pin: encrypted_pin,
-          amount: format('%.8f', amount),
+          amount: format('%.8f', amount.to_r),
           trace_id: trace_id,
           memo: memo
         }
@@ -40,7 +40,7 @@ module MixinBot
 
         asset_id = options[:asset_id]
         opponent_key = options[:opponent_key]
-        amount = options[:amount].to_f
+        amount = options[:amount].to_d
         memo = options[:memo]
         trace_id = options[:trace_id] || SecureRandom.uuid
         encrypted_pin = options[:encrypted_pin] || encrypt_pin(pin)
@@ -50,7 +50,7 @@ module MixinBot
           asset_id: asset_id,
           opponent_key: opponent_key,
           pin: encrypted_pin,
-          amount: format('%.8f', amount),
+          amount: format('%.8f', amount.to_r),
           trace_id: trace_id,
           memo: memo
         }

data/lib/mixin_bot/api/transfer.rb

@@ -9,7 +9,7 @@ module MixinBot
 
         asset_id = options[:asset_id]
         opponent_id = options[:opponent_id]
-        amount = options[:amount].to_f
+        amount = options[:amount].to_d
         memo = options[:memo]
         trace_id = options[:trace_id] || SecureRandom.uuid
         encrypted_pin = options[:encrypted_pin] || encrypt_pin(pin)
@@ -19,7 +19,7 @@ module MixinBot
           asset_id: asset_id,
           opponent_id: opponent_id,
           pin: encrypted_pin,
-          amount: format('%.8f', amount),
+          amount: format('%.8f', amount.to_r),
           trace_id: trace_id,
           memo: memo
         }

data/lib/mixin_bot/utils.rb

@@ -160,9 +160,9 @@ module MixinBot
         tx
       end
 
-      def nft_memo_hash(collection, token_id, meta)
+      def nft_memo_hash(collection, token_id, hash)
         collection = NULL_UUID if collection.empty?
-        meta = meta.to_json if meta.is_a?(Hash)
+        raise 'hash must be 256-bit string' unless hash.is_a?(String) && hash.size == 64
 
         memo = {
           prefix: NFT_MEMO_PREFIX,
@@ -172,7 +172,7 @@ module MixinBot
           class: NFT_MEMO_DEFAULT_CLASS,
           collection: collection,
           token: token_id,
-          extra: SHA3::Digest::SHA256.hexdigest(meta)
+          extra: hash
         }
 
         mark = [0]
@@ -186,8 +186,8 @@ module MixinBot
         memo
       end
 
-      def nft_memo(collection, token_id, meta)
-        encode_nft_memo nft_memo_hash(collection, token_id, meta)
+      def nft_memo(collection, token_id, hash)
+        encode_nft_memo nft_memo_hash(collection, token_id, hash)
       end
 
       def encode_nft_memo(memo)

data/lib/mixin_bot/version.rb

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

data/lib/mixin_bot.rb

@@ -2,8 +2,10 @@
 
 # third-party dependencies
 require 'English'
-require 'active_support/core_ext/hash'
+require 'active_support'
 require 'base64'
+require 'bigdecimal'
+require 'bigdecimal/util'
 require 'digest'
 require 'faye/websocket'
 require 'http'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.7
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport