Skip to content

Commit 4a8d5e8

Browse files
iohk-bors[bot]Anvikingpaweljakubassevanspowelljonathanknowles
authored
Merge #3280
3280: Update to cardano-node 1.35-rc2 r=Anviking a=Anviking ### Overview - Updates dependencies to target `cardano-node 1.35-rc2` - Adds support to make the wallet _mostly_ work in Babbage - Rework of nix setup: we now derive nix files from `cabal.project` rather than the weird `stack.yaml`-based approach we had before. ### Detailed todo-list - [x] Get nix happy with the new dependencies - [x] Make `cabal build all` work with modulo warnings - [x] Update to more recent revisions - [x] Fix compilation in tests again - [x] Make `cabal build all` work with _no_ warnings - [x] Fix puzzling persistent TH name shadowing warnings -> fixed by sam? - [x] Ensure existing tests pass - [x] unit - [x] Look closer at balanceTx golden unit failure after first seeing if balanceTx integration tests pass on both alonzo and Babbage - [x] Integration (on alonzo like on master) - [x] Was blocked by readTVar, fixed with input-output-hk/io-sim#6 (review) - [x] Fix failures relating to Babbage era -> fixed with a hack 9e2568e - [x] Fix cardano-wallet-core Aeson failures - [x] More closely review code-changes - [x] Clean up git commit history - [x] Flatten merge commits - [x] Squash back-and-forth nix and revision changes - [x] Rebase off master - [x] Ensure revisions in stack.yaml and cabal.project are updated consistently - Alternatively remove `stack.yaml` and ensure ./nix/regenerate.sh still works and that we know how to update sha256map.nix — #3328 but without the sha256map.nix - [x] Ensure CI is completely green: [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-3280), ADP-1888 - There may be CI specific problems with nix, windows and more (there probably are) - [x] fix hydra wine TH error e.g. `$(TH.lift =<< TH.runIO (readFile "app/foo.txt"))` - seems relevant input-output-hk/haskell.nix#1508 - seems gone now - [x] `Ambiguous module name` https://hydra.iohk.io/build/15469467 - https://input-output-rnd.slack.com/archives/C48HA39RS/p1654388106509579 - Bumping Haskell.nix again should help? - Didn't seem like it worked... - https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1654828014483969 - [x] Remove-iserv problem https://hydra.iohk.io/build/15604435 - Update from Hamish https://input-output-rnd.slack.com/archives/CAP8NM7N0/p1655213059547499?thread_ts=1654828014.483969&cid=CAP8NM7N0 - [x] Docs shell - we don't need explicit emanote input in nix config - [x] Profiled shell: `recursionzmschemeszm5zi2zi2zi2zm6NC6xZZx2tI3826DrVhqI9v_DataziFunctorziFoldableziTH_zdfMakeBaseFunctorNamezuzdcmakeBaseFunctor_closure` https://hydra.iohk.io/build/15694577/nixlog/2/tail - [x] musl cli goldens https://hydra.iohk.io/build/15694618/nixlog/82 - [x] `hie-bios: hie-bios: this operation requires -fexternal-interpreter - [x] `Ambiguous module name 'Options.Applicative':` in HLS - now we at least have an ugly `-XPackageImport` workaround. - [x] Update node revision in readme.md ### Things we need eventually, but not strictly for this PR > - Update to final 1.35 tag once it is released - can be done in separate PR > - Run existing integration tests on both Alonzo and Babbage eras in CI > - Depend on cardano-addresses with aeson2 support merged, tagged and released > - Depend on a cardano-sl-x509 where aeson 2 support is merged to master > - Consider appropriateness Tx deserialisation hack 9e2568e Moved to jira tasks in https://input-output.atlassian.net/browse/ADP-1538 ### Comments Includes #3258, #3293 <!-- Additional comments, links, or screenshots to attach, if any. --> ### Issue Number ADP-1744 <!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles. Note: Jira issues of the form ADP- will be auto-linked. --> Co-authored-by: Johannes Lund <[email protected]> Co-authored-by: Pawel Jakubas <[email protected]> Co-authored-by: Samuel Evans-Powell <[email protected]> Co-authored-by: Jonathan Knowles <[email protected]>
2 parents fe9bef7 + 0129872 commit 4a8d5e8

File tree

312 files changed

+55460
-69508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+55460
-69508
lines changed

.buildkite/pipeline.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ steps:
3232
key: nix
3333
commands:
3434
- './nix/regenerate.sh'
35-
- 'nix build .#checkStackProject -o check-stack-project.sh && ./check-stack-project.sh'
3635
agents:
3736
system: x86_64-linux
3837

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ See **Installation Instructions** for each available [release](https://github.co
7171
>
7272
> | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions)
7373
> | --- | --- | ---
74-
> | `master` branch | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
74+
> | `master` branch | [1.35.0-rc2](https://github.com/input-output-hk/cardano-node/releases/tag/1.35.0-rc2) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
7575
> | [v2022-05-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-05-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
7676
> | [v2022-04-27](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-04-27) | [1.34.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.34.1) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)
7777
> | [v2022-01-18](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2022-01-18) | [1.33.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.33.0) | [1.6.1](https://github.com/input-output-hk/smash/releases/tag/1.6.1)

cabal.project

Lines changed: 97 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
--
3939
--------------------------------------------------------------------------------
4040

41-
index-state: 2022-03-29T23:10:49Z
41+
index-state: 2022-05-18T00:00:00Z
4242
with-compiler: ghc-8.10.7
4343

4444
packages:
@@ -53,48 +53,60 @@ packages:
5353
, lib/shelley/
5454
, lib/strict-non-empty-containers/
5555

56+
-- Using RDRAND instead of /dev/urandom as an entropy source for key
57+
-- generation is dubious. Set the flag so we use /dev/urandom by default.
58+
package cryptonite
59+
flags: -support_rdrand
60+
5661
-- Using a fork until our patches can be merged upstream
5762

5863
-- TODO: ADP-1713
5964
source-repository-package
6065
type: git
6166
location: https://github.com/biocad/servant-openapi3
6267
tag: 4165b837d3a71debd1059c3735460075840000b5
68+
--sha256: 1dngrr353kjhmwhn0b289jzqz5rf32llwcv79zcyq15ldpqpbib9
6369

6470
-- TODO: ADP-1713
6571
source-repository-package
6672
type: git
6773
location: https://github.com/paolino/openapi3
6874
tag: c30d0de6875d75edd64d1aac2272886528bc492d
75+
--sha256: 0b0fzj5vrnfrc8qikabxhsnp4p8lrjpssblbh2rb7aji5hzzfli9
6976

7077
source-repository-package
7178
type: git
7279
location: https://github.com/input-output-hk/optparse-applicative
7380
tag: 7497a29cb998721a9068d5725d49461f2bba0e7a
81+
--sha256: 1gvsrg925vynwgqwplgjmp53vj953qyh3wbdf34pw21c8r47w35r
7482

7583
source-repository-package
7684
type: git
7785
location: https://github.com/input-output-hk/Win32-network
7886
tag: 3825d3abf75f83f406c1f7161883c438dac7277d
87+
--sha256: 19wahfv726fa3mqajpqdqhnl9ica3xmf68i254q45iyjcpj1psqx
7988

8089
source-repository-package
8190
type: git
8291
location: https://github.com/input-output-hk/cardano-addresses
83-
tag: ba8390504b6613957b73bf8d0d2aab1a989f104d
92+
tag: b9f424cc64459a95a2f190a1839ec9bc94cc778c
93+
--sha256: 0iqzppqqb1xqnp55yd0xil9qfy8fz8474w834nmfg2w692bynyb9
8494
subdir: command-line
8595
core
8696

8797
source-repository-package
8898
type: git
8999
location: https://github.com/input-output-hk/bech32
90100
tag: ab61914443e5f53624d3b2995767761b3f68e576
101+
--sha256: 0isqh5s6rdhmqa3jhvc32zb3kvzy149hmzddx1ld9f9jhls4f3wg
91102
subdir: bech32
92103
bech32-th
93104

94105
source-repository-package
95106
type: git
96107
location: https://github.com/input-output-hk/cardano-base
97-
tag: 41545ba3ac6b3095966316a99883d678b5ab8da8
108+
tag: 631cb6cf1fa01ab346233b610a38b3b4cba6e6ab
109+
--sha256: 0944wg2nqazmhlmsynwgdwxxj6ay0hb9qig9l128isb2cjia0hlp
98110
subdir:
99111
base-deriving-via
100112
binary
@@ -111,11 +123,13 @@ source-repository-package
111123
type: git
112124
location: https://github.com/input-output-hk/cardano-crypto
113125
tag: f73079303f663e028288f9f4a9e08bcca39a923e
126+
--sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
114127

115128
source-repository-package
116129
type: git
117130
location: https://github.com/input-output-hk/plutus
118-
tag: fc5fe94d3d9525d032bcbc79ff0e1ebcfd8ef143
131+
tag: d24a7540e4659b57ce2ab25dadb968991e232191
132+
--sha256: 15glaghkaa5kh1ayfkw2jahkqq3955kmfzplmb210gvrlnlghlaa
119133
subdir:
120134
plutus-core
121135
plutus-ledger-api
@@ -129,19 +143,24 @@ source-repository-package
129143
type: git
130144
location: https://github.com/input-output-hk/ekg-forward
131145
tag: 297cd9db5074339a2fb2e5ae7d0780debb670c63
146+
--sha256: 1zcwry3y5rmd9lgxy89wsb3k4kpffqji35dc7ghzbz603y1gy24g
132147

133148
source-repository-package
134149
type: git
135150
location: https://github.com/input-output-hk/cardano-config
136151
tag: 1646e9167fab36c0bff82317743b96efa2d3adaa
152+
--sha256: 11kf65x38laqhwspsl28j2x5a4rky8mfr6356w0li5g53sfykmjc
137153

138154
source-repository-package
139155
type: git
140156
location: https://github.com/input-output-hk/cardano-ledger
141-
tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
157+
tag: e290bf8d0ea272a51e9acd10adc96b4e12e00d37
158+
--sha256: 1pmdg80a8irrqgdhbp46a9jx628mjbrj0k89xv5nb5dy37z5ig5f
142159
subdir:
143160
eras/alonzo/impl
144161
eras/alonzo/test-suite
162+
eras/babbage/impl
163+
eras/babbage/test-suite
145164
eras/byron/chain/executable-spec
146165
eras/byron/crypto
147166
eras/byron/crypto/test
@@ -156,7 +175,7 @@ source-repository-package
156175
libs/cardano-ledger-pretty
157176
libs/cardano-protocol-tpraos
158177
libs/cardano-data
159-
libs/compact-map
178+
libs/vector-map
160179
libs/set-algebra
161180
libs/small-steps
162181
libs/small-steps-test
@@ -165,7 +184,8 @@ source-repository-package
165184
source-repository-package
166185
type: git
167186
location: https://github.com/input-output-hk/cardano-node
168-
tag: 73f9a746362695dc2cb63ba757fbcabb81733d23
187+
tag: 95c3692cfbd4cdb82071495d771b23e51840fb0e
188+
--sha256: 1s4jjksz185dg4lp36ldha7vccxh0rk8zlvqms00zhg8kla21kr5
169189
subdir:
170190
cardano-api
171191
cardano-git-rev
@@ -180,38 +200,48 @@ source-repository-package
180200
type: git
181201
location: https://github.com/input-output-hk/cardano-prelude
182202
tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
203+
--sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
183204
subdir: cardano-prelude
184205
cardano-prelude-test
185206

207+
-- In particular we rely on the code from this PR:
208+
-- * <https://github.com/input-output-hk/cardano-sl-x509/pull/6>
209+
-- being merged.
186210
source-repository-package
187211
type: git
188-
location: https://github.com/input-output-hk/cardano-sl-x509
189-
tag: 12925934c533b3a6e009b61ede555f8f26bac037
212+
location: https://github.com/MELD-labs/cardano-sl-x509
213+
tag: 819997049b9cc675b28059d3d6f511d08f934d10
214+
--sha256: 1ia8vlqghis92cla8qmqa6kh8f3jn29b01fshyk5hmgy5373s684
190215

191216
source-repository-package
192217
type: git
193218
location: https://github.com/input-output-hk/goblins
194219
tag: cde90a2b27f79187ca8310b6549331e59595e7ba
220+
--sha256: 17c88rbva3iw82yg9srlxjv2ia5wjb9cyqw44hik565f5v9svnyg
195221

222+
-- In particular we rely on the code from this PR:
223+
-- * <https://github.com/input-output-hk/iohk-monitoring-framework/pull/622>
224+
-- being merged.
196225
source-repository-package
197226
type: git
198227
location: https://github.com/input-output-hk/iohk-monitoring-framework
199-
tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
228+
tag: 066f7002aac5a0efc20e49643fea45454f226caa
229+
--sha256: 0s6x4in11k5ba7nl7la896g28sznf9185xlqg9c604jqz58vj9nj
200230
subdir: contra-tracer
201231
iohk-monitoring
202232
plugins/backend-aggregation
203233
plugins/backend-ekg
204234
plugins/backend-monitoring
205235
plugins/backend-trace-forwarder
236+
plugins/scribe-systemd
206237
tracer-transformers
207238

208239
source-repository-package
209240
type: git
210241
location: https://github.com/input-output-hk/ouroboros-network
211-
tag: 4fac197b6f0d2ff60dc3486c593b68dc00969fbf
242+
tag: 04245dbd69387da98d3a37de9f400965e922bb0e
243+
--sha256: 0bgfclc7h441dwq9z69697nqfir6shj4358zxmwjiaifp93zkc2p
212244
subdir:
213-
io-sim
214-
io-classes
215245
monoidal-synchronisation
216246
network-mux
217247
ouroboros-consensus
@@ -222,25 +252,48 @@ source-repository-package
222252
ouroboros-network
223253
ouroboros-network-framework
224254
ouroboros-network-testing
225-
strict-stm
226-
typed-protocols
227-
typed-protocols-cborg
228-
typed-protocols-examples
229255
ntp-client
230256

231257
source-repository-package
232-
type: git
233-
location: https://github.com/snoyberg/http-client.git
234-
tag: 1a75bdfca014723dd5d40760fad854b3f0f37156
235-
subdir: http-client
258+
type: git
259+
location: https://github.com/input-output-hk/io-sim
260+
tag: 57e888b1894829056cb00b7b5785fdf6a74c3271
261+
--sha256: 1kv8lwmrw1c0g03jy3i3fgk3c8d47ihjcslg295djqj442y95y2f
262+
subdir:
263+
io-classes
264+
io-sim
265+
strict-stm
266+
267+
source-repository-package
268+
type: git
269+
location: https://github.com/input-output-hk/typed-protocols
270+
tag: 181601bc3d9e9d21a671ce01e0b481348b3ca104
271+
--sha256: 1lr97b2z7l0rpsmmz92rsv27qzd5vavz10cf7n25svya4kkiysp5
272+
subdir:
273+
typed-protocols
274+
typed-protocols-cborg
275+
typed-protocols-examples
236276

237277
-- Drops an instance breaking cardano-node.
238278
source-repository-package
239279
type: git
240-
location: https://github.com/input-output-hk/flat.git
280+
location: https://github.com/input-output-hk/flat
241281
tag: ee59880f47ab835dbd73bea0847dab7869fc20d8
242282
--sha256: 1lrzknw765pz2j97nvv9ip3l1mcpf2zr4n56hwlz0rk7wq7ls4cm
243283

284+
-- Until https://github.com/tibbe/ekg-json/pull/12 gets merged with aeson2 support
285+
source-repository-package
286+
type: git
287+
location: https://github.com/vshabanov/ekg-json
288+
tag: 00ebe7211c981686e65730b7144fbf5350462608
289+
--sha256: 1zvjm3pb38w0ijig5wk5mdkzcszpmlp5d4zxvks2jk1rkypi8gsm
290+
291+
source-repository-package
292+
type: git
293+
location: https://github.com/input-output-hk/hedgehog-extras
294+
tag: 967d79533c21e33387d0227a5f6cc185203fe658
295+
--sha256: 0rbqb7a64aya1qizlr3im06hdydg9zr6sl3i8bvqqlf7kpa647sd
296+
244297
-- -------------------------------------------------------------------------
245298
-- Constraints tweaking
246299

@@ -252,33 +305,45 @@ allow-newer:
252305
hjsonschema:*
253306
, hjsonpointer:*
254307
, cardano-sl-x509:ip
255-
, cardano-addresses:aeson
308+
, *:aeson
256309
, size-based:template-haskell
257310

311+
-- Copied from (copied from cardano-node/cabal.project)
312+
allow-newer:
313+
*:aeson,
314+
monoidal-containers:aeson,
315+
size-based:template-haskell
316+
317+
allow-newer:
318+
async-timer:unliftio-core
319+
258320
constraints:
259-
hedgehog >= 1.0.2
260-
-- QUICK FIX: hedgehog >= 1.1 defines Rec constructor, PlutusIR also defines
261-
-- Rec constructor, and imports Hedgehog unqualified, leading to ambiguous
262-
-- reference to Rec.
263-
-- FIXME: https://input-output.atlassian.net/browse/ADP-1545
264-
, hedgehog < 1.1
265-
, hashable < 1.4
321+
hashable < 1.4
266322
, bimap >= 0.4.0
323+
, openapi3 >= 3.2.0
267324
, libsystemd-journal >= 1.4.4
268325
, systemd >= 2.3.0
269326
-- dependency of systemd-2.3.0
270327
, network >= 3.1.1.1
271328
-- choose versions that work with base >= 4.12
272329
, hjsonpointer >= 1.5.0
273330
, hjsonschema >= 1.10.0
331+
, Cabal >= 3.4.0.0
332+
, async-timer >= 0.2.0.0
333+
, unliftio-core >= 0.2.0.1
334+
335+
-- This pin is just here to make cabalProejct == stackProject.
336+
-- Remove it if you are happy for a newer version to be picked when possible.
337+
, semigroups == 0.19.2
338+
, persistent < 2.13.3.4
274339

275340
-- ----------------------------------------------------------------
276341
-- Flags for dependencies
277342

278343
package cardano-config
279-
flags: -systemd
344+
flags: +systemd
280345
package cardano-node
281-
flags: -systemd
346+
flags: +systemd
282347

283348
-- -------------------------------------------------------------------------
284349
-- Enable specific tests in this repo

0 commit comments

Comments
 (0)