Add output index

dcSpark · Dec 1, 2023 · bfc72d7 · bfc72d7
1 parent 57205c8
commit bfc72d7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/webserver/server/app/controllers/ProjectedNftRangeController.ts b/webserver/server/app/controllers/ProjectedNftRangeController.ts
@@ -36,6 +36,7 @@ export class ProjectedNftRangeController extends Controller {
                 previousTxHash: data.previous_tx_hash,
                 previousTxOutputIndex: data.previous_tx_output_index != null ? parseInt(data.previous_tx_output_index) : null,
                 actionTxId: data.action_tx_id,
+                actionOutputIndex: data.action_output_index,
                 asset: data.asset,
                 amount: parseInt(data.amount),
                 status: data.status,

diff --git a/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts b/webserver/server/app/models/projected_nft/projectedNftRange.queries.ts
@@ -9,6 +9,7 @@ export interface ISqlProjectedNftRangeParams {
 
 /** 'SqlProjectedNftRange' return type */
 export interface ISqlProjectedNftRangeResult {
+  action_output_index: number;
   action_slot: number;
   action_tx_id: string | null;
   amount: string;
@@ -26,7 +27,7 @@ export interface ISqlProjectedNftRangeQuery {
   result: ISqlProjectedNftRangeResult;
 }
 
-const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":true},"params":[{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":962,"b":971}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":997,"b":1006}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as owner_address,\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    encode(\"Transaction\".hash, 'hex') as action_tx_id,\n\n    \"ProjectedNFT\".asset as asset,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS status,\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as plutus_datum,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
+const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":true},"params":[{"name":"min_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1023,"b":1032}]},{"name":"max_slot","required":true,"transform":{"type":"scalar"},"locs":[{"a":1058,"b":1067}]}],"statement":"SELECT\n    encode(\"ProjectedNFT\".owner_address, 'hex') as owner_address,\n\n    encode(\"ProjectedNFT\".previous_utxo_tx_hash, 'hex') as previous_tx_hash,\n    \"ProjectedNFT\".previous_utxo_tx_output_index as previous_tx_output_index,\n\n    \"TransactionOutput\".output_index as action_output_index,\n    encode(\"Transaction\".hash, 'hex') as action_tx_id,\n\n    \"ProjectedNFT\".asset as asset,\n    \"ProjectedNFT\".amount as amount,\n\n    CASE\n        WHEN \"ProjectedNFT\".operation = 0 THEN 'Lock'\n        WHEN \"ProjectedNFT\".operation = 1 THEN 'Unlocking'\n        WHEN \"ProjectedNFT\".operation = 2 THEN 'Claim'\n        ELSE 'Invalid'\n        END AS status,\n\n    encode(\"ProjectedNFT\".plutus_datum, 'hex') as plutus_datum,\n\n    \"Block\".slot as action_slot\nFROM \"ProjectedNFT\"\n         LEFT JOIN \"TransactionOutput\" ON \"TransactionOutput\".id = \"ProjectedNFT\".hololocker_utxo_id\n         JOIN \"Transaction\" ON \"Transaction\".id = \"ProjectedNFT\".tx_id\n         JOIN \"Block\" ON \"Transaction\".block_id = \"Block\".id\nWHERE\n        \"Block\".slot > :min_slot!\n    AND \"Block\".slot <= :max_slot!\nORDER BY (\"Block\".height, \"Transaction\".tx_index) ASC"};
 
 /**
  * Query generated from SQL:
@@ -37,6 +38,7 @@ const sqlProjectedNftRangeIR: any = {"usedParamSet":{"min_slot":true,"max_slot":
  *     encode("ProjectedNFT".previous_utxo_tx_hash, 'hex') as previous_tx_hash,
  *     "ProjectedNFT".previous_utxo_tx_output_index as previous_tx_output_index,
  * 
+ *     "TransactionOutput".output_index as action_output_index,
  *     encode("Transaction".hash, 'hex') as action_tx_id,
  * 
  *     "ProjectedNFT".asset as asset,

diff --git a/webserver/server/app/models/projected_nft/projectedNftRange.sql b/webserver/server/app/models/projected_nft/projectedNftRange.sql
@@ -7,6 +7,7 @@ SELECT
     encode("ProjectedNFT".previous_utxo_tx_hash, 'hex') as previous_tx_hash,
     "ProjectedNFT".previous_utxo_tx_output_index as previous_tx_output_index,
 
+    "TransactionOutput".output_index as action_output_index,
     encode("Transaction".hash, 'hex') as action_tx_id,
 
     "ProjectedNFT".asset as asset,

diff --git a/webserver/shared/models/ProjectedNftRange.ts b/webserver/shared/models/ProjectedNftRange.ts
@@ -8,6 +8,7 @@ export type ProjectedNftRangeResponse = {
     ownerAddress: string | null,
 
     actionTxId: string | null,
+    actionOutputIndex: number | null,
 
     previousTxHash: string | null,
     previousTxOutputIndex: number | null,