trident_assistant 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca51a3b40da71d8ead06326ccd1377008aafe793e3881b9c4aaede46df73351
-  data.tar.gz: 9bf39cd480e433eab5443db26c57bec9e7c0445bb57aebdeddc2e2c439de03df
+  metadata.gz: 78044f2cab71b01faa20d88f6e46cc1231e6716d6f1a2e1c7f1ab4566c12a8c8
+  data.tar.gz: ffe521c1a183c2924ab38358bebe0e3e657f825b5b6e2be16a5c1962cc0beb8c
 SHA512:
-  metadata.gz: 2dd9e5df04ccfb3d41bc4c6b2ce1bc3a8b7f48453d692bff4cae9901e3da1c11fd6c2d2cfe9d5cb8dac8e4601b77bdcaea5a75c167b83622027558bd2a57bcb2
-  data.tar.gz: 3791ef7f7ec907f6b0f2a9ce807a1a157b92999291f60c99b24fc27f578af1c33751ac1d86a6c6c0143ddcc2b2cfb75300283cd832dc749e9eeb080af45a0890
+  metadata.gz: 6a56b4a274b0e74f19d2dbeb4e04738ccd653dfaa33588482eb62f7a921537ee9dbb24ae36a042d691fb11f2e77c103a078b8002ba3d435362875894ed818d12
+  data.tar.gz: a60869ceb2bceb39c86b4dc57a9ef35fca14da6246472efe8856cf8acbb8af08a9c18a544e83c921c0f27d47608a2dbb4cf34174146521f16c98f8deb7105305

data/lib/trident_assistant/api/collectible.rb

@@ -7,10 +7,27 @@ 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 = mixin_bot.collectibles(state: :unspent)["data"].find(&->(c) { c["token_id"] == token_id })
-        raise "Unauthorized" if collectible.blank?
+        collectible = find_collectible(:unspent, token_id)
+        collectible ||= find_collectible(:signed, token_id)
+        raise ForbiddenError, "Cannot find collectible" if collectible.blank?
 
         nfo = MixinBot::Utils::Nfo.new(extra: "deposit".unpack1("H*")).encode.hex
         _transfer_nft(
@@ -36,9 +53,9 @@ module TridentAssistant
 
       def airdrop(collection, token, **kwargs)
         token_id = MixinBot::Utils::Nfo.new(collection: collection, token: token).unique_token_id
-        collectible = mixin_bot.collectibles(state: :unspent)["data"].find(&->(c) { c["token_id"] == token_id })
-        collectible ||= mixin_bot.collectibles(state: :signed)["data"].find(&->(c) { c["token_id"] == token_id })
-        raise "Cannot find collectible in wallet" if collectible.blank?
+        collectible = find_collectible(:unspent, token_id)
+        collectible ||= find_collectible(:signed, token_id)
+        raise ForbiddenError, "Cannot find collectible in wallet" if collectible.blank?
 
         memo =
           TridentAssistant::Utils::Memo.new(
@@ -56,13 +73,13 @@ module TridentAssistant
         )
       end
 
-      def transfer(collection, token, recipient, **_kwargs)
+      def transfer(collection, token, recipient, **kwargs)
         token_id = MixinBot::Utils::Nfo.new(collection: collection, token: token).unique_token_id
-        collectible = mixin_bot.collectibles(state: :unspent)["data"].find(&->(c) { c["token_id"] == token_id })
-        collectible ||= mixin_bot.collectibles(state: :signed)["data"].find(&->(c) { c["token_id"] == token_id })
-        raise "Cannot find collectible in wallet" if collectible.blank?
+        collectible = find_collectible(:unspent, token_id)
+        collectible ||= find_collectible(:signed, token_id)
+        raise ForbiddenError, "Cannot find collectible in wallet" if collectible.blank?
 
-        memo = "TRANSFER"
+        memo = kwargs[:memo] || "TRANSFER"
         nfo = MixinBot::Utils::Nfo.new(extra: memo.unpack1("H*")).encode.hex
 
         _transfer_nft(
@@ -75,23 +92,38 @@ module TridentAssistant
 
       private
 
+      def find_collectible(state, token_id)
+        limit = 500
+        offset = ""
+
+        loop do
+          r = mixin_bot.collectibles(state: state, limit: limit, offset: offset)["data"]
+          puts "offset: #{offset}, loaded #{r.size} collectibles"
+          collectible = r.find(&->(c) { c["token_id"] == token_id })
+          break collectible if collectible.present?
+
+          break if r.size < 500
+
+          offset = r.last["updated_at"]
+        end
+      end
+
       def _transfer_nft(collectible, nfo, **kwargs)
-        tx =
-          if collectible["state"] == "signed"
-            collectible["signed_tx"]
-          else
-            raw = mixin_bot.build_collectible_transaction(
-              collectible: collectible,
-              receivers: kwargs[:receivers],
-              receivers_threshold: kwargs[:threshold],
-              nfo: nfo
-            )
-            mixin_bot.sign_raw_transaction raw
-          end
-
-        request = mixin_bot.create_sign_collectible_request tx
-        sign = mixin_bot.sign_collectible_request request["request_id"], keystore[:pin]
-        mixin_bot.send_raw_transaction sign["raw_transaction"]
+        if collectible["state"] == "signed"
+          mixin_bot.send_raw_transaction collectible["signed_tx"]
+        else
+          raw = mixin_bot.build_collectible_transaction(
+            collectible: collectible,
+            receivers: kwargs[:receivers],
+            receivers_threshold: kwargs[:threshold],
+            nfo: nfo
+          )
+          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]
+          mixin_bot.send_raw_transaction sign["raw_transaction"]
+        end
       end
     end
   end

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

@@ -19,6 +19,7 @@ module TridentAssistant
             metahash: kwargs[:metahash],
             state: kwargs[:state],
             type: kwargs[:type],
+            maker_id: kwargs[:maker_id],
             page: kwargs[:page]
           }
         )
@@ -146,8 +147,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/collectible.rb

@@ -11,7 +11,7 @@ module TridentAssistant
                      desc: "keystore or keystore.json file of Mixin bot"
       option :keystore, type: :string, aliases: "k", required: true, desc: "keystore or keystore.json file of Mixin bot"
       def index
-        r = api.mixin_bot.collectibles state: options[:state]
+        r = api.mixin_bot.collectibles state: options[:state], limit: 500
 
         log r["data"]
       end
@@ -87,7 +87,18 @@ module TridentAssistant
           log UI.fmt("{{v}} airdrop receiver_id: #{receiver_id}")
           log UI.fmt("{{v}} airdrop start_at: #{start_at}")
 
-          r = api.airdrop metadata.collection["id"], metadata.token["id"], receiver_id: receiver_id, start_at: start_at
+          attempt = 0
+          r =
+            begin
+              attempt += 1
+              api.airdrop metadata.collection["id"], metadata.token["id"], receiver_id: receiver_id, start_at: start_at
+            rescue Errno::ECONNRESET, OpenSSL::SSL::SSLError, MixinBot::HttpError => e
+              log UI.fmt("{{x}} #{e.inspect}")
+              log UI.fmt("Retrying #{attempt} times...")
+              sleep 0.5
+              retry
+            end
+
           log r["data"]
           data["_airdrop"] ||= {}
           data["_airdrop"]["hash"] = r["data"]["hash"]

data/lib/trident_assistant/cli/nfo.rb

@@ -26,9 +26,20 @@ module TridentAssistant
         files.each do |file|
           log "-" * 80
           log UI.fmt("{{v}} found #{file}")
-          minted.push(file) if _mint(file)
-        rescue TridentAssistant::Utils::Metadata::InvalidFormatError, JSON::ParserError, Client::RequestError,
-               MixinBot::Error, RuntimeError => e
+          attempt = 0
+          success =
+            begin
+              attempt += 1
+              _mint file
+            rescue Errno::ECONNRESET, OpenSSL::SSL::SSLError, MixinBot::HttpError, TridentAssistant::Client::HttpError,
+                   TridentAssistant::Client::RequestError, MixinBot::RequestError => e
+              log UI.fmt("{{x}} #{e.inspect}")
+              log UI.fmt("Retrying #{attempt} times...")
+              sleep 0.5
+              retry
+            end
+          minted.push(file) if success
+        rescue TridentAssistant::Utils::Metadata::InvalidFormatError, JSON::ParserError, RuntimeError => e
           log UI.fmt("{{x}} #{file} failed: #{e.inspect}")
           next
         end
@@ -55,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
@@ -76,33 +87,28 @@ module TridentAssistant
         memo = api.mixin_bot.nft_memo metadata.collection[:id], metadata.token[:id].to_i, metadata.metahash
 
         data["_mint"]["trace_id"] = trace_id
-        loop do
+        begin
           payment =
-            begin
-              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]
-                }
-              )
-            rescue MixinBot::InsufficientPoolError, MixinBot::HttpError => e
-              log UI.fmt("{{x}} #{e.inspect}")
-              log "Retrying to pay..."
-              sleep 1
-              nil
-            end
-
-          next if payment.blank? || payment["errors"].present?
+            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]
+              }
+            )
 
           log UI.fmt("{{v}} NFT mint payment paid: #{payment["data"]}")
           data["_mint"]["token_id"] = token_id
           log UI.fmt("{{v}} NFT successfully minted")
-          break
+        rescue MixinBot::InsufficientPoolError, MixinBot::HttpError => e
+          log UI.fmt("{{x}} #{e.inspect}")
+          log "Retrying to pay..."
+          sleep 1
+          retry
         end
 
         data.dig("_mint", "token_id").present?

data/lib/trident_assistant/client.rb

@@ -35,7 +35,7 @@ module TridentAssistant
       options[:headers]["Content-Type"] ||= "application/json"
 
       begin
-        response = HTTP.timeout(connect: 5, write: 10, read: 10).request(verb, uri, options)
+        response = HTTP.timeout(connect: 5, write: 120, read: 60).request(verb, uri, options)
       rescue HTTP::Error => e
         raise HttpError, e.message
       end
@@ -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.3"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trident_assistant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.7
 platform: ruby
 authors:
 - an-lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-07-21 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