Merge pull request #2452 from nervosnetwork/develop

Deploy to testnet

Author: zmcNotafraid

Gemfile.lock

@@ -346,7 +346,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.13)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-cache (1.13.0)

app/workers/pool_transaction_check_worker.rb

@@ -6,10 +6,10 @@ class PoolTransactionCheckWorker
 
   def perform
     pending_transactions = CkbTransaction.tx_pending.where("created_at < ?",
-                                                           5.minutes.ago).limit(100)
+                                                           10.minutes.ago).limit(100)
     pending_transactions.each do |tx|
       committed_tx = CkbTransaction.find_by(tx_hash: tx.tx_hash, tx_status: "committed")
-      if committed_tx
+      if committed_tx && tx.reload.tx_pending?
         tx.cell_inputs.delete_all
         tx.delete
       else