Skip to content

Commit

Permalink
Merge pull request #636 from nervosnetwork/rc/v0.9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@shaojunda
shaojunda authored Jun 1, 2020
2 parents dac1ff0 + 6f74aa5 commit 8d6d735
Show file tree
Hide file tree
Showing 36 changed files with 731 additions and 153 deletions.
51 changes: 51 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,54 @@
# [v0.9.6](https://github.com/shaojunda/ckb-explorer/compare/v0.9.5...v0.9.6) (2020-06-01)


### Bug Fixes

* task bug ([48c735c](https://github.com/shaojunda/ckb-explorer/commit/48c735c))


### Features

* add average_block_time to daily statistic ([ed2519d](https://github.com/shaojunda/ckb-explorer/commit/ed2519d))
* add block time statistic ([26898c4](https://github.com/shaojunda/ckb-explorer/commit/26898c4))
* add block_propagation_delay table ([09c7643](https://github.com/shaojunda/ckb-explorer/commit/09c7643))
* add block_propagation_delay_history ([8cf7293](https://github.com/shaojunda/ckb-explorer/commit/8cf7293))
* add block_size column to blocks ([fec68e0](https://github.com/shaojunda/ckb-explorer/commit/fec68e0))
* add circulating supply to daily statistics ([a63e01f](https://github.com/shaojunda/ckb-explorer/commit/a63e01f))
* add circulation ratio to daily statistic ([64717a5](https://github.com/shaojunda/ckb-explorer/commit/64717a5))
* add epoch distribution info generation task ([42f53a3](https://github.com/shaojunda/ckb-explorer/commit/42f53a3))
* add epoch length to epoch statistics ([1ad1249](https://github.com/shaojunda/ckb-explorer/commit/1ad1249))
* add epoch_length_distribution ([68c9d61](https://github.com/shaojunda/ckb-explorer/commit/68c9d61))
* add epoch_time_distribution ([2c40104](https://github.com/shaojunda/ckb-explorer/commit/2c40104))
* add epoch_time_distribution ([7aac8db](https://github.com/shaojunda/ckb-explorer/commit/7aac8db))
* add fill block size task ([5146ecf](https://github.com/shaojunda/ckb-explorer/commit/5146ecf))
* add inflation_rate ([bc5cdd8](https://github.com/shaojunda/ckb-explorer/commit/bc5cdd8))
* add liquidity to daily statistic ([493a50c](https://github.com/shaojunda/ckb-explorer/commit/493a50c))
* add locked_capacity to daily statistics ([c1e0bf9](https://github.com/shaojunda/ckb-explorer/commit/c1e0bf9))
* add miner_addresses_distribution ([f8752dd](https://github.com/shaojunda/ckb-explorer/commit/f8752dd))
* add monetary data serializer ([8c7d14c](https://github.com/shaojunda/ckb-explorer/commit/8c7d14c))
* add monetary data show action ([4feedeb](https://github.com/shaojunda/ckb-explorer/commit/4feedeb))
* add monetary data validator ([ed14322](https://github.com/shaojunda/ckb-explorer/commit/ed14322))
* add more columns to daily statistics ([ffe1fc1](https://github.com/shaojunda/ckb-explorer/commit/ffe1fc1))
* add new column to daily statistics ([871aefe](https://github.com/shaojunda/ckb-explorer/commit/871aefe))
* add new columns ([9b69d89](https://github.com/shaojunda/ckb-explorer/commit/9b69d89))
* add nominal apc ([6b24e77](https://github.com/shaojunda/ckb-explorer/commit/6b24e77))
* add real_inflation_rate ([098c930](https://github.com/shaojunda/ckb-explorer/commit/098c930))
* add total supply to daily statistic ([8c383bd](https://github.com/shaojunda/ckb-explorer/commit/8c383bd))
* add total tx fee column to daily statistic ([05669e2](https://github.com/shaojunda/ckb-explorer/commit/05669e2))
* add transaction propagation delays ([bf9651c](https://github.com/shaojunda/ckb-explorer/commit/bf9651c))
* add udt account model ([2b5c1f0](https://github.com/shaojunda/ckb-explorer/commit/2b5c1f0))
* add udt model ([74fbcf7](https://github.com/shaojunda/ckb-explorer/commit/74fbcf7))
* generate epoch_time_distribution ([3a175b9](https://github.com/shaojunda/ckb-explorer/commit/3a175b9))
* return epoch_length_distribution ([b7de134](https://github.com/shaojunda/ckb-explorer/commit/b7de134))
* show circulating_supply ([260f158](https://github.com/shaojunda/ckb-explorer/commit/260f158))


### Performance Improvements

* speed up epoch statistic generator ([f3a059a](https://github.com/shaojunda/ckb-explorer/commit/f3a059a))



# [v0.9.5](https://github.com/shaojunda/ckb-explorer/compare/v0.9.4...v0.9.5) (2020-02-26)

- prevent divided by 0 on average deposit time ([cabfa48](https://github.com/nervosnetwork/ckb-explorer/commit/cabfa48))
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "rails", "~> 6.0.0"
# Use postgresql as the database for Active Record
gem "pg", ">= 0.18", "< 2.0"
# Use Puma as the app server
gem "puma", "~> 4.3.3"
gem "puma", "~> 4.3.5"
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
# gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
Expand Down
158 changes: 79 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,63 +24,63 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.0)
actionpack (= 6.0.0)
actioncable (6.0.3.1)
actionpack (= 6.0.3.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
actionmailbox (6.0.3.1)
actionpack (= 6.0.3.1)
activejob (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
mail (>= 2.7.1)
actionmailer (6.0.0)
actionpack (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
actionmailer (6.0.3.1)
actionpack (= 6.0.3.1)
actionview (= 6.0.3.1)
activejob (= 6.0.3.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
actionpack (6.0.3.1)
actionview (= 6.0.3.1)
activesupport (= 6.0.3.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.0)
actionpack (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
actiontext (6.0.3.1)
actionpack (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
nokogiri (>= 1.8.5)
actionview (6.0.0)
activesupport (= 6.0.0)
actionview (6.0.3.1)
activesupport (= 6.0.3.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.0)
activesupport (= 6.0.0)
activejob (6.0.3.1)
activesupport (= 6.0.3.1)
globalid (>= 0.3.6)
activemodel (6.0.0)
activesupport (= 6.0.0)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activemodel (6.0.3.1)
activesupport (= 6.0.3.1)
activerecord (6.0.3.1)
activemodel (= 6.0.3.1)
activesupport (= 6.0.3.1)
activerecord-import (1.0.3)
activerecord (>= 3.2)
activestorage (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (6.0.3.1)
actionpack (= 6.0.3.1)
activejob (= 6.0.3.1)
activerecord (= 6.0.3.1)
marcel (~> 0.3.1)
activesupport (6.0.0)
activesupport (6.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
annotate (2.7.5)
Expand All @@ -93,23 +93,23 @@ GEM
ffi (>= 1.9.25)
bootsnap (1.4.4)
msgpack (~> 1.0)
builder (3.2.3)
builder (3.2.4)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
codecov (0.1.14)
json
simplecov
url
coderay (1.1.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
config (1.7.2)
activesupport (>= 3.0)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 0.12, >= 0.12.2, < 1.0.0)
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
daemons (1.3.1)
database_cleaner (1.7.0)
deep_merge (1.2.1)
Expand Down Expand Up @@ -147,7 +147,7 @@ GEM
dry-logic (~> 0.5, >= 0.5.0)
dry-types (~> 0.14.0)
equatable (0.5.0)
erubi (1.8.0)
erubi (1.9.0)
et-orbi (1.2.2)
tzinfo
factory_bot (5.0.2)
Expand All @@ -165,27 +165,27 @@ GEM
activesupport (>= 4.2.0)
hashdiff (1.0.0)
hiredis (0.6.3)
i18n (1.7.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.2)
json (2.2.0)
kaminari (1.1.1)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.3.1)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -194,15 +194,15 @@ GEM
mimemagic (~> 0.3.2)
metaclass (0.0.4)
method_source (0.9.2)
mimemagic (0.3.3)
mimemagic (0.3.5)
mina (1.2.3)
open4 (~> 1.3.4)
rake
mina-multistage (1.0.3)
mina (~> 1.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest (5.14.1)
minitest-reporters (1.3.6)
ansi
builder
Expand All @@ -215,7 +215,7 @@ GEM
connection_pool (~> 2.2)
newrelic_rpm (6.4.0.356)
nio4r (2.5.2)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
numerizer (0.1.1)
open4 (1.3.4)
Expand All @@ -232,10 +232,10 @@ GEM
pry-nav (0.3.0)
pry (>= 0.9.10, < 0.13.0)
public_suffix (3.1.0)
puma (4.3.3)
puma (4.3.5)
nio4r (~> 2.0)
raabro (1.1.6)
rack (2.0.8)
rack (2.2.2)
rack-attack (6.2.1)
rack (>= 1.0, < 3)
rack-cors (1.0.5)
Expand All @@ -244,29 +244,29 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.0)
actioncable (= 6.0.0)
actionmailbox (= 6.0.0)
actionmailer (= 6.0.0)
actionpack (= 6.0.0)
actiontext (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
activemodel (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
rails (6.0.3.1)
actioncable (= 6.0.3.1)
actionmailbox (= 6.0.3.1)
actionmailer (= 6.0.3.1)
actionpack (= 6.0.3.1)
actiontext (= 6.0.3.1)
actionview (= 6.0.3.1)
activejob (= 6.0.3.1)
activemodel (= 6.0.3.1)
activerecord (= 6.0.3.1)
activestorage (= 6.0.3.1)
activesupport (= 6.0.3.1)
bundler (>= 1.3.0)
railties (= 6.0.0)
railties (= 6.0.3.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.1)
actionpack (= 6.0.3.1)
activesupport (= 6.0.3.1)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
Expand Down Expand Up @@ -326,7 +326,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand All @@ -349,7 +349,7 @@ GEM
tty-screen (0.6.5)
tty-tree (0.3.0)
tty-which (0.4.1)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unicode_utils (1.4.0)
Expand All @@ -359,10 +359,10 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.1)
websocket-driver (0.7.2)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
zeitwerk (2.2.0)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand Down Expand Up @@ -392,7 +392,7 @@ DEPENDENCIES
pg (>= 0.18, < 2.0)
pry
pry-nav
puma (~> 4.3.3)
puma (~> 4.3.5)
rack-attack
rack-cors
rails (~> 6.0.0)
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/api/v1/distribution_data_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ module Api
module V1
class DistributionDataController < ApplicationController
before_action :validate_query_params, only: :show

def show
distribution_data = DistributionData.new
render json: DistributionDataSerializer.new(distribution_data, { params: { indicator: params[:id] } })
render json: DistributionDataSerializer.new(distribution_data, params: { indicator: params[:id] })
end

private
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v1/market_data_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class MarketDataController < ApplicationController
skip_before_action :check_header_info

def show
render json: MarketData.new(params[:id]).call
render json: MarketData.new(indicator: params[:id]).call
end
end
end
Expand Down
Loading

0 comments on commit 8d6d735

Please sign in to comment.