mixin_bot 0.7.9 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89684bcccabf1621b82773b9d017e8ec47faac2402ddc6b7238d591c9099705
-  data.tar.gz: 05d1e90439562b61ba03b3874945168fa4f838f5d48b57fbacb1738cf648a9ff
+  metadata.gz: 13c4f9ce40bbee325eed32c0a8a3c928911e3f3f2fc1acf3481b8a483d768e0d
+  data.tar.gz: 916d23e4ddc9bcc9f7eea588b9b00cd46a099cbc5d7ed955f74ec45077c41f00
 SHA512:
-  metadata.gz: f689d32c959651bbf71426f1c68942bc1ad0d17147885f42cfa5606e5a1ffecbf02416e57f8c8aa13cac214e2124bc207f6c51adb91e3962adc474d2e251e029
-  data.tar.gz: 3d99fd38161f4c1d326b7a32d63400270df4a3c7128070ed7d8abe8bb6f9947c31522963fb967ca4ae30b86d0a38882f911da79e639d7184ded9e36ce31df5a5
+  metadata.gz: 5283924b083f585b4a49486f39ecf668db803b3a3f975293bd421d5edbf92c370decaa113fc3893f2c79eaffc9f78c45aa2257d93ec4b1ee0eabcd5163c1cada
+  data.tar.gz: 72208f22e2b8a9a26814ca2a4bc2f260e461cc25f9231746ede4fbd638519242b8fada5604e325b467acd16be05eb88809053300067d7f54d0b56cd140033b46

data/lib/mixin_bot/cli/utils.rb

@@ -11,13 +11,7 @@ module MixinBot
 
     desc 'unique UUIDS', 'generate unique UUID for two or more UUIDs'
     def unique(*uuids)
-      uuids.sort
-      r = uuids.first
-      uuids.each_with_index do |uuid, i|
-        r = MixinBot::Utils.unique_uuid(r, uuid) if i.positive?
-      end
-
-      log r
+      log MixinBot::Utils.unique_uuid *uuids
     end
 
     desc 'generatetrace HASH', 'generate trace ID from Tx hash'

data/lib/mixin_bot/client.rb

@@ -76,7 +76,9 @@ module MixinBot
             raise UnauthorizedError, errmsg
           when 403, 20116, 10002, 429
             raise ForbiddenError, errmsg
-          when 400, 404, 10006, 20133, 500, 7000, 7001
+          when 404
+            raise NotFoundError, errmsg
+          when 400, 10006, 20133, 500, 7000, 7001
             raise ResponseError, errmsg
           when 20117
             raise InsufficientBalanceError, errmsg

data/lib/mixin_bot/utils.rb

@@ -17,7 +17,7 @@ module MixinBot
       NFT_MASK = 0x00
       NULL_UUID = '00000000-0000-0000-0000-000000000000'
 
-      def unique_uuid(uuid_1, uuid_2)
+      def generate_unique_uuid(uuid_1, uuid_2)
         md5 = Digest::MD5.new
         md5 << [uuid_1, uuid_2].min
         md5 << [uuid_1, uuid_2].max
@@ -37,6 +37,16 @@ module MixinBot
         )
       end
 
+      def unique_uuid(*uuids)
+        uuids.sort
+        r = uuids.first
+        uuids.each_with_index do |uuid, i|
+          r = MixinBot::Utils.generate_unique_uuid(r, uuid) if i.positive?
+        end
+
+        r
+      end
+
       def generate_trace_from_hash(hash, output_index = 0)
         md5 = Digest::MD5.new
         md5 << hash
@@ -57,7 +67,7 @@ module MixinBot
         if tx.is_a? String
           tx = JSON.parse tx
         end
-        raise "#{tx} is not a valid json" unless tx.is_a? Hash
+        raise ArgumentError, "#{tx} is not a valid json" unless tx.is_a? Hash
 
         tx = tx.with_indifferent_access
         bytes = []
@@ -99,7 +109,7 @@ module MixinBot
         tx = {}
 
         magic = bytes.shift(2)
-        raise 'Not valid raw' unless magic == MAGIC
+        raise ArgumentError, 'Not valid raw' unless magic == MAGIC
 
         version = bytes.shift(2)
         tx['version'] = bytes_to_int version
@@ -121,7 +131,7 @@ module MixinBot
           # aggregated
           aggregated = {}
 
-          raise 'invalid aggregated' unless bytes.shift(2).reverse.pack('C*').unpack1('S*') == AGGREGATED_SIGNATURE_PREFIX
+          raise ArgumentError, 'invalid aggregated' unless bytes.shift(2).reverse.pack('C*').unpack1('S*') == AGGREGATED_SIGNATURE_PREFIX
 
           aggregated['signature'] = bytes.shift(64).pack('C*').unpack1('H*')
 
@@ -162,7 +172,7 @@ module MixinBot
 
       def nft_memo_hash(collection, token_id, hash)
         collection = NULL_UUID if collection.empty?
-        raise 'hash must be 256-bit string' unless hash.is_a?(String) && hash.size == 64
+        raise ArgumentError, 'hash must be 256-bit string' unless hash.is_a?(String) && hash.size == 64
 
         memo = {
           prefix: NFT_MEMO_PREFIX,
@@ -171,14 +181,14 @@ module MixinBot
           chain: NFT_MEMO_DEFAULT_CHAIN,
           class: NFT_MEMO_DEFAULT_CLASS,
           collection: collection,
-          token: token_id.to_s,
+          token: token_id.to_i,
           extra: hash
         }
 
         mark = [0]
         mark.map do |index|
           if index >= 64
-            raise "invalid NFO memo index #{index}"
+            raise ArgumentError, "invalid NFO memo index #{index}"
           end
           memo[:mask] = memo[:mask] ^ (1 << index)
         end
@@ -252,8 +262,8 @@ module MixinBot
       private
 
       def encode_int(int)
-        raise "only support int #{int}" unless int.is_a?(Integer)
-        raise "int #{int} is larger than MAX_ENCODE_INT #{MAX_ENCODE_INT}" if int > MAX_ENCODE_INT
+        raise ArgumentError, "only support int #{int}" unless int.is_a?(Integer)
+        raise ArgumentError,"int #{int} is larger than MAX_ENCODE_INT #{MAX_ENCODE_INT}" if int > MAX_ENCODE_INT
 
         [int].pack('S*').bytes.reverse
       end
@@ -263,7 +273,7 @@ module MixinBot
       end
 
       def bytes_of(int)
-        raise 'not integer' unless int.is_a?(Integer)
+        raise ArgumentError, 'not integer' unless int.is_a?(Integer)
 
         bytes = []
         loop do
@@ -427,8 +437,8 @@ module MixinBot
           bytes += NULL_BYTES
         else
           signers.each do |sig, i|
-            raise 'signers not sorted' if i > 0 && sig <= signers[i - 1]
-            raise 'signers not sorted' if sig > MAX_ENCODE_INT
+            raise ArgumentError, 'signers not sorted' if i > 0 && sig <= signers[i - 1]
+            raise ArgumentError, 'signers not sorted' if sig > MAX_ENCODE_INT
           end
 
           max = signers.last
@@ -458,7 +468,7 @@ module MixinBot
             0
           end
 
-        raise 'signatures overflow' if sl == MAX_ENCODE_INT
+        raise ArgumentError, 'signatures overflow' if sl == MAX_ENCODE_INT
         bytes += encode_int sl
 
         if sl > 0
@@ -493,7 +503,7 @@ module MixinBot
 
           if bytes[...2] != NULL_BYTES
             magic = bytes.shift(2)
-            raise 'Not valid input' unless magic == MAGIC
+            raise ArgumentError, 'Not valid input' unless magic == MAGIC
 
             deposit = {}
             deposit['chain'] = bytes.shift(32).pack('C*').unpack1('H*')
@@ -516,7 +526,7 @@ module MixinBot
 
           if bytes[...2] != NULL_BYTES
             magic = bytes.shift(2)
-            raise 'Not valid input' unless magic == MAGIC
+            raise ArgumentError, 'Not valid input' unless magic == MAGIC
 
             mint = {}
             if bytes[...2] != NULL_BYTES
@@ -567,7 +577,7 @@ module MixinBot
 
           if bytes[...2] != NULL_BYTES
             magic = bytes.shift(2)
-            raise 'Not valid output' unless magic == MAGIC
+            raise ArgumentError, 'Not valid output' unless magic == MAGIC
 
             withdraw = {}
 

data/lib/mixin_bot/version.rb

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

data/lib/mixin_bot.rb

@@ -31,9 +31,11 @@ module MixinBot
   end
 
   class Error < StandardError; end
+  class ArgumentError < StandardError; end
   class HttpError < Error; end
   class RequestError < Error; end
   class ResponseError < Error; end
+  class NotFoundError < Error; end
   class UnauthorizedError < Error; end
   class ForbiddenError < Error; end
   class InsufficientBalanceError < Error; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.12
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport