Merge pull request #1619 from nervosnetwork/develop

Deploy to testnet

app/controllers/api/v1/udts_controller.rb

@@ -55,6 +55,8 @@ def update
         raise Api::V1::Exceptions::TokenExpiredError
       rescue UdtVerification::TokenNotMatchError
         raise Api::V1::Exceptions::TokenNotMatchError
+      rescue UdtVerification::TokenNotExistError
+        raise Api::V1::Exceptions::TokenNotExistError
       end
 
       def show

app/lib/api/v1/exceptions.rb

@@ -189,13 +189,13 @@ def initialize
 
       class UdtInfoInvalidError < Error
         def initialize(detail)
-          super code: 1030, status: 400, title: "UDT info parameters invalid", detail: detail, href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
+          super code: 1030, status: 400, title: "UDT info parameters invalid", detail:, href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
         end
       end
 
       class UdtVerificationInvalidError < Error
         def initialize(detail)
-          super code: 1031, status: 400, title: "UDT verification invalid", detail: detail, href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
+          super code: 1031, status: 400, title: "UDT verification invalid", detail:, href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
         end
       end
 
@@ -228,6 +228,12 @@ def initialize
           super code: 1036, status: 400, title: "Token sent too frequently", detail: "", href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
         end
       end
+
+      class TokenNotExistError < Error
+        def initialize
+          super code: 1037, status: 400, title: "Token is required when you update udt info", detail: "", href: "https://nervosnetwork.github.io/ckb-explorer/public/api_doc.html"
+        end
+      end
     end
   end
 end

app/models/udt_verification.rb

@@ -5,20 +5,22 @@ class UdtVerification < ApplicationRecord
   class TokenExpiredError < StandardError; end
   class TokenNotMatchError < StandardError; end
   class TokenSentTooFrequentlyError < StandardError; end
+  class TokenNotExistError < StandardError; end
 
   belongs_to :udt
 
   def refresh_token!(ip)
-    raise TokenSentTooFrequentlyError if sent_at.present? && self.sent_at + SENT_FREQUENCY_MINUTES.minutes > Time.now
+    raise TokenSentTooFrequentlyError if sent_at.present? && sent_at + SENT_FREQUENCY_MINUTES.minutes > Time.now
 
     self.token = rand(999999).to_s.rjust(6, "0")
     self.sent_at = Time.now
     self.last_ip = ip
-    self.save!
+    save!
   end
 
   def validate_token!(token_params)
-    raise TokenExpiredError if self.sent_at + KEEP_ALIVE_MINUTES.minutes < Time.now
+    raise TokenNotExistError if token_params.blank?
+    raise TokenExpiredError if sent_at + KEEP_ALIVE_MINUTES.minutes < Time.now
     raise TokenNotMatchError if token != token_params.to_i
   end
 end

app/serializers/ckb_transactions_serializer.rb

@@ -16,11 +16,11 @@ class CkbTransactionsSerializer
   end
 
   attribute :display_inputs_count do |object|
-    object.display_inputs.count
+    object.is_cellbase ? 1 : object.cell_inputs.count
   end
 
   attribute :display_outputs_count do |object|
-    object.display_outputs.count
+    object.outputs.count
   end
 
   attribute :display_inputs do |object, params|

test/controllers/api/v1/udts_controller_test.rb

@@ -587,6 +587,19 @@ class UdtsControllerTest < ActionDispatch::IntegrationTest
         assert_equal true, udt.reload.published
         assert_equal "[email protected]", udt.reload.email
       end
+
+      test "should raise token not exist error when update udt but token not passed" do
+        udt = create(:udt, email: "[email protected]")
+        create(:udt_verification, udt:)
+        valid_put api_v1_udt_url("#{udt.type_hash}"), params: {
+          symbol: "GWK",
+          full_name: "GodwokenToken on testnet_v1",
+        }
+
+        assert_equal 400, response.status
+        assert_equal [{ "title" => "Token is required when you update udt info", "detail" => "", "code" => 1037, "status" => 400 }],
+                     JSON.parse(response.body)
+      end
     end
   end
 end