mixin_bot 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b6a8ef2f385b184baa4c0228bfb9a97867cff65aa625618ce08a7ff0570237
-  data.tar.gz: 4d4f11a16d0bf135c56768f5658ac20e80db652474a9a5b55cb3700f41092196
+  metadata.gz: 9d053efb8425d1b2d144834961e60bae9abac2dbd877c0dea1a2aa8bb9bc4541
+  data.tar.gz: e830b155aa0b4bfd509732f7126cfc676b41bfc5425fb5646178ceabbed64c86
 SHA512:
-  metadata.gz: e1af0e4eb4050880c4ad2593045cc911a3cd078649f4a1cd90d7a820fec799cb9d758a70160af6b94b40ae9c04592c2a2ffa00159535d9b8954095a161ad1329
-  data.tar.gz: 571922c76b219488eb406836cb2d293365d16abe71f4a2fb7039d69ee53b52b71578b2f604264dd0f604d13dcebb53a40db06addef52dfff34cd21941088ae94
+  metadata.gz: 901ea75a36eeda0343230b00f9e478f6c2fbe8dd03d9209f78fe7da65e3b09d4a266ca8a08d979c490153e51d761ed2cf47824b485c25d8d7a4e7485efeb0aab
+  data.tar.gz: 44a8d64a5aead528b0949ee6ac33acdd6f7d16f56aaec4ee45f7ef964b8646f5e4baabcada13968bc48468cb3de03babfb1fb47ef19566fe519b6fae10cd4a4f

data/lib/mixin_bot/api/attachment.rb

@@ -27,15 +27,16 @@ module MixinBot
         HTTP
           .timeout(connect: 5, write: 5, read: 5)
           .request(
-            :put, 
-            attachment.delete('upload_url'), 
+            :put,
+            attachment.delete('upload_url'),
             {
               body: file,
               headers: {
                 'x-amz-acl': 'public-read',
-                'Content-Type': 'application/octet-stream',
+                'Content-Type': 'application/octet-stream'
               }
-          })
+            }
+          )
 
         attachment
       end

data/lib/mixin_bot/api/collectible.rb

@@ -38,6 +38,7 @@ module MixinBot
       COLLECTABLE_REQUEST_ACTIONS = %i[sign unlock].freeze
       def create_collectible_request(action, raw, access_token: nil)
         raise ArgumentError, "request action is limited in #{COLLECTABLE_REQUEST_ACTIONS.join(', ')}" unless COLLECTABLE_REQUEST_ACTIONS.include? action.to_sym
+
         path = '/collectibles/requests'
         payload = {
           action: action,
@@ -107,7 +108,7 @@ module MixinBot
 
       kwargs = kwargs.with_indifferent_access
       collectible = kwargs['collectible']
-      raise "collectible is spent" if collectible['state'] == 'spent'
+      raise 'collectible is spent' if collectible['state'] == 'spent'
 
       build_raw_transaction(
         utxos: [collectible],

data/lib/mixin_bot/api/multisig.rb

@@ -187,9 +187,9 @@ module MixinBot
         if outputs.empty?
           receivers_threshold = 1 if receivers.size == 1
           output0 = build_output(
-            receivers: receivers, 
-            index: 0, 
-            amount: amount, 
+            receivers: receivers,
+            index: 0,
+            amount: amount,
             threshold: receivers_threshold,
             hint: hint
           )
@@ -197,8 +197,8 @@ module MixinBot
 
           if input_amount > amount
             output1 = build_output(
-              receivers: senders, 
-              index: 1, 
+              receivers: senders,
+              index: 1,
               amount: input_amount - amount,
               threshold: senders_threshold,
               hint: hint
@@ -207,7 +207,7 @@ module MixinBot
           end
         end
 
-        extra = extra || Digest.hexencode(memo.to_s.slice(0, 140))
+        extra ||= Digest.hexencode(memo.to_s.slice(0, 140))
         asset = asset_mixin_id || SHA3::Digest::SHA256.hexdigest(asset_id)
         tx = {
           version: 2,

data/lib/mixin_bot/cli/api.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module MixinBot
+  class CLI < Thor
+    desc 'api PATH', 'request PATH of Mixin API'
+    long_desc <<-LONGDESC
+      use `mixinbot api PATH` to request any Mixin API
+
+      Get user infomation:
+
+      $ mixinbot api /me -k ~/.mixinbot/keystore.json
+
+      Search user infomation:
+
+      $ mixinbot api /search/1051445 -k ~/.mixinbot/keystore.json
+
+      Generate a multisig payment:
+
+      $ 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 :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'
+    option :accesstoken, type: :string, aliases: '-t', desc: 'Specify a accesstoken, or will generate by keystore'
+    def api(path)
+      path = "#{path}?#{URI.encode_www_form(options[:params])}" if options[:params].present?
+      payload =
+        begin
+          JSON.parse options[:data]
+        rescue JSON::ParserError => e
+          log UI.fmt("{{x}} #{e.inspect}")
+          {}
+        end
+
+      access_token = options[:accesstoken] || api_instance.access_token(options[:method].upcase, path, payload.blank? ? '' : payload.to_json)
+      authorization = format('Bearer %<access_token>s', access_token: access_token)
+      res = {}
+
+      CLI::UI::Spinner.spin("#{options[:method]} #{path}, payload: #{payload}") do |_spinner|
+        res =
+          case options[:method].downcase.to_sym
+          when :post
+            api_instance.client.post(path, headers: { 'Authorization': authorization }, json: payload)
+          when :get
+            api_instance.client.get(path, headers: { 'Authorization': authorization })
+          end
+      end
+
+      log res['data']
+    end
+  end
+end

data/lib/mixin_bot/cli/utils.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+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 :iterator, type: :string, aliases: '-i', desc: 'Iterator'
+    def encrypt(pin)
+      log api_instance.encrypt_pin options[:pin].to_s, iterator: options[:iterator]
+    end
+
+    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
+    end
+
+    desc 'generatetrace HASH', 'generate trace ID from Tx hash'
+    def generatetrace(hash)
+      log MixinBot::Utils.generate_trace_from_hash(hash)
+    end
+
+    desc 'decodetx TRANSACTION', 'decode raw transaction'
+    def decodetx(transaction)
+      log MixinBot::Utils.decode_raw_transaction(transaction)
+    end
+
+    desc 'nftmemo', 'memo for mint NFT'
+    option :collection, type: :string, required: true, aliases: '-c', desc: 'Collection ID, UUID'
+    option :token, type: :numeric, required: true, aliases: '-t', desc: 'Token ID, Integer'
+    option :hash, type: :string, required: true, aliases: '-h', desc: 'Hash of NFT metadata, 256-bit string'
+    def nftmemo
+      log MixinBot::Utils.nft(options[:collection], options[:token], options[:hash])
+    end
+  end
+end

data/lib/mixin_bot/cli.rb

@@ -5,77 +5,61 @@ require 'cli/ui'
 require 'thor'
 require 'yaml'
 require 'json'
+require_relative './cli/api'
 require_relative './cli/node'
-require_relative './cli/me'
-require_relative './cli/multisig'
+require_relative './cli/utils'
 
 module MixinBot
   class CLI < Thor
     # https://github.com/Shopify/cli-ui
     UI = ::CLI::UI
 
-    class_option :apihost, type: :string, aliases: '-a', desc: 'Specify mixin api host, default as api.mixin.one'
-    class_option :pretty, type: :boolean, aliases: '-p', desc: 'Print output in pretty'
+    class_option :apihost, type: :string, aliases: '-a', default: 'api.mixin.one', desc: 'Specify mixin api host'
+    class_option :pretty, type: :boolean, aliases: '-r', default: true, desc: 'Print output in pretty'
 
-    attr_reader :config, :api
+    attr_reader :keystore, :api_instance
 
     def initialize(*args)
       super
-      if File.exist? options[:config].to_s
-        @config =
-          begin
-            YAML.load_file options[:config]
-          rescue StandardError => e
-            log UI.fmt(
-              format(
-                '{{x}} %<file>s is not a valid .yml file',
-                file: options[:config]
-              )
-            )
-            UI::Frame.open('{{x}}', color: :red) do
-              log e
-            end
-          end
-      elsif options[:config]
-        @confg =
-          begin
-            JSON.parse options[:config]
-          rescue StandardError => e
-            log UI.fmt(
-              format(
-                '{{x}} Failed to parse %<config>s',
-                config: options[:config]
-              )
+      return if options[:keystore].blank?
+
+      keystore =
+        if File.exist? options[:keystore].to_s
+          File.read options[:keystore]
+        else
+          options[:keystore]
+        end
+
+      @keystore =
+        begin
+          JSON.parse keystore
+        rescue JSON::ParserError => e
+          log UI.fmt(
+            format(
+              '{{x}} falied to parse keystore.json: %<keystore>s',
+              keystore: options[:keystore]
             )
-            UI::Frame.open('{{x}}', color: :red) do
-              log e
-            end
-          end
-      end
+          )
+        end
 
-      return unless @config
+      return unless @keystore
 
       MixinBot.api_host = options[:apihost]
-      @api ||=
+      @api_instance ||=
         begin
           MixinBot::API.new(
-            client_id: @config['client_id'],
-            client_secret: @config['client_secret'],
-            session_id: @config['session_id'],
-            pin_token: @config['pin_token'],
-            private_key: @config['private_key'],
-            pin_code: @config['pin_code']
+            client_id: @keystore['client_id'],
+            session_id: @keystore['session_id'],
+            pin_token: @keystore['pin_token'],
+            private_key: @keystore['private_key']
           )
         rescue StandardError => e
-          log UI.fmt '{{x}}: Failed to initialize api, maybe your config is incorrect.'
-          UI.Frame.open('{{x}}', color: :red) do
-            log e
-          end
+          log UI.fmt '{{x}}: Failed to initialize api, maybe your keystore is incorrect.'
         end
     end
 
-    desc 'node', 'mixin node commands helper'
-    subcommand 'node', MixinBot::NodeCLI
+    # desc 'node', 'mixin node commands helper'
+    # subcommand 'node', MixinBot::NodeCLI
 
     desc 'version', 'Distay MixinBot version'
     def version
@@ -88,31 +72,6 @@ module MixinBot
 
     private
 
-    def api_method(method, *args, **params)
-      if api.nil?
-        log UI.fmt '{{x}} MixinBot api not initialized!'
-        return
-      end
-
-      res = if args.empty? && params.empty?
-              api&.public_send method
-            elsif args.empty? && !params.empty?
-              api&.public_send method params
-            elsif !args.empty? && params.empty?
-              api&.public_send method, args
-            else
-              args.push params
-              api&.public_send method, args
-            end
-      log res
-
-      [res, res && res['error'].nil?]
-    rescue MixinBot::Errors => e
-      UI::Frame.open('{{x}}', color: :red) do
-        log e
-      end
-    end
-
     def log(obj)
       if options[:pretty]
         if obj.is_a? String

data/lib/mixin_bot/utils.rb

@@ -171,7 +171,7 @@ module MixinBot
           chain: NFT_MEMO_DEFAULT_CHAIN,
           class: NFT_MEMO_DEFAULT_CLASS,
           collection: collection,
-          token: token_id,
+          token: token_id.to_s,
           extra: hash
         }
 

data/lib/mixin_bot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixin_bot
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - an-lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -293,9 +293,9 @@ files:
 - lib/mixin_bot/api/user.rb
 - lib/mixin_bot/api/withdraw.rb
 - lib/mixin_bot/cli.rb
-- lib/mixin_bot/cli/me.rb
-- lib/mixin_bot/cli/multisig.rb
+- lib/mixin_bot/cli/api.rb
 - lib/mixin_bot/cli/node.rb
+- lib/mixin_bot/cli/utils.rb
 - lib/mixin_bot/client.rb
 - lib/mixin_bot/utils.rb
 - lib/mixin_bot/version.rb

data/lib/mixin_bot/cli/me.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module MixinBot
-  class CLI < Thor
-    desc 'read_me', 'fetch mixin bot profile'
-    option :config, required: true, aliases: '-c'
-    def read_me
-      api_method(:read_me)
-    end
-
-    desc 'read_assets', 'fetch mixin bot assets'
-    option :config, required: true, aliases: '-c'
-    def read_assets
-      api_method(:read_assets)
-    end
-
-    desc 'cal_assets_as_usd', 'fetch mixin bot assets'
-    option :config, required: true, aliases: '-c'
-    def cal_assets_as_usd
-      assets, success = read_assets
-      return unless success
-
-      sum = assets['data'].map(
-        &lambda { |asset|
-           asset['balance'].to_f * asset['price_usd'].to_f
-         }
-      ).sum
-      UI::Frame.open('USD') do
-        log sum
-      end
-    end
-
-    desc 'read_asset', 'fetch specific asset of mixin bot'
-    option :config, required: true, aliases: '-c'
-    option :assetid, required: true, aliases: '-s'
-    def read_asset
-      api_method(:read_asset, options[:assetid])
-    end
-  end
-end

data/lib/mixin_bot/cli/multisig.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module MixinBot
-  class CLI < Thor
-    desc 'get_all_multisigs', 'fetch all utxos'
-    option :config, required: true, aliases: '-c'
-    def all_multisigs
-      api_method(:get_all_multisigs)
-    end
-  end
-end