trident_assistant 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca51a3b40da71d8ead06326ccd1377008aafe793e3881b9c4aaede46df73351
-  data.tar.gz: 9bf39cd480e433eab5443db26c57bec9e7c0445bb57aebdeddc2e2c439de03df
+  metadata.gz: f164a9116aa89a445553f7af742157ac0da7670dc436c8235508ff5e4a8030be
+  data.tar.gz: e0602539c1087780a03b543c90da70afbae5aced33373eb50339575a733f97e7
 SHA512:
-  metadata.gz: 2dd9e5df04ccfb3d41bc4c6b2ce1bc3a8b7f48453d692bff4cae9901e3da1c11fd6c2d2cfe9d5cb8dac8e4601b77bdcaea5a75c167b83622027558bd2a57bcb2
-  data.tar.gz: 3791ef7f7ec907f6b0f2a9ce807a1a157b92999291f60c99b24fc27f578af1c33751ac1d86a6c6c0143ddcc2b2cfb75300283cd832dc749e9eeb080af45a0890
+  metadata.gz: 8c3292e2f06b569a50357d64e0d8811218cdb1911e0c2eb544560c25e64a698f02b758f59a149cad1c5b9d0705bc952b73aaff1c77360ef83379a9217a69f6f2
+  data.tar.gz: ed3f043aa8ec27ee9931d41f2becaa031588d208c7a7b142c29db028380939d4a220319b5768a4cb2a912c0051bbae2c1e9ff4601d5f87cec1a4a1d5d1f25bcd

data/lib/trident_assistant/api/collectible.rb

@@ -9,7 +9,7 @@ module TridentAssistant
 
       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 })
+        collectible = find_collectible(:unspent, token_id)
         raise "Unauthorized" if collectible.blank?
 
         nfo = MixinBot::Utils::Nfo.new(extra: "deposit".unpack1("H*")).encode.hex
@@ -36,8 +36,8 @@ 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 })
+        collectible = find_collectible(:unspent, token_id)
+        collectible ||= find_collectible(:signed, token_id)
         raise "Cannot find collectible in wallet" if collectible.blank?
 
         memo =
@@ -58,8 +58,8 @@ module TridentAssistant
 
       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 })
+        collectible = find_collectible(:unspent, token_id)
+        collectible ||= find_collectible(:signed, token_id)
         raise "Cannot find collectible in wallet" if collectible.blank?
 
         memo = "TRANSFER"
@@ -75,23 +75,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/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
@@ -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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TridentAssistant
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 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.4
 platform: ruby
 authors:
 - an-lee
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixin_bot