trident_assistant 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faafb75ae81c3fb5817c1859ec5a745a9789496cbf6389bae0f33988efc80b8f
-  data.tar.gz: 6baa5f0723e33045b3692ee059f6b6cdfcd838ab032882f61297579de4593885
+  metadata.gz: de7cf235f053d71b3bc4eb821255f42bf92311d387a4642ed6b22cce1955b55a
+  data.tar.gz: d7cf3912ba6a2f01d9db67fa41da73be4d9301fa93b77ccc569f2d49632a5c24
 SHA512:
-  metadata.gz: c7fcd3b8706fb80d375d0d9ffea6ac8f21cdbac24cd32bbe9e03074cf262d572b72312ca2abb19b8b61c6a17d5b39bab9df3acf4b33e6c48727048c5a58acb65
-  data.tar.gz: 27eebdde0f3996ef85ba7daa2f722de271035fed6c71476eb986a8611fc224393fcd6aea107128a8e469d1b40f33d12bede657858977a4b79a4603f32e8aa3f6
+  metadata.gz: a1ff15e0276ab20e2edaf987e62951f00b04b63113b63223da2a6561f1f229cb077995e2b7016b01d03a99d85df3939385a2ff4e803c98bb9433cd51175d25f0
+  data.tar.gz: 19f4d1812f6894cf06c371ee5a97b6f3be5b1413789ad19a679fd7ec1b8364b7e267765b1a3f78a714f4f1308c38f24103cca4281c6d14ba40d4acb0fcd818dc

data/lib/trident_assistant/api/collectible.rb

@@ -11,14 +11,14 @@ module TridentAssistant
         client
           .get(
             "api/collectibles",
-            headers: {
-              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-            },
-            params: {
+            {
               collection_id: kwargs[:collection_id],
               type: kwargs[:type],
               page: kwargs[:page],
               query: kwargs[:query]
+            },
+            {
+              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
             }
           )
       end
@@ -121,7 +121,7 @@ module TridentAssistant
           tx = mixin_bot.sign_raw_transaction raw
 
           request = mixin_bot.create_sign_collectible_request tx
-          sign = mixin_bot.sign_collectible_request request["request_id"], keystore[:pin]
+          sign = mixin_bot.sign_collectible_request request["request_id"], keystore[:spend_key] || keystore[:pin]
           mixin_bot.send_raw_transaction sign["raw_transaction"]
         end
       end

data/lib/trident_assistant/api/collection.rb

@@ -13,11 +13,11 @@ module TridentAssistant
       def collections(**kwargs)
         client.get(
           "api/collections",
-          headers: {
-            Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-          },
-          params: {
+          {
             page: kwargs[:page]
+          },
+          {
+            Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
           }
         )
       end
@@ -27,10 +27,7 @@ module TridentAssistant
         client
           .post(
             "api/collections",
-            headers: {
-              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-            },
-            json: {
+            {
               name: kwargs[:name],
               symbol: kwargs[:symbol],
               description: kwargs[:description],
@@ -38,6 +35,9 @@ module TridentAssistant
               split: kwargs[:split].to_f.round(4),
               icon_base64: kwargs[:icon_base64],
               icon_url: kwargs[:icon_url]
+            },
+            {
+              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
             }
           )
       end
@@ -47,15 +47,15 @@ module TridentAssistant
         client
           .put(
             "api/collections/#{id}",
-            headers: {
-              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-            },
-            json: {
+            {
               description: kwargs[:description],
               external_url: kwargs[:external_url],
               icon_base64: kwargs[:icon_base64],
               icon_url: kwargs[:icon_url]
-            }.compact
+            }.compact,
+            {
+              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
+            }
           )
       end
     end

data/lib/trident_assistant/api/metadata.rb

@@ -12,12 +12,12 @@ module TridentAssistant
         client
           .post(
             "api/collectibles",
-            headers: {
-              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-            },
-            json: {
+            {
               metadata: metadata,
               metahash: metahash
+            },
+            {
+              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
             }
           )
       end

data/lib/trident_assistant/api/order.rb

@@ -8,19 +8,19 @@ module TridentAssistant
       MINIMUM_AMOUNT = 0.000_000_01
 
       def orders(**kwargs)
-        authorization = mixin_bot ? mixin_bot.access_token("GET", "/me") : ""
+        authorization = mixin_bot ? mixin_bot.access_token("GET", "/me", "") : ""
         client.get(
           "api/orders",
-          headers: {
-            Authorization: "Bearer #{authorization}"
-          },
-          params: {
+          {
             collection_id: kwargs[:collection_id],
             metahash: kwargs[:metahash],
             state: kwargs[:state],
             type: kwargs[:type],
             maker_id: kwargs[:maker_id],
             page: kwargs[:page]
+          },
+          {
+            Authorization: "Bearer #{authorization}"
           }
         )
       end
@@ -29,8 +29,9 @@ module TridentAssistant
         client
           .get(
             "api/orders/#{id}",
-            headers: {
-              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
+            nil,
+            {
+              Authorization: "Bearer #{mixin_bot.access_token("GET", "/me", "")}"
             }
           )
       end
@@ -54,14 +55,12 @@ module TridentAssistant
 
         mixin_bot.create_multisig_transaction(
           keystore[:pin],
-          {
-            asset_id: EXCHANGE_ASSET_ID,
-            trace_id: trace_id,
-            amount: MINIMUM_AMOUNT,
-            memo: memo.encode,
-            receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
-            threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
-          }
+          asset_id: EXCHANGE_ASSET_ID,
+          trace_id: trace_id,
+          amount: MINIMUM_AMOUNT,
+          memo: memo.encode,
+          receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
+          threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
         )
       end
 
@@ -85,14 +84,12 @@ module TridentAssistant
 
         mixin_bot.create_multisig_transaction(
           keystore[:pin],
-          {
-            asset_id: EXCHANGE_ASSET_ID,
-            trace_id: trace_id,
-            amount: MINIMUM_AMOUNT,
-            memo: memo.encode,
-            receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
-            threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
-          }
+          asset_id: EXCHANGE_ASSET_ID,
+          trace_id: trace_id,
+          amount: MINIMUM_AMOUNT,
+          memo: memo.encode,
+          receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
+          threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
         )
       end
 
@@ -114,40 +111,36 @@ module TridentAssistant
 
         mixin_bot.create_multisig_transaction(
           keystore[:pin],
-          {
-            asset_id: kwargs[:asset_id],
-            trace_id: trace_id,
-            amount: kwargs[:price],
-            memo: memo.encode,
-            receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
-            threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
-          }
+          asset_id: kwargs[:asset_id],
+          trace_id: trace_id,
+          amount: kwargs[:price],
+          memo: memo.encode,
+          receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
+          threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
         )
       end
 
       def fill_order(order_id)
         info = order order_id
-        raise "Order state: #{info["state"]}" if info["state"] != "open"
+        raise ForbiddenError, "Order state: #{info["state"]}" if info["state"] != "open"
 
         memo = TridentAssistant::Utils::Memo.new(type: "F", order_id: order_id, token_id: info["token_id"])
 
         trace_id = SecureRandom.uuid
         mixin_bot.create_multisig_transaction(
           keystore[:pin],
-          {
-            asset_id: info["type"] == "BidOrder" ? EXCHANGE_ASSET_ID : info["asset_id"],
-            trace_id: trace_id,
-            amount: info["type"] == "BidOrder" ? MINIMUM_AMOUNT : info["price"],
-            memo: memo.encode,
-            receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
-            threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
-          }
+          asset_id: info["type"] == "BidOrder" ? EXCHANGE_ASSET_ID : info["asset_id"],
+          trace_id: trace_id,
+          amount: info["type"] == "BidOrder" ? MINIMUM_AMOUNT : info["price"],
+          memo: memo.encode,
+          receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
+          threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
         )
       end
 
       def cancel_order(order_id)
         info = order order_id
-        raise ForbiddenError, "Order maker: #{info["maker"]["id"]}" if info.dig("maker", "id") != mixin_bot.client_id
+        raise ForbiddenError, "Order maker: #{info["maker"]["id"]}" if info.dig("maker", "id") != mixin_bot.app_id
         raise ForbiddenError, "Order state: #{info["state"]}" if info["state"] != "open"
 
         memo = TridentAssistant::Utils::Memo.new(type: "C", order_id: order_id, token_id: info["token_id"])
@@ -155,14 +148,12 @@ module TridentAssistant
         trace_id = SecureRandom.uuid
         mixin_bot.create_multisig_transaction(
           keystore[:pin],
-          {
-            asset_id: EXCHANGE_ASSET_ID,
-            trace_id: trace_id,
-            amount: MINIMUM_AMOUNT,
-            memo: memo.encode,
-            receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
-            threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
-          }
+          asset_id: EXCHANGE_ASSET_ID,
+          trace_id: trace_id,
+          amount: MINIMUM_AMOUNT,
+          memo: memo.encode,
+          receivers: TridentAssistant::Utils::TRIDENT_MTG[:members],
+          threshold: TridentAssistant::Utils::TRIDENT_MTG[:threshold]
         )
       end
     end

data/lib/trident_assistant/api.rb

@@ -17,7 +17,7 @@ module TridentAssistant
     attr_reader :mixin_bot, :client, :keystore
 
     def initialize(**args)
-      @client = Client.new endpoint: args[:endpoint]
+      @client = Client.new endpoint: args[:endpoint], debug: args[:debug]
       return if args[:keystore].blank?
 
       @keystore = TridentAssistant::Utils.parse_json args[:keystore]

data/lib/trident_assistant/cli/metadata.rb

@@ -11,7 +11,7 @@ module TridentAssistant
       desc "new", "generate a new metadata"
       option :keystore, type: :string, aliases: "k", required: true, desc: "keystore or keystore.json file of Mixin bot"
       def new
-        creator_id = api.mixin_bot.client_id
+        creator_id = api.mixin_bot.config.app_id
         creator_name = api.mixin_bot.me["full_name"]
         creator_royalty = UI.ask("Please input creator royalty, 0.0 ~ 0.1", default: "0.0")
         raise InvalidError, "Royalty must in 0.0 ~ 0.1" unless (0..0.1).include?(creator_royalty.to_f)
@@ -20,7 +20,7 @@ module TridentAssistant
         collection = api.collection collection_id
         raise InvalidError, "Cannot find collection #{collection_id}" if collection.blank?
 
-        if collection["creator"]&.[]("id") != api.mixin_bot.client_id
+        if collection["creator"]&.[]("id") != api.mixin_bot.config.app_id
           raise InvalidError,
                 "Unauthorized to mint in #{collection_id}"
         end

data/lib/trident_assistant/cli/nfo.rb

@@ -59,7 +59,7 @@ module TridentAssistant
         metadata.validate!
         log UI.fmt("{{v}} metadata validated")
 
-        raise "Creator ID incompatible with keystore" if metadata.creator[:id] != api.mixin_bot.client_id
+        raise "Creator ID incompatible with keystore" if metadata.creator[:id] != api.mixin_bot.config.app_id
 
         # upload metadata
         if data.dig("_mint", "metahash").blank?
@@ -91,14 +91,12 @@ module TridentAssistant
           payment =
             api.mixin_bot.create_multisig_transaction(
               api.keystore[:pin],
-              {
-                asset_id: TridentAssistant::Utils::MINT_ASSET_ID,
-                trace_id: trace_id,
-                amount: TridentAssistant::Utils::MINT_AMOUNT,
-                memo: memo,
-                receivers: TridentAssistant::Utils::NFO_MTG[:members],
-                threshold: TridentAssistant::Utils::NFO_MTG[:threshold]
-              }
+              asset_id: TridentAssistant::Utils::MINT_ASSET_ID,
+              trace_id: trace_id,
+              amount: TridentAssistant::Utils::MINT_AMOUNT,
+              memo: memo,
+              receivers: TridentAssistant::Utils::NFO_MTG[:members],
+              threshold: TridentAssistant::Utils::NFO_MTG[:threshold]
             )
 
           log UI.fmt("{{v}} NFT mint payment paid: #{payment["data"]}")

data/lib/trident_assistant/client.rb

@@ -12,105 +12,25 @@ module TridentAssistant
 
     def initialize(**kwargs)
       @endpoint = URI(kwargs[:endpoint] || ENDPOINT)
-    end
-
-    def get(path, **options)
-      request(:get, path, **options)
-    end
-
-    def post(path, **options)
-      request(:post, path, **options)
-    end
-
-    def put(path, **options)
-      request(:put, path, **options)
-    end
-
-    private
-
-    def request(verb, path, **options)
-      uri = uri_for path
-
-      options[:headers] ||= {}
-      options[:headers]["Content-Type"] ||= "application/json"
-
-      begin
-        response = HTTP.timeout(connect: 5, write: 120, read: 60).request(verb, uri, options)
-      rescue HTTP::Error => e
-        raise HttpError, e.message
-      end
-
-      raise RequestError, response.to_s unless response.status.success?
-
-      parse_response(response) do |parse_as, result|
-        case parse_as
-        when :json
-          break result if result.is_a?(Array) || (result.is_a?(Hash) && result["message"].blank?)
-
-          raise result["message"]
-        else
-          result
-        end
+      @conn = Faraday.new(url: @endpoint.to_s) do |f|
+        f.request :json
+        f.request :retry
+        f.response :raise_error
+        f.response :json
+        f.response :logger if kwargs[:debug]
       end
     end
 
-    def uri_for(path)
-      uri_options = {
-        scheme: endpoint.scheme,
-        host: endpoint.host,
-        port: endpoint.port,
-        path: path
-      }
-      Addressable::URI.new(uri_options)
+    def get(path, params = nil, headers = nil)
+      @conn.get(path, params&.compact, headers).body
     end
 
-    def parse_response(response)
-      content_type = response.headers[:content_type]
-      parse_as = {
-        %r{^application/json} => :json,
-        %r{^image/.*} => :file,
-        %r{^text/html} => :xml,
-        %r{^text/plain} => :plain
-      }.each_with_object([]) { |match, memo| memo << match[1] if content_type =~ match[0] }.first || :plain
-
-      if parse_as == :plain
-        result = JSON.parse(response&.body&.to_s)
-        result && yield(:json, result)
-
-        yield(:plain, response.body)
-      end
-
-      case parse_as
-      when :json
-        result = JSON.parse(response.body.to_s)
-      when :file
-        extension =
-          if response.headers[:content_type] =~ %r{^image/.*}
-            {
-              "image/gif": ".gif",
-              "image/jpeg": ".jpg",
-              "image/png": ".png"
-            }[response.headers["content-type"]]
-          else
-            ""
-          end
-
-        begin
-          file = Tempfile.new(["mixin-file-", extension])
-          file.binmode
-          file.write(response.body)
-        ensure
-          file&.close
-        end
-
-        result = file
-      when :xml
-        result = Hash.from_xml(response.body.to_s)
-      else
-        result = response.body
-      end
+    def post(path, body = nil, headers = nil)
+      @conn.post(path, body&.compact, headers).body
+    end
 
-      yield(parse_as, result)
+    def put(path, body = nil, headers = nil)
+      @conn.post(path, body&.compact, headers).body
     end
   end
 end

data/lib/trident_assistant/utils.rb

@@ -55,13 +55,9 @@ module TridentAssistant
 
       def mixin_bot_from_keystore(keystore)
         keystore = parse_json keystore if keystore.is_a?(String)
+        keystore = keystore.with_indifferent_access
 
-        MixinBot::API.new(
-          client_id: keystore["client_id"],
-          session_id: keystore["session_id"],
-          pin_token: keystore["pin_token"],
-          private_key: keystore["private_key"]
-        )
+        MixinBot::API.new **keystore
       end
 
       def parse_metadata(input)

data/lib/trident_assistant/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TridentAssistant
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/trident_assistant.rb

@@ -2,6 +2,9 @@
 
 require "mixin_bot"
 require "open-uri"
+require 'faraday'
+require 'faraday/multipart'
+require 'faraday/retry'
 
 # Trident SDK
 module TridentAssistant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trident_assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - an-lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixin_bot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 description: A simple program to use Trident NFT
 email:
 - an.lee.work@gmail.com
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: A simple program to use Trident NFT