Skip to content

Commit

Permalink
Merge branch 'master' into bump-open-api-and-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@vladimirvolek
vladimirvolek committed Feb 29, 2024
2 parents 11c4046 + a96251b commit 29a17b7
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 210 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- ordering in `/assets/asset/txs`, `/assets/asset/transactions` and `/epochs/{number}/stakes`
- port configuration via config option `dbSync.port`
- live_stake for retired pools in `/pools/{pool_id}` was always 0, instead of displaying the delegated amount
- error in `/epochs/n/parameters` for epochs without PlutusV1/PlutusV2 cost models

## [1.7.0] - 2023-08-30
Expand Down Expand Up @@ -60,7 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- `onchain_metadata_extra` field to `/assets/:asset`
- `onchain_metadata_extra` field to `/assets/{asset}`
- CIP68 RFT 444 support

### Changed
Expand Down
240 changes: 31 additions & 209 deletions src/sql/pools/pools_pool_id.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ circulating_supply AS (
/*
circulating_supply = SUM of all utxos + withdrawables
withdrawables = rewards (all types including rewards + refunds + treasury + reserves) - withdrawals
*/
*/
FROM tx_out txo
LEFT JOIN tx_in txi ON (txo.tx_id = txi.tx_out_id)
AND (txo.index = txi.tx_out_index)
Expand All @@ -63,7 +63,7 @@ queried_addr AS (
only the pool owner addresses are calculated in the pledge,
reward address IS NOT part of the pledge (alone, if it's not one of the owners)
moreover, it HAS TO be delegated (last part of the query) to that particular pool
*/
*/
SELECT DISTINCT sa.id
FROM pool_update pu
JOIN pool_hash ph ON (ph.id = pu.hash_id)
Expand All @@ -85,8 +85,32 @@ queried_addr AS (
)
) AS "addresses"
),
active_pools AS (
SELECT ph.id AS "pool_hash_id"
all_pools AS (
SELECT ph.id AS "pool_hash_id",
CASE
WHEN (
retiring_epoch IS NULL
OR (
max_announced_tx_id IS NOT NULL
AND (
max_registered_tx_id > max_announced_tx_id
OR (
max_registered_tx_id < max_announced_tx_id
AND retiring_epoch > (
SELECT MAX(NO)
FROM epoch
)
)
)
)
OR (max_announced_tx_id IS NULL)
OR (
max_registered_tx_id = max_announced_tx_id
AND update_cert_index > retire_cert_index
)
) THEN 'active'
ELSE 'retired'
END AS "state"
FROM pool_hash ph
JOIN (
SELECT pu.hash_id,
Expand Down Expand Up @@ -115,33 +139,12 @@ active_pools AS (
) prmax ON (prmax.hash_id = pr.hash_id)
AND (prmax.tempmax = pr.announced_tx_id)
) pr ON (pr.hash_id = ph.id)
WHERE (
retiring_epoch IS NULL
OR (
max_announced_tx_id IS NOT NULL
AND (
max_registered_tx_id > max_announced_tx_id
OR (
max_registered_tx_id < max_announced_tx_id
AND retiring_epoch > (
SELECT MAX(NO)
FROM epoch
)
)
)
)
OR (max_announced_tx_id IS NULL)
OR (
max_registered_tx_id = max_announced_tx_id
AND update_cert_index > retire_cert_index
)
)
),
live_stake_accounts AS (
SELECT d.addr_id AS "stake_address_id",
d.pool_hash_id AS "pool_id"
FROM delegation d
JOIN active_pools ap ON (d.pool_hash_id = ap.pool_hash_id)
JOIN all_pools ap ON (d.pool_hash_id = ap.pool_hash_id)
JOIN stake_registration sr ON (sr.addr_id = d.addr_id)
LEFT JOIN (
SELECT addr_id,
Expand Down Expand Up @@ -257,191 +260,10 @@ live_stake_queried_pool_sum AS (
)
) AS "live_stake_pool"
)
SELECT ph.view AS "pool_id",
encode(ph.hash_raw, 'hex') AS "hex",
encode(pu.vrf_key_hash, 'hex') AS "vrf_key",
(
SELECT COUNT(*)
FROM block b
JOIN slot_leader sl ON (sl.id = b.slot_leader_id)
JOIN pool_hash ph ON (ph.id = sl.pool_hash_id)
WHERE ph.view = $1
) AS "blocks_minted",
(
SELECT COUNT(*)
FROM block b
JOIN slot_leader sl ON (sl.id = b.slot_leader_id)
JOIN pool_hash ph ON (ph.id = sl.pool_hash_id)
WHERE ph.view = $1
AND b.epoch_no = (
SELECT epoch_no
FROM current_epoch
)
) AS "blocks_epoch",
(
SELECT amount_pool
FROM queried_stake
)::TEXT AS "active_stake", -- cast to TEXT to avoid number overflow
(
(
SELECT amount_pool
FROM queried_stake
) / (
SELECT amount
FROM queried_stake
)
)::FLOAT AS "active_size",
(
SELECT (
SELECT live_stake_pool
FROM live_stake_queried_pool_sum
)::TEXT AS "live_stake", -- cast to TEXT to avoid number overflow
(
(
SELECT live_stake_pool
FROM live_stake_queried_pool_sum
) / (
SELECT SUM(live_stake)
FROM live_stake_sum
)
)::FLOAT AS "live_size",
(
COALESCE(
(
SELECT live_stake_pool
FROM live_stake_queried_pool_sum
) / (
(
SELECT *
FROM circulating_supply
) / (
SELECT optimal_pool_count
FROM epoch_param
ORDER BY epoch_no DESC
LIMIT 1
)
), 0
)
)::FLOAT AS "live_saturation",
(
SELECT COUNT(DISTINCT d.id)
FROM delegation d
JOIN pool_hash ph ON (ph.id = d.pool_hash_id)
JOIN stake_address sa ON (sa.id = d.addr_id)
JOIN stake_registration sr ON (sr.addr_id = d.addr_id)
LEFT JOIN stake_deregistration sd ON (sd.addr_id = d.addr_id)
LEFT JOIN (
SELECT addr_id,
MAX(tx_id) AS tempmax
FROM stake_deregistration
GROUP BY addr_id
) deregmax ON (deregmax.addr_id = d.addr_id)
AND (deregmax.tempmax = sd.tx_id)
WHERE ph.view = $1
AND d.id = (
SELECT MAX(id)
FROM delegation
WHERE addr_id = d.addr_id
)
AND sr.tx_id = (
SELECT MAX(tx_id)
FROM stake_registration
WHERE addr_id = d.addr_id
)
AND (
(
sd.tx_id IS NOT NULL
AND sr.tx_id > (
SELECT MAX(tx_id)
FROM stake_deregistration
WHERE addr_id = d.addr_id
)
)
OR (sd.tx_id IS NULL)
)
) AS "live_delegators",
pu.pledge::TEXT AS "declared_pledge", -- cast to TEXT to avoid number overflow
(
SELECT COALESCE((amount + rewards_minus_withdrawals), 0)
FROM (
SELECT (
SELECT COALESCE(SUM(txo.value), 0)
FROM tx_out txo
LEFT JOIN tx_in txi ON (txo.tx_id = txi.tx_out_id)
AND (txo.index = txi.tx_out_index)
WHERE txi IS NULL
AND txo.stake_address_id IN (
SELECT *
FROM queried_addr
)
) AS "amount",
(
(
COALESCE(
(
SELECT SUM(amount) AS "amount"
FROM reward
WHERE (
addr_id IN (
SELECT *
FROM queried_addr
)
)
AND spendable_epoch <= (
SELECT epoch_no
FROM current_epoch
)
),
0
) - COALESCE(
(
SELECT SUM(amount) AS "amount"
FROM withdrawal
WHERE (
addr_id IN (
SELECT *
FROM queried_addr
)
)
),
0
)
)
) AS "rewards_minus_withdrawals"
) AS "temppledge"
)::TEXT AS "live_pledge", -- cast to TEXT to avoid number overflow
pu.margin AS "margin_cost",
pu.fixed_cost::TEXT AS "fixed_cost", -- cast to TEXT to avoid number overflow
sa.view AS "reward_account",
ARRAY (
SELECT sa.view
FROM pool_owner po
JOIN pool_update pu ON (pu.id = po.pool_update_id)
JOIN stake_address sa ON (sa.id = po.addr_id)
JOIN pool_hash ph ON (ph.id = pu.hash_id)
WHERE ph.view = $1
AND pu.id = (
SELECT update_id
FROM queried_pool
)
GROUP BY po.id,
sa.view
) AS "owners",
ARRAY (
SELECT encode(HASH, 'hex')
FROM tx
JOIN pool_update pu ON (pu.registered_tx_id = tx.id)
JOIN pool_hash ph ON (ph.id = pu.hash_id)
WHERE ph.view = $1
ORDER BY tx.id
) AS "registration",
ARRAY (
SELECT encode(HASH, 'hex')
FROM tx
JOIN pool_retire pr ON (pr.announced_tx_id = tx.id)
JOIN pool_hash ph ON (ph.id = pr.hash_id)
WHERE ph.view = $1
ORDER BY tx.id
) AS "retirement"
)::TEXT AS "live_stake"
FROM pool_hash ph
JOIN pool_update pu ON (pu.hash_id = ph.id)
LEFT JOIN stake_address sa ON (sa.id = pu.reward_addr_id)
Expand Down

0 comments on commit 29a17b7

Please sign in to comment.