mixin_bot 0.7.8 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d053efb8425d1b2d144834961e60bae9abac2dbd877c0dea1a2aa8bb9bc4541
-  data.tar.gz: e830b155aa0b4bfd509732f7126cfc676b41bfc5425fb5646178ceabbed64c86
+  metadata.gz: 3b4b77d94221e1120da8c18fadd70bcf5898d083e2bd95c469cee8c96084c76f
+  data.tar.gz: '039f44131a984c10b1f527b6c45766a3660af6efc40e2e66e132b46e1cbc8428'
 SHA512:
-  metadata.gz: 901ea75a36eeda0343230b00f9e478f6c2fbe8dd03d9209f78fe7da65e3b09d4a266ca8a08d979c490153e51d761ed2cf47824b485c25d8d7a4e7485efeb0aab
-  data.tar.gz: 44a8d64a5aead528b0949ee6ac33acdd6f7d16f56aaec4ee45f7ef964b8646f5e4baabcada13968bc48468cb3de03babfb1fb47ef19566fe519b6fae10cd4a4f
+  metadata.gz: 22470467c1b5955e2e2352788fecbf14bf307abdba0283796a2b86525660a8f479670135bd9d594b59462a2058956214036025f9881833b57b21f59f28644876
+  data.tar.gz: e88226bd6042e3ff224ff5805d1982df1ee4a6b17186440d3edeae820c9f804e1952b3da83dc2b29258a97f5be7685b6d3e163bbab242d83752e468a0d1a4908

data/lib/mixin_bot/cli/api.rb

@@ -18,7 +18,7 @@ module MixinBot
 
       $ mixinbot api /payments -k ~/.mixinbot/keystore.json -m POST -d '{"asset_id":"965e5c6e-434c-3fa9-b780-c50f43cd955c", "amount":"1", "trace_id": "37f16abb-0640-4d01-9423-a06121732d35", "memo":"test", "opponent_multisig":{"receivers":["0508a116-1239-4e28-b150-85a8e3e6b400", "7ed9292d-7c95-4333-aa48-a8c640064186", "a67c6e87-1c9e-4a1c-b81c-47a9f4f1bff1"], "threshold":2}}'
     LONGDESC
-    option :keystore, type: :string, aliases: '-k', required: true, default: '~/.mixinbot/keystore.json', desc: 'Specify keystore.json file path'
+    option :keystore, type: :string, aliases: '-k', required: true, desc: 'keystore or keystore.json file path'
     option :method, type: :string, aliases: '-m', default: 'GET', desc: 'HTTP method, GET or POST'
     option :params, type: :hash, aliases: '-p', desc: 'HTTP GET params'
     option :data, type: :string, aliases: '-d', default: '{}', desc: 'HTTP POST data'

data/lib/mixin_bot/cli/utils.rb

@@ -3,7 +3,7 @@
 module MixinBot
   class CLI < Thor
     desc 'encrypt PIN', 'encrypt PIN using private key'
-    option :keystore, type: :string, aliases: '-k', required: true, default: '~/.mixinbot/keystore.json', desc: 'Specify keystore.json file path'
+    option :keystore, type: :string, aliases: '-k', required: true, desc: 'keystore or keystore.json file path'
     option :iterator, type: :string, aliases: '-i', desc: 'Iterator'
     def encrypt(pin)
       log api_instance.encrypt_pin options[:pin].to_s, iterator: options[:iterator]

data/lib/mixin_bot/cli.rb

@@ -24,7 +24,7 @@ module MixinBot
       return if options[:keystore].blank?
 
       keystore =
-        if File.exist? options[:keystore].to_s
+        if File.file? options[:keystore]
           File.read options[:keystore]
         else
           options[:keystore]

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

@@ -57,7 +57,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 +99,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 +121,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 +162,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 +171,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 +252,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 +263,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 +427,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 +458,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 +493,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 +516,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 +567,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.8'
+  VERSION = '0.7.11'
 end

data/lib/mixin_bot.rb

@@ -30,12 +30,15 @@ module MixinBot
     @api ||= MixinBot::API.new
   end
 
-  class HttpError < StandardError; end
-  class RequestError < StandardError; end
-  class ResponseError < StandardError; end
-  class UnauthorizedError < StandardError; end
-  class ForbiddenError < StandardError; end
-  class InsufficientBalanceError < StandardError; end
-  class InsufficientPoolError < StandardError; end
-  class PinError < StandardError; 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
+  class InsufficientPoolError < Error; end
+  class PinError < Error; end
 end

metadata

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