Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch for tx_info and block_tx_info (collateral_tx_out) #285

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Patch for tx_info and block_tx_info (collateral_tx_out) #285

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d799c8
Fix collateral_tx_out to not map against multi asset but use it's own…
rdlrt Jun 4, 2024
647978e
Update specs and bump version in specs
rdlrt Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 4 additions & 17 deletions files/grest/rpc/blocks/block_tx_info.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,17 +260,6 @@ BEGIN
tx_out.index AS tx_index,
tx_out.value::text AS value,
ENCODE(tx_out.data_hash, 'hex') AS datum_hash,
(CASE WHEN ma.policy IS NULL THEN NULL
ELSE
JSONB_BUILD_OBJECT(
'policy_id', ENCODE(ma.policy, 'hex'),
'asset_name', ENCODE(ma.name, 'hex'),
'fingerprint', ma.fingerprint,
'decimals', aic.decimals,
'quantity', mto.quantity::text
)
END
) AS asset_list,
(CASE WHEN tx_out.inline_datum_id IS NULL THEN NULL
ELSE
JSONB_BUILD_OBJECT(
Expand All @@ -289,14 +278,12 @@ BEGIN
'size', script.serialised_size
)
END
) AS reference_script
) AS reference_script,
REPLACE(multi_assets_descr,'fromList ','') AS asset_descr
FROM
collateral_tx_out AS tx_out
INNER JOIN tx ON tx_out.tx_id = tx.id
LEFT JOIN stake_address AS sa ON tx_out.stake_address_id = sa.id
LEFT JOIN ma_tx_out AS mto ON _assets IS TRUE AND mto.tx_out_id = tx_out.id
LEFT JOIN multi_asset AS ma ON _assets IS TRUE AND ma.id = mto.ident
LEFT JOIN grest.asset_info_cache AS aic ON _assets IS TRUE AND aic.asset_id = ma.id
LEFT JOIN datum ON _scripts IS TRUE AND datum.id = tx_out.inline_datum_id
LEFT JOIN script ON _scripts IS TRUE AND script.id = tx_out.reference_script_id
WHERE _scripts IS TRUE
Expand Down Expand Up @@ -760,11 +747,11 @@ BEGIN
'datum_hash', datum_hash,
'inline_datum', inline_datum,
'reference_script', reference_script,
'asset_list', COALESCE(JSONB_AGG(asset_list) FILTER (WHERE asset_list IS NOT NULL), JSONB_BUILD_ARRAY())
'asset_list', asset_descr
) AS tx_collateral_outputs
FROM _all_collateral_outputs AS aco
WHERE _scripts IS TRUE AND aco.tx_id = atx.id
GROUP BY payment_addr_bech32, payment_addr_cred, stake_addr, aco.tx_hash, tx_index, value, datum_hash, inline_datum, reference_script
GROUP BY payment_addr_bech32, payment_addr_cred, stake_addr, aco.tx_hash, tx_index, value, datum_hash, inline_datum, reference_script, asset_descr
LIMIT 1 -- there can only be one collateral output
),
COALESCE((
Expand Down
21 changes: 4 additions & 17 deletions files/grest/rpc/transactions/tx_info.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,6 @@ BEGIN
tx_out.index AS tx_index,
tx_out.value::text AS value,
ENCODE(tx_out.data_hash, 'hex') AS datum_hash,
(CASE WHEN ma.policy IS NULL THEN NULL
ELSE
JSONB_BUILD_OBJECT(
'policy_id', ENCODE(ma.policy, 'hex'),
'asset_name', ENCODE(ma.name, 'hex'),
'fingerprint', ma.fingerprint,
'decimals', aic.decimals,
'quantity', mto.quantity::text
)
END
) AS asset_list,
(CASE WHEN tx_out.inline_datum_id IS NULL THEN NULL
ELSE
JSONB_BUILD_OBJECT(
Expand All @@ -272,14 +261,12 @@ BEGIN
'size', script.serialised_size
)
END
) AS reference_script
) AS reference_script,
REPLACE(multi_assets_descr,'fromList ','') AS asset_descr
FROM
collateral_tx_out AS tx_out
INNER JOIN tx ON tx_out.tx_id = tx.id
LEFT JOIN stake_address AS sa ON tx_out.stake_address_id = sa.id
LEFT JOIN ma_tx_out AS mto ON mto.tx_out_id = tx_out.id
LEFT JOIN multi_asset AS ma ON ma.id = mto.ident
LEFT JOIN grest.asset_info_cache AS aic ON aic.asset_id = ma.id
LEFT JOIN datum ON datum.id = tx_out.inline_datum_id
LEFT JOIN script ON script.id = tx_out.reference_script_id
WHERE
Expand Down Expand Up @@ -789,11 +776,11 @@ BEGIN
'datum_hash', datum_hash,
'inline_datum', inline_datum,
'reference_script', reference_script,
'asset_list', COALESCE(JSONB_AGG(asset_list) FILTER (WHERE asset_list IS NOT NULL), JSONB_BUILD_ARRAY())
'asset_list', asset_descr
) AS tx_collateral_outputs
FROM _all_collateral_outputs AS aco
WHERE aco.tx_id = atx.id
GROUP BY payment_addr_bech32, payment_addr_cred, stake_addr, aco.tx_hash, tx_index, value, datum_hash, inline_datum, reference_script
GROUP BY payment_addr_bech32, payment_addr_cred, stake_addr, aco.tx_hash, tx_index, value, datum_hash, inline_datum, reference_script, asset_descr
LIMIT 1 -- there can only be one collateral output
),
COALESCE((
Expand Down
Loading