Skip to content
This repository was archived by the owner on Apr 7, 2021. It is now read-only.

Commit fa66fbd

Browse files
KtorZKtorZ
authored
Merge pull request #119 from input-output-hk/KtorZ/cardano-db-sync-8.0.0
Bump cardano-db-sync to 8.0.0
2 parents 3713a7c + 7ef77b2 commit fa66fbd

File tree

14 files changed

+151
-148
lines changed

14 files changed

+151
-148
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919
steps:
2020
- name: Install OS Packages
21-
uses: mstksg/get-package@v1
21+
uses: mstksg/get-package@2a4b48d5
2222
with:
2323
apt-get: libgmp-dev libssl-dev libtinfo-dev libsystemd-dev zlib1g-dev libsodium-dev
2424
brew: libsodium

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright [2019-2020] [IOHK]
190+
Copyright [2019-2021] [IOHK]
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

‎cabal.project‎

Lines changed: 120 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
index-state: 2021-01-08T00:00:00Z
2+
13
-- Generated by stackage-to-hackage
24

35
-- with-compiler: ghc-8.6.5
@@ -19,130 +21,6 @@ package cardano-explorer-api
1921
package cardano-submit-api
2022
ghc-options: -Wall -Werror -fwarn-redundant-constraints
2123

22-
source-repository-package
23-
type: git
24-
location: https://github.com/input-output-hk/cardano-base
25-
tag: 2574600da11065937c1f07e4b234ecb451016a2e
26-
--sha256: 0nq8bpzsr3fd2i59a6s6qb6slpymjh47zv57wlifjfvhh0xlgmpx
27-
subdir: binary
28-
binary/test
29-
cardano-crypto-class
30-
cardano-crypto-praos
31-
cardano-crypto-tests
32-
slotting
33-
34-
source-repository-package
35-
type: git
36-
location: https://github.com/input-output-hk/cardano-crypto
37-
tag: 2547ad1e80aeabca2899951601079408becbc92c
38-
--sha256: 1p2kg2w02q5w1cvqzhfhqmxviy4xrzada3mmb096j2n6hfr20kri
39-
40-
source-repository-package
41-
type: git
42-
location: https://github.com/input-output-hk/cardano-db-sync
43-
tag: 3cf868ec8c06265e4b670ac737af640d716e5ef7
44-
--sha256: 152yhay3riak41saz5s5zdhlkb5c5iqpy1gw1rvwjp6rwg1mc77n
45-
subdir: cardano-db
46-
47-
source-repository-package
48-
type: git
49-
location: https://github.com/input-output-hk/cardano-ledger-specs
50-
tag: 581767d1329f3f702e332af08355e81a0f85333e
51-
--sha256: 198p4v2bi36y6x512w35qycvjm7nds7jf8qh7r84pj1qsy43vf7w
52-
subdir: byron/chain/executable-spec
53-
byron/crypto
54-
byron/crypto/test
55-
byron/ledger/executable-spec
56-
byron/ledger/impl
57-
byron/ledger/impl/test
58-
semantics/executable-spec
59-
semantics/small-steps-test
60-
shelley-ma/impl
61-
shelley/chain-and-ledger/dependencies/non-integer
62-
shelley/chain-and-ledger/executable-spec
63-
shelley/chain-and-ledger/shelley-spec-ledger-test
64-
65-
source-repository-package
66-
type: git
67-
location: https://github.com/input-output-hk/cardano-node
68-
tag: 400d18092ce604352cf36fe5f105b0d7c78be074
69-
--sha256: 19r4mamm9bxc1hz32qgsrfnrfxwp4pgnb4d28fzai3izznil03vi
70-
subdir: cardano-api
71-
cardano-api/test
72-
cardano-cli
73-
cardano-config
74-
cardano-node
75-
cardano-node-chairman
76-
hedgehog-extras
77-
78-
source-repository-package
79-
type: git
80-
location: https://github.com/input-output-hk/cardano-prelude
81-
tag: 742e8525b96bf4b66fb61a00c8298d75d7931d5e
82-
--sha256: 1132r58bjgdcf7yz3n77nlrkanqcmpn5b5km4nw151yar2dgifsv
83-
subdir: cardano-prelude
84-
cardano-prelude-test
85-
86-
source-repository-package
87-
type: git
88-
location: https://github.com/input-output-hk/cardano-sl-x509
89-
tag: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49
90-
--sha256: 1aw7ns8lv51fjf45k8yzils2j7a6bqzy8hn65kb3z0dn1qsm8x88
91-
92-
source-repository-package
93-
type: git
94-
location: https://github.com/input-output-hk/goblins
95-
tag: cde90a2b27f79187ca8310b6549331e59595e7ba
96-
--sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg
97-
98-
source-repository-package
99-
type: git
100-
location: https://github.com/input-output-hk/iohk-monitoring-framework
101-
tag: 563e79f28c6da5c547463391d4c58a81442e48db
102-
--sha256: 1is18h9kk8j16my89q76nihvapiiff3jl8777vk7c4wl2h4zry2w
103-
subdir: contra-tracer
104-
iohk-monitoring
105-
plugins/backend-aggregation
106-
plugins/backend-ekg
107-
plugins/backend-monitoring
108-
plugins/backend-trace-forwarder
109-
plugins/scribe-systemd
110-
tracer-transformers
111-
112-
source-repository-package
113-
type: git
114-
location: https://github.com/input-output-hk/nothunks.git
115-
tag: a4d072f973a6054518a1fc176608b7c5c8dc8917
116-
--sha256: 13d44qpj2ar6mwjr8c0sxmkcqjgsrf5yybczlca2fsip5cjc16v2
117-
118-
source-repository-package
119-
type: git
120-
location: https://github.com/input-output-hk/ouroboros-network
121-
tag: c2bd6814e231bfd48059f306ef486b830e524aa8
122-
--sha256: 0sjp5i4szp5nf1dkwang5w8pydjx5p22by8wisihs1410rxgwd7n
123-
subdir: Win32-network
124-
cardano-client
125-
io-sim
126-
io-sim-classes
127-
network-mux
128-
ntp-client
129-
ouroboros-consensus
130-
ouroboros-consensus-byron
131-
ouroboros-consensus-cardano
132-
ouroboros-consensus-mock
133-
ouroboros-consensus-shelley
134-
ouroboros-network
135-
ouroboros-network-framework
136-
typed-protocols
137-
typed-protocols-examples
138-
139-
source-repository-package
140-
type: git
141-
location: https://github.com/snoyberg/http-client.git
142-
tag: 1a75bdfca014723dd5d40760fad854b3f0f37156
143-
--sha256: 0537bjhk9bzhvl76haswsv7xkkyzrmv5xfph3fydcd953q08hqdb
144-
subdir: http-client
145-
14624
package cardano-crypto
14725
tests: False
14826
benchmarks: False
@@ -310,3 +188,121 @@ package persistent-template
310188
package shelley-spec-ledger-test
311189
tests: False
312190
benchmarks: False
191+
192+
source-repository-package
193+
type: git
194+
location: https://github.com/input-output-hk/cardano-base
195+
tag: b364d925e0a72689ecba40dd1f4899f76170b894
196+
--sha256: 0igb4gnzlwxy1h40vy5s1aysmaa04wypxn7sn67qy6din7ysmad3
197+
subdir: binary
198+
binary/test
199+
cardano-crypto-class
200+
cardano-crypto-praos
201+
cardano-crypto-tests
202+
slotting
203+
204+
source-repository-package
205+
type: git
206+
location: https://github.com/input-output-hk/cardano-crypto
207+
tag: f73079303f663e028288f9f4a9e08bcca39a923e
208+
--sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
209+
210+
source-repository-package
211+
type: git
212+
location: https://github.com/input-output-hk/cardano-db-sync
213+
tag: 1c7dbdac93e4d75118f1592dbb411f4f6a617128
214+
--sha256: 0wiqijrvahdn4w4mzdps22l85h9fb7dgmqq8p1alrmj4jb1hy3bb
215+
subdir: cardano-db
216+
217+
source-repository-package
218+
type: git
219+
location: https://github.com/input-output-hk/cardano-ledger-specs
220+
tag: 097890495cbb0e8b62106bcd090a5721c3f4b36f
221+
--sha256: 0i3y9n0rsyarvhfqzzzjccqnjgwb9fbmbs6b7vj40afjhimf5hcj
222+
subdir: byron/chain/executable-spec
223+
byron/crypto
224+
byron/crypto/test
225+
byron/ledger/executable-spec
226+
byron/ledger/impl
227+
byron/ledger/impl/test
228+
semantics/executable-spec
229+
semantics/small-steps-test
230+
shelley-ma/impl
231+
shelley/chain-and-ledger/dependencies/non-integer
232+
shelley/chain-and-ledger/executable-spec
233+
shelley/chain-and-ledger/shelley-spec-ledger-test
234+
235+
source-repository-package
236+
type: git
237+
location: https://github.com/input-output-hk/cardano-node
238+
tag: 9a7331cce5e8bc0ea9c6bfa1c28773f4c5a7000f
239+
--sha256: 1scffi7igv4kj93bpjf8yibcaq0sskfikmm00f7r6q031l53y50c
240+
subdir: cardano-api
241+
cardano-api/test
242+
cardano-cli
243+
cardano-config
244+
cardano-node
245+
cardano-node-chairman
246+
hedgehog-extras
247+
248+
source-repository-package
249+
type: git
250+
location: https://github.com/input-output-hk/cardano-prelude
251+
tag: ee4e7b547a991876e6b05ba542f4e62909f4a571
252+
--sha256: 0dg6ihgrn5mgqp95c4f11l6kh9k3y75lwfqf47hdp554w7wyvaw6
253+
subdir: cardano-prelude
254+
cardano-prelude-test
255+
256+
source-repository-package
257+
type: git
258+
location: https://github.com/input-output-hk/cardano-sl-x509
259+
tag: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49
260+
--sha256: 1aw7ns8lv51fjf45k8yzils2j7a6bqzy8hn65kb3z0dn1qsm8x88
261+
262+
source-repository-package
263+
type: git
264+
location: https://github.com/input-output-hk/goblins
265+
tag: cde90a2b27f79187ca8310b6549331e59595e7ba
266+
--sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg
267+
268+
source-repository-package
269+
type: git
270+
location: https://github.com/input-output-hk/iohk-monitoring-framework
271+
tag: 563e79f28c6da5c547463391d4c58a81442e48db
272+
--sha256: 1is18h9kk8j16my89q76nihvapiiff3jl8777vk7c4wl2h4zry2w
273+
subdir: contra-tracer
274+
iohk-monitoring
275+
plugins/backend-aggregation
276+
plugins/backend-ekg
277+
plugins/backend-monitoring
278+
plugins/backend-trace-forwarder
279+
plugins/scribe-systemd
280+
tracer-transformers
281+
282+
source-repository-package
283+
type: git
284+
location: https://github.com/input-output-hk/ouroboros-network
285+
tag: 6cb9052bde39472a0555d19ade8a42da63d3e904
286+
--sha256: 0rz4acz15wda6yfc7nls6g94gcwg2an5zibv0irkxk297n76gkmg
287+
subdir: Win32-network
288+
cardano-client
289+
io-sim
290+
io-sim-classes
291+
network-mux
292+
ntp-client
293+
ouroboros-consensus
294+
ouroboros-consensus-byron
295+
ouroboros-consensus-cardano
296+
ouroboros-consensus-mock
297+
ouroboros-consensus-shelley
298+
ouroboros-network
299+
ouroboros-network-framework
300+
typed-protocols
301+
typed-protocols-examples
302+
303+
source-repository-package
304+
type: git
305+
location: https://github.com/snoyberg/http-client.git
306+
tag: 1a75bdfca014723dd5d40760fad854b3f0f37156
307+
--sha256: 0537bjhk9bzhvl76haswsv7xkkyzrmv5xfph3fydcd953q08hqdb
308+
subdir: http-client

‎cabal.project.freeze‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,7 @@ constraints: any.ALUT ==2.4.0.3,
14841484
any.nonempty-containers ==0.3.1.0,
14851485
any.nonemptymap ==0.0.6.0,
14861486
any.not-gloss ==0.7.7.0,
1487+
any.nothunks ==0.1.2,
14871488
any.nowdoc ==0.1.1.0,
14881489
any.nqe ==0.6.1,
14891490
any.nsis ==0.3.3,
@@ -1662,7 +1663,7 @@ constraints: any.ALUT ==2.4.0.3,
16621663
any.pretty-sop ==0.2.0.3,
16631664
any.pretty-types ==0.3.0.1,
16641665
any.prettyclass ==1.0.0.0,
1665-
any.prettyprinter ==1.2.1.1,
1666+
any.prettyprinter ==1.7.0,
16661667
any.prettyprinter-ansi-terminal ==1.1.1.2,
16671668
any.prettyprinter-compat-annotated-wl-pprint ==1,
16681669
any.prettyprinter-compat-ansi-wl-pprint ==1.0.1,

‎docker-compose.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
max-file: "20"
2626

2727
cardano-node:
28-
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.24.2}
28+
image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.25.1}
2929
environment:
3030
- NETWORK=${NETWORK:-mainnet}
3131
volumes:
@@ -38,7 +38,7 @@ services:
3838
max-file: "10"
3939

4040
cardano-db-sync:
41-
image: inputoutput/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-7.1.0}
41+
image: inputoutput/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-8.0.0}
4242
environment:
4343
- NETWORK=${NETWORK:-mainnet}
4444
- POSTGRES_HOST=postgres
@@ -61,7 +61,7 @@ services:
6161
max-file: "10"
6262

6363
cardano-explorer-api:
64-
image: inputoutput/cardano-explorer-api:${CARDANO_EXPLORER_API_VERSION:-3.1.0}
64+
image: inputoutput/cardano-explorer-api:${CARDANO_EXPLORER_API_VERSION:-3.1.2}
6565
depends_on:
6666
- postgres
6767
- cardano-db-sync
@@ -83,7 +83,7 @@ services:
8383
max-file: "10"
8484

8585
cardano-submit-api:
86-
image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-3.1.1}
86+
image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-3.1.2}
8787
environment:
8888
- NETWORK=${NETWORK:-mainnet}
8989
depends_on:

‎explorer-api/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 3.1.2 -- January 2021
4+
5+
* Upgrade dependencies to more recent versions of the Cardano eco-system (cardano-node 1.25.1, cardano-db-sync 8.0.0)
6+
37
## 3.1.1 -- December 2020
48

59
* ø (patch in submit-api).

‎explorer-api/cardano-explorer-api.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cabal-version: >= 1.10
33
-- http://haskell.org/cabal/users-guide/
44

55
name: cardano-explorer-api
6-
version: 3.1.1
6+
version: 3.1.2
77
synopsis: A Block Explorer for the Cardano network
88
description:
99
homepage: https://github.com/input-output-hk/cardano-explorer
@@ -12,7 +12,7 @@ license: Apache-2.0
1212
license-file: LICENSE
1313
author: IOHK Engineering Team
1414
maintainer: operations@iohk.io
15-
copyright: (c) 2019 IOHK
15+
copyright: (c) 2019-2021 IOHK
1616
category: Language
1717
build-type: Simple
1818
extra-source-files: CHANGELOG.md

‎explorer-api/src/Explorer/Web/Api/Legacy/Util.hs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ module Explorer.Web.Api.Legacy.Util
2020

2121
import Cardano.Db
2222
( Block (..), TxId )
23-
import Cardano.Ledger.Shelley
24-
( ShelleyEra )
2523
import Control.Applicative
2624
( (<|>) )
2725
import Control.Monad.IO.Class
@@ -80,7 +78,7 @@ collapseTxGroup xs =
8078
[] -> error "collapseTxGroup: groupOn produced [] on non-empty list (impossible)"
8179
(x:_) -> (fst x, map snd xs)
8280

83-
decodeTextAddress :: Text -> Either ExplorerError (Addr (ShelleyEra StandardCrypto))
81+
decodeTextAddress :: Text -> Either ExplorerError (Addr StandardCrypto)
8482
decodeTextAddress txt =
8583
case tryBase16 <|> tryBech32 <|> tryBase58 of
8684
Nothing ->

‎explorer-api/src/Explorer/Web/Server.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ blocksSummary (CHash blkHashTxt) = runExceptT $ do
149149
}
150150
, cbsPrevHash = CHash $ bsBase16Encode prevHash
151151
, cbsNextHash = fmap (CHash . bsBase16Encode) nextHash
152-
, cbsMerkleRoot = CHash $ maybe "" bsBase16Encode (blockMerkelRoot blk)
152+
, cbsMerkleRoot = CHash $ maybe "" bsBase16Encode (blockMerkleRoot blk)
153153
}
154154
Nothing -> throwE $ Internal "slot missing"
155155
_ -> throwE $ Internal "No block found"

‎nix/sources.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "https://input-output-hk.github.io/haskell.nix",
66
"owner": "input-output-hk",
77
"repo": "haskell.nix",
8-
"rev": "131433c36bd05b90a6fb9f15647ca768584c96cc",
9-
"sha256": "088ykxh7sh71ar17hc15x8ygb91n03hg9m60wjmihsz0ix0g62s5",
8+
"rev": "69dcebb5fae7b5ccdf5756d0d097e9bb8dd880f1",
9+
"sha256": "18jvl3mj0hvy4jx04y6mihwpfslaqj0qcz1wxjj7ryb8vmz4cz6r",
1010
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/131433c36bd05b90a6fb9f15647ca768584c96cc.tar.gz",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/69dcebb5fae7b5ccdf5756d0d097e9bb8dd880f1.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
},
1414
"iohk-nix": {

0 commit comments

Comments
 (0)