Merge branch 'develop' into staging

Author: zmcNotafraid

app/workers/token_collection_tag_worker.rb

@@ -35,7 +35,7 @@ def invalid_char?(name)
   end
 
   def invisible_char?(name)
-    (name =~ /^[\x21-\x7E\u4E00-\u9FFF]+(?:\s[\x21-\x7E\u4E00-\u9FFF]+)?$/).nil?
+    (name =~ /^[\x21-\x7E\u4E00-\u9FFF]+(?:\s[\x21-\x7E\u4E00-\u9FFF]+)*$/).nil?
   end
 
   def out_of_length?(name)

lib/tasks/migration/check_dao_event.rake

@@ -0,0 +1,36 @@
+namespace :migration do
+  desc "Usage: RAILS_ENV=production bundle exec rake migration:check_dao_event"
+  task check_dao_event: :environment do
+    error_tx_ids = []
+    CkbTransaction.where("tags @> array[?]::varchar[]", ["dao"]).find_each do |tx|
+      tx.outputs.where(cell_type: :nervos_dao_deposit).each do |output|
+        unless DaoEvent.where(ckb_transaction_id: tx.id, address_id: output.address_id, value: output.capacity, event_type: "deposit_to_dao", cell_index: output.cell_index).exists?
+          error_tx_ids << tx.id
+        end
+      end
+      tx.cell_inputs.where(cell_type: :nervos_dao_withdrawing).each do |input|
+        previous_cell_output = CellOutput.
+          where(id: input.previous_cell_output_id).
+          select(:address_id, :block_id, :ckb_transaction_id, :dao, :cell_index, :capacity, :occupied_capacity).
+          take!
+        interest = CkbUtils.dao_interest(previous_cell_output)
+        unless DaoEvent.where(ckb_transaction_id: tx.id, address_id: previous_cell_output.address_id, value: interest, event_type: "issue_interest", cell_index: input.index).exists?
+          error_tx_ids << tx.id
+
+        end
+      end
+      tx.cell_inputs.where(cell_type: :nervos_dao_deposit).each do |input|
+        previous_cell_output =
+          CellOutput.
+            where(id: input.previous_cell_output_id).
+            select(:address_id, :ckb_transaction_id, :cell_index, :capacity).
+            take!
+        unless DaoEvent.where(ckb_transaction_id: tx.id, address_id: previous_cell_output.address_id, value: previous_cell_output.capacity, event_type: "withdraw_from_dao",
+                              cell_index: input.index).exists?
+          error_tx_ids << tx.id
+        end
+      end
+    end
+    puts error_tx_ids.join(",")
+  end
+end

test/models/ckb_sync/node_data_processor_test.rb

@@ -1254,6 +1254,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       address2 = Address.find_by(lock_hash: lock2.compute_hash)
       address3 = Address.find_by(lock_hash: lock3.compute_hash)
       CkbSync::Api.any_instance.stubs(:get_tip_block_number).returns(block.number + 1)
+      DaoContract.default_contract.update!(deposit_transactions_count: 4)
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}",
                        record: :new_episodes) do
         node_data_processor.call
@@ -3839,7 +3840,7 @@ class NodeDataProcessorTest < ActiveSupport::TestCase
       Sidekiq::Testing.inline!
       block = node_data_processor.process_block(node_block)
       CkbSync::Api.any_instance.stubs(:get_tip_block_number).returns(block.number + 1)
-
+      DaoContract.default_contract.update!(deposit_transactions_count: 4)
       VCR.use_cassette("blocks/#{DEFAULT_NODE_BLOCK_NUMBER}",
                        record: :new_episodes) do
         node_data_processor.call

test/workers/token_collection_tag_worker_test.rb

@@ -19,6 +19,12 @@ class TokenCollectionTagWorkerTest < ActiveJob::TestCase
     assert_equal ["suspicious"], TokenCollection.last.tags
   end
 
+  test "add suspicious tag to token_collection when blanks are not continuous" do
+    create(:token_collection, name: "C K B B", cell_id: @cell.id, creator_id: @address.id)
+    TokenCollectionTagWorker.new.perform
+    assert_equal ["rgb++", "layer-1-asset"], TokenCollection.last.tags
+  end
+
   test "add out-of-length-range tag to token_collection" do
     create(:token_collection, name: "C" * 66, cell_id: @cell.id, creator_id: @address.id)
     TokenCollectionTagWorker.new.perform