Merge pull request #754 from nervosnetwork/rc/v0.12.2

Rc/v0.12.2

Author: shaojunda

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [v0.12.2](https://github.com/nervosnetwork/ckb-explorer/compare/v0.12.1...v0.12.2) (2020-12-17)
+
+### Bug Fixes
+
+[#753](https://github.com/nervosnetwork/ckb-explorer/pull/753): fix address cache bug
+
 # [v0.12.1](https://github.com/nervosnetwork/ckb-explorer/compare/v0.12.0...v0.12.1) (2020-11-30)
 
 

Gemfile.lock

@@ -91,7 +91,7 @@ GEM
     builder (3.2.4)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
-    codecov (0.2.8)
+    codecov (0.2.12)
       json
       simplecov
     coderay (1.1.2)
@@ -162,7 +162,7 @@ GEM
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
-    json (2.3.1)
+    json (2.4.1)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.1)
@@ -310,10 +310,12 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 4.0, < 7.0)
       thor (~> 0)
-    simplecov (0.19.0)
+    simplecov (0.20.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)

RELEASENOTES.md

@@ -1,12 +1,5 @@
-# [v0.12.1](https://github.com/nervosnetwork/ckb-explorer/compare/v0.12.0...v0.12.1) (2020-11-30)
-
+# [v0.12.2](https://github.com/nervosnetwork/ckb-explorer/compare/v0.12.1...v0.12.2) (2020-12-17)
 
 ### Bug Fixes
 
-[#749](https://github.com/nervosnetwork/ckb-explorer/pull/749): fix dao contract cache bug
-
-
-### Features
-
-[#747](https://github.com/nervosnetwork/ckb-explorer/pull/747): support short acp address
-
+[#753](https://github.com/nervosnetwork/ckb-explorer/pull/753): fix address cache bug

app/models/address.rb

@@ -53,20 +53,26 @@ def self.find_address!(query_key)
   end
 
   def self.cached_find(query_key)
-    Rails.cache.realize([name, query_key], race_condition_ttl: 3.seconds) do
+    cache_key = query_key
+    unless QueryKeyUtils.valid_hex?(query_key)
+      cache_key = CkbUtils.parse_address(query_key).script.compute_hash
+    end
+    address = Rails.cache.realize([name, cache_key], race_condition_ttl: 3.seconds) do
       if QueryKeyUtils.valid_hex?(query_key)
         find_by(lock_hash: query_key)
       else
         lock_hash = CkbUtils.parse_address(query_key).script.compute_hash
-        address = find_by(lock_hash: lock_hash)
-        if address.present?
-          address.query_address = query_key
-          address
-        else
-          NullAddress.new(query_key)
-        end
+        find_by(lock_hash: lock_hash)
       end
     end
+    unless QueryKeyUtils.valid_hex?(query_key)
+      if address.present?
+        address.query_address = query_key
+      else
+        address = NullAddress.new(query_key)
+      end
+    end
+    address
   end
 
   def cached_lock_script

test/models/address_test.rb

@@ -216,4 +216,86 @@ class AddressTest < ActiveSupport::TestCase
 
     assert_equal [], address.ckb_udt_transactions(123)
   end
+
+  test "cached find cache key is lock_hash for short payload address" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    addr = CKB::Address.new(lock_script).generate
+    address = Address.find_or_create_address(lock_script, Time.current.to_i)
+    address = Address.cached_find(addr)
+    assert_equal address, Rails.cache.realize("Address/#{lock_script.compute_hash}")
+  end
+
+  test "cached find cache key is lock_hash for full payload address" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    addr = CKB::Address.new(lock_script).send(:generate_full_payload_address)
+    address = Address.find_or_create_address(lock_script, Time.current.to_i)
+    address = Address.cached_find(addr)
+    assert_equal address, Rails.cache.realize("Address/#{lock_script.compute_hash}")
+  end
+
+  test "cached find returned address's query address should be short payload address when query key is short payload address" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    addr = CKB::Address.new(lock_script).generate
+    full_addr = CKB::Address.new(lock_script).send(:generate_full_payload_address)
+    Address.find_or_create_address(lock_script, Time.current.to_i)
+    Address.cached_find(full_addr)
+    address = Address.cached_find(addr)
+
+    assert_equal addr, address.query_address
+  end
+
+  test "cached find returned address's query address should be short payload address when query key is full payload address" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    addr = CKB::Address.new(lock_script).generate
+    full_addr = CKB::Address.new(lock_script).send(:generate_full_payload_address)
+    Address.find_or_create_address(lock_script, Time.current.to_i)
+    Address.cached_find(addr)
+    address = Address.cached_find(full_addr)
+
+    assert_equal full_addr, address.query_address
+  end
+
+  test "cached find should return nil when query key is a hex string and there is no matched record" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    address = Address.cached_find("0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8")
+
+    assert_nil address
+  end
+
+  test "cached find should return null address when there is no matched record" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    addr = CKB::Address.new(lock_script).generate
+    address = Address.cached_find(addr)
+    expected_address = NullAddress.new(addr)
+    assert_equal expected_address.query_address, address.query_address
+  end
+
+  test "cached find should returned corresponding address when query key is hex string and there is a matched record" do
+    redis_cache_store = ActiveSupport::Cache.lookup_store(:redis_cache_store)
+    Rails.stubs(:cache).returns(redis_cache_store)
+    Rails.cache.extend(CacheRealizer)
+    lock_script = CKB::Types::Script.new(code_hash: "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8", hash_type: "type", args: "0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99")
+    full_addr = CKB::Address.new(lock_script).send(:generate_full_payload_address)
+    address = Address.find_or_create_address(lock_script, Time.current.to_i)
+    actual_address = Address.cached_find(lock_script.compute_hash)
+
+    assert_equal address, actual_address
+  end
 end