From 7622aaab223dc3a4537adb961a83fffbaed5b575 Mon Sep 17 00:00:00 2001 From: ksaric Date: Mon, 12 Jul 2021 17:09:30 +1000 Subject: [PATCH 1/7] Release 1.5.0 This was never merged back to master from release/1.5.0 branch --- ChangeLog.md | 23 +++++++++++++++++++ smash-servant-types/smash-servant-types.cabal | 2 +- smash/smash.cabal | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index dea4fb4..4971247 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,25 @@ # Changelog for smash + +## 1.5.0 + +### Story + +- Update dependencoes to support Alonzo +- Handle chain rollbacks correctly +- [CAD-2547] - Add Prometheus metrics for slot_no +- [CAD-2581] - Use the general db-sync plugins system to implement SMASH +- [CAD-2651] - Fix/improve caching +- [CAD-2671] - Modify cardano-sync to enable reusing from SMASH +- [CAD-2724] - CLI option to switch to existing SMASH server filtering +- [CAD-2810] - Add CLI for checking of pool metadata hash +- [CAD-2811] - Fix error handling to show last 10 results by default + +### Bug + +- [CAD-2832] - Smash syncing from scratch every restart + + ## 1.4.0 ### Story @@ -16,6 +36,7 @@ - [CAD-2416] - Database connection inconsistency - [CAD-2476] - SMASH not returning active pools that were previously retired + ## 1.3.0 ### Story @@ -33,6 +54,7 @@ - [CAD-2179] - pool_id delist endpoint is returning 200 for any string (not only for valid pool_ids) - [CAD-2181] - All queries that don't return anything should return 404 + ## 1.2.0 ### Story @@ -48,6 +70,7 @@ - [CAD-2088] - Resolve paths relative to the config file, not the executable - [CAD-2093] - Use qualified module names + ## 1.1.0 ### Story diff --git a/smash-servant-types/smash-servant-types.cabal b/smash-servant-types/smash-servant-types.cabal index 564bcae..e3a8da8 100644 --- a/smash-servant-types/smash-servant-types.cabal +++ b/smash-servant-types/smash-servant-types.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash-servant-types -version: 1.4.0 +version: 1.5.0 description: Shared servant API types for SMASH diff --git a/smash/smash.cabal b/smash/smash.cabal index 90e3e53..7234ee1 100644 --- a/smash/smash.cabal +++ b/smash/smash.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash -version: 1.4.0 +version: 1.5.0 description: Please see the README on GitHub at From c93e633a04588bf7c17d2bc302589d378de2a764 Mon Sep 17 00:00:00 2001 From: kderme Date: Fri, 20 Aug 2021 18:24:32 +0300 Subject: [PATCH 2/7] Prepare Release 1.6.x --- ChangeLog.md | 6 ++++++ smash-servant-types/smash-servant-types.cabal | 2 +- smash/smash.cabal | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 4971247..81e76a6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ # Changelog for smash +## 1.6.0 + +### Story + +- Let Postgres cascade deletes instead of using the deprecated persistant feature +- Use the same rollback logic as db-sync ## 1.5.0 diff --git a/smash-servant-types/smash-servant-types.cabal b/smash-servant-types/smash-servant-types.cabal index e3a8da8..5eb5043 100644 --- a/smash-servant-types/smash-servant-types.cabal +++ b/smash-servant-types/smash-servant-types.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash-servant-types -version: 1.5.0 +version: 1.6.0 description: Shared servant API types for SMASH diff --git a/smash/smash.cabal b/smash/smash.cabal index 7234ee1..97e88ef 100644 --- a/smash/smash.cabal +++ b/smash/smash.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash -version: 1.5.0 +version: 1.6.0 description: Please see the README on GitHub at From 1facf8361131c437ba1d9f4acfb98a1c7e675fd3 Mon Sep 17 00:00:00 2001 From: kderme Date: Wed, 25 Aug 2021 13:30:26 +0300 Subject: [PATCH 3/7] Tag 1.6.0-rc3 --- cabal.project | 24 ++++++++++++------------ stack.yaml | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cabal.project b/cabal.project index bbfc4df..79f365e 100644 --- a/cabal.project +++ b/cabal.project @@ -59,8 +59,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-db-sync - tag: 7ab7a9a2863cb1cdd344fccafef163b2a8372dc5 - --sha256: 02k5p17cq14xb0lgvzp1qg6df50yyl40s4acjqpwapn3mnf5ja97 + tag: ba5fbc4f8777b16e0e2617175126eae8eae55ea3 + --sha256: 09s7sy2hhksqclgi4mk8xgwr4hiw3w3sxwmh9jpma8hp31hp85bf subdir: cardano-sync cardano-db @@ -91,8 +91,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: d5b184a820853c7ba202efd615b8fadca1acb52c - --sha256: 04k5p6qwmfdza65gl5319r1ahdfwjnyqgzpfxdx0x2g5jcbimar4 + tag: 6aa1cd0a64a464371b94d4ac182e7e2cddc83a36 + --sha256: 1yv2biqc2q01xn7i7h7d1yn8dzygnqn8mywpjfs1i0pa7gnf5q14 subdir: alonzo/impl byron/crypto @@ -113,8 +113,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-node - tag: 9a6a6c81e3aebfaf757b562c823146c7da601e1c - --sha256: 1xiqrx3hf2s7j62clzzmlim81g7v2dvmirv78zf9gp9m1lqxzan6 + tag: c17315f2775eaf988e432b7caea3a094d62ce6c9 + --sha256: 17z8qyfxi0fh0l4vin94nbaqqgpl0wf91n8k9p18hv2flys1pp7i subdir: cardano-api cardano-config @@ -154,14 +154,14 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/optparse-applicative - tag: 84bcc6f18992a441886589a117249bfface8630e - --sha256: 09pr7m9gjsk8889m9d3mj75p69viv1acnrq63dgb11jl5gnnsblr + tag: 7497a29cb998721a9068d5725d49461f2bba0e7a + --sha256: 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: d070bad7ce389a4b2ff7fb4fcb7937fdeca80f3a - --sha256: 0jzdwjgqcj06b0rvwyh61cgf23dlh62lcn8z7dbm7wxwjjgpkjb1 + tag: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b + --sha256: 1kp0qysfy3hl96a3a61rijascq36f1imh3z4jy0vyiygb6qrv47z subdir: cardano-client io-sim @@ -181,8 +181,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/plutus - tag: 8c83c4abe211b4bbcaca3cdf1b2c0e38d0eb683f - --sha256: 1643s1g3jlm9pgalpc3vpij1zqb1n8yv8irq6qc43gs9bvl0wc3l + tag: edc6d4672c41de4485444122ff843bc86ff421a0 + --sha256: 12dmxp11xlal8rr3371sir5q4f7gscmyl84nw6wm47mb5b28bk92 subdir: plutus-core plutus-ledger-api diff --git a/stack.yaml b/stack.yaml index 6cf1136..f95c368 100644 --- a/stack.yaml +++ b/stack.yaml @@ -89,7 +89,7 @@ extra-deps: # db-sync dependency - git: https://github.com/input-output-hk/cardano-db-sync - commit: 7ab7a9a2863cb1cdd344fccafef163b2a8372dc5 + commit: ba5fbc4f8777b16e0e2617175126eae8eae55ea3 subdirs: - cardano-sync - cardano-db @@ -109,7 +109,7 @@ extra-deps: commit: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: d5b184a820853c7ba202efd615b8fadca1acb52c + commit: 6aa1cd0a64a464371b94d4ac182e7e2cddc83a36 subdirs: - alonzo/impl - byron/crypto @@ -127,7 +127,7 @@ extra-deps: - shelley-ma/shelley-ma-test - git: https://github.com/input-output-hk/cardano-node - commit: 9a6a6c81e3aebfaf757b562c823146c7da601e1c + commit: c17315f2775eaf988e432b7caea3a094d62ce6c9 subdirs: - cardano-api - cardano-api/test @@ -162,7 +162,7 @@ extra-deps: - tracer-transformers - git: https://github.com/input-output-hk/ouroboros-network - commit: d070bad7ce389a4b2ff7fb4fcb7937fdeca80f3a + commit: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b subdirs: - io-sim - io-sim-classes @@ -185,7 +185,7 @@ extra-deps: commit: 3825d3abf75f83f406c1f7161883c438dac7277d - git: https://github.com/input-output-hk/plutus - commit: 8c83c4abe211b4bbcaca3cdf1b2c0e38d0eb683f + commit: edc6d4672c41de4485444122ff843bc86ff421a0 subdirs: - plutus-core - plutus-ledger-api From 355c45359b0d6444e5146cf576c216d765bdc987 Mon Sep 17 00:00:00 2001 From: kderme Date: Thu, 26 Aug 2021 18:53:30 +0300 Subject: [PATCH 4/7] Tag 1.6.0 --- cabal.project | 8 ++++---- stack.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cabal.project b/cabal.project index 79f365e..333de38 100644 --- a/cabal.project +++ b/cabal.project @@ -59,8 +59,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-db-sync - tag: ba5fbc4f8777b16e0e2617175126eae8eae55ea3 - --sha256: 09s7sy2hhksqclgi4mk8xgwr4hiw3w3sxwmh9jpma8hp31hp85bf + tag: 07ee3b0aa3f2991eda0be6c96ec1d6d17e81f732 + --sha256: 15cc633k5d4px5zgrnwzxg3ps9gfypckc896bffpswsqlbrdljf9 subdir: cardano-sync cardano-db @@ -113,8 +113,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-node - tag: c17315f2775eaf988e432b7caea3a094d62ce6c9 - --sha256: 17z8qyfxi0fh0l4vin94nbaqqgpl0wf91n8k9p18hv2flys1pp7i + tag: 4c59442958072657812c6c0bb8e0b4ab85ce1ba2 + --sha256: 0pc26hrgdsf93h3qvp8m76axm4jspzclg6psn14mbaf1mkc1fxmx subdir: cardano-api cardano-config diff --git a/stack.yaml b/stack.yaml index f95c368..b0642b1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -89,7 +89,7 @@ extra-deps: # db-sync dependency - git: https://github.com/input-output-hk/cardano-db-sync - commit: ba5fbc4f8777b16e0e2617175126eae8eae55ea3 + commit: 07ee3b0aa3f2991eda0be6c96ec1d6d17e81f732 subdirs: - cardano-sync - cardano-db @@ -127,7 +127,7 @@ extra-deps: - shelley-ma/shelley-ma-test - git: https://github.com/input-output-hk/cardano-node - commit: c17315f2775eaf988e432b7caea3a094d62ce6c9 + commit: 4c59442958072657812c6c0bb8e0b4ab85ce1ba2 subdirs: - cardano-api - cardano-api/test From b7af48f65fcbd0e6db44c7b5897a4c9f36862dd0 Mon Sep 17 00:00:00 2001 From: kderme Date: Wed, 22 Sep 2021 14:02:18 +0300 Subject: [PATCH 5/7] Update dependencies --- cabal.project | 25 +++++++++++++------------ stack.yaml | 12 ++++++------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/cabal.project b/cabal.project index 333de38..6c501c5 100644 --- a/cabal.project +++ b/cabal.project @@ -59,8 +59,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-db-sync - tag: 07ee3b0aa3f2991eda0be6c96ec1d6d17e81f732 - --sha256: 15cc633k5d4px5zgrnwzxg3ps9gfypckc896bffpswsqlbrdljf9 + tag: 420bd3c46bc711ec8235cf52ac7a5e1a2939bb81 + --sha256: 1k2444f49ka1jfz5m7190xx7wj61c0npmzbka575rfxn4ygj34k4 subdir: cardano-sync cardano-db @@ -69,8 +69,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-base - tag: cb0f19c85e5bb5299839ad4ed66af6fa61322cc4 - --sha256: 0dnkfqcvbifbk3m5pg8kyjqjy0zj1l4vd23p39n6ym4q0bnib1cq + tag: 592aa61d657ad5935a33bace1243abce3728b643 + --sha256: 1bgq3a2wfdz24jqfwylcc6jjg5aji8dpy5gjkhpnmkkvgcr2rkyb subdir: base-deriving-via binary @@ -91,8 +91,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger-specs - tag: 6aa1cd0a64a464371b94d4ac182e7e2cddc83a36 - --sha256: 1yv2biqc2q01xn7i7h7d1yn8dzygnqn8mywpjfs1i0pa7gnf5q14 + tag: ec51e4fb1b17461ab612cf427b79f1742942e8cb + --sha256: 05bwy7x1asyfshqsfsyv2c70qwrxp4680xlvhwdm1hz9bi0lpq41 subdir: alonzo/impl byron/crypto @@ -102,6 +102,7 @@ source-repository-package byron/ledger/impl byron/ledger/impl/test cardano-ledger-core + cardano-protocol-tpraos semantics/executable-spec semantics/small-steps-test shelley/chain-and-ledger/dependencies/non-integer @@ -113,8 +114,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-node - tag: 4c59442958072657812c6c0bb8e0b4ab85ce1ba2 - --sha256: 0pc26hrgdsf93h3qvp8m76axm4jspzclg6psn14mbaf1mkc1fxmx + tag: 191b91eec3c7d845a55347781329d50bf36871d7 + --sha256: 1y0a80fmrqf7561yqp4p2vx36yrhh83222b01sall2rk791y4yf0 subdir: cardano-api cardano-config @@ -160,8 +161,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b - --sha256: 1kp0qysfy3hl96a3a61rijascq36f1imh3z4jy0vyiygb6qrv47z + tag: 5d37a927046bc7da2887830d8e35cf604622ce09 + --sha256: 1620zcnivgm1wp1kq3vqc44g77lv7dalzgywc96qsblf1sv9fw3p subdir: cardano-client io-sim @@ -181,8 +182,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/plutus - tag: edc6d4672c41de4485444122ff843bc86ff421a0 - --sha256: 12dmxp11xlal8rr3371sir5q4f7gscmyl84nw6wm47mb5b28bk92 + tag: 15121dd4dc66df7c17c6c0f2f4a8702ad841c020 + --sha256: 1g5jm1r58x5ly3vsk8hr3dviqnv1bqhxi2b87vmr53554pd6zcqp subdir: plutus-core plutus-ledger-api diff --git a/stack.yaml b/stack.yaml index b0642b1..8bb7cb3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -89,14 +89,14 @@ extra-deps: # db-sync dependency - git: https://github.com/input-output-hk/cardano-db-sync - commit: 07ee3b0aa3f2991eda0be6c96ec1d6d17e81f732 + commit: 420bd3c46bc711ec8235cf52ac7a5e1a2939bb81 subdirs: - cardano-sync - cardano-db - cardano-db-sync - git: https://github.com/input-output-hk/cardano-base - commit: cb0f19c85e5bb5299839ad4ed66af6fa61322cc4 + commit: 592aa61d657ad5935a33bace1243abce3728b643 subdirs: - binary - binary/test @@ -109,7 +109,7 @@ extra-deps: commit: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 6aa1cd0a64a464371b94d4ac182e7e2cddc83a36 + commit: ec51e4fb1b17461ab612cf427b79f1742942e8cb subdirs: - alonzo/impl - byron/crypto @@ -127,7 +127,7 @@ extra-deps: - shelley-ma/shelley-ma-test - git: https://github.com/input-output-hk/cardano-node - commit: 4c59442958072657812c6c0bb8e0b4ab85ce1ba2 + commit: 191b91eec3c7d845a55347781329d50bf36871d7 subdirs: - cardano-api - cardano-api/test @@ -162,7 +162,7 @@ extra-deps: - tracer-transformers - git: https://github.com/input-output-hk/ouroboros-network - commit: 877ce057ff6fb086474c8eaad53f2b7f0e0fce6b + commit: 5d37a927046bc7da2887830d8e35cf604622ce09 subdirs: - io-sim - io-sim-classes @@ -185,7 +185,7 @@ extra-deps: commit: 3825d3abf75f83f406c1f7161883c438dac7277d - git: https://github.com/input-output-hk/plutus - commit: edc6d4672c41de4485444122ff843bc86ff421a0 + commit: 15121dd4dc66df7c17c6c0f2f4a8702ad841c020 subdirs: - plutus-core - plutus-ledger-api From ac647740322c8f79bbd149dee529d7bfe4035010 Mon Sep 17 00:00:00 2001 From: kderme Date: Wed, 22 Sep 2021 14:19:34 +0300 Subject: [PATCH 6/7] Prepare Release 1.6.1 --- ChangeLog.md | 6 ++++++ smash-servant-types/smash-servant-types.cabal | 2 +- smash/smash.cabal | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 81e76a6..99d2791 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ # Changelog for smash +## 1.6.1 + +### Story + +- Update dependencies to match the latest node + ## 1.6.0 ### Story diff --git a/smash-servant-types/smash-servant-types.cabal b/smash-servant-types/smash-servant-types.cabal index 5eb5043..7381f21 100644 --- a/smash-servant-types/smash-servant-types.cabal +++ b/smash-servant-types/smash-servant-types.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash-servant-types -version: 1.6.0 +version: 1.6.1 description: Shared servant API types for SMASH diff --git a/smash/smash.cabal b/smash/smash.cabal index 97e88ef..3c7f078 100644 --- a/smash/smash.cabal +++ b/smash/smash.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: smash -version: 1.6.0 +version: 1.6.1 description: Please see the README on GitHub at From eaecec9f4c5ec12831e91397c4b12ddb0a182e88 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 22 Sep 2021 22:46:38 +0800 Subject: [PATCH 7/7] Update release.nix Drop `haskellPackages.smash.coverageReport.x86_64-darwin`, we don't want to build integration tests on CI. --- release.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 5281a6b..9e65e34 100644 --- a/release.nix +++ b/release.nix @@ -59,7 +59,9 @@ let # Paths or prefixes of paths of derivations to build only on the default system (ie. linux on hydra): onlyBuildOnDefaultSystem = [ ["dockerImage"] - ["checks" "tests" "smash" "db-spec-test"] ["haskellPackages" "smash" "checks" "db-spec-test"] + ["checks" "tests" "smash" "db-spec-test"] + ["haskellPackages" "smash" "checks" "db-spec-test"] + ["haskellPackages" "smash" "coverageReport"] ]; jobs = {