Fixes from schemathesis and wiretap

cardano-community · Aug 14, 2024 · ffb36ea · ffb36ea
1 parent c2e6215
commit ffb36ea
Show file tree

Hide file tree

Showing 10 changed files with 303 additions and 123 deletions.
diff --git a/files/grest/rpc/account/account_txs.sql b/files/grest/rpc/account/account_txs.sql
@@ -28,8 +28,7 @@ BEGIN
     --
     SELECT consumed_by_tx_id AS tx_id
     FROM tx_out
-    WHERE
-      tx_out.consumed_by_tx_id IS NOT NULL
+    WHERE tx_out.consumed_by_tx_id IS NOT NULL
       AND tx_out.stake_address_id = ANY(SELECT id FROM stake_address WHERE view = _stake_address)
       AND tx_out.consumed_by_tx_id >= _tx_id_min
   ) AS tmp;
@@ -43,7 +42,6 @@ BEGIN
     FROM public.tx
     INNER JOIN public.block AS b ON b.id = tx.block_id
     WHERE tx.id = ANY(_tx_id_list)
-      AND b.block_no >= _after_block_height
     ORDER BY b.block_no DESC;
 END;
 $$;

diff --git a/files/grest/rpc/address/address_txs.sql b/files/grest/rpc/address/address_txs.sql
@@ -11,19 +11,26 @@ DECLARE
   _tx_id_min bigint;
   _tx_id_list bigint[];
 BEGIN
+  SELECT INTO _tx_id_min id
+    FROM tx
+    WHERE block_id >= (SELECT id FROM block WHERE block_no >= _after_block_height ORDER BY id limit 1)
+    ORDER BY id limit 1;
+
   -- all tx_out & tx_in tx ids
   SELECT INTO _tx_id_list ARRAY_AGG(tx_id)
   FROM (
     SELECT tx_id
     FROM tx_out
     WHERE address = ANY (_addresses)
+      AND tx_id >= _tx_id_min
     --
     UNION
     --
     SELECT consumed_by_tx_id
     FROM tx_out
-    WHERE tx_out.address = ANY(_addresses)
-      AND tx_out.consumed_by_tx_id IS NOT NULL
+    WHERE tx_out.consumed_by_tx_id IS NOT NULL
+      AND tx_out.address = ANY(_addresses)
+      AND tx_out.consumed_by_tx_id >= _tx_id_min
   ) AS tmp;
 
   RETURN QUERY
@@ -35,7 +42,6 @@ BEGIN
     FROM public.tx
     INNER JOIN public.block AS b ON b.id = tx.block_id
     WHERE tx.id = ANY(_tx_id_list)
-      AND b.block_no >= _after_block_height
     ORDER BY b.block_no DESC;
 END;
 $$;

diff --git a/files/grest/rpc/pool/pool_history.sql b/files/grest/rpc/pool/pool_history.sql
@@ -4,8 +4,8 @@ RETURNS TABLE (
   active_stake text,
   active_stake_pct numeric,
   saturation_pct numeric,
-  block_cnt bigint,
-  delegator_cnt bigint,
+  block_cnt numeric,
+  delegator_cnt numeric,
   margin double precision,
   fixed_cost text,
   pool_fees text,

diff --git a/specs/results/koiosapi-guild.yaml b/specs/results/koiosapi-guild.yaml
@@ -2170,7 +2170,7 @@ components:
       deprecated: false
       name: _proposal_tx_hash
       description: Transaction Hash of government proposal in hexadecimal format (hex)
-      example: "##_proposal_tx_hash_param##"
+      example: "e61f151fcef9e99dff5c705f8d5de18891f8d1d92d69fef5ff608d2c29a7c133"
       schema:
         type: string
       in: query
@@ -3015,7 +3015,9 @@ components:
             description: Amount of delegated stake to this pool at the time of epoch snapshot (in lovelaces)
             example: "31235800000"
           active_stake_pct:
-            type: number
+            type:
+            - string
+            - 'null'
             description: Active stake for the pool, expressed as a percentage of total active stake on network
             example: 13.512182543475783
           saturation_pct:
@@ -3049,7 +3051,9 @@ components:
             description: Total amount of rewards earned by delegators in that epoch (in lovelaces)
             example: "123456789123"
           member_rewards:
-            type: string
+            type:
+            - string
+            - 'null'
             description: Total amount of rewards earned by members (delegator - owner) in that epoch (in lovelaces)
             example: "123456780123"
           epoch_ros:
@@ -4112,7 +4116,9 @@ components:
             description: Cardano staking address (reward account) in hex format
             example: e1c865f10d66a2e375242b5ef9f05abc8840d413421982f62c35ce4fbf
           script_hash:
-            type: string
+            type:
+              - 'null'
+              - string
             description: Script hash in case the stake address is locked by a script
             example: bf357f5de69e4aad71954bebd64357a4813ea5233df12fce4a9de582
     account_info:
@@ -4129,9 +4135,9 @@ components:
             enum: ["registered", "not registered"]
             example: registered
           delegated_drep:
-            anyOf:
-            - type: 'null'
-            - type: string
+            type:
+            - 'null'
+            - string
             description: Account's current delegation status to DRep ID in Bech32 format
             example: drep1gj49xmfcg6ev89ur2yad9c5p7z0pgfxggyakz9pua06vqh5vnp0
           delegated_pool:
@@ -4408,7 +4414,9 @@ components:
             - $ref: "#/components/schemas/tx_info/items/properties/outputs"
           collateral_output:
             description: A collateral output for change if the smart contract fails to execute and collateral inputs are spent. (CIP-40)
-            type: array
+            type:
+              - array
+              - 'null'
             items:
               properties:
                 payment_addr:
@@ -4951,19 +4959,29 @@ components:
             description: Asset metadata registered on the Cardano Token Registry
             properties:
               name:
-                type: string
+                type:
+                  - 'null'
+                  - string
                 example: Rackmob
               description:
-                type: string
+                type:
+                  - 'null'
+                  - string
                 example: Metaverse Blockchain Cryptocurrency.
               ticker:
-                type: string
+                type:
+                  - 'null'
+                  - string
                 example: MOB
               url:
-                type: string
+                type:
+                  - 'null'
+                  - string
                 example: https://www.rackmob.com/
               logo:
-                type: string
+                type:
+                  - 'null'
+                  - string
                 description: A PNG image file as a byte string
                 example: iVBORw0KGgoAAAANSUhEUgAAAPoAAAD6CAYAAACI7Fo9AAAACXBIWXMAAA7EAAAOxAGVKw4bAAADnmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSfvu78nIGlkPSdXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQnPz4KPHg6eG1wbWV0YSB4bWxuczp4PSdhZG9iZTpuczptZXRhLyc
               decimals:
@@ -5127,11 +5145,15 @@ components:
             description: The total amount of voting power this DRep is delegated.
             example: 599496769641
           url:
-            type: string
+            type:
+              - 'null'
+              - string
             description: A URL to a JSON payload of metadata
             example: "https://hornan7.github.io/Vote_Context.jsonld"
           hash:
-            type: string
+            type:
+              - 'null'
+              - string
             description: A hash of the contents of the metadata URL
             example: dc208474e195442d07a5b6d42af19bb2db02229427dfb53ab23122e6b0e2487d
     drep_epoch_summary:
@@ -5193,23 +5215,33 @@ components:
           hash:
             $ref: "#/components/schemas/drep_info/items/properties/hash"
           json:
-            type: object
+            type:
+              - 'null'
+              - object
             description: The payload as JSON
             example:
               {"body": {"title": "...", "...": "...", "references": [{"uri": "...", "@type": "Other", "label": "Hardfork to PV10"}]}, "authors": [{"name": "...", "witness": {"publicKey": "...", "signature": "...", "witnessAlgorithm": "ed25519"}}], "@context": {"body": {"@id": "CIP108:body", "@context": {"title": "CIP108:title", "abstract": "CIP108:abstract", "rationale": "CIP108:rationale", "motivation": "CIP108:motivation", "references": {"@id": "CIP108:references", "@context": {"uri": "CIP100:reference-uri", "Other": "CIP100:OtherReference", "label": "CIP100:reference-label", "referenceHash": {"@id": "CIP108:referenceHash", "@context": {"hashDigest": "CIP108:hashDigest", "hashAlgorithm": "CIP100:hashAlgorithm"}}, "GovernanceMetadata": "CIP100:GovernanceMetadataReference"}, "@container": "@set"}}}, "CIP100": "https://github.com/cardano-foundation/CIPs/blob/master/CIP-0100/README.md#", "CIP108": "https://github.com/cardano-foundation/CIPs/blob/master/CIP-0108/README.md#", "authors": {"@id": "CIP100:authors", "@context": {"name": "http://xmlns.com/foaf/0.1/name", "witness": {"@id": "CIP100:witness", "@context": {"publicKey": "CIP100:publicKey", "signature": "CIP100:signature", "witnessAlgorithm": "CIP100:witnessAlgorithm"}}}, "@container": "@set"}, "@language": "en-us", "hashAlgorithm": "CIP100:hashAlgorithm"}, "hashAlgorithm": "blake2b-256"}
           bytes:
-            type: string
+            type:
+              - 'null'
+              - string
             description: The raw bytes of the payload
             example: 7b0a20202240636f6e74657874223a207b0a2020202022406c616e6775616765223a2022656e2d7573222c0a2020202022434950313030223a202268747470733a2f2f6769746875622e636f6d2f63617264616e6f2d666f756e646174696f6e2f434950732f626c6f622f6d61737465722f4349502d303130302f524541444d452e6d6423222c0a2020202022434950313038223a202268747470733a2f2f6769746875622e636f6d2f63617264616e6f2d666f756e646174696f6e2f434950732f626c6f622f6d61737465722f4349502d303130382f524541444d452e6d6423222c0a202020202268617368416c676f726974686d223a20224349503130303a68617368416c676f726974686d222c0a2020202022626f6479223a207b0a20202020202022406964223a20224349503130383a626f6479222c0a2020202020202240636f6e74657874223a207b0a2020202020202020227265666572656e636573223a207b0a2020202020202020202022406964223a20224349503130383a7265666572656e636573222c0a202020202020202020202240636f6e7461696e6572223a202240736574222c0a202020202020202020202240636f6e74657874223a207b0a20202020202020202020202022476f7665726e616e63654d65746164617461223a20224349503130303a476f7665726e616e63654d657461646174615265666572656e6365222c0a202020202020202020202020224f74686572223a20224349503130303a4f746865725265666572656e6365222c0a202020202020202020202020226c6162656c223a20224349503130303a7265666572656e63652d6c6162656c222c0a20202020202020202020202022757269223a20224349503130303a7265666572656e63652d757269222c0a202020202020202020202020227265666572656e636548617368223a207b0a202020202020202020202020202022406964223a20224349503130383a7265666572656e636548617368222c0a20202020202020202020202020202240636f6e74657874223a207b0a202020202020202020202020202020202268617368446967657374223a20224349503130383a68617368446967657374222c0a202020202020202020202020202020202268617368416c676f726974686d223a20224349503130303a68617368416c676f726974686d220a20202020202020202020202020207d0a2020202020202020202020207d0a202020202020202020207d0a20202020202020207d2c0a2020202020202020227469746c65223a20224349503130383a7469746c65222c0a2020202020202020226162737472616374223a20224349503130383a6162737472616374222c0a2020202020202020226d6f7469766174696f6e223a20224349503130383a6d6f7469766174696f6e222c0a202020202020202022726174696f6e616c65223a20224349503130383a726174696f6e616c65220a2020202020207d0a202020207d2c0a2020202022617574686f7273223a207b0a20202020202022406964223a20224349503130303a617574686f7273222c0a2020202020202240636f6e7461696e6572223a202240736574222c0a2020202020202240636f6e74657874223a207b0a2020202020202020226e616d65223a2022687474703a2f2f786d6c6e732e636f6d2f666f61662f302e312f6e616d65222c0a2020202020202020227769746e657373223a207b0a2020202020202020202022406964223a20224349503130303a7769746e657373222c0a202020202020202020202240636f6e74657874223a207b0a202020202020202020202020227769746e657373416c676f726974686d223a20224349503130303a7769746e657373416c676f726974686d222c0a202020202020202020202020227075626c69634b6579223a20224349503130303a7075626c69634b6579222c0a202020202020202020202020227369676e6174757265223a20224349503130303a7369676e6174757265220a202020202020202020207d0a20202020202020207d0a2020202020207d0a202020207d0a20207d2c0a20202268617368416c676f726974686d223a2022626c616b6532622d323536222c0a202022626f6479223a207b0a20202020227469746c65223a202248617264666f726b20746f2050726f746f636f6c2076657273696f6e203130222c0a20202020226162737472616374223a20224c6574277320686176652073616e63686f4e657420696e2066756c6c20676f7665726e616e636520617320736f6f6e20617320706f737369626c65222c0a20202020226d6f7469766174696f6e223a2022505639206973206e6f742061732066756e2061732050563130222c0a2020202022726174696f6e616c65223a20224c65742773206b6565702074657374696e67207374756666222c0a20202020227265666572656e636573223a205b0a2020202020207b0a2020202020202020224074797065223a20224f74686572222c0a2020202020202020226c6162656c223a202248617264666f726b20746f2050563130222c0a202020202020202022757269223a2022220a2020202020207d0a202020205d0a20207d2c0a202022617574686f7273223a205b0a202020207b0a202020202020226e616d65223a20224361726c6f73222c0a202020202020227769746e657373223a207b0a2020202020202020227769746e657373416c676f726974686d223a202265643235353139222c0a2020202020202020227075626c69634b6579223a202237656130396133346165626231336339383431633731333937623163616266656335646466393530343035323933646565343936636163326634333734383061222c0a2020202020202020227369676e6174757265223a20226134373639383562346363306434353766323437373937363131373939613666366138306663386362376563396463623561383232333838386430363138653330646531363566336438363963346130643931303764386135623631326164376335653432343431393037663562393137393666306437313837643634613031220a2020202020207d0a202020207d0a20205d0a7d
           warning:
-            type: string
+            type:
+              - 'null'
+              - string
             description: A warning that occured while validating the metadata
           language:
-            type: string
+            type:
+              - 'null'
+              - string
             description: The language described in the context of the metadata as per CIP-100
             example: en-us
           comment:
-            type: string
+            type:
+              - 'null'
+              - string
             description: Comment attached to the metadata
           is_valid:
             type: boolean
@@ -5227,7 +5259,7 @@ components:
           update_tx_hash:
             $ref: "#/components/schemas/utxo_infos/items/properties/tx_hash"
           cert_index:
-            type: string
+            type: number
             description: The index of this certificate within the the transaction.
             example: 1
           block_time:
@@ -5443,7 +5475,9 @@ components:
         description: Array of information for scripts
         properties:
           script_hash:
-            type: string
+            type:
+              - 'null'
+              - string
             description: Hash of a script
             example: bfa7ffa9b2e164873db6ac6d0528c82e212963bc62e10fd1d81da4af
           creation_tx_hash:
@@ -5647,5 +5681,5 @@ tags:
         - [evaluateTransaction](https://ogmios.dev/mini-protocols/local-tx-submission/#evaluating-transactions)
     x-tag-expanded: true
 security:
-  - []
+  - {}
   - bearerAuth: []