trident_assistant 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f164a9116aa89a445553f7af742157ac0da7670dc436c8235508ff5e4a8030be
-  data.tar.gz: e0602539c1087780a03b543c90da70afbae5aced33373eb50339575a733f97e7
+  metadata.gz: f4acb50cc313a7bb9bde2830d586acd3264ad6342d19db8f33c3771c2bc50960
+  data.tar.gz: f1929e1fd73134237592eb08d8bc8297fb15ed5b44201deb411499880f4360d4
 SHA512:
-  metadata.gz: 8c3292e2f06b569a50357d64e0d8811218cdb1911e0c2eb544560c25e64a698f02b758f59a149cad1c5b9d0705bc952b73aaff1c77360ef83379a9217a69f6f2
-  data.tar.gz: ed3f043aa8ec27ee9931d41f2becaa031588d208c7a7b142c29db028380939d4a220319b5768a4cb2a912c0051bbae2c1e9ff4601d5f87cec1a4a1d5d1f25bcd
+  metadata.gz: 92abe8ed87e80f6a0b5733b31ebdc5393d615b3f8de846d5a68194c4e767faf9d516b57452d2733e3c068ba6b49e7e5513144a888a4bfa5ce2429f4780957636
+  data.tar.gz: f3a8d65af73524216b60970cf98add0c2035bb8fc9c9f2d10d12e16719c8623fb243a1486ffc5e4925d8bfec4c77f39d2186126e148a40fab0bdd7ae9a302892

data/lib/trident_assistant/api/collectible.rb

@@ -7,10 +7,26 @@ module TridentAssistant
       EXCHANGE_ASSET_ID = "965e5c6e-434c-3fa9-b780-c50f43cd955c"
       MINIMUM_AMOUNT = 0.000_000_01
 
+      def collectibles(**kwargs)
+        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]
+            }
+          )
+      end
+
       def deposit(collection, token)
         token_id = MixinBot::Utils::Nfo.new(collection: collection, token: token).unique_token_id
         collectible = find_collectible(:unspent, token_id)
-        raise "Unauthorized" if collectible.blank?
+        raise ForbiddenError, "Cannot find collectible" if collectible.blank?
 
         nfo = MixinBot::Utils::Nfo.new(extra: "deposit".unpack1("H*")).encode.hex
         _transfer_nft(
@@ -38,7 +54,7 @@ module TridentAssistant
         token_id = MixinBot::Utils::Nfo.new(collection: collection, token: token).unique_token_id
         collectible = find_collectible(:unspent, token_id)
         collectible ||= find_collectible(:signed, token_id)
-        raise "Cannot find collectible in wallet" if collectible.blank?
+        raise ForbiddenError, "Cannot find collectible in wallet" if collectible.blank?
 
         memo =
           TridentAssistant::Utils::Memo.new(
@@ -60,7 +76,7 @@ module TridentAssistant
         token_id = MixinBot::Utils::Nfo.new(collection: collection, token: token).unique_token_id
         collectible = find_collectible(:unspent, token_id)
         collectible ||= find_collectible(:signed, token_id)
-        raise "Cannot find collectible in wallet" if collectible.blank?
+        raise ForbiddenError, "Cannot find collectible in wallet" if collectible.blank?
 
         memo = "TRANSFER"
         nfo = MixinBot::Utils::Nfo.new(extra: memo.unpack1("H*")).encode.hex

data/lib/trident_assistant/api/collection.rb

@@ -6,18 +6,18 @@ module TridentAssistant
     module Collection
       def collection(id)
         client.get(
-          "api/collections/#{id}",
-          headers: {
-            Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
-          }
+          "api/collections/#{id}"
         )
       end
 
-      def collections
+      def collections(**kwargs)
         client.get(
           "api/collections",
           headers: {
             Authorization: "Bearer #{mixin_bot.access_token("GET", "/me")}"
+          },
+          params: {
+            page: kwargs[:page]
           }
         )
       end
@@ -52,7 +52,8 @@ module TridentAssistant
             json: {
               description: kwargs[:description],
               external_url: kwargs[:external_url],
-              icon_base64: kwargs[:icon_base64]
+              icon_base64: kwargs[:icon_base64],
+              icon_url: kwargs[:icon_url]
             }.compact
           )
       end

data/lib/trident_assistant/api/mixin_asset.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module TridentAssistant
+  class API
+    # api for supported assets
+    module MixinAsset
+      def assets
+        client.get "api/assets"
+      end
+    end
+  end
+end

data/lib/trident_assistant/api/order.rb

@@ -146,8 +146,8 @@ module TridentAssistant
 
       def cancel_order(order_id)
         info = order order_id
-        raise "Order maker: #{info["maker"]["id"]}" if info.dig("maker", "id") != mixin_bot.client_id
-        raise "Order state: #{info["state"]}" if info["state"] != "open"
+        raise ForbiddenError, "Order maker: #{info["maker"]["id"]}" if info.dig("maker", "id") != mixin_bot.client_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"])
 

data/lib/trident_assistant/api.rb

@@ -4,11 +4,16 @@ require_relative "./client"
 require_relative "./api/collection"
 require_relative "./api/collectible"
 require_relative "./api/metadata"
+require_relative "./api/mixin_asset"
 require_relative "./api/order"
 
 module TridentAssistant
   # APIs of Trident server
   class API
+    class UnauthorizedError < TridentAssistant::Error; end
+    class ArgumentError < TridentAssistant::Error; end
+    class ForbiddenError < TridentAssistant::Error; end
+
     attr_reader :mixin_bot, :client, :keystore
 
     def initialize(**args)
@@ -22,6 +27,7 @@ module TridentAssistant
     include TridentAssistant::API::Collectible
     include TridentAssistant::API::Collection
     include TridentAssistant::API::Metadata
+    include TridentAssistant::API::MixinAsset
     include TridentAssistant::API::Order
   end
 end

data/lib/trident_assistant/cli/nfo.rb

@@ -66,8 +66,8 @@ module TridentAssistant
           api.upload_metadata metadata: metadata.json, metahash: metadata.metahash
           data["_mint"] ||= {}
           data["_mint"]["metahash"] = metadata.metahash
+          log UI.fmt("{{v}} metadata uploaded: #{options[:endpoint]}/api/collectibles/#{metadata.metahash}")
         end
-        log UI.fmt("{{v}} metadata uploaded: #{options[:endpoint]}/api/collectibles/#{metadata.metahash}")
 
         token_id = MixinBot::Utils::Nfo.new(collection: metadata.collection[:id],
                                             token: metadata.token[:id]).unique_token_id

data/lib/trident_assistant/client.rb

@@ -45,7 +45,7 @@ module TridentAssistant
       parse_response(response) do |parse_as, result|
         case parse_as
         when :json
-          break result if result["message"].blank?
+          break result if result.is_a?(Array) || (result.is_a?(Hash) && result["message"].blank?)
 
           raise result["message"]
         else

data/lib/trident_assistant/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trident_assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - an-lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixin_bot
@@ -47,6 +47,7 @@ files:
 - lib/trident_assistant/api/collectible.rb
 - lib/trident_assistant/api/collection.rb
 - lib/trident_assistant/api/metadata.rb
+- lib/trident_assistant/api/mixin_asset.rb
 - lib/trident_assistant/api/order.rb
 - lib/trident_assistant/cli.rb
 - lib/trident_assistant/cli/base.rb